From 8a7d66731512b8a8ce8e10b4b6348f25f37c6f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Thu, 8 Sep 2022 20:27:56 +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                               | 2 +-
 jero-web/src/common/lang/zh-cn.js                               | 2 +-
 .../views/projectManagement/components/listOfRegulations.vue    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2fe2ec2d7..1dd31f30b 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -708,7 +708,7 @@ module.exports = {
   versionName: 'Version Name',
   finalizationTime: 'Finalization Time',
   setting: 'Setting',
-  incorrectsubmitted: 'The data status is incorrect; Only data with status to be confirmed can be submitted',
+  incorrectsubmitted: 'The data status is incorrect; Only data with status to be confirmed or rejected can be submitted',
   date: 'Date',
   time: 'Time',
   uploadMaximumATime: 'Upload a Maximum of 20 Images at a time',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 7fd173a33..32376ecc0 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -703,7 +703,7 @@ module.exports = {
   confirmOverrule: '确认驳回？',
   The: '第',
   submitted: '条数据已提交不能重复提交',
-  incorrectsubmitted: '条数据状态有误；只能提交状态为待确认的数据',
+  incorrectsubmitted: '条数据状态有误；只能提交状态为待确认或拒绝的数据',
   basicInformationOfParameters: '项目基本信息',
   regulatoryCertificationTaskPlan: '法规/认证任务计划',
   bringInRelevantPersonnel: '带入相关人员',
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 1fa57f8f6..1bd5760c2 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1880,7 +1880,7 @@
         this.rowKeysSuccessList = []
         this.rowKeysWarningList = []
         for (let i = 0; i < dataSource.length; i++) {
-          if (dataSource[i].inventoryAffirmStatus == 'List to confirm') {
+          if (dataSource[i].inventoryAffirmStatus == 'List to confirm' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
             if (dataSource[i].roleCode == 1 && dataSource[i].regulationOwnerSubmitStatus) {
 
               this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)