From c166bfecdf261a85b4b9344e6b980756f28ec1a3 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 12 Jul 2024 18:44:40 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B]=20=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/InterpretationClauseTable.vue     |  9 +++++-
 .../InterpretationClauseTableModal.vue        |  2 +-
 ...nterpretationMainInterpreterDistribute.vue | 30 ++++++++++++++-----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
index 6c00684..9df1e71 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
@@ -8,6 +8,7 @@
       </a-button>
       <!--  导入(标准主解读人节点 && 选择不分发时)  -->
       <a-upload v-if="isMainInterpreterDistribute && !isDistribute"
+                :data="importParams"
                 name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importUrl"
                 @change="handleImport">
         <a-button type="primary" icon="download" ghost>{{ $t('import') }}</a-button>
@@ -114,6 +115,12 @@ export default {
       type: Boolean,
       default: false,
       required: false
+    },
+    // 导入的参数
+    importParams: {
+      type: Object,
+      default: () => ({}),
+      required: false
     }
   },
   data () {
@@ -354,7 +361,7 @@ export default {
           title: this.$t('workCenter.standardInterpretationProcess.investigationStage'),
           align: 'center',
           width: 180,
-          dataIndex: 'investigationStage',
+          dataIndex: 'investigationStage_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // P3证明符合性的交付物名称
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
index 9412395..a353ff7 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
@@ -97,7 +97,7 @@
             <j-multi-select-tag dict-code="applicable_vehicle_type"
                                :disabled="disabled"
                                :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.applications')"
-                               v-decorator="['applicable_vehicle_type']"/>
+                               v-decorator="['applications']"/>
           </a-form-item>
           <!--动力类型-->
           <a-form-item :label="$t('workCenter.standardInterpretationProcess.powerType')" :colon="false">
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
index 895f2b4..8291740 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
@@ -40,7 +40,11 @@
       <!-- 确认下一步展示 -->
       <template v-if="isNextStep">
         <div class="process-part-title">{{ $t('dispatchInformation') }}</div>
-        <interpretation-clause-table ref="interpretationClauseTable" :disabled="disabled" :current-node-id="currentNodeId" :is-distribute="isDistribute"/>
+        <interpretation-clause-table ref="interpretationClauseTable"
+                                     :disabled="disabled"
+                                     :current-node-id="currentNodeId"
+                                     :import-params="importParams"
+                                     :is-distribute="isDistribute"/>
         <!-- 不分发的表单 -->
         <template v-if="!isDistribute">
           <a-form :form="userForm" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -207,7 +211,13 @@ export default {
       // 是否点击下一步
       isNextStep: false,
       // 是否下发 (true是, false否, null未选择)
-      isDistribute: null
+      isDistribute: null,
+      // 导入参数
+      importParams: {
+        standardInterp: '',
+        standardId: '',
+        splitInfoId: ''
+      }
     }
   },
   methods: {
@@ -285,21 +295,25 @@ export default {
     },
     setData (data) {
       console.log(data)
-      this.dataSource = [data.data.processStandardInterpret]
-      this.formInline = data.data.processStandardInterpret
+      const info = data.data.processStandardInterpret || {}
+      this.importParams.standardInterp = info.id
+      this.importParams.standardId = info.standardId
+      this.importParams.splitInfoId = info.splitInfoId
+      this.dataSource = [info]
+      this.formInline = info
       // 默认是少的条款表格
       this.clauseDataSource = data.data.processStandardInterpretClauseList
       // 是否下发
-      if (data.data.processStandardInterpret.isDistribute === IsDistribute.DISTRIBUTE.value) {
+      if (info.isDistribute === IsDistribute.DISTRIBUTE.value) {
         this.isDistribute = true
         this.clauseDataSource = data.data.processStandardInterpretClauseList
-      } else if (data.data.processStandardInterpret.isDistribute === IsDistribute.NOT_DISTRIBUTE.value) {
+      } else if (info.isDistribute === IsDistribute.NOT_DISTRIBUTE.value) {
         this.isDistribute = false
         this.clauseDataSource = data.data.processStandardInterpretClauseSublistList
       }
       // 是否下发有值就自动带入下一步，并回显数据
-      if (data.data.processStandardInterpret.isDistribute) {
-        this.form.setFieldsValue(data.data.processStandardInterpret)
+      if (info.isDistribute) {
+        this.form.setFieldsValue(this.formInline)
         this.isNextStep = true
         this.$nextTick(() => {
           this.$refs.interpretationClauseTable.setData(this.clauseDataSource)