From eab06fbfcf4577eac399992b5ab11df3f3ff7456 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 03 十一月 2023 11:44:32 +0800
Subject: [PATCH] 搜索和弹窗按钮公共组件和产品搜索功能优化

---
 src/components/makepager/SearchCommonView.vue |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/makepager/SearchCommonView.vue b/src/components/makepager/SearchCommonView.vue
index c44e993..dd328e8 100644
--- a/src/components/makepager/SearchCommonView.vue
+++ b/src/components/makepager/SearchCommonView.vue
@@ -54,7 +54,7 @@
             <template v-if="selectArr?.length > 0" slot="prepend">
               <div style="display: flex">
                 <div v-for="(val, i) in selectArr" :key="i" class="pre-views">
-                  <span style="margin-left: 5px">{{ val }}</span>
+                  <span style="margin-left: 5px">{{ val.title }}</span>
                   <i @click="delSelectClick(val)" class="el-icon-close" style="margint: 0 5px"></i>
                 </div>
               </div>
@@ -88,9 +88,9 @@
             </div>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
-                v-for="(item, key) in taskStatusMap"
+                v-for="(item, key) in screenArray"
                 :key="key"
-                :command="item.title"
+                :command="{ command: item.title, ...item }"
                 :class="{ selected: status == item.title }"
               >
                 <div class="dropdown-view">
@@ -224,6 +224,14 @@
     showSreen: {
       type: Boolean,
       default: true
+    },
+    searchTaskMap: {
+      type: Array,
+      default: () => []
+    },
+    screenArray: {
+      type: Array,
+      default: () => []
     }
   },
   watch: {
@@ -243,13 +251,12 @@
       searchInput: "",
       searchSelValue: this.searchSel,
       status: "",
-      taskStatusMap: [
-        { value: "0", type: "default", title: "瀹屾垚" },
-        { value: "1", type: "default", title: "灏辩窉" }
-      ],
       selList: [],
       selectArr: []
     }
+  },
+  mounted() {
+    this.selectArr = this.searchTaskMap
   },
   methods: {
     // 鎼滅储
@@ -302,6 +309,7 @@
         this.selectArr.findIndex((e) => e === item),
         1
       )
+      this.$emit("delSelectClick", item)
     }
   }
 }
@@ -400,7 +408,7 @@
         }
       }
       .pre-views {
-        border: 1px solid #ccc;
+        border: 1px solid #c0c0c0;
         font-size: 12px;
         margin-right: 5px;
         border-radius: 3px;

--
Gitblit v1.8.0