diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 8b410da1c..29b533712 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -31,7 +31,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="title">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.title"
                          :placeholder="$t('PleaseEnter')+$t('title')"/>
               </a-form-model-item>
@@ -46,7 +45,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="subtitle">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.subtitle"
                          :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
               </a-form-model-item>
@@ -60,7 +58,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="applicableSupplement">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.applicableSupplement"
                          :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
               </a-form-model-item>
@@ -158,8 +155,6 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="attestationType">
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
-                                    :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'"/>
@@ -169,14 +164,12 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required">*</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.roleCodeIndex == 0 ||
-                                    (formInline.roleCodeIndex == 4 && formInline.homologationEngineerId == userInfoQuery.id) ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'attestation_rank'"/>
@@ -202,7 +195,7 @@
               </a-form-model-item>
             </div>
           </a-col>
-          <a-col :span="12" v-if="formInline.roleCodeIndex == 0">
+          <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
@@ -211,9 +204,9 @@
               <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
                 <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
                           class="box-input"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           v-model="formInline.regulationOwnerId">
                   <a-select-option v-for="(item, key) in regulatoryEngineerList"
                                    :key="key"
@@ -227,7 +220,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0">
+        <a-row :gutter="24">
 <!--          <a-col :span="12">-->
 <!--            <div class="box-title-text">-->
 <!--              <div class="title-text">-->
@@ -255,7 +248,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
@@ -263,7 +256,6 @@
                           class="box-input"
                           allowClear
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           v-model="formInline.engineeringInterfacePerson">
                   <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
                                    :key="key"
@@ -312,18 +304,10 @@
                     </div>
                   </a-col>
                 </a-row>
-        <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+        <div class="header-text">
           &nbsp;{{$t('confirmationOfDesignConformity')}}
         </div>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -424,11 +408,7 @@
 <!--            </div>-->
 <!--          </a-col>-->
 <!--        </a-row>-->
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -472,11 +452,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+        <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -657,18 +633,10 @@
 <!--            </div>-->
 <!--          </a-col>-->
 <!--        </a-row>-->
-        <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+        <div class="header-text">
           &nbsp;{{$t('verificationAndConformityconfirmation')}}
         </div>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-        formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-         formInline.regulationOwnerId == userInfoQuery.id)">
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -753,11 +721,7 @@
 <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
 <!--          -->
 <!--        </a-row>-->
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -802,11 +766,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
+        <a-row :gutter="24">
           <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 cc980b94b..759991c7c 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -264,11 +264,7 @@
       >
         <span slot="operation" slot-scope="text,record">
               <a class="text-operation"
-                 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 && record.taskAffirmStatus != 'List to confirm')"
+                 v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1"
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
@@ -459,6 +455,7 @@
       </a-form-model>
     </a-modal>
     <JLoading :loading="JLoading">{{ $t('dataLoading') }}</JLoading>
+    <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
     <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
     <listOfRegulationsView ref="listOfRegulationsViewRef"/>
     <batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
@@ -1179,7 +1176,10 @@
         selectedRowKeysList: [],
         rowKeysWarningList: [],
         rolecode: false,
-        dataWarningList: []
+        dataWarningList: [],
+        completeTaskList: [],
+        requestsNum: 0,
+        JTextLoading: false
       }
     },
 
@@ -2082,7 +2082,7 @@
         })
       },
 
-      startProcess(value,type) {
+      startProcess(value, type,index) {
         let query = {
           type: type,
           projectLawsInvnetoryList: value,
@@ -2092,11 +2092,20 @@
         }
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
-            // this.visible = false
-            // this.selectedRowKeys = []
-            // this.$message.success(this.$t('OperationSuccessful'))
-            // this.confirmLoading = false
-            this.completeTask(value, res.result)
+            this.completeTaskList.push(this.completeTask(value, res.result,index))
+            Promise.all(this.completeTaskList).then((res) => {
+              if (this.requestsNum == res.length) {
+                this.visible = false
+                this.selectedRowKeys = []
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.confirmLoading = false
+                this.JTextLoading = false
+                this.getList()
+              }
+            }).catch((error) => {
+              this.JTextLoading = false
+              this.$message.warning(error.message)
+            })
           } else {
             this.$message.warning(this.$t('operationFailed'))
           }
@@ -2119,14 +2128,9 @@
           }
           postAction('/workFlow/completeTask', query).then((res) => {
             if (res.success) {
-              // this.visible = false
-              // this.selectedRowKeys = []
-              // this.$message.success(this.$t('OperationSuccessful'))
-              // this.confirmLoading = false
-              // this.getList()
               resolve(res)
             } else {
-              this.$message.warning(this.$t('operationFailed'))
+              reject(res)
             }
           })
         })
@@ -2180,6 +2184,7 @@
         let designList = []
         let verifyList = []
         let detailedWarningList = []
+        this.completeTaskList = []
         this.detailedWarningList = this.dataWarningList || []
         let _this = this
         _this.$destroyAll()
@@ -2225,15 +2230,21 @@
           })
           return
         }
-        this.$confirm({
-          content: _this.$t('confirmLaunchTask'),
-          onOk() {
-            _this.submitAdmin(dataList)
-          }
-        })
+        if (num == 1) {
+          this.$confirm({
+            content: _this.$t('confirmLaunchTask'),
+            onOk() {
+              _this.submitAdmin(dataList)
+            }
+          })
+        } else {
+          _this.submitAdmin(dataList)
+        }
       },
       submitAdmin(dataList) {
         let _this = this
+        this.requestsNum = 0
+        this.JTextLoading = true
         for (let i = 0; i < dataList.length; i++) {
           if (dataList[i].designDeliverableType) {
             if (!dataList[i].designDutyId) {
@@ -2255,18 +2266,29 @@
               < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>)
             }
           }
-          if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
-            _this.startProcess(dataList[i], 2)
-            Promise.all(_this.completeTask()).then((res) => {
-              console.log(res)
-            }).catch(error => {
-              console.log('error', error)
-            })
+          if (dataList[i].designFlowStatus == 'List to be checked') {
+            if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
+              this.requestsNum++
+              _this.startProcess(dataList[i], 2,this.requestsNum)
+            }
+          } else {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
           }
-          if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
-            _this.startProcess(dataList[i], 2)
+          if (dataList[i].verifyFlowStatus == 'List to be checked') {
+            if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
+              this.requestsNum++
+              _this.startProcess(dataList[i], 2,this.requestsNum)
+            }
+          } else {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
           }
         }
+        if (this.requestsNum == 0) {
+          _this.promptInformation(_this.detailedWarningList)
+          this.JTextLoading = false
+        }
       },
       handleOkComment() {
         this.$refs.ruleFormComment.validate(valid => {