diff --git a/src/views/statistics/bxerp/zhongjian1Total.vue b/src/views/statistics/bxerp/zhongjian1Total.vue index 5b1d2082..b479dd12 100644 --- a/src/views/statistics/bxerp/zhongjian1Total.vue +++ b/src/views/statistics/bxerp/zhongjian1Total.vue @@ -21,11 +21,27 @@ clearable style="width: 200px;" > - + + + + map.set(u.id, u)); + this.operators = [...map.values()]; + } catch (e) { + console.error('获取操作员失败', e); + } + }, handleQuery(){ let that = this; - let querys = [[{field:"data__has_key",compare:"",value:"中检一_日期"}]]; - let obj = {},obj1 = {},obj2 = {},obj3 = {}; - obj.field = 'data__中检一_批次号'; - obj.value = that.query.batch__contains; - obj.compare = ''; + let baseConditions = [{field:"data__has_key",compare:"",value:"中检一_日期"}]; - obj1.field = 'data__中检一_日期'; - obj1.value = that.query.last_time__gte; - obj1.compare = 'gte'; + let pushIf = (field, value, compare) => { + if (value !== '' && value !== null) { + baseConditions.push({ field, value, compare }); + } + }; + pushIf('data__中检一_批次号', that.query.batch__contains, ''); + pushIf('data__中检一_日期', that.query.last_time__gte, 'gte'); + pushIf('data__中检一_日期', that.query.last_time__lte, 'lte'); + pushIf('material_start__name', that.query.name__contains, 'contains'); - obj2.field = 'data__中检一_日期'; - obj2.value = that.query.last_time__lte; - obj2.compare = 'lte'; - - obj3.field = 'material_start__name'; - obj3.value = that.query.name__contains; - obj3.compare = 'contains'; - - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - 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); + let querys; + if (that.query.operator !== '' && that.query.operator !== null) { + querys = [ + [...baseConditions, { field: 'data__喷码_一体刀_操作人', value: that.query.operator, compare: '' }], + [...baseConditions, { field: 'data__喷码_磨床开台_操作人', value: that.query.operator, compare: '' }], + ]; + } else { + querys = [baseConditions]; } that.params.querys = querys; this.$refs.table.queryData(that.params);