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] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=8F=91=E8=B5=B7=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=E5=92=8C=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=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) }