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 @@
- {{ $t('query') }} + {{ $t('query') }} {{ $t('reset') }}
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 @@
- + @@ -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 @@

{{ arrItem.searchContent }}

- +
@@ -38,7 +38,7 @@