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']"/> + + + + { - 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 @@ + + + @@ -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 @@