From 983a3f5d2650974fec7cb71fdfc11b02a6bb16f6 Mon Sep 17 00:00:00 2001 From: jinna Date: Mon, 20 Apr 2026 15:17:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workwearManagement/index.vue | 16 +++++++ src/views/orderManagement/planYieIdOrder.vue | 24 +++++++++- .../orderManagement/sinTerYieIdOrder.vue | 46 ++++++++++++++++++- 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/views/equiptManagement/workwearManagement/index.vue b/src/views/equiptManagement/workwearManagement/index.vue index 749925c..ec828c2 100644 --- a/src/views/equiptManagement/workwearManagement/index.vue +++ b/src/views/equiptManagement/workwearManagement/index.vue @@ -169,6 +169,22 @@ export default { } }, + currentChange(currentPage){ + this.page.currentPage = currentPage; + if(this.tabPosition == "feiBaSet"){ + this.getFeiBa(); + }else{ + this.getRackSet(); + } + }, + sizeChange(pageSize){ + this.page.pageSize = pageSize; + if(this.tabPosition == "feiBaSet"){ + this.getFeiBa(); + }else{ + this.getRackSet(); + } + }, // 重置 searchReset() { if (this.tabPosition == "feiBaSet") { diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue index 7674fb3..8bbba36 100644 --- a/src/views/orderManagement/planYieIdOrder.vue +++ b/src/views/orderManagement/planYieIdOrder.vue @@ -204,6 +204,7 @@ export default { label: '计划单号', prop: 'ypCode', search: true, + searchOrder:5, sortable: true, width: 150, span: 12, @@ -223,6 +224,7 @@ export default { search: true, sortable: true, width: 150, + searchOrder:4, span: 12, headerAlign: 'center', align: 'center', @@ -239,6 +241,7 @@ export default { prop: 'partCode', search: true, sortable: true, + searchOrder:2, width: 180, span: 12, headerAlign: 'center', @@ -309,6 +312,7 @@ export default { label: '流程卡号', prop: 'cardNo', search: true, + searchOrder:3, sortable: true, width: 150, span: 12, @@ -649,6 +653,7 @@ export default { { label: '接收状态', prop: 'receiveStatus', + type: 'select', search: true, sortable: true, span: 12, @@ -668,6 +673,16 @@ export default { }, ], }, + { + label:"接收人", + prop: 'receiveUserName', + width: '140', + }, + { + label:"接收时间", + prop: 'receiveTime', + width: '140', + }, { label: '备注', prop: 'memo', @@ -1075,10 +1090,17 @@ export default { async onLoad(page, params = {}) { this.loading = true; try { + let param = { + ...this.query, + releaseDateStart:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[0]).format('YYYY-MM-DD') : null, + releaseDateEnd:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[1]).format('YYYY-MM-DD') : null, + } + if(param.releaseDate) delete param.releaseDate; + console.log('para-----------',param) const res = await getHotOrderList({ current:this.page.currentPage, size:this.page.pageSize, - ...this.query, + ...param, }); this.data = res.data.data.records; this.page.total = res.data.data.total; diff --git a/src/views/orderManagement/sinTerYieIdOrder.vue b/src/views/orderManagement/sinTerYieIdOrder.vue index b1d59a0..49a0adb 100644 --- a/src/views/orderManagement/sinTerYieIdOrder.vue +++ b/src/views/orderManagement/sinTerYieIdOrder.vue @@ -248,6 +248,7 @@ export default { label: '计划单号', prop: 'ypCode', search: true, + searchOrder:5, sortable: true, width: 150, span: 12, @@ -266,6 +267,7 @@ export default { prop: 'yoCode', search: true, sortable: true, + searchOrder:4, width: 150, span: 12, headerAlign: 'center', @@ -282,6 +284,7 @@ export default { label: '零件号', prop: 'partCode', search: true, + searchOrder:2, sortable: true, width: 180, span: 12, @@ -355,6 +358,7 @@ export default { prop: 'cardNo', search: true, sortable: true, + searchOrder:3, width: 150, span: 12, headerAlign: 'center', @@ -736,6 +740,39 @@ export default { }, ], }, + { + label: '接收状态', + prop: 'receiveStatus', + type: 'select', + search: true, + sortable: true, + span: 12, + width: '140', + display: false, + // RECEIVE_STATUS_NO( name:"未接收", +// RECEIVE_STATUS_YES(name:"已接收", +// code:11000),code:11001) + dicData: [ + { + value: 11000, + label: '未接收', + }, + { + value: 11001, + label: '已接收', + }, + ], + }, + { + label:"接收人", + prop: 'receiveUserName', + width: '140', + }, + { + label:"接收时间", + prop: 'receiveTime', + width: '140', + }, { label: '备注', prop: 'memo', @@ -1127,10 +1164,17 @@ export default { async onLoad(page, params = {}) { this.loading = true; try { + let param = { + ...this.query, + releaseDateStart:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[0]).format('YYYY-MM-DD') : null, + releaseDateEnd:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[1]).format('YYYY-MM-DD') : null, + } + if(param.releaseDate) delete param.releaseDate; + console.log('para-----------',param) const res = await getSinterOrderList({ current:this.page.currentPage, size:this.page.pageSize, - ...this.query + ...param }) this.data = res.data.data.records; this.page.total = res.data.data.total;