From 2faed2463d8a878738927472080027e6630b547a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 18 Jun 2024 15:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/StepsCountPlanForm/index.vue   | 41 ++++++++++++++++++-
 .../src/components/conditionFilters/index.vue |  9 ++--
 fe/PC/src/components/searchPage/index.vue     |  5 +++
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue
index 2ec5a158f..4fdc78d1c 100644
--- a/fe/PC/src/components/StepsCountPlanForm/index.vue
+++ b/fe/PC/src/components/StepsCountPlanForm/index.vue
@@ -81,6 +81,7 @@
             oldSkipCountLocation
           )"
         @tableButtonClick="addFormData(arguments)"
+        @filterColumnChange="filterColumnChange"
       ></searchPage>
       <!-- @filterBtnClickHandle="filterBtnClickHandle" -->
       <!-- 其他参数 -->
@@ -391,7 +392,7 @@ export default {
         label: '不等于'
       }, {
         value: 'In',
-        label: '包含',
+        label: '存在',
         notShow:true
       }],
       // 用户筛选暂存(如果筛选是code：value值为数组的格式)
@@ -404,6 +405,44 @@ export default {
     this.session = JSON.parse(JSON.stringify(this.CreateFormData));
   },
   methods: {
+    filterColumnChange(item){
+      if(item.column == "code"){
+        this.filterActionOptions=[{
+          value: '==',
+          label: '等于'
+        }, {
+          value: '!=',
+          label: '不等于'
+        }, {
+          value: 'In',
+          label: '含有',
+          notShow:true
+        },{
+          value: 'Like',
+          label: '包含'
+        }]
+        this.$nextTick(()=>{
+          this.$forceUpdate()
+        })
+      }
+      else if(item.column == "type"){
+        this.filterActionOptions=[{
+          value: '==',
+          label: '等于'
+        }, {
+          value: '!=',
+          label: '不等于'
+        },{
+          value: 'In',
+          label: '含有',
+          notShow:true
+        }]
+        this.$nextTick(()=>{
+          this.$forceUpdate()
+        })
+      }
+      if(item.action == "Like"){item.action = '=='}
+    },
     // 初始化库位筛选列表数据，目的：pda的库位类型不可以选择线边库位
     initSearchPageTableColums(){
       // let _list = JSON.parse(JSON.stringify(this.$isTableColumns.Location));
diff --git a/fe/PC/src/components/conditionFilters/index.vue b/fe/PC/src/components/conditionFilters/index.vue
index 56e12e386..64130ba81 100644
--- a/fe/PC/src/components/conditionFilters/index.vue
+++ b/fe/PC/src/components/conditionFilters/index.vue
@@ -216,11 +216,9 @@ export default {
   // }
 },
 watch: {
-  // InputOrSelect (val) {
-  //   if (val) {
-  //     this.InputOrSelectHide = val
-  //   }
-  // }
+  filterActionOptions(data) {
+    this.options.action = data
+  }
 },
 computed: {
 },
@@ -305,6 +303,7 @@ methods: {
   filterColumnChange(item){
     // 筛选对象更改时候，清空value值
     item.value = ""
+    this.$emit("filterColumnChange", item)
   },
   tableColumnsOptions(val) {
     const data = JSON.parse(JSON.stringify(val));
diff --git a/fe/PC/src/components/searchPage/index.vue b/fe/PC/src/components/searchPage/index.vue
index 79eb63830..33b2eb6e2 100644
--- a/fe/PC/src/components/searchPage/index.vue
+++ b/fe/PC/src/components/searchPage/index.vue
@@ -52,6 +52,7 @@
         :tableColumns="searchTableColumns"
         @screenFormClick="screenFormClick"
         @screenDelete="screenDelete"
+        @filterColumnChange="filterColumnChange"
         @screenPush="screenPush"
         :filterActionOptions="filterActionOptions"
       ></conditionFilters>
@@ -189,6 +190,10 @@ export default {
     }
   },
   methods: {
+    // 高级筛选-选择对象更改
+    filterColumnChange(item){
+      this.$emit("filterColumnChange", item)
+    },
     //table选择当前行数据
     prepareFormData (val) {
       this.$parent.isMoreSelectTable = this.isMoreSelectTable