From 74dfc64fee47f49bea6b070d06005e7d790ac91d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 12 十月 2023 09:52:15 +0800
Subject: [PATCH] feat: 合同管理、服务合同、客户服务单、服务回访单 自动生成编号编辑回显时显示对应编码

---
 src/components/makepager/SearchCommonView.vue |   47 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/components/makepager/SearchCommonView.vue b/src/components/makepager/SearchCommonView.vue
index c53477c..856afb5 100644
--- a/src/components/makepager/SearchCommonView.vue
+++ b/src/components/makepager/SearchCommonView.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="search-list">
     <div class="search-top">
-      <div class="query-class">
+      <!-- <div class="query-class">
         <div class="query-class-title">鏌ヨ鍒嗙被</div>
         <el-select v-model="queryClassValue" placeholder="璇烽�夋嫨" class="query-class-sel" size="mini">
           <el-option v-for="item in queryClassOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -10,17 +10,22 @@
         <div class="query-class-btn" @click="queryClassClick">
           <i class="el-icon-setting"></i>
         </div>
-      </div>
+      </div> -->
       <div class="search">
-        <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="searchInput" class="input-with-select" clearable>
+        <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model.trim="searchInput" class="input-with-select" clearable>
           <el-select v-model="searchSelValue" slot="prepend" placeholder="璇烽�夋嫨" class="search-sel">
-            <el-option v-for="item in searchOptions" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
+            <el-option v-for="item in searchOptions" :key="item.value" :label="item.label" :value="item"> </el-option>
           </el-select>
-          <i slot="suffix" class="el-icon-search" style="cursor: pointer" @click="searchClick"></i>
+          <!-- <i slot="suffix" class="el-icon-search" style="cursor: pointer" @click="searchClick"></i> -->
         </el-input>
       </div>
-      <div class="other-search">
+      <div class="btn">
+        <el-button type="primary" size="mini" @click="searchClick" icon="el-icon-search" style="margin-right: 5px"
+          >鎼滅储</el-button
+        >
+        <el-button size="mini" icon="el-icon-refresh-left" @click="resetClick">閲嶇疆</el-button>
+      </div>
+      <!-- <div class="other-search">
         <div class="other-search-high" @click="highSearchClick">
           <div class="high-icon"><i class="el-icon-postcard"></i></div>
           <div>楂樼骇鏌ユ壘</div>
@@ -33,9 +38,9 @@
           <div class="high-icon"><i class="el-icon-discount"></i></div>
           <div>鏍囩鏌ユ壘</div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <div v-if="isTileSearch" class="search-bottom">
+    <!-- <div v-if="isTileSearch" class="search-bottom">
       <el-table :data="tileSearchData" style="width: 100%">
         <el-table-column prop="selField" label="閫夋嫨瀛楁" width="430">
           <template slot-scope="scope">
@@ -82,7 +87,7 @@
           <el-button size="small">鍙栨秷</el-button>
         </div>
       </div>
-    </div>
+    </div> -->
     <!-- 鏌ヨ鍒嗙被寮圭獥 -->
     <QueryClassSettingDialog v-if="queryClassSetConfig.visible" :editCommonConfig="queryClassSetConfig" />
   </div>
@@ -104,8 +109,13 @@
       default: () => []
     },
     searchSel: {
-      type: String,
-      default: "1"
+      type: Object,
+      default: () => {
+        return {
+          value: "name",
+          label: ""
+        }
+      }
     },
     searchOptions: {
       type: Array,
@@ -159,7 +169,12 @@
       }
     },
     searchClick() {
-      console.log("sssssssssss")
+      this.$emit("searchClick", this.searchSelValue, this.searchInput)
+    },
+    resetClick() {
+      this.searchSelValue = this.searchSel
+      this.searchInput = ""
+      this.$emit("resetClick")
     },
     // 楂樼骇鏌ユ壘
     highSearchClick() {},
@@ -194,6 +209,7 @@
   color: #333;
   .search-top {
     display: flex;
+    align-items: center;
     .query-class {
       display: flex;
       height: 60px;
@@ -219,6 +235,9 @@
       .el-icon-search {
         margin-top: 7px;
       }
+    }
+    .btn {
+      margin-left: 10px;
     }
     .other-search {
       display: flex;
@@ -286,7 +305,7 @@
   }
   .search {
     .el-select .el-input {
-      width: 115px;
+      width: 130px;
     }
     .input-with-select .el-input-group__prepend {
       background-color: #fff;

--
Gitblit v1.8.0