fix:毛坯检测汇总查询条件改动
This commit is contained in:
parent
ca99eb54b3
commit
402e30744e
|
@ -189,12 +189,8 @@ export default {
|
||||||
querys:[[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]],
|
querys:[[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
batch__contains:''
|
||||||
batch__contains:'',
|
|
||||||
last_time__gte:'',
|
|
||||||
last_time__lte:'',
|
|
||||||
},
|
},
|
||||||
// apiObj: this.$API.wpm.wpr.query,
|
|
||||||
apiObj: this.$API.wpm.batchstquery,
|
apiObj: this.$API.wpm.batchstquery,
|
||||||
options:[],
|
options:[],
|
||||||
tableData:[],
|
tableData:[],
|
||||||
|
@ -203,43 +199,17 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
|
let querys = [[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {};
|
||||||
obj.field = 'data__毛坯检测_批次号';
|
obj.field = 'batch';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time';
|
|
||||||
obj1.value = that.query.last_time__gte;
|
|
||||||
obj1.compare = 'gte';
|
|
||||||
|
|
||||||
obj2.field = 'last_time';
|
|
||||||
obj2.value = that.query.last_time__lte;
|
|
||||||
obj2.compare = 'lte';
|
|
||||||
|
|
||||||
obj3.field = 'data__毛坯检测_物料名';
|
|
||||||
obj3.value = that.query.name__contains;
|
|
||||||
obj3.compare = '';
|
|
||||||
|
|
||||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
|
|
||||||
querys[0].push(obj1);
|
|
||||||
}
|
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
|
||||||
querys[0].push(obj2);
|
|
||||||
}
|
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
|
||||||
querys[0].push(obj3);
|
|
||||||
}
|
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
getCountQt(data,type){
|
|
||||||
let count_qt = 0,count = 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -557,6 +557,8 @@ export default {
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
this.paramsIn.mlog = "";
|
||||||
|
this.paramsOut.mlog = "";
|
||||||
this.route_code = this.$route.path.split("/")[2];
|
this.route_code = this.$route.path.split("/")[2];
|
||||||
this.paramsIn.mlog = this.mlogId;
|
this.paramsIn.mlog = this.mlogId;
|
||||||
this.paramsOut.mlog = this.mlogId;
|
this.paramsOut.mlog = this.mlogId;
|
||||||
|
|
Loading…
Reference in New Issue