From 6048f0ec824bd2e6eaf4f4f44f75282c01d1f782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 9 Mar 2023 15:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95?=
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             |  2 +-
 .../components/certificationList/index.vue    | 26 +++++++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 482ed3e9f..2a5778345 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1428,4 +1428,5 @@ module.exports = {
   onlyListCheckedCanRecalled:'Only the data whose process status is list to be checked can be recalled',
   statusthetasistobeconfirmed:'You can withdraw the list only when the status of the list is to be checked or the status of the task is to be confirmed',
   confirmreturn:'Confirm return ?',
+  onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected'
 }
\ 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 970fdbe0c..2e3e09e40 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1524,10 +1524,10 @@ module.exports = {
   confirmReturnForApproval:'确认退回审批？',
   onlyDataStatusResultReviewedCanBeSelected:'只能选择流程状态为结果待审查的数据',
   confirmResetProcess:'确认重置流程?',
-  confirmUrging:'确认催办',
   statusthetasistobeconfirmed:'只有清单待校核状态或任务确认状态为待确认时才可以进行撤回',
   confirmreturn:'确认退回？',
   confirmUrging:'确认催办?',
   confirmWithdrawal:'确认撤回?',
   onlyListCheckedCanRecalled:'只能撤回流程状态为清单待校核的数据',
+  onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据'
 }
\ 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 854caa94c..f96bc2312 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1159,7 +1159,26 @@
             this.turnToDoClickJC()
             return
           }
-          this.$refs.SelectedByRef.getPush()
+          this.toDoIds = []
+          this.toDoNotConditions = []
+          for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+            if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
+              this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+              this.selectedRowKeysList[i].flowStatus == 'Review and return') {
+              this.toDoIds.push(this.selectedRowKeysList[i].id)
+            } else {
+              this.toDoNotConditions.push(this.selectedRowKeysList[i].inspectionItem)
+            }
+          }
+          this.toDoData = ''
+          if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
+            this.toDoData = this.$t('inspectionItems') + '"' + this.toDoNotConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataSelected')
+          }
+          if (this.toDoIds && this.toDoIds.length > 0){
+            this.$refs.SelectedByRef.getPush()
+          }else{
+            this.failedMessage(this.toDoData)
+          }
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
@@ -1168,7 +1187,10 @@
         this.toDoIds = []
         this.toDoNotConditions = []
         for (let i = 0; i < this.selectedRowKeysList.length; i++) {
-          if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
+          if ((this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' ||
+            this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
+            this.selectedRowKeysList[i].flowStatus == 'Review and return') &&
+            this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
             this.toDoIds.push(this.selectedRowKeysList[i].id)
           } else {
             this.toDoNotConditions.push(this.selectedRowKeysList[i].inspectionItem)