From e39035efcc513332315551bcc180708335e81ca3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 七月 2026 11:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/views/procurementManagement/procurementLedger/index.vue | 4 ++--
multiple/config.json | 6 +++---
multiple/assets/logo/TDDQLogo.png | 0
src/views/salesManagement/salesLedger/index.vue | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/multiple/assets/logo/TDDQLogo.png b/multiple/assets/logo/TDDQLogo.png
index b34689f..234182d 100644
--- a/multiple/assets/logo/TDDQLogo.png
+++ b/multiple/assets/logo/TDDQLogo.png
Binary files differ
diff --git a/multiple/config.json b/multiple/config.json
index 94d369a..f8ce466 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -134,9 +134,9 @@
},
"TDDQ": {
"env": {
- "VITE_APP_TITLE": "娌冲崡鍚屽痉鐢靛櫒鏈夐檺鍏徃",
- "VITE_BASE_API": "http://localhost:9001",
- "VITE_JAVA_API": "http://localhost:9002"
+ "VITE_APP_TITLE": "娌冲崡鍚屽痉鐢垫皵鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://36.137.101.88:9001",
+ "VITE_JAVA_API": "http://36.137.101.88:9002"
},
"logo": "logo/TDDQLogo.png",
"favicon": "favicon/TDDQfavicon.ico"
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index e2d340b..6167e6c 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -108,7 +108,7 @@
<el-button link type="primary" @click="openForm('edit', scope.row)"
:disabled="scope.row.stockInStatus === '瀹屽叏鍏ュ簱'">缂栬緫
</el-button>
- <el-button link type="primary" @click="downloadOrder(scope.row.id)">涓嬭浇</el-button>
+ <el-button link type="primary" @click="openFileDialog(scope.row)">闄勪欢</el-button> <!--downloadOrder(scope.row.id) 涓嬭浇-->
</template>
</el-table-column>
</el-table>
@@ -137,7 +137,7 @@
<el-col :span="12">
<el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierId">
<el-select v-model="form.supplierId" placeholder="璇烽�夋嫨" filterable clearable>
- <el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName" :value="item.id">{{ item.supplierName + '---' + item.supplierType }}</el-option>
+ <el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName" :value="item.id">{{ item.supplierType ? item.supplierName + '---' + item.supplierType : item.supplierName }}</el-option>
</el-select>
</el-form-item>
</el-col>
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 23c7438..35ed6c9 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -249,8 +249,8 @@
</el-button>
<el-button link
type="primary"
- @click="downloadOrder(scope.row.id)">涓嬭浇
- </el-button>
+ @click="openFileDialog(scope.row)">闄勪欢
+ </el-button> <!--downloadOrder(scope.row.id) 涓嬭浇-->
</template>
</el-table-column>
</el-table>
@@ -330,7 +330,7 @@
:label="item.customerName"
:value="item.id">
{{
- item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber
+ item.taxpayerIdentificationNumber ? item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber : item.customerName
}}
</el-option>
</el-select>
--
Gitblit v1.9.3