From f355235b4eb47b3161a2cd6aeb48c7296f990cf9 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 8 Dec 2023 19:27:38 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=B8=80=E8=88=AC=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E5=92=8C=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/search/AdvancedSearch.vue      |  2 +-
 src/views/dashboard/search/GeneralSearch.vue       | 14 +++++++++++++-
 .../search/modules/SearchHistoryModal.vue          |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue
index 99888b1d..6e5a2cc2 100644
--- a/src/views/dashboard/search/AdvancedSearch.vue
+++ b/src/views/dashboard/search/AdvancedSearch.vue
@@ -122,7 +122,7 @@
         </a-row>
       </a-form>
       <div class="table-page-search-submitButtons">
-        <a-button icon="search" type="primary" @click="searchQuery" :loading="loading">{{ $t('query') }}</a-button>
+        <a-button icon="search" type="primary" @click="searchQuery" :loading="loading" v-has="'dashboard:advancedSearch:search'">{{ $t('query') }}</a-button>
         <a-button icon="reload" type="primary" ghost style="margin-left: 8px" @click="searchReset" :loading="loading">{{ $t('reset') }}</a-button>
       </div>
       <div class="table-wrapper">
diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue
index 60a9a7b4..2c6c9635 100644
--- a/src/views/dashboard/search/GeneralSearch.vue
+++ b/src/views/dashboard/search/GeneralSearch.vue
@@ -5,11 +5,12 @@
       <div class="top-search-div">
         <div class="top-search-div-content">
           <a-input-search class="input-search"
+                          :class="!isHasPermission('dashboard:generalSearch:search') ? 'search-no-btn' : ''"
                           :placeholder="$t('pleaseEnter')+$t('dashboard.generalSearch.queryCondition')"
                           v-model="searchValue"
                           :maxLength="50"
                           @search="onInputSearch()">
-            <a-button type="primary" slot="enterButton">
+            <a-button v-has="'dashboard:generalSearch:search'" type="primary" slot="enterButton">
               <i class="iconfont icon-Searchbar_Search_icon"></i>
             </a-button>
           </a-input-search>
@@ -116,6 +117,7 @@ import {
   generalSearchTitleSearch,
   generalSearchFullTextSearch
 } from '@/api/dashboard'
+import { isHasPermission } from '@/utils/hasPermission'
 
 export default {
   name: 'GeneralSearch',
@@ -193,6 +195,7 @@ export default {
     }
   },
   methods: {
+    isHasPermission,
     // 获取要显示数量的筛选条件的数据
     initFilterData (callback) {
       const param = {}
@@ -467,6 +470,15 @@ export default {
   display: flex;
   flex-direction: column;
 }
+// 搜索没有按钮
+.search-no-btn {
+  /deep/ .ant-input {
+    border-right: 1px solid #d9d9d9;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+  }
+}
+
 // 头部搜索区域
 .top-search-div {
   width: 100%;
diff --git a/src/views/dashboard/search/modules/SearchHistoryModal.vue b/src/views/dashboard/search/modules/SearchHistoryModal.vue
index 92e460aa..4df763fc 100644
--- a/src/views/dashboard/search/modules/SearchHistoryModal.vue
+++ b/src/views/dashboard/search/modules/SearchHistoryModal.vue
@@ -25,7 +25,7 @@
                   </template>
                   <p class="search-content" @click="clickSearchContent(arrItem)">{{ arrItem.searchContent }}</p>
                 </a-tooltip>
-                <i v-has="'generalSearch:searchHistory:delete'" class="iconfont icon-shanchu_" @click="handleDelete(arrItem.id)"></i>
+                <i v-has="'dashboard:generalSearch:searchHistory'" class="iconfont icon-shanchu_" @click="handleDelete(arrItem.id)"></i>
               </div>
             </template>
           </a-checkbox-group>
@@ -38,7 +38,7 @@
     </a-spin>
 
     <template v-slot:footer>
-      <a-button v-has="'generalSearch:searchHistory:batchDelete'" type="primary" ghost @click="handleBatchDel">{{ $t('batchDelete') }}</a-button>
+      <a-button v-has="'dashboard:generalSearch:searchHistory'" type="primary" ghost @click="handleBatchDel">{{ $t('batchDelete') }}</a-button>
       <a-button @click="handleCancel">{{ $t('close') }}</a-button>
     </template>
   </j-modal>