修改禅道bug

jero-web/src/views/documentTools/virtualList/components/batSetting.vue

@@ -30,7 +30,7 @@
             <div class="title-text">
               <span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span>
             </div>
-            <a-form-model-item class="itemModel">
+            <a-form-model-item class="itemModel-multi">
               <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
                                   :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                   :type="'select'"
@@ -50,7 +50,7 @@
             <div class="title-text">
               <span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
             </div>
-            <a-form-model-item class="itemModel">
+            <a-form-model-item class="itemModel-multi">
               <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
                                   :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                   :type="'select'"
@@ -68,12 +68,16 @@
             <div class="title-text">
               <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
             </div>
-            <a-form-model-item class="itemModel">
+            <a-form-model-item class="itemModel-multi">
-              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+              <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                 @input="handleInput('dutyTerritory')"
+                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                  :type="'select'"
-                                 :type="'select'"
+                                  :triggerChange="false" :dictCode="'duty_territory'"/>
-                                 :triggerChange="false" dictCode="duty_territory"/>
+<!--              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+<!--                                 @input="handleInput('dutyTerritory')"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" dictCode="duty_territory"/>-->
             </a-form-model-item>
           </div>
         </a-col>
@@ -116,7 +120,7 @@
                 <span class="title-text-text"
                       :title="$t('technicalField')">{{$t('technicalField')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="technologyTerritory">
+            <a-form-model-item class="itemModel-multi" prop="technologyTerritory">
               <a-tree-select
                 tree-node-filter-prop="title"
                 v-model="formInline.technologyTerritory"

jero-web/src/views/documentTools/virtualList/components/editModel.vue

@@ -292,6 +292,40 @@
         <div class="header-text">
           &nbsp;{{$t('confirmationOfDesignConformity')}}
         </div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="designInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"
+                                   :disabled="disabled"
+                                   @input="handleInput('designInitiator')"
+                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="designDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"
+                                   :disabled="disabled"
+                                   @input="handleInput('designDuty')"
+                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
@@ -337,40 +371,6 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="designInitiator">
-                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"
-                                   :disabled="disabled"
-                                   @input="handleInput('designInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="designDuty">
-                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"
-                                   :disabled="disabled"
-                                   @input="handleInput('designDuty')"
-                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text">
@@ -390,6 +390,40 @@
         <div class="header-text">
           &nbsp;{{$t('PrehomoConfirmation')}}
         </div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="prehomoInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"
+                                   :disabled="disabled"
+                                   @input="handleInput('prehomoInitiator')"
+                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="prehomoDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"
+                                   :disabled="disabled"
+                                   @input="handleInput('prehomoDuty')"
+                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
@@ -436,40 +470,6 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoInitiator">
-                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"
-                                   :disabled="disabled"
-                                   @input="handleInput('prehomoInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoDuty">
-                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"
-                                   :disabled="disabled"
-                                   @input="handleInput('prehomoDuty')"
-                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text">
@@ -489,6 +489,40 @@
         <div class="header-text">
           &nbsp;{{$t('verificationAndConformityconfirmation')}}
         </div>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="verifyInitiator">
+                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"
+                                   :disabled="disabled"
+                                   @input="handleInput('verifyInitiator')"
+                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="verifyDuty">
+                <j-dict-select-tag class="box-input" v-model="formInline.verifyDuty"
+                                   :disabled="disabled"
+                                   @input="handleInput('verifyDuty')"
+                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
@@ -534,40 +568,6 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="verifyInitiator">
-                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"
-                                   :disabled="disabled"
-                                   @input="handleInput('verifyInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('personLiable')">{{$t('personLiable')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="verifyDuty">
-                <j-dict-select-tag class="box-input" v-model="formInline.verifyDuty"
-                                   :disabled="disabled"
-                                   @input="handleInput('verifyDuty')"
-                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text">

jero-web/src/views/projectManagement/components/listEditModel.vue

@@ -323,54 +323,6 @@
         (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">
-                <span class="title-text-text"
-                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="typeOfDeliverables">
-                <a-tree-select
-                  tree-node-filter-prop="title"
-                  v-model="formInline.designDeliverableType"
-                  :maxTagCount="1"
-                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                  class="box-input"
-                  style="width: 100%"
-                  :tree-data="DeliverableTreeList"
-                  tree-checkable
-                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                />
-                <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
-                <!--                                   @input="handleInput('designDeliverableType')"-->
-                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
-                <!--                                   :type="'select'"-->
-                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
-                <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('designDeliverableTemplate')">
-                  {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
-                  formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                  }}
-                </a-button>
-              </a-form-model-item>
-            </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-col :span="12">
             <div class="box-title-text">
@@ -459,6 +411,54 @@
         (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">
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="typeOfDeliverables">
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="formInline.designDeliverableType"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
+                <!--                                   @input="handleInput('designDeliverableType')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('designDeliverableTemplate')">
+                  {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
+                  formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </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-col :span="24">
             <div class="box-title-text">
@@ -486,56 +486,6 @@
         (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">
-                <span class="title-text-text"
-                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
-                <a-tree-select
-                  tree-node-filter-prop="title"
-                  v-model="formInline.prehomoDeliverableType"
-                  :maxTagCount="1"
-                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                  class="box-input"
-                  style="width: 100%"
-                  :tree-data="DeliverableTreeList"
-                  tree-checkable
-                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                />
-                <!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"-->
-                <!--                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"-->
-                <!--                                   @input="handleInput('prehomoDeliverableType')"-->
-                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
-                <!--                                   :type="'select'"-->
-                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">
-                <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('prehomoDeliverableTemplate')">
-                  {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
-                  ||
-                  formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                  }}
-                </a-button>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
-        (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">
@@ -624,6 +574,56 @@
         (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">
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="formInline.prehomoDeliverableType"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"-->
+                <!--                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"-->
+                <!--                                   @input="handleInput('prehomoDeliverableType')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('prehomoDeliverableTemplate')">
+                  {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
+                  ||
+                  formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        (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">
@@ -648,55 +648,6 @@
           &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-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="verifyDeliverableType">
-                <a-tree-select
-                  tree-node-filter-prop="title"
-                  v-model="formInline.verifyDeliverableType"
-                  :maxTagCount="1"
-                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                  class="box-input"
-                  style="width: 100%"
-                  :tree-data="DeliverableTreeList"
-                  tree-checkable
-                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-                />
-                <!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"-->
-                <!--                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"-->
-                <!--                                   @input="handleInput('verifyDeliverableType')"-->
-                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
-                <!--                                   :type="'select'"-->
-                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="verifyDeliverableTemplate">
-                <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('verifyDeliverableTemplate')">
-                  {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
-                  formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                  }}
-                </a-button>
-              </a-form-model-item>
-            </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 &&
@@ -788,6 +739,55 @@
         (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">
+                <span class="title-text-text"
+                      :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="verifyDeliverableType">
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="formInline.verifyDeliverableType"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="DeliverableTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                />
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"-->
+                <!--                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"-->
+                <!--                                   @input="handleInput('verifyDeliverableType')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'deliverable_template'"/>-->
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="verifyDeliverableTemplate">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('verifyDeliverableTemplate')">
+                  {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
+                  formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </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-col :span="24">
             <div class="box-title-text">