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 6552e4762..2a5fcb150 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -183,6 +183,24 @@ + + + + + + + + + + + + + + + + + +
@@ -379,6 +397,24 @@
+ + + + + + + + + + + + + + + + + +
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 168d6e0c3..e1fbe14d9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -736,6 +736,7 @@ align: 'left', dataIndex: 'flowStatusName', width: 180, + sorter: true, ellipsis: true }, { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 921e0824f..9e14d461d 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -418,14 +418,14 @@ {{ $t('deadlineForConfirmationDesignComplianceResponsibility') }}
- +
@@ -441,14 +441,14 @@ {{ $t('deadlineForVerifyingComplianceResponsibilityConfirmation') }}
- + @@ -903,14 +903,14 @@ trigger: 'change' } ], - designComplianceDueDate: [ + designDutyDueDate: [ { required: true, message: this.$t('deadlineForConfirmationDesignComplianceResponsibility') + this.$t('cannotEmpty'), trigger: 'change' } ], - deadlineDueDate: [ + verifyDutyDueDate: [ { required: true, message: this.$t('deadlineForVerifyingComplianceResponsibilityConfirmation') + this.$t('cannotEmpty'), @@ -2468,6 +2468,11 @@ this.updateFlowStatusBatch() } for (let i = 0; i < this.startProcessList.length; i++) { + if (this.startProcessList[i].type == 2){ + this.startProcessList[i].dataList.designDutyDueDate = this.formInline.designDutyDueDate + }else if(this.startProcessList[i].type == 4){ + this.startProcessList[i].dataList.verifyDutyDueDate = this.formInline.verifyDutyDueDate + } this.startProcess(this.startProcessList[i].dataList, this.startProcessList[i].type, this.startProcessList[i].requestsNum) } }