diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 5c7147f7e..efb69b919 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -57,8 +57,8 @@
           </div>
         </div>
         <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
-          <div class="content" v-if="result.dutyTerritory">
-            <span v-for="(item,index) in result.dutyTerritory.split(',')">
+          <div class="content" v-if="result.dutyTerritory_dictText">
+            <span v-for="(item,index) in result.dutyTerritory_dictText.split(',')">
             <span class="box-content-index">{{item}}</span><br/>
             </span>
           </div>
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 12b01c278..af449af48 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -197,6 +197,7 @@
               <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
                 <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
                           class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.regulationOwnerId">
@@ -223,6 +224,7 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
                           class="box-input"
                           allowClear
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.homologationEngineerId">
                   <a-select-option v-for="(item, key) in certificationEngineerList"
@@ -246,6 +248,7 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
                           class="box-input"
                           allowClear
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           :disabled="formInline.roleCode == 0 ? false : true"
                           v-model="formInline.engineeringInterfacePerson">
                   <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
@@ -307,7 +310,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="typeOfDeliverables">
                 <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"
-                                   :disabled="disabled"
+                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false"
                                    @input="handleInput('designDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
@@ -323,6 +326,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
                 <a-button type="primary" class="button-text"
+                          :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableTemplate ? true : false"
                           @click="clickButtonToUpload('designDeliverableTemplate')">
                   {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
                   formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -341,7 +345,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="designInitiatorId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :disabled="designInitiatorDisabled"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           class="box-input"
                           allowClear
                           v-model="formInline.designInitiatorId">
@@ -370,7 +375,8 @@
               </div>
               <a-form-model-item class="itemModel" prop="designDutyId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :disabled="designDutyIdDisabled"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           class="box-input"
                           allowClear
                           v-model="formInline.designDutyId">
@@ -406,7 +412,7 @@
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.designDueDate"
-                               :disabled="false"
+                               :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDueDate ? true : false"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -425,7 +431,7 @@
               <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
 
                 <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"
-                                   :disabled="disabled"
+                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"
                                    @input="handleInput('prehomoDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
@@ -441,6 +447,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">
                 <a-button type="primary" class="button-text"
+                          :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableTemplate ? true : false"
                           @click="clickButtonToUpload('prehomoDeliverableTemplate')">
                   {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
                   ||
@@ -460,8 +467,9 @@
               </div>
               <a-form-model-item class="itemModel" prop="prehomoInitiatorId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :disabled="prehomoInitiatorIdDisabled"
                           class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
                           v-model="formInline.prehomoInitiatorId">
                   <a-select-option v-for="(item, key) in prehomoInitiatorList"
@@ -491,7 +499,8 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
                           class="box-input"
                           allowClear
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          :disabled="prehomoDutyIdDisabled"
                           v-model="formInline.prehomoDutyId">
                   <a-select-option v-for="(item, key) in prehomoDutyList"
                                    :key="key"
@@ -525,7 +534,7 @@
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.prehomoDueDate"
-                               :disabled="disabled"
+                               :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDueDate ? true : false"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -543,7 +552,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="verifyDeliverableType">
                 <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"
-                                   :disabled="disabled"
+                                   :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"
                                    @input="handleInput('verifyDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
@@ -559,6 +568,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="verifyDeliverableTemplate">
                 <a-button type="primary" class="button-text"
+                          :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableTemplate ? true : false"
                           @click="clickButtonToUpload('verifyDeliverableTemplate')">
                   {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
                   formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -579,7 +589,8 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
                           class="box-input"
                           allowClear
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          :disabled="verifyInitiatorIdDisabled"
                           v-model="formInline.verifyInitiatorId">
                   <a-select-option v-for="(item, key) in verifyInitiatorList"
                                    :key="key"
@@ -608,7 +619,8 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
                           class="box-input"
                           allowClear
-                          :disabled="formInline.roleCode == 0 ? false : true"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          :disabled="verifyDutyIdDisabled"
                           v-model="formInline.verifyDutyId">
                   <a-select-option v-for="(item, key) in verifyDutyList"
                                    :key="key"
@@ -642,7 +654,7 @@
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.verifyDueDate"
-                               :disabled="false"
+                               :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDueDate ? true : false"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -711,7 +723,13 @@
         verifyInitiatorList: [],
         verifyDutyList: [],
         prehomoDutyList: [],
-        disabled: false
+        disabled: false,
+        designInitiatorDisabled: false,
+        designDutyIdDisabled: false,
+        prehomoInitiatorIdDisabled: false,
+        prehomoDutyIdDisabled: false,
+        verifyDutyIdDisabled: false,
+        verifyInitiatorIdDisabled: false
       }
     },
     mounted() {
@@ -740,6 +758,52 @@
           }
         })
       },
+      getDis(val) {
+        if (val.taskAffirmStatus != 'Not started' && !val.designInitiatorId) {
+          this.designInitiatorDisabled = true
+        } else if (val.roleCode == 0) {
+          this.designInitiatorDisabled = false
+        } else {
+          this.designInitiatorDisabled = true
+        }
+        if (val.taskAffirmStatus != 'Not started' && !val.designDutyId) {
+          this.designDutyIdDisabled = true
+        } else if (val.roleCode == 0) {
+          this.designDutyIdDisabled = false
+        } else {
+          this.designDutyIdDisabled = true
+        }
+        if (val.taskAffirmStatus != 'Not started' && !val.prehomoInitiatorId) {
+          this.prehomoInitiatorIdDisabled = true
+        } else if (val.roleCode == 0) {
+          this.prehomoInitiatorIdDisabled = false
+        } else {
+          this.prehomoInitiatorIdDisabled = true
+        }
+        if (val.taskAffirmStatus != 'Not started' && !val.prehomoDutyId) {
+          this.prehomoDutyIdDisabled = true
+        } else if (val.roleCode == 0) {
+          this.prehomoDutyIdDisabled = false
+        } else {
+          this.prehomoDutyIdDisabled = true
+        }
+
+        if (val.taskAffirmStatus != 'Not started' && !val.verifyDutyId) {
+          this.verifyDutyIdDisabled = true
+        } else if (val.roleCode == 0) {
+          this.verifyDutyIdDisabled = false
+        } else {
+          this.verifyDutyIdDisabled = true
+        }
+
+        if (val.taskAffirmStatus != 'Not started' && !val.verifyInitiatorId) {
+          this.verifyInitiatorIdDisabled = true
+        } else if (val.roleCode == 0) {
+          this.verifyInitiatorIdDisabled = false
+        } else {
+          this.verifyInitiatorIdDisabled = true
+        }
+      },
       getData(row, res) {
         //设计符合性确认-发起人
         if (row.designInitiator == 1) {
@@ -851,6 +915,7 @@
           this.formInline = item
           this.formInline = { ...this.formInline }
         }
+        this.getDis(item)
         this.$nextTick(() => {
           this.rules = {}
           this.$refs.ruleForm.clearValidate()
@@ -873,6 +938,7 @@
           }
         })
       },
+
       studioLogic() {
         let rules = {
           ...this.rulesData,
@@ -1021,9 +1087,11 @@
   .itemModel .ant-form-item-control-wrapper {
     width: 100%;
   }
-  .itemModel-text .ant-form-item-control-wrapper{
+
+  .itemModel-text .ant-form-item-control-wrapper {
     width: 100% !important;
   }
+
   .box-input .ant-select-selection--single {
     height: 38px;
   }