From ff151e67e84dc5498621158a6cbef1b69e41a4c7 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 25 Apr 2022 18:30:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8F=A1=E6=89=8B=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- .../views/projectManagement/components/listOfRegulations.vue | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 7da434739..a998e3f77 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -669,7 +669,7 @@ module.exports = { listConfirmationStatus:'清单确认状态', ListConfirmationDeadline:'清单确认截止时间', dataConfirmation:'请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', - taskDataConfirmation:'请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', + taskDataConfirmation:'请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空', pleaseSelectPersonFirst:'请先选择人员', onlyOnePersonCanBeSelected:'只能选择一个人员', overrule:'驳回', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index a331d1e7b..747380d70 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -763,8 +763,7 @@ for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'rejected') && - this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId - && this.dataSource[i].inventoryAffirmStatus == 'accepted') { + this.dataSource[i].engineeringInterfacePerson && this.dataSource[i].inventoryAffirmStatus == 'accepted') { isTrue = true } else { isTrue = false @@ -832,7 +831,7 @@ let query = { type: 1, msg: value, - taskAffirmDueDate:this.formInline.taskAffirmDueDate + taskAffirmDueDate: this.formInline.taskAffirmDueDate } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) {