From fcbd926115b47071e4d1c51cbc82236660f0de48 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Sat, 2 Jul 2022 12:09:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BC=BA=E5=B0=91=E4=B8=AD=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/zh-cn.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index d477abc5a..1bd9d1cd4 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -880,7 +880,8 @@ module.exports = {
   yellowSchedule: '黄：不符合/待追踪，有可接受的方案和时间表',
   greenRequirements: '绿：确认符合或满足当前要求',
   blueUndeterminedState: '蓝：未判断状态',
-  authenticationMessage: '认证消息',
+  authenticationMessage: '认证参数任务',
+  taskRegulationComplianceTask: '法规符合性任务',
   accept: '接受',
   refuse: '拒绝',
   taskTermination: '任务终止',

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

---
 .../processCenter/components/reviewedByThePersonInCharge.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index acff4364e..fc760921f 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -93,11 +93,12 @@
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text-fq">
-              <span class="Required" v-if="this.$route.query.isDisplay">*</span>
+<!--              <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
               <span class="title-text-text"
                     :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
             </div>
-            <a-form-model-item class="itemModel" :prop="!this.$route.query.isDisplay?'':'fileId'">
+<!--            :prop="!this.$route.query.isDisplay?'':'fileId'"-->
+            <a-form-model-item class="itemModel">
               <a-button type="primary" class="button-text"
                         @click="clickButtonToUpload('fileId')">
                 {{ (formInline.fileId === 'null' || formInline.fileId === '' ||

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

---
 .../components/listEditModel.vue              | 90 ++++++++++++-------
 .../components/listOfRegulations.vue          |  8 +-
 2 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 2d4052ab3..3eed26d00 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -313,13 +313,17 @@
         <!--          </a-col>-->
         <!--        </a-row>-->
         <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           &nbsp;{{$t('confirmationOfDesignConformity')}}
         </div>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -364,8 +368,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -427,8 +433,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -448,8 +456,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -466,13 +476,17 @@
           </a-col>
         </a-row>
         <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           &nbsp;{{$t('PrehomoConfirmation')}}
         </div>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -519,8 +533,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -582,8 +598,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -603,8 +621,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -621,13 +641,17 @@
           </a-col>
         </a-row>
         <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           &nbsp;{{$t('verificationAndConformityconfirmation')}}
         </div>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -673,8 +697,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
+        formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
+         formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -736,8 +762,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -757,8 +785,10 @@
           </a-col>
         </a-row>
         <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
+         formInline.homologationEngineerId == userInfoQuery.id) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
+        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index e113e041a..ea9ca3462 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -161,7 +161,11 @@
       >
         <span slot="operation" slot-scope="text,record">
               <a class="text-operation"
-                 v-if="(record.inventoryAffirmStatus == 'List to confirm' && (record.roleCode == 1 || record.roleCode == 2 || record.roleCode == 4)) || record.roleCode == 0"
+                 v-if="(record.inventoryAffirmStatus == 'List to confirm' &&
+                  ((record.roleCode == 1 && !record.regulationOwnerSubmitStatus) ||
+                  (record.roleCode == 2 && !record.homologationEngineerSubmitStatus) ||
+                  (record.roleCode == 4 && !record.regulationOwnerSubmitStatus && !record.homologationEngineerSubmitStatus)))
+                  || record.roleCode == 0"
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
@@ -1356,7 +1360,7 @@
                   if (dataList[i].verifyDueDate && dataList[i].verifyDutyId
                     && dataList[i].verifyInitiatorId) {
                   } else {
-                    this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>)
+                    this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConformityVerification') } < /div>)
                     continue
                     // isTrue = false
                     // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification'))