From 3b66240234752d819147f321f5d353c072745c4d Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Mon, 20 Jun 2022 20:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E5=88=B0=E5=9C=BA?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AD=BE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homeApplication/proposerLite.vue          | 418 +++++++++++++-----
 1 file changed, 313 insertions(+), 105 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index ffdbba97..2c309a2b 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -211,20 +211,20 @@
                       remote-url="/system/dict/data/type/geographic_type"
                       :on-remote-response="'data'"
                     />
-                    <template>
-                      <van-field v-if="applicationDetail.tHouseApplyProposedSituation.geographicType == '10'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.constructionLandArea" label="建设用地面积" placeholder="建设用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                      <van-field v-else-if="applicationDetail.tHouseApplyProposedSituation.geographicType == '20'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.unusedLandArea" label="未利用地面积" placeholder="未利用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                      <van-field v-else-if="applicationDetail.tHouseApplyProposedSituation.geographicType && applicationDetail.tHouseApplyProposedSituation.geographicType != '10' && applicationDetail.tHouseApplyProposedSituation.geographicType != '20'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.agriculturalLandArea" label="农用地面积" placeholder="农用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                    </template>
+<!--                    <template>-->
+<!--                      <van-field v-if="applicationDetail.tHouseApplyProposedSituation.geographicType == '10'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.constructionLandArea" label="建设用地面积" placeholder="建设用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>-->
+<!--                      <van-field v-else-if="applicationDetail.tHouseApplyProposedSituation.geographicType == '20'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.unusedLandArea" label="未利用地面积" placeholder="未利用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>-->
+<!--                      <van-field v-else-if="applicationDetail.tHouseApplyProposedSituation.geographicType && applicationDetail.tHouseApplyProposedSituation.geographicType != '10' && applicationDetail.tHouseApplyProposedSituation.geographicType != '20'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.agriculturalLandArea" label="农用地面积" placeholder="农用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>-->
+<!--                    </template>-->
+                  </div>
+                  <div class="mapBox">
+                    <common-map ref="pointDarwMap" style="height:200px;"
+                                :allowDraw="formEnabled.baseApplyForm.baseFormEnabled"
+                                @drawReseted="onMapDrawReseted"
+                                @drawFinished="onMapDrawFinished"
+                    >
+                    </common-map>
                   </div>
-<!--                  <div class="mapBox">-->
-<!--                    <common-map ref="pointDarwMap" style="height:200px;"-->
-<!--                                :allowDraw="formEnabled.baseApplyForm.baseFormEnabled"-->
-<!--                                @drawReseted="onMapDrawReseted"-->
-<!--                                @drawFinished="onMapDrawFinished"-->
-<!--                    >-->
-<!--                    </common-map>-->
-<!--                  </div>-->
                 </div>
 
                 <div v-if="applicationDetail.tHouseApplyProposer">
@@ -266,15 +266,19 @@
                     </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 }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApproveVillageOptions.villageLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>-->
-                      <van-cell title="负责人:"  :rules="[{ required: true }]">
-                        <van-button round color="#7AC943" required :disabled ="!formEnabled.baseApplyForm.baseFormEnabled" v-show="false" v-model="applicationDetail.tHouseApproveVillageOptions.villageLeader" type="primary" style="float: right;width:200px;height:40px" @click="searchCommit">签名确认</van-button>
+                      <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 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:200px;height:40px" @click="searchCommit">签名确认</van-button>
                         <van-image
                           width="100"
                           height="50"
-                          :disabled ="formEnabled.baseApplyForm.baseFormEnabled"
-                          :src="imageUrl+applicationDetail.tHouseApproveVillageOptions.villageLeader"
-                        />
+                          :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>
                         <field-date-picker
                           v-model="applicationDetail.tHouseApproveVillageOptions.villageTime"
@@ -322,9 +326,19 @@
                       <!--                        </common-map>-->
                       <!--                      </div>-->
                       <van-field required :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.approveOption" rows="2" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
-<!--                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>-->
-                      <van-cell title="负责人:"  :rules="[{ required: true }]">
-                      <van-button round color="#7AC943" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" type="primary" style="float: right;width:200px;height:40px" @click="searchCommit">签名确认</van-button>
+                      <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:200px;height:40px" @click="searchCommit('tHouseApproveNatureOptions.approveLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled"
+                          v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader !='' && applicationDetail.tHouseApproveNatureOptions.approveLeader !=null
+                              && applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveNatureOptions.approveLeader"
+                          @click="formEnabled.baseApplyForm.nature_resourceFormEnabled && searchCommit('tHouseApproveNatureOptions.approveLeader')"
+                        ></van-image>
                       </van-cell>
                         <field-date-picker
                           v-model="applicationDetail.tHouseApproveNatureOptions.approveTime"
@@ -379,9 +393,19 @@
                       <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.south" label="南至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>-->
                       <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.north" label="北至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>-->
                       <van-field required :readonly="!formEnabled.baseApplyForm.buildingFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveOption" rows="2" autosize  type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
-<!--                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>-->
-                      <van-cell title="负责人:"  :rules="[{ required: true }]">
-                        <van-button round color="#7AC943" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" type="primary" style="float: right;width:200px;height:40px" @click="searchCommit">签名确认</van-button>
+                      <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:200px;height:40px" @click="searchCommit('tHouseApproveOtherOptions.approveLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.buildingFormEnabled"
+                          v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader !='' && applicationDetail.tHouseApproveOtherOptions.approveLeader !=null
+                              && applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveOtherOptions.approveLeader"
+                          @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveOtherOptions.approveLeader')"
+                        ></van-image>
                       </van-cell>
                         <field-date-picker
                           v-model="applicationDetail.tHouseApproveOtherOptions.approveTime"
@@ -434,9 +458,19 @@
 <!--                        :columns="[{dictLabel: '齐全', dictValue: '1'}, {dictLabel: '不齐全', dictValue: '2'}]"-->
 <!--                      />-->
                       <van-field required :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled" rows="2" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveOption" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
-<!--                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>-->
-                      <van-cell title="负责人:"  :rules="[{ required: true }]">
-                        <van-button round color="#7AC943" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" type="primary" style="float: right;width:200px;height:40px" @click="searchCommit">签名确认</van-button>
+                      <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:200px;height:40px" @click="searchCommit('tHouseApproveAgricultureOptions.approveLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled"
+                          v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader !='' && applicationDetail.tHouseApproveAgricultureOptions.approveLeader !=null
+                              && applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveAgricultureOptions.approveLeader"
+                          @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveAgricultureOptions.approveLeader')"
+                        ></van-image>
                       </van-cell>
                       <field-date-picker
                           v-model="applicationDetail.tHouseApproveAgricultureOptions.approveTime"
@@ -459,9 +493,19 @@
                     <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 :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>-->
-                      <van-cell title="负责人:"  :rules="[{ required: true }]">
-                        <van-button round color="#7AC943" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" type="primary" style="float: right;width:200px;height:40px" @click="searchCommit">签名确认</van-button>
+                      <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:200px;height:40px" @click="searchCommit('tHouseApproveTownOptions.approveLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                          v-if="applicationDetail.tHouseApproveTownOptions.approveLeader !='' && applicationDetail.tHouseApproveTownOptions.approveLeader !=null
+                              && applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveTownOptions.approveLeader"
+                          @click="formEnabled.baseApplyForm.townFormEnabled && searchCommit('tHouseApproveTownOptions.approveLeader')"
+                        ></van-image>
                       </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveTownOptions.approveTime"
@@ -690,11 +734,11 @@
                         remote-url="/system/dict/data/type/geographic_type"
                         :on-remote-response="'data'"
                       />
-                      <template>
-                        <van-field v-if="applicationDetail.tHouseApplyProposedSituation.geographicType == '10'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.constructionLandArea" label="建设用地面积" placeholder="建设用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                        <van-field v-else-if="applicationDetail.tHouseApplyProposedSituation.geographicType == '20'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.unusedLandArea" label="未利用地面积" placeholder="未利用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                        <van-field v-else-if="applicationDetail.tHouseApplyProposedSituation.geographicType && applicationDetail.tHouseApplyProposedSituation.geographicType != '10' && applicationDetail.tHouseApplyProposedSituation.geographicType != '20'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.agriculturalLandArea" label="农用地面积" placeholder="农用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                      </template>
+<!--                      <template>-->
+<!--                        <van-field v-if="applicationDetail.tHouseApplyProposedSituation.geographicType == '10'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.constructionLandArea" label="建设用地面积" placeholder="建设用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>-->
+<!--                        <van-field v-else-if="applicationDetail.tHouseApplyProposedSituation.geographicType == '20'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.unusedLandArea" label="未利用地面积" placeholder="未利用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>-->
+<!--                        <van-field v-else-if="applicationDetail.tHouseApplyProposedSituation.geographicType && applicationDetail.tHouseApplyProposedSituation.geographicType != '10' && applicationDetail.tHouseApplyProposedSituation.geographicType != '20'" :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposedSituation.agriculturalLandArea" label="农用地面积" placeholder="农用地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>-->
+<!--                      </template>-->
                     </div>
                   </div>
                 </template>
@@ -706,7 +750,20 @@
                     <van-col span="5">乡镇<br/>自然<br/>资源<br/>部门<br/>意见</van-col>
                     <van-col span="19">
                       <van-field required :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.approveOption" rows="2" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
-                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
+                      <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:200px;height:40px" @click="searchCommit('tHouseApproveNatureOptions.approveLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled"
+                          v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader !='' && applicationDetail.tHouseApproveNatureOptions.approveLeader !=null
+                              && applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveNatureOptions.approveLeader"
+                          @click="formEnabled.baseApplyForm.nature_resourceFormEnabled && searchCommit('tHouseApproveNatureOptions.approveLeader')"
+                        ></van-image>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveNatureOptions.approveTime"
                         label="审批日期"
@@ -728,7 +785,20 @@
                     <van-col span="5">乡镇<br/>其他<br/>部门<br/>意见<br/></van-col>
                     <van-col span="19">
                       <van-field required :readonly="!formEnabled.baseApplyForm.buildingFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveOption" rows="2" autosize  type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
-                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.buildingFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
+                      <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:200px;height:40px" @click="searchCommit('tHouseApproveOtherOptions.approveLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.buildingFormEnabled"
+                          v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader !='' && applicationDetail.tHouseApproveOtherOptions.approveLeader !=null
+                              && applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveOtherOptions.approveLeader"
+                          @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveOtherOptions.approveLeader')"
+                        ></van-image>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveOtherOptions.approveTime"
                         label="审批日期"
@@ -750,7 +820,20 @@
                     <van-col span="5">乡镇<br/>农业<br/>农村<br/>部门<br/>审查<br/>意见</van-col>
                     <van-col span="19">
                       <van-field required :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled" rows="2" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveOption" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
-                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>
+                      <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:200px;height:40px" @click="searchCommit('tHouseApproveAgricultureOptions.approveLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled"
+                          v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader !='' && applicationDetail.tHouseApproveAgricultureOptions.approveLeader !=null
+                              && applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveAgricultureOptions.approveLeader"
+                          @click="formEnabled.baseApplyForm.buildingFormEnabled && searchCommit('tHouseApproveAgricultureOptions.approveLeader')"
+                        ></van-image>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveAgricultureOptions.approveTime"
                         label="审批日期"
@@ -772,7 +855,20 @@
                     <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 :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
+                      <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:200px;height:40px" @click="searchCommit('tHouseApproveTownOptions.approveLeader')">签名确认</van-button>
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                          v-if="applicationDetail.tHouseApproveTownOptions.approveLeader !='' && applicationDetail.tHouseApproveTownOptions.approveLeader !=null
+                              && applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveTownOptions.approveLeader"
+                          @click="formEnabled.baseApplyForm.townFormEnabled && searchCommit('tHouseApproveTownOptions.approveLeader')"
+                        ></van-image>
+                      </van-cell>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveTownOptions.approveTime"
                         label="审批日期"
@@ -1011,7 +1107,20 @@
                   <van-col span="5">乡镇<br/>农业<br/>农村<br/>部门<br/>意见</van-col>
                   <van-col span="19">
                     <van-field required :readonly="!formEnabled.acceptingForm.agricultureFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.nongyeOption" :autosize="true" type="textarea" placeholder="乡镇农业农村部门意见" :rules="[{ required: true }]"/>
-                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled" v-model="applicationDetail.tHouseApplyEnd.nongyeName" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
+                    <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:200px;height:40px" @click="searchCommit('tHouseApplyEnd.nongyeName')">签名确认</van-button>
+                      <van-image
+                        width="100"
+                        height="50"
+                        :readonly="!formEnabled.acceptingForm.agricultureFormEnabled"
+                        v-if="applicationDetail.tHouseApplyEnd.nongyeName !='' && applicationDetail.tHouseApplyEnd.nongyeName !=null
+                              && applicationDetail.tHouseApplyEnd.nongyeName.endsWith('jpeg')"
+                        :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApplyEnd.nongyeName"
+                        @click="formEnabled.acceptingForm.agricultureFormEnabled && searchCommit('tHouseApplyEnd.nongyeName')"
+                      ></van-image>
+                    </van-cell>
                     <field-date-picker
                       v-model="applicationDetail.tHouseApplyEnd.nongyeTime"
                       label="审批日期"
@@ -1032,7 +1141,20 @@
                   <van-col span="5">乡镇<br/>自然<br/>资源<br/>部门<br/>意见</van-col>
                   <van-col span="19">
                     <van-field required :readonly="!formEnabled.acceptingForm.nature_resourceFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.natureOption" :autosize="true" type="textarea" placeholder="乡镇自然资源部门意见" :rules="[{ required: true }]"/>
-                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled" v-model="applicationDetail.tHouseApplyEnd.natureName" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
+                    <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:200px;height:40px" @click="searchCommit('tHouseApplyEnd.natureName')">签名确认</van-button>
+                      <van-image
+                        width="100"
+                        height="50"
+                        :readonly="!formEnabled.acceptingForm.nature_resourceFormEnabled"
+                        v-if="applicationDetail.tHouseApplyEnd.natureName !='' && applicationDetail.tHouseApplyEnd.natureName !=null
+                              && applicationDetail.tHouseApplyEnd.natureName.endsWith('jpeg')"
+                        :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApplyEnd.natureName"
+                        @click="formEnabled.acceptingForm.nature_resourceFormEnabled && searchCommit('tHouseApplyEnd.natureName')"
+                      ></van-image>
+                    </van-cell>
                     <field-date-picker
                       v-model="applicationDetail.tHouseApplyEnd.natureTime"
                       label="审批日期"
@@ -1076,8 +1198,20 @@
                   <van-col span="5">乡镇<br/>政府<br/>验收<br/>意见</van-col>
                   <van-col span="19">
                     <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.zhenOption" :autosize="true" type="textarea" placeholder="乡镇政府验收意见" :rules="[{ required: true }]"/>
-<!--                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.zhenName" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>-->
-                    <van-button round color="#7AC943"  style="flex:1;" @click="searchCommit">签名确认</van-button>
+                    <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:200px;height:40px" @click="searchCommit('tHouseApplyEnd.zhenName')">签名确认</van-button>
+                      <van-image
+                        width="100"
+                        height="50"
+                        :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                        v-if="applicationDetail.tHouseApplyEnd.zhenName !='' && applicationDetail.tHouseApplyEnd.zhenName !=null
+                              && applicationDetail.tHouseApplyEnd.zhenName.endsWith('jpeg')"
+                        :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApplyEnd.zhenName"
+                        @click="formEnabled.acceptingForm.townFormEnabled && searchCommit('tHouseApplyEnd.zhenName')"
+                      ></van-image>
+                    </van-cell>
                     <field-date-picker
                       v-model="applicationDetail.tHouseApplyEnd.zhenTime"
                       label="审批日期"
@@ -1265,7 +1399,6 @@ export default {
       FieldRadio, HouseApplyUploadComp, FieldDatePicker, CommonMap, FieldSelect, HouseLocationPlanComp},
     data() {
     return {
-      imageUrl:"",
       // 当前流程步骤
       active: 0,
       // 申请ID
@@ -1415,6 +1548,8 @@ export default {
       familyMembersActive: 0,
       //电子签名
       showesign: false,
+      //部门签字判断
+      onCliceQz:"",
       lineWidth: 6, // 画笔的线条粗细
       lineColor: "#000000", // 画笔的颜色
       bgColor: "", // 画布的背景颜色
@@ -1428,7 +1563,6 @@ export default {
     this.taskId = this.$route.query.taskId;
     this.instanceId = this.$route.query.instanceId;
     console.log(this.$cookies)
-    this.imageUrl =this.$cookies.get("url");
     this.getFormIntent();
     this.getLandCoord();
     this.getDetail();
@@ -1698,8 +1832,8 @@ export default {
               });
             }
             else {
-              if(!this.applicationDetail.tHouseApproveVillageOptions.villageLeader)
-                this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageLeader', handlerName);
+              // if(!this.applicationDetail.tHouseApproveVillageOptions.villageLeader)
+              //   this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageLeader', handlerName);
               if(!this.applicationDetail.tHouseApproveVillageOptions.villageTime)
                 this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageTime', handlerTime);
               if(!this.applicationDetail.tHouseApproveVillageOptions.villageOption || true) // always generate options
@@ -1719,7 +1853,8 @@ export default {
                 west: null, // 西至
                 south: null, // 南至
                 north: null, // 北至
-                approveLeader: handlerName,
+                //approveLeader: handlerName,
+                approveLeader: null,
                 approveOption: null,
                 approveTime: handlerTime,
                 //theGeom: value.tHouseApplyProposedSituation.theGeom,
@@ -1738,7 +1873,8 @@ export default {
                 isMembership: null,
                 isOnehouse: null,
                 isReviewmaterials: null,
-                approveLeader: handlerName,
+                //approveLeader: handlerName,
+                approveLeader: null,
                 approveOption: null,
                 approveTime: handlerTime,
               });
@@ -1763,7 +1899,8 @@ export default {
                 west: null, // 西至
                 south: null, // 南至
                 north: null, // 北至
-                approveLeader: handlerName,
+                //approveLeader: handlerName,
+                approveLeader: null,
                 approveOption: null,
                 approveTime: handlerTime,
               });
@@ -1778,7 +1915,8 @@ export default {
             if(!value.tHouseApproveTownOptions)
             {
               this.$set(this.applicationDetail, 'tHouseApproveTownOptions', {
-                approveLeader: handlerName,
+                //approveLeader: handlerName,
+                approveLeader: null,
                 approveTime: handlerTime,
               });
             }
@@ -1842,25 +1980,25 @@ export default {
             if(this.isInRoles(role, ['town_leader']))
             {
               if(!this.applicationDetail.tHouseApplyEnd.cartographer) this.applicationDetail.tHouseApplyEnd.cartographer = handlerName;
-              if(!this.applicationDetail.tHouseApplyEnd.zhenName) this.applicationDetail.tHouseApplyEnd.zhenName = handlerName;
+              if(!this.applicationDetail.tHouseApplyEnd.zhenName) //this.applicationDetail.tHouseApplyEnd.zhenName = handlerName;
               if(!this.applicationDetail.tHouseApplyEnd.zhenTime) this.applicationDetail.tHouseApplyEnd.zhenTime = handlerTime;
             }
 
             if(this.isInRoles(role, ['town_leader', 'agriculture']))
             {
-              if(!this.applicationDetail.tHouseApplyEnd.nongyeName) this.applicationDetail.tHouseApplyEnd.nongyeName = handlerName;
+              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.applicationDetail.tHouseApplyEnd.natureName) this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
+              if(!this.applicationDetail.tHouseApplyEnd.natureName) //this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
               if(!this.applicationDetail.tHouseApplyEnd.natureTime) this.applicationDetail.tHouseApplyEnd.natureTime = handlerTime;
             }
 
             if(0)
             {
-              if(!this.applicationDetail.tHouseApplyEnd.buildingName) this.applicationDetail.tHouseApplyEnd.buildingName = handlerName;
+              if(!this.applicationDetail.tHouseApplyEnd.buildingName) //this.applicationDetail.tHouseApplyEnd.buildingName = handlerName;
               if(!this.applicationDetail.tHouseApplyEnd.buildingTime) this.applicationDetail.tHouseApplyEnd.buildingTime = handlerTime;
             }
 
@@ -2450,7 +2588,6 @@ export default {
         case PROPOSER_STAGE_BASE_APPLY_ACTIVITY: {
           let comment;
           const role = this.$store.getters.roles[0];
-          //console.log(role);
           let msg = "";
           switch (role) {
             case "agriculture":
@@ -2524,6 +2661,41 @@ export default {
                 msg = '村领导意见不能为空';
               else
                 comment = this.applicationDetail.tHouseApproveVillageOptions.villageOption;
+              if (this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageLeader)) {
+                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'){
+            //       //自然资源部门签字
+            //       if(this.checkString(this.applicationDetail.tHouseApproveNatureOptions.approveLeader))
+            //         return  '自然资源部门签字不能为空';
+            //       this.applicationDetail.tHouseApproveNatureOptions.approveLeader = res.fileName;
+            //     } else if (this.currentUserRole == ''){
+            //       //其他部门签字
+            //       if(this.checkString(this.applicationDetail.tHouseApproveOtherOptions.approveLeader))
+            //         return  '其他部门签字不能为空';
+            //       this.applicationDetail.tHouseApproveOtherOptions.approveLeader = res.fileName;
+            //     } else if (this.currentUserRole == ''){
+            //       //农村农业部门签字
+            //       if(this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader))
+            //         return  '农村农业部门签字不能为空';
+            //       this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader = res.fileName;
+            //     } else if (this.currentUserRole == ''){
+            //       //镇级领导签字 tHouseApproveTownOptions
+            //       if(this.checkString(this.applicationDetail.tHouseApproveTownOptions.approveLeader))
+            //         return  '镇级领导签字不能为空';
+            //       this.applicationDetail.tHouseApproveTownOptions.approveLeader = res.fileName;
+            //     }
+            //     this.showesign =false;
+            // } else if(this.selectedTabName ==1){
+            //
+            // } else if (this.selectedTabName ==2){
+            //
+            // }
               break;
           }
           if (msg) {
@@ -2947,24 +3119,24 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.geographicType)) {
         return "土地类型不能为空";
       }
-      if(this.applicationDetail.tHouseApplyProposedSituation.geographicType == '10')
-      {
-        if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.constructionLandArea)) {
-          return "建设用地面积不能为空";
-        }
-      }
-      else if(this.applicationDetail.tHouseApplyProposedSituation.geographicType == '20')
-      {
-        if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.unusedLandArea)) {
-          return "未利用地不能为空";
-        }
-      }
-      else
-      {
-        if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.agriculturalLandArea)) {
-          return "农用地不能为空";
-        }
-      }
+      // if(this.applicationDetail.tHouseApplyProposedSituation.geographicType == '10')
+      // {
+      //   if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.constructionLandArea)) {
+      //     return "建设用地面积不能为空";
+      //   }
+      // }
+      // else if(this.applicationDetail.tHouseApplyProposedSituation.geographicType == '20')
+      // {
+      //   if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.unusedLandArea)) {
+      //     return "未利用地不能为空";
+      //   }
+      // }
+      // else
+      // {
+      //   if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.agriculturalLandArea)) {
+      //     return "农用地不能为空";
+      //   }
+      // }
       // if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.designPaper)) {
       //   return "设计图纸不能为空";
       // }
@@ -3016,7 +3188,6 @@ export default {
       // if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.isReviewmaterials)) {
       //   return "村委会审查材料不能为空";
       // }
-
       if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.approveOption)) {
         return "说明不能为空";
       }
@@ -3290,8 +3461,52 @@ export default {
         this.applicationDetail.tHouseApplyFamilyMembers[index].age = res[1];
       }
     },
-    searchCommit(){
-      this.showesign = true
+    searchCommit(data){
+      this.showesign = true;
+      this.onCliceQz = data;
+      console.log(this.currentUserRole);
+      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){
+          //自然资源部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.tHouseApproveNatureOptions.approveLeader;
+        } else if ((this.currentUserRole == 'town_leader' || this.currentUserRole == '') && this.onCliceQz =='tHouseApproveOtherOptions.approveLeader'  && this.applicationDetail.tHouseApproveOtherOptions.approveLeader !='' && this.applicationDetail.tHouseApproveOtherOptions.approveLeader !=null){
+          //其他部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.tHouseApproveOtherOptions.approveLeader;
+        } else if ((this.currentUserRole == 'town_leader' || this.currentUserRole == '') && this.onCliceQz =='tHouseApproveAgricultureOptions.approveLeader'  && this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader !='' && this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader !=null){
+          //农村农业部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader;
+        } else if (this.currentUserRole == 'town_leader'  && this.onCliceQz =='tHouseApproveTownOptions.approveLeader' && this.applicationDetail.tHouseApproveTownOptions.approveLeader !='' && this.applicationDetail.tHouseApproveTownOptions.approveLeader !=null){
+          //镇级领导签字 tHouseApproveTownOptions
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.tHouseApproveTownOptions.approveLeader;
+        } else {
+          this.resultImg = null
+          if(this.$refs.esign){
+            this.$refs.esign.reset();
+          }
+        }
+      } else if(this.selectedTabName ==1){
+
+      } else if (this.selectedTabName ==2) {
+        if ((this.currentUserRole == 'town_leader' || this.currentUserRole == '') && this.onCliceQz =='tHouseApplyEnd.nongyeName'  && this.applicationDetail.tHouseApplyEnd.nongyeName !='' && this.applicationDetail.tHouseApplyEnd.nongyeName !=null){
+          //农村农业部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.tHouseApplyEnd.nongyeName;
+        }  else if ((this.currentUserRole == 'task_executor' || this.currentUserRole == 'town_leader') && this.onCliceQz == 'tHouseApplyEnd.natureName' && this.applicationDetail.tHouseApplyEnd.natureName != '' && this.applicationDetail.tHouseApplyEnd.natureName != null) {
+          //自然资源部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl + this.applicationDetail.tHouseApplyEnd.natureName;
+        } else if ((this.currentUserRole == 'town_leader') && this.onCliceQz == 'tHouseApplyEnd.zhenName' && this.applicationDetail.tHouseApplyEnd.zhenName != '' && this.applicationDetail.tHouseApplyEnd.zhenName != null) {
+          //镇级领导部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl + this.applicationDetail.tHouseApplyEnd.zhenName;
+        } else {
+          this.resultImg = null
+          if (this.$refs.esign) {
+            this.$refs.esign.reset();
+          }
+        }
+      }
     },
     // 清空画板
     handleReset() {
@@ -3302,7 +3517,6 @@ export default {
     },
     // 生成签字图
     handleGenerate() {
-      if(this.resultImg==null||this.resultImg==''){
         this.$refs.esign
           .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
           .then((res) => {
@@ -3332,47 +3546,41 @@ export default {
             console.log(this.selectedTabName);
             console.log(this.currentUserRole);
             if(this.selectedTabName ==0){
-              if(this.currentUserRole == 'task_executor'){
+              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'){
                 //自然资源部门签字
-                if(this.checkString(this.applicationDetail.tHouseApproveNatureOptions.approveLeader))
-                  return  '自然资源部门签字不能为空';
                 this.applicationDetail.tHouseApproveNatureOptions.approveLeader = res.fileName;
-              } else if (this.currentUserRole == ''){
+              } else if ((this.currentUserRole == 'town_leader' || this.currentUserRole == 'building') && this.onCliceQz =='tHouseApproveOtherOptions.approveLeader'){
                 //其他部门签字
-                if(this.checkString(this.applicationDetail.tHouseApproveOtherOptions.approveLeader))
-                  return  '其他部门签字不能为空';
                 this.applicationDetail.tHouseApproveOtherOptions.approveLeader = res.fileName;
-              } else if (this.currentUserRole == ''){
+              } else if ((this.currentUserRole == 'town_leader' || this.currentUserRole == 'agriculture') && this.onCliceQz =='tHouseApproveAgricultureOptions.approveLeader'){
                 //农村农业部门签字
-                if(this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader))
-                  return  '农村农业部门签字不能为空';
                 this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader = res.fileName;
-              } else if (this.currentUserRole == ''){
+              } else if (this.currentUserRole == 'town_leader'  && this.onCliceQz =='tHouseApproveTownOptions.approveLeader'){
                 //镇级领导签字 tHouseApproveTownOptions
-                if(this.checkString(this.applicationDetail.tHouseApproveTownOptions.approveLeader))
-                  return  '镇级领导签字不能为空';
                 this.applicationDetail.tHouseApproveTownOptions.approveLeader = res.fileName;
-              } else if (this.currentUserRole == 'village_leader'){
-                this.applicationDetail.tHouseApproveVillageOptions.villageLeader = res.fileName;
               }
+              this.showesign =false;
             } else if(this.selectedTabName ==1){
 
             } else if (this.selectedTabName ==2){
-
+              if ((this.currentUserRole == 'town_leader' || this.currentUserRole == 'agriculture') && this.onCliceQz =='tHouseApplyEnd.nongyeName'){
+                //农村农业部门签字
+                this.applicationDetail.tHouseApplyEnd.nongyeName =res.fileName;
+              }  else if ((this.currentUserRole == 'nature_resource' || this.currentUserRole == 'town_leader') && this.onCliceQz == 'tHouseApplyEnd.natureName') {
+                //自然资源部门签字
+               this.applicationDetail.tHouseApplyEnd.natureName =res.fileName;
+              } else if ((this.currentUserRole == 'town_leader') && this.onCliceQz == 'tHouseApplyEnd.zhenName') {
+                //镇级领导部门签字
+                this.applicationDetail.tHouseApplyEnd.zhenName =res.fileName;
+              }
+              this.showesign =false;
             }
-
           })
         }, 200);
-      }else{
-        // submitOnly(this.form).then(response => {
-        //   let _this =this
-        //   this.$toast({
-        //     icon: 'success', // 找到自己需要的图标
-        //     message: '修改成功',
-        //     duration:"1000",
-        //   });
-        // });
-      }
     },
   },
   watch: {