From 6387015cdd5b858a428a9a22a3d9a6fe0ee659c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 12 Apr 2023 14:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E9=80=80?=
 =?UTF-8?q?=E5=9B=9E=E5=8E=9F=E5=9B=A0?=
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    | 32 +++++++++++--------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index bbbcdece6..ed76a0fe9 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1777,4 +1777,5 @@ module.exports = {
   deadlineForVerifyingComplianceResponsibilityConfirmation:'Deadline for verifying compliance responsibility confirmation',
   batchTaskResponsibilityConfirmation:'Batch task responsibility confirmation',
   batchComplianceConfirmation:'Batch compliance confirmation',
+  onlyDataWithApprovedCanCeSelected:'Only data with a process status of result pending review or approved 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 4e9ace7af..aa511a371 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1879,4 +1879,5 @@ module.exports = {
   deadlineForVerifyingComplianceResponsibilityConfirmation:'验证符合性责任确认截止日期',
   batchTaskResponsibilityConfirmation:'批量任务责任确认',
   batchComplianceConfirmation:'批量符合性确认',
+  onlyDataWithApprovedCanCeSelected:'只能选择流程状态为结果待审查、审查通过的数据',
 }
\ 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 e0d4b2485..168d6e0c3 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1113,7 +1113,7 @@
             if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' &&
               this.selectedRowKeysList[i].deliverableType == '1635545748968783874') ||
               (this.selectedRowKeysList[i].flowStatus == 'Certification returned' &&
-                this.selectedRowKeysList[i].deliverableType == '1635545748968783874') ) {
+                this.selectedRowKeysList[i].deliverableType == '1635545748968783874')) {
               ids.push(this.selectedRowKeysList[i].id)
             } else if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' &&
               this.selectedRowKeysList[i].endTime) ||
@@ -1852,24 +1852,30 @@
           }
           let data = ''
           if (notConditions && notConditions.length > 0) {
-            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusResultReviewedCanBeSelected')
+            if (value == 'rzgcssc_th'){
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataWithApprovedCanCeSelected')
+            }else{
+              data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusResultReviewedCanBeSelected')
+            }
           }
           if (ids && ids.length > 0) {
             let text = ''
             if (isTrue) {
               text = this.$t('theCurrentlySelectedDataContainsReviewed')
-            } else {
-              text = prompt
             }
             if (value == 'rzgcssc_th') {
-              this.$confirm({
-                content: text,
-                onOk() {
-                  _this.$refs.reasonForReturnRef.getData(value, text, ids, notConditions, data, _this.$t('reviewTheReasonForReturn'))
-                }
-              })
+              if (isTrue) {
+                this.$confirm({
+                  content: text,
+                  onOk() {
+                    _this.$refs.reasonForReturnRef.getData(value, text, ids, notConditions, data, _this.$t('reviewTheReasonForReturn'))
+                  }
+                })
+              } else {
+                _this.$refs.reasonForReturnRef.getData(value, prompt, ids, notConditions, data, _this.$t('reviewTheReasonForReturn'))
+              }
             } else {
-              this.submitTask(value, text, ids, notConditions, data)
+              this.submitTask(value, prompt, ids, notConditions, data)
             }
           } else {
             this.failedMessage(data)
@@ -1878,13 +1884,13 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
-      reasonForReturnForm(value, text, ids, notConditions, data,reasonForReturn) {
+      reasonForReturnForm(value, text, ids, notConditions, data, reasonForReturn) {
         let _this = this
         let query = {
           'nodeKey': value,
           'projectLibraryId': _this.$route.query.id,
           'ids': ids.join(','),
-          reasonForReturn:reasonForReturn
+          reasonForReturn: reasonForReturn
         }
         postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
           if (res.success) {