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] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=97=B6=E6=A0=A1=E9=AA=8C=E6=88=AA=E6=AD=A2=E6=97=A5?= =?UTF-8?q?=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)