diff --git a/src/api/onlineHome/homestead/application.js b/src/api/onlineHome/homestead/application.js
index c9ff9477..53ce431c 100644
--- a/src/api/onlineHome/homestead/application.js
+++ b/src/api/onlineHome/homestead/application.js
@@ -222,3 +222,11 @@ export function getWorkflow() {
     method: 'get'
   })
 }
+
+//驳回提交清空历史审批记录
+export function updateOpretion(id) {
+  return request({
+    url: '/house/custom/updateOpretion/' + id,
+    method: 'post'
+  })
+}
diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
index e50c70e4..1f494fb6 100644
--- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue
+++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
@@ -63,6 +63,7 @@
 <script>
 import { getList , removeList } from "@/api/onlineHome/homestead/application";
 import { customSubmit, customSubmitWLHT} from "@/api/onlineHome/homestead/application";
+import {updateOpretion} from "@/api/onlineHome/homestead/application";
 export default {
   name: "applicationList",
   data() {
@@ -182,6 +183,9 @@ export default {
         message: '您确认提交申请草稿？',
       }).then(() => {
         let func = 1 || item.processKey.endsWith('WLHT') ? customSubmitWLHT : customSubmit; //TODO: 总是走简化流程
+        if(item.auditStatus == '2'){
+          updateOpretion(item.id).then();
+        }
         func(item.id).then((resp) => {
           this.$toast.success("提交成功");
           this.refresh();
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 30468989..d2ae429d 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="app-container">
+      <div id="info" style="display: none"></div>
       <van-nav-bar
         :title="(proposerStatus == 3 ? '添加' : '') + '用地建房申请'"
         left-arrow
@@ -20,6 +21,16 @@
 
       <div class="main" style="padding-bottom: 1rem;">
         <van-form ref="form">
+          <template>
+            <van-dialog v-model:show="mapShow" @cancel="mapZbQx" @confirm="mapZbQd()" show-cancel-button>
+              <div style="width: 100%;height:45vh;position:relative;">
+                <div style="width: 100%;height: 100%">
+                    <!--<iframe style="width: 100%;height: 50%" src="https://www.sea-meta.com/location.html"></iframe>-->
+                  <div id='uuidMap' style="width: 100%;height: 100%"></div>
+                </div>
+              </div>
+            </van-dialog>
+          </template>
           <template v-if="selectedTabName == 0 && formVisible.baseApplyFormVisible"> <!-- 申请 -->
             <div :class="active == 0 ? '' : 'noModify'">
               <p class="topTit">农村宅基地和建房（规划许可）申请表</p>
@@ -258,14 +269,14 @@
                 </div>
               </template>
 
-              <!-- 申请::村级审批 -->
+              <!-- 申请::村级审核 -->
               <template v-if="formVisible.baseApplyForm.villageFormVisible">
                 <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">村集体<br/>经济组<br/>织或村<br/>民委员<br/>会意见
                     </van-col>
                     <van-col span="19">
-                      <van-field required :readonly="!formEnabled.baseApplyForm.villageFormEnabled" v-model="applicationDetail.tHouseApproveVillageOptions.villageOption" rows="2" autosize type="textarea" placeholder="同意申请宅基地" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.villageFormEnabled" v-model="applicationDetail.tHouseApproveVillageOptions.villageOption" rows="2" autosize type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
                       <van-field :rules="[{ required: true }]" v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader !='' && applicationDetail.tHouseApproveVillageOptions.villageLeader !=null && !applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')"
                       required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" @click="formEnabled.baseApplyForm.villageFormEnabled && searchCommit('tHouseApproveVillageOptions.villageLeader')" v-model="applicationDetail.tHouseApproveVillageOptions.villageLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:" v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader =='' || applicationDetail.tHouseApproveVillageOptions.villageLeader ==null || applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')" :rules="[{ required: true }]">
@@ -279,6 +290,17 @@
                           :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveVillageOptions.villageLeader"
                           @click="formEnabled.baseApplyForm.villageFormEnabled && searchCommit('tHouseApproveVillageOptions.villageLeader')"
                         ></van-image>
+                      </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveVillage" :uploadDisabled="!formEnabled.baseApplyForm.villageFormEnabled" :jsonData="uploadImgVillage.fileList" :proposer-id="uploadImgVillage.proposerId" tableName="t_house_approve_village_options"
+                                                  @uploadFileChanged="(x) => {this.uploadImgVillage.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgVillage.removeFileList = x;}"
+                        />
+                      </van-cell>
+                        <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.villageFormEnabled">
+                          <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveVillageOptions.theGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveVillage')">定位当前位置</van-button>
+                        </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.villageFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveVillageOptions.theGeom !='' || applicationDetail.tHouseApproveVillageOptions.theGeom !=null" v-model="applicationDetail.tHouseApproveVillageOptions.theGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveVillage')">查看现场位置</van-button>
                       </van-cell>
                         <field-date-picker
                           v-model="applicationDetail.tHouseApproveVillageOptions.villageTime"
@@ -329,7 +351,7 @@
                       <van-field v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader !='' && applicationDetail.tHouseApproveNatureOptions.approveLeader !=null && !applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')"
                                  required :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled" @click="formEnabled.baseApplyForm.nature_resourceFormEnabled && searchCommit(tHouseApproveNatureOptions)" :rules="[{ required: true }]" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:" v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader =='' || applicationDetail.tHouseApproveNatureOptions.approveLeader ==null || applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')" :rules="[{ required: true }]" >
-                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader =='' || applicationDetail.tHouseApproveNatureOptions.approveLeader ==null || !applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveNatureOptions.approveLeader')">签名确认</van-button>
+                      <van-button :disabled="!formEnabled.baseApplyForm.nature_resourceFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader =='' || applicationDetail.tHouseApproveNatureOptions.approveLeader ==null || !applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveNatureOptions.approveLeader')">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
@@ -339,6 +361,17 @@
                           :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveNatureOptions.approveLeader"
                           @click="formEnabled.baseApplyForm.nature_resourceFormEnabled && searchCommit('tHouseApproveNatureOptions.approveLeader')"
                         ></van-image>
+                      </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveNature" :uploadDisabled="!formEnabled.baseApplyForm.nature_resourceFormEnabled" :jsonData="uploadImgNature.fileList" :proposer-id="uploadImgNature.proposerId" tableName="t_house_approve_nature_options"
+                                                 @uploadFileChanged="(x) => {this.uploadImgNature.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgNature.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.nature_resourceFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveNatureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveNature')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.nature_resourceFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.theGeomPoint !='' || applicationDetail.tHouseApproveNatureOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveNatureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveNature')">查看现场位置</van-button>
                       </van-cell>
                         <field-date-picker
                           v-model="applicationDetail.tHouseApproveNatureOptions.approveTime"
@@ -396,7 +429,7 @@
                       <van-field :rules="[{ required: true }]" v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader !='' && applicationDetail.tHouseApproveOtherOptions.approveLeader !=null && !applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')"
                                  @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveOtherOptions.approveLeader')" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:"  v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader =='' || applicationDetail.tHouseApproveOtherOptions.approveLeader ==null || applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')" :rules="[{ required: true }]">
-                        <van-button color="#7AC943"  v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader =='' || applicationDetail.tHouseApproveOtherOptions.approveLeader ==null || !applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveOtherOptions.approveLeader')">签名确认</van-button>
+                        <van-button color="#7AC943" :disabled="!formEnabled.baseApplyForm.buildingFormEnabled"  v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader =='' || applicationDetail.tHouseApproveOtherOptions.approveLeader ==null || !applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveOtherOptions.approveLeader')">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
@@ -406,6 +439,17 @@
                           :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveOtherOptions.approveLeader"
                           @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveOtherOptions.approveLeader')"
                         ></van-image>
+                      </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveOther" :uploadDisabled="!formEnabled.baseApplyForm.buildingFormEnabled" :jsonData="uploadImgOther.fileList" :proposer-id="uploadImgOther.proposerId" tableName="t_house_approve_other_options"
+                                                     @uploadFileChanged="(x) => {this.uploadImgOther.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgOther.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.buildingFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveOther')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.buildingFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveOtherOptions.theGeomPoint !='' || applicationDetail.tHouseApproveOtherOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveOther')">查看现场位置</van-button>
                       </van-cell>
                         <field-date-picker
                           v-model="applicationDetail.tHouseApproveOtherOptions.approveTime"
@@ -461,7 +505,7 @@
                       <van-field :rules="[{ required: true }]"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader !='' && applicationDetail.tHouseApproveAgricultureOptions.approveLeader !=null && !applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')"
                                  @click="formEnabled.baseApplyForm.agricultureFormEnabled && searchCommit('tHouseApproveOtherOptions.approveLeader')" required :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader =='' || applicationDetail.tHouseApproveAgricultureOptions.approveLeader ==null || applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')"  :rules="[{ required: true }]">
-                        <van-button color="#7AC943"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader =='' || applicationDetail.tHouseApproveAgricultureOptions.approveLeader ==null || !applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveAgricultureOptions.approveLeader')">签名确认</van-button>
+                        <van-button :disabled="!formEnabled.baseApplyForm.agricultureFormEnabled" color="#7AC943"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader =='' || applicationDetail.tHouseApproveAgricultureOptions.approveLeader ==null || !applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveAgricultureOptions.approveLeader')">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
@@ -472,6 +516,17 @@
                           @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveAgricultureOptions.approveLeader')"
                         ></van-image>
                       </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveAgriculture" :uploadDisabled="!formEnabled.baseApplyForm.agricultureFormEnabled" :jsonData="uploadImgAgriculture.fileList" :proposer-id="uploadImgAgriculture.proposerId" tableName="t_house_approve_agriculture_options"
+                                                @uploadFileChanged="(x) => {this.uploadImgAgriculture.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAgriculture.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.agricultureFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveAgriculture')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.agricultureFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint !='' || applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveAgriculture')">查看现场位置</van-button>
+                      </van-cell>
                       <field-date-picker
                           v-model="applicationDetail.tHouseApproveAgricultureOptions.approveTime"
                           label="审批日期"
@@ -492,11 +547,11 @@
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">乡镇<br/>政府<br/>审核<br/>批准<br/>意见</van-col>
                     <van-col span="19">
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveOption" rows="2" autosize type="textarea" placeholder="同意申请宅基地" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveOption" rows="2" autosize type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
                       <van-field :rules="[{ required: true }]"  v-if="applicationDetail.tHouseApproveTownOptions.approveLeader !='' && applicationDetail.tHouseApproveTownOptions.approveLeader !=null && !applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')"
                                  @click="formEnabled.baseApplyForm.agricultureFormEnabled && searchCommit('tHouseApproveTownOptions.approveLeader')" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:" v-if="applicationDetail.tHouseApproveTownOptions.approveLeader =='' || applicationDetail.tHouseApproveTownOptions.approveLeader ==null || applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')"   :rules="[{ required: true }]">
-                        <van-button round color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.approveLeader =='' || applicationDetail.tHouseApproveTownOptions.approveLeader ==null || !applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveTownOptions.approveLeader')">签名确认</van-button>
+                        <van-button :disabled="!formEnabled.baseApplyForm.townFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.approveLeader =='' || applicationDetail.tHouseApproveTownOptions.approveLeader ==null || !applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveTownOptions.approveLeader')">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
@@ -507,6 +562,17 @@
                           @click="formEnabled.baseApplyForm.townFormEnabled && searchCommit('tHouseApproveTownOptions.approveLeader')"
                         ></van-image>
                       </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveTown" :uploadDisabled="!formEnabled.baseApplyForm.townFormEnabled" :jsonData="uploadImgTown.fileList" :proposer-id="uploadImgTown.proposerId" tableName="t_house_approve_town_options"
+                                                     @uploadFileChanged="(x) => {this.uploadImgTown.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgTown.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.townFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveTownOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveTown')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.townFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.theGeomPoint !='' || applicationDetail.tHouseApproveTownOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveTownOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveTown')">查看现场位置</van-button>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveTownOptions.approveTime"
                         label="审批日期"
@@ -743,6 +809,53 @@
                   </div>
                 </template>
 
+              <!-- 申请::村级审核 -->
+              <template v-if="formVisible.baseApplyForm.villageFormVisible">
+                <div class="main_box examine_box">
+                  <van-row type="flex" justify="space-between" align="center">
+                    <van-col span="5">村集体<br/>经济组<br/>织或村<br/>民委员<br/>会意见
+                    </van-col>
+                    <van-col span="19">
+                      <van-field required :readonly="!formEnabled.baseApplyForm.villageFormEnabled" v-model="applicationDetail.tHouseApproveVillageOptions.villageOption" rows="2" autosize type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
+                      <van-field :rules="[{ required: true }]" v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader !='' && applicationDetail.tHouseApproveVillageOptions.villageLeader !=null && !applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')"
+                                 required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" @click="formEnabled.baseApplyForm.villageFormEnabled && searchCommit('tHouseApproveVillageOptions.villageLeader')" v-model="applicationDetail.tHouseApproveVillageOptions.villageLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
+                      <van-cell title="负责人:" v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader =='' || applicationDetail.tHouseApproveVillageOptions.villageLeader ==null || applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')" :rules="[{ required: true }]">
+                        <van-button :disabled="!formEnabled.baseApplyForm.villageFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader =='' || applicationDetail.tHouseApproveVillageOptions.villageLeader ==null || !applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveVillageOptions.villageLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveVillageOptions.villageLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                          v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader !='' && applicationDetail.tHouseApproveVillageOptions.villageLeader !=null
+                              && applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveVillageOptions.villageLeader"
+                          @click="formEnabled.baseApplyForm.villageFormEnabled && searchCommit('tHouseApproveVillageOptions.villageLeader')"
+                        ></van-image>
+                      </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveVillage" :uploadDisabled="!formEnabled.baseApplyForm.villageFormEnabled" :jsonData="uploadImgVillage.fileList" :proposer-id="uploadImgVillage.proposerId" tableName="t_house_approve_village_options"
+                                                  @uploadFileChanged="(x) => {this.uploadImgVillage.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgVillage.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.villageFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveVillageOptions.theGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveVillage')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.villageFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveVillageOptions.theGeom !='' || applicationDetail.tHouseApproveVillageOptions.theGeom !=null" v-model="applicationDetail.tHouseApproveVillageOptions.theGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveVillage')">查看现场位置</van-button>
+                      </van-cell>
+                      <field-date-picker
+                        v-model="applicationDetail.tHouseApproveVillageOptions.villageTime"
+                        label="审批日期"
+                        placeholder="选择日期"
+                        :rules="[{ required: true }]"
+                        formatter="yyyy-MM-dd"
+                        required
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      />
+                    </van-col>
+                  </van-row>
+                </div>
+              </template>
+
               <!-- 申请::自然资源部门 -->
               <template v-if="formVisible.baseApplyForm.nature_resourceFormVisible">
                 <div class="main_box examine_box">
@@ -753,7 +866,7 @@
                       <van-field v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader !='' && applicationDetail.tHouseApproveNatureOptions.approveLeader !=null && !applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')"
                                  required :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled" @click="formEnabled.baseApplyForm.nature_resourceFormEnabled && searchCommit(tHouseApproveNatureOptions)" :rules="[{ required: true }]" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:" v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader =='' || applicationDetail.tHouseApproveNatureOptions.approveLeader ==null || applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')" :rules="[{ required: true }]" >
-                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader =='' || applicationDetail.tHouseApproveNatureOptions.approveLeader ==null || !applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveNatureOptions.approveLeader')">签名确认</van-button>
+                        <van-button :disabled="!formEnabled.baseApplyForm.nature_resourceFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader =='' || applicationDetail.tHouseApproveNatureOptions.approveLeader ==null || !applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveNatureOptions.approveLeader')">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
@@ -764,6 +877,17 @@
                           @click="formEnabled.baseApplyForm.nature_resourceFormEnabled && searchCommit('tHouseApproveNatureOptions.approveLeader')"
                         ></van-image>
                       </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveNature" :uploadDisabled="!formEnabled.baseApplyForm.nature_resourceFormEnabled" :jsonData="uploadImgNature.fileList" :proposer-id="uploadImgNature.proposerId" tableName="t_house_approve_nature_options"
+                                                  @uploadFileChanged="(x) => {this.uploadImgNature.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgNature.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.nature_resourceFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveNatureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveNature')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.nature_resourceFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.theGeomPoint !='' || applicationDetail.tHouseApproveNatureOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveNatureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveNature')">查看现场位置</van-button>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveNatureOptions.approveTime"
                         label="审批日期"
@@ -788,7 +912,7 @@
                       <van-field :rules="[{ required: true }]" v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader !='' && applicationDetail.tHouseApproveOtherOptions.approveLeader !=null && !applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')"
                                  @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveOtherOptions.approveLeader')" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:"  v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader =='' || applicationDetail.tHouseApproveOtherOptions.approveLeader ==null || applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')" :rules="[{ required: true }]">
-                        <van-button color="#7AC943"  v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader =='' || applicationDetail.tHouseApproveOtherOptions.approveLeader ==null || !applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveOtherOptions.approveLeader')">签名确认</van-button>
+                        <van-button :disabled="!formEnabled.baseApplyForm.buildingFormEnabled" color="#7AC943"  v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader =='' || applicationDetail.tHouseApproveOtherOptions.approveLeader ==null || !applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveOtherOptions.approveLeader')">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
@@ -799,6 +923,17 @@
                           @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveOtherOptions.approveLeader')"
                         ></van-image>
                       </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveOther" :uploadDisabled="!formEnabled.baseApplyForm.buildingFormEnabled" :jsonData="uploadImgOther.fileList" :proposer-id="uploadImgOther.proposerId" tableName="t_house_approve_other_options"
+                                                  @uploadFileChanged="(x) => {this.uploadImgOther.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgOther.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.buildingFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveOther')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.buildingFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveOtherOptions.theGeomPoint !='' || applicationDetail.tHouseApproveOtherOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveOther')">查看现场位置</van-button>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveOtherOptions.approveTime"
                         label="审批日期"
@@ -823,7 +958,7 @@
                       <van-field :rules="[{ required: true }]"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader !='' && applicationDetail.tHouseApproveAgricultureOptions.approveLeader !=null && !applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')"
                                  @click="formEnabled.baseApplyForm.agricultureFormEnabled && searchCommit('tHouseApproveOtherOptions.approveLeader')" required :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader =='' || applicationDetail.tHouseApproveAgricultureOptions.approveLeader ==null || applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')"  :rules="[{ required: true }]">
-                        <van-button color="#7AC943"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader =='' || applicationDetail.tHouseApproveAgricultureOptions.approveLeader ==null || !applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveAgricultureOptions.approveLeader')">签名确认</van-button>
+                        <van-button :disabled="!formEnabled.baseApplyForm.agricultureFormEnabled" color="#7AC943"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader =='' || applicationDetail.tHouseApproveAgricultureOptions.approveLeader ==null || !applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveAgricultureOptions.approveLeader')">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
@@ -834,6 +969,17 @@
                           @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveAgricultureOptions.approveLeader')"
                         ></van-image>
                       </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveAgriculture" :uploadDisabled="!formEnabled.baseApplyForm.agricultureFormEnabled" :jsonData="uploadImgAgriculture.fileList" :proposer-id="uploadImgAgriculture.proposerId" tableName="t_house_approve_agriculture_options"
+                                                  @uploadFileChanged="(x) => {this.uploadImgAgriculture.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAgriculture.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.agricultureFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveAgriculture')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.agricultureFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint !='' || applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveAgriculture')">查看现场位置</van-button>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveAgricultureOptions.approveTime"
                         label="审批日期"
@@ -854,11 +1000,11 @@
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">乡镇<br/>政府<br/>审核<br/>批准<br/>意见</van-col>
                     <van-col span="19">
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveOption" rows="2" autosize type="textarea" placeholder="同意申请宅基地" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveOption" rows="2" autosize type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
                       <van-field :rules="[{ required: true }]"  v-if="applicationDetail.tHouseApproveTownOptions.approveLeader !='' && applicationDetail.tHouseApproveTownOptions.approveLeader !=null && !applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')"
                                  @click="formEnabled.baseApplyForm.agricultureFormEnabled && searchCommit('tHouseApproveTownOptions.approveLeader')" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
                       <van-cell title="负责人:" v-if="applicationDetail.tHouseApproveTownOptions.approveLeader =='' || applicationDetail.tHouseApproveTownOptions.approveLeader ==null || applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')"   :rules="[{ required: true }]">
-                        <van-button round color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.approveLeader =='' || applicationDetail.tHouseApproveTownOptions.approveLeader ==null || !applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveTownOptions.approveLeader')">签名确认</van-button>
+                        <van-button :disabled="!formEnabled.baseApplyForm.townFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.approveLeader =='' || applicationDetail.tHouseApproveTownOptions.approveLeader ==null || !applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveTownOptions.approveLeader')">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
@@ -869,6 +1015,17 @@
                           @click="formEnabled.baseApplyForm.townFormEnabled && searchCommit('tHouseApproveTownOptions.approveLeader')"
                         ></van-image>
                       </van-cell>
+                      <van-cell title="现场照片:">
+                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveTown" :uploadDisabled="!formEnabled.baseApplyForm.townFormEnabled" :jsonData="uploadImgTown.fileList" :proposer-id="uploadImgTown.proposerId" tableName="t_house_approve_town_options"
+                                                  @uploadFileChanged="(x) => {this.uploadImgTown.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgTown.removeFileList = x;}"
+                        />
+                      </van-cell>
+                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.townFormEnabled">
+                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveTownOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveTown')">定位当前位置</van-button>
+                      </van-cell>
+                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.townFormEnabled">
+                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.theGeomPoint !='' || applicationDetail.tHouseApproveTownOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveTownOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveTown')">查看现场位置</van-button>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveTownOptions.approveTime"
                         label="审批日期"
@@ -882,7 +1039,6 @@
                   </van-row>
                 </div>
               </template>
-
                 <!-- 申请::现场踏勘 -->
                 <template v-if="formVisible.baseApplyForm.townFormVisible">
                   <div class="main_box examine_box" v-if="formVisible.baseApplyForm.townFormVisible">
@@ -1110,7 +1266,7 @@
                     <van-field :rules="[{ required: true }]"  v-if="applicationDetail.tHouseApplyEnd.nongyeName !='' && applicationDetail.tHouseApplyEnd.nongyeName !=null && !applicationDetail.tHouseApplyEnd.nongyeName.endsWith('jpeg')"
                                @click="formEnabled.acceptingForm.agricultureFormEnabled && searchCommit('tHouseApplyEnd.nongyeName')"  required :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled" v-model="applicationDetail.tHouseApplyEnd.nongyeName" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
                     <van-cell title="负责人:" v-if="applicationDetail.tHouseApplyEnd.nongyeName =='' || applicationDetail.tHouseApplyEnd.nongyeName ==null || applicationDetail.tHouseApplyEnd.nongyeName.endsWith('jpeg')"   :rules="[{ required: true }]">
-                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.nongyeName =='' || applicationDetail.tHouseApplyEnd.nongyeName ==null || !applicationDetail.tHouseApplyEnd.nongyeName.endsWith('jpeg')" v-model="applicationDetail.tHouseApplyEnd.nongyeName" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApplyEnd.nongyeName')">签名确认</van-button>
+                      <van-button :disabled="!formEnabled.acceptingForm.agricultureFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.nongyeName =='' || applicationDetail.tHouseApplyEnd.nongyeName ==null || !applicationDetail.tHouseApplyEnd.nongyeName.endsWith('jpeg')" v-model="applicationDetail.tHouseApplyEnd.nongyeName" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApplyEnd.nongyeName')">签名确认</van-button>
                       <van-image
                         width="100"
                         height="50"
@@ -1121,6 +1277,17 @@
                         @click="formEnabled.acceptingForm.agricultureFormEnabled && searchCommit('tHouseApplyEnd.nongyeName')"
                       ></van-image>
                     </van-cell>
+                    <van-cell title="现场照片:">
+                      <house-location-plan-comp ref="tHouseApplyEndNongye" :uploadDisabled="!formEnabled.acceptingForm.agricultureFormEnabled" :jsonData="uploadImgEndNongyePlan.fileList" :proposer-id="uploadImgTown.proposerId" tableName="t_house_apply_end_nongye_options"
+                                                @uploadFileChanged="(x) => {this.uploadImgEndNongyePlan.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgEndNongyePlan.removeFileList = x;}"
+                      />
+                    </van-cell>
+                    <van-cell title="定位当前位置:" v-if="formEnabled.acceptingForm.agricultureFormEnabled">
+                      <van-button color="#7AC943" v-model="applicationDetail.tHouseApplyEnd.nongyeGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApplyEndNongye')">定位当前位置</van-button>
+                    </van-cell>
+                    <van-cell title="查看现场位置:" v-if="!formEnabled.acceptingForm.agricultureFormEnabled">
+                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.nongyeGeom !='' || applicationDetail.tHouseApplyEnd.nongyeGeom !=null" v-model="applicationDetail.tHouseApplyEnd.nongyeGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApplyEndNongye')">查看现场位置</van-button>
+                    </van-cell>
                     <field-date-picker
                       v-model="applicationDetail.tHouseApplyEnd.nongyeTime"
                       label="审批日期"
@@ -1132,6 +1299,7 @@
                     />
                   </van-col>
                 </van-row>
+                <div id="showInfo"></div>
               </div>
             </template>
 
@@ -1144,7 +1312,7 @@
                     <van-field :rules="[{ required: true }]"  v-if="applicationDetail.tHouseApplyEnd.natureName !='' && applicationDetail.tHouseApplyEnd.natureName !=null && !applicationDetail.tHouseApplyEnd.natureName.endsWith('jpeg')"
                                @click="formEnabled.acceptingForm.nature_resourceFormEnabled && searchCommit('tHouseApplyEnd.natureName')" required :readonly="!formEnabled.acceptingForm.nature_resourceFormEnabled" v-model="applicationDetail.tHouseApplyEnd.natureName" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
                     <van-cell title="负责人:" v-if="applicationDetail.tHouseApplyEnd.natureName =='' || applicationDetail.tHouseApplyEnd.natureName ==null || applicationDetail.tHouseApplyEnd.natureName.endsWith('jpeg')"   :rules="[{ required: true }]">
-                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.natureName =='' || applicationDetail.tHouseApplyEnd.natureName ==null || !applicationDetail.tHouseApplyEnd.natureName.endsWith('jpeg')" v-model="applicationDetail.tHouseApplyEnd.natureName" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApplyEnd.natureName')">签名确认</van-button>
+                      <van-button :disabled="!formEnabled.acceptingForm.nature_resourceFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.natureName =='' || applicationDetail.tHouseApplyEnd.natureName ==null || !applicationDetail.tHouseApplyEnd.natureName.endsWith('jpeg')" v-model="applicationDetail.tHouseApplyEnd.natureName" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApplyEnd.natureName')">签名确认</van-button>
                       <van-image
                         width="100"
                         height="50"
@@ -1155,6 +1323,17 @@
                         @click="formEnabled.acceptingForm.nature_resourceFormEnabled && searchCommit('tHouseApplyEnd.natureName')"
                       ></van-image>
                     </van-cell>
+                    <van-cell title="现场照片:">
+                      <house-location-plan-comp ref="tHouseApplyEndNature" :uploadDisabled="!formEnabled.acceptingForm.nature_resourceFormEnabled" :jsonData="uploadImgEndNaturePlan.fileList" :proposer-id="uploadImgEndNaturePlan.proposerId" tableName="t_house_apply_end_nature_options"
+                                                @uploadFileChanged="(x) => {this.uploadImgEndNaturePlan.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgEndNaturePlan.removeFileList = x;}"
+                      />
+                    </van-cell>
+                    <van-cell title="定位当前位置:" v-if="formEnabled.acceptingForm.nature_resourceFormEnabled">
+                      <van-button color="#7AC943" v-model="applicationDetail.tHouseApplyEnd.natureGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApplyEndNature')">定位当前位置</van-button>
+                    </van-cell>
+                    <van-cell title="查看现场位置:" v-if="!formEnabled.acceptingForm.nature_resourceFormEnabled">
+                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.natureGeom !='' || applicationDetail.tHouseApplyEnd.natureGeom !=null" v-model="applicationDetail.tHouseApplyEnd.natureGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApplyEndNature')">查看现场位置</van-button>
+                    </van-cell>
                     <field-date-picker
                       v-model="applicationDetail.tHouseApplyEnd.natureTime"
                       label="审批日期"
@@ -1178,7 +1357,6 @@
 <!--                </van-row>-->
 <!--              </div>-->
 
-
             <template v-if="formVisible.acceptingForm.townFormVisible">
               <div class="main_box examine_box">
                 <van-row type="flex" justify="space-between" align="center">
@@ -1201,7 +1379,7 @@
                     <van-field :rules="[{ required: true }]" v-if="applicationDetail.tHouseApplyEnd.zhenName !='' && applicationDetail.tHouseApplyEnd.zhenName !=null && !applicationDetail.tHouseApplyEnd.zhenName.endsWith('jpeg')"
                                @click="formEnabled.acceptingForm.agricultureFormEnabled && searchCommit('tHouseApplyEnd.zhenName')" required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.tHouseApplyEnd.zhenName" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
                     <van-cell title="负责人:" v-if="applicationDetail.tHouseApplyEnd.zhenName =='' || applicationDetail.tHouseApplyEnd.zhenName ==null || applicationDetail.tHouseApplyEnd.zhenName.endsWith('jpeg')"   :rules="[{ required: true }]">
-                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.zhenName =='' || applicationDetail.tHouseApplyEnd.zhenName ==null || !applicationDetail.tHouseApplyEnd.zhenName.endsWith('jpeg')" v-model="applicationDetail.tHouseApplyEnd.zhenName" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApplyEnd.zhenName')">签名确认</van-button>
+                      <van-button :disabled="!formEnabled.acceptingForm.townFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.zhenName =='' || applicationDetail.tHouseApplyEnd.zhenName ==null || !applicationDetail.tHouseApplyEnd.zhenName.endsWith('jpeg')" v-model="applicationDetail.tHouseApplyEnd.zhenName" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApplyEnd.zhenName')">签名确认</van-button>
                       <van-image
                         width="100"
                         height="50"
@@ -1212,6 +1390,17 @@
                         @click="formEnabled.acceptingForm.townFormEnabled && searchCommit('tHouseApplyEnd.zhenName')"
                       ></van-image>
                     </van-cell>
+                    <van-cell title="现场照片:">
+                      <house-location-plan-comp ref="tHouseApplyEndZhen" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgEndZhenPlan.fileList" :proposer-id="uploadImgEndZhenPlan.proposerId" tableName="t_house_apply_end_zhen_options"
+                                                @uploadFileChanged="(x) => {this.uploadImgEndZhenPlan.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgEndZhenPlan.removeFileList = x;}"
+                      />
+                    </van-cell>
+                    <van-cell title="定位当前位置:" v-if="formEnabled.acceptingForm.townFormEnabled">
+                      <van-button color="#7AC943" v-model="applicationDetail.tHouseApplyEnd.zhenGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApplyEndZhen')">定位当前位置</van-button>
+                    </van-cell>
+                    <van-cell title="查看现场位置:" v-if="!formEnabled.acceptingForm.townFormEnabled">
+                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.zhenGeom !='' || applicationDetail.tHouseApplyEnd.zhenGeom !=null" v-model="applicationDetail.tHouseApplyEnd.zhenGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApplyEndZhen')">查看现场位置</van-button>
+                    </van-cell>
                     <field-date-picker
                       v-model="applicationDetail.tHouseApplyEnd.zhenTime"
                       label="审批日期"
@@ -1340,6 +1529,7 @@
           <vue-esign
             ref="esign"
             class="mySign"
+            :height="200"
             :isCrop="isCrop"
             :lineWidth="lineWidth"
             :lineColor="lineColor"
@@ -1369,8 +1559,11 @@ import FieldRadio from "@/components/form/FieldRadio";
 import FieldCheckbox from "@/components/form/FieldCheckbox";
 import {formatDate} from "element-ui/src/utils/date-util.js";
 import request from '@/utils/request'
-import {Notify} from "vant";
+import {Notify, Dialog} from "vant";
 import {uploadFile} from "@/api/homesteadSurvey/zjdzd";
+import {updateOpretion} from "@/api/onlineHome/homestead/application";
+import axios from "axios";
+
 // 意图
 const PROPOSER_VIEW = 1;
 const PROPOSER_EDIT = 2;
@@ -1515,6 +1708,69 @@ export default {
       // 工作流
       taskId: null,
       instanceId: null,
+      // 村级领导审核
+      uploadImgVillage: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 自然资源领导审批
+      uploadImgNature: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 农村农业部领导审批
+      uploadImgAgriculture: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 其他部门领导审批
+      uploadImgOther: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 镇级领导审批
+      uploadImgTown: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收自然资源领导审批
+      uploadImgEndNaturePlan: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收农村农业部领导审批
+      uploadImgEndNongyePlan: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收其他部门领导审批
+      uploadImgEndBuildingPlan: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收镇级领导审批
+      uploadImgEndZhenPlan: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
       // 申请镇政府审批平面图
       uploadImg: {
         proposerId: null,
@@ -1553,6 +1809,10 @@ export default {
       bgColor: "", // 画布的背景颜色
       resultImg: "", // 最终画布生成的base64图片
       isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+      mapShow:false,
+      mapZbDw:"",
+      mapBcZb:"",   //定位坐标
+      mapZbNow:"", //当前查看坐标
     };
   },
   created() {
@@ -1566,6 +1826,13 @@ export default {
     this.getDetail();
   },
   methods: {
+    guidProduct(){
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
     // 打开工作流程
     goFlow(){
       this.flowVisible = true;
@@ -1664,6 +1931,7 @@ export default {
     },
     // 全局初始化
     init(value) {
+      console.log(sessionStorage);
       const role = this.$store.getters.roles;
       this.currentUserRole = role[0];
       console.log("当前用户角色: " + role);
@@ -1735,9 +2003,8 @@ export default {
           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"]);
 
-          if(this.type !='done') {
-            this.formEnabled.submitEnabled = this.isProposeStatus(houseApplyStatus, ["1"]);
-            this.formVisible.editVisible = this.formEnabled.submitEnabled;
+          if(this.type =='done') {
+            this.formVisible.editVisible = false;
           }
 
           this.houseApplyUploadComp.full = true;
@@ -1753,6 +2020,33 @@ export default {
           this.houseApplyUploadCompEnd.proposerId = proposerId;
           this.houseApplyUploadCompEnd.houseApplyStatus = houseApplyStatus;
 
+          // // 初始化村级审核现场图
+          this.uploadImgVillage.fileList = value.tHouseApproveVillageOptions ? value.tHouseApproveVillageOptions.villagePlan : '';
+          this.uploadImgVillage.proposerId = value.tHouseApplyProposer.id;
+          // 初始化自然资源审批现场图
+          this.uploadImgNature.fileList = value.tHouseApproveNatureOptions ? value.tHouseApproveNatureOptions.naturePlan : '';
+          this.uploadImgNature.proposerId = value.tHouseApplyProposer.id;
+          // 初始化农村农业部审批现场图
+          this.uploadImgAgriculture.fileList = value.tHouseApproveAgricultureOptions ? value.tHouseApproveAgricultureOptions.agriculturePlan : '';
+          this.uploadImgAgriculture.proposerId = value.tHouseApplyProposer.id;
+          // 初始化其他部审批现场图
+          this.uploadImgOther.fileList = value.tHouseApproveOtherOptions ? value.tHouseApproveOtherOptions.otherPlan : '';
+          this.uploadImgOther.proposerId = value.tHouseApplyProposer.id;
+          // 初始化镇级审批现场图
+          this.uploadImgTown.fileList = value.tHouseApproveTownOptions ? value.tHouseApproveTownOptions.townPlan : '';
+          this.uploadImgTown.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收农村农业部审批现场图
+          this.uploadImgEndNongyePlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.nongyePlan : '';
+          this.uploadImgEndNongyePlan.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收自然资源部审批现场图
+          this.uploadImgEndNaturePlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.naturePlan : '';
+          this.uploadImgEndNaturePlan.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收其他部门审批现场图
+          this.uploadImgEndBuildingPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.buildingPlan : '';
+          this.uploadImgEndBuildingPlan.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收镇级审批现场图
+          this.uploadImgEndZhenPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.zhenPlan : '';
+          this.uploadImgEndZhenPlan.proposerId = value.tHouseApplyProposer.id;
           // 初始化申请平面图
           this.uploadImg.fileList = value.tHouseApproveLocationplanOptions ? value.tHouseApproveLocationplanOptions.locationPlan : '';
           this.uploadImg.proposerId = value.tHouseApplyProposer.id;
@@ -1770,16 +2064,16 @@ export default {
             if(this.applicationDetail.tHouseApproveVillageOptions.villageOption !=null && this.applicationDetail.tHouseApproveVillageOptions.villageOption !=''){
               this.formVisible.baseApplyForm.villageFormVisible = true;
             }
-            if(this.applicationDetail.tHouseApproveOtherOptions.approveOption !=null && this.applicationDetail.tHouseApproveOtherOptions.approveOption !=''){
+            if(this.applicationDetail.tHouseApproveOtherOptions != null && this.applicationDetail.tHouseApproveOtherOptions.approveOption !=null && this.applicationDetail.tHouseApproveOtherOptions.approveOption !=''){
               this.formVisible.baseApplyForm.buildingFormVisible = true;
             }
-            if(this.applicationDetail.tHouseApproveAgricultureOptions.approveOption !=null && this.applicationDetail.tHouseApproveAgricultureOptions.approveOption !=''){
+            if(this.applicationDetail.tHouseApproveAgricultureOptions != null && this.applicationDetail.tHouseApproveAgricultureOptions.approveOption !=null && this.applicationDetail.tHouseApproveAgricultureOptions.approveOption !=''){
               this.formVisible.baseApplyForm.agricultureFormVisible = true;
             }
-            if(this.applicationDetail.tHouseApproveNatureOptions.approveOption !=null && this.applicationDetail.tHouseApproveNatureOptions.approveOption !=''){
+            if(this.applicationDetail.tHouseApproveNatureOptions != null && this.applicationDetail.tHouseApproveNatureOptions.approveOption !=null && this.applicationDetail.tHouseApproveNatureOptions.approveOption !=''){
               this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
             }
-            if(this.applicationDetail.tHouseApproveTownOptions.approveOption !=null && this.applicationDetail.tHouseApproveTownOptions.approveOption !=''){
+            if(this.applicationDetail.tHouseApproveTownOptions != null && this.applicationDetail.tHouseApproveTownOptions.approveOption !=null && this.applicationDetail.tHouseApproveTownOptions.approveOption !=''){
               this.formVisible.baseApplyForm.townFormVisible = true;
             }
           }
@@ -1791,13 +2085,13 @@ export default {
             //   this.formVisible.acceptingForm.baseFormVisible = false;
             // }
             if(this.applicationDetail.tHouseApplyEnd.nongyeOption !=null && this.applicationDetail.tHouseApplyEnd.nongyeOption !=''){
-              this.formVisible.acceptingForm.agricultureFormVisible = false;
+              this.formVisible.acceptingForm.agricultureFormVisible = true;
             }
             if(this.applicationDetail.tHouseApplyEnd.natureOption !=null && this.applicationDetail.tHouseApplyEnd.natureOption !=''){
-              this.formVisible.acceptingForm.nature_resourceFormVisible = false;
+              this.formVisible.acceptingForm.nature_resourceFormVisible = true;
             }
             if(this.applicationDetail.tHouseApplyEnd.zhenOption !=null && this.applicationDetail.tHouseApplyEnd.zhenOption !=''){
-              this.formVisible.acceptingForm.townFormVisible = false
+              this.formVisible.acceptingForm.townFormVisible = true
             }
           }
           break;
@@ -1836,6 +2130,7 @@ export default {
             }
           }
 
+          console.log(value.tHouseApproveVillageOptions);
           // 申请-草稿
           if(this.isProposeStatus(houseApplyStatus, ["1"]))
           {
@@ -1844,7 +2139,7 @@ export default {
             this.formEnabled.submitEnabled = true;
             this.formVisible.editVisible = true;
           }
-          // 申请-村级审批
+          // 申请-村级审核
           else if(this.isProposeStatus(houseApplyStatus, ["31"]))
           {
             let neighbor = [];
@@ -1861,9 +2156,11 @@ export default {
             if(!value.tHouseApproveVillageOptions) {
               this.$set(this.applicationDetail, 'tHouseApproveVillageOptions', {
                 //villageLeader: handlerName,
+                villagePlan: null,
                 villageLeader: null,
                 villageOption: defaultVillageOption,
                 villageTime: handlerTime,
+                theGeom: null,
               });
             }
             else {
@@ -1892,7 +2189,9 @@ export default {
                 approveLeader: null,
                 approveOption: null,
                 approveTime: handlerTime,
-                //theGeom: value.tHouseApplyProposedSituation.theGeom,
+                theGeom: value.tHouseApplyProposedSituation.theGeom,
+                naturePlan: null, //现场拍照
+                theGeomPoint: null,  //现场坐标点
               });
             }
             else {
@@ -1912,6 +2211,8 @@ export default {
                 approveLeader: null,
                 approveOption: null,
                 approveTime: handlerTime,
+                agriculturePlan: null, //现场拍照
+                theGeomPoint: null,  //现场坐标点
               });
             }
             else {
@@ -1938,6 +2239,8 @@ export default {
                 approveLeader: null,
                 approveOption: null,
                 approveTime: handlerTime,
+                otherPlan: null, //现场拍照
+                theGeomPoint: null,  //现场坐标点
               });
             }
             else {
@@ -1953,6 +2256,8 @@ export default {
                 //approveLeader: handlerName,
                 approveLeader: null,
                 approveTime: handlerTime,
+                townPlan: null, //现场拍照
+                theGeomPoint: null,  //现场坐标点
               });
             }
             else {
@@ -2019,13 +2324,13 @@ export default {
               if(!this.applicationDetail.tHouseApplyEnd.zhenTime) this.applicationDetail.tHouseApplyEnd.zhenTime = handlerTime;
             }
 
-            if(this.isInRoles(role, ['town_leader', 'agriculture']))
+            if(this.isInRoles(role, ['agriculture']))
             {
               if(!this.applicationDetail.tHouseApplyEnd.nongyeName) //this.applicationDetail.tHouseApplyEnd.nongyeName = handlerName;
               if(!this.applicationDetail.tHouseApplyEnd.nongyeTime) this.applicationDetail.tHouseApplyEnd.nongyeTime = handlerTime;
             }
 
-            if(this.isInRoles(role, ['town_leader', 'nature_resource']))
+            if(this.isInRoles(role, ['nature_resource']))
             {
               if(!this.applicationDetail.tHouseApplyEnd.natureName) //this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
               if(!this.applicationDetail.tHouseApplyEnd.natureTime) this.applicationDetail.tHouseApplyEnd.natureTime = handlerTime;
@@ -2056,24 +2361,37 @@ export default {
             if(this.isInRoles(role, ['town_leader', 'agriculture']) || houseApplyStatus != '8')
             {
               this.formVisible.baseApplyForm.agricultureFormVisible = true;
+              // this.applicationDetail.tHouseApproveAgricultureOptions.approveOption = null;
+              // this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader = null;
+              // this.applicationDetail.tHouseApproveAgricultureOptions.approveTime = handlerTime;
             }
             if(this.isInRoles(role, ['town_leader', 'building']) || houseApplyStatus != '8')
             {
               this.formVisible.baseApplyForm.buildingFormVisible = true;
+              // this.applicationDetail.tHouseApproveOtherOptions.approveOption = null;
+              // this.applicationDetail.tHouseApproveOtherOptions.approveLeader = null;
+              // this.applicationDetail.tHouseApproveOtherOptions.approveTime = handlerTime;
             }
             if(this.isInRoles(role, ['town_leader', 'nature_resource']) || houseApplyStatus != '8')
             {
               this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
+              // this.applicationDetail.tHouseApproveNatureOptions.approveOption = null;
+              // this.applicationDetail.tHouseApproveNatureOptions.approveLeader = null;
+              // this.applicationDetail.tHouseApproveNatureOptions.approveTime = handlerTime;
             }
             if(this.isInRoles(role, ['town_leader']))
             {
               this.formVisible.baseApplyForm.townFormVisible = true;
+              // this.applicationDetail.tHouseApproveTownOptions.approveOption = null;
+              // this.applicationDetail.tHouseApproveTownOptions.approveLeader = null;
+              // this.applicationDetail.tHouseApproveTownOptions.approveTime = handlerTime;
             }
           }
 
           this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9']);
           this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9']);
 
+          //this.formVisible.baseApplyForm.townFormVisible = this.landscopeVisible
           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"]);
           if(this.isProposeStatus(houseApplyStatus, ["29", "26"]))
@@ -2095,17 +2413,22 @@ export default {
           // 禁用/启用
           this.formEnabled.baseApplyForm.groupFormEnabled = hasGroupLevel && this.isProposeStatus(houseApplyStatus, ['32']) && this.isInRoles(role, 'village_group_leader');
           this.formEnabled.baseApplyForm.villageFormEnabled = this.isProposeStatus(houseApplyStatus, ["31"]) && this.isInRoles(role, 'village_leader');
+          // //驳回时审批意见及签名清空
+          // if(this.formEnabled.baseApplyForm.villageFormEnabled){
+          //   this.applicationDetail.tHouseApproveVillageOptions.villageLeader = null;
+          //   //this.applicationDetail.tHouseApproveVillageOptions.
+          // }
           if(this.isProposeStatus(houseApplyStatus, ['8']))
           {
-            if(this.isInRoles(role, ['town_leader', 'agriculture']))
+            if(this.isInRoles(role, ['agriculture']))
             {
               this.formEnabled.baseApplyForm.agricultureFormEnabled = true;
             }
-            if(this.isInRoles(role, ['town_leader', 'building']))
+            if(this.isInRoles(role, ['building']))
             {
               this.formEnabled.baseApplyForm.buildingFormEnabled = true;
             }
-            if(this.isInRoles(role, ['town_leader', 'nature_resource']))
+            if(this.isInRoles(role, ['nature_resource']))
             {
               this.formEnabled.baseApplyForm.nature_resourceFormEnabled = true;
             }
@@ -2121,11 +2444,11 @@ export default {
           this.formEnabled.acceptingForm.baseFormEnabled = this.isProposeStatus(houseApplyStatus, ['20']);
           if(this.isProposeStatus(houseApplyStatus, ['29']))
           {
-            if(this.isInRoles(role, ['town_leader', 'agriculture']))
+            if(this.isInRoles(role, ['agriculture']))
             {
               this.formEnabled.acceptingForm.agricultureFormEnabled = true;
             }
-            if(this.isInRoles(role, ['town_leader', 'nature_resource']))
+            if(this.isInRoles(role, ['nature_resource']))
             {
               this.formEnabled.acceptingForm.nature_resourceFormEnabled = true;
             }
@@ -2140,6 +2463,12 @@ export default {
           this.applicationDetail.tHouseApplyProposedSituation = value.tHouseApplyProposedSituation;
           //this.formEnabled.landscopeEnabled = value.startDraft;
 
+          //this.formVisible.baseApplyForm.townFormVisible = this.isLandscope(houseApplyStatus, ["12", "13", "14", "15", "16", "17", "28", "19", "18"]);
+          //this.formVisible.baseApplyForm.townFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
+          //this.applicationDetail.tHouseApplyProposer = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
+          //this.formVisible.baseApplyForm.villageFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
+          //this.formVisible.acceptingVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
+
           if (this.isLandscope()) {
             this.houseApplyUploadComp.full = true;
             this.houseApplyUploadCompStart.full = false;
@@ -2171,6 +2500,33 @@ export default {
           this.houseApplyUploadCompEnd.proposerId = proposerId;
           this.houseApplyUploadCompEnd.houseApplyStatus = houseApplyStatus;
 
+          // 初始化村级审核现场图
+          this.uploadImgVillage.fileList = value.tHouseApproveVillageOptions ? value.tHouseApproveVillageOptions.villagePlan : '';
+          this.uploadImgVillage.proposerId = value.tHouseApplyProposer.id;
+          // 初始化自然资源审批现场图
+          this.uploadImgNature.fileList = value.tHouseApproveNatureOptions ? value.tHouseApproveNatureOptions.naturePlan : '';
+          this.uploadImgNature.proposerId = value.tHouseApplyProposer.id;
+          // 初始化其他部审批现场图
+          this.uploadImgOther.fileList = value.tHouseApproveOtherOptions ? value.tHouseApproveOtherOptions.otherPlan : '';
+          this.uploadImgOther.proposerId = value.tHouseApplyProposer.id;
+          // 初始化农村农业部审批现场图
+          this.uploadImgAgriculture.fileList = value.tHouseApproveAgricultureOptions ? value.tHouseApproveAgricultureOptions.agriculturePlan : '';
+          this.uploadImgAgriculture.proposerId = value.tHouseApplyProposer.id;
+          // 初始化镇级审批现场图
+          this.uploadImgTown.fileList = value.tHouseApproveTownOptions ? value.tHouseApproveTownOptions.townPlan : '';
+          this.uploadImgTown.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收农村农业部审批现场图
+          this.uploadImgEndNongyePlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.nongyePlan : '';
+          this.uploadImgEndNongyePlan.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收自然资源部审批现场图
+          this.uploadImgEndNaturePlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.naturePlan : '';
+          this.uploadImgEndNaturePlan.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收其他部门审批现场图
+          this.uploadImgEndBuildingPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.buildingPlan : '';
+          this.uploadImgEndBuildingPlan.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收镇级审批现场图
+          this.uploadImgEndZhenPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.zhenPlan : '';
+          this.uploadImgEndZhenPlan.proposerId = value.tHouseApplyProposer.id;
           // 初始化申请平面图
           this.applicationDetail.tHouseApproveLocationplanOptions = value.tHouseApproveLocationplanOptions;
           this.uploadImg.fileList = value.tHouseApproveLocationplanOptions ? value.tHouseApproveLocationplanOptions.locationPlan : '';
@@ -2212,30 +2568,53 @@ export default {
       }
 
       // 通用设置
-      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 if (this.isAccepting()) {
-        this.active = PROPOSER_STAGE_END;
-        this.selectedTabName = PROPOSER_STAGE_END;
-        this.processKeyField = PROPOSER_STAGE_END_ACTIVITY;
-        this.attachmentActive = PROPOSER_STAGE_END;
-      }
-      else { // this.isBaseApply()
-        this.active = PROPOSER_STAGE_BASE_APPLY;
-        this.selectedTabName = PROPOSER_STAGE_BASE_APPLY;
-        this.attachmentActive = PROPOSER_STAGE_BASE_APPLY;
-        // 编辑时且为申请通过状态 -> 填写开工
-        if(this.proposerStatus == PROPOSER_EDIT && houseApplyStatus == '10')
-        {
+      if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
+        if (this.isAccepting()) {
           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;
+          // 编辑时且为申请通过状态 -> 填写开工
+          if(this.proposerStatus == PROPOSER_EDIT && houseApplyStatus == '10')
+          {
+            this.active = PROPOSER_STAGE_START;
+            this.selectedTabName = PROPOSER_STAGE_START;
+            this.attachmentActive = PROPOSER_STAGE_START;
+          }
+
+          this.processKeyField = PROPOSER_STAGE_BASE_APPLY_ACTIVITY;
+        }
+      } 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 if (this.isAccepting()) {
+          this.active = PROPOSER_STAGE_END;
+          this.selectedTabName = PROPOSER_STAGE_END;
+          this.processKeyField = PROPOSER_STAGE_END_ACTIVITY;
+          this.attachmentActive = PROPOSER_STAGE_END;
+        }
+        else { // this.isBaseApply()
+          this.active = PROPOSER_STAGE_BASE_APPLY;
+          this.selectedTabName = PROPOSER_STAGE_BASE_APPLY;
+          this.attachmentActive = PROPOSER_STAGE_BASE_APPLY;
+          // 编辑时且为申请通过状态 -> 填写开工
+          if(this.proposerStatus == PROPOSER_EDIT && houseApplyStatus == '10')
+          {
+            this.active = PROPOSER_STAGE_START;
+            this.selectedTabName = PROPOSER_STAGE_START;
+            this.attachmentActive = PROPOSER_STAGE_START;
+          }
 
-        this.processKeyField = PROPOSER_STAGE_BASE_APPLY_ACTIVITY;
+          this.processKeyField = PROPOSER_STAGE_BASE_APPLY_ACTIVITY;
+        }
       }
     },
     // 获取query的意图
@@ -2381,7 +2760,8 @@ export default {
     },
     //返回上一步操作
     goBack(){
-      this.$router.back(-1)
+      this.$router.push({path: '/onlineHome/done'});
+      //this.$router.back(-1)
       //this.$router.push({name: this.$router.back(-1)});
     },
     // 当地图绘制完成时
@@ -2401,6 +2781,11 @@ export default {
     // 全局提交
     onSubmit(intent){
       console.log(this.applicationDetail, intent);
+      let chars = window.location.href.split("lat=")[1] || "";
+      if(chars !="" && chars != null && chars !=undefined){
+        this.mapBcZb =[window.location.href.split("lng=")[1] || "",(window.location.href.split("lat=")[1] || "").split("&lng=")[0] || ""];
+        this.mapZbQd();
+      }
       switch (intent) {
         case 'add':
         case 'modify':
@@ -2591,6 +2976,9 @@ export default {
     },
     // 提交申请
     submitApplyProposer() {
+      if(this.applicationDetail.tHouseApplyProposer.auditStatus == '2' && this.selectedTabName == 0){
+        updateOpretion(this.id).then();
+      }
       customSubmitWLHT(this.id).then((resp) => {
           this.notify("提交成功", 'success');
           this.goBack();
@@ -2700,10 +3088,22 @@ export default {
                 comment = this.applicationDetail.tHouseApproveVillageOptions.villageOption;
               if (this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageLeader)) {
                 msg = "村级领导签名不能为空";
+              } else
+              if (this.checkString(this.applicationDetail.tHouseApproveVillageOptions.theGeom)) {
+                msg = "村级现场定位不能为空";
+              } else
+              if(this.$refs.pictureUploadApplyingTHouseApproveVillage && this.$refs.pictureUploadApplyingTHouseApproveVillage.isValid()) {
+                this.submitHouseApproveVillageplanOptions(pass, comment);
+                return;
+              } else {
+                if (this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villagePlan)) {
+                  msg = "村级现场拍照不能为空";
+                }
               }
+              //}
             //   if(this.selectedTabName ==0){
             //     if(this.currentUserRole == 'village_leader'){
-            //       //村级审批人员签字
+            //       //村级审核人员签字
             //       //if(this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageLeader))
             //       this.applicationDetail.tHouseApproveVillageOptions.villageLeader = res.fileName;
             //     } else if(this.currentUserRole == 'task_executor'){
@@ -2740,13 +3140,14 @@ export default {
             this.$refs.form.validate().then(() => {}).catch((e)=>{})
             return;
           }
-
-          saveHouseBaseInfo(this.applicationDetail).then((response) => {
-            this.complete(pass, comment);
-          }).catch(resp => {
-            this.notify(msg, 'danger');
-            this.notify("保存失败!", 'danger');
-          });
+          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:
@@ -2790,6 +3191,23 @@ export default {
             return;
           }
 
+          // //农村农业部
+          // if (this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) {
+          //   this.submitHouseApproveEndNongyeOptions();
+          //   return;
+          // }
+          // //自然资源部
+          // if (this.$refs.pictureUploadAccepting && this.$refs.pictureUploadAccepting.isValid()) {
+          //   this.submitHouseApproveEndNatureOptions();
+          //   return;
+          // }
+          // //乡镇领导部
+          // if (this.$refs.pictureUploadAccepting && this.$refs.pictureUploadAccepting.isValid()) {
+          //   this.submitHouseApproveEndBZhenOptions();
+          //   return;
+          // }
+
+          console.log(this.applicationDetail.tHouseApplyEnd);
           updateEnd(this.applicationDetail.tHouseApplyEnd).then((response) => {
             this.complete(pass, comment);
           }).catch(err => {
@@ -2801,6 +3219,220 @@ export default {
           break;
       }
     },
+    //村级领导审批现场图片
+    submitHouseApproveVillageplanOptions(pass, commentText) {
+      this.$refs.pictureUploadApplyingTHouseApproveVillage.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveVillageOptions.villagePlan = JSON.stringify(list);
+        if (this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villagePlan)) {
+          return  "村级现场拍照不能为空";
+        } else {
+          saveHouseBaseInfo(this.applicationDetail).then((response) => {
+            this.complete(pass, commentText);
+          }).catch(resp => {
+            this.notify("保存失败!", 'danger');
+          });
+        }
+      }).catch((x) => {
+        this.notify("村级上传现场照片失败!", 'danger');
+      });
+    },
+    //自然资源部门审批现场图片
+    submitHouseApproveNatureplanOptions() {
+      this.$refs.pictureUploadApplyingTHouseApproveNature.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveNatureOptions.naturePlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApproveNatureOptions.naturePlan)){
+          return "自然资源部门现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("自然资源部门上传现场照片失败!", 'danger');
+      });
+    },
+    //农村农业部门审批现场图片
+    submitHouseApproveAgricultureOptions() {
+      this.$refs.pictureUploadApplyingTHouseApproveAgriculture.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan = JSON.stringify(list);
+        console.log(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan);
+        if(this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)){
+          return "农村农业部现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("农村农业部上传现场照片失败!", 'danger');
+      });
+    },
+    //其他部门审批现场图片
+    submitHouseApproveOtherOptions() {
+      this.$refs.pictureUploadApplyingTHouseApproveOther.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveOtherOptions.otherPlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApproveOtherOptions.otherPlan)){
+          return "其他部门现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("其他部门上传现场照片失败!", 'danger');
+      });
+    },
+    //镇级领导审批现场图片
+    submitHouseApproveTownOptions() {
+      this.$refs.pictureUploadApplyingTHouseApproveTown.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveTownOptions.townPlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApproveTownOptions.townPlan)){
+          return "镇级领导现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("镇级领导上传现场照片失败!", 'danger');
+      });
+    },
+    //验收农业部门审批现场图片
+    submitHouseApproveEndNongyeOptions() {
+      this.$refs.tHouseApplyEndNongye.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApplyEnd.nongyePlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApplyEnd.nongyePlan)){
+          return "农业部门现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("农业部门上传现场照片失败!", 'danger');
+      });
+    },
+    //验收自然资源部门审批现场图片
+    submitHouseApproveEndNatureOptions() {
+      this.$refs.tHouseApplyEndNature.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApplyEnd.naturePlan = JSON.stringify(list);
+        // if(this.checkString(this.applicationDetail.tHouseApplyEnd.naturePlan)){
+        //   return "自然资源部门现场拍照不能为空";
+        // }
+      }).catch((x) => {
+        this.notify("自然资源部门上传现场照片失败!", 'danger');
+      });
+    },
+    //验收住建部门审批现场图片
+    submitHouseApproveEndBuildingOptions() {
+      this.$refs.tHouseApplyEndBuilding.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApplyEnd.buildingPlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApplyEnd.buildingPlan)){
+          return "住建部门现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("住建部门上传现场照片失败!", 'danger');
+      });
+    },
+    //验收镇政府审批现场图片
+    submitHouseApproveEndBZhenOptions() {
+      this.$refs.tHouseApplyEndZhen.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApplyEnd.zhenPlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApplyEnd.zhenPlan)){
+          return "镇政府现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("镇政府上传现场照片失败!", 'danger');
+      });
+    },
     // 带平面图附件上传的镇级申请审批
     submitHouseApproveLocationplanOptions(pass, commentText) {
       this.$refs.pictureUploadApplying.updatePlanFiles().then((x) => {
@@ -3211,9 +3843,19 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.approveOption)) {
         return "说明不能为空";
       }
-      if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.approveLeader)) {
+      else if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.approveLeader)) {
         return "自然资源签名不能为空";
       }
+      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) {
@@ -3234,6 +3876,16 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader)) {
         return "农村农业部门签名不能为空";
       }
+      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)
       {
@@ -3289,6 +3941,16 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.approveLeader)) {
         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 false;
     },
     validateTownForm() {
@@ -3298,6 +3960,16 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.approveLeader)) {
         return "镇政府审批签字不能为空";
       }
+      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() {
@@ -3396,6 +4068,16 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeTime)) {
           return "乡镇农业农村部门经办时间不能为空";
         }
+        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')
       {
@@ -3408,6 +4090,16 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureTime)) {
           return "乡镇自然资源部门经办时间不能为空";
         }
+        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)
       {
@@ -3420,6 +4112,16 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingTime)) {
           return "乡镇住建部门验收时间不能为空";
         }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingGeom)) {
+          return "住建部门现场定位不能为空";
+        }
+        if(this.$refs.tHouseApplyEndBuilding && this.$refs.tHouseApplyEndBuilding.isValid()) {
+          this.submitHouseApproveEndBuildingOptions();
+        } else {
+          if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingPlan)) {
+            return "住建部门现场拍照不能为空";
+          }
+        }
       }
       if(!role)
       {
@@ -3435,6 +4137,16 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenTime)) {
           return "乡镇政府验收时间不能为空";
         }
+        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 "乡镇政府现场拍照不能为空";
+          }
+        }
       }
 
       // 通过时检查打勾, 农业部门
@@ -3517,7 +4229,7 @@ export default {
       console.log(this.$store.getters.baseRoutingUrl);
       if(this.selectedTabName ==0){
         if(this.currentUserRole == 'village_leader' && this.onCliceQz =='tHouseApproveVillageOptions.villageLeader'  && this.applicationDetail.tHouseApproveVillageOptions.approveLeader !='' && this.applicationDetail.tHouseApproveVillageOptions.approveLeader !=null){
-          //村级审批人员签字
+          //村级审核人员签字
           //if(this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageLeader))
           this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.tHouseApproveVillageOptions.villageLeader;
         } else if((this.currentUserRole == 'task_executor' || this.currentUserRole == 'town_leader') && this.onCliceQz =='tHouseApproveNatureOptions.approveLeader'  && this.applicationDetail.tHouseApproveNatureOptions.approveLeader !='' && this.applicationDetail.tHouseApproveNatureOptions.approveLeader !=null){
@@ -3597,7 +4309,7 @@ export default {
             console.log(this.currentUserRole);
             if(this.selectedTabName ==0){
               if(this.currentUserRole == 'village_leader' && this.onCliceQz =='tHouseApproveVillageOptions.villageLeader'){
-                //村级审批人员签字
+                //村级审核人员签字
                 //if(this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageLeader))
                 this.applicationDetail.tHouseApproveVillageOptions.villageLeader = res.fileName;
               } else if((this.currentUserRole == 'nature_resource' || this.currentUserRole == 'town_leader') && this.onCliceQz =='tHouseApproveNatureOptions.approveLeader'){
@@ -3632,6 +4344,190 @@ export default {
           })
         }, 200);
     },
+
+    //定位当前位置
+    dingweiCommit(data){
+      //this.mapShow =true;
+      this.mapZbNow = data;
+      // saveHouseBaseInfo(this.applicationDetail).then((response) => {
+      // }).catch(resp => {
+      //   this.notify("保存失败!", 'danger');
+      // });
+      console.log(document.cookie);
+      console.log(window.location.href);
+      let chars = window.location.href.split("lat=")[1] || "";
+      if(chars !="" && chars != null && chars !=undefined){
+        var urlZb = window.location.href.split("&lat=")[0];
+        window.location = `https://www.nongshen.net/static/tdtLocation/location.html?exiturl=${urlZb}`;
+      } else {
+        window.location = `https://www.nongshen.net/static/tdtLocation/location.html?exiturl=${window.location.href}`;
+      }
+    },
+    dingweiCommitLook(data){
+      this.mapShow =true;
+      var zb;
+      //定位坐标点查看
+      if(data == 'tHouseApproveVillage'){
+        zb  = this.applicationDetail.tHouseApproveVillageOptions.theGeom;
+      }
+      if (data == 'tHouseApproveNature'){
+        zb = this.applicationDetail.tHouseApproveNatureOptions.theGeomPoint;
+      }
+      if(data == 'tHouseApproveAgriculture'){
+        zb = this.applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint;
+      }
+      if(data == 'tHouseApproveOther'){
+        zb = this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint;
+      }
+      if(data == 'tHouseApproveTown'){
+        zb = this.applicationDetail.tHouseApproveTownOptions.theGeomPoint;
+      }
+      //验收申请定位
+      if(data == 'tHouseApplyEndNongye'){
+        zb = this.applicationDetail.tHouseApplyEnd.nongyeGeom;
+      }
+      if(data == 'tHouseApplyEndNature'){
+        zb = this.applicationDetail.tHouseApplyEnd.natureGeom;
+      }
+      if(data == 'tHouseApplyEndZhen'){
+        zb = this.applicationDetail.tHouseApplyEnd.zhenGeom;
+      }
+      setTimeout(() => {
+        var zbCl = zb.replace("POINT(","").replace(")","").replace(" ",",");
+        zbCl = JSON.stringify([zbCl]).replaceAll("\"","");
+        var vector_drawing;
+        let projection = new ol.proj.Projection({
+          //地图投影类型
+          code: "EPSG:3857",
+          units: "degrees",
+          //extent:extent
+        });
+        let aerial = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: "http://t0.tianditu.gov.cn/img_w/wmts?" +
+              "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+              "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
+          }),
+          isGroup: true,
+          name: "卫星影像图",
+        });
+
+        let yingxzi = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: "https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
+          }),
+          isGroup: true,
+          name: "天地图文字标注--卫星影像图",
+        });
+        //加载地图
+        let map = new ol.Map({
+          controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
+          layers: [aerial, yingxzi],
+          projection: projection,
+          target: 'uuidMap',
+          logo: 'false',
+          view: new ol.View({
+            center: ol.proj.fromLonLat(JSON.parse(zbCl)),
+            //zoom: false,
+            zoom: 17.9,
+            minZoom: 0, //地图缩小限制
+            maxZoom: 18.3, //地图放大限制
+          }),
+        });
+        var newcenterFeature = new ol.Feature({
+          geometry: new ol.geom.Point(ol.proj.fromLonLat(JSON.parse(zbCl))), //几何信息
+          name: "到场点",
+        });
+        var sourceMapLook = new ol.source.Vector({wrapX: false});
+        vector_drawing = new ol.layer.Vector({
+          source: sourceMapLook,
+        });
+        map.addLayer(vector_drawing);
+        newcenterFeature.setStyle(createLabelStyle()); //设置要素样式
+        sourceMapLook.addFeature(newcenterFeature);
+
+        //矢量标注样式设置函数，设置image为图标ol.style.Icon
+        function createLabelStyle() {
+          return new ol.style.Style({
+            image: new ol.style.Icon({
+              //设置图标偏移
+              anchor: [0.5, 1],
+              //标注样式的起点位置
+              anchorOrigin: "top-right",
+              //X方向单位：分数
+              anchorXUnits: "fraction",
+              //Y方向单位：像素
+              anchorYUnits: "pixels",
+              //偏移起点位置的方向
+              offsetOrigin: "top-right",
+              //透明度
+              opacity: 0.9,
+              //图片路径
+              src: require("../../../../assets/images/housesteadSurvey/mark.png"),
+            }),
+            zIndex: 9999,
+          });
+        }
+      },1000);
+    },
+    mapZbQx(){
+
+    },
+    mapZbQd(){
+      // //申请审批定位
+      // if(this.mapZbNow == 'tHouseApproveVillage' && this.formEnabled.baseApplyForm.villageFormEnabled){
+      //   this.applicationDetail.tHouseApproveVillageOptions.theGeom = JSON.stringify(this.mapBcZb);
+      // }
+      // if (this.mapZbNow == 'tHouseApproveNature' && this.formEnabled.baseApplyForm.nature_resourceFormEnabled){
+      //   this.applicationDetail.tHouseApproveNatureOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApproveAgriculture' && this.formEnabled.baseApplyForm.agricultureFormEnabled){
+      //   this.applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApproveOther' && this.formEnabled.baseApplyForm.buildingFormEnabled){
+      //   this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApproveTown' && this.formEnabled.baseApplyForm.townFormEnabled){
+      //   this.applicationDetail.tHouseApproveTownOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      // }
+      // //验收申请定位
+      // if(this.mapZbNow == 'tHouseApplyEndNongye' && this.formEnabled.acceptingForm.agricultureFormEnabled){
+      //   this.applicationDetail.tHouseApplyEnd.nongyeGeom = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApplyEndNature' && this.formEnabled.acceptingForm.nature_resourceFormEnabled){
+      //   this.applicationDetail.tHouseApplyEnd.natureGeom = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApplyEndZhen' && this.formEnabled.acceptingForm.townFormEnabled){
+      //   this.applicationDetail.tHouseApplyEnd.zhenGeom = JSON.stringify(this.mapBcZb);
+      // }
+      //申请审批定位
+      if(this.formEnabled.baseApplyForm.villageFormEnabled){
+        this.applicationDetail.tHouseApproveVillageOptions.theGeom = JSON.stringify(this.mapBcZb);
+      }
+      if (this.formEnabled.baseApplyForm.nature_resourceFormEnabled){
+        this.applicationDetail.tHouseApproveNatureOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.baseApplyForm.agricultureFormEnabled){
+        this.applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.baseApplyForm.buildingFormEnabled){
+        this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.baseApplyForm.townFormEnabled){
+        this.applicationDetail.tHouseApproveTownOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      }
+      //验收申请定位
+      if(this.formEnabled.acceptingForm.agricultureFormEnabled){
+        this.applicationDetail.tHouseApplyEnd.nongyeGeom = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.acceptingForm.nature_resourceFormEnabled){
+        this.applicationDetail.tHouseApplyEnd.natureGeom = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.acceptingForm.townFormEnabled){
+        this.applicationDetail.tHouseApplyEnd.zhenGeom = JSON.stringify(this.mapBcZb);
+      }
+
+    },
   },
   watch: {
     selectedTabName: function (newVal, oldVal) {
@@ -3835,4 +4731,22 @@ export default {
   .van-goods-action-button {
     margin-left: 0.1rem;
   }
+  .fuTitle {
+    border-top: 1px solid #e9e9e9;
+    text-align: center;
+    padding: 10px 0px 0px 0px;
+    font-size: 18px;
+    color: #999;
+  }
+  #mapDiv {
+    width: 100%;
+    height: 400px
+  }
+
+  input,
+  b,
+  p {
+    margin-left: 5px;
+    font-size: 14px
+  }
 </style>