From c70015b8a330b3719a5b21e9b0d687ba2d146cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 10 Jan 2026 16:32:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(wms):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E5=91=BD=E5=90=8D=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将时间参数从startTime/endTime重命名为byCreateTimeStart/byCreateTimeEnd以保持一致性 移除重复的时间参数传递并调整按钮组件格式 --- klp-ui/src/views/wms/coil/do/search.vue | 4 ++-- klp-ui/src/views/wms/report/delivery.vue | 4 ++-- klp-ui/src/views/wms/report/receive.vue | 8 ++++---- klp-ui/src/views/wms/report/zha.vue | 10 ++-------- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/klp-ui/src/views/wms/coil/do/search.vue b/klp-ui/src/views/wms/coil/do/search.vue index e13838b7..3517bf49 100644 --- a/klp-ui/src/views/wms/coil/do/search.vue +++ b/klp-ui/src/views/wms/coil/do/search.vue @@ -267,8 +267,8 @@
- 领料 + 领料
diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue index a6055d15..14c45ef5 100644 --- a/klp-ui/src/views/wms/report/delivery.vue +++ b/klp-ui/src/views/wms/report/delivery.vue @@ -127,8 +127,8 @@ export default { pageNum: 1, pageSize: 9999, status: 1, - startTime: startTime, - endTime: endTime, + byCreateTimeStart: startTime, + byCreateTimeEnd: endTime, selectType: 'product', enterCoilNo: '', currentCoilNo: '', diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue index 77002746..07b073e1 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -128,8 +128,8 @@ export default { pageNum: 1, pageSize: 9999, // status: 1, - startTime: startTime, - endTime: endTime, + byCreateTimeStart: startTime, + byCreateTimeEnd: endTime, selectType: 'product', enterCoilNo: '', currentCoilNo: '', @@ -163,8 +163,8 @@ export default { actionType: 401, pageSize: 999, pageNum: 1, - startTime: this.queryParams.startTime, - endTime: this.queryParams.endTime, + byCreateTimeStart: this.queryParams.byCreateTimeStart, + byCreateTimeEnd: this.queryParams.byCreateTimeEnd, }).then(res => { const actions = res.rows const coilIds = actions.map(item => item.coilId).join(',') diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue index 5afc8fa1..10688934 100644 --- a/klp-ui/src/views/wms/report/zha.vue +++ b/klp-ui/src/views/wms/report/zha.vue @@ -129,8 +129,8 @@ export default { pageNum: 1, pageSize: 9999, // status: 1, - startTime: startTime, - endTime: endTime, + byCreateTimeStart: startTime, + byCreateTimeEnd: endTime, selectType: 'product', enterCoilNo: '', currentCoilNo: '', @@ -163,8 +163,6 @@ export default { // 酸连轧成品库 listMaterialCoil({ ...this.queryParams, - startTime: this.queryParams.startTime, - endTime: this.queryParams.endTime, pageSize: 9999, pageNum: 1, dataType: 1, @@ -175,8 +173,6 @@ export default { // 镀锌原料库 listMaterialCoil({ ...this.queryParams, - startTime: this.queryParams.startTime, - endTime: this.queryParams.endTime, pageSize: 9999, pageNum: 1, dataType: 1, @@ -187,8 +183,6 @@ export default { // 脱脂原料库 listMaterialCoil({ ...this.queryParams, - startTime: this.queryParams.startTime, - endTime: this.queryParams.endTime, pageSize: 9999, pageNum: 1, dataType: 1, From d5990850e7600375c13da191afc094644ba306c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 10 Jan 2026 16:42:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(wms):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E5=91=BD=E5=90=8D=E5=B9=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=B5=E5=89=AA=E5=88=86=E6=9D=A1=E5=8E=9F?= =?UTF-8?q?=E6=96=99=E5=BA=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将接收、发货和轧后报表的时间参数从startTime/endTime统一改为byCreateTimeStart/byCreateTimeEnd 在轧后报表中添加纵剪分条原料库的数据查询 --- klp-ui/src/views/wms/report/delivery.vue | 4 ++-- klp-ui/src/views/wms/report/receive.vue | 4 ++-- klp-ui/src/views/wms/report/zha.vue | 19 ++++++++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue index 14c45ef5..e7aa726f 100644 --- a/klp-ui/src/views/wms/report/delivery.vue +++ b/klp-ui/src/views/wms/report/delivery.vue @@ -3,11 +3,11 @@ - - diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue index 07b073e1..c8e59db3 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -3,11 +3,11 @@ - - diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue index 10688934..ed913334 100644 --- a/klp-ui/src/views/wms/report/zha.vue +++ b/klp-ui/src/views/wms/report/zha.vue @@ -3,11 +3,11 @@ - - @@ -189,9 +189,18 @@ export default { createBy: 'suanzhakuguan', warehouseId: '1988150545175736322' }), - ]).then(([res1, res2, res3]) => { - console.log(res1, res2, res3) - this.list = [...res1.rows, ...res2.rows, ...res3.rows] + // 酸连轧纵剪分条原料库1988150150521090049 + listMaterialCoil({ + ...this.queryParams, + pageSize: 9999, + pageNum: 1, + dataType: 1, + createBy: 'suanzhakuguan', + warehouseId: '1988150150521090049' + }), + ]).then(([res1, res2, res3, res4]) => { + console.log(res1, res2, res3, res4) + this.list = [...res1.rows, ...res2.rows, ...res3.rows, ...res4.rows] this.loading = false }) // listPendingAction({