From 6ddebe8d7ae193255883af9dd04e304fbe16301f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 6 May 2022 10:22:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../virtualList/components/editModel.vue | 32 ++-- .../ProjectDetails/index.vue | 10 +- .../projectManagement/components/addModel.vue | 49 +++--- .../components/listEditModel.vue | 37 +++-- .../components/listOfRegulations.vue | 19 ++- .../components/settingList.vue | 139 +++++++++++++----- 8 files changed, 198 insertions(+), 90 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b9dba09d0..513053f61 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -755,4 +755,5 @@ module.exports = { standardInformation:'standardInformation', VirtualList:'VirtualList', importTemplate:'import template', + verificationConfirmationDeadline:'Verification compliance confirmation deadline', } \ 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 0f3b73146..2e078e997 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -760,4 +760,5 @@ module.exports = { Characters:'个字符', standardInformation:'标准信息', importTemplate:'导入模板', + verificationConfirmationDeadline:'验证符合性确认截止时间', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index d6c41ada0..70a39c849 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -74,15 +74,14 @@ :title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}} - - - - - - - + + + + @@ -248,14 +247,13 @@ :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}} - - - - - - + + + + diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index f51b28255..4014f4f54 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -39,14 +39,14 @@ {{$t('taskList')}} -
- - {{$t('TaskParameterCollection')}} -
-
+
{{$t('nonConformance')}}
+
+ + {{$t('TaskParameterCollection')}} +
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 2c828ffe6..c2238236c 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -98,23 +98,6 @@
- -
-
- {{$t('IPDInformation')}} -
- - - -
- - - -
@@ -130,6 +113,8 @@
+ +
@@ -145,6 +130,21 @@
+ +
+
+ {{$t('IPDInformation')}} +
+ + + +
+ + @@ -204,18 +204,33 @@ { pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, message: this.$t('pleaseEnterTheCorrectWebAddress') + }, + { + max: 300, + message: this.$t('IPDInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' } ], vehicleDevelopmentPlan: [ { pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, message: this.$t('pleaseEnterTheCorrectWebAddress') + }, + { + max: 300, + message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 300 + 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') + }, + { + max: 300, + message: this.$t('certificationProgram') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' } ], projectNameId: [ diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index a0578483c..3c5989f5e 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -251,6 +251,25 @@
+ + +
+
+ {{$t('zoneOfApplication')}} +
+ + + + + + +
+ +
@@ -760,15 +779,15 @@ }, editModel(item) { this.visible = true - this.regulatoryEngineerList= [] - this.engineeringInterfacePersonList= [] - this.certificationEngineerList= [] - this.designInitiatorList= [] - this.designDutyList= [] - this.prehomoInitiatorList= [] - this.verifyInitiatorList= [] - this.verifyDutyList= [] - this.prehomoDutyList= [] + this.regulatoryEngineerList = [] + this.engineeringInterfacePersonList = [] + this.certificationEngineerList = [] + this.designInitiatorList = [] + this.designDutyList = [] + this.prehomoInitiatorList = [] + this.verifyInitiatorList = [] + this.verifyDutyList = [] + this.prehomoDutyList = [] if (item.dutyTerritory) { this.queryPersonByProject(item) } else { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 2ad9aef01..7df323c20 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -322,6 +322,12 @@ // align: 'center', // dataIndex: 'taskReleaseStatus' // }, + { + title: this.$t('zoneOfApplication'), + align: 'center', + ellipsis: true, + dataIndex: 'region_dictText' + }, { title: this.$t('correspondingStandard'), align: 'center', @@ -346,12 +352,6 @@ ellipsis: true, dataIndex: 'implementTime' }, - { - title: 'WVTA ID', - align: 'center', - dataIndex: 'wvtaId', - ellipsis: true - }, { title: this.$t('certificationType'), align: 'center', @@ -364,7 +364,12 @@ ellipsis: true, dataIndex: 'attestationRank_dictText' }, - // + { + title: 'WVTA ID', + align: 'center', + dataIndex: 'wvtaId', + ellipsis: true + }, { title: this.$t('areaOfResponsibility'), align: 'center', diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index 619dee8e4..8cf12fd72 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -13,10 +13,11 @@
+ * {{$t('confirmationOfRegulationsList')}}
- +
+ * {{$t('regulatoryTaskConfirmation')}}
- +
+ * {{$t('confirmationOfDesignConformity')}}
- +
+ * {{$t('PrehomoConfirmation')}}
- +
+ * {{$t('certificationStart')}}
- +
+ * {{$t('certificationEnd')}}
- +
- - {{$t('deadlineForConfirmationOfDesignCompliance')}} + * + + {{$t('verificationConfirmationDeadline')}}
- + { + this.$refs.ruleForm.clearValidate() + }) this.settingQueryForm() }, settingQueryForm() { @@ -167,29 +227,33 @@ }) }, handleOk() { - let query = { - ...this.formInline, - projectId: this.$route.query.id - } - let url = '' - let Action - if (this.formInline.id) { - url = this.url.editSettingUrl - Action = putAction - } else { - url = this.url.addSettingUrl - Action = postAction - } - this.confirmLoading = true - Action(url, query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.confirmLoading = false - this.$emit('settingListForm') - } else { - this.$message.warning(this.$t('operationFailed')) - this.confirmLoading = false + this.$refs.ruleForm.validate(valid => { + if (valid) { + let query = { + ...this.formInline, + projectId: this.$route.query.id + } + let url = '' + let Action + if (this.formInline.id) { + url = this.url.editSettingUrl + Action = putAction + } else { + url = this.url.addSettingUrl + Action = postAction + } + this.confirmLoading = true + Action(url, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('settingListForm') + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + } + }) } }) }, @@ -260,7 +324,7 @@ } .title-text { - width: 174px; + width: 194px; text-align: right; display: inline-block; font-weight: 500; @@ -292,4 +356,9 @@ .formAdd { margin-bottom: 40px; } + + .Required { + color: red; + margin-right: 3px; + } \ No newline at end of file