From 2d30a2f3fb8d0a5dd83bd3b8211c95f2502ff18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 9 Dec 2025 14:37:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=91=E8=B4=A7=E5=8D=95):=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=91=E8=B4=A7=E5=8D=95=E9=92=A2=E5=8D=B7=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=8C=83=E5=9B=B4=E9=99=90=E5=88=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CoilSelector组件中新增rangeMode和rangeData属性，支持传入可选钢卷列表 - 发货单明细表增加对可选钢卷列表的支持，并在增删改时刷新列表 - 发货单打印时自动填充取货地点为实际库位前三位 - 调整操作列固定显示在表格右侧 --- klp-ui/src/api/wms/coil.js | 4 ++- klp-ui/src/api/wms/deliveryPlan.js | 15 +++++++++- klp-ui/src/components/CoilSelector/index.vue | 19 ++++++++++-- .../wms/delivery/components/detailTable.vue | 9 +++++- .../views/wms/delivery/components/wayBill.vue | 30 ++++--------------- klp-ui/src/views/wms/delivery/plan/index.vue | 2 +- .../src/views/wms/delivery/waybill/index.vue | 30 +++++++++++++++---- 7 files changed, 74 insertions(+), 35 deletions(-) diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js index e57b5b0c..389d2e28 100644 --- a/klp-ui/src/api/wms/coil.js +++ b/klp-ui/src/api/wms/coil.js @@ -143,7 +143,9 @@ export function listCoilByIds(coilIds) { url: '/wms/materialCoil/list', method: 'get', params: { - coilIds + coilIds, + pageNum: 1, + pageSize: 1000 } }) } \ No newline at end of file diff --git a/klp-ui/src/api/wms/deliveryPlan.js b/klp-ui/src/api/wms/deliveryPlan.js index 2d07b347..0851b121 100644 --- a/klp-ui/src/api/wms/deliveryPlan.js +++ b/klp-ui/src/api/wms/deliveryPlan.js @@ -56,4 +56,17 @@ export function getDeliveryReport(query) { method: 'get', params: query }) -} \ No newline at end of file +} + +/** + * 获取当前可用的钢卷列表 + */ +export function listSelectableCoils(planId) { + return request({ + url: '/wms/deliveryPlan/selectableCoils', + method: 'get', + params: { + planId: planId + } + }) +} diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue index 4046779e..2a1aff1d 100644 --- a/klp-ui/src/components/CoilSelector/index.vue +++ b/klp-ui/src/components/CoilSelector/index.vue @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ -
@@ -91,6 +91,15 @@ export default { type: Object, default: null }, + rangeMode: { + type: Boolean, + default: false + }, + // 返回选择模式，不再通过list借口获取，而是传入可以选择的钢卷数据 + rangeData: { + type: Array, + default: () => [] + } }, data() { return { @@ -178,6 +187,12 @@ export default { methods: { // 获取钢卷列表 async getList() { + // 如果是范围模式，直接使用传入数据 + if (this.rangeMode) { + this.coilList = this.rangeData || []; + this.total = this.coilList.length; + return; + } try { this.loading = true; const params = { ...this.queryParams, ...this.filters }; diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue index a78e96fd..3209b2a7 100644 --- a/klp-ui/src/views/wms/delivery/components/detailTable.vue +++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue @@ -49,7 +49,7 @@
- +
@@ -108,6 +108,10 @@ export default { waybillId: { type: String, default: '', + }, + coilList: { + type: Array, + default: () => [] } }, components: { @@ -273,12 +277,14 @@ export default { this.getList(); }).finally(() => { this.buttonLoading = false; + this.$emit('update'); }); } else { addDeliveryWaybillDetail(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); + this.$emit('add'); }).finally(() => { this.buttonLoading = false; }); @@ -296,6 +302,7 @@ export default { this.loading = false; this.getList(); this.$modal.msgSuccess("删除成功"); + this.$emit('delete'); }).catch(() => { }).finally(() => { this.loading = false; diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue index 10d40326..d722a646 100644 --- a/klp-ui/src/views/wms/delivery/components/wayBill.vue +++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue @@ -104,7 +104,7 @@
取货地点： - +
@@ -159,7 +159,8 @@ export default { deliveryDay: '', principal: '', principalPhone: '', - licensePlate: '' + licensePlate: '', + pickupLocation: '' }, // 本地可编辑的发货单明细 localWaybillDetails: [] @@ -178,7 +179,8 @@ export default { deliveryDay: this.getDayFromDate(newVal.deliveryTime) || '', principal: newVal.principal || '', principalPhone: newVal.principalPhone || '', - licensePlate: newVal.licensePlate || '' + licensePlate: newVal.licensePlate || '', + pickupLocation: newVal.pickupLocation || '' }; } }, @@ -187,6 +189,7 @@ export default { }, waybillDetails: { handler(newVal) { + console.log('waybillDetails', newVal); if (newVal && Array.isArray(newVal)) { this.localWaybillDetails = [...newVal]; } else { @@ -222,27 +225,6 @@ export default { } return ''; }, - // 添加明细 - addDetail() { - this.localWaybillDetails.push({ - productName: '', - edgeType: '', - packageType: '', - settlementType: '', - rawMaterialFactory: '', - coilNumber: '', - specification: '', - material: '', - quantity: 0, - weight: 0, - unitPrice: 0, - remark: '' - }); - }, - // 删除明细 - deleteDetail(index) { - this.localWaybillDetails.splice(index, 1); - }, // 保存为图片 saveAsImage() { const node = this.$refs.waybillRef; diff --git a/klp-ui/src/views/wms/delivery/plan/index.vue b/klp-ui/src/views/wms/delivery/plan/index.vue index c8e9200d..72c048d8 100644 --- a/klp-ui/src/views/wms/delivery/plan/index.vue +++ b/klp-ui/src/views/wms/delivery/plan/index.vue @@ -92,7 +92,7 @@ - + diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue index 6e7cc010..cee2885e 100644 --- a/klp-ui/src/views/wms/delivery/waybill/index.vue +++ b/klp-ui/src/views/wms/delivery/waybill/index.vue @@ -80,7 +80,7 @@ - + @@ -138,7 +138,8 @@