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/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 575de7b..13bed4d 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 ac59c4b..678229c 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/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 @@
{{ global.emptyLine }}
+
+
+
+ {{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }}
+
+ {{ global.emptyLine }}
+
@@ -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',
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 @@
+
+
+ {{ $t('view') }}
+ {{ global.emptyLine }}
+
+
- {{ $t('view') }}
+ {{ $t('view') }}
{{ global.emptyLine }}
@@ -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/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
index 7d8bfca..e4b78bd 100644
--- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
+++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
@@ -113,6 +113,15 @@
placeholder=""/>
+
+
+
+
+
+
@@ -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 c1fa1ae..dd5be6a 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')" />
+
+
+
+
+ {{ $t('attach') }}
+
+
+
+
+
+
@@ -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
// 国家/地区
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 @@