@@ -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