From d3e041041a3cd6943150d81bcbd1c77656276c5f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 23 Aug 2022 10:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                         | 7 ++++---
 jero-web/src/common/lang/zh-cn.js                         | 1 +
 .../processCenter/processForm/taskListProcess/index.vue   | 5 ++++-
 .../views/projectManagement/components/listEditModel.vue  | 5 ++++-
 .../projectManagement/components/listOfRegulations.vue    | 8 ++++++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index defc1db5c..be373dc58 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -715,9 +715,9 @@ module.exports = {
 
   confirmationOfRegulationsList: 'Regulation List Confirmation',
   regulatoryTaskConfirmation: 'Regulation Task Confirmation',
-  certificationStart: 'Homo Test Completion',
-  preHomoCompletion: 'Pre-Homo Completion',
-  certificationEnd: 'Type Approval',
+  certificationStart: 'Homo Completion',
+  preHomoCompletion: 'Pre-Homo Confirmation',
+  certificationEnd: 'Homo KO',
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',
@@ -1274,4 +1274,5 @@ module.exports = {
   theInconsistentSameResponsibility:'The selected data responsibility fields are inconsistent; Please select the same responsibility',
   taskConfirmedPersonnelCannotBeSetBatch:'When the task confirmation status is to be confirmed, personnel cannot be set in batch',
   theSelectedDataResponsibilityFieldCannotEmpty:'The selected data responsibility field cannot be empty',
+  theTaskConfirmationStatusCannot:'Only the list confirmation status is "reject" or "accept" and the task confirmation status cannot be "data to be confirmed"',
 }
\ 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 1b20b6c2f..9639b2b99 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1376,4 +1376,5 @@ module.exports = {
   theInconsistentSameResponsibility:'所选的数据责任领域不一致；请选择相同的责任领域',
   taskConfirmedPersonnelCannotBeSetBatch:'任务确认状态为待确认时无法批量设置人员',
   theSelectedDataResponsibilityFieldCannotEmpty:'所选数据责任领域不能为空',
+  theTaskConfirmationStatusCannot:'只能变更清单确认状态为拒绝或接受、及任务确认状态不能为待确认的数据',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index efb58fae4..79601ac8b 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -97,9 +97,12 @@
           },
           {
             title: this.$t('targetMarket'),
+            value: 'subtitle'
+          },
+          {
+            title: this.$t('subtitle'),
             value: 'targetMarket_dictText'
           },
-          {},
           {
             title: this.$t('standard'),
             value: 'serialNumber',
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 460c504bd..38b7f34f6 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -808,7 +808,10 @@
     </a-spin>
     <div class="drawer-bootom-button">
       <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      <a-button @click="handleSubmit" v-if="formInline.roleCodeIndex == 0" type="primary" :loading="confirmLoading">
+        {{$t('submit')}}
+      </a-button>
+      <a-button @click="handleSubmit" v-else type="primary" :loading="confirmLoading">{{$t('confirm')}}</a-button>
     </div>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </a-drawer>
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 7ad82c138..316af4691 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1263,11 +1263,15 @@
               if (this.dataSource[i].id == selectedRowKeys[j]) {
                 if (this.dataSource[i].taskAffirmStatus == 'Accepted' ||
                   (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
-                  (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
+                  (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
+                  (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
+                  (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
+                  (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started') ||
+                  (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
                   isTrue = true
                 } else {
                   isTrue = false
-                  this.$message.warning(this.$t('onlyTheDataWhoseStatusNotInitiatedAcceptedChanged'))
+                  this.$message.warning(this.$t('theTaskConfirmationStatusCannot'))
                   return
                 }
               }