From ce7090277cb729acb2b045a14584d87ebea3f5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 16 Mar 2023 10:45:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 9 + jero-web/src/common/lang/zh-cn.js | 9 + .../components/ProjectDetails.vue | 167 +++++++++++------- .../projectManagement/components/addModel.vue | 118 +++++++------ .../components/listOfRelevantPersonnel.vue | 160 +++++++++-------- .../components/personBatting.vue | 50 +++--- .../components/settingList.vue | 36 ++-- 7 files changed, 315 insertions(+), 234 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bb8ec1478..c1a41cf95 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1436,6 +1436,15 @@ module.exports = { type:'type', select:'select', onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted', + complianceCertificationProgram:'Compliance Certification Program', + listPublishing:'List Publishing', + responsibilityConfirmation:'Responsibility Confirmation', + designVerification:'Design Verification', + getStarted:'Get Started', + certificationStartOne:'Certification Start', + verificationAndVerification:'Verification And Verification', + projectInterfacePersonRegulationEngineerSetting:'Project Interface Person - Regulation Engineer Setting', + projectInterfacePersonCertificationEngineerSetting:'Project Interface Person - Certification Engineer Setting', registrationnumber:'Product registration number', noticebatch:'Notice batch', producttrademark:'Product Trademark', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 78430946f..beaa3623c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1538,6 +1538,15 @@ module.exports = { type:'类型', select:'选择', onlyDataWithProcessStatusDeleted:'只能删除流程状态为清单待发布和审查通过的数据', + complianceCertificationProgram:'合规认证计划', + listPublishing:'清单发布', + responsibilityConfirmation:'责任确认', + designVerification:'设计核查', + getStarted:'摸底开始', + certificationStartOne:'认证开始', + verificationAndVerification:'验证核查', + projectInterfacePersonRegulationEngineerSetting:'工程接口人-法规工程师设置', + projectInterfacePersonCertificationEngineerSetting:'工程接口人-认证工程师设置', registrationnumber:'产品登记编号', noticebatch:'《公告》批次', producttrademark:'产品商标', diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 23aea89dd..7c7970d5b 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -19,76 +19,32 @@ >{{queryForm.projectName}}
- {{$t('targetMarket')}} - {{queryForm.targetMarket_dictText}} + {{$t('brand')}} + {{queryForm.brandText}}
-
- {{$t('projectVersion')}} - {{queryForm.projectVersion}} -
- -
{{$t('projectStatus')}} {{queryForm.projectStatus_dictText}}
-
- {{$t('DigitalPlatform')}} - {{queryForm.digitalPlatform}} -
-
- {{$t('ModelPlatform')}} - {{queryForm.vehiclePlatform}} -
-
-
-
- {{$t('softwareVersion')}} - {{queryForm.softwareVersion}} -
-
- {{$t('IPDInformation')}} - {{queryForm.ipdInfo}} -
-
- {{$t('brand')}} - {{queryForm.brandText}} -
-
-
-
- {{$t('certificationProgram')}} - {{queryForm.attestationPlan}} -
-
- {{$t('dehicleDevelopmentPlan')}} - {{queryForm.vehicleDevelopmentPlan}} -
-
-
-
- {{$t('explain')}} - {{queryForm.explanation}} -
+ + + + + + + + + +
+ + + + +
{{$t('StudioEngineer')}}
- +
+ {{$t('DigitalPlatform')}} + {{queryForm.digitalPlatform}} +
+
+ {{$t('ModelPlatform')}} + {{queryForm.vehiclePlatform}} +
+
+ {{$t('softwareVersion')}} + {{queryForm.softwareVersion}} +
+ + + + + + + + + + + +
+
+
+ {{$t('dehicleDevelopmentPlan')}} + {{queryForm.vehicleDevelopmentPlan}} +
+
+ {{$t('certificationProgram')}} + {{queryForm.attestationPlan}} +
+
+ {{$t('configurationInformation')}} + {{queryForm.ipdInfo}} +
+
+
+
+ {{$t('explain')}} + {{queryForm.explanation}} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
- {{$t('regulatoryCertificationTaskPlan')}} + {{$t('complianceCertificationProgram')}}
+ +
+
+ {{$t('brand')}} +
+ + + +
+ + +
@@ -118,8 +134,6 @@
- -
@@ -136,19 +150,6 @@
- -
-
- {{$t('ModelPlatform')}} -
- - - -
- @@ -167,44 +168,13 @@
- {{$t('IPDInformation')}} + {{$t('ModelPlatform')}}
- + - -
- - - - - -
-
- {{$t('dehicleDevelopmentPlan')}} -
- - - -
- - -
-
- {{$t('certificationProgram')}} -
- - + v-model="formInline.vehiclePlatform" + :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"/>
@@ -228,16 +198,48 @@
{{$t('brand')}} + :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}
- - + +
+ + + + +
+
+ {{$t('certificationProgram')}} +
+ + + +
+ + +
+
+ {{$t('configurationInformation')}} +
+ + + +
+ + @@ -287,7 +289,7 @@ }, { max: 300, - message: this.$t('IPDInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + message: this.$t('configurationInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], @@ -334,7 +336,7 @@ trigger: 'blur' } ], - softwareVersion:[ + softwareVersion: [ { max: 300, message: this.$t('softwareVersion') + this.$t('cannotExceed') + 300 + this.$t('Characters'), diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index fe545562b..11d8fa6dd 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -2,7 +2,7 @@
@@ -127,6 +127,14 @@ {{$t('engineeringInterfacePerson')}} + + {{$t('projectInterfacePersonRegulationEngineerSetting')}} + + + {{$t('projectInterfacePersonCertificationEngineerSetting')}} + {{$t('certifiedEngineer')}} @@ -217,31 +225,31 @@
- - -
-
- - {{$t('certifiedEngineer')}} -
- - - - - - {{ item.certificationEngineerName }} - - - - -
- - + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -280,7 +288,7 @@ ImportFile, personBatting }, - mixins:[ResizeHeader, ResizeColumnProvide], + mixins: [ResizeHeader, ResizeColumnProvide], data() { return { toggleSearchStatus: false, @@ -308,12 +316,26 @@ ellipsis: true, width: 153 }, + // { + // align: 'left', + // slots: { title: 'certifiedEngineer' }, + // dataIndex: 'certificationEngineerName', + // ellipsis: true, + // width: 153 + // }, { align: 'left', - slots: { title: 'certifiedEngineer' }, - dataIndex: 'certificationEngineerName', + slots: { title: 'projectInterfacePersonRegulationEngineerSetting' }, + dataIndex: 'engineeringInterfacePersonName', ellipsis: true, - width: 153 + width: 203 + }, + { + align: 'left', + slots: { title: 'projectInterfacePersonCertificationEngineerSetting' }, + dataIndex: 'engineeringInterfacePersonName', + ellipsis: true, + width: 203 }, { title: this.$t('remarks'), diff --git a/jero-web/src/views/projectManagement/components/personBatting.vue b/jero-web/src/views/projectManagement/components/personBatting.vue index 7cac7fe92..c6c031be5 100644 --- a/jero-web/src/views/projectManagement/components/personBatting.vue +++ b/jero-web/src/views/projectManagement/components/personBatting.vue @@ -16,7 +16,7 @@
{{$t('regulatoryEngineer')}}
- + {{$t('engineeringInterfacePerson')}}
- + - - -
-
- {{$t('certifiedEngineer')}} -
- - - - - {{ item.certificationEngineerName }} - - - - -
- - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index 0161134a8..1fa78f812 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -14,12 +14,12 @@
- - {{$t('confirmationOfRegulationsList')}} + + {{$t('listPublishing')}}
- - {{$t('regulatoryTaskConfirmation')}} + + {{$t('responsibilityConfirmation')}}
- - {{$t('confirmationOfDesignConformity')}} + + {{$t('designVerification')}}
- - {{$t('preHomoCompletion')}} + + {{$t('getStarted')}}
- - {{$t('certificationStart')}} + + {{$t('certificationStartOne')}}
- - {{$t('verificationAndConformityconfirmation')}} + + {{$t('verificationAndVerification')}}