diff --git a/src/views/statistics/bxerp/fenjian.vue b/src/views/statistics/bxerp/fenjian.vue index c58051d0..fe006b10 100644 --- a/src/views/statistics/bxerp/fenjian.vue +++ b/src/views/statistics/bxerp/fenjian.vue @@ -179,8 +179,9 @@ export default { }, handleQuery(){ let that = this; + let querys0 = [{field:"wm",value:false,compare:"isnull"},{field:"data__分检_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"分检_批次号"}]; let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__分检_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"分检_批次号"}]]; - let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {},obj5 = {}; + let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {},obj5 = {},obj6 = {},obj7 = {}; obj.field = 'data__分检_批次号'; obj.value = that.query.batch__contains; obj.compare = ''; @@ -201,27 +202,58 @@ export default { obj4.value = that.query.number__contains; obj4.compare = 'contains'; - obj5.field = 'data__分检_操作人'; + obj5.field = 'data__喷码_一体刀_操作人'; obj5.value = that.query.handler; obj5.compare = ''; + obj6.field = 'data__喷码_磨床开台_操作人'; + obj6.value = that.query.handler; + obj6.compare = ''; + + obj7.field = 'data__光锥一体刀_操作人'; + obj7.value = that.query.handler; + obj7.compare = ''; + if(that.query.handler!==''&&that.query.handler!==null){ + querys[1]=querys0; + querys[2]=querys0; + querys[0].push(obj5); + querys[1].push(obj6); + querys[2].push(obj7); + } if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ querys[0].push(obj); + if(that.query.handler!==''&&that.query.handler!==null){ + querys[1].push(obj); + querys[2].push(obj); + } } if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ querys[0].push(obj1); + if(that.query.handler!==''&&that.query.handler!==null){ + querys[1].push(obj1); + querys[2].push(obj1); + } } if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ querys[0].push(obj2); + if(that.query.handler!==''&&that.query.handler!==null){ + querys[1].push(obj2); + querys[2].push(obj2); + } } if(that.query.name__contains!==''&&that.query.name__contains!==null){ querys[0].push(obj3); + if(that.query.handler!==''&&that.query.handler!==null){ + querys[1].push(obj3); + querys[2].push(obj3); + } } if(that.query.number__contains!==''&&that.query.number__contains!==null){ querys[0].push(obj4); - } - if(that.query.handler!==''&&that.query.handler!==null){ - querys[0].push(obj5); + if(that.query.handler!==''&&that.query.handler!==null){ + querys[1].push(obj4); + querys[2].push(obj4); + } } that.params.querys = querys; this.$refs.table.queryData(that.params);