From b72071eb1fe00d839f741e1fe545f5a4c348b308 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 11:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE=E5=BA=93-?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E6=95=B0=E6=8D=AE=E5=8C=B9=E9=85=8D=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue                  | 11 +++++------
 .../components/certificationDirectory.vue             |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index d6c47d187..67b63745f 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1994,19 +1994,18 @@
             }
           }
           for (let i = 0; i < dataSource.length; i++) {
-            if (dataSource[i].verifyFlowStatus == 'List to be released' &&
-              dataSource[i].designFlowStatus == 'List to be released') {
+            if (dataSource[i].verifyFlowStatus !== 'List to be released' &&
+              dataSource[i].designFlowStatus !== 'List to be released') {
               flag = '1'
               status = '1'
-            } else {
-              status = '2'
             }
           }
           console.log(status)
           if(status == '1'){
-            this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
-          }else{
             this.$message.warning(this.$t('unpublishedregulationsselected'))
+
+          }else{
+            this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
           }
         }else{
           this.dataSource.forEach(item => {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
index c6021f680..2badb0e82 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
@@ -11,7 +11,7 @@
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
       <div style="margin-bottom: 60px">
         <div class="table-operator">
-          <div class="operator-text" v-if="isDisplayNum == 2 && roleSwitchingCode == 1"
+          <div class="operator-text" v-if="roleSwitchingCode == 1"
                @click="addData">
             <a-icon type="plus"/>
             {{$t('add')}}
@@ -159,7 +159,7 @@
     computed: {
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.roleSwitchingCode == 1 && this.isDisplayNum == 2){
+        if (this.roleSwitchingCode == 1){
         }else{
           for (var i = 0; i < columnResult.length; i++) {
             if (columnResult[i].title === this.$t('operation')) {