From e0bb8b2afeedb532ff26d81af5cff1731617fabe Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 6 Sep 2024 09:59:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[update]=20=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=91=E6=96=87=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/dashboard/en.js               |  1 +
 src/common/lang/dashboard/zh.js               |  1 +
 src/views/dashboard/search/AdvancedSearch.vue | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js
index 6487685..8b867fe 100644
--- a/src/common/lang/dashboard/en.js
+++ b/src/common/lang/dashboard/en.js
@@ -52,6 +52,7 @@ module.exports = {
     termNo: 'Article No.',
     termTitle: 'Article Title',
     termContent: 'Article Content',
+    translation: 'Translation',
     applicableComponents: 'Applicable Components',
     newProduceVehiclesImplementationDate: 'New Certified Vehicle Implementation Date',
     newAuthVehiclesImplementationDate: 'New Production Vehicle Implementation Date',
diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js
index 7cec826..95e6743 100644
--- a/src/common/lang/dashboard/zh.js
+++ b/src/common/lang/dashboard/zh.js
@@ -52,6 +52,7 @@ module.exports = {
     termNo: '条款号',
     termTitle: '条款标题',
     termContent: '条款内容',
+    translation: '译文',
     applicableComponents: '适用零部件',
     newProduceVehiclesImplementationDate: '新生产车实施日期',
     newAuthVehiclesImplementationDate: '新认证车实施日期',
diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue
index 30063c5..070c2ac 100644
--- a/src/views/dashboard/search/AdvancedSearch.vue
+++ b/src/views/dashboard/search/AdvancedSearch.vue
@@ -211,6 +211,13 @@
               </div>
               <div class="table-text" v-else>{{ global.emptyLine }}</div>
             </template>
+            <!--译文-->
+            <template slot="translation" slot-scope="{text, record}">
+              <div style="cursor: pointer;" class="table-text" v-if="text || text === 0" @click="showContent(text,record)">
+                {{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }}
+              </div>
+              <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            </template>
           </j-table>
         </div>
       </div>
@@ -394,6 +401,13 @@ export default {
           dataIndex: 'item_content',
           scopedSlots: { customRender: 'item_content' }
         },
+        { // 译文
+          title: this.$t('dashboard.advancedSearch.translation'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'translation',
+          scopedSlots: { customRender: 'translation' }
+        },
         // { // 适用零部件
         //   title: this.$t('dashboard.advancedSearch.applicableComponents'),
         //   align: 'center',

From 5eda1d45872f3811fb7af9287e12d6714af976c8 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 6 Sep 2024 11:37:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=E4=B8=8D=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E5=92=8C=E5=BE=85=E9=AA=8C=E8=AF=81=E7=9A=84=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=BB=A1=E8=B6=B3=E8=A6=81=E6=B1=82=E7=8E=B0=E7=8A=B6?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E8=AF=B4=E6=98=8E=E6=9D=90=E6=96=99=EF=BC=8C=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=E9=80=89=E6=8B=A9=E4=B8=8D=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E5=92=8C=E5=BE=85=E9=AA=8C=E8=AF=81=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E8=87=AA=E5=8A=A8=E5=B1=95=E5=BC=80=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en.js                                     |  2 +
 .../zh.js                                     |  2 +
 src/common/lang/workCenter/en.js              |  1 +
 src/common/lang/workCenter/zh.js              |  1 +
 .../modules/NonmatchItemLookModal.vue         |  7 +-
 .../modules/AssessmentLookModal.vue           | 20 +++-
 .../modules/DesignEngineerEvaluation.vue      | 97 ++++++++++++-------
 .../modules/FinishAuditBaseInfo.vue           | 19 +++-
 .../modules/MainFinderCollectBaseInfo.vue     | 19 +++-
 .../modules/MainFinderDistributesBaseInfo.vue | 97 ++++++++++++-------
 .../modules/MainFinderSingleAuditBaseInfo.vue | 19 +++-
 11 files changed, 199 insertions(+), 85 deletions(-)

diff --git a/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js b/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
index b1bf488..0d551a4 100644
--- a/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
+++ b/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
@@ -13,6 +13,7 @@ module.exports = {
     clauseContent: 'Article Content',
     modelStatus: 'Developing Status',
     theStatusNotMeetRequirements: 'Unsatisfied Description',
+    supplementaryExplanatoryMaterial: 'Supplementary explanatory material',
     rectificationPlan: 'Rectification Plan',
     rectificationCycle: 'Rectification Time',
     rectificationCost: 'Rectification Costs',
@@ -32,6 +33,7 @@ module.exports = {
     problemType: 'Evaluation Results',
     rectificationCompletionDate: 'Completion Date of Rectification',
     theStatusNotMeetRequirements: 'Unsatisfied Description',
+    supplementaryExplanatoryMaterial: 'Supplementary explanatory material',
     rectificationPlan: 'Rectification Plan',
     rectificationCycle: 'Rectification Time',
     rectificationCost: 'Rectification Costs',
diff --git a/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js b/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
index 7955537..297fa13 100644
--- a/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
+++ b/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
@@ -13,6 +13,7 @@ module.exports = {
     clauseContent: '条款内容',
     modelStatus: '车型状态',
     theStatusNotMeetRequirements: '不满足要求的现状',
+    supplementaryExplanatoryMaterial: '辅助说明材料',
     rectificationPlan: '整改方案',
     rectificationCycle: '整改周期',
     rectificationCost: '整改费用',
@@ -32,6 +33,7 @@ module.exports = {
     problemType: '问题类型',
     rectificationCompletionDate: '整改完成日期',
     theStatusNotMeetRequirements: '不满足要求的现状',
+    supplementaryExplanatoryMaterial: '辅助说明材料',
     rectificationPlan: '整改方案',
     rectificationCycle: '整改周期',
     rectificationCost: '整改费用',
diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index 174c155..ccb60ce 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -43,6 +43,7 @@ module.exports = {
     approvingOfficer: 'Approving officer',
     evaluationResult: 'Evaluation Result',
     theStatusNotMeetRequirements: 'Unsatisfied Description',
+    supplementaryExplanatoryMaterial: 'Supplementary explanatory material',
     rectificationPlan: 'Rectification Plan',
     rectificationCycle: 'Rectification Time',
     rectificationCost: 'Rectification Costs',
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 8246be8..42d42f9 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -43,6 +43,7 @@ module.exports = {
     approvingOfficer: '批准人员',
     evaluationResult: '评估结果',
     theStatusNotMeetRequirements: '不满足要求的现状',
+    supplementaryExplanatoryMaterial: '辅助说明材料',
     rectificationPlan: '整改方案',
     rectificationCycle: '整改周期',
     rectificationCost: '整改费用',
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
index 114d786..4bc9f5d 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
@@ -18,6 +18,11 @@
                    :placeholder="$t('pleaseEnter')+$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.theStatusNotMeetRequirements')"
                    v-decorator.trim="[ 'unsatisfiedRequire']"/>
         </a-form-item>
+        <!--   辅助说明材料  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.supplementaryExplanatoryMaterial')">
+          <j-upload disabled
+                    v-decorator.trim="[ 'unsatisfiedRequireAttach']"/>
+        </a-form-item>
         <!--   整改方案  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationPlan')">
           <a-input :max-length="50"
@@ -87,7 +92,7 @@ export default {
       this.form.resetFields()
       this.model = Object.assign({}, record)
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'unsatisfiedRequire', 'correctionSolution', 'correctionPeriod',
+        this.form.setFieldsValue(pick(this.model, 'unsatisfiedRequire', 'unsatisfiedRequireAttach', 'correctionSolution', 'correctionPeriod',
           'correctionCost', 'commonality', 'commonalityCost'))
       })
     },
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
index 9d3aaa4..43c4b02 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
@@ -111,9 +111,15 @@
         </a-tooltip>
       </template>
 
+      <!--  辅助说明材料 -->
+      <template v-slot:unsatisfiedRequireAttach="text, record">
+        <a v-if="text" class="link-a" @click="handleFileClick(record, 'unsatisfiedRequireAttach')">{{ $t('view') }}</a>
+        <div v-else class="table-text">{{ global.emptyLine }}</div>
+      </template>
+
       <!--  佐证材料 -->
       <template v-slot:material="text, record">
-        <a v-if="text" class="link-a" @click="handleMaterialClick(record)">{{ $t('view') }}</a>
+        <a v-if="text" class="link-a" @click="handleFileClick(record, 'material')">{{ $t('view') }}</a>
         <div v-else class="table-text">{{ global.emptyLine }}</div>
       </template>
     </a-table>
@@ -208,6 +214,13 @@ export default {
           dataIndex: 'unsatisfiedRequire',
           scopedSlots: { customRender: 'text' }
         },
+        { // 辅助说明材料
+          title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.supplementaryExplanatoryMaterial'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'unsatisfiedRequireAttach',
+          scopedSlots: { customRender: 'unsatisfiedRequireAttach' }
+        },
         { // 整改方案
           title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.rectificationPlan'),
           align: 'center',
@@ -298,8 +311,9 @@ export default {
       const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label
       return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    handleMaterialClick (record) {
-      this.$refs.uploadFile.open(record.material)
+    // 列表中的附件查看
+    handleFileClick (record, fieldName) {
+      this.$refs.uploadFile.open(record[fieldName])
     },
     handleCancel () {
       this.close()
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
index 172e021..eaf57a9 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
@@ -50,6 +50,7 @@
 <script>
 import JExpandTable from '@/components/JExpandTable'
 import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail'
+import { EvaluationResult } from '../../../../enums/commonEnums'
 
 export default {
   name: 'DesignEngineerEvaluation',
@@ -152,12 +153,32 @@ export default {
             commonalityCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'), trigger: 'blur' },
             // 不满足要求的现状
             unsatisfiedRequire: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'), trigger: 'blur' },
+            // 辅助说明材料
+            unsatisfiedRequireAttach: { required: false, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'), trigger: 'change' },
             // 整改方案
             correctionSolution: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'), trigger: 'blur' },
             // 与其他项目共用性
             commonality: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects'), trigger: 'blur' }
           },
           formArr: [
+            { // 不满足要求的现状
+              fieldShowType: 1,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
+              fieldMustInput: true,
+              dbFieldName: 'unsatisfiedRequire'
+            },
+            { // 辅助说明材料
+              fieldShowType: 2,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'),
+              fieldMustInput: false,
+              dbFieldName: 'unsatisfiedRequireAttach'
+            },
+            { // 整改方案
+              fieldShowType: 1,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
+              fieldMustInput: true,
+              dbFieldName: 'correctionSolution'
+            },
             { // 整改周期
               fieldShowType: 4,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
@@ -170,29 +191,17 @@ export default {
               fieldMustInput: true,
               dbFieldName: 'correctionCost'
             },
-            { // 共用后本项目所需费用
-              fieldShowType: 4,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'),
-              fieldMustInput: true,
-              dbFieldName: 'commonalityCost'
-            },
-            { // 不满足要求的现状
-              fieldShowType: 1,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
-              fieldMustInput: true,
-              dbFieldName: 'unsatisfiedRequire'
-            },
-            { // 整改方案
-              fieldShowType: 1,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
-              fieldMustInput: true,
-              dbFieldName: 'correctionSolution'
-            },
             { // 与其他项目共用性
               fieldShowType: 1,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects'),
               fieldMustInput: true,
               dbFieldName: 'commonality'
+            },
+            { // 共用后本项目所需费用
+              fieldShowType: 4,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'),
+              fieldMustInput: true,
+              dbFieldName: 'commonalityCost'
             }
           ]
         },
@@ -226,12 +235,32 @@ export default {
             commonalityCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'), trigger: 'blur' },
             // 不满足要求的现状
             unsatisfiedRequire: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'), trigger: 'blur' },
+            // 辅助说明材料
+            unsatisfiedRequireAttach: { required: false, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'), trigger: 'change' },
             // 整改方案
             correctionSolution: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'), trigger: 'blur' },
             // 与其他项目共用性
             commonality: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects'), trigger: 'blur' }
           },
           formArr: [
+            { // 不满足要求的现状
+              fieldShowType: 1,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
+              fieldMustInput: true,
+              dbFieldName: 'unsatisfiedRequire'
+            },
+            { // 辅助说明材料
+              fieldShowType: 2,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'),
+              fieldMustInput: false,
+              dbFieldName: 'unsatisfiedRequireAttach'
+            },
+            { // 整改方案
+              fieldShowType: 1,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
+              fieldMustInput: true,
+              dbFieldName: 'correctionSolution'
+            },
             { // 整改周期
               fieldShowType: 4,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
@@ -244,29 +273,17 @@ export default {
               fieldMustInput: true,
               dbFieldName: 'correctionCost'
             },
-            { // 共用后本项目所需费用
-              fieldShowType: 4,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'),
-              fieldMustInput: true,
-              dbFieldName: 'commonalityCost'
-            },
-            { // 不满足要求的现状
-              fieldShowType: 1,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
-              fieldMustInput: true,
-              dbFieldName: 'unsatisfiedRequire'
-            },
-            { // 整改方案
-              fieldShowType: 1,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
-              fieldMustInput: true,
-              dbFieldName: 'correctionSolution'
-            },
             { // 与其他项目共用性
               fieldShowType: 1,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects'),
               fieldMustInput: true,
               dbFieldName: 'commonality'
+            },
+            { // 共用后本项目所需费用
+              fieldShowType: 4,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'),
+              fieldMustInput: true,
+              dbFieldName: 'commonalityCost'
             }
           ]
         }
@@ -318,6 +335,14 @@ export default {
     },
     // 评估结果改变，清空备注和佐证材料,不满足要求的现状,整改方案,整改周期,整改费用,与其他项目共用性,共用后本项目所需费用
     resultChange (record) {
+      if ([EvaluationResult.INCONFORMITY.value, EvaluationResult.TO_BE_VERIFIED.value].includes(record.result)) {
+        // 选中的是不符合或者待验证自动展开扩展区
+        const rowKey = this.$refs.expandTable.rowKey
+        if (!this.$refs.expandTable.expandedRowKeys.includes(record[rowKey])) {
+          // 表格展开中没有该列，加到展开项中
+          this.$refs.expandTable.expandedRowKeys.push(record[rowKey])
+        }
+      }
       const index = this.dataSource.findIndex(item => item.id === record.id)
       this.dataSource[index].remark = ''
       this.dataSource[index].material = ''
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
index b456d69..94935fd 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
@@ -24,9 +24,15 @@
         <div class="table-text" v-else>{{ global.emptyLine }}</div>
       </template>
 
+      <!--  辅助说明材料 -->
+      <template v-slot:unsatisfiedRequireAttach="{text, record}">
+        <a v-if="text" class="link-a" @click="handleFileClick(record, 'unsatisfiedRequireAttach')">{{ $t('view') }}</a>
+        <div v-else class="table-text">{{ global.emptyLine }}</div>
+      </template>
+
       <!--  佐证材料 -->
       <template v-slot:material="{text, record}">
-        <a v-if="text" class="link-a" @click="handleMaterialClick(record)">{{ $t('view') }}</a>
+        <a v-if="text" class="link-a" @click="handleFileClick(record, 'material')">{{ $t('view') }}</a>
         <div v-else class="table-text">{{ global.emptyLine }}</div>
       </template>
 
@@ -132,6 +138,13 @@ export default {
           dataIndex: 'unsatisfiedRequire',
           scopedSlots: { customRender: 'text' }
         },
+        { // 辅助说明材料
+          title: this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'unsatisfiedRequireAttach',
+          scopedSlots: { customRender: 'unsatisfiedRequireAttach' }
+        },
         { // 整改方案
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
           align: 'center',
@@ -209,8 +222,8 @@ export default {
       data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
       return data
     },
-    handleMaterialClick (record) {
-      this.$refs.uploadFile.open(record.material)
+    handleFileClick (record, fieldName) {
+      this.$refs.uploadFile.open(record[fieldName])
     },
     handleTableChange (pagination, filters, sorter) {
       // 分页、排序、筛选变化时触发
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
index 1bcff4a..a9ace71 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
@@ -31,9 +31,15 @@
         <div class="table-text" v-else>{{ global.emptyLine }}</div>
       </template>
 
+      <!--  辅助说明材料 -->
+      <template v-slot:unsatisfiedRequireAttach="{text, record}">
+        <a v-if="text" class="link-a" @click="handleFileClick(record, 'unsatisfiedRequireAttach')">{{ $t('view') }}</a>
+        <div v-else class="table-text">{{ global.emptyLine }}</div>
+      </template>
+
       <!--  佐证材料 -->
       <template v-slot:material="{text, record}">
-        <a v-if="text" class="link-a" @click="handleMaterialClick(record)">{{ $t('view') }}</a>
+        <a v-if="text" class="link-a" @click="handleFileClick(record, 'material')">{{ $t('view') }}</a>
         <div v-else class="table-text">{{ global.emptyLine }}</div>
       </template>
 
@@ -223,6 +229,13 @@ export default {
           dataIndex: 'unsatisfiedRequire',
           scopedSlots: { customRender: 'text' }
         },
+        { // 辅助说明材料
+          title: this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'unsatisfiedRequireAttach',
+          scopedSlots: { customRender: 'unsatisfiedRequireAttach' }
+        },
         { // 整改方案
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
           align: 'center',
@@ -345,8 +358,8 @@ export default {
     handleTableChange (pagination) {
       this.ipagination = pagination
     },
-    handleMaterialClick (record) {
-      this.$refs.uploadFile.open(record.material)
+    handleFileClick (record, fieldName) {
+      this.$refs.uploadFile.open(record[fieldName])
     },
     handleExportXls (fileName, fileSuffix = '.xls') {
       if (!fileName || typeof fileName !== 'string') {
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
index ae3cb54..4f11513 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
@@ -198,6 +198,7 @@ import { ACCESS_TOKEN, TENANT_ID } from '@/store/mutation-types'
 import store from '@/store'
 import { downFile } from '../../../../api/manage'
 import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail'
+import { EvaluationResult } from '../../../../enums/commonEnums'
 
 // 导入的加载提示
 let importModalLoading
@@ -428,12 +429,32 @@ export default {
             commonalityCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'), trigger: 'blur' },
             // 不满足要求的现状
             unsatisfiedRequire: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'), trigger: 'blur' },
+            // 辅助说明材料
+            unsatisfiedRequireAttach: { required: false, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'), trigger: 'change' },
             // 整改方案
             correctionSolution: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'), trigger: 'blur' },
             // 与其他项目共用性
             commonality: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects'), trigger: 'blur' }
           },
           formArr: [
+            { // 不满足要求的现状
+              fieldShowType: 1,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
+              fieldMustInput: true,
+              dbFieldName: 'unsatisfiedRequire'
+            },
+            { // 辅助说明材料
+              fieldShowType: 2,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'),
+              fieldMustInput: true,
+              dbFieldName: 'unsatisfiedRequireAttach'
+            },
+            { // 整改方案
+              fieldShowType: 1,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
+              fieldMustInput: true,
+              dbFieldName: 'correctionSolution'
+            },
             { // 整改周期
               fieldShowType: 4,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
@@ -446,29 +467,17 @@ export default {
               fieldMustInput: true,
               dbFieldName: 'correctionCost'
             },
-            { // 共用后本项目所需费用
-              fieldShowType: 4,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'),
-              fieldMustInput: true,
-              dbFieldName: 'commonalityCost'
-            },
-            { // 不满足要求的现状
-              fieldShowType: 1,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
-              fieldMustInput: true,
-              dbFieldName: 'unsatisfiedRequire'
-            },
-            { // 整改方案
-              fieldShowType: 1,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
-              fieldMustInput: true,
-              dbFieldName: 'correctionSolution'
-            },
             { // 与其他项目共用性
               fieldShowType: 1,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects'),
               fieldMustInput: true,
               dbFieldName: 'commonality'
+            },
+            { // 共用后本项目所需费用
+              fieldShowType: 4,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'),
+              fieldMustInput: true,
+              dbFieldName: 'commonalityCost'
             }
           ]
         },
@@ -502,12 +511,32 @@ export default {
             commonalityCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'), trigger: 'blur' },
             // 不满足要求的现状
             unsatisfiedRequire: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'), trigger: 'blur' },
+            // 辅助说明材料
+            unsatisfiedRequireAttach: { required: false, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'), trigger: 'change' },
             // 整改方案
             correctionSolution: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'), trigger: 'blur' },
             // 与其他项目共用性
             commonality: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects'), trigger: 'blur' }
           },
           formArr: [
+            { // 不满足要求的现状
+              fieldShowType: 1,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
+              fieldMustInput: true,
+              dbFieldName: 'unsatisfiedRequire'
+            },
+            { // 辅助说明材料
+              fieldShowType: 2,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'),
+              fieldMustInput: false,
+              dbFieldName: 'unsatisfiedRequireAttach'
+            },
+            { // 整改方案
+              fieldShowType: 1,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
+              fieldMustInput: true,
+              dbFieldName: 'correctionSolution'
+            },
             { // 整改周期
               fieldShowType: 4,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
@@ -520,29 +549,17 @@ export default {
               fieldMustInput: true,
               dbFieldName: 'correctionCost'
             },
-            { // 共用后本项目所需费用
-              fieldShowType: 4,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'),
-              fieldMustInput: true,
-              dbFieldName: 'commonalityCost'
-            },
-            { // 不满足要求的现状
-              fieldShowType: 1,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
-              fieldMustInput: true,
-              dbFieldName: 'unsatisfiedRequire'
-            },
-            { // 整改方案
-              fieldShowType: 1,
-              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
-              fieldMustInput: true,
-              dbFieldName: 'correctionSolution'
-            },
             { // 与其他项目共用性
               fieldShowType: 1,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects'),
               fieldMustInput: true,
               dbFieldName: 'commonality'
+            },
+            { // 共用后本项目所需费用
+              fieldShowType: 4,
+              dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing'),
+              fieldMustInput: true,
+              dbFieldName: 'commonalityCost'
             }
           ]
         }
@@ -702,6 +719,14 @@ export default {
     },
     // 评估结果改变，清空备注和佐证材料,不满足要求的现状,整改方案,整改周期,整改费用,与其他项目共用性,共用后本项目所需费用
     resultChange (record) {
+      if ([EvaluationResult.INCONFORMITY.value, EvaluationResult.TO_BE_VERIFIED.value].includes(record.result)) {
+        // 选中的是不符合或者待验证自动展开扩展区
+        const rowKey = this.$refs.expandTable.rowKey
+        if (!this.$refs.expandTable.expandedRowKeys.includes(record[rowKey])) {
+          // 表格展开中没有该列，加到展开项中
+          this.$refs.expandTable.expandedRowKeys.push(record[rowKey])
+        }
+      }
       const index = this.dataSourceEvaluate.findIndex(item => item.id === record.id)
       this.dataSourceEvaluate[index].remark = ''
       this.dataSourceEvaluate[index].material = ''
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
index 8240a28..42e4db8 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
@@ -24,9 +24,15 @@
         <div class="table-text" v-else>{{ global.emptyLine }}</div>
       </template>
 
+      <!--  辅助说明材料 -->
+      <template v-slot:unsatisfiedRequireAttach="{text, record}">
+        <a v-if="text" class="link-a" @click="handleFileClick(record, 'unsatisfiedRequireAttach')">{{ $t('view') }}</a>
+        <div v-else class="table-text">{{ global.emptyLine }}</div>
+      </template>
+
       <!--  佐证材料 -->
       <template v-slot:material="{text, record}">
-        <a v-if="text" class="link-a" @click="handleMaterialClick(record)">{{ $t('view') }}</a>
+        <a v-if="text" class="link-a" @click="handleFileClick(record, 'material')">{{ $t('view') }}</a>
         <div v-else class="table-text">{{ global.emptyLine }}</div>
       </template>
 
@@ -146,6 +152,13 @@ export default {
           dataIndex: 'unsatisfiedRequire',
           scopedSlots: { customRender: 'text' }
         },
+        { // 辅助说明材料
+          title: this.$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'unsatisfiedRequireAttach',
+          scopedSlots: { customRender: 'unsatisfiedRequireAttach' }
+        },
         { // 整改方案
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan'),
           align: 'center',
@@ -226,8 +239,8 @@ export default {
     handleTableChange (pagination) {
       this.ipagination = pagination
     },
-    handleMaterialClick (record) {
-      this.$refs.uploadFile.open(record.material)
+    handleFileClick (record, fieldName) {
+      this.$refs.uploadFile.open(record[fieldName])
     },
     // 显示条款内容弹框
     showContent (val) {

From 4b87e113bddc52be9d39c6a5df4d6e0c8950b2aa Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 6 Sep 2024 13:59:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketListReleaseProcess.vue              | 19 +++++++++++++++++--
 .../modules/BaseInfoForm.vue                  | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
index 96fbb9c..2e636d8 100644
--- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
+++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
@@ -113,6 +113,15 @@
                             placeholder=""/>
               </a-form-item>
             </a-col>
+            <!--   附件  -->
+            <a-col :span="24">
+              <a-form-item
+                :labelCol="$i18n.locale === EN ? longLabelColEn : longLabelCol"
+                :wrapperCol="$i18n.locale === EN ? longWrapperColEn : longWrapperCol"
+                :label="$t('attach')" :colon="formItemColon">
+                <j-upload v-decorator="['file']" disabled />
+              </a-form-item>
+            </a-col>
           </template>
         </a-row>
       </a-form>
@@ -202,10 +211,12 @@ import pick from 'lodash.pick'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import { getFormDictTreeList } from '../../../api/api'
 import STreeSelect from '../../../components/STreeSelect'
+import FileEcho from '../../../components/FileEcho'
 
 export default {
   name: 'MarketListReleaseProcess',
   components: {
+    FileEcho,
     BaseInfoForm,
     InternalDetailPage,
     ProcessDetailList,
@@ -398,7 +409,9 @@ export default {
                 processInfo.country = this.model.businessInfoDTO.country.split(',').map(item => {
                   return { value: item }
                 })
-                this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country', 'manifestDesc'))
+                // 附件
+                processInfo.file = this.model.businessInfoDTO.file
+                this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country', 'manifestDesc', 'file'))
               }
             }
             // 有草稿json按草稿进来的回显
@@ -419,7 +432,9 @@ export default {
                 processInfo.country = this.draftModel.businessInfoDTO.country.split(',').map(item => {
                   return { value: item }
                 })
-                this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country', 'manifestDesc'))
+                // 附件
+                processInfo.file = this.draftModel.businessInfoDTO.file
+                this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country', 'manifestDesc', 'file'))
               }
               // 初始化流程审批信息
               this.approvalInfoForm.setFieldsValue(pick(this.draftModel.basicTaskInfoDTO, 'handleText', 'handleFile'))
diff --git a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue
index 94ddbb7..2ff0de8 100644
--- a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue
@@ -71,6 +71,20 @@
                         :placeholder="disabled ? '' : $t('autoTakeout')" />
           </a-form-model-item>
         </div>
+        <!--  附件  -->
+        <div class="box-title-text form-flex-item form-flex-item-half form-flex-item-all">
+          <div class="title-text title-text-long">
+            <span class="title-text-text" :title="$t('attach')">
+                  {{ $t('attach') }}
+                </span>
+          </div>
+          <a-form-model-item class="item-model" prop="file">
+            <j-upload v-model="formInline.file"
+                      return-id
+                      multiple
+                      disabled/>
+          </a-form-model-item>
+        </div>
       </div>
     </a-form-model>
 
@@ -347,6 +361,8 @@ export default {
           formInline.manifestName = result.manifestName
           // 清单说明
           formInline.manifestDesc = result.manifestDesc
+          // 附件
+          formInline.file = result.file
           // 版本号
           formInline.manifestVersion = result.manifestVersion
           // 国家/地区
@@ -458,6 +474,8 @@ export default {
             formInline.manifestName = result.manifestName
             // 清单说明
             formInline.manifestDesc = result.manifestDesc
+            // 清单说明
+            formInline.file = result.file
             // 版本号
             formInline.manifestVersion = result.manifestVersion
             // 国家/地区