From 54bea0141664b40c7e8d4327acb1fecf327c3da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 14 Apr 2026 10:03:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor(contract):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E4=BB=8EcontractNo=E6=94=B9=E4=B8=BAcontractCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改多个组件中合同编号字段名以保持一致性，移除未使用的props和清理冗余代码 --- .../views/aps/planSheet/PlanDetailForm.vue | 8 ++---- .../crm/contract/components/ContractList.vue | 8 +++--- .../crm/contract/components/ContractTabs.vue | 28 ------------------- klp-ui/src/views/crm/contract/index.vue | 25 ++++++++--------- klp-ui/src/views/crm/order/index.vue | 2 +- .../src/views/wms/contract/contractPage.vue | 14 +++++----- 6 files changed, 25 insertions(+), 60 deletions(-) diff --git a/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue b/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue index 4e58a072..3faf4b67 100644 --- a/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue +++ b/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue @@ -210,12 +210,6 @@
- @@ -237,6 +231,8 @@ + + diff --git a/klp-ui/src/views/crm/contract/components/ContractList.vue b/klp-ui/src/views/crm/contract/components/ContractList.vue index 6d03b762..1e2c8680 100644 --- a/klp-ui/src/views/crm/contract/components/ContractList.vue +++ b/klp-ui/src/views/crm/contract/components/ContractList.vue @@ -74,7 +74,7 @@
{{ row.contractName }}
-
{{ row.contractNo }}
+
{{ row.contractCode }}
@@ -144,7 +144,7 @@ export default { pageNum: 1, pageSize: 10, contractName: undefined, - contractNo: undefined, + contractCode: undefined, supplier: undefined, customer: undefined, signTime: undefined, @@ -230,7 +230,7 @@ export default { // 合同编号 worksheet.mergeCells('G2:H2'); - worksheet.getCell('G2').value = `合同编号：${row.contractNo || ''}`; + worksheet.getCell('G2').value = `合同编号：${row.contractCode || ''}`; worksheet.getCell('G2').alignment = { horizontal: 'right', vertical: 'middle' }; // 供方信息 @@ -692,7 +692,7 @@ export default { // 5. 导出文件 const buffer = await workbook.xlsx.writeBuffer(); const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); - saveAs(blob, `合同_${row.contractNo || row.contractName || '未命名'}.xlsx`); + saveAs(blob, `合同_${row.contractCode || row.contractName || '未命名'}.xlsx`); }, } }; diff --git a/klp-ui/src/views/crm/contract/components/ContractTabs.vue b/klp-ui/src/views/crm/contract/components/ContractTabs.vue index 16d95c22..e0924e91 100644 --- a/klp-ui/src/views/crm/contract/components/ContractTabs.vue +++ b/klp-ui/src/views/crm/contract/components/ContractTabs.vue @@ -95,18 +95,6 @@ export default { type: [Number, String], default: null }, - customerId: { - type: String, - default: '' - }, - financeList: { - type: Array, - default: () => [] - }, - objectionList: { - type: Array, - default: () => [] - }, coilList: { type: Array, default: () => [] @@ -115,10 +103,6 @@ export default { type: Boolean, default: false }, - tabLoading: { - type: Boolean, - default: false - }, // 附件字段 contractAttachment: { type: String, @@ -132,10 +116,6 @@ export default { type: String, default: '' }, - wmsDeliveryWaybills: { - type: Array, - default: () => [] - }, // 新增必要的props form: { type: Object, @@ -145,10 +125,6 @@ export default { type: Object, default: () => ({}) }, - customerList: { - type: Array, - default: () => [] - }, deliveryWaybillList: { type: Array, default: () => [] @@ -179,10 +155,6 @@ export default { .replace('{i}', minutes) .replace('{s}', seconds); }, - // 处理订单保存 - handleOrderSave() { - // 这里可以添加保存逻辑 - } } }; \ No newline at end of file diff --git a/klp-ui/src/views/crm/contract/index.vue b/klp-ui/src/views/crm/contract/index.vue index ec16eea2..83188b15 100644 --- a/klp-ui/src/views/crm/contract/index.vue +++ b/klp-ui/src/views/crm/contract/index.vue @@ -23,9 +23,7 @@
-
@@ -339,15 +337,10 @@ export default { /** 行点击事件 */ handleRowClick(row) { this.form = row; - // this.tabLoading = true; this.getCoilList(); - // listContractOrderObjection(row.contractId).then(response => { - // this.financeList = response.data.financeList || []; - // this.objectionList = response.data.oobjectionList || []; - // this.wmsDeliveryWaybills = response.data.wmsDeliveryWaybills || []; - // }).finally(() => { - // this.tabLoading = false; - // }) + listDeliveryWaybill({ orderId: row.orderId, pageNum: 1, pageSize: 50 }).then(res => { + this.wmsDeliveryWaybills = res.rows || []; + }) }, /** 查询合同配卷列表 */ getCoilList() { @@ -360,7 +353,7 @@ export default { this.form = { contractId: undefined, contractName: '产品销售合同', - contractNo: undefined, + contractCode: undefined, supplier: '嘉祥科伦普重工有限公司', customer: undefined, signTime: undefined, @@ -478,8 +471,12 @@ export default { this.$refs["form"].validate(valid => { if (valid) { this.buttonLoading = true; + const payload = { + ...this.form, + orderCode: this.form.contractCode, + } if (this.form.orderId != null) { - updateOrder(this.form).then(response => { + updateOrder(payload).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.$refs.orderList.getList(); @@ -487,7 +484,7 @@ export default { this.buttonLoading = false; }); } else { - addOrder(this.form).then(response => { + addOrder(payload).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; this.$refs.orderList.getList(); diff --git a/klp-ui/src/views/crm/order/index.vue b/klp-ui/src/views/crm/order/index.vue index 3cd72a82..2506c99c 100644 --- a/klp-ui/src/views/crm/order/index.vue +++ b/klp-ui/src/views/crm/order/index.vue @@ -114,7 +114,7 @@ - diff --git a/klp-ui/src/views/wms/contract/contractPage.vue b/klp-ui/src/views/wms/contract/contractPage.vue index 9d4801bf..25f1dfbe 100644 --- a/klp-ui/src/views/wms/contract/contractPage.vue +++ b/klp-ui/src/views/wms/contract/contractPage.vue @@ -1,8 +1,8 @@