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'))