Browse Source

库位筛选,默认去掉的库位代码暂存

dev_web_online
安虹睿 2 years ago
parent
commit
d73b5785f7
  1. 24
      fe/PC/src/components/StepsCountPlanForm/index.vue
  2. 2
      fe/PC/src/components/searchPage/index.vue

24
fe/PC/src/components/StepsCountPlanForm/index.vue

@ -388,7 +388,7 @@ export default {
}, { }, {
value: '!=', value: '!=',
label: '不等于' label: '不等于'
}] }],
}; };
}, },
mounted() { mounted() {
@ -454,6 +454,7 @@ export default {
column: _option.column, column: _option.column,
logic: "And", logic: "And",
value: _values.join(','), value: _values.join(','),
hide:_option.hide
} }
_new.push(_item) _new.push(_item)
this.$refs.searchTable.setScreenDataFilters(_new) this.$refs.searchTable.setScreenDataFilters(_new)
@ -468,6 +469,8 @@ export default {
// Excel(this.CreateFormData.requestType == 1)2 // Excel(this.CreateFormData.requestType == 1)2
// Excel(this.CreateFormData.requestType != 1)线5 // Excel(this.CreateFormData.requestType != 1)线5
let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' let type_value = this.CreateFormData.requestType == 1 ? '2' : '5'
//
let code_value = 'INSPECT,HOLD,TRANSFERONTHEWAY'
let _filter = { let _filter = {
action: "!=", action: "!=",
column: "type", column: "type",
@ -475,15 +478,27 @@ export default {
value: type_value, value: type_value,
hide:true hide:true
} }
let _filter_code = {
action: "!=",
column: "code",
logic: "And",
value: code_value,
hide:true
}
if(this.pageListLocation.condition.filters.length <= 0){ if(this.pageListLocation.condition.filters.length <= 0){
this.pageListLocation.condition.filters.push(_filter) this.pageListLocation.condition.filters.push(_filter)
this.pageListLocation.condition.filters.push(_filter_code)
} }
let _code_value = [] let _code_value = []
let _code_option = null let _code_option = null
list.condition.filters.forEach((item,key)=>{ list.condition.filters.forEach((item,key)=>{
if(item.action == '!=' && item.column == 'type' && item.value == type_value){ // searchPage255delete element.hide
item.hide = true // 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
// }
// code20230704 // code20230704
if(item.column == 'code' ){ if(item.column == 'code' ){
_code_value = item.value.split(',') _code_value = item.value.split(',')
@ -501,6 +516,7 @@ export default {
column: _code_option.column, column: _code_option.column,
logic: _logic, logic: _logic,
value: value, value: value,
hide:_code_option.hide
} }
list.condition.filters.push(_item) list.condition.filters.push(_item)
} }

2
fe/PC/src/components/searchPage/index.vue

@ -252,7 +252,7 @@ export default {
if (valid) { if (valid) {
this.supplierItemPage.condition.filters = [] this.supplierItemPage.condition.filters = []
this.screenData.filters.forEach((element, index) => { this.screenData.filters.forEach((element, index) => {
delete element.hide // delete element.hide //todo:514-519
this.supplierItemPage.condition.filters.push(element) this.supplierItemPage.condition.filters.push(element)
}) })
this.dialog.screenDialog = false; this.dialog.screenDialog = false;

Loading…
Cancel
Save