From 6bf56e4752c486bf85c0823dd26e26152be0ddd2 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 09:03:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                             | 3 ++-
 jero-web/src/common/lang/zh-cn.js                             | 1 +
 .../components/certificationDirectory.vue                     | 4 ++--
 .../components/certificationList/components/addModel.vue      | 2 +-
 .../components/certificationList/index.vue                    | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 19f020dad..60a3b785c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1977,5 +1977,6 @@ module.exports = {
   unpublishedregulationsselected:'Only unpublished regulations can be selected',
   PlatformInformation:'Platform Information',
   Processdetails:'Process Details',
-  matchempty:'The match is empty'
+  matchempty:'The match is empty',
+  onlyDataProcessStatusDeleted:'Only data whose flow status is to be started can be deleted',
 }
\ 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 f3cb814c8..69c317448 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1551,6 +1551,7 @@ module.exports = {
   type: '类型',
   select: '选择',
   onlyDataWithProcessStatusDeleted: '只能删除流程状态为清单待发布和审查通过的数据',
+  onlyDataProcessStatusDeleted: '只能删除流程状态为任务待发起的数据',
   complianceCertificationProgram: '合规认证计划',
   listPublishing: '清单发布',
   responsibilityConfirmation: '责任确认',
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationDirectory.vue
index e15fbb63f..c6021f680 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 == 2"
+          <div class="operator-text" v-if="isDisplayNum == 2 && 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 == 2 && this.isDisplayNum == 2){
+        if (this.roleSwitchingCode == 1 && this.isDisplayNum == 2){
         }else{
           for (var i = 0; i < columnResult.length; i++) {
             if (columnResult[i].title === this.$t('operation')) {
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 bb67b377b..9b887b4c3 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
@@ -362,7 +362,7 @@
                     <span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
                     <span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel-multi"
+                  <a-form-model-item class="itemModel"
                                      :prop="formInline.deliverableType == '1635545748968783874'?'':'dutyPersonName'"
                                      :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
                                  message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]"
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 d971f2fba..8bb58749c 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -1500,7 +1500,7 @@
       },
       deleteLib(val) {
         let _this = this
-        if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') {
+        if (val.flowStatus == 'List to be checked') {
           this.$confirm({
             content: _this.$t('ConfirmDelete'),
             onOk() {
@@ -1515,7 +1515,7 @@
             }
           })
         } else {
-          this.$message.warning(this.$t('onlyDataWithProcessStatusDeleted'))
+          this.$message.warning(this.$t('onlyDataProcessStatusDeleted'))
         }
       },
       modifyHistoryClick(row) {