Browse Source

HL-5420发料任务、物料任务-筛选点击“重置”按钮时,没有清空只看当天和只看待处理按钮的状态

ljc_0803
wangyufei 1 month ago
parent
commit
6bbef5511c
  1. 2
      src/mycomponents/job/jobFilter.vue
  2. 95
      src/pages/issue/job/issueJob.vue
  3. 64
      src/pages/repleinsh/job/repleinshJob.vue

2
src/mycomponents/job/jobFilter.vue

@ -198,6 +198,8 @@
return params; return params;
}, },
reset(){ reset(){
this.checkedTodayModel = false
this.checkedWaitModel = false
this.productionLineCode = '' this.productionLineCode = ''
this.fromLocationCode = '' this.fromLocationCode = ''
this.fromAreaCode = ''// this.fromAreaCode = ''//

95
src/pages/issue/job/issueJob.vue

@ -329,82 +329,91 @@
title: "加载中­....", title: "加载中­....",
mask: true mask: true
}); });
var filters = [] // var filters = []
if (this.checkedToday) { // if (this.checkedToday) {
filters.push({ // filters.push({
column: "create_time", // column: "create_time",
action: "betweeen", // action: "betweeen",
value: this.todayTime // 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) { if (params.fromLocationCode) {
// //
this.fromLocation = params.fromLocationCode this.fromLocation = params.fromLocationCode
filters.push({ // filters.push({
column: "fromLocationCode", // column: "fromLocationCode",
action: "==", // action: "==",
value: params.fromLocationCode // value: params.fromLocationCode
}) // })
}else{ }else{
this.fromLocation = '' this.fromLocation = ''
} }
if (params.productionLineCode) { if (params.productionLineCode) {
// 线 // 线
this.productionLine = params.productionLineCode this.productionLine = params.productionLineCode
filters.push({ // filters.push({
column: "productionLineCode", // column: "productionLineCode",
action: "==", // action: "==",
value: params.productionLineCode // value: params.productionLineCode
}) // })
}else{ }else{
this.productionLine = '' this.productionLine = ''
} }
if (params.itemCode) { if (params.itemCode) {
// //
this.filterItemCode = params.itemCode this.filterItemCode = params.itemCode
filters.push({ // filters.push({
column: "itemCode", // column: "itemCode",
action: "like", // action: "like",
value: params.itemCode // value: params.itemCode
}) // })
}else{ }else{
this.filterItemCode = '' this.filterItemCode = ''
} }
if (params.fromAreaCode) { if (params.fromAreaCode) {
// //
this.fromAreaCode = params.fromAreaCode this.fromAreaCode = params.fromAreaCode
filters.push({ // filters.push({
column: "fromAreaCode", // column: "fromAreaCode",
action: "==", // action: "==",
value: params.fromAreaCode // value: params.fromAreaCode
}) // })
}else{ }else{
this.fromAreaCode = '' this.fromAreaCode = ''
} }
if (params.toAreaCode) { if (params.toAreaCode) {
// //
this.toAreaCode = params.toAreaCode this.toAreaCode = params.toAreaCode
filters.push({ // filters.push({
column: "toAreaCode", // column: "toAreaCode",
action: "==", // action: "==",
value: params.toAreaCode // value: params.toAreaCode
}) // })
}else{ }else{
this.toAreaCode = '' this.toAreaCode = ''
} }
var params = { // var params = {
filters: filters, // filters: filters,
pageNo: 1, // pageNo: 1,
pageSize: 100, // pageSize: 100,
} // }
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
// getIssueJobList(params).then(res => { // getIssueJobList(params).then(res => {

64
src/pages/repleinsh/job/repleinshJob.vue

@ -281,29 +281,37 @@
title: "加载中­....", title: "加载中­....",
mask: true mask: true
}); });
var filters = [] // var filters = []
if (this.checkedToday) { // if (this.checkedToday) {
filters.push({ // filters.push({
column: "create_time", // column: "create_time",
action: "betweeen", // action: "betweeen",
value: this.todayTime // value: this.todayTime
}) // })
} // }
filters.push({ // filters.push({
column: "status", // column: "status",
action: "in", // action: "in",
value: this.status // value: this.status
}) // })
if (params.status) {
this.status = params.status
}else{
this.status = "1,2"
}
if(params.creationTime==""){
this.checkedToday = false;
}
if (params.fromLocationCode) { if (params.fromLocationCode) {
// //
this.fromLocationCode = params.fromLocationCode this.fromLocationCode = params.fromLocationCode
filters.push({ // filters.push({
column: "fromLocationCode", // column: "fromLocationCode",
action: "==", // action: "==",
value: params.fromLocationCode // value: params.fromLocationCode
}) // })
}else{ }else{
this.fromLocationCode = '' this.fromLocationCode = ''
} }
@ -311,19 +319,19 @@
if (params.itemCode) { if (params.itemCode) {
// //
this.filterItemCode = params.itemCode this.filterItemCode = params.itemCode
filters.push({ // filters.push({
column: "itemCode", // column: "itemCode",
action: "like", // action: "like",
value: params.itemCode // value: params.itemCode
}) // })
}else{ }else{
this.filterItemCode = '' this.filterItemCode = ''
} }
var params = { // var params = {
filters: filters, // filters: filters,
pageNo: 1, // pageNo: 1,
pageSize: 100, // pageSize: 100,
} // }
this.getList('refresh', this.fromLocationCode, this.filterItemCode) this.getList('refresh', this.fromLocationCode, this.filterItemCode)
// getRepleinshJobList(params).then(res => { // getRepleinshJobList(params).then(res => {

Loading…
Cancel
Save