From 30c05a935d0d241b18a620e406f874e560a37572 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 15 Aug 2022 09:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionOfRegulatoryOpinions/index.vue  |  2 +-
 .../components/countryCardRelease.vue         | 30 ++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 66551a844..da4f75e4f 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -75,7 +75,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="initiatingProcessClick" class="operator-text">
+      <div @click="initiatingProcessClick" v-has="'regulatoryComments:initiationProcess'" class="operator-text">
         <a-icon type="apartment"/>
         {{$t('initiatingProcess')}}
       </div>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
index ba3d5fef4..367fa4314 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
@@ -19,10 +19,18 @@
                     <div class="title-text" :title="$t('applicableMarket')">
                       <span>{{$t('applicableMarket')}}</span>
                     </div>
-                    <j-dict-select-tag class="box-input" v-model="queryParam.applyMarket"
-                                       :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
-                                       :type="'select'"
-                                       :triggerChange="false" :dictCode="'region'"/>
+                    <a-select class="box-input"
+                              :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
+                              style="width: 100%"
+                              v-model="queryParam.applyMarket">
+                      <a-select-option v-for="(item, key) in applyMarketList"
+                                       :key="key"
+                                       :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.title ">
+                           {{ item.title}}
+                     </span>
+                      </a-select-option>
+                    </a-select>
                   </div>
                 </a-col>
                 <a-col :md="6" :sm="8">
@@ -150,6 +158,7 @@
           deleteBatch: '/problemKnowledgeBase/countryCardManageReleaseEO/deleteBatch'
         },
         userInfoQuery: {},
+        applyMarketList: [],
         selectedRowKeys: [],
         columns: [
           {
@@ -177,10 +186,20 @@
     mounted() {
       document.title = 'Country Card-' + this.$t('managePublishing')
       this.getList()
+      this.getApplyMarketList()
       this.userInfoQuery = this.userInfo()
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getApplyMarketList() {
+        getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '1' }).then((res) => {
+          if (res.success) {
+            this.applyMarketList = res.result || []
+          } else {
+            this.applyMarketList = []
+          }
+        })
+      },
       searchQuery() {
         this.pageNo = 1
         this.getList()
@@ -200,6 +219,7 @@
         this.getList()
       },
       countryCardReleaseAddForm() {
+        this.getApplyMarketList()
         this.pageNo = 1
         this.getList()
       },
@@ -256,6 +276,7 @@
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.selectedRowKeys = []
                     _this.getList()
+                    _this.getApplyMarketList()
                   } else {
                     _this.$message.warning(res.message)
                   }
@@ -317,6 +338,7 @@
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.getList()
+                _this.getApplyMarketList()
               } else {
                 _this.$message.warning(res.message)
               }