diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index 3a7f10349..c888b1039 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -76,7 +76,7 @@
         {{$t('regulatoryCertificationTaskPlan')}}
       </div>
       <div class="header-tight">
-        <a-button class="box-button" style="line-height: 32px" @click="searchReset">{{$t('setting')}}</a-button>
+        <a-button class="box-button" style="line-height: 32px">{{$t('setting')}}</a-button>
       </div>
     </div>
     <div class="process-content">
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 18a63d9b1..4f983c1d1 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -310,13 +310,24 @@
                 <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="formInline.roleCode == 0 ? false : true"
-                                   @input="handleInput('designInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
+              <a-form-model-item class="itemModel" prop="designInitiatorId">
+                <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                          :disabled="formInline.roleCode == 0 ? false : true"
+                          v-model="formInline.designInitiatorId">
+                  <a-select-option v-for="(item, key) in designInitiatorList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"-->
+                <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+                <!--                                   @input="handleInput('designInitiator')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -326,13 +337,24 @@
                 <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="formInline.roleCode == 0 ? false : true"
-                                   @input="handleInput('designDuty')"
-                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
+              <a-form-model-item class="itemModel" prop="designDutyId">
+                <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                          :disabled="formInline.roleCode == 0 ? false : true"
+                          v-model="formInline.designDutyId">
+                  <a-select-option v-for="(item, key) in designDutyList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
+                <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+                <!--                                   @input="handleInput('designDuty')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -367,6 +389,7 @@
                       :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
+
                 <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"
                                    :disabled="disabled"
                                    @input="handleInput('prehomoDeliverableType')"
@@ -401,13 +424,24 @@
                 <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="formInline.roleCode == 0 ? false : true"
-                                   @input="handleInput('prehomoInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
+              <a-form-model-item class="itemModel" prop="prehomoInitiatorId">
+                <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                          :disabled="formInline.roleCode == 0 ? false : true"
+                          v-model="formInline.prehomoInitiatorId">
+                  <a-select-option v-for="(item, key) in prehomoInitiatorList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"-->
+                <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+                <!--                                   @input="handleInput('prehomoInitiator')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -417,13 +451,24 @@
                 <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="formInline.roleCode == 0 ? false : true"
-                                   @input="handleInput('prehomoDuty')"
-                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
+              <a-form-model-item class="itemModel" prop="prehomoDutyId">
+                <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                          :disabled="formInline.roleCode == 0 ? false : true"
+                          v-model="formInline.prehomoDutyId">
+                  <a-select-option v-for="(item, key) in prehomoDutyList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"-->
+                <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+                <!--                                   @input="handleInput('prehomoDuty')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -491,13 +536,24 @@
                 <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="formInline.roleCode == 0 ? false : true"
-                                   @input="handleInput('verifyInitiator')"
-                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
+              <a-form-model-item class="itemModel" prop="verifyInitiatorId">
+                <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
+                          :disabled="formInline.roleCode == 0 ? false : true"
+                          v-model="formInline.verifyInitiatorId">
+                  <a-select-option v-for="(item, key) in verifyInitiatorList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"-->
+                <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+                <!--                                   @input="handleInput('verifyInitiator')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -507,13 +563,24 @@
                 <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="formInline.roleCode == 0 ? false : true"
-                                   @input="handleInput('verifyDuty')"
-                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
+              <a-form-model-item class="itemModel" prop="verifyDutyId">
+                <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
+                          :disabled="formInline.roleCode == 0 ? false : true"
+                          v-model="formInline.verifyDutyId">
+                  <a-select-option v-for="(item, key) in verifyDutyList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+                <!--                <j-dict-select-tag class="box-input" v-model="formInline.verifyDuty"-->
+                <!--                                   :disabled="formInline.roleCode == 0 ? false : true"-->
+                <!--                                   @input="handleInput('verifyDuty')"-->
+                <!--                                   :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
+                <!--                                   :type="'select'"-->
+                <!--                                   :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -571,6 +638,12 @@
         regulatoryEngineerList: [],
         engineeringInterfacePersonList: [],
         certificationEngineerList: [],
+        designInitiatorList: [],
+        designDutyList: [],
+        prehomoInitiatorList: [],
+        verifyInitiatorList: [],
+        verifyDutyList: [],
+        prehomoDutyList: [],
         disabled: false
       }
     },
@@ -584,18 +657,112 @@
         }
         getAction(this.url.queryPersonByProject, query).then((res) => {
           if (res.success) {
-            this.regulatoryEngineerList = res.result.lawEngineerList
-            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList
-            this.certificationEngineerList = res.result.certificationEngineerList
+            this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师
+            this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList //工程接口人
+            this.certificationEngineerList = res.result.certificationEngineerList //认证工程师
+            this.getData(row, res)
           }
         })
       },
+      getData(row, res) {
+        //设计符合性确认-发起人
+        if (row.designInitiator == 1) {
+          this.designInitiatorList = res.result.lawEngineerList || []
+        } else if (row.designInitiator == 2) {
+          this.designInitiatorList = res.result.certificationEngineerList || []
+        } else if (row.designInitiator == 3) {
+          this.designInitiatorList = res.result.engineeringInterfacePersonList || []
+        } else if (!row.designInitiator || row.designInitiator == '') {
+          this.designInitiatorList = res.result.allPersonList || []
+        }
+        //设计符合性确认-责任人
+        if (row.designDuty == 1) {
+          this.designDutyList = res.result.lawEngineerList || []
+        } else if (row.designDuty == 2) {
+          this.designDutyList = res.result.certificationEngineerList || []
+        } else if (row.designDuty == 3) {
+          this.designDutyList = res.result.engineeringInterfacePersonList || []
+        } else if (!row.designDuty || row.designDuty == '') {
+          this.designDutyList = res.result.allPersonList || []
+        }
+        //prehomo确认-发起人
+        if (row.prehomoInitiator == 1) {
+          this.prehomoInitiatorList = res.result.lawEngineerList || []
+        } else if (row.prehomoInitiator == 2) {
+          this.prehomoInitiatorList = res.result.certificationEngineerList || []
+        } else if (row.prehomoInitiator == 3) {
+          this.prehomoInitiatorList = res.result.engineeringInterfacePersonList || []
+        } else if (!row.prehomoInitiator || row.prehomoInitiator == '') {
+          this.prehomoInitiatorList = res.result.allPersonList || []
+        }
+        //prehomo确认-责任人
+        if (row.prehomoDuty == 1) {
+          this.prehomoDutyList = res.result.lawEngineerList || []
+        } else if (row.prehomoDuty == 2) {
+          this.prehomoDutyList = res.result.certificationEngineerList || []
+        } else if (row.prehomoDuty == 3) {
+          this.prehomoDutyList = res.result.engineeringInterfacePersonList || []
+        } else if (!row.prehomoDuty || row.prehomoDuty == '') {
+          this.prehomoDutyList = res.result.allPersonList || []
+        }
+        //验证符合性确认-发起人
+        if (row.verifyInitiator == 1) {
+          this.verifyInitiatorList = res.result.lawEngineerList || []
+        } else if (row.verifyInitiator == 2) {
+          this.verifyInitiatorList = res.result.certificationEngineerList || []
+        } else if (row.verifyInitiator == 3) {
+          this.verifyInitiatorList = res.result.engineeringInterfacePersonList || []
+        } else if (!row.verifyInitiator || row.verifyInitiator == '') {
+          this.verifyInitiatorList = res.result.allPersonList || []
+        }
+        //验证符合性确认-责任人
+        if (row.verifyDuty == 1) {
+          this.verifyDutyList = res.result.lawEngineerList || []
+        } else if (row.verifyDuty == 2) {
+          this.verifyDutyList = res.result.certificationEngineerList || []
+        } else if (row.verifyDuty == 3) {
+          this.verifyDutyList = res.result.engineeringInterfacePersonList || []
+        } else if (!row.verifyDuty || row.verifyDuty == '') {
+          this.verifyDutyList = res.result.allPersonList || []
+        }
+        //清空下拉框选中没有的数据
+        if (!(this.designInitiatorList.some(val => val.value == row.designInitiatorId))) {
+          row.designInitiatorId = undefined
+        }
+        if (!(this.designDutyList.some(val => val.value == row.designDutyId))) {
+          row.designDutyId = undefined
+        }
+        if (!(this.prehomoInitiatorList.some(val => val.value == row.prehomoInitiatorId))) {
+          row.prehomoInitiatorId = undefined
+        }
+        if (!(this.prehomoDutyList.some(val => val.value == row.prehomoDutyId))) {
+          row.prehomoDutyId = undefined
+        }
+        if (!(this.verifyInitiatorList.some(val => val.value == row.verifyInitiatorId))) {
+          row.verifyInitiatorId = undefined
+        }
+        if (!(this.verifyDutyList.some(val => val.value == row.verifyDutyId))) {
+          row.verifyDutyId = undefined
+        }
+        if (!(this.regulatoryEngineerList.some(val => val.value == row.regulationOwnerId))) {
+          row.regulationOwnerId = undefined
+        }
+        if (!(this.engineeringInterfacePersonList.some(val => val.value == row.engineeringInterfacePerson))) {
+          row.engineeringInterfacePerson = undefined
+        }
+        if (!(this.certificationEngineerList.some(val => val.value == row.homologationEngineerId))) {
+          row.homologationEngineerId = undefined
+        }
+        this.$nextTick(() => {
+          this.formInline = row
+          this.formInline = { ...this.formInline }
+        })
+      },
       editModel(item) {
         this.visible = true
         this.queryPersonByProject(item)
         this.$nextTick(() => {
           this.rules = {}
-          this.formInline = item
           switch (item.roleCode) {
             case 0:
               this.studioLogic()
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 23f8484da..cbcf7d507 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -382,12 +382,12 @@ export default {
             },
             {
               title: this.$t('Sponsor'),
-              dataIndex: 'designInitiator_dictText',
+              dataIndex: 'designInitiatorName',
               align: 'center'
             },
             {
               title: this.$t('personLiable'),
-              dataIndex: 'designDuty_dictText',
+              dataIndex: 'designDutyName',
               align: 'center'
             },
             {
@@ -408,12 +408,12 @@ export default {
             },
             {
               title: this.$t('Sponsor'),
-              dataIndex: 'prehomoInitiator_dictText',
+              dataIndex: 'prehomoInitiatorName',
               align: 'center'
             },
             {
               title: this.$t('personLiable'),
-              dataIndex: 'prehomoDuty_dictText',
+              dataIndex: 'prehomoDutyName',
               align: 'center'
             },
             {
@@ -434,12 +434,12 @@ export default {
             },
             {
               title: this.$t('Sponsor'),
-              dataIndex: 'verifyInitiator_dictText',
+              dataIndex: 'verifyInitiatorName',
               align: 'center'
             },
             {
               title: this.$t('personLiable'),
-              dataIndex: 'verifyDuty_dictText',
+              dataIndex: 'verifyDutyName',
               align: 'center'
             },
             {