diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index b9108ffba..455dd593e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -845,23 +845,38 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						String engineeringInterfacePersonName = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 						String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 
-						//除了责任领域全有值->可以
-						if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) {
-							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
-							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
-							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
-						}else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) {
-							//除了责任领域,其他的可以全为空->可以
+						if(StringUtils.isBlank(lawEngineerName)){
 							projectRelatedPersonnel.setLawEngineerName("");
-							projectRelatedPersonnel.setEngineeringInterfacePersonName("");
-							projectRelatedPersonnel.setCertificationEngineerName("");
-						}else {//除了责任领域,备注,有一个为空都报错
-							if(CutEnum.CN.getValue().equals(cut)){
-								throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行");
-							}else{
-								throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check  line" + (i+1));
-							}
+						}else{
+							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
 						}
+						if(StringUtils.isBlank(engineeringInterfacePersonName)){
+							projectRelatedPersonnel.setEngineeringInterfacePersonName("");
+						}else{
+							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
+						}
+						if(StringUtils.isBlank(certificationEngineerName)){
+							projectRelatedPersonnel.setCertificationEngineerName("");
+						}else{
+							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
+						}
+//						//除了责任领域全有值->可以
+//						if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) {
+//							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
+//							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
+//							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
+//						}else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) {
+//							//除了责任领域,其他的可以全为空->可以
+//							projectRelatedPersonnel.setLawEngineerName("");
+//							projectRelatedPersonnel.setEngineeringInterfacePersonName("");
+//							projectRelatedPersonnel.setCertificationEngineerName("");
+//						}else {//除了责任领域,备注,有一个为空都报错
+//							if(CutEnum.CN.getValue().equals(cut)){
+//								throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行");
+//							}else{
+//								throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check  line" + (i+1));
+//							}
+//						}
 
 						//导入的备注为数字,被识别成小数点后一位
 						Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 3cc0b4441..420faa5b6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1068,4 +1068,8 @@ module.exports = {
   newNiONumber: 'Number',
   English: 'English',
   requiredParametersEmpty:'Required parameters cannot be empty',
+  PleaseTaskConfirmationRejected:'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected',
+  theProjectContactEmpty:'The project contact person of cannot be empty',
+  pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
+  TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
 }
\ 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 d477abc5a..58a24510e 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -681,7 +681,11 @@ module.exports = {
   listConfirmation: '清单确认',
   ListConfirmationDeadline: '清单确认截止时间',
   dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
+  pleaseSelectinitiatedOrRejected:'请选择清单确认状态为未发起或拒绝的数据',
+  TheEngineerAndCertification:'的法规工程师、认证工程师不能为空',
   taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
+  theProjectContactEmpty:'的工程接口人不能为空',
+  PleaseTaskConfirmationRejected:'请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据',
   pleaseSelectPersonFirst: '请先选择人员',
   onlyOnePersonCanBeSelected: '只能选择一个人员',
   overrule: '驳回',
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
index 0df58f3f4..bf0488485 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
@@ -259,7 +259,9 @@
       },
       hideModal() {
         this.form.dictName = this.form.dictName.trim()
-        this.form.description = this.form.description.trim()
+        if (this.form.description){
+          this.form.description = this.form.description.trim()
+        }
         let params = {
           ...this.form
         }
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 38a70644d..5082b874a 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -509,7 +509,6 @@
           distributionEngineerList: this.distributionEngineerList
         }
         postAction(this.url.DetailEOAdd, query).then((res) => {
-          if (res.success) {
             if (res.success) {
               this.confirmLoading = false
               this.getList()
@@ -519,7 +518,6 @@
               this.confirmLoading = false
               this.$message.warning(res.message)
             }
-          }
         })
       },
       feedbackData(url, Action) {
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index bcf18f0a6..f486e8b1c 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -158,7 +158,7 @@
           this.textLoading = this.$t('Submitting')
           this.loading = true
           if (!this.isFlag) {
-            res.flag = ''
+            res.flag = 0
           }
           this.completeTask(res, handlingTime)
         })
@@ -195,17 +195,17 @@
             this.$message.success(this.$t('OperationSuccessful'))
             if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') {
               if (value.flag == 0) {
-                if (this.queryProject.verifyRemark) {
+                if (this.queryProject.verifyDeliverableType) {
                   this.startProcessDesign(this.queryBy, 4)
                 }
-                if (this.queryProject.prehomoRemark) {
+                if (this.queryProject.prehomoDeliverableType) {
                   this.startProcessDesign(this.queryBy, 3)
                 }
-                if (this.queryProject.designRemark) {
+                if (this.queryProject.designDeliverableType) {
                   this.startProcessDesign(this.queryBy, 2)
                 }
-                if (!this.queryProject.verifyRemark && !this.queryProject.prehomoRemark &&
-                  !this.queryProject.designRemark) {
+                if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType &&
+                  !this.queryProject.designDeliverableType) {
                   setTimeout(() => {
                     this.loading = false
                     window.close()
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 68f508967..e1f9c7be6 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -321,6 +321,7 @@
               DueDate: 'designDueDate',
               remarks: 'designRemark',
               projectName: this.$route.query.projectName,
+              targetMarket:this.$route.query.targetMarket,
               projectNameId: this.$route.query.projectNameId,
               primaryKeyId: val.designTaskDetailId,
               PersonChargeFeedback: val.designPersonChargeFeedback
@@ -345,6 +346,7 @@
               DueDate: 'prehomoDueDate',
               remarks: 'prehomoRemark',
               projectName: this.$route.query.projectName,
+              targetMarket:this.$route.query.targetMarket,
               projectNameId: this.$route.query.projectNameId,
               primaryKeyId: val.prehomoTaskDetailId,
               PersonChargeFeedback: val.prehomoPersonChargeFeedback
@@ -369,6 +371,7 @@
               DueDate: 'verifyDueDate',
               remarks: 'verifyRemark',
               projectName: this.$route.query.projectName,
+              targetMarket:this.$route.query.targetMarket,
               projectNameId: this.$route.query.projectNameId,
               primaryKeyId: val.verifyTaskDetailId,
               PersonChargeFeedback: val.verifyPersonChargeFeedback
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index c7e77282b..2d4052ab3 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -46,7 +46,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="subtitle">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCode == 0 ? false : true"
+                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.subtitle"
                          :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
               </a-form-model-item>
@@ -60,7 +60,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="applicableSupplement">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCode == 0 ? false : true"
+                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.applicableSupplement"
                          :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
               </a-form-model-item>
@@ -158,7 +158,8 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="attestationType">
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
-                                    :disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true"
+                                    :disabled="formInline.roleCodeIndex == 0 ||
+                                    (formInline.roleCodeIndex == 4 && formInline.homologationEngineerId == userInfoQuery.id) ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'attestation_type'"/>
@@ -168,13 +169,14 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCode == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
                 <span class="title-text-text"
                       :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
               </div>
               <a-form-model-item class="itemModel-multi" prop="attestationRank">
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
-                                    :disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true"
+                                    :disabled="formInline.roleCodeIndex == 0 ||
+                                    (formInline.roleCodeIndex == 4 && formInline.homologationEngineerId == userInfoQuery.id) ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'attestation_rank'"/>
@@ -186,24 +188,24 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCode == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
                 <span class="title-text-text"
                       :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
               </div>
               <a-form-model-item class="itemModel-multi" prop="dutyTerritory">
                 <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
                                     @change="dutyTerritoryChange"
-                                    :disabled="formInline.roleCode == 0 ? false : true"
+                                    :disabled="formInline.roleCodeIndex == 0 ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'duty_territory'"/>
               </a-form-model-item>
             </div>
           </a-col>
-          <a-col :span="12" v-if="formInline.roleCode == 0">
+          <a-col :span="12" v-if="formInline.roleCodeIndex == 0">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCode == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
                 <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
@@ -211,7 +213,7 @@
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           v-model="formInline.regulationOwnerId">
                   <a-select-option v-for="(item, key) in regulatoryEngineerList"
                                    :key="key"
@@ -225,11 +227,11 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="formInline.roleCode == 0">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCode == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
                 <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'homologationEngineerId'">
@@ -237,7 +239,7 @@
                           class="box-input"
                           allowClear
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           v-model="formInline.homologationEngineerId">
                   <a-select-option v-for="(item, key) in certificationEngineerList"
                                    :key="key"
@@ -253,7 +255,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCode == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
@@ -261,7 +263,7 @@
                           class="box-input"
                           allowClear
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           v-model="formInline.engineeringInterfacePerson">
                   <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
                                    :key="key"
@@ -310,10 +312,14 @@
         <!--            </div>-->
         <!--          </a-col>-->
         <!--        </a-row>-->
-        <div class="header-text">
+        <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
           &nbsp;{{$t('confirmationOfDesignConformity')}}
         </div>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -325,7 +331,6 @@
                   tree-node-filter-prop="title"
                   v-model="formInline.designDeliverableType"
                   :maxTagCount="1"
-                  :disabled="formInline.taskAffirmStatus != 'Not started' ? true : false"
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   class="box-input"
                   style="width: 100%"
@@ -349,7 +354,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          :disabled="formInline.taskAffirmStatus != 'Not started' ? true : false"
                           @click="clickButtonToUpload('designDeliverableTemplate')">
                   {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
                   formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -359,7 +363,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -368,7 +374,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="designInitiatorId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                          :disabled="designInitiatorDisabled"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           class="box-input"
                           allowClear
@@ -420,7 +426,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -439,7 +447,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -455,10 +465,14 @@
             </div>
           </a-col>
         </a-row>
-        <div class="header-text">
+        <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
           &nbsp;{{$t('PrehomoConfirmation')}}
         </div>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -504,7 +518,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -513,7 +529,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="prehomoInitiatorId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                          :disabled="prehomoInitiatorIdDisabled"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
@@ -565,7 +581,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -584,7 +602,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -600,10 +620,14 @@
             </div>
           </a-col>
         </a-row>
-        <div class="header-text">
+        <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
           &nbsp;{{$t('verificationAndConformityconfirmation')}}
         </div>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -648,7 +672,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -660,7 +686,7 @@
                           class="box-input"
                           allowClear
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          :disabled="verifyInitiatorIdDisabled"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           v-model="formInline.verifyInitiatorId">
                   <a-select-option v-for="(item, key) in verifyInitiatorList"
                                    :key="key"
@@ -709,7 +735,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -728,7 +756,9 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
+        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -760,6 +790,7 @@
   import { getAction, postAction, putAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
   import moment from 'moment'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'listEditModel',
@@ -842,13 +873,16 @@
         prehomoDutyIdDisabled: false,
         verifyDutyIdDisabled: false,
         verifyInitiatorIdDisabled: false,
-        DeliverableTreeList: []
+        DeliverableTreeList: [],
+        userInfoQuery:{},
       }
     },
     mounted() {
       this.getDeliverableTree()
+      this.userInfoQuery = this.userInfo()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       getDeliverableTree() {
         getAction('/sys/category/getDeliverableTree', {}).then((res) => {
           if (res.success) {
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index a270be398..e113e041a 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1197,6 +1197,16 @@
         }
       },
       edit(item) {
+        let roleCodeIndex
+        if (this.isDisplay) {
+          roleCodeIndex = 0
+        } else {
+          roleCodeIndex = 4
+        }
+        if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
+          roleCodeIndex = 0
+        }
+        item.roleCodeIndex = roleCodeIndex
         this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
       },
       deleteLib(val) {
@@ -1290,13 +1300,13 @@
                   if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
                     this.detailedSuccessList.push(this.dataSource[i])
                   } else {
-                    this.detailedWarningList.push(<div> {this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } </div>)
+                    this.detailedWarningList.push( < div > { this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
                     // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification'))
                     // isTrue = false
                     // return
                   }
                 } else {
-                  this.detailedWarningList.push(<div>  {this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } </div>)
+                  this.detailedWarningList.push( < div > {this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>)
                   // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
                   // isTrue = false
                   // return
@@ -1307,12 +1317,12 @@
           if (this.detailedSuccessList && this.detailedSuccessList.length > 0) {
             this.visible = true
             this.formInline = {}
-          }else{
+          } else {
             let that = this
             this.$warning({
               content: (
                 < div >
-                {that.detailedWarningList}
+                { that.detailedWarningList }
                 < /div>
             )
           })
@@ -1342,36 +1352,36 @@
             if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') &&
               dataList[i].inventoryAffirmStatus == 'Accepted') {
               if (dataList[i].engineeringInterfacePerson) {
-                if (dataList[i].verifyRemark) {
+                if (dataList[i].verifyDeliverableType) {
                   if (dataList[i].verifyDueDate && dataList[i].verifyDutyId
                     && dataList[i].verifyInitiatorId) {
                   } else {
-                    this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } </div>)
-                    continue;
+                    this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>)
+                    continue
                     // isTrue = false
                     // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification'))
                     // return
                   }
                 }
 
-                if (dataList[i].prehomoRemark) {
+                if (dataList[i].prehomoDeliverableType) {
                   if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId
                     && dataList[i].prehomoInitiatorId) {
                   } else {
-                    this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } </div>)
-                    continue;
+                    this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>)
+                    continue
                     // isTrue = false
                     // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo'))
                     // return
                   }
                 }
 
-                if (dataList[i].designRemark) {
+                if (dataList[i].designDeliverableType) {
                   if (dataList[i].designDueDate && dataList[i].designDutyId
                     && dataList[i].designInitiatorId) {
                   } else {
-                    this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } </div>)
-                    continue;
+                    this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } < /div>)
+                    continue
                     // isTrue = false
                     // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation'))
                     // return
@@ -1379,27 +1389,27 @@
                 }
                 this.TaskSuccessList.push(dataList[i])
               } else {
-                this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('theProjectContactEmpty') } </div>)
+                this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('theProjectContactEmpty') } < /div>)
                 // isTrue = false
                 // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty'))
                 // return
               }
             } else {
-              this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } </div>)
+              this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } < /div>)
               // isTrue = false
               // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected'))
               // return
             }
           }
-          if (this.TaskWarningList && this.TaskWarningList.length > 0) {
+          if (this.TaskSuccessList && this.TaskSuccessList.length > 0) {
             this.visible = true
             this.formInline = {}
-          }else{
+          } else {
             let that = this
             this.$warning({
               content: (
                 < div >
-                {that.TaskWarningList}
+                { that.TaskWarningList }
                 < /div>
             )
           })
@@ -1436,11 +1446,11 @@
                   this.confirmLoading = false
                 }
                 let that = this
-                if (this.detailedWarningList.length > 0){
+                if (this.detailedWarningList.length > 0) {
                   this.$warning({
                     content: (
                       < div >
-                      {that.detailedWarningList}
+                      { that.detailedWarningList }
                       < /div>
                   )
                 })
@@ -1449,20 +1459,20 @@
                 this.detailedWarningList = []
               })
             } else {
-              let index = 0
               for (let i = 0; i < this.TaskSuccessList.length; i++) {
-                    index++
-                    this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
-                    Object.keys(this.TaskSuccessList[i]).forEach(res => {
-                      if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) {
-                        this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“')
-                        this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘')
-                      }
-                    })
-                    setTimeout(() => {
-                      this.confirmLoading = true
-                      this.startProcess(this.TaskSuccessList[i], index)
-                    }, 500)
+                ((i) => {
+                  this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
+                  Object.keys(this.TaskSuccessList[i]).forEach(res => {
+                    if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) {
+                      this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“')
+                      this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘')
+                    }
+                  })
+                  setTimeout(() => {
+                    this.confirmLoading = true
+                    this.startProcess(this.TaskSuccessList[i], (i + 1))
+                  }, 500)
+                })(i)
               }
             }
           }
@@ -1502,11 +1512,11 @@
               this.confirmLoading = false
               this.getList()
               let that = this
-              if (this.TaskWarningList.length > 0){
+              if (this.TaskWarningList.length > 0) {
                 this.$warning({
                   content: (
                     < div >
-                    {that.TaskWarningList}
+                    { that.TaskWarningList }
                     < /div>
                 )
               })