From f2065c1bd49e03d10333260c24f03b9ec9a0f0ef Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Wed, 15 Jun 2022 15:11:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=96=B0=E5=B7=A5=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homeApplication/applicationList.vue       |  77 ++-
 .../homeApplication/proposerLite.vue          | 579 ++++++++++++------
 2 files changed, 431 insertions(+), 225 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
index ce83e835..7ddf3899 100644
--- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue
+++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
@@ -15,12 +15,12 @@
         </template>
       </van-nav-bar>
 
-      <van-pull-refresh v-model="refreshing" @refresh="refresh">
+      <van-pull-refresh v-model="refreshing" @refresh="getList()">
         <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
-        @load="getList"
+        @load="getList('+1')"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell :title="item.ywh" center @click="viewItem(item)">
@@ -72,6 +72,7 @@ export default {
       loading: false,
       finished: false,
       refreshing: false,
+      total: 0,
       queryParams:{
         pageNum:1,
         pageSize:10,
@@ -84,7 +85,7 @@ export default {
     this.houseGetDicts("house_apply_status").then((response) => {
       console.log(response)
       this.houseApplyStatus = response.data;
-      //this.refresh();
+      this.getList();
     });
   },
   methods: {
@@ -104,30 +105,51 @@ export default {
           ? 'modify' : 'view';
       window.location = 'proposerLite?type=' + type + '&id=' + row.id;
     },
-    getList(){
-      setTimeout(() => {
-        getList(this.queryParams).then(response => {
-          console.log(response)
-          for (var i = 0; i < response.rows.length; i++) {
-            var houseApplyStatusName = this.selectDictLabel(this.houseApplyStatus, response.rows[i].houseApplyStatus);
-            // if(response.rows[i].auditStatus !== '0' && response.rows[i].auditStatus === '2'){
-            //   houseApplyStatusName = houseApplyStatusName+ ' ● 已驳回';
-            // }
-            response.rows[i].houseApplyStatusName = houseApplyStatusName;
-            this.applicationList.push(response.rows[i]);
-          }
-          if(this.applicationList.length >= response.total){
-            this.finished = true;
-            return;
-          }else{
-            this.loading = false;
-            this.queryParams.pageNum += 1 ;
-          }
-        }).finally(() => {
-          this.loading = false;
-          this.refreshing = false;
-        });
-      }, 1000);
+    getList(target){
+      let type = typeof (target);
+      console.log(type, target);
+      if(target && this.finished)
+        return;
+      if (target === 0) {
+        this.refreshing = true;
+        this.finished = true;
+        this.total = 0;
+        this.queryParams.pageNum = 1;
+        this.applicationList = [];
+      }
+      else if (type === 'number')
+        this.queryParams.pageNum = target;
+      else if (type === 'string') {
+        this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
+      }
+      else
+      {
+        this.refreshing = true;
+        this.finished = true;
+        this.total = 0;
+        this.queryParams.pageNum = 1;
+        this.applicationList = []
+      }
+      getList(this.queryParams).then(response => {
+        console.log(response)
+        if (response.rows.length === 0) {
+          this.finished = true;
+          return;
+        }
+        for (var i = 0; i < response.rows.length; i++) {
+          var houseApplyStatusName = this.selectDictLabel(this.houseApplyStatus, response.rows[i].houseApplyStatus);
+          // if(response.rows[i].auditStatus !== '0' && response.rows[i].auditStatus === '2'){
+          //   houseApplyStatusName = houseApplyStatusName+ ' ● 已驳回';
+          // }
+          response.rows[i].houseApplyStatusName = houseApplyStatusName;
+          this.applicationList.push(response.rows[i]);
+        }
+        this.total += response.rows.length;
+        this.finished = this.total >= response.total;
+      }).finally(() => {
+        this.loading = false;
+        this.refreshing = false;
+      });
     },
     deleteList(id,index){
       this.$dialog.confirm({
@@ -147,6 +169,7 @@ export default {
       });
     },
     refresh() {
+      this.getList(); return;
       this.applicationList = [];
       this.queryParams.pageNum = 1;
       this.refreshing = true;
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 8c55d198..4fe602d2 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -291,7 +291,7 @@
               </template>
 
               <!-- 申请::自然资源部门 -->
-              <template v-if="formVisible.baseApplyForm.townFormVisible">
+              <template v-if="formVisible.baseApplyForm.nature_resourceFormVisible">
                 <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>
@@ -321,7 +321,7 @@
                       <!--                        >-->
                       <!--                        </common-map>-->
                       <!--                      </div>-->
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.approveOption" rows="2" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
+                      <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>
@@ -333,7 +333,7 @@
                           :rules="[{ required: true }]"
                           formatter="yyyy-MM-dd"
                           required
-                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                          :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled"
                         />
                     </van-col>
                   </van-row>
@@ -341,7 +341,7 @@
               </template>
 
               <!-- 申请::住建部门 -->
-              <template v-if="formVisible.baseApplyForm.townFormVisible">
+              <template v-if="formVisible.baseApplyForm.buildingFormVisible">
                 <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>
@@ -378,7 +378,7 @@
                       <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.west" label="西至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>-->
                       <!--                      <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.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveOption" rows="2" autosize  type="textarea" placeholder="审批意见" :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>
@@ -390,7 +390,7 @@
                           :rules="[{ required: true }]"
                           formatter="yyyy-MM-dd"
                           required
-                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                          :readonly="!formEnabled.baseApplyForm.buildingFormEnabled"
                         />
                     </van-col>
                   </van-row>
@@ -398,7 +398,7 @@
               </template>
 
               <!-- 申请::农业部门 -->
-              <template v-if="formVisible.baseApplyForm.townFormVisible">
+              <template v-if="formVisible.baseApplyForm.agricultureFormVisible">
                 <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">乡镇<br/>农业<br/>农村<br/>部门<br/>审查<br/>意见</van-col>
@@ -433,7 +433,7 @@
 <!--                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
 <!--                        :columns="[{dictLabel: '齐全', dictValue: '1'}, {dictLabel: '不齐全', dictValue: '2'}]"-->
 <!--                      />-->
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveOption" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
+                      <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>
@@ -445,7 +445,7 @@
                           :rules="[{ required: true }]"
                           formatter="yyyy-MM-dd"
                           required
-                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                          :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled"
                         />
                     </van-col>
                   </van-row>
@@ -454,7 +454,7 @@
 
               <!-- 申请::镇政府 -->
               <template v-if="formVisible.baseApplyForm.townFormVisible">
-                <div class="main_box examine_box" v-if="formVisible.baseApplyForm.townFormVisible">
+                <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">
@@ -470,7 +470,7 @@
                         :rules="[{ required: true }]"
                         formatter="yyyy-MM-dd"
                         required
-                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"
                       />
                     </van-col>
                   </van-row>
@@ -479,7 +479,7 @@
 
               <!-- 申请::现场踏勘 -->
               <template v-if="formVisible.baseApplyForm.townFormVisible">
-                <div class="main_box examine_box" v-if="formVisible.baseApplyForm.townFormVisible">
+                <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">现场<br/>踏勘</van-col>
                     <van-col span="19">
@@ -700,13 +700,13 @@
                 </template>
 
               <!-- 申请::自然资源部门 -->
-              <template v-if="formVisible.baseApplyForm.townFormVisible">
+              <template v-if="formVisible.baseApplyForm.nature_resourceFormVisible">
                 <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.townFormEnabled" 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-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"/>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveNatureOptions.approveTime"
                         label="审批日期"
@@ -714,7 +714,7 @@
                         :rules="[{ required: true }]"
                         formatter="yyyy-MM-dd"
                         required
-                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled"
                       />
                     </van-col>
                   </van-row>
@@ -722,13 +722,13 @@
               </template>
 
               <!-- 申请::住建部门 -->
-              <template v-if="formVisible.baseApplyForm.townFormVisible">
+              <template v-if="formVisible.baseApplyForm.buildingFormVisible">
                 <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.townFormEnabled" 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-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"/>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveOtherOptions.approveTime"
                         label="审批日期"
@@ -736,7 +736,7 @@
                         :rules="[{ required: true }]"
                         formatter="yyyy-MM-dd"
                         required
-                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        :readonly="!formEnabled.baseApplyForm.buildingFormEnabled"
                       />
                     </van-col>
                   </van-row>
@@ -744,13 +744,13 @@
               </template>
 
               <!-- 申请::农业部门 -->
-              <template v-if="formVisible.baseApplyForm.townFormVisible">
+              <template v-if="formVisible.baseApplyForm.agricultureFormVisible">
                 <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">乡镇<br/>农业<br/>农村<br/>部门<br/>审查<br/>意见</van-col>
                     <van-col span="19">
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" 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-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"/>
                       <field-date-picker
                         v-model="applicationDetail.tHouseApproveAgricultureOptions.approveTime"
                         label="审批日期"
@@ -758,7 +758,7 @@
                         :rules="[{ required: true }]"
                         formatter="yyyy-MM-dd"
                         required
-                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled"
                       />
                     </van-col>
                   </van-row>
@@ -861,7 +861,7 @@
                   />
 <!--                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.houseCertificateNo" label="权属证书号（不动产）" placeholder="权属证书号（不动产）" input-align="right" label-width="auto" :rules="[{ required: true }]"/>-->
 <!--                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.landCertificateNo" label="权属证书号（宅基地）" placeholder="权属证书号（宅基地）" input-align="right" label-width="auto" :rules="[{ required: true }]"/>-->
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingArea" label="批准宅基地面积" placeholder="批准宅基地面积" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingArea" label-width="auto" label="批准宅基地面积" placeholder="批准宅基地面积" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
                   <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingHouseArea" label="实用宅基地面积面积" placeholder="实用宅基地面积面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
                   <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.fangjiArea" label="批准房基占地面积" placeholder="批准房基占地面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
                   <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.actualFangjiArea" label="实际房基占地面积" placeholder="实际房基占地面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
@@ -934,97 +934,84 @@
               </div>
             </template>
 
-            <template v-if="formVisible.acceptingForm.townFormVisible">
-              <div class="main_box examine_box">
-                <van-row type="flex" justify="space-between" align="center">
-                  <van-col span="5">竣工<br/>平面<br/>简图<br/>
-                    (标注<br/>长宽<br/>及四至)</van-col>
-                  <van-col span="19">
-                    <house-location-plan-comp ref="pictureUploadAccepting" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgAccepting.fileList" :proposer-id="uploadImgAccepting.proposerId" tableName="t_house_apply_end"
-                                              @uploadFileChanged="(x) => {this.uploadImgAccepting.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAccepting.removeFileList = x;}"
-                    />
-                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.tHouseApplyEnd.cartographer"  placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/>
-                  </van-col>
-                </van-row>
-              </div>
-
-<!--              <div class="main_box examine_box">-->
-<!--                <van-row type="flex" justify="space-between" align="center">-->
-<!--                  <van-col span="5">住房<br/>竣工<br/>验收<br/>内容</van-col>-->
-<!--                  <van-col span="19">-->
-<!--                    <field-checkbox-->
-<!--                      v-model="applicationDetail.tHouseApplyEnd.isProjectFinished"-->
-<!--                      label="1.是否已完成工程设计和合同约定的各项内容"-->
-<!--                      true-label="Y"-->
-<!--                      false-label="N"-->
-<!--                      :rules="[{ required: true }]"-->
-<!--                      :readonly="!formEnabled.acceptingForm.townFormEnabled"-->
-<!--                      label-width="5.6rem"-->
-<!--                    />-->
-<!--                    <field-checkbox-->
-<!--                      v-model="applicationDetail.tHouseApplyEnd.isQualifiedQuality"-->
-<!--                      label="2.承揽人对完工住房质量自查是否合格"-->
-<!--                      true-label="Y"-->
-<!--                      false-label="N"-->
-<!--                      :rules="[{ required: true }]"-->
-<!--                      :readonly="!formEnabled.acceptingForm.townFormEnabled"-->
-<!--                      label-width="5.6rem"-->
-<!--                    />-->
-<!--                    <field-checkbox-->
-<!--                      v-model="applicationDetail.tHouseApplyEnd.hasBuildingRecord"-->
-<!--                      label="3.是否有施工记录资料"-->
-<!--                      true-label="Y"-->
-<!--                      false-label="N"-->
-<!--                      :rules="[{ required: true }]"-->
-<!--                      :readonly="!formEnabled.acceptingForm.townFormEnabled"-->
-<!--                      label-width="5.6rem"-->
-<!--                    />-->
-<!--                    <field-checkbox-->
-<!--                      v-model="applicationDetail.tHouseApplyEnd.isSignWarranty"-->
-<!--                      label="4.建房村民和承揽人是否已经共同签署农村住房质量保修书"-->
-<!--                      true-label="Y"-->
-<!--                      false-label="N"-->
-<!--                      :rules="[{ required: true }]"-->
-<!--                      :readonly="!formEnabled.acceptingForm.townFormEnabled"-->
-<!--                      label-width="5.6rem"-->
-<!--                    />-->
-<!--                    <field-checkbox-->
-<!--                      v-model="applicationDetail.tHouseApplyEnd.isHandleProblem"-->
-<!--                      label="5.住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕"-->
-<!--                      true-label="Y"-->
-<!--                      false-label="N"-->
-<!--                      :rules="[{ required: true }]"-->
-<!--                      :readonly="!formEnabled.acceptingForm.townFormEnabled"-->
-<!--                      label-width="5.6rem"-->
-<!--                    />-->
-<!--                    <field-checkbox-->
-<!--                      v-model="applicationDetail.tHouseApplyEnd.isDesignPaperSame"-->
-<!--                      label="6.建筑风貌是否与设计图基本一致"-->
-<!--                      true-label="Y"-->
-<!--                      false-label="N"-->
-<!--                      :rules="[{ required: true }]"-->
-<!--                      :readonly="!formEnabled.acceptingForm.townFormEnabled"-->
-<!--                      label-width="5.6rem"-->
-<!--                    />-->
-<!--                    <field-checkbox-->
-<!--                      v-model="applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished"-->
-<!--                      label="7.法律、法规规定的其他验收条件完成情况"-->
-<!--                      true-label="Y"-->
-<!--                      false-label="N"-->
-<!--                      :rules="[{ required: true }]"-->
-<!--                      :readonly="!formEnabled.acceptingForm.townFormEnabled"-->
-<!--                      label-width="5.6rem"-->
-<!--                    />-->
-<!--                  </van-col>-->
-<!--                </van-row>-->
-<!--              </div>-->
-
+<!--              <div class="main_box examine_box">
+                              <van-row type="flex" justify="space-between" align="center">
+                                <van-col span="5">住房<br/>竣工<br/>验收<br/>内容</van-col>
+                                <van-col span="19">
+                                  <field-checkbox
+                                    v-model="applicationDetail.tHouseApplyEnd.isProjectFinished"
+                                    label="1.是否已完成工程设计和合同约定的各项内容"
+                                    true-label="Y"
+                                    false-label="N"
+                                    :rules="[{ required: true }]"
+                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                                    label-width="5.6rem"
+                                  />
+                                  <field-checkbox
+                                    v-model="applicationDetail.tHouseApplyEnd.isQualifiedQuality"
+                                    label="2.承揽人对完工住房质量自查是否合格"
+                                    true-label="Y"
+                                    false-label="N"
+                                    :rules="[{ required: true }]"
+                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                                    label-width="5.6rem"
+                                  />
+                                  <field-checkbox
+                                    v-model="applicationDetail.tHouseApplyEnd.hasBuildingRecord"
+                                    label="3.是否有施工记录资料"
+                                    true-label="Y"
+                                    false-label="N"
+                                    :rules="[{ required: true }]"
+                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                                    label-width="5.6rem"
+                                  />
+                                  <field-checkbox
+                                    v-model="applicationDetail.tHouseApplyEnd.isSignWarranty"
+                                    label="4.建房村民和承揽人是否已经共同签署农村住房质量保修书"
+                                    true-label="Y"
+                                    false-label="N"
+                                    :rules="[{ required: true }]"
+                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                                    label-width="5.6rem"
+                                  />
+                                  <field-checkbox
+                                    v-model="applicationDetail.tHouseApplyEnd.isHandleProblem"
+                                    label="5.住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕"
+                                    true-label="Y"
+                                    false-label="N"
+                                    :rules="[{ required: true }]"
+                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                                    label-width="5.6rem"
+                                  />
+                                  <field-checkbox
+                                    v-model="applicationDetail.tHouseApplyEnd.isDesignPaperSame"
+                                    label="6.建筑风貌是否与设计图基本一致"
+                                    true-label="Y"
+                                    false-label="N"
+                                    :rules="[{ required: true }]"
+                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                                    label-width="5.6rem"
+                                  />
+                                  <field-checkbox
+                                    v-model="applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished"
+                                    label="7.法律、法规规定的其他验收条件完成情况"
+                                    true-label="Y"
+                                    false-label="N"
+                                    :rules="[{ required: true }]"
+                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                                    label-width="5.6rem"
+                                  />
+                                </van-col>
+                              </van-row>
+                            </div>-->
+
+            <template v-if="formVisible.acceptingForm.agricultureFormVisible">
               <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.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.nongyeOption" :autosize="true" type="textarea" placeholder="乡镇农业农村部门意见" :rules="[{ required: true }]"/>
-                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.nongyeName" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
+                    <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"/>
                     <field-date-picker
                       v-model="applicationDetail.tHouseApplyEnd.nongyeTime"
                       label="审批日期"
@@ -1032,18 +1019,20 @@
                       :rules="[{ required: true }]"
                       formatter="yyyy-MM-dd"
                       required
-                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled"
                     />
                   </van-col>
                 </van-row>
               </div>
+            </template>
 
+            <template v-if="formVisible.acceptingForm.nature_resourceFormVisible">
               <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.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.natureOption" :autosize="true" type="textarea" placeholder="乡镇自然资源部门意见" :rules="[{ required: true }]"/>
-                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.natureName" label="负责人:" placeholder="负责人" input-align="right" label-width="auto"/>
+                    <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"/>
                     <field-date-picker
                       v-model="applicationDetail.tHouseApplyEnd.natureTime"
                       label="审批日期"
@@ -1051,11 +1040,12 @@
                       :rules="[{ required: true }]"
                       formatter="yyyy-MM-dd"
                       required
-                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled"
                     />
                   </van-col>
                 </van-row>
               </div>
+            </template>
 
 <!--              <div class="main_box examine_box">-->
 <!--                <van-row type="flex" justify="space-between" align="center">-->
@@ -1066,6 +1056,21 @@
 <!--                </van-row>-->
 <!--              </div>-->
 
+
+            <template v-if="formVisible.acceptingForm.townFormVisible">
+              <div class="main_box examine_box">
+                <van-row type="flex" justify="space-between" align="center">
+                  <van-col span="5">竣工<br/>平面<br/>简图<br/>
+                    (标注<br/>长宽<br/>及四至)</van-col>
+                  <van-col span="19">
+                    <house-location-plan-comp ref="pictureUploadAccepting" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgAccepting.fileList" :proposer-id="uploadImgAccepting.proposerId" tableName="t_house_apply_end"
+                                              @uploadFileChanged="(x) => {this.uploadImgAccepting.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAccepting.removeFileList = x;}"
+                    />
+                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.tHouseApplyEnd.cartographer"  placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/>
+                  </van-col>
+                </van-row>
+              </div>
+
               <div class="main_box examine_box">
                 <van-row type="flex" justify="space-between" align="center">
                   <van-col span="5">乡镇<br/>政府<br/>验收<br/>意见</van-col>
@@ -1284,6 +1289,9 @@ export default {
           groupFormVisible: false,
           villageFormVisible: false,
           townFormVisible: false,
+          agricultureFormVisible: false,
+          buildingFormVisible: false,
+          nature_resourceFormVisible: false,
           homesteadForm: {
             keepVisible: false, // 是否显示宅基地保留输入
             otherVisible: false, // 是否显示宅基地其他输入
@@ -1297,6 +1305,8 @@ export default {
         acceptingForm: {
           baseFormVisible: false,
           townFormVisible: false,
+          agricultureFormVisible: false,
+          nature_resourceFormVisible: false,
         },
         auditVisible: false,
       },
@@ -1310,6 +1320,9 @@ export default {
           groupFormEnabled: false,
           villageFormEnabled: false,
           townFormEnabled: false,
+          agricultureFormEnabled: false,
+          buildingFormEnabled: false,
+          nature_resourceFormEnabled: false,
         },
         landscopeEnabled: false,
         landscopeForm: {
@@ -1319,6 +1332,8 @@ export default {
         acceptingForm: {
           baseFormEnabled: false,
           townFormEnabled: false,
+          agricultureFormEnabled: false,
+          nature_resourceFormEnabled: false,
         },
       },
       // 申请附件树
@@ -1519,11 +1534,13 @@ export default {
     init(value) {
       const role = this.$store.getters.roles;
       this.currentUserRole = role[0];
+      console.log("当前用户角色: " + role);
       // 局部变量
       let houseApplyStatus = value ? value.tHouseApplyProposer.houseApplyStatus : -1;
       let proposerId = value ? value.tHouseApplyProposer.id : null;
       let hasGroupLevel = false; //value.tHouseApplyProposer.hasOwnProperty('hasGroupLevel') ? value.tHouseApplyProposer.hasGroupLevel : this.isGroupLevel;
 
+      console.log("当前申请状态: " + houseApplyStatus);
       // 默认状态
       this.formVisible.baseApplyForm.homesteadFormVisible = value ? value.tHouseApplyProposer.existHomestead ==='Y' : false;
 
@@ -1532,6 +1549,9 @@ export default {
       this.formVisible.baseApplyForm.groupFormVisible = false;
       this.formVisible.baseApplyForm.villageFormVisible = false;
       this.formVisible.baseApplyForm.townFormVisible = false;
+      this.formVisible.baseApplyForm.agricultureFormVisible = false;
+      this.formVisible.baseApplyForm.buildingFormVisible = false;
+      this.formVisible.baseApplyForm.nature_resourceFormVisible = false;
 
       this.formVisible.landscopeVisible = false;
       this.formVisible.landscopeForm.baseFormVisible = false;
@@ -1539,6 +1559,8 @@ export default {
       this.formVisible.acceptingVisible = false;
       this.formVisible.acceptingForm.baseFormVisible = false;
       this.formVisible.acceptingForm.townFormVisible = false
+      this.formVisible.acceptingForm.agricultureFormVisible = false;
+      this.formVisible.acceptingForm.nature_resourceFormVisible = false;
 
       this.formVisible.auditVisible = false;
 
@@ -1549,6 +1571,9 @@ export default {
       this.formEnabled.baseApplyForm.groupFormEnabled = false;
       this.formEnabled.baseApplyForm.villageFormEnabled = false;
       this.formEnabled.baseApplyForm.townFormEnabled = false;
+      this.formEnabled.baseApplyForm.agricultureFormEnabled = false;
+      this.formEnabled.baseApplyForm.buildingFormEnabled = false;
+      this.formEnabled.baseApplyForm.nature_resourceFormEnabled = false;
 
       this.formEnabled.landscopeEnabled = false;
       this.formEnabled.landscopeForm.baseFormEnabled = false;
@@ -1556,20 +1581,27 @@ export default {
       this.formEnabled.acceptingEnabled = false;
       this.formEnabled.acceptingForm.baseFormEnabled = false;
       this.formEnabled.acceptingForm.townFormEnabled = false;
+      this.formEnabled.acceptingForm.agricultureFormEnabled = false;
+      this.formEnabled.acceptingForm.nature_resourceFormEnabled = false;
 
       switch (this.proposerStatus) {
         // 查看
         case PROPOSER_VIEW:
           this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(houseApplyStatus, ["1", '32']);
           this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31"]);
-          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '8']);
+          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8']);
+          this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
 
           this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
           this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
 
           this.formVisible.acceptingVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
           this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
-          this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(houseApplyStatus, [/*"29", */"26"]);
+          this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, 'town_leader') ? '29' : -99, "26"]);
+          this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '29' : -99, "26"]);
+          this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '29' : -99, "26"]);
 
           this.formEnabled.submitEnabled = this.isProposeStatus(houseApplyStatus, ["1"]);
           this.formVisible.editVisible = this.formEnabled.submitEnabled;
@@ -1791,6 +1823,7 @@ export default {
               });
             }
           }
+
           // 验收
           else if(this.isProposeStatus(houseApplyStatus, ["20"]))
           {
@@ -1806,45 +1839,128 @@ export default {
           // 验收镇级审批
           else if(this.isProposeStatus(houseApplyStatus, ["29"]))
           {
-            if(!this.applicationDetail.tHouseApplyEnd.cartographer) this.applicationDetail.tHouseApplyEnd.cartographer = handlerName;
-            if(!this.applicationDetail.tHouseApplyEnd.zhenName) this.applicationDetail.tHouseApplyEnd.zhenName = handlerName;
-            if(!this.applicationDetail.tHouseApplyEnd.zhenTime) this.applicationDetail.tHouseApplyEnd.zhenTime = handlerTime;
-            if(!this.applicationDetail.tHouseApplyEnd.nongyeName) this.applicationDetail.tHouseApplyEnd.nongyeName = handlerName;
-            if(!this.applicationDetail.tHouseApplyEnd.nongyeTime) this.applicationDetail.tHouseApplyEnd.nongyeTime = handlerTime;
-            if(!this.applicationDetail.tHouseApplyEnd.natureName) this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
-            if(!this.applicationDetail.tHouseApplyEnd.natureTime) this.applicationDetail.tHouseApplyEnd.natureTime = handlerTime;
-            if(!this.applicationDetail.tHouseApplyEnd.buildingName) this.applicationDetail.tHouseApplyEnd.buildingName = handlerName;
-            if(!this.applicationDetail.tHouseApplyEnd.buildingTime) this.applicationDetail.tHouseApplyEnd.buildingTime = handlerTime;
-            if(!this.applicationDetail.tHouseApplyEnd.isProjectFinished) this.applicationDetail.tHouseApplyEnd.isProjectFinished = 'Y';
-            if(!this.applicationDetail.tHouseApplyEnd.isQualifiedQuality) this.applicationDetail.tHouseApplyEnd.isQualifiedQuality = 'Y';
-            if(!this.applicationDetail.tHouseApplyEnd.hasBuildingRecord) this.applicationDetail.tHouseApplyEnd.hasBuildingRecord = 'Y';
-            if(!this.applicationDetail.tHouseApplyEnd.isSignWarranty) this.applicationDetail.tHouseApplyEnd.isSignWarranty = 'Y';
-            if(!this.applicationDetail.tHouseApplyEnd.isHandleProblem) this.applicationDetail.tHouseApplyEnd.isHandleProblem = 'Y';
-            if(!this.applicationDetail.tHouseApplyEnd.isDesignPaperSame) this.applicationDetail.tHouseApplyEnd.isDesignPaperSame = 'Y';
-            if(!this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished) this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished = 'Y';
+            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.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.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.natureTime) this.applicationDetail.tHouseApplyEnd.natureTime = handlerTime;
+            }
+
+            if(0)
+            {
+              if(!this.applicationDetail.tHouseApplyEnd.buildingName) this.applicationDetail.tHouseApplyEnd.buildingName = handlerName;
+              if(!this.applicationDetail.tHouseApplyEnd.buildingTime) this.applicationDetail.tHouseApplyEnd.buildingTime = handlerTime;
+            }
+
+            if(0) {
+              if (!this.applicationDetail.tHouseApplyEnd.isProjectFinished) this.applicationDetail.tHouseApplyEnd.isProjectFinished = 'Y';
+              if (!this.applicationDetail.tHouseApplyEnd.isQualifiedQuality) this.applicationDetail.tHouseApplyEnd.isQualifiedQuality = 'Y';
+              if (!this.applicationDetail.tHouseApplyEnd.hasBuildingRecord) this.applicationDetail.tHouseApplyEnd.hasBuildingRecord = 'Y';
+              if (!this.applicationDetail.tHouseApplyEnd.isSignWarranty) this.applicationDetail.tHouseApplyEnd.isSignWarranty = 'Y';
+              if (!this.applicationDetail.tHouseApplyEnd.isHandleProblem) this.applicationDetail.tHouseApplyEnd.isHandleProblem = 'Y';
+              if (!this.applicationDetail.tHouseApplyEnd.isDesignPaperSame) this.applicationDetail.tHouseApplyEnd.isDesignPaperSame = 'Y';
+              if (!this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished) this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished = 'Y';
+            }
           }
 
+          // 可见/隐藏
           this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(houseApplyStatus, ["1"]);
           this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3"]);
-          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5']);
+          if(this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5']))
+          {
+            if(this.isInRoles(role, ['town_leader', 'agriculture']) || houseApplyStatus != '8')
+            {
+              this.formVisible.baseApplyForm.agricultureFormVisible = true;
+            }
+            if(this.isInRoles(role, ['town_leader', 'building']) || houseApplyStatus != '8')
+            {
+              this.formVisible.baseApplyForm.buildingFormVisible = true;
+            }
+            if(this.isInRoles(role, ['town_leader', 'nature_resource']) || houseApplyStatus != '8')
+            {
+              this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
+            }
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              this.formVisible.baseApplyForm.townFormVisible = true;
+            }
+          }
 
           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.acceptingVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
           this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
-          this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(houseApplyStatus, ["29", "26"]);
+          if(this.isProposeStatus(houseApplyStatus, ["29", "26"]))
+          {
+            if(this.isInRoles(role, ['town_leader', 'agriculture']) || houseApplyStatus != '29')
+            {
+              this.formVisible.acceptingForm.agricultureFormVisible = true;
+            }
+            if(this.isInRoles(role, ['town_leader', 'nature_resource']) || houseApplyStatus != '29')
+            {
+              this.formVisible.acceptingForm.nature_resourceFormVisible = true;
+            }
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              this.formVisible.acceptingForm.townFormVisible = true;
+            }
+          }
 
+          // 禁用/启用
           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');
-          this.formEnabled.baseApplyForm.townFormEnabled = this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader');
-          //console.log(this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader')+'11111111');
+          if(this.isProposeStatus(houseApplyStatus, ['8']))
+          {
+            if(this.isInRoles(role, ['town_leader', 'agriculture']))
+            {
+              this.formEnabled.baseApplyForm.agricultureFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['town_leader', 'building']))
+            {
+              this.formEnabled.baseApplyForm.buildingFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['town_leader', 'nature_resource']))
+            {
+              this.formEnabled.baseApplyForm.nature_resourceFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              this.formEnabled.baseApplyForm.townFormEnabled = true;
+            }
+          }
           this.formEnabled.landscopeEnabled = this.isProposeStatus(houseApplyStatus, ['10', '12']);
           this.formEnabled.landscopeForm.baseFormEnabled = this.isProposeStatus(houseApplyStatus, ['10', '12']);
 
           this.formEnabled.acceptingEnabled = this.isProposeStatus(houseApplyStatus, ['20']);
           this.formEnabled.acceptingForm.baseFormEnabled = this.isProposeStatus(houseApplyStatus, ['20']);
-          this.formEnabled.acceptingForm.townFormEnabled = this.isProposeStatus(houseApplyStatus, ["29"]) && this.isInRoles(role, 'town_leader');
+          if(this.isProposeStatus(houseApplyStatus, ['29']))
+          {
+            if(this.isInRoles(role, ['town_leader', 'agriculture']))
+            {
+              this.formEnabled.acceptingForm.agricultureFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['town_leader', 'nature_resource']))
+            {
+              this.formEnabled.acceptingForm.nature_resourceFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              this.formEnabled.acceptingForm.townFormEnabled = true;
+            }
+          }
 
           this.applicationDetail.tHouseApplyProposer = value.tHouseApplyProposer;
           this.applicationDetail.tHouseApplyCurrentSituation = value.tHouseApplyCurrentSituation;
@@ -2090,7 +2206,8 @@ export default {
     },
     //返回上一步操作
     goBack(){
-      this.$router.push({name: this.$router.back(-1)});
+      this.$router.back(-1)
+      //this.$router.push({name: this.$router.back(-1)});
     },
     // 当地图绘制完成时
     onMapDrawFinished(data) {
@@ -2301,10 +2418,17 @@ export default {
       });
     },
     // 判断角色是否符合
-    isInRoles(myRoles, requireRole) {
+    isInRoles(myRoles, requireRoles) {
       if(!Array.isArray(myRoles))
         myRoles = myRoles.split(',');
-      return myRoles.indexOf(requireRole) !== -1;
+      if(!Array.isArray(requireRoles))
+        requireRoles = requireRoles.split(',');
+      for(let r of requireRoles)
+      {
+        if(myRoles.indexOf(r) !== -1)
+          return true;
+      }
+      return false;
     },
     // 转换地图数据用于提交后台
     convertGeom(json) {
@@ -2322,6 +2446,36 @@ export default {
           //console.log(role);
           let msg = "";
           switch (role) {
+            case "agriculture":
+              msg = this.validateAgricultureForm(pass);
+              if (msg) {
+                break;
+              }
+              this.$set(this.applicationDetail, 'tHouseApproveTownOptions', null);
+              this.$set(this.applicationDetail, 'tHouseApproveNatureOptions', null);
+              this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
+              comment = this.applicationDetail.tHouseApproveAgricultureOptions.approveOption;
+              break;
+            case "building":
+              msg = this.validateBuildingForm(pass);
+              if (msg) {
+                break;
+              }
+              this.$set(this.applicationDetail, 'tHouseApproveTownOptions', null);
+              this.$set(this.applicationDetail, 'tHouseApproveNatureOptions', null);
+              this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
+              comment = this.applicationDetail.tHouseApproveOtherOptions.approveOption;
+              break;
+            case "nature_resource":
+              msg = this.validateNatureForm(pass);
+              if (msg) {
+                break;
+              }
+              this.$set(this.applicationDetail, 'tHouseApproveTownOptions', null);
+              this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
+              this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
+              comment = this.applicationDetail.tHouseApproveNatureOptions.approveOption;
+              break;
             case "town_leader":
               msg = this.validateAgricultureForm(pass);
               if (msg) {
@@ -2387,6 +2541,20 @@ export default {
           let msg = "";
           const role = this.$store.getters.roles[0];
           switch (role) {
+            case "agriculture":
+              msg = this.validateAcceptingFormTown(undefined, role);
+              if (msg) {
+                break;
+              }
+              comment = this.applicationDetail.tHouseApplyEnd.nongyeOption;
+              break;
+            case "nature_resource":
+              msg = this.validateAcceptingFormTown(undefined, role);
+              if (msg) {
+                break;
+              }
+              comment = this.applicationDetail.tHouseApplyEnd.natureOption;
+              break;
             case "town_leader":
               msg = this.validateAcceptingFormTown();
               comment = this.applicationDetail.tHouseApplyEnd.zhenOption;
@@ -2962,69 +3130,84 @@ export default {
 
       return false;
     },
-    validateAcceptingFormTown(pass) {
+    validateAcceptingFormTown(pass, role) {
       if(!this.applicationDetail.tHouseApplyEnd) return '请填写验收数据';
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.cartographer)) {
-        return "竣工平面简图经办人不能为空";
-      }
 
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isProjectFinished)) {
-        return "是否已完成工程设计和合同约定的各项内容不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isQualifiedQuality)) {
-        return "承揽人对完工住房质量自查是否合格不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.hasBuildingRecord)) {
-        return "是否有施工记录资料不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isSignWarranty)) {
-        return "建房村民和承揽人是否已经共同签署农村住房质量保修书不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isHandleProblem)) {
-        return "住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isDesignPaperSame)) {
-        return "建筑风貌是否与设计图基本一致不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished)) {
-        return "法律、法规规定的其他验收条件完成情况不能为空";
+      if(0)
+      {
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.isProjectFinished)) {
+          return "是否已完成工程设计和合同约定的各项内容不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.isQualifiedQuality)) {
+          return "承揽人对完工住房质量自查是否合格不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.hasBuildingRecord)) {
+          return "是否有施工记录资料不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.isSignWarranty)) {
+          return "建房村民和承揽人是否已经共同签署农村住房质量保修书不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.isHandleProblem)) {
+          return "住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.isDesignPaperSame)) {
+          return "建筑风貌是否与设计图基本一致不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished)) {
+          return "法律、法规规定的其他验收条件完成情况不能为空";
+        }
       }
 
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeOption)) {
-        return "乡镇农业农村部门意见不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeName)) {
-        return "乡镇农业农村部门经办人不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeTime)) {
-        return "乡镇农业农村部门经办时间不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureOption)) {
-        return "乡镇自然资源部门意见不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureName)) {
-        return "乡镇自然资源部门经办人不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureTime)) {
-        return "乡镇自然资源部门经办时间不能为空";
+      if(!role || role === 'agriculture')
+      {
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeOption)) {
+          return "乡镇农业农村部门意见不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeName)) {
+          return "乡镇农业农村部门经办人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeTime)) {
+          return "乡镇农业农村部门经办时间不能为空";
+        }
       }
-      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingOption)) {
-      //   return "乡镇住建部门意见不能为空";
-      // }
-      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingName)) {
-      //   return "乡镇住建部门验收负责人不能为空";
-      // }
-      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingTime)) {
-      //   return "乡镇住建部门验收时间不能为空";
-      // }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenOption)) {
-        return "乡镇政府验收意见不能为空";
+      if(!role || role === 'nature_resource')
+      {
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureOption)) {
+          return "乡镇自然资源部门意见不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureName)) {
+          return "乡镇自然资源部门经办人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.natureTime)) {
+          return "乡镇自然资源部门经办时间不能为空";
+        }
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenName)) {
-        return "乡镇政府验收负责人不能为空";
+      if(0)
+      {
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingOption)) {
+          return "乡镇住建部门意见不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingName)) {
+          return "乡镇住建部门验收负责人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingTime)) {
+          return "乡镇住建部门验收时间不能为空";
+        }
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenTime)) {
-        return "乡镇政府验收时间不能为空";
+      if(!role)
+      {
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.cartographer)) {
+          return "竣工平面简图经办人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenOption)) {
+          return "乡镇政府验收意见不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenName)) {
+          return "乡镇政府验收负责人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenTime)) {
+          return "乡镇政府验收时间不能为空";
+        }
       }
 
       // 通过时检查打勾, 农业部门