From 0e5dc0dc1c6b256a4beadad12e6ff7ee4f1f9b36 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 2 Jul 2024 11:10:29 +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=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=85=B3=E8=81=94=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardMasterPlanList.vue                |  2 +-
 .../modules/StandardMasterPlanModal.vue       | 51 ++++++++++++-------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
index a5ecf1e..67c25ec 100644
--- a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
+++ b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
@@ -103,7 +103,7 @@ export default {
         { // 适用市场
           title: this.$t('standardRegulationLibrary.standardMasterPlan.applicableMarket'),
           align: 'center',
-          dataIndex: 'applicableMarket',
+          dataIndex: 'applicableMarket_dictText',
           width: 100,
           scopedSlots: { customRender: 'text' }
         },
diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
index 3a8760f..f188990 100644
--- a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
+++ b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
@@ -28,12 +28,18 @@
                 <a-col :span="12">
                   <!-- 适用市场 -->
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.applicableMarket')">
-                    <a-select :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardMasterPlan.applicableMarket')"
-                              allowClear
-                              :disabled="disableSubmit"
-                              v-decorator="['base.applicableMarket', validatorRules.applicableMarket]">
-                      <a-select-option v-for="item in applicableMarketList" :value="item.value" :key="item.value">{{ item }}</a-select-option>
-                    </a-select>
+                    <!--<a-select :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardMasterPlan.applicableMarket')"-->
+                    <!--          allowClear-->
+                    <!--          :disabled="disableSubmit"-->
+                    <!--          v-decorator="['base.applicableMarket', validatorRules.applicableMarket]">-->
+                    <!--  <a-select-option v-for="item in applicableMarketList" :value="item.value" :key="item.value">{{ item }}</a-select-option>-->
+                    <!--</a-select>-->
+                    <market-regulations-list-selection type="radio"
+                                                       selectOnly
+                                                       @listChange="handleChangeApplicableMarket"
+                                                       :nameStr="model.marketStandardId_dictText"
+                                                       :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardMasterPlan.applicableMarket')"
+                                                       v-decorator="['base.marketStandardId', validatorRules.applicableMarket]" />
                   </a-form-item>
                 </a-col>
                 <a-col :span="12">
@@ -597,10 +603,11 @@ import {
   editStandardMasterPlan,
   getStandardMasterPlanById
 } from '@api/standardRegulationLibraryApi'
+import MarketRegulationsListSelection from '@comp/selection/MarketRegulationsListSelection'
 
 export default {
   name: 'StandardMasterPlanModal',
-  components: { UserSelection, StandardSelection },
+  components: { MarketRegulationsListSelection, UserSelection, StandardSelection },
   data () {
     return {
       title: '',
@@ -622,7 +629,7 @@ export default {
         // 适用市场
         applicableMarket: {
           rules: [
-            { required: true, message: this.$t('standardRegulationLibrary.standardMasterPlan.standardNumber') + this.$t('cannotEmpty') }
+            { required: true, message: this.$t('standardRegulationLibrary.standardMasterPlan.applicableMarket') + this.$t('cannotEmpty') }
           ]
         },
         // 标准名称
@@ -674,7 +681,9 @@ export default {
             { required: false, message: this.$t('standardRegulationLibrary.standardMasterPlan.actualFinishingDate') + this.$t('cannotEmpty') }
           ]
         }
-      }
+      },
+      // 选择的适用市场
+      selectApplicableMarket: {}
     }
   },
   computed: {
@@ -683,15 +692,12 @@ export default {
       return this.modelType === 'view'
     }
   },
-  mounted () {
-    // 获取适用市场下拉菜单
-    this.loadApplicableMarketList()
-  },
   methods: {
-    // 获取适用市场下拉菜单
-    loadApplicableMarketList () {
-      this.applicableMarketList = []
-      // TODO 暂无清单接口
+    // 修改
+    handleChangeApplicableMarket (list) {
+      console.log(list[0], '选择的清单')
+      this.selectApplicableMarket = list[0] || {}
+      this.model.marketStandardId_dictText = this.selectApplicableMarket.country_dictText || ''
     },
     add () {
       this.visible = true
@@ -724,7 +730,9 @@ export default {
       getStandardMasterPlanById({ id: this.model.id }).then(res => {
         if (res.success) {
           this.model = res.result.lawsStandardMasterPlanVO
-          this.data = res.result.lawsStandardMasterPlanSublistList
+          if (res.result.lawsStandardMasterPlanSublistList && res.result.lawsStandardMasterPlanSublistList.length) {
+            this.data = res.result.lawsStandardMasterPlanSublistList
+          }
           this.$nextTick(() => {
             this.form.setFieldsValue({
               base: this.model,
@@ -755,6 +763,13 @@ export default {
         if (!err) {
           const params = {}
           params.lawsStandardMasterPlanVO = Object.assign({}, this.model, values.base)
+          // 处理适用市场，选择清单带出
+          if (this.selectApplicableMarket.id) {
+            // 清单id
+            params.lawsStandardMasterPlanVO.marketStandardId = this.selectApplicableMarket.id
+            // 适用市场
+            params.lawsStandardMasterPlanVO.applicableMarket = this.selectApplicableMarket.country
+          }
           params.lawsStandardMasterPlanSublistList = this.data.map((_, index) => {
             const result = Object.assign({}, _, values.data[index])
             if (!result.type) {