diff --git a/src/api/onlineHome/homestead/circulation.js b/src/api/onlineHome/homestead/circulation.js
index 94277a01..52a90809 100644
--- a/src/api/onlineHome/homestead/circulation.js
+++ b/src/api/onlineHome/homestead/circulation.js
@@ -32,6 +32,15 @@ export function zjdzd(){
     method:'get'
   })
 }
+
+//宅基地退出申请人信息
+export function getExitProposerDetail() {
+  return request({
+    url: '/house/mobile/exit/proposer',
+    method: 'get'
+  })
+}
+
 // 查询权利人列表
 export function obligeeList(query) {
   return request({
diff --git a/src/router/index.js b/src/router/index.js
index fca2aac5..f1123146 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3011,7 +3011,7 @@ export const constantRoutes = [
     path: '/onlineHome/arbitrationList',
     name: 'arbitrationList',
     meta: {
-      title: '纠纷调请',
+      title: '纠纷调解',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/homestead/arbitration/arbitrationList'], resolve)
@@ -3020,7 +3020,7 @@ export const constantRoutes = [
     path: '/onlineHome/arbitrationDetail',
     name: 'arbitrationDetail',
     meta: {
-      title: '纠纷调请',
+      title: '纠纷调解',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/homestead/arbitration/arbitrationDetail'], resolve)
diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue
index 8c122f61..0e63d76a 100644
--- a/src/views/onlineHome/done.vue
+++ b/src/views/onlineHome/done.vue
@@ -43,11 +43,11 @@
             <van-col span="6" :offset="1">
               <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
             </van-col>
-            <van-col span="8" :offset="2">
+            <van-col span="11" :offset="2">
 <!--              <p style="color: #878787">{{item.formData.activityBusinessType}}</p>-->
               <p style="color: #878787">{{item.taskName}}</p>
             </van-col>
-            <van-col span="5" :offset="1">
+            <van-col span="3" :offset="1">
               <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
             </van-col>
           </van-row>
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue b/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue
index 37696d2d..bb67e7db 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
       <van-nav-bar
-        :title="(operationIntent == 3 ? '添加' : '') + '纠纷调请'"
+        :title="(operationIntent == 3 ? '添加' : '') + '纠纷调解'"
         left-arrow
         fixed
         placeholder
@@ -16,7 +16,7 @@
       <div class="main" style="padding-bottom: 1rem;">
         <van-form ref="form">
           <div :class="allowCUD && formEnabled.baseFormEnabled ? '' : 'noModify'">
-<!--            <p class="topTit">纠纷调请</p>-->
+<!--            <p class="topTit">纠纷调解</p>-->
             <template> <!-- 申请 基本信息 -->
               <div>
                 <p class="main_title">基本信息</p>
@@ -48,7 +48,7 @@
               </div>
 
               <div>
-                <p class="main_title">纠纷事项</p>
+                <p class="main_title"><span style="color: red;">*</span>纠纷事项</p>
                 <div class="main_box">
                   <van-field
                     rows="3"
@@ -58,7 +58,7 @@
                     input-align="left"
                     v-model="arbitrationData.disputes"
                     :readonly="!allowCUD || !formEnabled.baseFormEnabled"
-                    :rules="[{ required: true }]" required
+                    :rules="[{ required: true }]"
                   />
                 </div>
               </div>
@@ -74,7 +74,6 @@
                     input-align="left"
                     v-model="arbitrationData.remark"
                     :readonly="!allowCUD || !formEnabled.baseFormEnabled"
-                    :rules="[{ required: true }]" required
                   />
                 </div>
               </div>
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
index a21ccfed..c9951ddc 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
@@ -2,7 +2,7 @@
   <div>
     <van-nav-bar
       left-arrow
-      title="纠纷调请"
+      title="纠纷调解"
       fixed
       placeholder
       @click-left="$router.back()"
@@ -45,7 +45,7 @@
           <template #right>
             <van-row style="height: 100%;">
               <van-col style="height: 100%;">
-                <van-button v-if="allowCUD && item.disputeStatus == '1'" square text="编辑" type="info" style="height: 100%;" @click="editItem(item)"/>
+                <van-button v-if="allowCUD && item.disputeStatus == '1'" square text="修改" type="info" style="height: 100%;" @click="editItem(item)"/>
               </van-col>
               <van-col style="height: 100%;">
                 <van-button v-if="allowCUD && item.disputeStatus == '1'" square text="提交" type="primary" style="height: 100%;" @click="submitItem(item)"/>
diff --git a/src/views/onlineHome/homestead/freeExit/freeExitAdd.vue b/src/views/onlineHome/homestead/freeExit/freeExitAdd.vue
index f85b2e60..97b11e22 100644
--- a/src/views/onlineHome/homestead/freeExit/freeExitAdd.vue
+++ b/src/views/onlineHome/homestead/freeExit/freeExitAdd.vue
@@ -12,13 +12,13 @@
     </van-nav-bar>
     <van-form ref="_Form">
       <div class="main_box">
-<!--        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>-->
-        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <!-- <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
         <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
           <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
             {{item}}
           </van-cell>
-        </div>
+        </div> -->
         <!--<van-field
           readonly
           clickable
@@ -167,7 +167,7 @@
 </template>
 
 <script>
-  import { zjdzd, getByZjddm, getObligeeList, obligeeList } from "@/api/onlineHome/homestead/circulation";
+  import { zjdzd, getByZjddm, getObligeeList, obligeeList, getExitProposerDetail } from "@/api/onlineHome/homestead/circulation";
   import { dyAdd,  } from "@/api/onlineHome/homestead/paidExit";
   import {Notify} from "vant";
   import MapGisObtain from "@/components/Map/MapGisObtain";
@@ -245,6 +245,19 @@
           if(this.zjdDictionaries.length > 0)
             this.onConfirmZjddm(this.zjdDictionaries[0]);
         });*/
+        getExitProposerDetail().then(res => {
+          if (res.data) {
+            let data = res.data;
+            this.$set(this.circulation, 'sqrxm', data.shyqrdbxm);
+            this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
+            this.$set(this.circulation, 'sqrzjlx', data.shyqrdbzjlx);
+            if(data.shyqrdbzjlx) {
+              let val = this.zjlxDictionaries.find((x) => x.value == data.shyqrdbzjlx);
+              if(val)
+                this.zjlx = val.text;
+            }
+          }
+        });
       },
       /*onConfirmZjddm(data){
         console.log(data)
@@ -381,7 +394,7 @@
       /** 查找地图中宅基地 */
       closeMoule: function (data) {
         this.circulation.zjddm = data;
-        getByZjddm({zjddm: data,}).then(qlrRes => {
+        /*getByZjddm({zjddm: data,}).then(qlrRes => {
           let data = qlrRes.data;
           if (data) {
             this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
@@ -394,7 +407,7 @@
             }
           }
           // this.$forceUpdate();
-        });
+        });*/
       },
     },
   }
@@ -424,21 +437,21 @@
     background-color: #1D6FE9;
 
   }
-  #dropList::-webkit-scrollbar {
-    /*滚动条整体样式*/
-    width: 5px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 1px;
-  }
-  #dropList::-webkit-scrollbar-thumb {
-    /*滚动条里面小方块*/
-    border-radius: 10px;
-    background: #fff;
-    box-shadow: inset 0 0 5px rgb(0, 122, 204);
-  }
-  #dropList::-webkit-scrollbar-track {
-    border-radius: 10px;
-    background: #fff;
-    /*滚动条里面轨道*/
-    box-shadow: inset 0 0 5px rgba( 0, 0, 0, .1);
-  }
+  /*#dropList::-webkit-scrollbar {*/
+  /*  !*滚动条整体样式*!*/
+  /*  width: 5px;     !*高宽分别对应横竖滚动条的尺寸*!*/
+  /*  height: 1px;*/
+  /*}*/
+  /*#dropList::-webkit-scrollbar-thumb {*/
+  /*  !*滚动条里面小方块*!*/
+  /*  border-radius: 10px;*/
+  /*  background: #fff;*/
+  /*  box-shadow: inset 0 0 5px rgb(0, 122, 204);*/
+  /*}*/
+  /*#dropList::-webkit-scrollbar-track {*/
+  /*  border-radius: 10px;*/
+  /*  background: #fff;*/
+  /*  !*滚动条里面轨道*!*/
+  /*  box-shadow: inset 0 0 5px rgba( 0, 0, 0, .1);*/
+  /*}*/
 </style>
diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
index 1f494fb6..a69cb86d 100644
--- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue
+++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
@@ -35,7 +35,7 @@
               <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <span v-if="item.auditStatus === '0'">{{ formatDict(houseApplyStatus, item.houseApplyStatus) }} </span>
-            <span v-else-if="item.auditStatus !== '0' && item.auditStatus === '2' " style="color: #F56C6C">{{ formatDict(houseApplyStatus, item.houseApplyStatus) + ' ● 已驳回' }} </span>
+            <span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ formatDict(houseApplyStatus, item.houseApplyStatus) + ' ● 已驳回' }} </span>
             <span  v-else style="color: #67c23a;">{{ formatDict(houseApplyStatus, item.houseApplyStatus) }} </span>
             <template #label>
               <p>{{item.projectName}}</p>
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 576ca92b..6a30c5c2 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -1999,8 +1999,8 @@ export default {
           this.formVisible.acceptingVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
           this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
           this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, 'town_leader') ? '29' : -99, "26"]);
-          this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '29' : -99, "26"]);
-          this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '29' : -99, "26"]);
+          this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '29' : -99, this.isInRoles(role, ['town_leader', 'agriculture']) ? '25' : -99, "26"]);
+          this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '29' : -99, this.isInRoles(role, ['town_leader', 'nature_resource']) ? '25' : -99, "26"]);
           if(this.type =='done') {
             this.formVisible.editVisible = false;
           }
@@ -2571,8 +2571,13 @@ export default {
           this.selectedTabName = PROPOSER_STAGE_START;
           this.processKeyField = PROPOSER_STAGE_START_ACTIVITY;
           this.attachmentActive = PROPOSER_STAGE_START;
-        }
-        else { // this.isBaseApply()
+        }else if(this.isLandscope()){
+          this.active = PROPOSER_STAGE_START;
+          this.selectedTabName = PROPOSER_STAGE_START;
+          this.processKeyField = PROPOSER_STAGE_START_ACTIVITY;
+          this.attachmentActive = PROPOSER_STAGE_START;
+        }else
+         { // this.isBaseApply()
           this.active = PROPOSER_STAGE_BASE_APPLY;
           this.selectedTabName = PROPOSER_STAGE_BASE_APPLY;
           this.attachmentActive = PROPOSER_STAGE_BASE_APPLY;
@@ -2595,7 +2600,8 @@ export default {
         } else if (this.isAccepting()) {
           this.active = PROPOSER_STAGE_END;
           this.selectedTabName = PROPOSER_STAGE_END;
-          if(this.isProposeStatus(houseApplyStatus, ["20"])){
+          // 编辑时且为申请通过状态 -> 查看验收草稿
+          if(this.proposerStatus == PROPOSER_VIEW && this.isProposeStatus(houseApplyStatus, ["20"])){
             this.selectedTabName = PROPOSER_STAGE_START;
           }
 
@@ -2803,7 +2809,11 @@ export default {
           this.auditProposer(true);
           break;
         case 'reject':
-          this.auditProposer(false);
+          this.$dialog.confirm({
+            message: '是否确认驳回此条申请',
+          }).then(() => {
+            this.auditProposer(false);
+          });
           break;
         case 'start':
           this.startProposerApply();
@@ -3011,6 +3021,7 @@ export default {
     },
     // 审批(同意/驳回)
     auditProposer(pass) {
+      let _this = this;
       switch (this.processKeyField) {
         case PROPOSER_STAGE_BASE_APPLY_ACTIVITY: {
           let comment;
@@ -3026,6 +3037,28 @@ export default {
               this.$set(this.applicationDetail, 'tHouseApproveNatureOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
               comment = this.applicationDetail.tHouseApproveAgricultureOptions.approveOption;
+              if(this.$refs.pictureUploadApplyingTHouseApproveAgriculture && this.$refs.pictureUploadApplyingTHouseApproveAgriculture.isValid()) {
+
+                this.submitHouseApproveAgricultureOptions().then(item=>{
+                  if (msg) {
+                    return;
+                  }
+                  setTimeout(() => {
+
+                    saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(resp => {
+                      _this.notify(msg, 'danger');
+                      _this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)) {
+                  msg = "农村农业部门现场拍照不能为空";
+                  break;
+                }
+              }
               break;
             case "building":
               msg = this.validateBuildingForm(pass);
@@ -3036,23 +3069,58 @@ export default {
               this.$set(this.applicationDetail, 'tHouseApproveNatureOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
               comment = this.applicationDetail.tHouseApproveOtherOptions.approveOption;
+              if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) {
+                this.submitHouseApproveOtherOptions().then(item=>{
+                  setTimeout(() => {
+
+                    saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(resp => {
+                      _this.notify(msg, 'danger');
+                      _this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.otherPlan)) {
+                  msg =  "住建部门现场拍照不能为空";
+                  break;
+                }
+              }
               break;
             case "nature_resource":
               msg = this.validateNatureForm(pass);
               if (msg) {
                 break;
               }
+
               this.$set(this.applicationDetail, 'tHouseApproveTownOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
               comment = this.applicationDetail.tHouseApproveNatureOptions.approveOption;
+              if(this.$refs.pictureUploadApplyingTHouseApproveNature && this.$refs.pictureUploadApplyingTHouseApproveNature.isValid()) {
+                this.submitHouseApproveNatureplanOptions().then(item=>{
+                  setTimeout(() => {
+                    saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(resp => {
+                      _this.notify(msg, 'danger');
+                      _this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.naturePlan)) {
+                  msg =  "自然资源部门现场拍照不能为空";
+                  break;
+                }
+              }
               break;
             case "town_leader":
               msg = this.validateAgricultureForm(pass);
               if (msg) {
                 break;
               }
-
               msg = this.validateNatureForm();
               if (msg) {
                 break;
@@ -3062,26 +3130,61 @@ export default {
               if (msg) {
                 break;
               }
-
               msg = this.validateTownForm();
               if (msg) {
                 break;
               }
               comment = this.applicationDetail.tHouseApproveTownOptions.approveOption;
-              //地图判断
-              if (this.drawInsert != null) {
-                this.applicationDetail.tHouseApproveNatureOptions.theGeom = JSON.stringify(this.drawInsert);
-              }
-              else {
-                if(this.applicationDetail.tHouseApproveNatureOptions && this.applicationDetail.tHouseApproveNatureOptions.theGeom == null){
-                  this.applicationDetail.tHouseApproveNatureOptions.theGeom = this.convertGeom(this.applicationDetail.tHouseApplyProposedSituation.theGeom);
-                }
-              }
-              //console.log(this.$refs.pictureUploadApplying, this.$refs.pictureUploadApplying.isValid());
-              if(this.$refs.pictureUploadApplying && this.$refs.pictureUploadApplying.isValid()) {
-                this.submitHouseApproveLocationplanOptions(pass, comment);
-                return;
-              }
+                this.submitHouseApproveAgricultureOptions().then(item=>{
+                    _this.submitHouseApproveNatureplanOptions().then(item2=>{
+                        _this.submitHouseApproveOtherOptions().then(item3=>{
+                          if(_this.$refs.pictureUploadApplyingTHouseApproveTown && _this.$refs.pictureUploadApplyingTHouseApproveTown.isValid()) {
+                            _this.submitHouseApproveTownOptions().then(item4=>{
+                              //地图判断
+                              if (_this.drawInsert != null) {
+                                _this.applicationDetail.tHouseApproveNatureOptions.theGeom = JSON.stringify(_this.drawInsert);
+                              }
+                              else {
+                                if(_this.applicationDetail.tHouseApproveNatureOptions && _this.applicationDetail.tHouseApproveNatureOptions.theGeom == null){
+                                  _this.applicationDetail.tHouseApproveNatureOptions.theGeom = _this.convertGeom(_this.applicationDetail.tHouseApplyProposedSituation.theGeom);
+                                }
+                              }
+                              if(_this.$refs.pictureUploadApplying && _this.$refs.pictureUploadApplying.isValid()) {
+                                _this.submitHouseApproveLocationplanOptions(pass, comment).then(item5=>{
+                                  _this.submitHouseApproveNatureplanOptions().then(item6=>{
+                                    setTimeout(() => {
+                                      saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                                        _this.complete(pass, comment);
+                                      }).catch(resp => {
+                                        _this.notify(msg, 'danger');
+                                        _this.notify("保存失败!", 'danger');
+                                      });
+                                    }, 500);
+                                  });
+                                });
+                              }else{
+                                if (this.checkString(this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan)) {
+                                  msg =  "现场踏勘不能为空";
+                                }
+                              }
+                            });
+                          } else {
+                            if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.townPlan)) {
+                              msg =  "镇政府审批现场拍照不能为空";
+                            }else{
+                              setTimeout(() => {
+                                saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                                  _this.complete(pass, comment);
+                                }).catch(resp => {
+                                  _this.notify(msg, 'danger');
+                                  _this.notify("保存失败!", 'danger');
+                                });
+                              }, 500);
+                            }
+                          }
+                        });
+                    });
+                });
               break;
             default:
               if(this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageOption))
@@ -3099,7 +3202,17 @@ export default {
                 return;
               } else {
                 if (this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villagePlan)) {
+
                   msg = "村级现场拍照不能为空";
+                }else{
+                  setTimeout(() => {
+                    saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(resp => {
+                      _this.notify(msg, 'danger');
+                      _this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
                 }
               }
               //}
@@ -3138,18 +3251,10 @@ export default {
               break;
           }
           if (msg) {
-            this.notify(msg, 'danger');
-            this.$refs.form.validate().then(() => {}).catch((e)=>{})
+            _this.notify(msg, 'danger');
+            _this.$refs.form.validate().then(() => {}).catch((e)=>{})
             return;
           }
-          setTimeout(() => {
-            saveHouseBaseInfo(this.applicationDetail).then((response) => {
-              this.complete(pass, comment);
-            }).catch(resp => {
-              this.notify(msg, 'danger');
-              this.notify("保存失败!", 'danger');
-            });
-          }, 500);
         }
           break;
         case PROPOSER_STAGE_START_ACTIVITY:
@@ -3165,7 +3270,28 @@ export default {
               if (msg) {
                 break;
               }
-              comment = this.applicationDetail.tHouseApplyEnd.nongyeOption;
+              comment = _this.applicationDetail.tHouseApplyEnd.nongyeOption;
+              if(this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) {
+                this.submitHouseApproveEndNongyeOptions().then(item=>{
+                  updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                    _this.complete(pass, comment);
+                  }).catch(err => {
+                    _this.notify('保存失败', 'danger');
+                  });
+
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyePlan)) {
+                  msg =  "农业农村部门现场拍照不能为空";
+                }else{
+                    updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                      _this.complete(pass, comment);
+                    }).catch(err => {
+                      _this.notify('保存失败', 'danger');
+                    });
+                }
+              }
+
               break;
             case "nature_resource":
               msg = this.validateAcceptingFormTown(undefined, role);
@@ -3173,13 +3299,69 @@ export default {
                 break;
               }
               comment = this.applicationDetail.tHouseApplyEnd.natureOption;
+              if(this.$refs.tHouseApplyEndNature && this.$refs.tHouseApplyEndNature.isValid()) {
+                this.submitHouseApproveEndNatureOptions().then(item=>{
+                  updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                    _this.complete(pass, comment);
+                  }).catch(err => {
+                    _this.notify('保存失败', 'danger');
+                  });
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApplyEnd.naturePlan)) {
+                  msg =  "自然资源部门现场拍照不能为空";
+                }else{
+                  updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                    _this.complete(pass, comment);
+                  }).catch(err => {
+                    _this.notify('保存失败', 'danger');
+                  });
+                }
+              }
               break;
             case "town_leader":
               msg = this.validateAcceptingFormTown();
+              if (msg) {
+                break;
+              }
               comment = this.applicationDetail.tHouseApplyEnd.zhenOption;
+              if(this.$refs.tHouseApplyEndZhen && this.$refs.tHouseApplyEndZhen.isValid()) {
+                this.submitHouseApproveEndBZhenOptions().then(item=>{
+                  comment = this.applicationDetail.tHouseApplyEnd.zhenOption;
+                  if (_this.$refs.pictureUploadAccepting && _this.$refs.pictureUploadAccepting.isValid()) {
+                    this.submitHouseApplyEndLocationplanOptions(pass).then(item2=>{
+                      updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
+                        _this.complete(pass, comment);
+                      }).catch(err => {
+                        _this.notify('保存失败', 'danger');
+                      });
+                    });
+                  }else{
+                    if (this.checkString(this.applicationDetail.tHouseApplyEnd.locationPlan)) {
+                      msg =  "竣工平面简图不能为空";
+                    }
+                  }
+                });
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenPlan)) {
+                  msg =  "乡镇政府现场拍照不能为空";
+                }else{
+                  updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
+                    this.complete(pass, comment);
+                  }).catch(err => {
+                    this.notify('保存失败', 'danger');
+                  });
+                }
+              }
+
               break;
             default:
               comment = '同意';
+              updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
+                this.complete(pass, comment);
+              }).catch(err => {
+                this.notify('保存失败', 'danger');
+              });
               break;
           }
           if (msg) {
@@ -3188,10 +3370,7 @@ export default {
             return;
           }
 
-          if (this.$refs.pictureUploadAccepting && this.$refs.pictureUploadAccepting.isValid()) {
-            this.submitHouseApplyEndLocationplanOptions(pass);
-            return;
-          }
+
 
           // //农村农业部
           // if (this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) {
@@ -3210,11 +3389,7 @@ export default {
           // }
 
           console.log(this.applicationDetail.tHouseApplyEnd);
-          updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
-            this.complete(pass, comment);
-          }).catch(err => {
-            this.notify('保存失败', 'danger');
-          });
+
         }
           break;
         default:
@@ -3223,7 +3398,8 @@ export default {
     },
     //村级领导审批现场图片
     submitHouseApproveVillageplanOptions(pass, commentText) {
-      this.$refs.pictureUploadApplyingTHouseApproveVillage.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveVillageOptions.villagePlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveVillage.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3252,7 +3428,8 @@ export default {
     },
     //自然资源部门审批现场图片
     submitHouseApproveNatureplanOptions() {
-      this.$refs.pictureUploadApplyingTHouseApproveNature.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveNatureOptions.naturePlan = null;
+     return   this.$refs.pictureUploadApplyingTHouseApproveNature.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3275,7 +3452,8 @@ export default {
     },
     //农村农业部门审批现场图片
     submitHouseApproveAgricultureOptions() {
-      this.$refs.pictureUploadApplyingTHouseApproveAgriculture.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveAgriculture.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3289,7 +3467,6 @@ export default {
           list.push(item);
         });
         this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan = JSON.stringify(list);
-        console.log(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan);
         if(this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)){
           return "农村农业部现场拍照不能为空";
         }
@@ -3299,7 +3476,8 @@ export default {
     },
     //其他部门审批现场图片
     submitHouseApproveOtherOptions() {
-      this.$refs.pictureUploadApplyingTHouseApproveOther.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveOtherOptions.otherPlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveOther.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3322,7 +3500,8 @@ export default {
     },
     //镇级领导审批现场图片
     submitHouseApproveTownOptions() {
-      this.$refs.pictureUploadApplyingTHouseApproveTown.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveTownOptions.townPlan = null;
+     return this.$refs.pictureUploadApplyingTHouseApproveTown.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3345,7 +3524,8 @@ export default {
     },
     //验收农业部门审批现场图片
     submitHouseApproveEndNongyeOptions() {
-      this.$refs.tHouseApplyEndNongye.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApplyEnd.nongyePlan = null;
+      return this.$refs.tHouseApplyEndNongye.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3368,7 +3548,8 @@ export default {
     },
     //验收自然资源部门审批现场图片
     submitHouseApproveEndNatureOptions() {
-      this.$refs.tHouseApplyEndNature.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApplyEnd.naturePlan = null;
+      return this.$refs.tHouseApplyEndNature.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3391,6 +3572,7 @@ export default {
     },
     //验收住建部门审批现场图片
     submitHouseApproveEndBuildingOptions() {
+      this.applicationDetail.tHouseApplyEnd.buildingPlan = null;
       this.$refs.tHouseApplyEndBuilding.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
@@ -3414,7 +3596,8 @@ export default {
     },
     //验收镇政府审批现场图片
     submitHouseApproveEndBZhenOptions() {
-      this.$refs.tHouseApplyEndZhen.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApplyEnd.zhenPlan = null;
+      return this.$refs.tHouseApplyEndZhen.updatePlanFiles().then((x) => {
         let list = [];
         x.data.forEach((f) => {
           let item = {
@@ -3437,7 +3620,8 @@ export default {
     },
     // 带平面图附件上传的镇级申请审批
     submitHouseApproveLocationplanOptions(pass, commentText) {
-      this.$refs.pictureUploadApplying.updatePlanFiles().then((x) => {
+      this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan = null;
+     return this.$refs.pictureUploadApplying.updatePlanFiles().then((x) => {
           let list = [];
           x.data.forEach((f) => {
             let item = {
@@ -3451,18 +3635,13 @@ export default {
             list.push(item);
           });
           this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan = JSON.stringify(list);
-          saveHouseBaseInfo(this.applicationDetail).then((response) => {
-            this.complete(pass, commentText);
-          }).catch(resp => {
-            this.notify("保存失败!", 'danger');
-          });
         }).catch((x) => {
         this.notify("上传宅基地坐落平面位置图失败!", 'danger');
       });
     },
     // 带平面图附件上传的镇级验收审批
     submitHouseApplyEndLocationplanOptions(pass, commentText) {
-      this.$refs.pictureUploadAccepting.updatePlanFiles()
+      return this.$refs.pictureUploadAccepting.updatePlanFiles()
         .then((x) => {
           let list = [];
           x.data.forEach((f) => {
@@ -3478,12 +3657,6 @@ export default {
           });
 
           this.applicationDetail.tHouseApplyEnd.locationPlan = JSON.stringify(list);
-
-          updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
-            this.complete(pass, commentText);
-          }).catch(err => {
-            this.notify("保存失败!", 'danger');
-          });
         }).catch((x) => {
         this.notify("上传宅基地坐落平面位置图失败!", 'danger');
       });
@@ -3851,13 +4024,6 @@ export default {
       else if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.theGeomPoint)) {
         return "自然资源部门现场定位不能为空";
       }
-      if(this.$refs.pictureUploadApplyingTHouseApproveNature && this.$refs.pictureUploadApplyingTHouseApproveNature.isValid()) {
-        this.submitHouseApproveNatureplanOptions();
-      } else {
-        if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.naturePlan)) {
-          return "自然资源部门现场拍照不能为空";
-        }
-      }
       return false;
     },
     validateAgricultureForm(pass) {
@@ -3881,13 +4047,7 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint)) {
         return "农村农业部门现场定位不能为空";
       }
-      if(this.$refs.pictureUploadApplyingTHouseApproveAgriculture && this.$refs.pictureUploadApplyingTHouseApproveAgriculture.isValid()) {
-        this.submitHouseApproveAgricultureOptions();
-      } else {
-        if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)) {
-          return "农村农业部门现场拍照不能为空";
-        }
-      }
+
       // 通过时检查打勾, 农业部门
       if(pass)
       {
@@ -3941,17 +4101,10 @@ export default {
         return "说明不能为空";
       }
       if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.approveLeader)) {
-        return "其他部门签名不能为空";
+        return "住建部门签名不能为空";
       }
       if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint)) {
-        return "其他部门现场定位不能为空";
-      }
-      if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) {
-        this.submitHouseApproveOtherOptions();
-      } else {
-        if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.otherPlan)) {
-          return "其他部门现场拍照不能为空";
-        }
+        return "住建部门现场定位不能为空";
       }
       return false;
     },
@@ -3965,13 +4118,6 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.theGeomPoint)) {
         return "镇政府审批现场定位不能为空";
       }
-      if(this.$refs.pictureUploadApplyingTHouseApproveTown && this.$refs.pictureUploadApplyingTHouseApproveTown.isValid()) {
-        this.submitHouseApproveTownOptions();
-      } else {
-        if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.townPlan)) {
-          return "镇政府审批现场拍照不能为空";
-        }
-      }
       return false;
     },
     validateAcceptingFormBase() {
@@ -4073,13 +4219,7 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeGeom)) {
           return "农业农村部门现场定位不能为空";
         }
-        if(this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) {
-          this.submitHouseApproveEndNongyeOptions();
-        } else {
-          if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyePlan)) {
-            return "农业农村部门现场拍照不能为空";
-          }
-        }
+
       }
       if(!role || role === 'nature_resource')
       {
@@ -4095,13 +4235,7 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureGeom)) {
           return "自然资源部门现场定位不能为空";
         }
-        if(this.$refs.tHouseApplyEndNature && this.$refs.tHouseApplyEndNature.isValid()) {
-          this.submitHouseApproveEndNatureOptions();
-        } else {
-          // if (this.checkString(this.applicationDetail.tHouseApplyEnd.naturePlan)) {
-          //   return "自然资源部门现场拍照不能为空";
-          // }
-        }
+
       }
       if(0)
       {
@@ -4142,13 +4276,7 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenGeom)) {
           return "乡镇政府现场定位不能为空";
         }
-        if(this.$refs.tHouseApplyEndZhen && this.$refs.tHouseApplyEndZhen.isValid()) {
-          this.submitHouseApproveEndBZhenOptions();
-        } else {
-          if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenPlan)) {
-            return "乡镇政府现场拍照不能为空";
-          }
-        }
+
       }
 
       // 通过时检查打勾, 农业部门
diff --git a/src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue b/src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue
index c2ac2528..b1c39a0f 100644
--- a/src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue
+++ b/src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue
@@ -159,12 +159,11 @@ export default {
       this.showdcsj = false;
     },
     goSubmit(){
-      console.log(this.circulation);
       this.$refs._Form.validate().then(() => {
       zjdlyAdd(this.circulation).then(response => {
         if(response.code = 200){
           this.$toast.success('保存成功');
-          this.$router.back();
+          window.location.replace("homesteadUtilize")
         }
       });
       }).catch((e) => {
diff --git a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
index 607d0837..ea6fc16c 100644
--- a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
+++ b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
@@ -12,13 +12,13 @@
       </van-nav-bar>
       <van-form ref="_Form">
       <div class="main_box">
-        <!-- <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/> -->
-        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <!-- <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
         <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
           <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
             {{item}}
           </van-cell>
-        </div>
+        </div> -->
         <!-- <van-field
           readonly
           clickable
@@ -190,7 +190,7 @@
 </template>
 
 <script>
-import { zjdzd, getByZjddm, getObligeeList, obligeeList } from "@/api/onlineHome/homestead/circulation";
+import { zjdzd, getByZjddm, getObligeeList, obligeeList, getExitProposerDetail } from "@/api/onlineHome/homestead/circulation";
 import { dyAdd, zyyctcApply } from "@/api/onlineHome/homestead/paidExit";
 import {Notify} from "vant";
 import MapGisObtain from "@/components/Map/MapGisObtain";
@@ -274,6 +274,19 @@ export default {
         if(this.zjdDictionaries.length > 0)
           this.onConfirmZjddm(this.zjdDictionaries[0]);
       });*/
+      getExitProposerDetail().then(res => {
+        if (res.data) {
+          let data = res.data;
+          this.$set(this.circulation, 'sqrxm', data.shyqrdbxm);
+          this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
+          this.$set(this.circulation, 'sqrzjlx', data.shyqrdbzjlx);
+          if(data.shyqrdbzjlx) {
+            let val = this.zjlxDictionaries.find((x) => x.value == data.shyqrdbzjlx);
+            if(val)
+              this.zjlx = val.text;
+          }
+        }
+      });
     },
     /*onConfirmZjddm(data){
       console.log(data)
@@ -424,7 +437,7 @@ export default {
     /** 查找地图中宅基地 */
     closeMoule: function (data) {
       this.circulation.zjddm = data;
-      getByZjddm({zjddm: data,}).then(qlrRes => {
+      /*getByZjddm({zjddm: data,}).then(qlrRes => {
         let data = qlrRes.data;
         if (data) {
           this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
@@ -437,7 +450,7 @@ export default {
           }
         }
         // this.$forceUpdate();
-      });
+      });*/
     },
   },
 }
@@ -467,21 +480,21 @@ export default {
     background-color: #1D6FE9;
 
   }
-  #dropList::-webkit-scrollbar {
-    /*滚动条整体样式*/
-    width: 5px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 1px;
-  }
-  #dropList::-webkit-scrollbar-thumb {
-    /*滚动条里面小方块*/
-    border-radius: 10px;
-    background: #fff;
-    box-shadow: inset 0 0 5px rgb(0, 122, 204);
-  }
-  #dropList::-webkit-scrollbar-track {
-    border-radius: 10px;
-    background: #fff;
-    /*滚动条里面轨道*/
-    box-shadow: inset 0 0 5px rgba( 0, 0, 0, .1);
-  }
+  /*#dropList::-webkit-scrollbar {*/
+  /*  !*滚动条整体样式*!*/
+  /*  width: 5px;     !*高宽分别对应横竖滚动条的尺寸*!*/
+  /*  height: 1px;*/
+  /*}*/
+  /*#dropList::-webkit-scrollbar-thumb {*/
+  /*  !*滚动条里面小方块*!*/
+  /*  border-radius: 10px;*/
+  /*  background: #fff;*/
+  /*  box-shadow: inset 0 0 5px rgb(0, 122, 204);*/
+  /*}*/
+  /*#dropList::-webkit-scrollbar-track {*/
+  /*  border-radius: 10px;*/
+  /*  background: #fff;*/
+  /*  !*滚动条里面轨道*!*/
+  /*  box-shadow: inset 0 0 5px rgba( 0, 0, 0, .1);*/
+  /*}*/
 </style>
diff --git a/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue b/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
index f404a341..0b676e65 100644
--- a/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
+++ b/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
@@ -160,7 +160,7 @@ export default {
         this.notify("请填写审批意见", 'danger');
         return false;
       }
-      let data = {
+      /*let data = {
         taskId: this.approval.taskId,
         instanceId: this.approval.instanceId,
         variables: JSON.stringify({
@@ -177,7 +177,51 @@ export default {
         this.$router.back();
       }).catch(e => {
         this.notify("操作失败!", 'danger');
-      });
+      });*/
+      if (pass) {
+        let data = {
+          taskId: this.approval.taskId,
+          instanceId: this.approval.instanceId,
+          variables: JSON.stringify({
+            pass: "true",
+            comment: this.approval.comment ? this.approval.comment : "同意",
+          }),
+        };
+        request({
+          url: "/activiti/process/complete",
+          method: "post",
+          params: data,
+        }).then((response) => {
+          this.notify("操作成功", 'success');
+          this.$router.back();
+        }).catch(e => {
+          this.notify("操作失败!", 'danger');
+        });
+      } else {
+        let _this = this;
+        _this.$dialog.confirm({
+          message: '是否确认驳回此条申请',
+        }).then(() => {
+          let data = {
+            taskId: _this.approval.taskId,
+            instanceId: _this.approval.instanceId,
+            variables: JSON.stringify({
+              pass: "false",
+              comment: _this.approval.comment ? _this.approval.comment : "驳回",
+            }),
+          };
+          request({
+            url: "/activiti/process/complete",
+            method: "post",
+            params: data,
+          }).then((response) => {
+            _this.notify("操作成功", 'success');
+            _this.$router.back();
+          }).catch(e => {
+            _this.notify("操作失败!", 'danger');
+          });
+        });
+      }
       return true;
     },
     notify(message, type) {
diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue
index 1181d602..1e1577cc 100644
--- a/src/views/onlineHome/workbench.vue
+++ b/src/views/onlineHome/workbench.vue
@@ -479,7 +479,7 @@
             </div>
             <p style="margin-top: 5px;color: #666666;">无偿退出</p>
           </van-grid-item>
-          <van-grid-item text="纠纷调请"  @click="applicationList('arbitrationList')">
+          <van-grid-item text="纠纷调解"  @click="applicationList('arbitrationList')">
             <div slot="default">
               <div class="icon" style="background:#1D6FE9;">
                 <img src="../../../static/images/onlineHome/icon_Z13.png"  alt />