|
|
@ -388,7 +388,7 @@ export default { |
|
|
|
}, { |
|
|
|
value: '!=', |
|
|
|
label: '不等于' |
|
|
|
}] |
|
|
|
}], |
|
|
|
}; |
|
|
|
}, |
|
|
|
mounted() { |
|
|
@ -441,7 +441,7 @@ export default { |
|
|
|
let _option = null |
|
|
|
let _new = [] |
|
|
|
data.forEach((item,key)=>{ |
|
|
|
if(item.column == 'code' && (item.action == '==' || item.action == '!=')){ |
|
|
|
if( item.column == 'code' && (item.action == '==' || item.action == '!=') ){ |
|
|
|
_values.push(item.value) |
|
|
|
_option = item |
|
|
|
}else{ |
|
|
@ -454,6 +454,7 @@ export default { |
|
|
|
column: _option.column, |
|
|
|
logic: "And", |
|
|
|
value: _values.join(','), |
|
|
|
hide:_option.hide |
|
|
|
} |
|
|
|
_new.push(_item) |
|
|
|
this.$refs.searchTable.setScreenDataFilters(_new) |
|
|
@ -468,6 +469,8 @@ export default { |
|
|
|
// 如果是Excel盘点类型(this.CreateFormData.requestType == 1),过滤原材料2 |
|
|
|
// 如果不是Excel盘点类型(this.CreateFormData.requestType != 1),过滤线边仓数据5 |
|
|
|
let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' |
|
|
|
// 库位筛选,默认去掉的库位代码 |
|
|
|
let code_value = 'INSPECT,HOLD,TRANSFERONTHEWAY' |
|
|
|
let _filter = { |
|
|
|
action: "!=", |
|
|
|
column: "type", |
|
|
@ -475,17 +478,29 @@ export default { |
|
|
|
value: type_value, |
|
|
|
hide:true |
|
|
|
} |
|
|
|
let _filter_code = { |
|
|
|
action: "!=", |
|
|
|
column: "code", |
|
|
|
logic: "And", |
|
|
|
value: code_value, |
|
|
|
hide:true |
|
|
|
} |
|
|
|
if(this.pageListLocation.condition.filters.length <= 0){ |
|
|
|
this.pageListLocation.condition.filters.push(_filter) |
|
|
|
this.pageListLocation.condition.filters.push(_filter_code) |
|
|
|
} |
|
|
|
let _code_value = [] |
|
|
|
let _code_option = null |
|
|
|
list.condition.filters.forEach((item,key)=>{ |
|
|
|
if(item.action == '!=' && item.column == 'type' && item.value == type_value){ |
|
|
|
item.hide = true |
|
|
|
} |
|
|
|
// 如果searchPage组件打开了255行delete element.hide,可打开以下注释 |
|
|
|
// if(item.action == '!=' && item.column == 'type' && item.value == type_value){ |
|
|
|
// item.hide = true |
|
|
|
// } |
|
|
|
// if(item.action == '!=' && item.column == 'code' && (item.value == 'INSPECT' || item.value == 'HOLD' || item.value == 'TRANSFERONTHEWAY')){ |
|
|
|
// item.hide = true |
|
|
|
// } |
|
|
|
// code多选(只针对与等于和不等于)20230704 |
|
|
|
if(item.column == 'code'){ |
|
|
|
if(item.column == 'code' ){ |
|
|
|
_code_value = item.value.split(',') |
|
|
|
_code_option = item |
|
|
|
list.condition.filters.splice(key,1) |
|
|
@ -501,6 +516,7 @@ export default { |
|
|
|
column: _code_option.column, |
|
|
|
logic: _logic, |
|
|
|
value: value, |
|
|
|
hide:_code_option.hide |
|
|
|
} |
|
|
|
list.condition.filters.push(_item) |
|
|
|
} |
|
|
|