From 1119788e777bea3b9816dd87de37e16d9c1d18a2 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 19 Jul 2024 16:48:40 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E4=B8=BB=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92]=20=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/StandardResolutionSheet.vue    | 10 ++---
 .../StandardMasterPlanList.vue                | 45 +++++++++++++++++--
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue
index 17662ca..6abf25f 100644
--- a/src/components/StandardResolutionSheet.vue
+++ b/src/components/StandardResolutionSheet.vue
@@ -150,11 +150,11 @@
         <div class="has-title-part-content">
           <template v-for="clause in clauseField">
             <!--技术规范/设计指南 查看-->
-            <div class="clause-item" v-if="clause.dbFieldName === 'technical_specification_design_guide'" :key="clause.id">
-              <label>{{ clause.dbFieldTxt }}</label>
-              <div class="clause-item-content"><a @click="handleViewFile(clauseLabelInfo[clause.dbFieldName])">{{ $t('view') }}</a></div>
-            </div>
-            <div class="clause-item" v-else-if="!clauseLabelHideField.includes(clause.dbFieldName)" :key="clause.id">
+            <!--<div class="clause-item" v-if="clause.dbFieldName === 'technical_specification_design_guide'" :key="clause.id">-->
+            <!--  <label>{{ clause.dbFieldTxt }}</label>-->
+            <!--  <div class="clause-item-content"><a @click="handleViewFile(clauseLabelInfo[clause.dbFieldName])">{{ $t('view') }}</a></div>-->
+            <!--</div>-->
+            <div class="clause-item" v-if="!clauseLabelHideField.includes(clause.dbFieldName)" :key="clause.id">
               <label>{{ clause.dbFieldTxt }}</label>
               <div class="clause-item-content"
                    v-html="clauseLabelInfo[needDictField.includes(clause.fieldShowType) ? clause.dbFieldName + '_dictText' : clause.dbFieldName]"></div>
diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
index ecc7419..768ae4e 100644
--- a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
+++ b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
@@ -18,8 +18,13 @@
           </a-col>
           <a-col :md="6" :sm="8">
             <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.applicableMarket')">
-              <j-dict-select-tag v-model="queryParam.applicableMarket"
-                                 :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.applicableMarket')"/>
+              <s-tree-select v-model="queryParam.applicableMarket"
+                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                             style="width: 100%"
+                             :tree-data="applicableMarketList"
+                             tree-checkable
+                             treeCheckStrictly
+                             :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardMasterPlan.applicableMarket')"/>
             </a-form-item>
           </a-col>
           <div style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
@@ -69,11 +74,14 @@ import JTable from '@comp/jero/JTable'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import StandardMasterPlanModal
   from '@views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal'
+import { getFormDictTreeList } from '@api/api'
+import STreeSelect from '@comp/STreeSelect'
+import { filterObj } from '@/utils/util'
 
 export default {
   name: 'StandardMasterPlanList',
   mixins: [JeroListMixin],
-  components: { StandardMasterPlanModal, JTable },
+  components: { STreeSelect, StandardMasterPlanModal, JTable },
   data () {
     return {
       columns: [
@@ -139,10 +147,39 @@ export default {
       url: {
         list: '/laws/StandardMasterPlan/queryByPage',
         exportXlsUrl: '/laws/StandardMasterPlan/exportExcel'
-      }
+      },
+      // 适用市场下拉
+      applicableMarketList: []
     }
   },
+  created () {
+    this.getCountryOption()
+  },
   methods: {
+    getQueryParams () {
+      // 获取查询条件
+      const sqp = {}
+      if (this.superQueryParams) {
+        sqp.superQueryParams = encodeURI(this.superQueryParams)
+        sqp.superQueryMatchType = this.superQueryMatchType
+      }
+      const param = Object.assign(sqp, this.queryParam, this.isorter, this.filters)
+      param.field = this.getQueryField()
+      param.pageNo = this.ipagination.current
+      param.pageSize = this.ipagination.pageSize
+      if (Array.isArray(param.applicableMarket)) {
+        param.applicableMarket = param.applicableMarket.map(item => item.value).join(',')
+      }
+      return filterObj(param)
+    },
+    // 获取国家/地区下拉数据
+    getCountryOption () {
+      getFormDictTreeList({ dictId: '1801130851452059649' }).then(res => {
+        if (res.success) {
+          this.applicableMarketList = res.result || []
+        }
+      })
+    },
     // 跳转详情
     toStandardDetail (record) {
       const { standardId } = record