feat:禅道266
This commit is contained in:
parent
d3daab7ea8
commit
591ebf185c
|
|
@ -441,47 +441,90 @@ export default {
|
|||
let that = this;
|
||||
that.params.page = 1;
|
||||
that.params.querys=[];
|
||||
let arr1 = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"}],
|
||||
arr2 = [{field:"data__has_key",compare:"",value:"外观检验_日期"}],
|
||||
arr3 = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"}];
|
||||
let arrays = {};
|
||||
if(that.query.batch != "" && that.query.batch != null && that.query.batch != undefined&&that.query.batch.indexOf(' ')){
|
||||
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){
|
||||
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 = {};
|
||||
obj.value = that.query[key];
|
||||
if(key=='batch'){
|
||||
obj.field = "batch";
|
||||
obj.compare = "contains";
|
||||
}else if(key=='cc_data_start'){
|
||||
if(key=='cc_data_start'){
|
||||
obj.compare = "gte";
|
||||
obj.field = "data__尺寸检验_日期";
|
||||
}else if(key=='cc_data_end'){
|
||||
}
|
||||
if(key=='cc_data_end'){
|
||||
obj.compare = "lte";
|
||||
obj.field = "data__尺寸检验_日期";
|
||||
}else if(key=='shiftcc'){
|
||||
}
|
||||
if(key=='shiftcc'){
|
||||
obj.compare = "";
|
||||
obj.field = "data__尺寸检验_班次";
|
||||
}else if(key=='wg_data_start'){
|
||||
}
|
||||
if(key=='wg_data_start'){
|
||||
obj.compare = "gte";
|
||||
obj.field = "data__外观检验_日期";
|
||||
}else if(key=='wg_data_end'){
|
||||
}
|
||||
if(key=='wg_data_end'){
|
||||
obj.compare = "lte";
|
||||
obj.field = "data__外观检验_日期";
|
||||
}else if(key=='shiftwg'){
|
||||
}
|
||||
if(key=='shiftwg'){
|
||||
obj.compare = "";
|
||||
obj.field = "data__外观检验_班次";
|
||||
}else if(key=='fx_data_start'){
|
||||
}
|
||||
if(key=='fx_data_start'){
|
||||
obj.compare = "gte";
|
||||
obj.field = "data__外观检验_返修_日期";
|
||||
}else if(key=='fx_data_end'){
|
||||
}
|
||||
if(key=='fx_data_end'){
|
||||
obj.compare = "lte";
|
||||
obj.field = "data__外观检验_返修_日期";
|
||||
}
|
||||
arr1.push(obj);
|
||||
arr2.push(obj);
|
||||
arr3.push(obj);
|
||||
if(that.query.batch.indexOf(' ')){
|
||||
let arrs = that.query.batch.split(' ');
|
||||
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();
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue