From 0aa5b72dc5df5d4515aeb65a9a120c3d63003b7b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 16 Aug 2022 14:37:02 +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                           | 1 +
 jero-web/src/common/lang/zh-cn.js                           | 1 +
 .../projectManagement/components/listOfRegulations.vue      | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 72d278ab7..1175d57c9 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1261,4 +1261,5 @@ module.exports = {
   currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up',
   currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down',
   weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report',
+  onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'Only the data whose list confirmation status is accepted and the task list status is not initiated or the task list status is accepted can be changed',
 }
\ 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 bdd85ecab..4267b58cd 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1363,4 +1363,5 @@ module.exports = {
   currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移',
   currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移',
   weilaiRegulationMonthlyReport:'蔚来法规月报',
+  onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'只能变更清单确认状态为接受并且任务清单状态为未发起或任务清单状态为接受的数据',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 194e2cda8..4f4e1b73a 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1190,11 +1190,13 @@
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                if (this.dataSource[i].taskAffirmStatus == 'Accepted') {
+                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')) {
                   isTrue = true
                 } else {
                   isTrue = false
-                  this.$message.warning(this.$t('onlyDataChanged'))
+                  this.$message.warning(this.$t('onlyTheDataWhoseStatusNotInitiatedAcceptedChanged'))
                   return
                 }
               }