Merge branch 'master' into 标准拆分译文变更

# Conflicts:
#	src/common/lang/en-us.js
#	src/common/lang/zh-cn.js
#	src/views/documentTool/documentSplit/modules/SplitAddForm.vue
#	src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue

src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue

@@ -9,10 +9,9 @@
       <!--  导入(标准主解读人节点 && 选择不分发时)  -->
       <a-upload v-if="isMainInterpreterDistribute && !isDistribute"
                 :data="importParams"
-                :disabled="disabledImport"
                 name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importUrl"
                 @change="handleImport">
-        <a-button type="primary" icon="download" :disabled="disabledImport" ghost>{{ $t('import') }}</a-button>
+        <a-button type="primary" icon="download" ghost>{{ $t('import') }}</a-button>
       </a-upload>
       <!--  批量编辑（解读人填写）  -->
       <a-button type="primary" ghost @click="handleBatchEdit" v-if="showBatchEditBtn">
@@ -56,9 +55,9 @@
                         :nameStr="record.interpretPersonIds_dictText" />
       </template>
       <template v-slot:action="{text, record}">
-        <a v-if="showEditBtn" @click="handleEdit(record)" class="table-ope-btn">{{ $t('edit') }}</a>
+        <a v-if="showEditBtn" :disabled="disabled" @click="handleEdit(record)" class="table-ope-btn">{{ $t('edit') }}</a>
         <a-divider v-if="showEditBtn && showDeleteBtn" type="vertical" />
-        <a v-if="showDeleteBtn" @click="handleDelete(record[rowKey])" class="operate-del-btn">{{ $t('delete') }}</a>
+        <a v-if="showDeleteBtn" :disabled="disabled" @click="handleDelete(record[rowKey])" class="operate-del-btn">{{ $t('delete') }}</a>
       </template>
     </j-table>
     <!--条文内容-->
@@ -201,7 +200,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'isSameAsPrevVersion_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 相对上一版变化点说明
           title: this.$t('workCenter.standardInterpretationProcess.explanationOfChangePoints'),
@@ -229,7 +228,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'keyController_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 责任部门
           title: this.$t('workCenter.standardInterpretationProcess.responsibleDepartment'),
@@ -243,7 +242,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'responsibleModule_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 关联部门
           title: this.$t('workCenter.standardInterpretationProcess.relatedDepartments'),
@@ -257,35 +256,35 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'relatedModule_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 适用车型
           title: this.$t('workCenter.standardInterpretationProcess.applications'),
           align: 'center',
           width: 180,
           dataIndex: 'applications_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 动力类型
           title: this.$t('workCenter.standardInterpretationProcess.powerType'),
           align: 'center',
           width: 180,
           dataIndex: 'powerType_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 专业领域
           title: this.$t('workCenter.standardInterpretationProcess.professionalField'),
           align: 'center',
           width: 180,
           dataIndex: 'domainArea_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 配置需求
           title: this.$t('workCenter.standardInterpretationProcess.configurationRequirements'),
           align: 'center',
           width: 180,
           dataIndex: 'configurationRequirements_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 新认证车实施日期
           title: this.$t('workCenter.standardInterpretationProcess.newCertificationImplementationDate'),
@@ -376,7 +375,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'investigationStage_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // P3证明符合性的交付物名称
           title: this.$t('workCenter.standardInterpretationProcess.pThree'),
@@ -473,7 +472,7 @@ export default {
         columns.push(...this.columnsExtend)
       }
       // 非禁用时，需要操作的节点就加上操作列
-      if (!this.disabled && !noActionCoumnsNodes.includes(this.currentNodeId)) {
+      if (!noActionCoumnsNodes.includes(this.currentNodeId)) {
         columns.push(this.actionColumn)
       }
       return columns
@@ -579,9 +578,9 @@ export default {
      * @param info
      */
     handleImport (info) {
-      // 限制导入大于500MB
-      if (info.file.size > 1024 * 1024 * 500) {
-        this.$message.error('导入文件最大500MB！')
+      // 限制导入大于20MB
+      if (info.file.size > 1024 * 1024 * 20) {
+        this.$message.error(this.$t('importMaxMsg', { size: '20MB' }))
         info.fileList.pop()
         return
       }
@@ -937,6 +936,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import '~@assets/less/common.less';
 .clause-table-container {
   margin-bottom: 20px;
 }