新增盘点：筛选同类型：多种条件且多选拼接，与选择条件需要同步共存bug问题处理

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

@@ -388,7 +388,11 @@ export default {
       }, {
         value: '!=',
         label: '不等于'
-      }]
+      }],
+      // 用户筛选暂存(如果筛选是code：value值为数组的格式)
+      filterOptionCopyForMutiple:[],
+      // 库位筛选，默认去掉的库位代码
+      filterCodeExclude:'INSPECT,HOLD,TRANSFERONTHEWAY',
     };
   },
   mounted() {
@@ -436,28 +440,8 @@ export default {
     },
     // 点击筛选按钮 20230704
     sxBtnClickHandle(data){
-      // 如果是code回显为一条数据处理
+      // 合并code多选，进行回显 20230705更新
-      let _values = []
+      this.$refs.searchTable.setScreenDataFilters(this.filterOptionCopyForMutiple)
-      let _option = null
-      let _new = []
-      data.forEach((item,key)=>{
-        if(item.column == 'code' && (item.action == '==' || item.action == '!=')){
-          _values.push(item.value)
-          _option = item
-        }else{
-          _new.push(item)
-        }
-      })
-      if(_option){
-        let _item = {
-          action: _option.action,
-          column: _option.column,
-          logic: "And",
-          value: _values.join(','),
-        }
-        _new.push(_item)
-        this.$refs.searchTable.setScreenDataFilters(_new)
-      }
     },
     //确定筛选
     advancedFilter(url, list, TotalCount, data, oldSkipCount) {
@@ -475,36 +459,42 @@ export default {
           value: type_value,
           hide:true
         }
+        // 库位筛选，默认去掉的库位代码
+        let _filter_code = {
+          action: "!=",
+          column: "code",
+          logic: "And",
+          value: this.filterCodeExclude,
+          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 = []
+        // code多选处理   20230705更新
-        let _code_option = null
+        this.filterOptionCopyForMutiple = JSON.parse(JSON.stringify(list.condition.filters))
-        list.condition.filters.forEach((item,key)=>{
+        let _filters = []
-          // if(item.action == '!=' && item.column == 'type' && item.value == type_value){
+        // 拆分code多选，回传给接口
-          //   item.hide = true
+        this.filterOptionCopyForMutiple.forEach((option)=>{
-          // }
+          if(option.column == 'code'){
-          // code多选（只针对与等于和不等于）20230704
+            option.value.split(',').forEach((val,val_index)=>{
-          if(item.column == 'code'){
+              // 如果是第一位 则是用户选择的条件 否则判断是否为!= (And) 还是 == （Or）
-            _code_value = item.value.split(',')
+              let _logic = val_index == 0 ? option.logic : (option.action == '!=' ? 'And' : 'Or')
-            _code_option = item
+              if((val || val == 0) && val.length > 0){
-            list.condition.filters.splice(key,1)
+                let _item = {
-          }
+                  action: option.action,
-        })
+                  column: option.column,
-        // 拆分code多选，回传给接口  20230704
+                  logic: _logic,
-        _code_value.forEach((value,index)=>{
+                  value: val,
-          // 不等于情况（And）,等于情况（如果key等于0是 And,其余的是 Or）
+                }
-          let _logic = (_code_option.action == '!=') ? "And" : (index == 0 ? "And" : "Or")
+                _filters.push(_item)
-          if(value && value.length > 0){
+              }
-            let _item = {
+            })
-              action: _code_option.action,
+          }else{
-              column: _code_option.column,
+            _filters.push(option)
-              logic: _logic,
-              value: value,
-            }
-            list.condition.filters.push(_item)
           }
         })
+        list.condition.filters = _filters
         getPageList(list, url)
           .then((res) => {
             this[data] = res.items;