From 71a31e83ac8beec1953d6f0ffa6412861145c006 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 28 Sep 2023 09:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BA=BA=E5=9C=A8=E7=BC=96=E8=BE=91=E4=B8=AD=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/components/addModel.vue   | 6 +++---
 .../components/certificationList/index.vue                 | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 92905cb59..9fc29bdf5 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -804,9 +804,9 @@
         if (value.dutyDepart && value.dutyDepart.length > 0) {
           this.getDutyTerritoryOne(value.dutyDepart.join(','))
         }
-        if (value.dutyTerritory && value.dutyTerritory.length > 0) {
-          this.queryPersonByProject(value.dutyTerritory.join(','))
-        }
+        // if (value.dutyTerritory && value.dutyTerritory.length > 0) {
+        //   this.queryPersonByProject(value.dutyTerritory.join(','))
+        // }
         this.getRegulationNo()
         this.title = this.$t('edit')
         this.$nextTick(() => {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 56fd57180..2aee9c74d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -1136,8 +1136,9 @@
           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 == 'Review and pass') {
+            if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
+              this.selectedRowKeysList[i].flowStatus == 'Review and pass'  ||
+              this.selectedRowKeysList[i].flowStatus == 'Duty Person Rejected') {
               ids.push(this.selectedRowKeysList[i].id)
             } else {
               notConditions.push(this.selectedRowKeysList[i].inspectionItem)
@@ -1145,7 +1146,7 @@
           }
           let data = ''
           if (notConditions && notConditions.length > 0) {
-            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataWithProcessStatusDeleted')
+            data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataProcessStatusDeleted')
           }
           if (ids && ids.length > 0) {
             this.$confirm({