feat:禅道266

This commit is contained in:
shijing 2025-12-30 13:45:07 +08:00
parent d3daab7ea8
commit 591ebf185c
1 changed files with 62 additions and 19 deletions

View File

@ -441,47 +441,90 @@ export default {
let that = this; let that = this;
that.params.page = 1; that.params.page = 1;
that.params.querys=[]; that.params.querys=[];
let arr1 = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"}], let arrays = {};
arr2 = [{field:"data__has_key",compare:"",value:"外观检验_日期"}], if(that.query.batch != "" && that.query.batch != null && that.query.batch != undefined&&that.query.batch.indexOf(' ')){
arr3 = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"}]; let arrs = that.query.batch.split(' ');
console.log('arrs',arrs);
arrs.forEach((item, index) => {
let obj = {};
obj.value = item;
obj.field = "batch";
obj.compare = "contains";
let newArrayName1 = 'arr1' + index;
let newArrayName2 = 'arr2' + index;
let newArrayName3 = 'arr3' + index;
console.log('obj',obj);
arrays[newArrayName1] = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"},obj];
arrays[newArrayName2] = [{field:"data__has_key",compare:"",value:"外观检验_日期"},obj];
arrays[newArrayName3] = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"},obj];
});
}else{
let obj = {};
obj.value =that.query.batch;
obj.field = "batch";
obj.compare = "contains";
arrays.arr1=[{field:"data__has_key",compare:"",value:"尺寸检验_日期"},obj];
arrays.arr2=[{field:"data__has_key",compare:"",value:"外观检验_日期"},obj];
arrays.arr3=[{field:"data__has_key",compare:"",value:"外观检验_返修_日期"},obj];
}
console.log('arrays',arrays);
for(let key in that.query){ for(let key in that.query){
if(that.query[key] != ""&&that.query[key] != null&&that.query[key] != undefined){ if(that.query[key] != ""&&that.query[key] != null&&that.query[key] != undefined&&key!='batch'){
let obj = {}; let obj = {};
obj.value = that.query[key]; obj.value = that.query[key];
if(key=='batch'){ if(key=='cc_data_start'){
obj.field = "batch";
obj.compare = "contains";
}else if(key=='cc_data_start'){
obj.compare = "gte"; obj.compare = "gte";
obj.field = "data__尺寸检验_日期"; obj.field = "data__尺寸检验_日期";
}else if(key=='cc_data_end'){ }
if(key=='cc_data_end'){
obj.compare = "lte"; obj.compare = "lte";
obj.field = "data__尺寸检验_日期"; obj.field = "data__尺寸检验_日期";
}else if(key=='shiftcc'){ }
if(key=='shiftcc'){
obj.compare = ""; obj.compare = "";
obj.field = "data__尺寸检验_班次"; obj.field = "data__尺寸检验_班次";
}else if(key=='wg_data_start'){ }
if(key=='wg_data_start'){
obj.compare = "gte"; obj.compare = "gte";
obj.field = "data__外观检验_日期"; obj.field = "data__外观检验_日期";
}else if(key=='wg_data_end'){ }
if(key=='wg_data_end'){
obj.compare = "lte"; obj.compare = "lte";
obj.field = "data__外观检验_日期"; obj.field = "data__外观检验_日期";
}else if(key=='shiftwg'){ }
if(key=='shiftwg'){
obj.compare = ""; obj.compare = "";
obj.field = "data__外观检验_班次"; obj.field = "data__外观检验_班次";
}else if(key=='fx_data_start'){ }
if(key=='fx_data_start'){
obj.compare = "gte"; obj.compare = "gte";
obj.field = "data__外观检验_返修_日期"; obj.field = "data__外观检验_返修_日期";
}else if(key=='fx_data_end'){ }
if(key=='fx_data_end'){
obj.compare = "lte"; obj.compare = "lte";
obj.field = "data__外观检验_返修_日期"; obj.field = "data__外观检验_返修_日期";
} }
arr1.push(obj); if(that.query.batch.indexOf(' ')){
arr2.push(obj); let arrs = that.query.batch.split(' ');
arr3.push(obj); arrs.forEach((item,index)=>{
let newArrayName1 = 'arr1' + index;
let newArrayName2 = 'arr2' + index;
let newArrayName3 = 'arr3' + index;
arrays[newArrayName1].push(obj);
arrays[newArrayName2].push(obj);
arrays[newArrayName3].push(obj);
});
}else{
arrays.arr1.push(obj);
arrays.arr2.push(obj);
arrays.arr3.push(obj);
}
} }
} }
that.params.querys.push(arr1,arr2,arr3); for(let key in arrays){
that.params.querys.push(arrays[key]);
}
this.getList(); this.getList();
}, },
getSummaries({ columns, data }) { getSummaries({ columns, data }) {