diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a773e0f2f..2253642ca 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1392,4 +1392,6 @@ module.exports = { reportNo:'Report No', productModel:'Product Model', nameOfManufacturer:'Name Of Manufacturer', + regulationNo:'Regulation No', + itemInformation:'Item Information', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5501d53b0..87d5c0993 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1493,4 +1493,6 @@ module.exports = { reportNo:'报告编号', productModel:'产品型号', nameOfManufacturer:'生产企业名称', + regulationNo:'法规编号', + itemInformation:'条目信息', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 879f2e479..c755d0570 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -16,12 +16,11 @@
* - {{$t('modelName')}} + {{$t('regulationNo')}}
- - + + @@ -39,132 +38,144 @@ * WVTA ID
- + +
+
+ {{$t('itemInformation')}} + + +
+ + +
+
+ * + {{$t('category')}} +
+ + + +
+ + +
+
+ * + {{$t('inspectionItems')}} +
+ + + +
+ + - - -
-
- * - {{$t('category')}} + + +
+
+ * + {{$t('typeOfDeliverables')}} +
+ + +
- - - -
- - -
-
- * - {{$t('inspectionItems')}} + + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' + || + formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + +
- - - -
- - + + - - -
-
- * - {{$t('typeOfDeliverables')}} + + +
+
+ * + {{$t('areaOfResponsibility')}} +
+ + +
- - - -
- - -
-
- * - {{$t('deliverableTemplate')}} + + +
+
+ * + {{$t('engineeringInterfacePerson')}} +
+ + +
- - - {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' - || - formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - - - -
-
- {{$t('areaOfResponsibility')}} + + + + + +
+
+ * + {{$t('personLiable')}} +
+ + +
- - - -
- - -
-
- {{$t('engineeringInterfacePerson')}} -
- - - -
- - - - -
-
- {{$t('personLiable')}} -
- - - -
- - + + +
+ @@ -210,111 +221,75 @@ visible: false, yearNameDataList: [], rules: { - ipdInfo: [ + serialNumber: [ { - pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, - message: this.$t('pleaseEnterTheCorrectWebAddress') + required: true, + message: this.$t('entryName') + this.$t('regulationNo'), + trigger: 'change' + } + ], + + wvtaId: [ + { + required: true, + message: 'WVTA ID' + this.$t('regulationNo'), + trigger: 'change' }, { max: 300, - message: this.$t('IPDInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + message: 'WVTA ID' + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], - vehicleDevelopmentPlan: [ + category: [ { - pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, - message: this.$t('pleaseEnterTheCorrectWebAddress') + required: true, + message: this.$t('category') + this.$t('regulationNo'), + trigger: 'change' }, { max: 300, - message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + message: this.$t('category') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], - explanation: [ + inspectionItem: [ { - max: 500, - message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'), - trigger: 'blur' - } - ], - attestationPlan: [ - { - pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, - message: this.$t('pleaseEnterTheCorrectWebAddress') + required: true, + message: this.$t('inspectionItems') + this.$t('regulationNo'), + trigger: 'change' }, { max: 300, - message: this.$t('certificationProgram') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + message: this.$t('inspectionItems') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], - vehiclePlatform: [ - { - max: 100, - message: this.$t('ModelPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - trigger: 'blur' - } - ], - digitalPlatform: [ - { - max: 100, - message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - trigger: 'blur' - } - ], - softwareVersion: [ - { - max: 300, - message: this.$t('softwareVersion') + this.$t('cannotExceed') + 300 + this.$t('Characters'), - trigger: 'blur' - } - ], - projectNameId: [ + deliverableType: [ { required: true, - message: this.$t('entryName') + this.$t('cannotEmpty'), + message: this.$t('typeOfDeliverables') + this.$t('cannotEmpty'), trigger: 'change' } ], - yearNameId: [ + dutyTerritory: [ { required: true, - message: this.$t('modelYear') + this.$t('cannotEmpty'), + message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'), trigger: 'change' } ], - targetMarket: [ + sdtName: [ { required: true, - message: this.$t('targetMarket') + this.$t('cannotEmpty'), + message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'), trigger: 'change' } ], - projectStatus: [ + dutyPersonName: [ { required: true, - message: this.$t('projectStatus') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - studioEngineerName: [ - { - required: true, - message: this.$t('StudioEngineer') + this.$t('cannotEmpty'), - trigger: 'change' - }, - { - max: 100, - message: this.$t('StudioEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - trigger: 'change' - } - ], - certificationEngineerName: [ - { - max: 100, - message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('personLiable') + this.$t('cannotEmpty'), trigger: 'change' } ] @@ -323,11 +298,10 @@ projectNameList: [], title: '', DeliverableTreeList: [], - uploadName: '' + uploadName: '', } }, mounted() { - this.getNameList() this.getDeliverableTree() }, methods: { @@ -341,32 +315,12 @@ } }) }, - getNameList(value) { - getAction('project/projectNameInfoEO/list', {}).then((res) => { - if (res.success) { - this.projectNameList = res.result || [] - if (this.title == this.$t('edit')) { - let content = this.projectNameList.filter(res => { - return res.id == value.projectNameId - }) - this.yearNameDataList = content[0].yearNameDataList || [] - this.formInline = value - this.formInline = { ...this.formInline } - } - } else { - this.projectNameList = [] - } - }) - }, addModel() { this.visible = true this.title = this.$t('add') this.formInline = {} - this.getNameList() - this.formInline.studioEngineerName = this.userInfo().username - this.formInline.studioEngineer = this.userInfo().id - this.formInline.projectVersion = '00' - this.formInline = { ...this.formInline } + this.formInline.dataList = [{}] + this.formInline = {...this.formInline} this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) @@ -374,7 +328,6 @@ editModel(value) { this.visible = true this.title = this.$t('edit') - this.getNameList(value) this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) @@ -425,16 +378,6 @@ this.formInline[value] = id this.formInline = { ...this.formInline } }, - projectNameChange(value) { - this.formInline.yearNameId = undefined - let content = this.projectNameList.filter(res => { - return res.id == value - }) - this.formInline.vehiclePlatform = content[0].vehiclePlatform || '' - this.yearNameDataList = content[0].yearNameDataList || [] - this.formInline.digitalPlatform = content[0].digitalPlatform || '' - this.formInline = { ...this.formInline } - }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -458,7 +401,11 @@ /** 赋值给当前对应的表单文件 */ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } - } + }, + addClick(index){ + this.formInline.dataList.splice(1,index,{}) + this.formInline = {...this.formInline} + }, } } @@ -582,6 +529,16 @@ border: 1px #00B3BE solid; color: #00B3BE; } + + .header-text { + font-size: 16px; + font-weight: 500; + } + + .icon-text { + font-size: 16px; + margin-right: 4px; + }