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 01/29] =?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 02/29] =?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 03/29] =?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
             // 国家/地区

From 21606264aa372d5d0078e6d834e248b38592e34c Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 11 Sep 2024 11:33:02 +0800
Subject: [PATCH 04/29] =?UTF-8?q?[update=20=E6=B5=81=E7=A8=8B=E5=8A=A0?=
 =?UTF-8?q?=E7=AD=BE=E6=8C=89=E9=92=AE]=20=E6=94=B9=E6=88=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=A1=B5=E9=9D=A2=E9=87=8C=E8=BF=9B=E8=A1=8C=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/WorkCenterMixin.js                          | 10 +++++++++-
 .../MarketListReleaseProcess.vue                       |  2 +-
 .../NewRegulationIntroductionProcess.vue               |  2 +-
 .../RegulatoryComplianceCheckProcess.vue               |  2 +-
 .../StandardInterpretationProcess.vue                  |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/mixins/WorkCenterMixin.js b/src/mixins/WorkCenterMixin.js
index f78f5e3..a0bcbd7 100644
--- a/src/mixins/WorkCenterMixin.js
+++ b/src/mixins/WorkCenterMixin.js
@@ -8,7 +8,8 @@ export const WorkCenterMixin = {
     return {
       personnelInfoData: [], // 需要传给PersonnelInfo的数据
       switchValue: 'base',
-      formItemColon: false // a-form不显示冒号
+      formItemColon: false, // a-form不显示冒号
+      showCountersign: false // 加签按钮是否显示
     }
   },
   methods: {
@@ -22,6 +23,13 @@ export const WorkCenterMixin = {
       getProcessNodeList(param).then(res => {
         if (res.success) {
           console.log(res.result)
+          let curNode = res.result.find(item => item.xmlNodeId === this.$route.query.nodeId)
+          // 如果nodeId没有找到，再去匹配流程名
+          if (!curNode) {
+            curNode = res.result.find(item => item.nodeName === this.$route.query.taskName)
+          }
+          // 是否显示会签
+          this.showCountersign = curNode ? curNode.countersignFlag + '' === '1' : false
           // 处理人员信息数据，判断每个节点是否能选人
           this.personnelInfoData = res.result.map(item => {
             return {
diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
index e4b78bd..2583f2d 100644
--- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
+++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
@@ -161,7 +161,7 @@
     <!--  操作按钮  -->
     <div v-if="!isLook" class="detail-page-bottom-operate-box">
       <!--  加签  -->
-      <a-button v-if="$route.query.countersignFlag + '' === '1'" type="primary" ghost :loading="loading" @click="handleAddSign" icon="plus">{{ $t('countersign') }}</a-button>
+      <a-button v-if="showCountersign" type="primary" ghost :loading="loading" @click="handleAddSign" icon="plus">{{ $t('countersign') }}</a-button>
       <!--  发起节点  -->
       <template v-if="currentNode === 1">
         <!--  保存  -->
diff --git a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
index 7046eb2..aba17a5 100644
--- a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
+++ b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
@@ -100,7 +100,7 @@
     <!--  操作按钮  -->
     <div v-if="!isLook" class="detail-page-bottom-operate-box">
       <!--  加签  -->
-      <a-button v-if="$route.query.countersignFlag + '' === '1'" type="primary" ghost :loading="loading" @click="handleAddSign" icon="plus">{{ $t('countersign') }}</a-button>
+      <a-button v-if="showCountersign" type="primary" ghost :loading="loading" @click="handleAddSign" icon="plus">{{ $t('countersign') }}</a-button>
       <!--  发起节点  -->
       <template v-if="currentNode === 1">
         <!--  保存  -->
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
index cc88bdd..befa302 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
@@ -128,7 +128,7 @@
     <!--  操作按钮  -->
     <div v-if="!isLook" class="detail-page-bottom-operate-box">
       <!--  加签 -->
-      <a-button v-if="$route.query.countersignFlag + '' === '1'" type="primary" ghost :loading="loading" @click="handleAddSign" icon="plus">{{ $t('countersign') }}</a-button>
+      <a-button v-if="showCountersign" type="primary" ghost :loading="loading" @click="handleAddSign" icon="plus">{{ $t('countersign') }}</a-button>
       <!--  发起节点  -->
       <template v-if="currentNode === 1">
         <!--  保存  -->
diff --git a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
index b42b714..2ab2a21 100644
--- a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
+++ b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
@@ -112,7 +112,7 @@
     <!--  操作按钮  -->
     <div class="detail-page-bottom-operate-box" v-if="!isLook">
       <!--  加签  -->
-      <a-button v-if="$route.query.countersignFlag + '' === '1'" type="primary" ghost :loading="loading" @click="handleCountersign" icon="plus">{{ $t('countersign') }}</a-button>
+      <a-button v-if="showCountersign" type="primary" ghost :loading="loading" @click="handleCountersign" icon="plus">{{ $t('countersign') }}</a-button>
       <!--  转办  -->
       <a-button v-if="btn.includes('transfer') && isPartialDistribution" type="primary" ghost :loading="loading" @click="handleTurnTo" icon="arrow-up">{{ $t('turnTo') }}</a-button>
       <!--  保存  -->

From 9f986354ffff9af4fe858345501d33751cb01844 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 11 Sep 2024 11:37:41 +0800
Subject: [PATCH 05/29] =?UTF-8?q?[update=20=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2]=20=E6=9D=A1=E6=AC=BE=E5=A2=9E=E5=8A=A0=E9=80=82?=
 =?UTF-8?q?=E7=94=A8=E5=B8=82=E5=9C=BA=EF=BC=88=E5=89=8D=E7=AB=AF=E5=86=99?=
 =?UTF-8?q?=E6=AD=BB=EF=BC=89=EF=BC=8C=E6=9D=A1=E6=AC=BE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=91=E6=96=87=E6=A0=87=E9=A2=98=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/search/AdvancedSearch.vue | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue
index 070c2ac..2a3c403 100644
--- a/src/views/dashboard/search/AdvancedSearch.vue
+++ b/src/views/dashboard/search/AdvancedSearch.vue
@@ -141,6 +141,25 @@
               </template>
             </a-form-item>
           </a-col>
+          <!-- 条款搜索，前端写死加一个适用市场 -->
+          <a-col :md="(24 / (minLength + 1))"
+                 :sm="(24 / minLength)"
+                 :key="-1"
+                 v-if="currStandardType === '4'"
+                 style="line-height: 48px">
+            <!-- 适用市场 -->
+            <a-form-item :label="$t('applicableMarket')" :labelCol="labelCol" :wrapperCol="wrapperCol" :colon="false">
+              <s-tree-select v-model="queryParam.country"
+                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                             style="width: 100%"
+                             :tree-data="applicableMarketList"
+                             tree-checkable
+                             treeCheckStrictly
+                             :replaceFields="{title: isChinese() ? 'title' : 'enTitle'}"
+                             :placeholder="$t('pleaseSelect') + $t('applicableMarket')"/>
+
+            </a-form-item>
+          </a-col>
         </a-row>
       </a-form>
       <div class="table-page-search-submitButtons">
@@ -255,10 +274,11 @@ import { previewPdf } from '../../../utils/previewPdf'
 import { kkFilePreview } from '../../../utils/kkFilePreview'
 import JDatePicker from '@comp/JDatePicker'
 import SplitClauseDetail from '@views/documentTool/documentSplit/modules/SplitClauseDetail'
+import STreeSelect from '@comp/STreeSelect'
 
 export default {
   name: 'AdvancedSearch',
-  components: { SplitClauseDetail, JDatePicker, JTable },
+  components: { STreeSelect, SplitClauseDetail, JDatePicker, JTable },
   data () {
     return {
       FieldType,
@@ -394,6 +414,13 @@ export default {
           dataIndex: 'item_title',
           scopedSlots: { customRender: 'text' }
         },
+        { // 标题译文
+          title: this.$t('clauseTitleTranslation'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'title_translation',
+          scopedSlots: { customRender: 'text' }
+        },
         { // 条款内容
           title: this.$t('dashboard.advancedSearch.termContent'),
           align: 'center',
@@ -522,7 +549,8 @@ export default {
       // 国标和外标的默认标准状态
       defaultStandardStatus: ``,
       // 企标的默认标准状态
-      defaultEnStandardStatus: `${EnterpriseStandardStatus.CURRENTLY_EFFECTIVE.value}`
+      defaultEnStandardStatus: `${EnterpriseStandardStatus.CURRENTLY_EFFECTIVE.value}`,
+      applicableMarketList: [] // 条款增加适用市场字段，前端写死
     }
   },
   computed: {
@@ -570,9 +598,18 @@ export default {
     this.getQueryConditionFunc = getDomesticStandardQuery
     this.getSearch()
     this.getSysCategoryTree()
+    this.getCountryOption()
     this.queryParam.standard_state = this.defaultStandardStatus
   },
   methods: {
+    // 获取适用市场下拉数据
+    getCountryOption () {
+      getFormDictTreeList({ dictId: '1801130851452059649' }).then(res => {
+        if (res.success) {
+          this.applicableMarketList = res.result || []
+        }
+      })
+    },
     // 显示条款内容弹框
     showContent (val) {
       this.$refs.splitClauseDetail.open(val)

From cc546eb28934be7b679f6d0eb623fd1ffc2961d2 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 11 Sep 2024 11:57:15 +0800
Subject: [PATCH 06/29] =?UTF-8?q?[update=20=E6=B5=81=E7=A8=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85]=20=E9=9D=9E=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=A4=8D=E9=80=89=E6=A1=86=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProcessDetailList.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue
index b676657..b87e205 100644
--- a/src/components/ProcessDetailList.vue
+++ b/src/components/ProcessDetailList.vue
@@ -41,7 +41,7 @@
           :can-drag="true"
           :loading="loading"
           :rowKey="record => {return record.id + ',' + (record.taskId || '')}"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps: getCheckboxProps }"
           :pagination="ipagination"
           :scroll="{x: '100%', y: yScrollHeight}"
           @change="handleTableChange">
@@ -262,6 +262,15 @@ export default {
     }
   },
   methods: {
+    // 表格复选框props
+    getCheckboxProps (record) {
+      return {
+        props: {
+          // 不是进行中的禁用复选框 1进行中 2已完成
+          disabled: record.finishFlag + '' !== '1'
+        }
+      }
+    },
     loadData (arg) {
       if (!this.url.list) {
         this.$message.warning('请设置url.list属性!')

From 1fe97251df5b6280105e9d1635241a5bb63973fe Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 11 Sep 2024 12:01:49 +0800
Subject: [PATCH 07/29] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=A0=91=E8=8A=82=E7=82=B9=E6=8E=92=E5=BA=8F]=20?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=90=8E=E4=BF=9D=E7=95=99=E4=B8=8A=E6=AC=A1?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentSplit/modules/SplitTreeOrderModal.vue            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/documentTool/documentSplit/modules/SplitTreeOrderModal.vue b/src/views/documentTool/documentSplit/modules/SplitTreeOrderModal.vue
index c084c33..00fbbde 100644
--- a/src/views/documentTool/documentSplit/modules/SplitTreeOrderModal.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitTreeOrderModal.vue
@@ -231,7 +231,9 @@ export default {
           const treeData = res.result || []
           treeData.forEach(node => this.addTitleToNodes(node))
           this.treeData = treeData
-          this.expandedKeys = this.treeData.length > 0 ? [this.treeData[0].id] : []
+          if (this.treeData.length > 0 && this.expandedKeys <= 0) {
+            this.expandedKeys = [this.treeData[0].id]
+          }
         }
       }).finally(() => {
         this.confirmLoading = false
@@ -249,6 +251,7 @@ export default {
       this.$emit('close')
       this.model = {}
       this.treeData = []
+      this.expandedKeys = []
       this.visible = false
     },
     handleCancel () {

From d94aac793d8f734d75942f1663d564fee81dcfef Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 12 Sep 2024 10:22:20 +0800
Subject: [PATCH 08/29] =?UTF-8?q?[fix=20uat94]=20=E6=8E=92=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E6=8B=89=E6=A1=86=E6=95=B0=E6=8D=AE=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=EF=BC=9A=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/EngineerInitBaseInfo.vue          | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
index 547edeb..cdf1089 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
@@ -109,14 +109,24 @@
                 </span>
             </div>
             <a-form-model-item class="item-model" prop="applicableMarket">
-              <market-regulations-list-selection
-                v-model="formInline.applicableMarket"
-                type="radio"
-                @numberChange="marketRegulationNumberChange"
-                :name-str="formInline.applicableMarketNo"
-                :disabled="isRejectedData"
-                selectOnly
-                :placeholder="$t('pleaseSelect')+$t('applicableMarket')" />
+              <s-tree-select
+                             v-model="formInline.applicableMarket"
+                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                             style="width: 100%"
+                             :tree-data="countryOptions"
+                             tree-checkable
+                             treeCheckStrictly
+                             :disabled="isRejectedData"
+                             :replaceFields="{title: isChinese() ? 'title' : 'enTitle'}"
+                             :placeholder="$t('pleaseSelect')+$t('applicableMarket')" />
+              <!--<market-regulations-list-selection-->
+              <!--  v-model="formInline.applicableMarket"-->
+              <!--  type="radio"-->
+              <!--  @numberChange="marketRegulationNumberChange"-->
+              <!--  :name-str="formInline.applicableMarketNo"-->
+              <!--  :disabled="isRejectedData"-->
+              <!--  selectOnly-->
+              <!--  :placeholder="$t('pleaseSelect')+$t('applicableMarket')" />-->
             </a-form-model-item>
           </div>
           <!--  是否与上一版相同,是添加标准的新增的数据并且分解单来源不是不带入时显示  -->
@@ -266,6 +276,9 @@ import { getFileAccessHttpUrl, downloadFile } from '@/api/manage'
 import { kkFilePreview } from '@/utils/kkFilePreview'
 import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail'
 import JUploadImport from '../../../../components/JUploadImport'
+// import { marketRegulationGetListNumber } from '../../../../api/standardRegulationLibraryApi'
+import STreeSelect from '@/components/STreeSelect'
+
 
 const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw']
 const FILE_TYPE_PDF = 'pdf'
@@ -279,7 +292,8 @@ const uidGenerator = () => {
 export default {
   name: 'EngineerInitBaseInfo',
   components: {
-    MarketRegulationsListSelection,
+    STreeSelect,
+    // MarketRegulationsListSelection,
     JTable,
     ManualAddModal,
     StandardSelectionModal,

From 67a0ad926ab453a95832cc816d8974b8e99d051a Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 12 Sep 2024 10:26:49 +0800
Subject: [PATCH 09/29] =?UTF-8?q?[fix=20uat124]=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=20=E4=B8=BB=E6=8E=A7=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=BF=AE=E6=94=B9=E6=88=90=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketRegulationsList/modules/MarketRegulationsModal.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
index 835f376..f18f0ab 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
@@ -85,6 +85,7 @@
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.mainControlDepartment')">
             <j-select-depart :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.mainControlDepartment')"
                              :backDepart="true"
+                             :multi="true"
                              v-decorator.trim="[ 'mainDept', validatorRules.mainDept ]" />
           </a-form-item>
           <!--   主控部门专业模块  -->

From 19e7b9386ba3264af01fb518efee68a45d10cd02 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 12 Sep 2024 11:56:09 +0800
Subject: [PATCH 10/29] =?UTF-8?q?[update=20=E8=A7=A3=E8=AF=BB=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B]=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/InterpretationClauseTableModal.vue                   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
index 5b8e389..a64e674 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
@@ -170,7 +170,6 @@
                                 :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.enterpriseStandards')"
                                 :disabled="disabled"
                                 :disabledSourceSearch="true"
-                                type="radio"
                                 selectOnly
                                 v-decorator="['enterpriseStandard']" />
           </a-form-item>

From df196d504efa4b222c1955d993246f74eea1a065 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 12 Sep 2024 14:26:03 +0800
Subject: [PATCH 11/29] =?UTF-8?q?[fix=20uat124]=20=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=20=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=B8=82=E5=9C=BA=E6=B8=85=E5=8D=95+=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E6=B8=85=E5=8D=95=E7=BC=96=E7=A0=81=E7=9A=84=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lang/standardRegulationLibrary/en-us.js   |  1 +
 .../lang/standardRegulationLibrary/zh-cn.js   |  1 +
 .../MarketRegulationsFormPage.vue             | 87 ++++++++++++++-----
 3 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js
index c58fb05..4f0f5ba 100644
--- a/src/common/lang/standardRegulationLibrary/en-us.js
+++ b/src/common/lang/standardRegulationLibrary/en-us.js
@@ -71,6 +71,7 @@ module.exports = {
     releaseTime: 'Published Date',
     listState: 'Status',
     customName: 'Custom Name',
+    customNameLastText: '车型需满足标准法规清单',
     securityClass: 'Confidential Level',
     listDeclaration: 'Manifest Declaration',
     templateName: 'Market regulation list import template',
diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js
index 634a48c..176e62d 100644
--- a/src/common/lang/standardRegulationLibrary/zh-cn.js
+++ b/src/common/lang/standardRegulationLibrary/zh-cn.js
@@ -71,6 +71,7 @@ module.exports = {
     releaseTime: '发布时间',
     listState: '清单状态',
     customName: '自定义名称',
+    customNameLastText: '车型需满足标准法规清单',
     securityClass: '密级',
     listDeclaration: '清单说明',
     templateName: '市场法规清单导入模板',
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
index 45e3ebf..a01f680 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
@@ -25,25 +25,32 @@
             </a-form-item>
           </a-col>
           <!--  清单编号英文缩写  -->
-          <a-col :span="12" v-if="isShowManifestNo">
-            <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.listNumberEnglishPart')"
-                         :labelCol="labelCol"
-                         :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listNumberEnglishPart')"
-                       :maxLength="192"
-                       v-decorator="['manifestNo', validatorRules.manifestNo]" />
-            </a-form-item>
-          </a-col>
+          <!--<template v-if="isShowManifestNo">-->
+          <a-form-item class="block-form-item" :label="$t('standardRegulationLibrary.marketRegulationsList.listNumber')"
+                       :labelCol="lineLabelCol"
+                       :wrapperCol="lineWrapperCol">
+            <!--固定的编码-->
+            <span>BZFG-</span>
+            <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listNumberEnglishPart')"
+                     :maxLength="192"
+                     v-decorator="['manifestNo', validatorRules.manifestNo]" />
+            <!--后端生成的序号-->
+            <span>-{{model.columnNo}}</span>
+          </a-form-item>
+          <!--</template>-->
           <!--  自定义名称  -->
-          <a-col :span="12">
-            <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.customName')"
-                         :labelCol="labelCol"
-                         :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.customName')"
-                       :maxLength="200"
-                       v-decorator="['customColumnName', validatorRules.customColumnName]" />
-            </a-form-item>
-          </a-col>
+          <!--<a-col :span="24">-->
+          <a-form-item class="block-form-item" :label="$t('standardRegulationLibrary.marketRegulationsList.listName')"
+                       :labelCol="lineLabelCol"
+                       :wrapperCol="lineWrapperCol">
+            <!--国家地区-->
+            <span>{{model.countryName}}</span>
+            <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.customName')"
+                     :maxLength="200"
+                     v-decorator="['customColumnName', validatorRules.customColumnName]" />
+            <span>{{ $t('standardRegulationLibrary.marketRegulationsList.customNameLastText') }}</span>
+          </a-form-item>
+          <!--</a-col>-->
           <!--  驾驶位置  -->
           <a-col :span="12">
             <a-form-item :labelCol="labelCol"
@@ -256,7 +263,7 @@ export default {
       SecurityClass,
       pageLoading: false,
       form: this.$form.createForm(this),
-      model: { manifest: {}, lists: [] },
+      model: { manifest: {}, lists: [], columnNo: 'XXX', countryName: '' },
       queryParam: {},
       countryOptions: [], // 国家下拉选择
       labelCol: {
@@ -512,17 +519,33 @@ export default {
       // const value = this.form.getFieldValue('country')
       console.log('--------value', value)
       const param = {}
-      param.country = value && value.length > 0 ? value.map(item => item.value).join(',') : ''
+      if (value && value.length > 0) {
+        param.country = value.map(item => item.value).join(',')
+        this.model.countryName = value.map(item => item.label).join('')
+      } else {
+        param.country = ''
+        this.model.countryName = ''
+      }
+
       marketRegulationGetListNumber(param).then(res => {
         if (res.success) {
+          const noText = res.message ? res.message.split(',')[0] : ''
           const result = {
-            manifestNo: res.message
+            manifestNo: noText
           }
           // 显示清单编号英文名称缩写
           this.isShowManifestNo = true
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(result, 'manifestNo'))
           })
+
+        } else {
+          const result = {
+            manifestNo: ''
+          }
+          this.$nextTick(() => {
+            this.form.setFieldsValue(pick(result, 'manifestNo'))
+          })
         }
       })
     },
@@ -540,14 +563,22 @@ export default {
             this.model.country = this.model.country.split(',').map(item => {
               return { value: item }
             })
+            // 清单名称
+            this.model.countryName = this.model.country_dictText.split(',').join('')
           }
+          // 清单编号的转换
+          const manifestNoAll = this.model.manifestNo
           // 从清单编号截取英文缩写
-          this.model.manifestNo = this.model.manifestNo.split('-')[1]
+          this.model.manifestNo = manifestNoAll.split('-')[1]
+          // 清单标号 里面的序号
+          this.model.columnNo = manifestNoAll.split('-')[2]
+
           // 显示清单编号英文名称缩写
           this.isShowManifestNo = true
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model, 'country', 'manifestNo', 'customColumnName', 'drivePosition', 'securityLevel', 'manifestDesc', 'file'))
           })
+          this.$forceUpdate()
         }
       }).finally(() => {
         this.pageLoading = false
@@ -715,4 +746,16 @@ export default {
     z-index: 999;
   }
 }
+
+/deep/.block-form-item{
+  clear: both;
+  .ant-form-item-children {
+    display: flex;
+    align-items: center;
+    input {
+      flex: 1;
+      margin: 0 10px;
+    }
+  }
+}
 </style>

From e546efd604f8682af61072212e0f381e330aeecb Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 12 Sep 2024 14:36:32 +0800
Subject: [PATCH 12/29] =?UTF-8?q?[fix=20uat126]=E5=85=A8=E5=B1=80=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=20=E2=80=9C=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E8=AF=95=E7=94=A8=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/standardRegulationLibrary/zh-cn.js   |  2 +-
 src/common/lang/zh-cn.js                             |  2 +-
 .../MarketRegulationsListSelectionModal.vue          |  4 ++--
 src/views/dashboard/modules/SearchAndWarningCard.vue |  2 +-
 .../MarketRegulationsDetailPage.vue                  |  2 +-
 .../MarketRegulationsFormPage.vue                    | 10 +++++-----
 .../marketRegulationsList/MarketRegulationsList.vue  |  4 ++--
 .../standardMasterPlan/StandardMasterPlanList.vue    |  2 +-
 .../MarketListReleaseProcess.vue                     | 12 ++++++------
 .../modules/BaseInfoForm.vue                         |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js
index 176e62d..c230e45 100644
--- a/src/common/lang/standardRegulationLibrary/zh-cn.js
+++ b/src/common/lang/standardRegulationLibrary/zh-cn.js
@@ -63,7 +63,7 @@ module.exports = {
   marketRegulationsList: {
     listNumber: '清单编号',
     listName: '清单名称',
-    countryRegion: '国家/地区',
+    countryRegion: '适用市场',
     drivingPosition: '驾驶位置',
     author: '作者',
     exportName: '市场法规清单表',
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index bd6d612..4fdd7b2 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -212,7 +212,7 @@ module.exports = {
   maximumSelectFive: '最多选择五条记录！',
   listNumber: '清单编号',
   listName: '清单名称',
-  countryRegion: '国家/地区',
+  countryRegion: '适用市场',
   ccPerson: '抄送人员',
   startDate: '开始日期',
   endDate: '结束日期',
diff --git a/src/components/selection/MarketRegulationsListSelectionModal.vue b/src/components/selection/MarketRegulationsListSelectionModal.vue
index d7d1de1..e4c36be 100644
--- a/src/components/selection/MarketRegulationsListSelectionModal.vue
+++ b/src/components/selection/MarketRegulationsListSelectionModal.vue
@@ -30,7 +30,7 @@
               </a-form-item>
             </a-col>
 
-            <!--   国家/地区  -->
+            <!--   适用市场  -->
             <a-col :md="8" :sm="12">
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.countryRegion')">
                 <a-tree-select
@@ -201,7 +201,7 @@ export default {
         total: 0
       },
       columns: [
-        { // 国家/地区
+        { // 适用市场
           title: this.$t('standardRegulationLibrary.marketRegulationsList.countryRegion'),
           align: 'center',
           width: 180,
diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue
index 31c04d9..e3838c1 100644
--- a/src/views/dashboard/modules/SearchAndWarningCard.vue
+++ b/src/views/dashboard/modules/SearchAndWarningCard.vue
@@ -241,7 +241,7 @@ export default {
           }
         },
         // 市场更新情况start
-        { // 国家/地区
+        { // 适用市场
           title: this.$t('standardRegulationLibrary.marketRegulationsList.countryRegion'),
           align: 'left',
           dataIndex: 'country_dictText',
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
index 024c98a..f32ba85 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
@@ -7,7 +7,7 @@
     </template>
     <div class="content-wrapper">
       <a-row class="basic-info" v-if="ids.length <= 1">
-        <!--  国家/地区 -->
+        <!--  适用市场 -->
         <a-col :span="12">
           <label>{{ $t('standardRegulationLibrary.marketRegulationsList.countryRegion') }}</label>
           <span>{{ (isChinese() ? model.country_dictText : model.country_dictTextEn) || global.emptyLine }}</span>
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
index a01f680..249041d 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
@@ -8,7 +8,7 @@
     <div class="content-wrapper">
       <a-form :form="form">
         <a-row>
-          <!--  国家/地区  -->
+          <!--  适用市场  -->
           <a-col :span="12">
             <a-form-item :labelCol="labelCol"
                          :wrapperCol="wrapperCol"
@@ -283,7 +283,7 @@ export default {
         sm: { span: 20 }
       },
       validatorRules: {
-        // 国家/地区
+        // 适用市场
         country: {
           rules: [{
             required: true,
@@ -505,7 +505,7 @@ export default {
     this.loadData()
   },
   methods: {
-    // 获取国家/地区下拉数据
+    // 获取适用市场下拉数据
     getCountryOption () {
       getFormDictTreeList({ dictId: '1801130851452059649' }).then(res => {
         if (res.success) {
@@ -597,7 +597,7 @@ export default {
           this.pageLoading = true
           const param = {}
           param.manifest = Object.assign({}, values)
-          // 国家/地区是树选择，需要处理格式
+          // 适用市场是树选择，需要处理格式
           param.manifest.country = param.manifest.country.map(item => item.value).join(',')
           let func
           if (this.model && this.model.id) {
@@ -657,7 +657,7 @@ export default {
             form.newProductImplDate = result.new_product_impl_date // 新生产车实施日期
             form.newAuthImplDate = result.new_auth_impl_date // 新认证车实施日期
             form.registrationDate = result.registration_date // 注册日期
-            form.country = this.model.country.map(item => item.value).join(',') // 适用市场，带入清单基本信息的国家/地区
+            form.country = this.model.country.map(item => item.value).join(',') // 适用市场，带入清单基本信息的适用市场
             form.mainDept = result.main_dept // 主控部门
             form.mainDeptProfMode = result.main_dept_prof_mode || undefined // 主控部门专业模块
             form.associateDept = result.associate_dept // 关联部门
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
index 3e85f73..68f797d 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
@@ -23,7 +23,7 @@
             </a-form-item>
           </a-col>
 
-          <!--   国家/地区  -->
+          <!--   适用市场  -->
           <a-col :md="6" :sm="8">
             <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.countryRegion')">
               <a-tree-select
@@ -148,7 +148,7 @@ export default {
     return {
       countryOptions: [], // 国家下拉选择
       columns: [
-        { // 国家/地区
+        { // 适用市场
           title: this.$t('standardRegulationLibrary.marketRegulationsList.countryRegion'),
           align: 'center',
           width: 180,
diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
index 7652e49..a090a3b 100644
--- a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
+++ b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
@@ -180,7 +180,7 @@ export default {
       }
       return filterObj(param)
     },
-    // 获取国家/地区下拉数据
+    // 获取适用市场下拉数据
     getCountryOption () {
       getFormDictTreeList({ dictId: '1801130851452059649' }).then(res => {
         if (res.success) {
diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
index 2583f2d..c607ea9 100644
--- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
+++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
@@ -83,7 +83,7 @@
                          v-decorator="['manifestName', validatorRules.manifestName]" />
               </a-form-item>
             </a-col>
-            <!--   国家/地区  -->
+            <!--   适用市场  -->
             <a-col :span="24">
               <a-form-item
                 :labelCol="$i18n.locale === EN ? longLabelColEn : longLabelCol"
@@ -231,7 +231,7 @@ export default {
     }
   },
   mounted () {
-    // 获取国家/地区下拉数据
+    // 获取适用市场下拉数据
     this.getCountryOption()
     // 初始化节点
     const nodeId = this.$route.query.nodeId
@@ -361,12 +361,12 @@ export default {
       formInline: {},
       approvalInfoForm: this.$form.createForm(this), // 审批信息表单
       personnelInfoData: [],
-      countryOptions: [], // 国家/地区下拉框
+      countryOptions: [], // 适用市场下拉框
       isLook: false
     }
   },
   methods: {
-    // 获取国家/地区下拉框数据
+    // 获取适用市场下拉框数据
     getCountryOption () {
       getFormDictTreeList({ dictId: '1801130851452059649' }).then(res => {
         if (res.success) {
@@ -405,7 +405,7 @@ export default {
                 processInfo.manifestName = this.model.businessInfoDTO.manifestName
                 // 清单说明
                 processInfo.manifestDesc = this.model.businessInfoDTO.manifestDesc
-                // 国家/地区
+                // 适用市场
                 processInfo.country = this.model.businessInfoDTO.country.split(',').map(item => {
                   return { value: item }
                 })
@@ -428,7 +428,7 @@ export default {
                 processInfo.manifestName = this.draftModel.businessInfoDTO.manifestName
                 // 清单说明
                 processInfo.manifestDesc = this.draftModel.businessInfoDTO.manifestDesc
-                // 国家/地区
+                // 适用市场
                 processInfo.country = this.draftModel.businessInfoDTO.country.split(',').map(item => {
                   return { value: item }
                 })
diff --git a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue
index dd5be6a..7768bef 100644
--- a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue
@@ -36,7 +36,7 @@
                      :placeholder="disabled ? '' : $t('autoTakeout')" />
           </a-form-model-item>
         </div>
-        <!--  国家/地区  -->
+        <!--  适用市场  -->
         <div class="box-title-text form-flex-item form-flex-item-half">
           <div class="title-text title-text-long">
             <span class="title-text-text" :title="$t('countryRegion')">
@@ -365,7 +365,7 @@ export default {
           formInline.file = result.file
           // 版本号
           formInline.manifestVersion = result.manifestVersion
-          // 国家/地区
+          // 适用市场
           if (result.country) {
             formInline.country = result.country.split(',').map(item => {
               return { value: item }
@@ -478,7 +478,7 @@ export default {
             formInline.file = result.file
             // 版本号
             formInline.manifestVersion = result.manifestVersion
-            // 国家/地区
+            // 适用市场
             if (result.country) {
               formInline.country = result.country.split(',').map(item => {
                 return { value: item }

From 3de997fbc5bfaa5c0db3f8005e9011ef6e8f5fc2 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 12 Sep 2024 14:44:42 +0800
Subject: [PATCH 13/29] =?UTF-8?q?[fix=20bug]=20=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=20=E6=96=B0=E5=A2=9E/=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=90=8E=E6=9B=B4=E6=96=B0=E6=B8=85=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketRegulationsList/MarketRegulationsFormPage.vue     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
index 249041d..7b4c1ed 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
@@ -611,12 +611,12 @@ export default {
               this.$message.success(this.$t('operationSuccessful'))
               if (!this.model.id) {
                 // 没有id，是新增会返回id，用于下方表格处理
-                this.model = Object.assign({}, values)
+                // this.model = Object.assign({}, values)
                 this.model.id = res.message
                 this.filters.manifestId = this.model.id
-                // 更新清单编号
-                this.initData(this.model.id)
               }
+              // 更新清单编号
+              this.initData(this.model.id)
               this.showList = true
             } else {
               this.$message.warning(res.message)

From 59cb1b8dd2ba630d2d1cdb45084927fc990ae104 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 13 Sep 2024 11:39:26 +0800
Subject: [PATCH 14/29] =?UTF-8?q?[update=20uat=20150]=20=E8=A7=A3=E8=AF=BB?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AF=91=E6=96=87=E5=B1=95=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/StandardResolutionSheet.vue | 35 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue
index a53c9d6..d865be5 100644
--- a/src/components/StandardResolutionSheet.vue
+++ b/src/components/StandardResolutionSheet.vue
@@ -107,10 +107,11 @@
         <!--                         @dragstop="(...args) => onDragstop('standardCatalogueRef', ...args)"></vue-draggable-resizable>-->
       </div>
       <!--内容和译文-->
-      <div class="content-and-translation" :class="{'hide-translation': isContainerExpand}">
+      <div class="content-and-translation" :class="{'hide-translation': isContainerExpand, 'hide-content': isTranslationExpand}">
         <!--标准内容-->
         <div class="sheet-container part-ml" ref="sheetContainerRef"
              @click="handleClickContent"
+             :class="{'hide-translation-text': isTranslationExpand}"
              :style="showClauseLabel === showClauseLabelEnums.hideTranslation ? 'width: 100%' : ''">
           <!--标准名称-->
           <div class="standard-name">
@@ -146,7 +147,12 @@
              class="translation-text part-ml part-common" ref="translationRef"
              @click="handleClickContent"
              :class="{'hide-translation-text': isContainerExpand}">
-          <div class="part-title">{{ $t('standardRegulationLibrary.translation') }}</div>
+          <div class="part-title flex-between">
+            <span>{{ $t('standardRegulationLibrary.translation') }}</span>
+            <a-button type="link" :icon="isTranslationExpand ? 'fullscreen-exit' : 'fullscreen'" @click="handleTranslationExpand">
+              {{ isTranslationExpand ? $t('putAway') : $t('open') }}
+            </a-button>
+          </div>
           <div class="standard-content translation-content">
             <div class="clause-content-item" v-if="Object.keys(clauseLabelInfo).length">
               <div class="clause-content-item-title">{{ clauseLabelInfo.item_num }} {{ clauseLabelInfo.title_translation }}</div>
@@ -163,7 +169,7 @@
       </div>
       <!--条文标签-->
       <div class="clause-label part-ml part-common" ref="clauseLabelRef"
-           :class="{'hide-clause-label': (showClauseLabel === showClauseLabelEnums.hideClauseLable) || isContainerExpand}">
+           :class="{'hide-clause-label': (showClauseLabel === showClauseLabelEnums.hideClauseLable) || isContainerExpand || isTranslationExpand}">
         <div class="part-title">{{ $t('standardRegulationLibrary.clauseLabel') }}</div>
         <div class="has-title-part-content">
           <template v-for="clause in clauseField">
@@ -209,8 +215,8 @@
             <span v-show="isClauseLabelExpand">{{ $t('docTool.split.clauseLabel') }}</span>
           </div>
         </a-tooltip>
-        <!--展示译文-->
-        <a-tooltip placement="left">
+        <!--隐藏译文(展开译文就不能展示该按钮)-->
+        <a-tooltip placement="left" v-if="!isTranslationExpand">
           <template #title>{{ $t('docTool.split.originalText') }}</template>
           <div class="clause-label-change-item"
                :class="{'clause-label-change-item-selected': showClauseLabel === showClauseLabelEnums.hideTranslation}"
@@ -284,6 +290,7 @@ export default {
       isClauseLabelExpand: true, // 条文/条文标签切换部分是否展开，控制是否只显示图标
       isCatalogueExpand: true, // 标准目录收起
       isContainerExpand: false, // 条文是否展开
+      isTranslationExpand: false, // 译文是否展开
       loading: false,
       spiltInfo: {}, // 拆分的整体信息
       clauseContentList: [], // 条文内容的数据
@@ -510,6 +517,13 @@ export default {
       //   this.isCatalogueExpand = true
       // }
     },
+    /**
+     * 译文展开
+     */
+    handleTranslationExpand () {
+      this.isTranslationExpand = !this.isTranslationExpand
+      this.isCatalogueExpand = !this.isTranslationExpand
+    },
     /**
      * 条文标签切换
      * @param flag - 1 隐藏条文标签 2 全部显示 3 隐藏译文
@@ -628,6 +642,9 @@ export default {
   &.hide-translation .sheet-container {
     width: 100%;
   }
+  &.hide-content .translation-text {
+    width: 100%;
+  }
 }
 
 .sheet-container {
@@ -649,7 +666,8 @@ export default {
   height: calc(100% - 40px);
 }
 
-.hide-translation-text {
+.hide-translation-text,
+.hide-content-text {
   width: 0 !important;
   overflow: hidden;
   margin-left: 0;
@@ -889,4 +907,9 @@ export default {
 .table-page-search-wrapper .ant-form-inline /deep/ .ant-form-item > .ant-form-item-label {
   min-width: auto;
 }
+.flex-between {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>

From 667c816d0bc05e2e213820fa8fbb05ef8c2523e5 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 11:48:46 +0800
Subject: [PATCH 15/29] =?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=AD=E7=9A=84=E9=80=82?=
 =?UTF-8?q?=E7=94=A8=E5=B8=82=E5=9C=BA=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E5=90=8E=E7=BB=99=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/EngineerInitBaseInfo.vue              | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
index cdf1089..2c43ad0 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
@@ -527,8 +527,13 @@ export default {
       }
       const formInline = {}
       formInline.modelFile = data.standardInfo.modelFile
-      formInline.applicableMarket = data.standardInfo.applicableMarket
-      formInline.applicableMarketNo = data.standardInfo.applicableMarketNo
+      if (data.standardInfo.applicableMarket) {
+        formInline.applicableMarket = data.standardInfo.applicableMarket.split(',').map(item => {
+          return { value: item }
+        })
+      }
+      // formInline.applicableMarket = data.standardInfo.applicableMarket
+      // formInline.applicableMarketNo = data.standardInfo.applicableMarketNo
       formInline.isSameLastVersion = data.standardInfo.isSameLastVersion
       this.formInline = Object.assign({}, formInline)
       if (data.detailInfoList && data.detailInfoList.length > 0) {
@@ -548,6 +553,8 @@ export default {
       // 组合businessInfoDTO，抛出
       const data = {}
       data.standardInfo = Object.assign({}, this.standardDataSource[0], this.formInline)
+      // 处理适用市场的格式
+      data.standardInfo.applicableMarket = data.standardInfo.applicableMarket.map(item => item.value).join(',')
       // 更换标准后是否重新生成了，保存json的时候存一下,防止保存之前改了标准，再次办理的时候直接提交校验不到改了标准
       data.isChangeStandardAfterClickGenerate = this.isChangeStandardAfterClickGenerate ? '1' : '0'
       data.detailInfoList = JSON.parse(JSON.stringify(this.dataList))
@@ -569,6 +576,8 @@ export default {
             data = false
           } else {
             data.standardInfo = Object.assign({}, this.standardDataSource[0], this.formInline)
+            // 处理适用市场的格式
+            data.standardInfo.applicableMarket = data.standardInfo.applicableMarket.map(item => item.value).join(',')
             data.detailInfoList = JSON.parse(JSON.stringify(this.dataList))
           }
         } else {
@@ -747,6 +756,8 @@ export default {
             if ((param.standardId && param.splitFileSource === DecompositionSource.NO_INPUT.value) || !param.standardId) {
               param.isSameLastVersion = undefined
             }
+            // 处理适用市场的格式
+            param.applicableMarket = param.applicableMarket.map(item => item.value).join(',')
             regulatoryComplianceCheckGenerate(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)

From f74ef8bf396d7096e95e148abc3dd6cee32c20b8 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 13 Sep 2024 11:56:29 +0800
Subject: [PATCH 16/29] =?UTF-8?q?[update=20uat=20156]=20=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E5=8E=BB=E6=8E=89=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/Breadcrumb.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/tools/Breadcrumb.vue b/src/components/tools/Breadcrumb.vue
index 0965155..48fbb5f 100644
--- a/src/components/tools/Breadcrumb.vue
+++ b/src/components/tools/Breadcrumb.vue
@@ -1,10 +1,10 @@
 <template>
   <a-breadcrumb class="breadcrumb">
     <a-breadcrumb-item v-for="(item, index) in breadList" :key="index">
-      <router-link v-if="item.name + '' !== name + ''" :to="{ path: item.path }">
-        {{ item.meta[showKey] || item.meta.title }}
-      </router-link>
-      <span v-else>{{ item.meta[showKey] || item.meta.title }}</span>
+      <!--<router-link v-if="item.name + '' !== name + ''" :to="{ path: item.path }">-->
+      <!--  {{ item.meta[showKey] || item.meta.title }}-->
+      <!--</router-link>-->
+      <span>{{ item.meta[showKey] || item.meta.title }}</span>
     </a-breadcrumb-item>
   </a-breadcrumb>
 </template>

From cdd96e73c73c9c5aab51e7f0cef1a3bda0907fef Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 13 Sep 2024 14:49:06 +0800
Subject: [PATCH 17/29] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86-=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=8B=86=E5=88=86=E7=BB=93=E6=9E=9C]=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=86=E5=88=AB=E7=88=B6=E5=AD=90=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/en-us.js                        |  3 ++-
 src/common/lang/zh-cn.js                        |  3 ++-
 .../modules/ImportSplitResultModal.vue          | 17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index 4a3a264..261a2ed 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -571,7 +571,8 @@ module.exports = {
       numberColumns: 'Number Of Columns',
       maximumSelection: 'Maximum Selection',
       pieceOfData: 'Article Data',
-      cornerMark: 'Corner Mark'
+      cornerMark: 'Corner Mark',
+      childParentLink: 'Identify Parent-Child Relationship'
     },
     // 文档比对
     comparison: {
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index 4fdd7b2..05a1197 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -571,7 +571,8 @@ module.exports = {
       numberColumns: '列数',
       maximumSelection: '最多选择',
       pieceOfData: '条数据',
-      cornerMark: '角标'
+      cornerMark: '角标',
+      childParentLink: '识别父子关系'
     },
     // 文档比对
     comparison: {
diff --git a/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
index 4c8ee16..991ac68 100644
--- a/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
+++ b/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
@@ -43,6 +43,16 @@
             :triggerChange="false"
             :dictCode="'process_manuscript'" />
         </a-form-item>
+        <!--识别父子关系-->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.split.childParentLink')">
+          <j-dict-select-tag
+            class="box-input"
+            v-decorator="['childParentLink', validatorRules.childParentLink]"
+            :placeholder="$t('pleaseSelect') + $t('docTool.split.childParentLink')"
+            :type="'select'"
+            :triggerChange="false"
+            :dictCode="'yn'" />
+        </a-form-item>
         <!--拆分结果文件-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.split.splitResultFile')">
           <div class="result-file-box">
@@ -72,7 +82,7 @@ import StandardSelection from '../../../../components/selection/StandardSelectio
 import { importSplitResult } from '@api/documentToolApi'
 import { getFileInfo } from '@api/api'
 import { downloadFile } from '@api/manage'
-import { StandardSource } from '../../../../enums/commonEnums'
+import { StandardSource, YesOrNoEnum } from '../../../../enums/commonEnums'
 
 export default {
   name: 'ImportSplitResultModal',
@@ -112,6 +122,11 @@ export default {
         splitFileId: {
           rules: [{ required: true, message: this.$t('uploadFile.pleaseUpload') + this.$t('docTool.split.splitResultFile') }],
           validateTrigger: 'change'
+        },
+        // 识别父子关系
+        childParentLink: {
+          validateTrigger: 'change',
+          initialValue: YesOrNoEnum.NO.value
         }
       },
       standardInfo: {}, // 选择的标准

From aad54426824407d1b9998443fd6c2757eca0ff64 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 15:40:17 +0800
Subject: [PATCH 18/29] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=AD=97=E5=85=B8=E9=A1=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=92=8C=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E9=A1=B9=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=AE=80=E5=86=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/en-us.js                                 | 1 +
 src/common/lang/system/en.js                             | 1 +
 src/common/lang/system/zh.js                             | 1 +
 src/common/lang/zh-cn.js                                 | 1 +
 src/views/system/modules/DictItemModal.vue               | 9 +++++++++
 .../system/tags/modules/TagContentDictItemModal.vue      | 8 ++++++++
 6 files changed, 21 insertions(+)

diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index 261a2ed..508817d 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -439,6 +439,7 @@ module.exports = {
     dictList: 'Dictionary List',
     // 字典配置项新增，编辑弹框
     dataValue: 'Data Value',
+    englishAbbreviation: 'English abbreviation',
     rankingValue: 'Ranking Value',
     valueSmallerIsHigher: 'The smaller the value, the higher the value',
     valueCannotContainSpecChar: 'Data values cannot contain special characters!',
diff --git a/src/common/lang/system/en.js b/src/common/lang/system/en.js
index c6f04c7..5a2c0e5 100644
--- a/src/common/lang/system/en.js
+++ b/src/common/lang/system/en.js
@@ -50,6 +50,7 @@ module.exports = {
     //  字段列表
     name: 'Name',
     dataValue: 'Value',
+    englishAbbreviation: 'English abbreviation',
     parentName: 'Parent Name',
     select: 'Select',
     tree: 'Tree',
diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js
index 2f62801..ce0c595 100644
--- a/src/common/lang/system/zh.js
+++ b/src/common/lang/system/zh.js
@@ -50,6 +50,7 @@ module.exports = {
     //  字段列表
     name: '名称',
     dataValue: '数据值',
+    englishAbbreviation: '英文简称',
     parentName: '父级名称',
     select: '下拉选择',
     tree: '树形结构',
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index 05a1197..1063c29 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -439,6 +439,7 @@ module.exports = {
     dictList: '字典列表',
     // 字典配置项新增，编辑弹框
     dataValue: '数据值',
+    englishAbbreviation: '英文简称',
     rankingValue: '排序值',
     valueSmallerIsHigher: '值越小越靠前',
     valueCannotContainSpecChar: '数据值不能包含特殊字符！',
diff --git a/src/views/system/modules/DictItemModal.vue b/src/views/system/modules/DictItemModal.vue
index bfb8a27..0fcd0ff 100644
--- a/src/views/system/modules/DictItemModal.vue
+++ b/src/views/system/modules/DictItemModal.vue
@@ -40,6 +40,15 @@
           <a-input :placeholder="$t('pleaseEnter') + $t('dict.dataValue')" v-model="model.itemValue" :maxLength="50" />
         </a-form-model-item>
 
+        <!--  英文简称  -->
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="enBase"
+          :label="$t('dict.englishAbbreviation')">
+          <a-input :placeholder="$t('pleaseEnter') + $t('dict.englishAbbreviation')" v-model="model.enBase" :maxLength="50" />
+        </a-form-model-item>
+
         <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
diff --git a/src/views/system/tags/modules/TagContentDictItemModal.vue b/src/views/system/tags/modules/TagContentDictItemModal.vue
index 746c619..101c86f 100644
--- a/src/views/system/tags/modules/TagContentDictItemModal.vue
+++ b/src/views/system/tags/modules/TagContentDictItemModal.vue
@@ -54,6 +54,14 @@
           />
         </a-form-model-item>
 
+        <!--  英文简称  -->
+        <a-form-model-item prop="enBase" :label="$t('dict.englishAbbreviation')">
+          <a-input
+            :placeholder="$t('pleaseEnter') + $t('dict.englishAbbreviation')"
+            v-model="model.enBase"
+            :maxLength="50" />
+        </a-form-model-item>
+
         <a-form-model-item :label="$t('description')">
           <a-input :maxLength="50"
                    v-model="model.description"

From 64bf4ac5b32aab4086b41699cd72b210cf7ff968 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 15:52:39 +0800
Subject: [PATCH 19/29] =?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?=E8=AF=84=E4=BC=B0=E5=BA=93=E5=88=97=E8=A1=A8=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F=EF=BC=8C=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E4=BA=BA=EF=BC=8C=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E5=BA=93=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD=E4=BA=BA?=
 =?UTF-8?q?=E5=92=8C=E5=85=B3=E9=97=AD=E6=97=B6=E9=97=B4=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulatoryComplianceAssessmentDatabase/en.js   |  7 +++++--
 .../regulatoryComplianceAssessmentDatabase/zh.js   |  7 +++++--
 .../nonmatchItem/NonmatchItemList.vue              | 14 ++++++++++++++
 .../RegulatoryComplianceAssessmentList.vue         |  2 +-
 .../modules/AssessmentLookModal.vue                |  7 +++++++
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js b/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
index 0d551a4..972bdfe 100644
--- a/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
+++ b/src/common/lang/regulatoryComplianceAssessmentDatabase/en.js
@@ -3,7 +3,8 @@ module.exports = {
   // 法规符合性评估库
   assessmentLibrary: {
     applicableMarket: 'Applicable Market',
-    dateOfEvaluation: 'Date of Assessment',
+    evaluationSponsor: 'Evaluation sponsor',
+    dateOfEvaluation: 'Evaluation completion date',
     exportName: 'Non-conformance term Library Table',
     clauseNumber: 'Article No.',
     vehicleType: 'Vehicle Catagory',
@@ -40,6 +41,8 @@ module.exports = {
     sharedWithOtherProjects: 'Commonality',
     costOfThisItemAfterSharing: 'Expenses After Sharing',
     isHaveClosed: 'Select the data whose rectification status is to be rectified and close it',
-    exportName: 'Non-conformance term Library table'
+    exportName: 'Non-conformance term Library table',
+    shutter: 'Shutter',
+    closingTime: 'Closing time'
   }
 }
diff --git a/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js b/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
index 297fa13..1603a54 100644
--- a/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
+++ b/src/common/lang/regulatoryComplianceAssessmentDatabase/zh.js
@@ -3,7 +3,8 @@ module.exports = {
   // 法规符合性评估库
   assessmentLibrary: {
     applicableMarket: '适用市场',
-    dateOfEvaluation: '评估日期',
+    evaluationSponsor: '评估发起人',
+    dateOfEvaluation: '评估完成日期',
     exportName: '法规符合性评估库表',
     clauseNumber: '条款号',
     vehicleType: '车型',
@@ -40,6 +41,8 @@ module.exports = {
     sharedWithOtherProjects: '与其他项目共用性',
     costOfThisItemAfterSharing: '共用后本项目所需费用',
     isHaveClosed: '请选择整改状态为待整改的数据进行关闭',
-    exportName: '不符合项库表'
+    exportName: '不符合项库表',
+    shutter: '关闭人',
+    closingTime: '关闭时间'
   }
 }
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
index 0555a5f..2e1636f 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
@@ -259,6 +259,20 @@ export default {
           dataIndex: 'file',
           scopedSlots: { customRender: 'file' }
         },
+        { // 关闭人
+          title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.shutter'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'closeUser_dictText',
+          scopedSlots: { customRender: 'text' }
+        },
+        { // 关闭时间
+          title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.closingTime'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'closeTime',
+          scopedSlots: { customRender: 'text' }
+        },
         {
           title: this.$t('operation'),
           scopedSlots: { customRender: 'action' },
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
index bb2c45d..bc7a9a8 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
@@ -146,7 +146,7 @@ export default {
           dataIndex: 'applicableMarket_dictText',
           scopedSlots: { customRender: 'dictText' }
         },
-        { // 评估日期
+        { // 评估完成日期
           title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.dateOfEvaluation'),
           align: 'center',
           width: 180,
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
index 43c4b02..7ae5cef 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
@@ -207,6 +207,13 @@ export default {
           dataIndex: 'result_dictText',
           scopedSlots: { customRender: 'dictText' }
         },
+        { // 评估发起人
+          title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.evaluationSponsor'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'assessorInitiator_dictText',
+          scopedSlots: { customRender: 'text' }
+        },
         { // 不满足要求的现状
           title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.theStatusNotMeetRequirements'),
           align: 'center',

From e6e523b54cf80c6408f1fb1472bde9f2cb80ea9e Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 16:49:02 +0800
Subject: [PATCH 20/29] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=A4=96=E6=9D=A5=E6=A0=87=E5=87=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=8F=AF=E4=BB=A5=E6=94=B6=E8=97=8F=E5=92=8C?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ForeignStandardDetailPage.vue      | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
index 71c957b..90dfa0b 100644
--- a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
+++ b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
@@ -8,6 +8,13 @@
       <div class="detail-page-part">
         <div class="detail-page-part-title">
           <span>{{ $t('dataInfo') }}</span>
+          <div class="detail-page-part-title-operate-box">
+            <!--  收藏  -->
+            <a-button type="link" @click="handleCollection" v-has="'domesticStandard:collection'">
+              <i class="iconfont icon-star1" v-show="detailData.collectionFlag" />
+              <i class="iconfont icon-star" v-show="!detailData.collectionFlag" />
+            </a-button>
+          </div>
         </div>
         <div class="detail-page-part-form">
           <div class="detail-page-part-form-item">
@@ -170,6 +177,10 @@ import { downloadFile, getFileAccessHttpUrl } from '../../../../api/manage'
 import { previewPdf } from '../../../../utils/previewPdf'
 import { kkFilePreview } from '../../../../utils/kkFilePreview'
 import { queryStandardInfoByStandardNumber } from '../../../../utils/util'
+import {
+  cancelCollectionForeignStandard,
+  collectionForeignStandard
+} from '../../../../api/standardRegulationLibraryApi'
 
 // 外来标准法规权限
 const ForeignStandardPermission = {
@@ -196,6 +207,7 @@ export default {
     return {
       DisplayAreaManagement,
       loading: false,
+      collectionFlag: false,
       partList: [], // 页面模块列表
       form: {}, // 页面字段
       // 页面数据
@@ -454,7 +466,38 @@ export default {
       this.$openPageNewSheet({
         path, query
       })
-    }
+    },
+    /**
+     * 收藏/取消收藏
+     * @param record
+     */
+    handleCollection () {
+      if (this.collectionFlag || this.loading) {
+        return
+      }
+      this.collectionFlag = true
+      let params
+      let submitFunc
+      // 取消收藏
+      if (this.detailData.collectionFlag) {
+        params = { id: this.detailData.id, standardNumber: this.detailData.standard_number }
+        submitFunc = cancelCollectionForeignStandard
+      } else {
+        params = { standardId: this.detailData.id, standardNumber: this.detailData.standard_number }
+        submitFunc = collectionForeignStandard
+      }
+      // 收藏
+      submitFunc(params).then(res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.initDetailData()
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.collectionFlag = false
+      })
+    },
   }
 }
 </script>
@@ -502,4 +545,11 @@ export default {
 .title-red-span {
   color: #D52C26;
 }
+
+//.icon-star1 {
+//  color: rgba(243, 129, 65);
+//}
+//.icon-star {
+//  color: rgba(243, 129, 65, 0.50);
+//}
 </style>

From 98675ac1c3bba87249a6426268f02c8c27e64afa Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 17:13:57 +0800
Subject: [PATCH 21/29] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=88=97=E6=8C=89=E9=92=AE=E7=9A=84=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAsource=E5=8F=AA=E6=9C=89=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=96=B0=E5=A2=9E=E6=89=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/UserList.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 509d551..326c28e 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -313,8 +313,8 @@ export default {
           clickEvent: 'handleEdit',
           has: 'user:edit',
           show: (record) => {
-            // IAM同步过来的不能编辑
-            return record.source !== UserSource.IAM.value
+            // 只有系统新增的可以编辑
+            return record.source === UserSource.SYSTEMADD.value
           }
         },
         // 详情
@@ -329,8 +329,8 @@ export default {
           clickEvent: 'handleChangePassword',
           has: 'user:password',
           show: (record) => {
-            // IAM同步过来的不能编辑
-            return record.source !== UserSource.IAM.value
+            // 只有系统新增的可以编辑
+            return record.source === UserSource.SYSTEMADD.value
           }
         },
         // 删除
@@ -339,8 +339,8 @@ export default {
           clickEvent: 'handleDelete',
           has: 'sys:user:sel',
           show: (record) => {
-            // IAM同步过来的不能删除
-            return record.source !== UserSource.IAM.value
+            // 只有系统新增的可以编辑
+            return record.source === UserSource.SYSTEMADD.value
           }
         },
         // 冻结
@@ -349,8 +349,8 @@ export default {
           clickEvent: 'handleFrozen',
           has: 'user:edit',
           show: (record) => {
-            // IAM同步过来的不能编辑
-            return (record.status + '') === '1' && record.source !== UserSource.IAM.value
+            // 只有系统新增的可以编辑
+            return (record.status + '') === '1' && record.source === UserSource.SYSTEMADD.value
           }
         },
         // 解冻
@@ -359,8 +359,8 @@ export default {
           clickEvent: 'handleFrozen',
           has: 'user:edit',
           show: (record) => {
-            // IAM同步过来的不能编辑
-            return (record.status + '') === '2' && record.source !== UserSource.IAM.value
+            // 只有系统新增的可以编辑
+            return (record.status + '') === '2' && record.source === UserSource.SYSTEMADD.value
           }
         }
         // 上传手写章

From 5fd2e48327396b93425ae62e1c3c25242f392d3c Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 17:26:53 +0800
Subject: [PATCH 22/29] =?UTF-8?q?Revert=20"[update]=20=E4=BF=AE=E6=94=B9UA?=
 =?UTF-8?q?T=E9=97=AE=E9=A2=98=EF=BC=9A=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=93=8D=E4=BD=9C=E5=88=97=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=E4=B8=BAsource=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E7=B3=BB=E7=BB=9F=E6=96=B0=E5=A2=9E=E6=89=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 98675ac1
---
 src/views/system/UserList.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 326c28e..509d551 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -313,8 +313,8 @@ export default {
           clickEvent: 'handleEdit',
           has: 'user:edit',
           show: (record) => {
-            // 只有系统新增的可以编辑
-            return record.source === UserSource.SYSTEMADD.value
+            // IAM同步过来的不能编辑
+            return record.source !== UserSource.IAM.value
           }
         },
         // 详情
@@ -329,8 +329,8 @@ export default {
           clickEvent: 'handleChangePassword',
           has: 'user:password',
           show: (record) => {
-            // 只有系统新增的可以编辑
-            return record.source === UserSource.SYSTEMADD.value
+            // IAM同步过来的不能编辑
+            return record.source !== UserSource.IAM.value
           }
         },
         // 删除
@@ -339,8 +339,8 @@ export default {
           clickEvent: 'handleDelete',
           has: 'sys:user:sel',
           show: (record) => {
-            // 只有系统新增的可以编辑
-            return record.source === UserSource.SYSTEMADD.value
+            // IAM同步过来的不能删除
+            return record.source !== UserSource.IAM.value
           }
         },
         // 冻结
@@ -349,8 +349,8 @@ export default {
           clickEvent: 'handleFrozen',
           has: 'user:edit',
           show: (record) => {
-            // 只有系统新增的可以编辑
-            return (record.status + '') === '1' && record.source === UserSource.SYSTEMADD.value
+            // IAM同步过来的不能编辑
+            return (record.status + '') === '1' && record.source !== UserSource.IAM.value
           }
         },
         // 解冻
@@ -359,8 +359,8 @@ export default {
           clickEvent: 'handleFrozen',
           has: 'user:edit',
           show: (record) => {
-            // 只有系统新增的可以编辑
-            return (record.status + '') === '2' && record.source === UserSource.SYSTEMADD.value
+            // IAM同步过来的不能编辑
+            return (record.status + '') === '2' && record.source !== UserSource.IAM.value
           }
         }
         // 上传手写章

From 6ffb824d060e2043a6ac556187c4cf1ca161d389 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 17:31:11 +0800
Subject: [PATCH 23/29] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9=E5=BA=93?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=BA=EF=BC=8C=E5=85=B3=E9=97=AD=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=88=97=E6=8D=A2=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonmatchItem/NonmatchItemList.vue         | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
index 2e1636f..b2e616e 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
@@ -238,6 +238,20 @@ export default {
           dataIndex: 'rectifyStatus_dictText',
           scopedSlots: { customRender: 'dictText' }
         },
+        { // 关闭人
+          title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.shutter'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'closeUser_dictText',
+          scopedSlots: { customRender: 'text' }
+        },
+        { // 关闭时间
+          title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.closingTime'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'closeTime',
+          scopedSlots: { customRender: 'text' }
+        },
         { // PCR编号
           title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.pcrNumber'),
           align: 'center',
@@ -259,20 +273,6 @@ export default {
           dataIndex: 'file',
           scopedSlots: { customRender: 'file' }
         },
-        { // 关闭人
-          title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.shutter'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'closeUser_dictText',
-          scopedSlots: { customRender: 'text' }
-        },
-        { // 关闭时间
-          title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.closingTime'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'closeTime',
-          scopedSlots: { customRender: 'text' }
-        },
         {
           title: this.$t('operation'),
           scopedSlots: { customRender: 'action' },

From b91e7767ed98a38db3fb022db09d7566d97a7e17 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 18:03:29 +0800
Subject: [PATCH 24/29] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=A4=96=E6=9D=A5=E6=A0=87=E5=87=86=E5=92=8C?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E7=BC=96=E8=BE=91=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=A0=E6=94=B6=E8=97=8F=E6=A0=87=E8=AF=86=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standard/modules/EnterpriseStandardModal.vue                 | 1 +
 .../foreignStandard/modules/ForeignStandardModal.vue             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
index dcd0755..b5079d2 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
@@ -212,6 +212,7 @@ export default {
       }
       const param = Object.assign({}, formInline)
       param.checkList = this.dataSource
+      param.collectionFlag = undefined
       postAction(url, param).then((res) => {
         if (res.success) {
           this.$message.success(this.$t('operationSuccessful'))
diff --git a/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue b/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue
index 3f4c664..621e995 100644
--- a/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue
+++ b/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue
@@ -117,6 +117,7 @@ export default {
       } else {
         submitFunc = addForeignStandard
       }
+      formInline.collectionFlag = undefined
       submitFunc(formInline).then((res) => {
         if (res.success) {
           this.$message.success(this.$t('operationSuccessful'))

From 32e4419bc42971253e4857e81a87be698ee2192a Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 13 Sep 2024 18:12:51 +0800
Subject: [PATCH 25/29] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86-=E6=A0=91?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=BC=B9=E6=A1=86]=20=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentSplit/modules/SplitTreeOrderModal.vue      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/documentTool/documentSplit/modules/SplitTreeOrderModal.vue b/src/views/documentTool/documentSplit/modules/SplitTreeOrderModal.vue
index 00fbbde..fe4fc5b 100644
--- a/src/views/documentTool/documentSplit/modules/SplitTreeOrderModal.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitTreeOrderModal.vue
@@ -7,12 +7,14 @@
     :maskClosable="false"
     :footer="null"
     :confirmLoading="confirmLoading"
+    :fullscreen.sync="fullscreen"
     @ok="handleOk"
     @cancel="handleCancel">
     <a-spin :spinning="confirmLoading">
       <a-tree :show-line="true"
               :show-icon="true"
               style="height: 50vh; overflow-y: auto"
+              :class="{fullscreen: fullscreen}"
               checkable
               :tree-data="treeData"
               :selected-keys="selectedKeys"
@@ -55,6 +57,7 @@ export default {
   data () {
     return {
       width: 600,
+      fullscreen: false,
       visible: false,
       confirmLoading: false,
       selectedKeys: [],
@@ -284,5 +287,10 @@ export default {
 </script>
 
 <style scoped lang="less">
-
+.fullscreen .tree-node-custom-title {
+  max-width: 90vw;
+}
+.tree-node-custom-title {
+  max-width: 460px;
+}
 </style>

From 5fddaa7e0c967135ec825bfa6f26e1ca5eda2381 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 19:00:24 +0800
Subject: [PATCH 26/29] =?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=BB=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5=E4=BA=BA=E6=B1=87=E6=80=BB=E8=8A=82=E7=82=B9=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=A2=9E=E5=8A=A0=E8=BE=85=E5=8A=A9=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/MainFinderCollectEditModal.vue    | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
index a08e0d4..77d861d 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
@@ -30,6 +30,28 @@
       </a-form-item>
       <!--   不符合和待验证   -->
       <template v-if="[EvaluationResult.INCONFORMITY.value, EvaluationResult.TO_BE_VERIFIED.value].includes(model.result)">
+        <!--   不满足要求的现状  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements')">
+          <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements')"
+                      :maxLength="500"
+                      :autoSize="{minRows: 4, maxRows: 6}"
+                      v-decorator="['unsatisfiedRequire', validatorRules.unsatisfiedRequire]" />
+        </a-form-item>
+        <!--   辅助说明材料  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial')">
+          <j-upload :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.supplementaryExplanatoryMaterial')"
+                    return-id
+                    multiple
+                    :file-type="canUploadType"
+                    v-decorator="['unsatisfiedRequireAttach', validatorRules.unsatisfiedRequireAttach]" />
+        </a-form-item>
+        <!--   整改方案  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan')">
+          <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan')"
+                      :maxLength="500"
+                      :autoSize="{minRows: 4, maxRows: 6}"
+                      v-decorator="['correctionSolution', validatorRules.correctionSolution]" />
+        </a-form-item>
         <!--   整改周期  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle')">
           <a-input :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle')"
@@ -42,26 +64,6 @@
                    :maxLength="50"
                    v-decorator="['correctionCost', validatorRules.correctionCost]" />
         </a-form-item>
-        <!--   共用后本项目所需费用  -->
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing')">
-          <a-input :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing')"
-                   :maxLength="50"
-                   v-decorator="['commonalityCost', validatorRules.commonalityCost]" />
-        </a-form-item>
-        <!--   不满足要求的现状  -->
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements')">
-          <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements')"
-                      :maxLength="500"
-                      :autoSize="{minRows: 4, maxRows: 6}"
-                      v-decorator="['unsatisfiedRequire', validatorRules.unsatisfiedRequire]" />
-        </a-form-item>
-        <!--   整改方案  -->
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan')">
-          <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.rectificationPlan')"
-                      :maxLength="500"
-                      :autoSize="{minRows: 4, maxRows: 6}"
-                      v-decorator="['correctionSolution', validatorRules.correctionSolution]" />
-        </a-form-item>
         <!--   与其他项目共用性  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects')">
           <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.sharedWithOtherProjects')"
@@ -69,6 +71,12 @@
                       :autoSize="{minRows: 4, maxRows: 6}"
                       v-decorator="['commonality', validatorRules.commonality]" />
         </a-form-item>
+        <!--   共用后本项目所需费用  -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing')">
+          <a-input :placeholder="$t('pleaseEnter') + $t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing')"
+                   :maxLength="50"
+                   v-decorator="['commonalityCost', validatorRules.commonalityCost]" />
+        </a-form-item>
       </template>
       <!--   符合和不涉及   -->
       <template v-else-if="[EvaluationResult.CONFORM_TO.value, EvaluationResult.NOT_INVOLVE.value].includes(model.result)">
@@ -156,7 +164,9 @@ export default {
           rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.costOfThisItemAfterSharing') }],
           validateTrigger: 'blur'
         }
-      }
+      },
+      // 本系统限制可以上传的文件格式
+      canUploadType: 'pdf,docx,doc,xlsx,xls,ppt,pptx,jpg,jpeg,png'
     }
   },
   methods: {

From add92f7ef67b97f60aeb467d4b068aa4109dc107 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 13 Sep 2024 19:43:03 +0800
Subject: [PATCH 27/29] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86=E3=80=81?=
 =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E4=B8=AD=E7=9A=84=E8=A1=A8=E6=A0=BC]=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/StandardResolutionSheet.vue                       | 1 +
 src/views/documentTool/documentSplit/modules/SplitAddForm.vue    | 1 +
 .../documentTool/documentSplit/modules/SplitClauseDetail.vue     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue
index d865be5..c073fed 100644
--- a/src/components/StandardResolutionSheet.vue
+++ b/src/components/StandardResolutionSheet.vue
@@ -833,6 +833,7 @@ export default {
       border: 1px solid;
 
       td {
+        word-break: break-all;
         border: 1px solid;
       }
     }
diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
index 4233ca3..8b102f9 100644
--- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
@@ -1056,6 +1056,7 @@ export default {
         width: 100%;
         border: 1px solid;
         td {
+          word-break: break-all;
           border: 1px solid;
         }
       }
diff --git a/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue b/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
index 60d6c53..8203bf2 100644
--- a/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
@@ -46,6 +46,7 @@ export default {
     width: 100%;
     border: 1px solid;
     td {
+      word-break: break-all;
       border: 1px solid;
     }
   }

From 1b13e5c1c1069733ef4a84a8787073418a01bf96 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 19:56:08 +0800
Subject: [PATCH 28/29] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E4=B8=80=E8=88=AC=E6=A3=80=E7=B4=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A3=80=E7=B4=A2=E5=AE=9E=E6=96=BD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=BE=88=E9=95=BF=E7=9A=84=E6=97=B6=E5=80=99=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/search/GeneralSearch.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue
index 11d18cc..f1752ef 100644
--- a/src/views/dashboard/search/GeneralSearch.vue
+++ b/src/views/dashboard/search/GeneralSearch.vue
@@ -96,7 +96,9 @@
               <div v-show="judgeAbolish(item)" class="result-source-wrapper" >
                 <p class="result-abolish">{{ StandardStatus.ABOLISH.text }}</p>
               </div>
-              <p class="result-date">{{ $t('dashboard.generalSearch.implementationDate') }} {{ item.implementationDate || global.emptyLine }}</p>
+              <p class="result-date" :title="$t('dashboard.generalSearch.implementationDate') + (item.implementationDate || global.emptyLine)">
+                {{ $t('dashboard.generalSearch.implementationDate') }} {{ item.implementationDate || global.emptyLine }}
+              </p>
               <a-button v-has="'dashboard:generalSearch:viewText'" :disabled="judgeAbolish(item)" @click="filePreviewAll(item)" style="margin-left: 8px;" type="primary" ghost>{{ $t('dashboard.generalSearch.viewText') }}</a-button>
             </div>
             <template v-if="retrievalModeCurrent === '1'">
@@ -956,7 +958,10 @@ export default {
       color: #86909C;
       line-height: 19px;
       text-align: right;
+      overflow: hidden;
       white-space: nowrap;
+      text-overflow: ellipsis;
+      padding-left: 20px;
       flex: 1;
     }
   }

From 00da074328599d6fa89452e28c6b33d285d15e88 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Sep 2024 20:29:59 +0800
Subject: [PATCH 29/29] =?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=E6=8F=90=E4=BA=A4=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E8=AE=BE=E7=BD=AE=E6=89=A9=E5=B1=95=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=9A=84=E5=B1=95=E5=BC=80keys=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JExpandTable.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/JExpandTable.vue b/src/components/JExpandTable.vue
index efb591b..339dad7 100644
--- a/src/components/JExpandTable.vue
+++ b/src/components/JExpandTable.vue
@@ -282,6 +282,9 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    expandedRowKeys (val) {
+      console.log('expandedRowKeys改变了', val)
     }
   },
   data () {
@@ -359,7 +362,8 @@ export default {
         const firstPage = parseInt((Number(firstIndex) + 1) / this.ipagination.pageSize) + 1
         this.ipagination.current = firstPage
         this.$nextTick(() => {
-          this.expandedRowKeys = [...this.expandedRowKeys, ...errorRows.map(tt => tt.rowKey)]
+          const arr = [...this.expandedRowKeys, ...errorRows.map(tt => tt.rowKey)]
+          this.expandedRowKeys = Array.from(new Set(arr))
           let timer = setTimeout(() => {
             this.$nextTick(() => {
               errorIndex.forEach(index => {