From 65aeb3a7d7742d26ba1233e6d79e1d95c1342e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 16:04:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=BA=A4=E4=BB=98=E7=89=A9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= 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 + .../components/certificationList/index.vue | 24 +++++++++++++++---- .../components/listOfRegulations.vue | 8 +++---- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9bf2aa79d..f0f071ceb 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1710,4 +1710,5 @@ module.exports = { implementationrecords:'Fault handling measures and emergency response implementation records', onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted', implementationDateTwo:'Implementation Date', + reasonForReturn:'Reason For Return', } \ 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 83a9c7fd1..eb33ab603 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1810,4 +1810,5 @@ module.exports = { implementationrecords:'故障处置措施和应急响应实施记录', onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据', implementationDateTwo:'实施日期', + reasonForReturn:'Reason For Return', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index ec076d2c6..ac9f8a11f 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -367,6 +367,14 @@ {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('maintainProgress')}} + + + {{$t('viewFile')}} + + -- +
* - {{ $t('reasonsForRejection') }} + {{ $t('reasonForReturn') }}
@@ -768,7 +768,7 @@ commentContent: [ { required: true, - message: this.$t('reasonsForRejection') + this.$t('cannotEmpty'), + message: this.$t('reasonForReturn') + this.$t('cannotEmpty'), trigger: 'blur' } ] From 375fda713ba3d30609aafb424bdb0e481a173514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 16:14:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E6=A0=A1=E9=AA=8C=E6=88=AA=E6=AD=A2?= =?UTF-8?q?=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- .../components/certificationList/components/addModel.vue | 4 ++++ .../components/certificationList/index.vue | 6 ++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f0f071ceb..805fb232f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1438,7 +1438,7 @@ module.exports = { onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected', youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved', batchmodify:'Whether to batch modify', - onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected', + onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected And the deadline cannot be empty', type:'type', select:'select', onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index eb33ab603..16b01d77e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1540,7 +1540,7 @@ module.exports = { onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据', youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据', batchmodify:'是否批量修改', - onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据', + onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据,并且截止时间不能为空', type:'类型', select:'选择', onlyDataWithProcessStatusDeleted:'只能删除流程状态为清单待发布和审查通过的数据', 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 25f1f896c..8417b5850 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -798,6 +798,10 @@ this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人 if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1) { this.formInline.sdt = res.result.engineeringInterfacePersonList[0].value + if (!this.formInline.dutyPersonName) { + this.formInline.dutyPersonName = res.result.engineeringInterfacePersonList[0].name + this.formInline.dutyPerson = res.result.engineeringInterfacePersonList[0].value + } } else if (this.engineeringInterfacePersonList.length == 0) { this.formInline.sdt = undefined } diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index ac9f8a11f..3a9ba01b7 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1012,8 +1012,10 @@ let ids = [] let notConditions = [] for (let i = 0; i < this.selectedRowKeysList.length; i++) { - if (this.selectedRowKeysList[i].flowStatus == 'List to be released' || - this.selectedRowKeysList[i].flowStatus == 'Certification returned') { + if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' && + this.selectedRowKeysList[i].endTime) || + (this.selectedRowKeysList[i].flowStatus == 'Certification returned' && + this.selectedRowKeysList[i].endTime)) { ids.push(this.selectedRowKeysList[i].id) } else { notConditions.push(this.selectedRowKeysList[i].inspectionItem) From c0f40fb36e18f68eaaa13a7889891de120b5a149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 24 Mar 2023 16:23:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=E5=92=8C=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 ++- jero-web/src/common/lang/zh-cn.js | 3 ++- .../components/certificationList/index.vue | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 805fb232f..376bc7375 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1419,7 +1419,7 @@ module.exports = { confirmLaunchTask:'Confirm launch task ?', conditionsNotMet:'Conditions not met', onlyProcessStatusReturned:'Only the data whose process status is list to be checked and rejected by the responsible person can be returned', - onlyProcessReturned:'Only data with process status of list to be checked and rejected by responsible person can be initiated', + onlyProcessReturned:'Only data with process status of list to be checked and rejected by responsible person can be initiated And the project interface person and responsible person cannot be blank', confirmToAcceptTheTask:'Confirm to accept the task ?', confirmRejectTask:'Confirm Reject Task ?', onlyDataStatusConfirmedSelected:'Only data with process status of task to be confirmed can be selected', @@ -1711,4 +1711,5 @@ module.exports = { onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted', implementationDateTwo:'Implementation Date', reasonForReturn:'Reason For Return', + pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process' } \ 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 16b01d77e..024f495ef 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1518,7 +1518,7 @@ module.exports = { confirmLaunchTask:'确认发起任务?', conditionsNotMet:'不满足条件', onlyProcessStatusReturned:'只能退回流程状态为清单待校核和责任人拒绝的数据', - onlyProcessReturned:'只能发起流程状态为清单待校核和责任人拒绝的数据', + onlyProcessReturned:'只能发起流程状态为清单待校核和责任人拒绝的数据,并且工程接口人和责任人不能为空', confirmToAcceptTheTask:'确认接受任务?', confirmRejectTask:'确认拒绝任务?', onlyDataStatusConfirmedSelected:'只能选择流程状态为任务待确认的数据', @@ -1811,4 +1811,5 @@ module.exports = { onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据', implementationDateTwo:'实施日期', reasonForReturn:'Reason For Return', + pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程' } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 3a9ba01b7..684a6383f 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1505,7 +1505,11 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' || this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') { - ids.push(this.selectedRowKeysList[i].id) + if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].sdt) { + ids.push(this.selectedRowKeysList[i].id) + } else { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } } else { notConditions.push(this.selectedRowKeysList[i].inspectionItem) }