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..e7aa726f 100644 --- a/klp-ui/src/views/wms/report/delivery.vue +++ b/klp-ui/src/views/wms/report/delivery.vue @@ -3,11 +3,11 @@ - - @@ -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..c8e59db3 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -3,11 +3,11 @@ - - @@ -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..ed913334 100644 --- a/klp-ui/src/views/wms/report/zha.vue +++ b/klp-ui/src/views/wms/report/zha.vue @@ -3,11 +3,11 @@ - - @@ -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,17 +183,24 @@ export default { // 脱脂原料库 listMaterialCoil({ ...this.queryParams, - startTime: this.queryParams.startTime, - endTime: this.queryParams.endTime, pageSize: 9999, pageNum: 1, dataType: 1, 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({