From 9116ac6818b8c421a629975580b1285b18c32ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 5 Jul 2023 10:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=8E=9F=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/StepsCountPlanForm/index.vue | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue index 21d0bb448..4638f2a79 100644 --- a/fe/PC/src/components/StepsCountPlanForm/index.vue +++ b/fe/PC/src/components/StepsCountPlanForm/index.vue @@ -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,7 +454,6 @@ export default { column: _option.column, logic: "And", value: _values.join(','), - hide:_option.hide } _new.push(_item) this.$refs.searchTable.setScreenDataFilters(_new) @@ -469,8 +468,6 @@ 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", @@ -478,29 +475,17 @@ 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)=>{ - // 如果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) @@ -516,7 +501,6 @@ export default { column: _code_option.column, logic: _logic, value: value, - hide:_code_option.hide } list.condition.filters.push(_item) }