From fe9fcaaa8993bb4f0b6a8ebcef8e258d20613d39 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 17 Nov 2023 17:55:16 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=B8=80=E8=88=AC?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2,=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dashboard.js                          |  6 +-
 src/common/lang/dashboard/en.js               |  8 +++
 src/common/lang/dashboard/zh.js               |  8 +++
 src/views/dashboard/search/AdvancedSearch.vue | 66 +++++++++++++++----
 src/views/dashboard/search/GeneralSearch.vue  |  5 +-
 5 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 01dc9a9c..8cafb796 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -22,11 +22,11 @@ const getOverseasStandardQuery = (params) => getAction('/laws/standard/overseas/
 const getEnterStandardQuery = (params) => getAction('/laws/standard/enterprise/getQueryCondition', params)
 
 // 国内标准的高级搜索,查询列表数据
-const getDomesticStandardList = (params) => getAction('/laws//standard/domestic/getCommonPage', params)
+const getDomesticStandardList = (params) => postAction('/laws//standard/domestic/getCommonPage', params)
 // 国外标准的高级搜索,查询列表数据
-const getOverseasStandardList = (params) => getAction('/laws//standard/overseas/getCommonPage', params)
+const getOverseasStandardList = (params) => postAction('/laws//standard/overseas/getCommonPage', params)
 // 企标的高级搜索,查询列表数据
-const getEnterStandardList = (params) => getAction('/laws/standard/enterprise/getCommonPage', params)
+const getEnterStandardList = (params) => postAction('/laws/standard/enterprise/getCommonPage', params)
 
 export {
   getSearchHistoryData,
diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js
index ece5cb9a..6068cf3a 100644
--- a/src/common/lang/dashboard/en.js
+++ b/src/common/lang/dashboard/en.js
@@ -18,5 +18,13 @@ module.exports = {
     standardGradeClassification: 'Standard Grade Classification',
     all: 'All',
     releaseDate: 'Release Date'
+  },
+  // 高级搜索
+  advancedSearch: {
+    standardNum: '标准号',
+    standardName: '标准名称',
+    releaseDate: '发布日期',
+    materialDate: '实施日期',
+    standardStatus: '标准状态'
   }
 }
diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js
index 1f30516c..c6cae41c 100644
--- a/src/common/lang/dashboard/zh.js
+++ b/src/common/lang/dashboard/zh.js
@@ -18,5 +18,13 @@ module.exports = {
     standardGradeClassification: '标准等级分类',
     all: '全部',
     releaseDate: '发布日期'
+  },
+  // 高级搜索
+  advancedSearch: {
+    standardNum: '标准号',
+    standardName: '标准名称',
+    releaseDate: '发布日期',
+    materialDate: '实施日期',
+    standardStatus: '标准状态'
   }
 }
diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue
index 880d60fa..54fa6bfa 100644
--- a/src/views/dashboard/search/AdvancedSearch.vue
+++ b/src/views/dashboard/search/AdvancedSearch.vue
@@ -59,7 +59,6 @@
             <!--   日期区间  -->
             <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
               <a-range-picker v-model="queryParam[item.dbFieldName]"
-                              :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
                               format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                               @change="onChange(item.dbFieldName)"></a-range-picker>
             </template>
@@ -123,7 +122,7 @@
       <a-button icon="search" type="primary" @click="searchQuery" :loading="loading">{{ $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>
+    <div class="table-wrapper">
       <j-table
         :can-drag="true"
         :scroll="{x: '100%'}"
@@ -177,12 +176,49 @@ export default {
         span: 14
       },
       getQueryConditionFunc: undefined, // 获取查询条件列表
+      getDataListFunc: undefined, // 获取数据列表
       minLength: 2,
       searchList: [], // 搜索条件
       optionsData: [], // 搜索条件下拉数据
       categoryTreeList: [], // 组织机构下拉框数据
       queryParam: {},
-      columns: [],
+      columns: [
+        { // 标准号
+          title: this.$t('dashboard.advancedSearch.standardNum'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'standard_number',
+          scopedSlots: { customRender: 'text' }
+        },
+        { // 标准名称
+          title: this.$t('dashboard.advancedSearch.standardName'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'standard_name',
+          scopedSlots: { customRender: 'text' }
+        },
+        { // 发布日期
+          title: this.$t('dashboard.advancedSearch.releaseDate'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'release_date',
+          scopedSlots: { customRender: 'text' }
+        },
+        { // 实施日期
+          title: this.$t('dashboard.advancedSearch.materialDate'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'implementation_date',
+          scopedSlots: { customRender: 'text' }
+        },
+        { // 标准状态
+          title: this.$t('dashboard.advancedSearch.standardStatus'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'standard_state_dictText',
+          scopedSlots: { customRender: 'text' }
+        }
+      ],
       dataSource: [],
       /* 分页参数 */
       ipagination: {
@@ -204,12 +240,16 @@ export default {
       handler (val) {
         if (val === '1') {
           this.getQueryConditionFunc = getDomesticStandardQuery
+          this.getDataListFunc = getDomesticStandardList
         } else if (val === '2') {
           this.getQueryConditionFunc = getOverseasStandardQuery
+          this.getDataListFunc = getOverseasStandardList
         } else if (val === '3') {
           this.getQueryConditionFunc = getEnterStandardQuery
+          this.getDataListFunc = getEnterStandardList
         }
         this.getSearch()
+        // this.loadData(1)
       }
     }
   },
@@ -306,20 +346,18 @@ 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
       }
       const params = this.getQueryParams()// 查询条件
-      let func
-      if (this.currStandardType === StandardSource.DOMESTIC.value) {
-        func = getDomesticStandardList
-      } else if (this.currStandardType === StandardSource.OVERSEAS.value) {
-        func = getOverseasStandardList
-      } else if (this.currStandardType === StandardSource.ENTERPRISE.value) {
-        func = getEnterStandardList
-      }
       this.loading = true
-      func(params).then((res) => {
+      this.getDataListFunc(params).then((res) => {
         if (res.success) {
           this.dataSource = res.result.records || res.result
           if (res.result.total) {
@@ -431,4 +469,8 @@ export default {
   text-align: center;
   margin-top: 10px;
 }
+
+.table-wrapper {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue
index a1d7ceac..ccb819c9 100644
--- a/src/views/dashboard/search/GeneralSearch.vue
+++ b/src/views/dashboard/search/GeneralSearch.vue
@@ -59,7 +59,7 @@
         <!--  查询结果展示区域  -->
         <div class="result-wrapper">
           <a-spin :spinning="loading">
-            <div class="result-div" v-for="item in dataSource" :key="item.standardNumber">
+            <div class="result-div" v-for="item in dataSource" :key="item.id">
               <div class="result-title-wrapper">
                 <!--  正在搜索，标题根据搜索内容高亮显示  -->
                 <a-tooltip>
@@ -73,9 +73,10 @@
                 </div>
                 <p class="result-date">{{ $t('dashboard.generalSearch.releaseDate') }} {{ item.releaseDate || global.emptyLine }}</p>
               </div>
-              <div class="result-content-wrapper">
+              <div v-if="item.resourceType !== '4'" class="result-content-wrapper">
                 {{ item.content }}
               </div>
+              <div v-else v-html="item.content" class="result-content-wrapper"></div>
             </div>
           </a-spin>
         </div>