From 6bbef5511cf24fd19b4a13572eaf249e0a8729e0 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 16 Aug 2024 19:41:27 +0800 Subject: [PATCH] =?UTF-8?q?HL-5420=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=81=E7=89=A9=E6=96=99=E4=BB=BB=E5=8A=A1-=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E7=82=B9=E5=87=BB=E2=80=9C=E9=87=8D=E7=BD=AE=E2=80=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E5=8F=AA=E7=9C=8B=E5=BD=93=E5=A4=A9=E5=92=8C=E5=8F=AA?= =?UTF-8?q?=E7=9C=8B=E5=BE=85=E5=A4=84=E7=90=86=E6=8C=89=E9=92=AE=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/job/jobFilter.vue | 2 + src/pages/issue/job/issueJob.vue | 95 +++++++++++++----------- src/pages/repleinsh/job/repleinshJob.vue | 64 +++++++++------- 3 files changed, 90 insertions(+), 71 deletions(-) diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 4dcd4b84..32d1546f 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -198,6 +198,8 @@ return params; }, reset(){ + this.checkedTodayModel = false + this.checkedWaitModel = false this.productionLineCode = '' this.fromLocationCode = '' this.fromAreaCode = ''// 来源库区 diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 5d5db6d8..38acf2ac 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -329,82 +329,91 @@ title: "加载中­....", mask: true }); - var filters = [] - if (this.checkedToday) { - filters.push({ - column: "create_time", - action: "betweeen", - value: this.todayTime - }) + // var filters = [] + // if (this.checkedToday) { + // filters.push({ + // column: "create_time", + // action: "betweeen", + // value: this.todayTime + // }) + // } + + // filters.push({ + // column: "status", + // action: "in", + // value: this.status + // }) + if (params.status) { + this.status = params.status + + }else{ + this.status = "1,2" + } + if(params.creationTime==""){ + this.checkedToday = false; } - filters.push({ - column: "status", - action: "in", - value: this.status - }) - if (params.fromLocationCode) { // 来源库位 this.fromLocation = params.fromLocationCode - filters.push({ - column: "fromLocationCode", - action: "==", - value: params.fromLocationCode - }) + // filters.push({ + // column: "fromLocationCode", + // action: "==", + // value: params.fromLocationCode + // }) }else{ this.fromLocation = '' } if (params.productionLineCode) { // 生产线 this.productionLine = params.productionLineCode - filters.push({ - column: "productionLineCode", - action: "==", - value: params.productionLineCode - }) + // filters.push({ + // column: "productionLineCode", + // action: "==", + // value: params.productionLineCode + // }) }else{ this.productionLine = '' } if (params.itemCode) { // 物料代码 this.filterItemCode = params.itemCode - filters.push({ - column: "itemCode", - action: "like", - value: params.itemCode - }) + // filters.push({ + // column: "itemCode", + // action: "like", + // value: params.itemCode + // }) }else{ this.filterItemCode = '' } if (params.fromAreaCode) { // 来源库区 this.fromAreaCode = params.fromAreaCode - filters.push({ - column: "fromAreaCode", - action: "==", - value: params.fromAreaCode - }) + // filters.push({ + // column: "fromAreaCode", + // action: "==", + // value: params.fromAreaCode + // }) }else{ this.fromAreaCode = '' } if (params.toAreaCode) { // 到库区 this.toAreaCode = params.toAreaCode - filters.push({ - column: "toAreaCode", - action: "==", - value: params.toAreaCode - }) + // filters.push({ + // column: "toAreaCode", + // action: "==", + // value: params.toAreaCode + // }) }else{ this.toAreaCode = '' } - var params = { - filters: filters, - pageNo: 1, - pageSize: 100, - } + // var params = { + // filters: filters, + // pageNo: 1, + // pageSize: 100, + // } this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) // getIssueJobList(params).then(res => { diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index d0c1605f..a711b862 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -281,29 +281,37 @@ title: "加载中­....", mask: true }); - var filters = [] - if (this.checkedToday) { - filters.push({ - column: "create_time", - action: "betweeen", - value: this.todayTime - }) - } + // var filters = [] + // if (this.checkedToday) { + // filters.push({ + // column: "create_time", + // action: "betweeen", + // value: this.todayTime + // }) + // } - filters.push({ - column: "status", - action: "in", - value: this.status - }) + // filters.push({ + // column: "status", + // action: "in", + // value: this.status + // }) + if (params.status) { + this.status = params.status + }else{ + this.status = "1,2" + } + if(params.creationTime==""){ + this.checkedToday = false; + } if (params.fromLocationCode) { // 来源库位 this.fromLocationCode = params.fromLocationCode - filters.push({ - column: "fromLocationCode", - action: "==", - value: params.fromLocationCode - }) + // filters.push({ + // column: "fromLocationCode", + // action: "==", + // value: params.fromLocationCode + // }) }else{ this.fromLocationCode = '' } @@ -311,19 +319,19 @@ if (params.itemCode) { // 物料代码 this.filterItemCode = params.itemCode - filters.push({ - column: "itemCode", - action: "like", - value: params.itemCode - }) + // filters.push({ + // column: "itemCode", + // action: "like", + // value: params.itemCode + // }) }else{ this.filterItemCode = '' } - var params = { - filters: filters, - pageNo: 1, - pageSize: 100, - } + // var params = { + // filters: filters, + // pageNo: 1, + // pageSize: 100, + // } this.getList('refresh', this.fromLocationCode, this.filterItemCode) // getRepleinshJobList(params).then(res => {