[update] 修改主分支高级检索

src/api/dashboard.js

@@ -15,11 +15,11 @@ const getSearchParamNumFullText = (params) => getAction('/home/lawsHomeSearch/ge
 const generalSearchFullTextSearch = (params) => getAction('/home/lawsHomeSearch/getNormalSearchAllPage', params)
 
 // 国内标准的高级搜索，查询搜索条件
-const getDomesticStandardQuery = (params) => getAction('/laws/standard/domestic/getQueryCondition', params)
+const getDomesticStandardQuery = (params) => getAction('/laws/standard/domestic/getAdvancedQueryCondition', params)
 // 国外标准的高级搜索，查询搜索条件
-const getOverseasStandardQuery = (params) => getAction('/laws/standard/overseas/getQueryCondition', params)
+const getOverseasStandardQuery = (params) => getAction('/laws/standard/overseas/getAdvancedQueryCondition', params)
 // 企业标准的高级搜索，查询搜索条件
-const getEnterStandardQuery = (params) => getAction('/laws/standard/enterprise/getQueryCondition', params)
+const getEnterStandardQuery = (params) => getAction('/laws/standard/enterprise/getAdvancedQueryCondition', params)
 
 // 国内标准的高级搜索,查询列表数据
 const getDomesticStandardList = (params) => postAction('/laws//standard/domestic/getCommonPage', params)

src/views/dashboard/search/AdvancedSearch.vue

@@ -1,5 +1,6 @@
 <template>
   <a-card :bordered="false">
+    <a-spin :spinning="loading">
       <!--  一般检索和高级检索的tab切换  -->
       <div class="tab-wrapper">
         <span class="tab-title" @click="clickGeneralSearch">一般检索</span>
@@ -131,11 +132,11 @@
           :columns="columns"
           :dataSource="dataSource"
           :pagination="ipagination"
-        :loading="loading"
           @change="handleTableChange">
 
         </j-table>
       </div>
+    </a-spin>
   </a-card>
 </template>
 
@@ -297,11 +298,14 @@ export default {
       const params = {
         module: this.currStandardType
       }
+      this.loading = true
       this.getQueryConditionFunc(params).then((res) => {
         if (res.success) {
           this.searchList = res.result
           this.getOptionsData() // 获取下拉数据
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
     /**
@@ -346,12 +350,6 @@ export default {
       return filterObj(param)
     },
     loadData (arg) {
-      const flag = Object.values(this.queryParam).some(v => !!v || v === 0)
-      if (!flag) {
-        // 提示至少填写一项
-        this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
-        return
-      }
       if (arg === 1) {
         this.ipagination.current = 1
       }
@@ -387,12 +385,19 @@ export default {
     },
     // 查询
     searchQuery () {
+      const flag = Object.values(this.queryParam).some(v => !!v || v === 0)
+      if (!flag) {
+        // 提示至少填写一项
+        this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+        return
+      }
       this.loadData(1)
     },
     // 重置
     searchReset () {
       this.queryParam = {}
-      this.loadData(1)
+      this.dataSource = []
+      this.ipagination.total = 0
     }
   }
 }

src/views/system/tags/modules/StandardDrawer.vue

@@ -173,11 +173,11 @@
               </a-col>
             </template>
             <!--其它模块展示-->
-            <template>
+            <template v-if="isSearch">
               <p class="tag-info">{{ $t('system.tag.displayOtherModules') }}</p>
               <a-divider dashed />
               <!--搜索中心展示-->
-              <a-col :span="24">
+              <a-col :span="24" v-if="isSearch">
                 <a-form-model-item :label="$t('system.tag.searchCenterDisplay')" prop="isShowSearch">
                   <j-dict-select-tag type="list" v-model="form.isShowSearch" dictCode="yn"
                                      :placeholder="$t('system.tag.selectSearchCenterDisplayed')" />