From fa0e4d5f3e5fd804586c968887382f2c04e76634 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 10 Aug 2023 16:58:08 +0800
Subject: [PATCH 01/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/cbfjtcy.js                 |  46 +++
 .../village/contractor/contractor.vue         |   2 +-
 .../village/contractor/contractorFamily.vue   | 103 +++---
 .../contractor/contractorFamilyDetail.vue     | 329 +++++++++++-------
 4 files changed, 310 insertions(+), 170 deletions(-)
 create mode 100644 src/api/contracted/cbfjtcy.js

diff --git a/src/api/contracted/cbfjtcy.js b/src/api/contracted/cbfjtcy.js
new file mode 100644
index 00000000..d3cd5919
--- /dev/null
+++ b/src/api/contracted/cbfjtcy.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request';
+
+// 查询承包方家庭成员列表
+export function listJtcy(params) {
+  return request({
+    url: '/service/jtcy/list',
+    method: 'get',
+    params: params
+  });
+}
+
+// 查询承包方家庭成员详细
+export function getJtcy(id) {
+  return request({
+    url: '/service/jtcy/get/' + id,
+    method: 'get'
+  });
+}
+
+// 新增承包方家庭成员信息
+export function addJtcy(data) {
+  return request({
+    url: '/service/jtcy/add',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改承包方家庭成员信息
+export function updateJtcy(data) {
+  return request({
+    url: '/service/jtcy/edit',
+    method: 'post',
+    data: data
+  });
+}
+
+// 删除承包方家庭成员信息
+export function deleteJtcy(id) {
+  return request({
+    url: '/service/jtcy/remove/' + id,
+    method: 'get'
+  });
+}
+
+
diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue
index ff8fe70b..53419da0 100644
--- a/src/views/contracted/village/contractor/contractor.vue
+++ b/src/views/contracted/village/contractor/contractor.vue
@@ -161,7 +161,7 @@
       },
       deleteContractor(id, index) {
         this.$dialog.confirm({
-          message: '是否确认删除此承包方信息？',
+          message: '是否确认删除此条承包方信息？',
         }).then(() => {
             // on confirm
             deleteCbf(id).then(res => {
diff --git a/src/views/contracted/village/contractor/contractorFamily.vue b/src/views/contracted/village/contractor/contractorFamily.vue
index c4b9eb4f..060026d4 100644
--- a/src/views/contracted/village/contractor/contractorFamily.vue
+++ b/src/views/contracted/village/contractor/contractorFamily.vue
@@ -11,44 +11,39 @@
     <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
 
     <div class="tap_block">
-      <p @click="$router.push({path:'/contracted/village/contractorDetail'})">承包方</p>
+      <p @click="skip('contractedVillageContractorDetail')">承包方</p>
       <p class="active">家庭成员</p>
-      <p @click="$router.push({path:'/contracted/village/contractorWord'})">承包合同</p>
-      <p @click="$router.push({path:'/contracted/village/contractorLand'})">承包地</p>
+      <p @click="skip('contractedVillageContractorWord')">承包合同</p>
+      <p @click="skip('contractedVillageContractorLand')">承包地</p>
     </div>
 
     <div class="list_main">
 
-      <van-swipe-cell v-for="(item,index) in 10">
-
-        <div class="item" @click="goDetail">
-
+      <van-swipe-cell v-for="(item, index) in familyList" :key="item.id">
+        <div class="item" @click="goDetail(item.id)">
           <div class="item_left">
             <div class="item_left_tt">
               <p class="name">
                 <img src="../../../../../static/images/contracted/family_icon_01.png" alt="">
-                张三
+                {{ item.cyxm }}
               </p>
-              <p>户主</p>
+              <p>{{ item.yhzgx }}</p>
               <p class="sex">
-                男
-                <img src="../../../../../static/images/contracted/family_icon_man.png" alt="">
+                {{ item. cyxb }}
+                <img v-if="item.cyxb === '男'" src="../../../../../static/images/contracted/family_icon_man.png" alt="">
+                <img v-else-if="item.cyxb === '女'" src="../../../../../static/images/contracted/family_icon_wman.png" alt="">
               </p>
             </div>
             <p class="id_card">
               <img src="../../../../../static/images/contracted/family_icon_02.png" alt="">
-              230381199705551762
+              {{ item.cyzjhm }}
             </p>
           </div>
-          <p class="item_right">是</p>
-
+          <p class="item_right">{{ item.sfgyr }}</p>
         </div>
         <template #right>
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
-            <div class="opera_btn delete">
-              <p>删除</p>
-            </div>
             <div class="opera_btn edit">
               <p>分户</p>
             </div>
@@ -58,11 +53,14 @@
             <div class="opera_btn list">
               <p>设为<br/>户主</p>
             </div>
+            <div class="opera_btn delete" @click="deleteFamilyMember(item.id, index)">
+              <p>删除</p>
+            </div>
           </div>
         </template>
       </van-swipe-cell>
-
-      <p class="btn" @click="goDetail">新增</p>
+      <!-- getDetail不加(), 第一个参数默认传递的是event，getDetail加(), 需要手动传递$event -->
+      <p class="btn" @click="goDetail()">新增</p>
     </div>
 
 
@@ -71,6 +69,7 @@
 <script>
   import Cookies from "js-cookie";
   import contractorHeader from "./contractorHeader";
+  import { listJtcy, deleteJtcy } from "@/api/contracted/cbfjtcy";
 
   export default {
     name: "contractedVillageContractor",
@@ -79,41 +78,57 @@
     },
     data() {
       return {
-        loading:false,
-        finished:true,
-        value:'',
-        showType:false,
-        showZjType:false,
-        typeOptions:[{
-          dictLabel:'类型1',
-          dictValue:'1',
-        }],
-        zjTypeOptions:[{
-          dictLabel:'类型2',
-          dictValue:'1',
-        }],
+        // 家庭成员列表
+        familyList: [],
       };
     },
     created() {
-      console.log(this.$route.params);
+      this.getList();
     },
     methods: {
       getList(){
-
+        listJtcy({cbfbm: this.$route.params.cbfbm, translate_dict: 1}).then(response => {
+          this.familyList = response.rows;
+        });
       },
-      onSearch(){
-
-      },
-      onConfirmTypeOptions(){
-
+      skip(name) {
+        this.$router.push({
+          name: name,
+          params: {
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
       },
-      onConfirmZjTypeOptions(){
-
+      goDetail(id) {
+        this.$router.push({
+          name: 'contractedVillageContractorFamilyDetail',
+          params: {
+            id: id,
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
       },
-      goDetail(){
-        this.$router.push({path:'/contracted/village/contractorFamilyDetail'});
+      deleteFamilyMember(id, index) {
+        this.$dialog.confirm({
+          message: '是否确认删除此条家庭成员信息？',
+        }).then(() => {
+          // on confirm
+          deleteJtcy(id).then(res => {
+            if(res.code == 200){
+              this.$toast.success('删除成功');
+              this.familyList.splice(index, 1);
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
       }
-
     },
   };
 </script>
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index 9c47da27..9345bec3 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -1,117 +1,109 @@
 <template>
   <div class="app-container">
 
-    <van-nav-bar left-arrow fixed placeholder @click-left="onClickLeft" >
+    <van-nav-bar left-arrow fixed placeholder @click-left="goBack" >
       <template #title>
         <div class="tb_main">
 <!--          B村<p><span class="tb">签字完成</span><span class="tb">异常挂起</span></p>-->
-          1111111
+          {{ titleName }}
         </div>
       </template>
     </van-nav-bar>
 
-    <div class="tap_block">
+    <!-- <div class="tap_block">
       <p @click="$router.push({path:'/contracted/village/contractorDetail'})">承包方</p>
       <p class="active">家庭成员</p>
       <p @click="$router.push({path:'/contracted/village/contractorWord'})">承包合同</p>
       <p @click="$router.push({path:'/contracted/village/contractorLand'})">承包地</p>
-    </div>
+    </div> -->
 
     <div class="list_main">
-      <van-field v-model="value" label="姓名：" placeholder="请输入姓名" required :border="false" input-align="right" />
-      <van-field v-model="value" label="性别：" required :border="false" input-align="right" >
-        <template #input>
-          <van-radio-group v-model="radio" direction="horizontal">
-            <van-radio name="1">男</van-radio>
-            <van-radio name="2">女</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-
-      <van-field
-        v-model="value"
-        label="与户主关系："
-        placeholder="请选择与户主关系"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showType = true"
-      />
-      <van-popup v-model="showType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="typeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmTypeOptions"
-          @cancel="showType = false"
+      <van-form ref="formData">
+        <van-field v-model="form.cyxm" label="姓名：" placeholder="请输入姓名" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field label="性别：" required :border="false" input-align="right" >
+          <template #input>
+            <van-radio-group v-model="form.cyxb" direction="horizontal">
+              <van-radio v-for="item in cyxbOptions" :key="item.dictValue" :name="item.dictValue">{{ item.dictLabel }}</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field
+          v-model="familyStatusText"
+          label="与户主关系："
+          placeholder="请选择与户主关系"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showFamilyStatus = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="是否共有人：" required :border="false" input-align="right" >
-        <template #input>
-          <van-radio-group v-model="radio" direction="horizontal">
-            <van-radio name="1">是</van-radio>
-            <van-radio name="2">否</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-
-      <van-field
-        v-model="value"
-        label="证件类型："
-        placeholder="请选择证件类型"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showZjType = true"
-      />
-      <van-popup v-model="showZjType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="zjTypeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmZjTypeOptions"
-          @cancel="showZjType = false"
+        <van-popup v-model="showFamilyStatus" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="familyStatusOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmFamilyStatusOptions"
+            @cancel="showFamilyStatus = false"
+          />
+        </van-popup>
+        <van-field label="是否共有人：" required :border="false" input-align="right" >
+          <template #input>
+            <van-radio-group v-model="form.sfgyr" direction="horizontal">
+              <van-radio v-for="item in sfgyrOptions" :key="item.dictValue" :name="item.dictValue">{{ item.dictLabel }}</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field
+          v-model="cyzjlxText"
+          label="证件类型："
+          placeholder="请选择证件类型"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showCredentialType = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="证件号码：" placeholder="请输入证件号码" required :border="false" input-align="right" />
-
-      <van-field
-        v-model="value"
-        label="成员备注："
-        placeholder="请选择成员备注"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showCYBZ = true"
-      />
-      <van-popup v-model="showCYBZ" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="CYBZOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmCYBZOptions"
-          @cancel="showCYBZ = false"
+        <van-popup v-model="showCredentialType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="cyzjlxOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmCredentialTypeOptions"
+            @cancel="showCredentialType = false"
+          />
+        </van-popup>
+        <van-field v-model="form.cyzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field
+          v-model="cybzText"
+          label="成员备注："
+          placeholder="请选择成员备注"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showMemberRemark = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="备注说明：" placeholder="请输入备注说明" required :border="false" input-align="right" />
-      <van-field v-model="value" label="持股份数：" placeholder="请输入持股份数" required :border="false" input-align="right" />
-      <van-field v-model="value" label="股权编号：" placeholder="请输入股权编号" required :border="false" input-align="right" />
-      <p class="btn">保存</p>
+        <van-popup v-model="showMemberRemark" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="cybzOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmMemberRemarkOptions"
+            @cancel="showMemberRemark = false"
+          />
+        </van-popup>
+        <van-field v-model="form.cybzsm" label="备注说明：" placeholder="请输入备注说明" :border="false" input-align="right" />
+        <van-field v-model="form.cycgfs" label="持股份数：" placeholder="请输入持股份数" :border="false" input-align="right" />
+        <van-field v-model="form.gqzbh" label="股权编号：" placeholder="请输入股权编号" :border="false" input-align="right" />
+      </van-form>
+      <p class="btn" @click="submitForm">保存</p>
     </div>
 
 
@@ -119,50 +111,137 @@
 </template>
 <script>
   import Cookies from "js-cookie";
+  import { getJtcy, addJtcy, updateJtcy } from "@/api/contracted/cbfjtcy";
+
   export default {
     name: "contractedVillageContractor",
     data() {
       return {
-        loading:false,
-        finished:true,
-        value:'',
-        showType:false,
-        showZjType:false,
-        typeOptions:[{
-          dictLabel:'类型1',
-          dictValue:'1',
-        }],
-        zjTypeOptions:[{
-          dictLabel:'类型2',
-          dictValue:'1',
-        }],
-        CYBZOptions:[{
-          dictLabel:'类型2',
-          dictValue:'1',
-        }],
-        radio:1
+        titleName: '',                  // 顶部标题名
+        form: {},                       // 承包方家庭成员表单信息
+        cyxbOptions: [],                // 成员性别字典
+        cyzjlxOptions: [],              // 成员证件类型字典
+        cyzjlxText: null,               // 成员证件类型标签名
+        showCredentialType: false,      // 控制证件类型字典弹出层的显示和隐藏
+        cybzOptions: [],                // 成员备注字典
+        cybzText: null,                 // 成员备注标签名
+        showMemberRemark: false,        // 控制成员备注字典弹出层的显示和隐藏
+        sfgyrOptions: [],               // 是否共有人字典
+        familyStatusOptions: [],        // 家庭身份字典
+        familyStatusText: null,         // 家庭身份标签名
+        showFamilyStatus: false,        // 控制家庭身份字典弹出层的显示和隐藏
       };
     },
     created() {
-
+      this.getDicts("sys_user_sex").then(response => {
+        this.cyxbOptions = response.data;
+      });
+      this.getDicts("cert_type").then(response => {
+        this.cyzjlxOptions = response.data;
+      });
+      this.getDicts("cybz").then(response => {
+        this.cybzOptions = response.data;
+      });
+      this.getDicts("is_common").then(response => {
+        this.sfgyrOptions = response.data;
+      });
+      this.getDicts("family_status").then(response => {
+        this.familyStatusOptions = response.data;
+      });
+      if (this.$route.params.id) {
+        this.titleName = "修改家庭成员信息";
+        this.getDetail();
+      } else {
+        this.titleName = "新增家庭成员信息";
+        this.resetForm();
+      }
     },
     methods: {
-      getList(){
-
+      getDetail(){
+        getJtcy(this.$route.params.id).then(response => {
+          this.form = response.data;
+          this.familyStatusText = this.selectDictLabel(this.familyStatusOptions, response.data.yhzgx);
+          this.cyzjlxText = this.selectDictLabel(this.cyzjlxOptions, response.data.cyzjlx);
+          this.cybzText = this.selectDictLabel(this.cybzOptions, response.data.cybz);
+        });
       },
-      onSearch(){
-
+      onConfirmFamilyStatusOptions(value){
+        this.form.yhzgx = value.dictValue;
+        this.familyStatusText = value.dictLabel;
+        this.showFamilyStatus = false;
       },
-      onConfirmTypeOptions(){
-
+      onConfirmCredentialTypeOptions(value){
+        this.form.cyzjlx = value.dictValue;
+        this.cyzjlxText = value.dictLabel;
+        this.showCredentialType = false;
       },
-      onConfirmZjTypeOptions(){
-
+      onConfirmMemberRemarkOptions(value){
+        this.form.cybz = value.dictValue;
+        this.cybzText = value.dictLabel;
+        this.showMemberRemark = false;
       },
-      onConfirmCYBZOptions(){
-
+      goBack() {
+        this.$router.push({
+          name: 'contractedVillageContractorFamily',
+          params: {
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
       },
-
+      submitForm() {
+        this.$refs.formData.validate().then(() => {
+          if (this.$route.params.id) {
+            updateJtcy(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.goBack();
+                  }
+                });
+              }
+            });
+          } else {
+            this.form.deptId = this.$route.params.deptId;
+            this.form.cbfbm = this.$route.params.cbfbm;
+            addJtcy(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.goBack();
+                  }
+                });
+              }
+            });
+          }
+        }).catch(() => {
+          this.$notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
+      },
+      resetForm() {
+        this.form = {
+          deptId: null,
+          cbfbm: null,
+          cyxm: null,
+          cyxb: '1',
+          yhzgx: null,
+          sfgyr: '1',
+          cyzjlx: null,
+          cyzjhm: null,
+          cybz: null,
+          cybzsm: null,
+          cycgfs: null,
+          gqzbh: null
+        };
+      }
     },
   };
 </script>

From cef8e204fe0de34c8f965e2af19c8dc7d8168a05 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Fri, 11 Aug 2023 14:30:13 +0800
Subject: [PATCH 02/28] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |   27 +
 src/views/homesteadSurvey/add.vue             |    6 +
 src/views/homesteadSurvey/fsssAdd.vue         |    4 +
 src/views/homesteadSurvey/zrzAdd.vue          |    5 +
 .../sunVillage_info/paidExit/paidExitList.vue |    8 +-
 .../homestead/circulation/circulationAdd.vue  |   46 +-
 .../circulation/circulationDetail.vue         |   46 +-
 .../homestead/circulation/circulationList.vue |   52 +-
 .../circulation/circulationModify.vue         |   46 +-
 .../homestead/freeExit/freeExitAdd.vue        |    2 +-
 .../homestead/freeExit/freeExitDetail.vue     |    2 +-
 .../homestead/freeExit/freeExitList.vue       |    2 +-
 .../homestead/freeExit/freeExitModify.vue     |    2 +-
 .../homeApplication/applicationGsList.vue     |    4 +-
 .../homeApplication/applicationList.vue       |  363 +-
 .../homeApplication/proposerLite.vue          | 5287 +++++++++++++++++
 .../homestead/paidExit/paidExitAdd.vue        |  726 +++
 .../homestead/paidExit/paidExitDetail.vue     |    4 +-
 .../homestead/paidExit/paidExitList.vue       |   39 +-
 .../homestead/paidExit/paidExitModify.vue     |  634 ++
 .../homestead/paidUtilize/paidUtilizeAdd.vue  |   47 +-
 .../paidUtilize/paidUtilizeDteail.vue         |   47 +-
 .../homestead/paidUtilize/paidUtilizeList.vue |   52 +-
 .../paidUtilize/paidUtilizeModify.vue         |   47 +-
 24 files changed, 7195 insertions(+), 303 deletions(-)
 create mode 100644 src/views/yinnong/homestead/homeApplication/proposerLite.vue
 create mode 100644 src/views/yinnong/homestead/paidExit/paidExitAdd.vue
 create mode 100644 src/views/yinnong/homestead/paidExit/paidExitModify.vue

diff --git a/src/router/index.js b/src/router/index.js
index 85553089..2e5fd561 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -852,6 +852,24 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/homestead/freeExit/freeExitList'], resolve)
   },
+  {
+    path: '/homesteadPaidExitAdd',
+    name: 'homesteadPaidExitAdd',
+    meta: {
+      title: '有偿退出（阳光村务）',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/homestead/paidExit/paidExitAdd'], resolve)
+  },
+  {
+    path: '/homesteadPaidExitModify',
+    name: 'homesteadPaidExitModify',
+    meta: {
+      title: '有偿退出（阳光村务）',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/homestead/paidExit/paidExitModify'], resolve)
+  },
   {
     path: '/paidExitAdd',
     name: 'paidExitAdd',
@@ -3912,6 +3930,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLite'], resolve)
   },
+  {
+    path: '/homesteadProposerLite',
+    name: 'homesteadProposerLite',
+    meta: {
+      title: '农村宅基地申请（阳光村务）',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/homestead/homeApplication/proposerLite'], resolve)
+  },
   {
     path: '/sunVillage_info/paidExit/paidExitList',
     name: 'sunVillageInfoPaidExitList',
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index fc19bbbc..246d896a 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -849,11 +849,17 @@ export default {
           return;
         }
         if(this.form.id == null){
+
           let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
+          this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
+          if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
+          this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
+          this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
           this.$set(this.form, 'surveyId', surveyItem.id);
           addZjdzd(this.form).then(response => {
             let _this =this;
             getZjdzd(response.data).then((res) => {
+              console.info(res.data);
               localStorage.setItem("zjdzdxxItem",JSON.stringify(res.data));
               this.$toast({
                 icon: 'success', // 找到自己需要的图标
diff --git a/src/views/homesteadSurvey/fsssAdd.vue b/src/views/homesteadSurvey/fsssAdd.vue
index f970787d..b768c4f9 100644
--- a/src/views/homesteadSurvey/fsssAdd.vue
+++ b/src/views/homesteadSurvey/fsssAdd.vue
@@ -209,6 +209,10 @@ export default {
     },
     submitzjd(){
       this.$refs.form.validate().then(() => {
+        this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
+        if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
+        this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
+        this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
       if(this.form.id == null){
         addFsss(this.form).then(response => {
           let _this =this
diff --git a/src/views/homesteadSurvey/zrzAdd.vue b/src/views/homesteadSurvey/zrzAdd.vue
index 636805ff..c090134f 100644
--- a/src/views/homesteadSurvey/zrzAdd.vue
+++ b/src/views/homesteadSurvey/zrzAdd.vue
@@ -243,6 +243,7 @@ export default {
     let data = this.$route.query;
     this.form = data;
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    console.info(this.zjdzdxx);
     this.permission = localStorage.getItem("executePermission");
     if(this.form.shyqrdbzjhm != null){
       this.getList();
@@ -269,6 +270,10 @@ export default {
     submitzjd(){
       this.$refs.form.validate().then(() => {
       if(this.form.id == null){
+        this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
+        if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
+        this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
+        this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
         addZrz(this.form).then(response => {
           let _this =this
           this.$toast({
diff --git a/src/views/sunVillage_info/paidExit/paidExitList.vue b/src/views/sunVillage_info/paidExit/paidExitList.vue
index e1973d9c..4a1ababc 100644
--- a/src/views/sunVillage_info/paidExit/paidExitList.vue
+++ b/src/views/sunVillage_info/paidExit/paidExitList.vue
@@ -28,7 +28,7 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.zjddm" :value="item.auditStatus" center :to="{name:'sunVillageInfoPaidExitDetail', query: {id:item.id}}" >
+          <van-cell :title="item.zjddm" :value="selectDictLabel(auditStatus, item.auditStatus)" center :to="{name:'sunVillageInfoPaidExitDetail', query: {id:item.id}}" >
             <template #icon>
               <van-icon name="../../../static/images/onlineHome/icon_zjd3.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
@@ -39,13 +39,13 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button square text="修改" v-if="item.auditStatus=='草稿'" :to="{name:'sunVillageInfoPaidExitModify', query: {id:item.id}}" type="info" class="delete-button" />
+                <van-button square text="修改" v-if="item.auditStatus=='0'" :to="{name:'sunVillageInfoPaidExitModify', query: {id:item.id}}" type="info" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button square text="提交" type="primary" v-if="item.auditStatus=='草稿'" class="delete-button" @click="goSubmit(item)" />
+                <van-button square text="提交" type="primary" v-if="item.auditStatus=='0'" class="delete-button" @click="goSubmit(item)" />
               </van-col>
               <van-col>
-                <van-button square text="删除" v-if="item.auditStatus=='草稿'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
+                <van-button square text="删除" v-if="item.auditStatus=='0'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
               </van-col>
             </van-row>
           </template>
diff --git a/src/views/yinnong/homestead/circulation/circulationAdd.vue b/src/views/yinnong/homestead/circulation/circulationAdd.vue
index 1852e910..77906f99 100644
--- a/src/views/yinnong/homestead/circulation/circulationAdd.vue
+++ b/src/views/yinnong/homestead/circulation/circulationAdd.vue
@@ -1,15 +1,9 @@
 <template>
   <div class="app-container">
-    <van-nav-bar
-      left-arrow
-      fixed
-      placeholder
-      @click-left="$router.back(-1)"
-    >
-      <template #title>
-        <p style="font-weight: bold;">添加宅基地使用权流转</p>
-      </template>
-    </van-nav-bar>
+    <div class="header_main">
+      使用权流转
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
     <p class="main_title">转出方信息</p>
     <div class="main_box">
       <!--        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>-->
@@ -641,6 +635,38 @@
 
 <style scoped lang="scss">
   .app-container {
+  .header_main{
+    height: 116px;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+  .return_btn{
+    width: 24px;
+    height: 43.2px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  .add_btn{
+    width: 56.4px;
+    height: 40.8px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+    background-size: 47px 34px;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+  }
   }
   .main_title{
     font-size: 0.4rem;
diff --git a/src/views/yinnong/homestead/circulation/circulationDetail.vue b/src/views/yinnong/homestead/circulation/circulationDetail.vue
index be2193a2..42c6cd74 100644
--- a/src/views/yinnong/homestead/circulation/circulationDetail.vue
+++ b/src/views/yinnong/homestead/circulation/circulationDetail.vue
@@ -1,15 +1,9 @@
 <template>
   <div class="app-container">
-    <van-nav-bar
-      left-arrow
-      fixed
-      placeholder
-      @click-left="$router.back(-1)"
-    >
-      <template #title>
-        <p style="font-weight: bold;">添加宅基地使用权流转</p>
-      </template>
-    </van-nav-bar>
+    <div class="header_main">
+      使用权流转
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
     <p class="main_title">转出方信息</p>
     <div class="main_box">
       <!--        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>-->
@@ -670,6 +664,38 @@
 
 <style scoped lang="scss">
   .app-container {
+  .header_main{
+    height: 116px;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+  .return_btn{
+    width: 24px;
+    height: 43.2px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  .add_btn{
+    width: 56.4px;
+    height: 40.8px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+    background-size: 47px 34px;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+  }
   }
   .main_title{
     font-size: 0.4rem;
diff --git a/src/views/yinnong/homestead/circulation/circulationList.vue b/src/views/yinnong/homestead/circulation/circulationList.vue
index 1e51fa52..83720bf6 100644
--- a/src/views/yinnong/homestead/circulation/circulationList.vue
+++ b/src/views/yinnong/homestead/circulation/circulationList.vue
@@ -1,19 +1,10 @@
 <template>
     <div class="app-container">
-      <van-nav-bar
-        left-arrow
-        fixed
-        placeholder
-        @click-left="$router.back(-1)"
-        @click-right="goAdd"
-      >
-        <template #title>
-          <p style="font-weight: bold;">使用权流转</p>
-        </template>
-        <template #right>
-          <van-icon name="add" size="18" />
-        </template>
-      </van-nav-bar>
+      <div class="header_main">
+        使用权流转
+        <div class="return_btn" @click="onClickLeft"></div>
+        <div class="add_btn" @click="goAdd"></div>
+      </div>
       <van-list
         v-model="loading"
         :finished="finished"
@@ -120,7 +111,38 @@ export default {
 
 <style scoped lang="scss">
   .app-container {
-    padding: 0.2rem 3%;
+  .header_main{
+    height: 116px;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+  .return_btn{
+    width: 24px;
+    height: 43.2px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  .add_btn{
+    width: 56.4px;
+    height: 40.8px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+    background-size: 47px 34px;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+  }
   }
   /deep/.van-cell__title{
     flex: 0.7;
diff --git a/src/views/yinnong/homestead/circulation/circulationModify.vue b/src/views/yinnong/homestead/circulation/circulationModify.vue
index 3a781096..6c8649c4 100644
--- a/src/views/yinnong/homestead/circulation/circulationModify.vue
+++ b/src/views/yinnong/homestead/circulation/circulationModify.vue
@@ -1,15 +1,9 @@
 <template>
   <div class="app-container">
-    <van-nav-bar
-      left-arrow
-      fixed
-      placeholder
-      @click-left="$router.back(-1)"
-    >
-      <template #title>
-        <p style="font-weight: bold;">添加宅基地使用权流转</p>
-      </template>
-    </van-nav-bar>
+    <div class="header_main">
+      使用权流转
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
     <p class="main_title">转出方信息</p>
     <div class="main_box">
       <!--        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>-->
@@ -670,6 +664,38 @@
 
 <style scoped lang="scss">
   .app-container {
+  .header_main{
+    height: 116px;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+  .return_btn{
+    width: 24px;
+    height: 43.2px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  .add_btn{
+    width: 56.4px;
+    height: 40.8px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+    background-size: 47px 34px;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+  }
   }
   .main_title{
     font-size: 0.4rem;
diff --git a/src/views/yinnong/homestead/freeExit/freeExitAdd.vue b/src/views/yinnong/homestead/freeExit/freeExitAdd.vue
index 709e985c..0468018b 100644
--- a/src/views/yinnong/homestead/freeExit/freeExitAdd.vue
+++ b/src/views/yinnong/homestead/freeExit/freeExitAdd.vue
@@ -627,7 +627,7 @@ export default {
     padding-bottom: 2%;
     .header_main{
       height: 116px;
-      background: url('../../../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
       background-size: 100% 100%;
       position: fixed;
       top: 0;
diff --git a/src/views/yinnong/homestead/freeExit/freeExitDetail.vue b/src/views/yinnong/homestead/freeExit/freeExitDetail.vue
index f0e68345..a7716fb6 100644
--- a/src/views/yinnong/homestead/freeExit/freeExitDetail.vue
+++ b/src/views/yinnong/homestead/freeExit/freeExitDetail.vue
@@ -791,7 +791,7 @@ export default {
     padding-bottom: 2%;
     .header_main{
       height: 116px;
-      background: url('../../../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
       background-size: 100% 100%;
       position: fixed;
       top: 0;
diff --git a/src/views/yinnong/homestead/freeExit/freeExitList.vue b/src/views/yinnong/homestead/freeExit/freeExitList.vue
index 9888b51e..a49a6774 100644
--- a/src/views/yinnong/homestead/freeExit/freeExitList.vue
+++ b/src/views/yinnong/homestead/freeExit/freeExitList.vue
@@ -154,7 +154,7 @@ export default {
   .app-container {
     .header_main{
       height: 116px;
-      background: url('../../../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
       background-size: 100% 100%;
       position: fixed;
       top: 0;
diff --git a/src/views/yinnong/homestead/freeExit/freeExitModify.vue b/src/views/yinnong/homestead/freeExit/freeExitModify.vue
index 82bd5c92..bad8420d 100644
--- a/src/views/yinnong/homestead/freeExit/freeExitModify.vue
+++ b/src/views/yinnong/homestead/freeExit/freeExitModify.vue
@@ -550,7 +550,7 @@
     padding-bottom: 2%;
     .header_main{
       height: 116px;
-      background: url('../../../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
       background-size: 100% 100%;
       position: fixed;
       top: 0;
diff --git a/src/views/yinnong/homestead/homeApplication/applicationGsList.vue b/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
index 10a12352..60e0b048 100644
--- a/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
+++ b/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
@@ -101,7 +101,7 @@
         || row.houseApplyStatus == '3F' // 开工通过
         || row.houseApplyStatus == '71' // 验收草稿
           ? 'modify' : 'view';
-        this.$router.push({name:'applicationForm',query:{type:type,id:row.id}})
+        this.$router.push({name:'homesteadProposerLite',query:{type:type,id:row.id}})
       },
       getList(target){
         let type = typeof (target);
@@ -208,7 +208,7 @@
   .app-container {
   .header_main{
     height: 116px;
-    background: url('../../../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
     background-size: 100% 100%;
     position: fixed;
     top: 0;
diff --git a/src/views/yinnong/homestead/homeApplication/applicationList.vue b/src/views/yinnong/homestead/homeApplication/applicationList.vue
index 47455b96..17506613 100644
--- a/src/views/yinnong/homestead/homeApplication/applicationList.vue
+++ b/src/views/yinnong/homestead/homeApplication/applicationList.vue
@@ -1,27 +1,28 @@
 <template>
-  <div class="app-container">
-    <!--      <van-nav-bar-->
-    <!--        left-arrow-->
-    <!--        fixed-->
-    <!--        placeholder-->
-    <!--        @click-left="$router.back(-1)"-->
-    <!--        @click-right="goAddLite()"-->
-    <!--      >-->
-    <!--        <template #title>-->
-    <!--          <p style="font-weight: bold;">宅基地申请</p>-->
-    <!--        </template>-->
-    <!--        <template #right>-->
-    <!--          <van-icon name="add" size="18"/>-->
-    <!--        </template>-->
-    <!--      </van-nav-bar>-->
+    <div class="app-container">
+<!--      <van-nav-bar-->
+<!--        left-arrow-->
+<!--        fixed-->
+<!--        placeholder-->
+<!--        @click-left="$router.back(-1)"-->
+<!--        @click-right="goAddLite()"-->
+<!--      >-->
+<!--        <template #title>-->
+<!--          <p style="font-weight: bold;">宅基地申请</p>-->
+<!--        </template>-->
+<!--        <template #right>-->
+<!--          <van-icon name="add" size="18"/>-->
+<!--        </template>-->
+<!--      </van-nav-bar>-->
 
-    <div class="header_main">
-      宅基地申请
-      <div class="return_btn" @click="onClickLeft"></div>
-    </div>
+      <div class="header_main">
+        宅基地申请
+        <div class="return_btn" @click="onClickLeft"></div>
+        <div class="add_btn" @click="goAddLite"></div>
+      </div>
 
-    <van-pull-refresh v-model="refreshing" @refresh="getList()">
-      <van-list
+      <van-pull-refresh v-model="refreshing" @refresh="getList()">
+        <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
@@ -29,13 +30,13 @@
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell :title="item.ywh" center @click="viewItem(item)">
-            <!--          <van-cell :title="item.ywh" :value="item.houseApplyStatusName" center @click="viewItem(item)">-->
-            <!--            <template #icon>-->
-            <!--              <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />-->
-            <!--            </template>-->
-            <!--            <template #label>-->
-            <!--              <p>{{item.projectName}}</p>-->
-            <!--            </template>-->
+<!--          <van-cell :title="item.ywh" :value="item.houseApplyStatusName" center @click="viewItem(item)">-->
+<!--            <template #icon>-->
+<!--              <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />-->
+<!--            </template>-->
+<!--            <template #label>-->
+<!--              <p>{{item.projectName}}</p>-->
+<!--            </template>-->
             <template #icon>
               <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
@@ -48,147 +49,151 @@
           </van-cell>
           <template #right>
             <van-row>
-
               <van-col>
-                <van-button square text="许可证预览" v-if="parseInt(item.homeApplyStatus, 16) >= 0x31" type="info"  :to="{name:'homeXkzPanel', query: {id:item.id, type: 'modify'}}" class="delete-button" />
+                <van-button square text="提交" type="primary" v-if="item.homeApplyStatus=='11' || item.homeApplyStatus=='31' || item.homeApplyStatus=='71'" @click="submitApplyProposer(item)" class="delete-button" />
+              </van-col>
+              <van-col>
+                <van-button square text="修改" type="info" v-if="item.homeApplyStatus=='11' || item.homeApplyStatus=='31' || item.homeApplyStatus=='71'" :to="{name:'homesteadProposerLite', query: {id:item.id, type: 'modify'}}" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button square text="批准书预览" v-if="parseInt(item.homeApplyStatus, 16) >= 0x31" type="info"  :to="{name:'homePzsPanel', query: {id:item.id, type: 'modify'}}" class="delete-button" />
+                <van-button square text="删除" type="danger" v-if="item.homeApplyStatus=='11'" @click="deleteList(item.id,index)" class="delete-button" />
               </van-col>
             </van-row>
           </template>
         </van-swipe-cell>
       </van-list>
-    </van-pull-refresh>
-  </div>
+      </van-pull-refresh>
+    </div>
 </template>
 
 <script>
-  import { getList , removeList } from "@/api/sunVillage_info/homestead/application";
-  import { customSubmitWLHT, submitStartWLHT, submitEndWLHT,} from "@/api/sunVillage_info/homestead/application";
-  import {updateOpretion} from "@/api/sunVillage_info/homestead/application";
-  import Cookies from "js-cookie";
-  export default {
-    name: "applicationList",
-    data() {
-      return {
-        applicationList:[],
-        houseApplyStatus:[],
-        loading: false,
-        finished: false,
-        refreshing: false,
+import { getList , removeList } from "@/api/sunVillage_info/homestead/application";
+import { customSubmitWLHT, submitStartWLHT, submitEndWLHT,} from "@/api/sunVillage_info/homestead/application";
+import {updateOpretion} from "@/api/sunVillage_info/homestead/application";
+import Cookies from "js-cookie";
+export default {
+  name: "applicationList",
+  data() {
+    return {
+      applicationList:[],
+      houseApplyStatus:[],
+      loading: false,
+      finished: false,
+      refreshing: false,
+      deptId:null,
+      idcard:null,
+      total: 0,
+      queryParams:{
+        pageNum:1,
+        pageSize:10,
         deptId:null,
-        idcard:null,
-        total: 0,
-        queryParams:{
-          pageNum:1,
-          pageSize:10,
-          deptId:null,
-          orderByColumn:'createTime',
-          isAsc:'desc'
-        }
-      };
+        orderByColumn:'createTime',
+        isAsc:'desc'
+      }
+    };
+  },
+  created() {
+    this.houseGetDicts("home_stage_status").then((response) => {
+      this.houseApplyStatus = response.data;
+    });
+    this.deptId = Cookies.get('deptId')
+    this.idcard = Cookies.get('idcard')
+    this.$set(this.queryParams, "deptId", this.deptId);
+    this.$set(this.queryParams, "sqhhzsfzh", this.idcard);
+    this.getList();
+  },
+  methods: {
+    goAdd(){
+      window.location = 'applicationAdd';
     },
-    created() {
-      this.houseGetDicts("home_stage_status").then((response) => {
-        this.houseApplyStatus = response.data;
-      });
-      this.deptId = this.$store.state.user.loginDeptId;
-      this.$set(this.queryParams, "deptId", this.deptId);
-      this.getList();
+    goAddLite(){
+      //window.location = 'applicationAdd'
+      this.$router.push({name:'homesteadProposerLite',query:{type:"add"}})
     },
-    methods: {
-      goAdd(){
-        window.location = 'applicationAdd';
-      },
-      goAddLite(){
-        //window.location = 'applicationAdd'
-        this.$router.push({name:'sunVillageInfoProposerLite',query:{type:"add"}})
-      },
-      viewItem(row){
-        let type = row.houseApplyStatus == '11' // 申请草稿
+    viewItem(row){
+      let type = row.houseApplyStatus == '11' // 申请草稿
         || row.houseApplyStatus == '1F' // 申请通过
         || row.houseApplyStatus == '31' // 开工草稿
         || row.houseApplyStatus == '3F' // 开工通过
         || row.houseApplyStatus == '71' // 验收草稿
           ? 'modify' : 'view';
-        this.$router.push({name:'applicationForm',query:{type:type,id:row.id}})
-      },
-      getList(target){
-        let type = typeof (target);
-        console.log(type, target);
-        if(target && this.finished)
-          return;
-        if (target === 0) {
-          this.refreshing = true;
+      this.$router.push({name:'homesteadProposerLite',query:{type:type,id:row.id}})
+    },
+    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;
-          this.total = 0;
-          this.queryParams.pageNum = 1;
-          this.applicationList = [];
+          return;
         }
-        else if (type === 'number')
-          this.queryParams.pageNum = target;
-        else if (type === 'string') {
-          this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
+        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]);
         }
-        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;
+      });
+    },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
+    deleteList(id,index){
+      this.$dialog.confirm({
+        message: '您确认删除申请草稿？',
+      })
+      .then(() => {
+        // on confirm
+        this.applicationList.splice(index,1)
+        removeList(id).then(res => {
+          if(res.code = 200){
+            this.$toast.success('删除成功');
           }
-          this.total += response.rows.length;
-          this.finished = this.total >= response.total;
-        }).finally(() => {
-          this.loading = false;
-          this.refreshing = false;
         });
-      },
-      formatDict(dict, value) {
-        return this.selectDictLabel(dict, value);
-      },
-      deleteList(id,index){
-        this.$dialog.confirm({
-          message: '您确认删除申请草稿？',
-        })
-          .then(() => {
-            // on confirm
-            this.applicationList.splice(index,1)
-            removeList(id).then(res => {
-              if(res.code = 200){
-                this.$toast.success('删除成功');
-              }
-            });
-          })
-          .catch(() => {
-            // on cancel
-          });
-      },
-      refresh() {
-        this.getList(); return;
-        this.applicationList = [];
-        this.queryParams.pageNum = 1;
-        this.refreshing = true;
-        this.finished = false;
-      },
-      submitApplyProposer(item) {
-        this.$router.push({name:'sunVillageInfoProposerLite',query:{type:"edit",id:item.id}})
+      })
+      .catch(() => {
+        // on cancel
+      });
+    },
+    refresh() {
+      this.getList(); return;
+      this.applicationList = [];
+      this.queryParams.pageNum = 1;
+      this.refreshing = true;
+      this.finished = false;
+    },
+    submitApplyProposer(item) {
+        this.$router.push({name:'homesteadProposerLite',query:{type:"edit",id:item.id}})
         // if(item.homeApplyStatus === '11'){
         //   customSubmitWLHT(item.id).then((resp) => {
         //     this.$toast.success("提交成功");
@@ -211,45 +216,45 @@
         //     this.$toast.fail("提交失败!");
         //   });
         // }
-      },
     },
-  }
+  },
+}
 </script>
 
 <style scoped lang="scss">
   .app-container {
-  .header_main{
-    height: 116px;
-    background: url('../../../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
-    background-size: 100% 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    font-size: 36px;
-    line-height: 116px;
-    text-align: center;
-    color: #fff;
-    position: relative;
-  .return_btn{
-    width: 24px;
-    height: 43.2px;
-    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
-    background-size: 20px 36px;
-    position: absolute;
-    left: 38px;
-    top: 36px;
-  }
-  .add_btn{
-    width: 56.4px;
-    height: 40.8px;
-    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
-    background-size: 47px 34px;
-    position: absolute;
-    right: 38px;
-    top: 36px;
-  }
-  }
+    .header_main{
+      height: 116px;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+      .return_btn{
+        width: 24px;
+        height: 43.2px;
+        background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 56.4px;
+        height: 40.8px;
+        background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+        background-size: 47px 34px;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
   }
   /deep/.van-list{
     padding: 0.2rem 3%;
diff --git a/src/views/yinnong/homestead/homeApplication/proposerLite.vue b/src/views/yinnong/homestead/homeApplication/proposerLite.vue
new file mode 100644
index 00000000..e6ae6fb5
--- /dev/null
+++ b/src/views/yinnong/homestead/homeApplication/proposerLite.vue
@@ -0,0 +1,5287 @@
+<template>
+    <div class="app-container">
+      <div id="info" style="display: none"></div>
+<!--      <van-nav-bar-->
+<!--        :title="(proposerStatus == 3 ? '添加' : '') + '用地建房申请'"-->
+<!--        left-arrow-->
+<!--        fixed-->
+<!--        placeholder-->
+<!--        @click-left="goBack()"-->
+<!--        z-index="998"-->
+<!--      >-->
+<!--        <template #right>-->
+<!--          <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>-->
+<!--        </template>-->
+<!--      </van-nav-bar>-->
+
+      <div class="header_main">
+        {{(proposerStatus == 3 ? '添加' : '') + '用地建房申请'}}
+        <div class="return_btn" @click="onClickLeft"></div>
+        <div class="add_btn" @click="goFlow"></div>
+      </div>
+
+      <van-steps :active="active" active-color="#38f" @click-step="onStepClicked">
+        <van-step>申请</van-step>
+        <van-step>开工</van-step>
+        <van-step>验收</van-step>
+      </van-steps>
+
+      <div class="main" style="padding-bottom: 1rem;">
+        <van-form ref="form">
+          <template>
+            <van-dialog v-model:show="mapShow" @cancel="mapZbQx" @confirm="mapZbQd()" show-cancel-button>
+              <div style="width: 100%;height:45vh;position:relative;">
+                <div style="width: 100%;height: 100%">
+                    <!--<iframe style="width: 100%;height: 50%" src="https://www.sea-meta.com/location.html"></iframe>-->
+                  <div id='uuidMap' style="width: 100%;height: 100%"></div>
+                </div>
+              </div>
+            </van-dialog>
+          </template>
+          <template v-if="selectedTabName == 0 && formVisible.baseApplyFormVisible"> <!-- 申请 -->
+            <div :class="active == 0 ? '' : 'noModify'">
+              <p class="topTit">农村宅基地和建房（规划许可）申请表</p>
+              <template v-if="formVisible.baseApplyForm.baseFormVisible"> <!-- 申请 基本信息 -->
+                <div>
+                  <p class="main_title">申请户主信息</p>
+                  <div class="main_box">
+                    <van-field  v-model="applicationDetail.sqhhzxm" label="姓名" placeholder="姓名" input-align="right"    @input="remoteTransfereeMethod" required :rules="[{ required: true }]"/>
+                    <van-popup v-model="showNhxx" position="bottom">
+                      <van-picker
+                        show-toolbar
+                        :columns="nhxxList"
+                        @confirm="getApplyerDetail"
+                        value-key="hzxm"
+                        @cancel="showNhxx = false"
+                      />
+                    </van-popup>
+                    <field-select
+                      v-model="applicationDetail.sqhhzxb"
+                      label="性别"
+                      value-key="dictLabel"
+                      data-key="dictValue"
+                      placeholder="选择性别"
+                      :rules="[{ required: true }]"
+                      required
+                      :readonly="true"
+                      remote-url="/open/zdzh/list/sys_user_sex"
+                      :on-remote-response="'data'"
+                    />
+                    <van-field required readonly v-model="applicationDetail.sqhhznl" label="年龄" placeholder="年龄" input-align="right" type="digit" :rules="[{ required: true }]"/>
+                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzlxdh" label="联系电话" placeholder="联系电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
+                    <van-field required readonly v-model="applicationDetail.sqhhzsfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateUserInfo"/>
+                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzhkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhjtzz" label="家庭住址" placeholder="家庭住址" input-align="right" :rules="[{ required: true }]"/>
+<!--                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.familyAddress" label="家庭住址" placeholder="家庭住址" input-align="right" :rules="[{ required: true }]"/>-->
+<!--                    <van-field required readonly v-model="applicationDetail.tHouseApplyProposer.members" label="家庭人口数" placeholder="家庭人口数" type="digit" input-align="right"/>-->
+<!--                    <field-radio-->
+<!--                      v-model="applicationDetail.tHouseApplyProposer.existHomestead"-->
+<!--                      label="是否已有宅基地"-->
+<!--                      value-key="dictLabel"-->
+<!--                      data-key="dictValue"-->
+<!--                      :rules="[{ required: true }]"-->
+<!--                      required-->
+<!--                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                      :columns="yesNoOptions"-->
+<!--                      @change="existHomesteadChange"-->
+<!--                    />-->
+                  </div>
+                </div>
+
+                <div v-if="applicationDetail.sqrjtcyList">
+                  <p class="main_title">家庭成员信息</p>
+<!--                  <van-collapse v-model="activeNames" v-if="!formEnabled.baseApplyForm.baseFormEnabled">-->
+<!--                    <van-collapse-item  class="collapse" v-for="(item , index) in applicationDetail.sqrjtcyList" :key="index" :name="index+1">-->
+<!--                      <template #title>-->
+<!--                        <van-row>-->
+<!--                          <van-col span="8">{{item.xm}}</van-col>-->
+<!--                          <van-col span="8">{{item.nl}}</van-col>-->
+<!--                          <van-col span="8">{{item.yhzgx}}</van-col>-->
+<!--                          <van-col span="8">{{item.familyStatusName}}</van-col>-->
+<!--                        </van-row>-->
+<!--                      </template>-->
+<!--                      <van-field readonly v-model="item.xm" label="姓名" placeholder="姓名" input-align="right"/>-->
+<!--                      <van-field readonly v-model="item.nl" label="年龄" placeholder="年龄" input-align="right"/>-->
+<!--                      <field-select-->
+<!--                        v-model="item.yhzgx"-->
+<!--                        label="与户主关系"-->
+<!--                        value-key="dictLabel"-->
+<!--                        data-key="dictValue"-->
+<!--                        placeholder="选择与户主关系"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                        remote-url="/open/zdzh/list/family_status"-->
+<!--                        :on-remote-response="'data'"-->
+<!--                      />-->
+<!--                      <van-field readonly v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right"/>-->
+<!--                      <van-field readonly v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right"/>-->
+<!--                    </van-collapse-item>-->
+<!--                  </van-collapse>-->
+
+                  <div >
+                    <van-tabs v-if="applicationDetail.sqrjtcyList && applicationDetail.sqrjtcyList.length > 0" v-model="familyMembersActive" ref="memberTabs">
+                      <van-tab :title="(index + 1) + '. ' + item.xm" v-for="(item , index) in applicationDetail.sqrjtcyList" :key="index" swipeable>
+                        <div class="familyList">
+                          <div class="main_box" style="margin-bottom: 20px">
+                            <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteFamily(index)" />
+                            <van-field required v-model="item.xm" label="姓名" placeholder="姓名" input-align="right" :rules="[{ required: true }]"/>
+                            <van-field required v-model="item.nl" label="年龄" placeholder="年龄" input-align="right" :rules="[{ required: true }]"/>
+                            <field-select
+                              v-model="item.yhzgx"
+                              label="与户主关系"
+                              value-key="dictLabel"
+                              data-key="dictValue"
+                              placeholder="选择与户主关系"
+                              :rules="[{ required: true }]"
+                              required
+                              :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                              remote-url="/open/zdzh/list/family_status"
+                              :on-remote-response="'data'"
+                            />
+                            <van-field required v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateMemberInfo(index)"/>
+                            <van-field required v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                          </div>
+                        </div>
+                      </van-tab>
+                    </van-tabs>
+                  </div>
+                </div>
+                <div v-if="applicationDetail.sfyyzjd === 'Y'">
+                  <p class="main_title">现宅基地及农房状况</p>
+                  <div class="main_box">
+                    <van-field
+                      readonly
+                      clickable
+                      name="picker"
+                      v-model="showZjddm"
+                      label="宅基地代码"
+                      @click="showZjdzk = true"
+                      input-align="right"
+                      right-icon="arrow-down"
+                    />
+                    <van-popup v-model="showZjdzk" position="bottom">
+                      <van-picker
+                        show-toolbar
+                        :columns="zjddmColumns"
+                        value-key="value"
+                        @confirm="onConfirmZjdxx"
+                        @cancel="showZjdzk = false"
+                      />
+                    </van-popup>
+                  </div>
+                  <div class="main_box">
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xzjdmj" label="宅基地面积" placeholder="宅基地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xjzmj" label="建筑面积" placeholder="建筑面积㎡" input-align="right" type="number" :rules="[{ required: true }]" required ><template #right-icon>㎡</template></van-field>
+<!--                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingPerArea" label="人均建筑面积" placeholder="人均建筑面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>-->
+                    <van-field  :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.qszsh" label="权属证书号" placeholder="权属证书号" input-align="right"/>
+                    <field-select
+                      v-model="applicationDetail.xzjdczqk"
+                      label="处置情况"
+                      value-key="dictLabel"
+                      data-key="dictValue"
+                      placeholder="选择宅基地处置情况"
+                      :rules="[{ required: true }]"
+                      required
+                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      remote-url="/open/zdzh/list/land_isposal"
+                      :on-remote-response="'data'"
+                    />
+                    <template v-if="applicationDetail.sfyyzjd ==='Y'">
+                      <van-field v-if="applicationDetail.xzjdczqk == '1'" :rules="[{ required: true }]" :required="applicationDetail.sfyyzjd ==='Y' && applicationDetail.xzjdczqk == '1'" :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xzjdblmj" label="保留面积" placeholder="保留面积" input-align="right" type="number"/>
+                      <van-field v-else-if="applicationDetail.xzjdczqk == '3'" :rules="[{ required: true }]" :required="applicationDetail.sfyyzjd ==='Y' && applicationDetail.xzjdczqk == '3'" :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xzjdzqtqk" label="处置情况" placeholder="处置情况" input-align="right"/>
+                    </template>
+                    <van-icon v-if="!zjdzdxxDetailedShow" class="zkshStyle" name="arrow-up" @click.native="zkshClick"/>
+                    <div v-if="zjdzdxxDetailedShow">
+                      <van-field :readonly="true" v-model="zjdzdxxDetailed.zdszd" label="东至" input-align="right"/>
+                      <van-field :readonly="true" v-model="zjdzdxxDetailed.zdszx" label="西至" input-align="right"/>
+                      <van-field :readonly="true" v-model="zjdzdxxDetailed.zdszn" label="南至"  input-align="right"/>
+                      <van-field :readonly="true" v-model="zjdzdxxDetailed.zdszb" label="北至" input-align="right"/>
+                      <van-icon class="zkshStyle" name="arrow-down" @click.native="zkshClick"/>
+                    </div>
+                  </div>
+                </div>
+
+                <div v-if="applicationDetail">
+                  <p class="main_title">拟申请宅基地及建房情况</p>
+                  <div class="main_box">
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdmj" label="宅基地面积" placeholder="宅基地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqfjzdmj" label="房基占地面积" placeholder="房基占地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjddz" label="地址" placeholder="地址" input-align="right"/>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdszd" label="东至" placeholder="东至" input-align="right"/>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdszx" label="西至" placeholder="西至" input-align="right"/>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdszn" label="南至" placeholder="南至" input-align="right"/>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdszb" label="北至" placeholder="北至" input-align="right"/>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.zfjzmj" label="住房建筑面积" placeholder="住房建筑面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.jzcs" label="建筑层数" placeholder="建筑层数" input-align="right" type="digit"><template #right-icon>层</template></van-field>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.jzgd" label="建筑高度" placeholder="建筑高度" input-align="right" type="number"><template #right-icon>m</template></van-field>
+                    <field-radio
+                      v-model="applicationDetail.sfzqxlqlryj"
+                      label="是否征求相邻权利人意见"
+                      value-key="dictLabel"
+                      data-key="dictValue"
+                      :rules="[{ required: true }]"
+                      required
+                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      :columns="[{dictLabel: '是', dictValue: '1'}, {dictLabel: '否', dictValue: '2'}]"
+                      @change="existHomesteadChange"
+                    />
+
+<!--                    <field-select-->
+<!--                      v-model="applicationDetail.tHouseApplyProposedSituation.housingStructure"-->
+<!--                      label="房屋构造"-->
+<!--                      value-key="dictLabel"-->
+<!--                      data-key="dictValue"-->
+<!--                      placeholder="选择房屋构造"-->
+<!--                      :rules="[{ required: true }]"-->
+<!--                      required-->
+<!--                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                      remote-url="/open/zdzh/list/housing_structure"-->
+<!--                      :on-remote-response="'data'"-->
+<!--                    />-->
+                    <field-select
+                      v-model="applicationDetail.jflx"
+                      label="建房类型"
+                      value-key="dictLabel"
+                      data-key="dictValue"
+                      placeholder="选择建房类型"
+                      :rules="[{ required: true }]"
+                      required
+                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      remote-url="/open/zdzh/list/building_type"
+                      :on-remote-response="'data'"
+                      @confirm="onJflxChanged"
+                    />
+<!--                    <field-radio-->
+<!--                      v-model="applicationDetail.tHouseApplyProposedSituation.designPaper"-->
+<!--                      label="设计图纸"-->
+<!--                      value-key="dictLabel"-->
+<!--                      data-key="dictValue"-->
+<!--                      :rules="[{ required: true }]"-->
+<!--                      required-->
+<!--                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                      remote-url="/open/zdzh/list/design_paper"-->
+<!--                      :on-remote-response="'data'"-->
+<!--                    />-->
+
+<!--                    <field-select-->
+<!--                      v-if="applicationDetail.tHouseApplyProposedSituation.designPaper == '2'"-->
+<!--                      v-model="applicationDetail.tHouseApplyProposedSituation.houseTypeId"-->
+<!--                      label="户型图"-->
+<!--                      value-key="name"-->
+<!--                      data-key="id"-->
+<!--                      placeholder="选择户型图"-->
+<!--                      :rules="[{ required: true }]"-->
+<!--                      required-->
+<!--                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                      :remote-url="getHouseList"-->
+<!--                      :on-remote-response="'rows'"-->
+<!--                    />-->
+                    <field-select
+                      v-model="applicationDetail.nsqzjddldm"
+                      label="土地类型"
+                      value-key="dictLabel"
+                      data-key="dictValue"
+                      placeholder="选择土地类型"
+                      :rules="[{ required: true }]"
+                      required
+                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      remote-url="/open/zdzh/list/geographic_type"
+                      :on-remote-response="'data'"
+                    />
+                    <field-select
+                      v-model="applicationDetail.sjtz"
+                      label="设计图纸"
+                      value-key="dictLabel"
+                      data-key="dictValue"
+                      placeholder="选择设计图纸"
+                      :rules="[{ required: true }]"
+                      required
+                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      remote-url="/open/zdzh/list/design_paper"
+                      :on-remote-response="'data'"
+                    />
+                    <template v-if="applicationDetail.sjtz ==='2'">
+                      <van-field
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        clickable
+                        required
+                        :rules="[{ required: applicationDetail.sjtz == '2' , message:'请选择选通用图' }]"
+                        label="选通用图"
+                        placeholder="选通用图"
+                        v-model="tytzName"
+                        @click="showTyt = true"
+                        input-align="right"
+                        right-icon="arrow-down"
+                        label-width="auto"
+                      />
+                      <van-popup v-model="showTyt" position="bottom">
+                        <van-picker
+                          show-toolbar
+                          :columns="tytzList"
+                          value-key="name"
+                          @confirm="onConfirmTytz"
+                          @cancel="showTyt = false"
+                        />
+                      </van-popup>
+                    </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">-->
+
+                </div>
+
+                <div v-if="applicationDetail">
+                  <p class="main_title">申请理由</p>
+                  <div class="main_box">
+                    <van-field
+                      rows="3"
+                      autosize
+                      type="textarea"
+                      placeholder="申请理由"
+                      input-align="left"
+                      v-model="applicationDetail.sqly"
+                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      :rules="[{ required: true }]" required
+                    />
+                    <van-row>
+                      <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzxm" label="申请人" placeholder="申请人" input-align="left" label-width="auto"/></van-col>
+                      <van-col span="12">
+                        <field-date-picker
+                          v-model="applicationDetail.applyTime"
+                          label=""
+                          placeholder="选择日期"
+                          :rules="[{ required: true }]"
+                          formatter="yyyy-MM-dd"
+                          required
+                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        />
+                      </van-col>
+                    </van-row>
+                  </div>
+                </div>
+              </template>
+              <!-- 申请::现场踏勘 -->
+              <template 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/>面位置图</van-col>
+                    <van-col span="19">
+                      <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt" :uploadDisabled="!wztUpdate" @fileUpdate="fileUpdate"/>
+                      <van-row>
+                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zckcryxm" label="踏勘人" placeholder="现场踏勘人员" input-align="left" label-width="auto"/></van-col>
+                        <van-col span="12">
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfsp.zckcsj"
+                            label=""
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                          />
+                        </van-col>
+                      </van-row>
+                      <van-row>
+                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zjdzlpmwztztr" label="制图人" placeholder="制图人" input-align="left" label-width="auto"/></van-col>
+                        <van-col span="12">
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfsp.zjdzlpmwzxctksj"
+                            label=""
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                          />
+                        </van-col>
+                      </van-row>
+                    </van-col>
+                  </van-row>
+                  <van-row type="flex" justify="space-between" align="center">
+                    <van-col span="5">备注</van-col>
+                    <van-col span="19">
+                      <van-field
+                        autosize
+                        placeholder="备注"
+                        input-align="left"
+                        v-model="applicationDetail.bz"
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      />
+                    </van-col>
+                  </van-row>
+                </div>
+              </template>
+              <!-- 申请::村级审核 -->
+              <template v-if="formVisible.baseApplyForm.villageFormVisible">
+                <div class="main_box examine_box">
+                  <van-row type="flex" justify="space-between" align="center">
+                    <van-col span="5">村集体<br/>经济组<br/>织或村<br/>民委员<br/>会意见
+                    </van-col>
+                    <van-col span="19">
+                      <van-field required :readonly="!formEnabled.baseApplyForm.villageFormEnabled" v-model="applicationDetail.cjxzscyj" rows="2" autosize type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
+                      <van-cell title="负责人:"  :rules="[{ required: true }]">
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                          v-if="applicationDetail.cjxzscr !='' && applicationDetail.cjxzscr !=null
+                              && applicationDetail.cjxzscr.endsWith('png')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.cjxzscr"
+                        ></van-image>
+                        <div  v-if="applicationDetail.cjxzscr !='' && applicationDetail.cjxzscr !=null && !applicationDetail.cjxzscr.endsWith('png')">
+                            {{applicationDetail.cjxzscr}}
+                        </div>
+                      </van-cell>
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveVillage" :uploadDisabled="formEnabled.baseApplyForm.villageFormEnabled" :jsonData="uploadImgVillage.fileList" :proposer-id="uploadImgVillage.proposerId" tableName="t_homeapply_ydjfsp"-->
+<!--                                                  @uploadFileChanged="(x) => {this.uploadImgVillage.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgVillage.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                        <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.villageFormEnabled">-->
+<!--                          <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveVillageOptions.theGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveVillage')">定位当前位置</van-button>-->
+<!--                        </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.villageFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveVillageOptions.theGeom !='' || applicationDetail.tHouseApproveVillageOptions.theGeom !=null" v-model="applicationDetail.tHouseApproveVillageOptions.theGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveVillage')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+                        <field-date-picker
+                          v-model="applicationDetail.cjxzscsj"
+                          label="审批日期"
+                          placeholder="选择日期"
+                          :rules="[{ required: true }]"
+                          formatter="yyyy-MM-dd"
+                          required
+                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        />
+                    </van-col>
+                  </van-row>
+                </div>
+              </template>
+              <template v-if="formVisible.baseApplyForm.nature_resourceFormVisible">
+                <div class="main_box examine_box">
+                  <van-row type="flex" justify="space-between" align="center">
+                    <van-col span="5">{{applicationDetail.ydjfsp.zrzybmmc != null?applicationDetail.ydjfsp.zrzybmmc:'自然资源部'}}意见</van-col>
+                    <van-col span="19">
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.landArea" label="用地面积" placeholder="请输入" input-align="right" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>-->
+                      <!--                      <field-select-->
+                      <!--                        v-model="applicationDetail.tHouseApproveNatureOptions.rightsType"-->
+                      <!--                        label="土地权属"-->
+                      <!--                        value-key="dictLabel"-->
+                      <!--                        data-key="dictValue"-->
+                      <!--                        placeholder="请选择土地权属"-->
+                      <!--                        :rules="[{ required: true }]"-->
+                      <!--                        required-->
+                      <!--                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
+                      <!--                        remote-url="/open/zdzh/list/rights_type"-->
+                      <!--                        :on-remote-response="'data'"-->
+                      <!--                      />-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.east" label="东至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.west" label="西至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.south" label="南至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.north" label="北至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>-->
+                      <!--                      <div class="mapBox">-->
+                      <!--                        <common-map ref="pointDarwNatureMap" style="height:200px;"-->
+                      <!--                                    :allowDraw="formEnabled.baseApplyForm.townFormEnabled"-->
+                      <!--                                    @drawReseted="onNatureMapDrawReseted"-->
+                      <!--                                    @drawFinished="onMapDrawFinished"-->
+                      <!--                        >-->
+                      <!--                        </common-map>-->
+                      <!--                      </div>-->
+                      <van-field required :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled" v-model="applicationDetail.ydjfsp.zrzybmscyj" rows="2" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
+                      <van-cell title="负责人:"  :rules="[{ required: true }]" >
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled"
+                          v-if="applicationDetail.ydjfsp.zrzybmscrxm !='' && applicationDetail.ydjfsp.zrzybmscrxm !=null
+                              && applicationDetail.ydjfsp.zrzybmscrxm.endsWith('png')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.ydjfsp.zrzybmscrxm"
+                        ></van-image>
+                        <div  v-if="applicationDetail.ydjfsp.zrzybmscrxm !='' && applicationDetail.ydjfsp.zrzybmscrxm !=null
+                              && !applicationDetail.ydjfsp.zrzybmscrxm.endsWith('png')">{{applicationDetail.ydjfsp.zrzybmscrxm}} </div>
+                      </van-cell>
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveNature" :uploadDisabled="!formEnabled.baseApplyForm.nature_resourceFormEnabled" :jsonData="uploadImgNature.fileList" :proposer-id="uploadImgNature.proposerId" tableName="t_house_approve_nature_options"-->
+<!--                                                 @uploadFileChanged="(x) => {this.uploadImgNature.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgNature.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.nature_resourceFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveNatureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveNature')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.nature_resourceFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.theGeomPoint !='' || applicationDetail.tHouseApproveNatureOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveNatureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveNature')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+                        <field-date-picker
+                          v-model="applicationDetail.ydjfsp.zrzybmscsj"
+                          label="审批日期"
+                          placeholder="选择日期"
+                          :rules="[{ required: true }]"
+                          formatter="yyyy-MM-dd"
+                          required
+                          :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled"
+                        />
+                    </van-col>
+                  </van-row>
+                </div>
+              </template>
+
+              <!-- 申请::住建部门 -->
+              <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">{{applicationDetail.ydjfsp.zfcxjsbmmc != null?applicationDetail.ydjfsp.zfcxjsbmmc:'住建部'}}意见</van-col>
+                    <van-col span="19">
+                      <!--                      <field-select-->
+                      <!--                        v-model="applicationDetail.tHouseApproveOtherOptions.buildingType"-->
+                      <!--                        label="建筑类型"-->
+                      <!--                        value-key="dictLabel"-->
+                      <!--                        data-key="dictValue"-->
+                      <!--                        placeholder="请选择建筑类型"-->
+                      <!--                        :rules="[{ required: true }]"-->
+                      <!--                        required-->
+                      <!--                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
+                      <!--                        remote-url="/open/zdzh/list/building_type"-->
+                      <!--                        :on-remote-response="'data'"-->
+                      <!--                      />-->
+                      <!--                      <field-select-->
+                      <!--                        v-model="applicationDetail.tHouseApproveOtherOptions.designPaper"-->
+                      <!--                        label="图纸类型"-->
+                      <!--                        value-key="dictLabel"-->
+                      <!--                        data-key="dictValue"-->
+                      <!--                        placeholder="请选择图纸类型"-->
+                      <!--                        :rules="[{ required: true }]"-->
+                      <!--                        required-->
+                      <!--                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
+                      <!--                        remote-url="/open/zdzh/list/design_paper"-->
+                      <!--                        :on-remote-response="'data'"-->
+                      <!--                      />-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingLandArea" label="建筑占地面积" placeholder="请输入" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingArea" label="建筑面积" placeholder="请输入" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingFloors" label="建筑层数" placeholder="请输入" input-align="right" type="digit" :rules="[{ required: true }]"><template #right-icon>层</template></van-field>-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingHight" label="建筑高度" placeholder="请输入" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>m</template></van-field>-->
+                      <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.east" label="东至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>-->
+                      <!--                      <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.buildingFormEnabled" v-model="applicationDetail.ydjfsp.zfcxjsbmscyj" rows="2" autosize  type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
+                      <van-cell title="负责人:"   :rules="[{ required: true }]">
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.buildingFormEnabled"
+                          v-if="applicationDetail.ydjfsp.zfcxjsbmscrxm !='' && applicationDetail.ydjfsp.zfcxjsbmscrxm !=null
+                              && applicationDetail.ydjfsp.zfcxjsbmscrxm.endsWith('png')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.ydjfsp.zfcxjsbmscrxm"
+                        ></van-image>
+                        <div v-if="applicationDetail.ydjfsp.zfcxjsbmscrxm !='' && applicationDetail.ydjfsp.zfcxjsbmscrxm !=null
+                              && !applicationDetail.ydjfsp.zfcxjsbmscrxm.endsWith('png')">{{applicationDetail.ydjfsp.zfcxjsbmscrxm}}</div>
+                      </van-cell>
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveOther" :uploadDisabled="!formEnabled.baseApplyForm.buildingFormEnabled" :jsonData="uploadImgOther.fileList" :proposer-id="uploadImgOther.proposerId" tableName="t_house_approve_other_options"-->
+<!--                                                     @uploadFileChanged="(x) => {this.uploadImgOther.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgOther.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.buildingFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveOther')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.buildingFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveOtherOptions.theGeomPoint !='' || applicationDetail.tHouseApproveOtherOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveOther')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+                        <field-date-picker
+                          v-model="applicationDetail.ydjfsp.zfcxjsbmscsj"
+                          label="审批日期"
+                          placeholder="选择日期"
+                          :rules="[{ required: true }]"
+                          formatter="yyyy-MM-dd"
+                          required
+                          :readonly="!formEnabled.baseApplyForm.buildingFormEnabled"
+                        />
+                    </van-col>
+                  </van-row>
+                </div>
+              </template>
+
+              <!-- 申请::农业部门 -->
+              <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">{{applicationDetail.ydjfsp.nyncbmmc != null?applicationDetail.ydjfsp.nyncbmmc:'农业农村部'}}意见</van-col>
+                    <van-col span="19">
+<!--                      <field-radio-->
+<!--                        v-model="applicationDetail.tHouseApproveAgricultureOptions.isMembership"-->
+<!--                        label="成员资格审查"-->
+<!--                        value-key="dictLabel"-->
+<!--                        data-key="dictValue"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
+<!--                        :columns="[{dictLabel: '通过', dictValue: '1'}, {dictLabel: '不通过', dictValue: '2'}]"-->
+<!--                      />-->
+<!--                      <field-radio-->
+<!--                        v-model="applicationDetail.tHouseApproveAgricultureOptions.isOnehouse"-->
+<!--                        label="一户一宅情况"-->
+<!--                        value-key="dictLabel"-->
+<!--                        data-key="dictValue"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
+<!--                        :columns="[{dictLabel: '符合', dictValue: '1'}, {dictLabel: '不符合', dictValue: '2'}]"-->
+<!--                      />-->
+<!--                      <field-radio-->
+<!--                        v-model="applicationDetail.tHouseApproveAgricultureOptions.isReviewmaterials"-->
+<!--                        label="村委审查资料"-->
+<!--                        value-key="dictLabel"-->
+<!--                        data-key="dictValue"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
+<!--                        :columns="[{dictLabel: '齐全', dictValue: '1'}, {dictLabel: '不齐全', dictValue: '2'}]"-->
+<!--                      />-->
+                      <van-field required :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled" rows="2" v-model="applicationDetail.ydjfsp.nyncbmscyj" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
+                      <van-cell title="负责人:"   :rules="[{ required: true }]">
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled"
+                          v-if="applicationDetail.ydjfsp.nyncbmscrxm !='' && applicationDetail.ydjfsp.nyncbmscrxm !=null
+                              && applicationDetail.ydjfsp.nyncbmscrxm.endsWith('png')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.ydjfsp.nyncbmscrxm"
+                        ></van-image>
+                        <div  v-if="applicationDetail.ydjfsp.nyncbmscrxm !='' && applicationDetail.ydjfsp.nyncbmscrxm !=null
+                              && !applicationDetail.ydjfsp.nyncbmscrxm.endsWith('png')">{{applicationDetail.ydjfsp.nyncbmscrxm}}</div>
+                      </van-cell>
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveAgriculture" :uploadDisabled="!formEnabled.baseApplyForm.agricultureFormEnabled" :jsonData="uploadImgAgriculture.fileList" :proposer-id="uploadImgAgriculture.proposerId" tableName="t_house_approve_agriculture_options"-->
+<!--                                                @uploadFileChanged="(x) => {this.uploadImgAgriculture.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAgriculture.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.agricultureFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveAgriculture')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.agricultureFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint !='' || applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveAgriculture')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+                      <field-date-picker
+                          v-model="applicationDetail.ydjfsp.nyncbmscsj"
+                          label="审批日期"
+                          placeholder="选择日期"
+                          :rules="[{ required: true }]"
+                          formatter="yyyy-MM-dd"
+                          required
+                          :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled"
+                        />
+                    </van-col>
+                  </van-row>
+                </div>
+              </template>
+
+              <!-- 申请::镇政府 -->
+              <template 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">
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.xzzfshpzyj" rows="2" autosize type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
+                      <van-cell title="负责人:"   :rules="[{ required: true }]">
+                        <van-image
+                          width="100"
+                          height="50"
+                          :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                          v-if="applicationDetail.ydjfsp.xzzfshpzrxm !='' && applicationDetail.ydjfsp.xzzfshpzrxm !=null
+                              && applicationDetail.ydjfsp.xzzfshpzrxm.endsWith('png')"
+                          :src="$store.getters.baseRoutingUrl+applicationDetail.ydjfsp.xzzfshpzrxm"
+                        ></van-image>
+                        <div  v-if="applicationDetail.ydjfsp.xzzfshpzrxm !='' && applicationDetail.ydjfsp.xzzfshpzrxm !=null
+                              && !applicationDetail.ydjfsp.xzzfshpzrxm.endsWith('png')">{{applicationDetail.ydjfsp.xzzfshpzrxm}}</div>
+                      </van-cell>
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveTown" :uploadDisabled="!formEnabled.baseApplyForm.townFormEnabled" :jsonData="uploadImgTown.fileList" :proposer-id="uploadImgTown.proposerId" tableName="t_house_approve_town_options"-->
+<!--                                                     @uploadFileChanged="(x) => {this.uploadImgTown.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgTown.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.townFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveTownOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveTown')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.townFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.theGeomPoint !='' || applicationDetail.tHouseApproveTownOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveTownOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveTown')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+                      <field-date-picker
+                        v-model="applicationDetail.ydjfsp.xzzfshpzsj"
+                        label="审批日期"
+                        placeholder="选择日期"
+                        :rules="[{ required: true }]"
+                        formatter="yyyy-MM-dd"
+                        required
+                        :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                      />
+                    </van-col>
+                  </van-row>
+                </div>
+              </template>
+
+
+            </div>
+          </template>
+          <template v-if="selectedTabName == 1 && formVisible.landscopeVisible"> <!-- 开工申请 -->
+            <div :class="active == 1 ? '' : 'noModify'" v-if="formVisible.landscopeVisible">
+              <p class="topTit">农村宅基地和建房（规划许可）审批表</p>
+              <div class="main_box action-box">
+                <van-cell>
+                  <template #right-icon>
+                    <field-date-picker
+                      v-model="applicationDetail.ydjfkg.kgrq"
+                      label="计划开工时间"
+                      placeholder="选择日期"
+                      :rules="[{ required: true }]"
+                      formatter="yyyy-MM-dd"
+                      required
+                      :readonly="!formEnabled.landscopeForm.baseFormEnabled"
+                    />
+                  </template>
+                </van-cell>
+                <van-cell>
+                  <template #right-icon>
+                    <field-date-picker
+                      v-model="applicationDetail.ydjfkg.jgrq"
+                      label="计划竣工时间"
+                      placeholder="选择日期"
+                      :rules="[{ required: true }]"
+                      formatter="yyyy-MM-dd"
+                      required
+                      :readonly="!formEnabled.landscopeForm.baseFormEnabled"
+                    />
+                  </template>
+                </van-cell>
+              </div>
+                <template v-if="formVisible.baseApplyForm.baseFormVisible"> <!-- 申请 基本信息 -->
+                  <div>
+                    <p class="main_title">申请户主信息</p>
+                    <div class="main_box">
+                      <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzxm" label="姓名" placeholder="姓名" input-align="right" required :rules="[{ required: true }]"/>
+                      <field-select
+                        v-model="applicationDetail.sqhhzxb"
+                        label="性别"
+                        value-key="dictLabel"
+                        data-key="dictValue"
+                        placeholder="选择性别"
+                        :rules="[{ required: true }]"
+                        required
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        remote-url="/open/zdzh/list/sys_user_sex"
+                        :on-remote-response="'data'"
+                      />
+                      <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhznl" label="年龄" placeholder="年龄" input-align="right" type="digit" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzlxdh" label="联系电话" placeholder="联系电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzsfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateUserInfo"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzhkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                    </div>
+                  </div>
+
+                  <div v-if="applicationDetail.sqrjtcyList">
+                    <p class="main_title">家庭成员信息</p>
+<!--                    <van-collapse v-model="activeNames" v-if="!formEnabled.baseApplyForm.baseFormEnabled">-->
+<!--                      <van-collapse-item  class="collapse" v-for="(item , index) in applicationDetail.sqrjtcyList" :key="index" :name="index+1">-->
+<!--                        <template #title>-->
+<!--                          <van-row>-->
+<!--                            <van-col span="8">{{item.xm}}</van-col>-->
+<!--                            <van-col span="8">{{item.nl}}</van-col>-->
+<!--                            <van-col span="8">{{item.yhzgx}}</van-col>-->
+<!--                          </van-row>-->
+<!--                        </template>-->
+<!--                        <van-field readonly v-model="item.xm" label="姓名" placeholder="姓名" input-align="right"/>-->
+<!--                        <van-field readonly v-model="item.nl" label="年龄" placeholder="年龄" input-align="right"/>-->
+<!--                        <field-select-->
+<!--                          v-model="item.yhzgx"-->
+<!--                          label="与户主关系"-->
+<!--                          value-key="dictLabel"-->
+<!--                          data-key="dictValue"-->
+<!--                          placeholder="选择与户主关系"-->
+<!--                          :rules="[{ required: true }]"-->
+<!--                          required-->
+<!--                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                          remote-url="/open/zdzh/list/family_status"-->
+<!--                          :on-remote-response="'data'"-->
+<!--                        />-->
+<!--                        <van-field readonly v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right"/>-->
+<!--                        <van-field readonly v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right"/>-->
+<!--                      </van-collapse-item>-->
+<!--                    </van-collapse>-->
+
+                    <div>
+                      <van-tabs v-if="applicationDetail.sqrjtcyList && applicationDetail.sqrjtcyList.length > 0" v-model="familyMembersActive" ref="memberTabs">
+                        <van-tab :title="(index + 1) + '. ' + item.xm" v-for="(item , index) in applicationDetail.sqrjtcyList" :key="index" swipeable>
+                          <div class="familyList">
+                            <div class="main_box" style="margin-bottom: 20px">
+                              <van-field required v-model="item.xm" label="姓名" placeholder="姓名" input-align="right" :rules="[{ required: true }]"/>
+                              <van-field required v-model="item.nl" label="年龄" placeholder="年龄" input-align="right" :rules="[{ required: true }]"/>
+                              <field-select
+                                v-model="item.yhzgx"
+                                label="与户主关系"
+                                value-key="dictLabel"
+                                data-key="dictValue"
+                                placeholder="选择与户主关系"
+                                :rules="[{ required: true }]"
+                                required
+                                :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                                remote-url="/open/zdzh/list/family_status"
+                                :on-remote-response="'data'"
+                              />
+                              <van-field required v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateMemberInfo(index)"/>
+                              <van-field required v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                            </div>
+                          </div>
+                        </van-tab>
+                      </van-tabs>
+                    </div>
+                  </div>
+
+                  <div v-if="applicationDetail.sfyyzjd === 'Y'">
+                    <p class="main_title">现宅基地及农房状况</p>
+                    <div class="main_box">
+                      <van-field
+                        readonly
+                        clickable
+                        name="picker"
+                        v-model="showZjddm"
+                        label="宅基地代码"
+                        @click="showZjdzk = true"
+                        input-align="right"
+                        right-icon="arrow-down"
+                      />
+                      <van-popup v-model="showZjdzk" position="bottom">
+                        <van-picker
+                          show-toolbar
+                          :columns="zjddmColumns"
+                          value-key="value"
+                          @confirm="onConfirmZjdxx"
+                          @cancel="showZjdzk = false"
+                        />
+                      </van-popup>
+                    </div>
+                    <div class="main_box">
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xzjdmj" label="宅基地面积" placeholder="宅基地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                      <!--                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.landPerArea" label="人均宅基地面积" placeholder="人均宅基地面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>-->
+                      <!--                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.landCertificateNo" label="不动产单元号" placeholder="不动产单元号" input-align="right"/>-->
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xjzmj" label="建筑面积" placeholder="建筑面积㎡" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                      <!--                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingPerArea" label="人均建筑面积" placeholder="人均建筑面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>-->
+                      <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.qszsh" label="权属证书号" placeholder="权属证书号" input-align="right"/>
+                      <field-select
+                        v-model="applicationDetail.xzjdczqk"
+                        label="处置情况"
+                        value-key="dictLabel"
+                        data-key="dictValue"
+                        placeholder="选择宅基地处置情况"
+                        :rules="[{ required: true }]"
+                        required
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        remote-url="/open/zdzh/list/land_isposal"
+                        :on-remote-response="'data'"
+                      />
+                      <template v-if="applicationDetail.sfyyzjd ==='Y'">
+                        <van-field v-if="applicationDetail.sfyyzjd == '1'" :rules="[{ required: true }]" :required="applicationDetail.sfyyzjd ==='Y' && applicationDetail.landIsposal == '1'" :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.reservedArea" label="保留面积" placeholder="保留面积" input-align="right" type="number"/>
+                        <van-field v-else-if="applicationDetail.xzjdczqk == '3'" :rules="[{ required: true }]" :required="applicationDetail.sfyyzjd ==='Y' && applicationDetail.xzjdczqk == '3'" :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xzjdqtqk" label="处置情况" placeholder="处置情况" input-align="right"/>
+                      </template>
+                      <van-icon v-if="!zjdzdxxDetailedShow" class="zkshStyle" name="arrow-up" @click.native="zkshClick"/>
+                      <div v-if="zjdzdxxDetailedShow">
+                        <van-field :readonly="true" v-model="zjdzdxxDetailed.zdszd" label="东至" input-align="right"/>
+                        <van-field :readonly="true" v-model="zjdzdxxDetailed.zdszx" label="西至" input-align="right"/>
+                        <van-field :readonly="true" v-model="zjdzdxxDetailed.zdszn" label="南至"  input-align="right"/>
+                        <van-field :readonly="true" v-model="zjdzdxxDetailed.zdszb" label="北至" input-align="right"/>
+                        <van-icon class="zkshStyle" name="arrow-down" @click.native="zkshClick"/>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div v-if="applicationDetail">
+                    <p class="main_title">拟申请宅基地及建房情况</p>
+                    <div class="main_box">
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdmj" label="宅基地面积" placeholder="宅基地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqfjzdmj" label="房基占地面积" placeholder="房基占地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjddz" label="地址" placeholder="地址" input-align="right"/>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdszd" label="东至" placeholder="东至" input-align="right"/>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdszx" label="西至" placeholder="西至" input-align="right"/>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdszn" label="南至" placeholder="南至" input-align="right"/>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.nsqzjdszb" label="北至" placeholder="北至" input-align="right"/>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.zfjzmj" label="住房建筑面积" placeholder="住房建筑面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.jzcs" label="建筑层数" placeholder="建筑层数" input-align="right" type="digit"><template #right-icon>层</template></van-field>
+                      <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.jzgd" label="建筑高度" placeholder="建筑高度" input-align="right" type="number"><template #right-icon>m</template></van-field>
+                      <field-radio
+                        v-model="applicationDetail.sfzqxlqlryj"
+                        label="是否征求相邻权利人意见"
+                        value-key="dictLabel"
+                        data-key="dictValue"
+                        :rules="[{ required: true }]"
+                        required
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        :columns="[{dictLabel: '是', dictValue: '1'}, {dictLabel: '否', dictValue: '2'}]"
+                        @change="existHomesteadChange"
+                      />
+
+                      <field-select
+                        v-model="applicationDetail.jflx"
+                        label="建房类型"
+                        value-key="dictLabel"
+                        data-key="dictValue"
+                        placeholder="选择建房类型"
+                        :rules="[{ required: true }]"
+                        required
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        remote-url="/open/zdzh/list/building_type"
+                        :on-remote-response="'data'"
+                      />
+                      <field-select
+                        v-model="applicationDetail.nsqzjddldm"
+                        label="土地类型"
+                        value-key="dictLabel"
+                        data-key="dictValue"
+                        placeholder="选择土地类型"
+                        :rules="[{ required: true }]"
+                        required
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                        remote-url="/open/zdzh/list/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>-->
+                    </div>
+                  </div>
+                </template>
+
+              <!-- 申请::村级审核 -->
+<!--              <template v-if="formVisible.baseApplyForm.villageFormVisible">-->
+<!--                <div class="main_box examine_box">-->
+<!--                  <van-row type="flex" justify="space-between" align="center">-->
+<!--                    <van-col span="5">村集体<br/>经济组<br/>织或村<br/>民委员<br/>会意见-->
+<!--                    </van-col>-->
+<!--                    <van-col span="19">-->
+<!--                      <van-field required :readonly="!formEnabled.baseApplyForm.villageFormEnabled" v-model="applicationDetail.tHouseApproveVillageOptions.villageOption" rows="2" autosize type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>-->
+<!--                      <van-field :rules="[{ required: true }]" v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader !='' && applicationDetail.tHouseApproveVillageOptions.villageLeader !=null && !applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')"-->
+<!--                                 required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" @click="formEnabled.baseApplyForm.villageFormEnabled && searchCommit('tHouseApproveVillageOptions.villageLeader')" v-model="applicationDetail.tHouseApproveVillageOptions.villageLeader" label="负责人" placeholder="负责人" input-align="right" label-width="auto"/>-->
+<!--                      <van-cell title="负责人:" v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader =='' || applicationDetail.tHouseApproveVillageOptions.villageLeader ==null || applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')" :rules="[{ required: true }]">-->
+<!--                        <van-button :disabled="!formEnabled.baseApplyForm.villageFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader =='' || applicationDetail.tHouseApproveVillageOptions.villageLeader ==null || !applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveVillageOptions.villageLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveVillageOptions.villageLeader')">签名确认</van-button>-->
+<!--                        <van-image-->
+<!--                          width="100"-->
+<!--                          height="50"-->
+<!--                          :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                          v-if="applicationDetail.tHouseApproveVillageOptions.villageLeader !='' && applicationDetail.tHouseApproveVillageOptions.villageLeader !=null-->
+<!--                              && applicationDetail.tHouseApproveVillageOptions.villageLeader.endsWith('jpeg')"-->
+<!--                          :src="$store.getters.baseRoutingUrl+applicationDetail.tHouseApproveVillageOptions.villageLeader"-->
+<!--                          @click="formEnabled.baseApplyForm.villageFormEnabled && searchCommit('tHouseApproveVillageOptions.villageLeader')"-->
+<!--                        ></van-image>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveVillage" :uploadDisabled="!formEnabled.baseApplyForm.villageFormEnabled" :jsonData="uploadImgVillage.fileList" :proposer-id="uploadImgVillage.proposerId" tableName="t_house_approve_village_options"-->
+<!--                                                  @uploadFileChanged="(x) => {this.uploadImgVillage.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgVillage.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.villageFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveVillageOptions.theGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveVillage')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.villageFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveVillageOptions.theGeom !='' || applicationDetail.tHouseApproveVillageOptions.theGeom !=null" v-model="applicationDetail.tHouseApproveVillageOptions.theGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveVillage')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <field-date-picker-->
+<!--                        v-model="applicationDetail.tHouseApproveVillageOptions.villageTime"-->
+<!--                        label="审批日期"-->
+<!--                        placeholder="选择日期"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        formatter="yyyy-MM-dd"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                      />-->
+<!--                    </van-col>-->
+<!--                  </van-row>-->
+<!--                </div>-->
+<!--              </template>-->
+                                  <common-map ref="pointDarwMap" style="height:200px;"
+                                              :allowDraw="formVisible.landscopeForm.nature_resourceFormEnabled"
+                                              @drawReseted="onMapDrawReseted"
+                                              @drawFinished="onMapDrawFinished"
+                                  >
+                                  </common-map>
+<!--              &lt;!&ndash; 申请::自然资源部门 &ndash;&gt;-->
+<!--              <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.nature_resourceFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.approveOption" rows="2" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>-->
+<!--                      <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 :disabled="!formEnabled.baseApplyForm.nature_resourceFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.approveLeader =='' || applicationDetail.tHouseApproveNatureOptions.approveLeader ==null || !applicationDetail.tHouseApproveNatureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveNatureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveNatureOptions.approveLeader')">签名确认</van-button>-->
+<!--                        <van-image-->
+<!--                          width="100"-->
+<!--                          height="50"-->
+<!--                          :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>-->
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveNature" :uploadDisabled="!formEnabled.baseApplyForm.nature_resourceFormEnabled" :jsonData="uploadImgNature.fileList" :proposer-id="uploadImgNature.proposerId" tableName="t_house_approve_nature_options"-->
+<!--                                                  @uploadFileChanged="(x) => {this.uploadImgNature.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgNature.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.nature_resourceFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveNatureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveNature')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.nature_resourceFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveNatureOptions.theGeomPoint !='' || applicationDetail.tHouseApproveNatureOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveNatureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveNature')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <field-date-picker-->
+<!--                        v-model="applicationDetail.tHouseApproveNatureOptions.approveTime"-->
+<!--                        label="审批日期"-->
+<!--                        placeholder="选择日期"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        formatter="yyyy-MM-dd"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.nature_resourceFormEnabled"-->
+<!--                      />-->
+<!--                    </van-col>-->
+<!--                  </van-row>-->
+<!--                </div>-->
+<!--              </template>-->
+
+<!--              &lt;!&ndash; 申请::住建部门 &ndash;&gt;-->
+<!--              <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.buildingFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveOption" rows="2" autosize  type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>-->
+<!--                      <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 :disabled="!formEnabled.baseApplyForm.buildingFormEnabled" color="#7AC943"  v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader =='' || applicationDetail.tHouseApproveOtherOptions.approveLeader ==null || !applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveOtherOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveOtherOptions.approveLeader')">签名确认</van-button>-->
+<!--                        <van-image-->
+<!--                          width="100"-->
+<!--                          height="50"-->
+<!--                          :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>-->
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveOther" :uploadDisabled="!formEnabled.baseApplyForm.buildingFormEnabled" :jsonData="uploadImgOther.fileList" :proposer-id="uploadImgOther.proposerId" tableName="t_house_approve_other_options"-->
+<!--                                                  @uploadFileChanged="(x) => {this.uploadImgOther.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgOther.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.buildingFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveOther')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.buildingFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveOtherOptions.theGeomPoint !='' || applicationDetail.tHouseApproveOtherOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveOther')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <field-date-picker-->
+<!--                        v-model="applicationDetail.tHouseApproveOtherOptions.approveTime"-->
+<!--                        label="审批日期"-->
+<!--                        placeholder="选择日期"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        formatter="yyyy-MM-dd"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.buildingFormEnabled"-->
+<!--                      />-->
+<!--                    </van-col>-->
+<!--                  </van-row>-->
+<!--                </div>-->
+<!--              </template>-->
+
+<!--              &lt;!&ndash; 申请::农业部门 &ndash;&gt;-->
+<!--              <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.agricultureFormEnabled" rows="2" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveOption" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>-->
+<!--                      <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 :disabled="!formEnabled.baseApplyForm.agricultureFormEnabled" color="#7AC943"  v-if="applicationDetail.tHouseApproveAgricultureOptions.approveLeader =='' || applicationDetail.tHouseApproveAgricultureOptions.approveLeader ==null || !applicationDetail.tHouseApproveAgricultureOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveAgricultureOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveAgricultureOptions.approveLeader')">签名确认</van-button>-->
+<!--                        <van-image-->
+<!--                          width="100"-->
+<!--                          height="50"-->
+<!--                          :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>-->
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveAgriculture" :uploadDisabled="!formEnabled.baseApplyForm.agricultureFormEnabled" :jsonData="uploadImgAgriculture.fileList" :proposer-id="uploadImgAgriculture.proposerId" tableName="t_house_approve_agriculture_options"-->
+<!--                                                  @uploadFileChanged="(x) => {this.uploadImgAgriculture.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAgriculture.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.agricultureFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveAgriculture')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.agricultureFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint !='' || applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveAgriculture')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <field-date-picker-->
+<!--                        v-model="applicationDetail.tHouseApproveAgricultureOptions.approveTime"-->
+<!--                        label="审批日期"-->
+<!--                        placeholder="选择日期"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        formatter="yyyy-MM-dd"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.agricultureFormEnabled"-->
+<!--                      />-->
+<!--                    </van-col>-->
+<!--                  </van-row>-->
+<!--                </div>-->
+<!--              </template>-->
+
+<!--              &lt;!&ndash; 申请::镇政府 &ndash;&gt;-->
+<!--              <template v-if="formVisible.baseApplyForm.townFormVisible">-->
+<!--                <div class="main_box examine_box" v-if="formVisible.baseApplyForm.townFormVisible">-->
+<!--                  <van-row type="flex" justify="space-between" align="center">-->
+<!--                    <van-col span="5">乡镇<br/>政府<br/>审核<br/>批准<br/>意见</van-col>-->
+<!--                    <van-col span="19">-->
+<!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveOption" rows="2" autosize type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>-->
+<!--                      <van-field :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 :disabled="!formEnabled.baseApplyForm.townFormEnabled" color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.approveLeader =='' || applicationDetail.tHouseApproveTownOptions.approveLeader ==null || !applicationDetail.tHouseApproveTownOptions.approveLeader.endsWith('jpeg')" v-model="applicationDetail.tHouseApproveTownOptions.approveLeader" type="primary" style="float: right;width:100%;height:40px" @click="searchCommit('tHouseApproveTownOptions.approveLeader')">签名确认</van-button>-->
+<!--                        <van-image-->
+<!--                          width="100"-->
+<!--                          height="50"-->
+<!--                          :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>-->
+<!--                      <van-cell title="现场照片:">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveTown" :uploadDisabled="!formEnabled.baseApplyForm.townFormEnabled" :jsonData="uploadImgTown.fileList" :proposer-id="uploadImgTown.proposerId" tableName="t_house_approve_town_options"-->
+<!--                                                  @uploadFileChanged="(x) => {this.uploadImgTown.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgTown.removeFileList = x;}"-->
+<!--                        />-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.townFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveTownOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveTown')">定位当前位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.townFormEnabled">-->
+<!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveTownOptions.theGeomPoint !='' || applicationDetail.tHouseApproveTownOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveTownOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveTown')">查看现场位置</van-button>-->
+<!--                      </van-cell>-->
+<!--                      <field-date-picker-->
+<!--                        v-model="applicationDetail.tHouseApproveTownOptions.approveTime"-->
+<!--                        label="审批日期"-->
+<!--                        placeholder="选择日期"-->
+<!--                        :rules="[{ required: true }]"-->
+<!--                        formatter="yyyy-MM-dd"-->
+<!--                        required-->
+<!--                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"-->
+<!--                      />-->
+<!--                    </van-col>-->
+<!--                  </van-row>-->
+<!--                </div>-->
+<!--              </template>-->
+<!--                &lt;!&ndash; 申请::现场踏勘 &ndash;&gt;-->
+<!--                <template v-if="formVisible.baseApplyForm.townFormVisible">-->
+<!--                  <div class="main_box examine_box" v-if="formVisible.baseApplyForm.townFormVisible">-->
+<!--                    <van-row type="flex" justify="space-between" align="center">-->
+<!--                      <van-col span="5">现场<br/>踏勘</van-col>-->
+<!--                      <van-col span="19">-->
+<!--                        <house-location-plan-comp ref="pictureUploadApplying" :uploadDisabled="!formEnabled.baseApplyForm.townFormEnabled" :jsonData="uploadImg.fileList" :proposer-id="uploadImg.proposerId" tableName="t_house_approve_locationplan_options"-->
+<!--                                                  @uploadFileChanged="(x) => {this.uploadImg.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImg.removeFileList = x;}"-->
+<!--                        />-->
+<!--                        <van-row>-->
+<!--                          <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveLocationplanOptions.surveyPersonnel" label="踏勘" placeholder="现场踏勘人员" input-align="left" label-width="auto"/></van-col>-->
+<!--                          <van-col span="12">-->
+<!--                            <field-date-picker-->
+<!--                              v-model="applicationDetail.tHouseApproveLocationplanOptions.suveyTime"-->
+<!--                              label=""-->
+<!--                              placeholder="选择日期"-->
+<!--                              :rules="[{ required: true }]"-->
+<!--                              formatter="yyyy-MM-dd"-->
+<!--                              required-->
+<!--                              :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
+<!--                            />-->
+<!--                          </van-col>-->
+<!--                        </van-row>-->
+<!--                        <van-row>-->
+<!--                          <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveLocationplanOptions.cartographer" label="制图" placeholder="制图人" input-align="left" label-width="auto"/></van-col>-->
+<!--                          <van-col span="12">-->
+<!--                            <field-date-picker-->
+<!--                              v-model="applicationDetail.tHouseApproveLocationplanOptions.cartographicTime"-->
+<!--                              label=""-->
+<!--                              placeholder="选择日期"-->
+<!--                              :rules="[{ required: true }]"-->
+<!--                              formatter="yyyy-MM-dd"-->
+<!--                              required-->
+<!--                              :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
+<!--                            />-->
+<!--                          </van-col>-->
+<!--                        </van-row>-->
+<!--                      </van-col>-->
+<!--                    </van-row>-->
+<!--                  </div>-->
+<!--                </template>-->
+            </div>
+          </template>
+          <template v-if="selectedTabName == 2 && formVisible.acceptingVisible"> <!-- 验收申请 -->
+            <template v-if="formVisible.acceptingForm.baseFormVisible">
+              <div :class="active == 2 ? '' : 'noModify'">
+                <p class="topTit">农村宅基地和建房（规划许可）验收意见表</p>
+                <div class="main_box check-box">
+                  <van-field required readonly v-model="applicationDetail.sqhhzxm" label="申请户主姓名" placeholder="申请户主姓名" input-align="right" label-width="auto"/>
+                  <van-field required readonly v-model="applicationDetail.sqhhzsfzh" label="身份证号" placeholder="身份证号" input-align="right" label-width="auto"/>
+<!--                  <van-field required readonly v-model="applicationDetail.tHouseApplyEnd.location" label="用地建房位置" placeholder="用地建房位置" input-align="right" label-width="auto"/>-->
+                  <van-field required readonly v-model="applicationDetail.ydjfys.xkzh" label="乡村建设规划许可证号" placeholder="乡村建设规划许可证号" input-align="right" label-width="auto"/>
+                  <van-field required readonly v-model="applicationDetail.ydjfys.pzsh" label="农村宅基地批准书号" placeholder="农村宅基地批准书号" input-align="right" label-width="auto"/>
+                  <field-date-picker
+                    v-model="applicationDetail.ydjfys.kgrq"
+                    label="开工日期"
+                    placeholder="选择开工日期"
+                    :rules="[{ required: true }]"
+                    formatter="yyyy-MM-dd"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                  />
+                  <field-date-picker
+                    v-model="applicationDetail.ydjfys.jgrq"
+                    label="竣工日期"
+                    placeholder="选择竣工日期"
+                    :rules="[{ required: true }]"
+                    formatter="yyyy-MM-dd"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                  />
+<!--                  <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.ydjfys.pzzjdmj" 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.ydjfys.syzjdmj" 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.ydjfys.pzfjzdmj" 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.ydjfys.sjfjzdmj" 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.ydjfys.pjcg" label="批建高度" placeholder="批建高度" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>m</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.pjcs" label="批建层数" placeholder="批建层数" input-align="right" label-width="auto" type="digit" :rules="[{ required: true }]"><template #right-icon>层</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.jggd" label="竣工高度" placeholder="竣工高度" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>m</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.jgcs" label="竣工层数" placeholder="竣工层数" input-align="right" label-width="auto" type="digit" :rules="[{ required: true }]"><template #right-icon>层</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.zjzmj" 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.ydjfys.fwzjmj" 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.ydjfys.ptfsssjzmj" 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.ydjfys.zfzj" label="住房造价" placeholder="住房造价" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>万元</template></van-field>
+                  <field-select
+                    v-model="applicationDetail.ydjfys.jglx"
+                    label="结构类型"
+                    value-key="dictLabel"
+                    data-key="dictValue"
+                    placeholder="选择结构类型"
+                    :rules="[{ required: true }]"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                    remote-url="/open/zdzh/list/design_paper"
+                    :on-remote-response="'data'"
+                  />
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.wlmys" label="外立面颜色" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+
+                  <field-select
+                    v-model="applicationDetail.ydjfys.cjhtzjdqk"
+                    label="旧宅基地退还情况"
+                    value-key="dictLabel"
+                    data-key="dictValue"
+                    placeholder="选择旧宅基地退还情况"
+                    :rules="[{ required: true }]"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                    remote-url="/open/zdzh/list/old_house_status"
+                    :on-remote-response="'data'"
+                  />
+                  <field-radio
+                    v-model="applicationDetail.ydjfys.sfxszfjsbzzc"
+                    label="是否享受住房建设补助政策"
+                    value-key="dictLabel"
+                    data-key="dictValue"
+                    :rules="[{ required: true }]"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                    :columns="yesNoOptions"
+                  />
+                  <field-select
+                    v-if="applicationDetail.ydjfys.sfxszfjsbzzc === '1'"
+                    v-model="applicationDetail.ydjfys.zfjsbzzc"
+                    label="住房建设补助政策"
+                    value-key="dictLabel"
+                    data-key="dictValue"
+                    placeholder="选择住房建设补助政策"
+                    :rules="[{ required: true }]"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                    remote-url="/open/zdzh/list/house_subsidy_policy"
+                    :on-remote-response="'data'"
+                  />
+<!--                  <van-cell title="农房验收位置"></van-cell>-->
+<!--                  <div class="mapBox">-->
+<!--                    <common-map ref="pointDarwAcceptanceMap" style="height:200px;"-->
+<!--                                :allowDraw="formEnabled.acceptingForm.baseFormEnabled"-->
+<!--                                @drawReseted="onAcceptanceMapDrawReseted"-->
+<!--                                @drawFinished="onMapDrawFinished"-->
+<!--                    >-->
+<!--                    </common-map>-->
+<!--                  </div>-->
+<!--                  <van-field rows="3" :autosize="true" type="textarea" readonly label="备注" label-width="auto" placeholder="" input-align="left" value="1.村民旧宅基地属于应退未退的，不得发放本验收意见表。-->
+<!--2.本验收意见表是向不动产登记部门申请办理不动产登记的要件之一，请妥善保管。"></van-field>-->
+                  <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">
+
+                        <MultiImageUploadComp :value="applicationDetail.ydjfys.jgpmjt" :uploadDisabled="this.formEnabled.acceptingForm.baseFormEnabled" @fileUpdate="fileUpdatePmt"/>
+                        <van-field required :readonly="!this.formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.jgpmjtjbr"  placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/>
+                      </van-col>
+                    </van-row>
+                  </div>
+                  <div class="main_box examine_box" v-if="isYiLong()">
+                    <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.ydjfys.qtysnr.sfywcgcsjhhtyddgxnr"
+                          label="1.是否已完成工程设计和合同约定的各项内容"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.clrdwgzfzlzcsfhhg"
+                          label="2.承揽人对完工住房质量自查是否合格"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.sfysgjlzl"
+                          label="3.是否有施工记录资料"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.jfcmhclrsfyjgtqsnczfzlbxs"
+                          label="4.建房村民和承揽人是否已经共同签署农村住房质量保修书"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.zfcxjsxzzgbmhxzrmzfzlzgdwtsfqbzgwb"
+                          label="5.住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.jzfmsfysjtjbyz"
+                          label="6.建筑风貌是否与设计图基本一致"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.flfggddqtystjwcqk"
+                          label="7.法律、法规规定的其他验收条件完成情况"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                      </van-col>
+                    </van-row>
+                    <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">
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.clr" label="签字" placeholder="承揽人签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <!--                    </van-cell>-->
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfys.qtysnr.clrsj"
+                            label="签字日期"
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.ysnrEnable"
+                          />
+                        </van-col>
+                      </van-row>
+                    </div>
+                    <div class="main_box examine_box">
+                      <van-row type="flex" justify="space-between" align="center">
+                        <van-col span="5">第三服务方</van-col>
+                        <van-col span="19">
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.dsfwf" label="签字" placeholder="第三服务方签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <!--                    </van-cell>-->
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfys.qtysnr.dsfwfsj"
+                            label="签字日期"
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.ysnrEnable"
+                          />
+                        </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/>术人员）</van-col>
+                        <van-col span="19">
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.zyjsry" label="签字" placeholder="专业技术人员签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <!--                    </van-cell>-->
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfys.qtysnr.zyjsrysj"
+                            label="签字日期"
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.ysnrEnable"
+                          />
+                        </van-col>
+                      </van-row>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <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">{{applicationDetail.ydjfys.nyncbmmc != null?applicationDetail.ydjfsp.nyncbmmc:'农业农村部'}}意见</van-col>
+                  <van-col span="19">
+                    <van-field required :readonly="!formEnabled.acceptingForm.agricultureFormEnabled" rows="2" v-model="applicationDetail.ydjfys.nyncbmysyj" :autosize="true" type="textarea" placeholder="乡镇农业农村部门意见" :rules="[{ required: true }]"/>
+                    <van-cell title="负责人:" :rules="[{ required: true }]">
+                      <van-image
+                        width="100"
+                        height="50"
+                        :readonly="!formEnabled.acceptingForm.agricultureFormEnabled"
+                        v-if="applicationDetail.ydjfys.nyncbmysjbrxm !='' && applicationDetail.ydjfys.nyncbmysjbrxm !=null
+                              && applicationDetail.ydjfys.nyncbmysjbrxm.endsWith('png')"
+                        :src="$store.getters.baseRoutingUrl+applicationDetail.ydjfys.nyncbmysjbrxm"
+                        @click="formEnabled.acceptingForm.agricultureFormEnabled && searchCommit('ydjfys.nyncbmysjbrxm')"
+                      ></van-image>
+                      <div  v-if="applicationDetail.ydjfys.nyncbmysjbrxm !='' && applicationDetail.ydjfys.nyncbmysjbrxm !=null
+                              && !applicationDetail.ydjfys.nyncbmysjbrxm.endsWith('png')">{{applicationDetail.ydjfys.nyncbmysjbrxm}}</div>
+                    </van-cell>
+<!--                    <van-cell title="现场照片:">-->
+<!--                      <house-location-plan-comp ref="tHouseApplyEndNongye" :uploadDisabled="!formEnabled.acceptingForm.agricultureFormEnabled" :jsonData="uploadImgEndNongyePlan.fileList" :proposer-id="uploadImgTown.proposerId" tableName="t_house_apply_end_nongye_options"-->
+<!--                                                @uploadFileChanged="(x) => {this.uploadImgEndNongyePlan.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgEndNongyePlan.removeFileList = x;}"-->
+<!--                      />-->
+<!--                    </van-cell>-->
+<!--                    <van-cell title="定位当前位置:" v-if="formEnabled.acceptingForm.agricultureFormEnabled">-->
+<!--                      <van-button color="#7AC943" v-model="applicationDetail.tHouseApplyEnd.nongyeGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApplyEndNongye')">定位当前位置</van-button>-->
+<!--                    </van-cell>-->
+<!--                    <van-cell title="查看现场位置:" v-if="!formEnabled.acceptingForm.agricultureFormEnabled">-->
+<!--                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.nongyeGeom !='' || applicationDetail.tHouseApplyEnd.nongyeGeom !=null" v-model="applicationDetail.tHouseApplyEnd.nongyeGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApplyEndNongye')">查看现场位置</van-button>-->
+<!--                    </van-cell>-->
+                    <field-date-picker
+                      v-model="applicationDetail.ydjfys.nyncbmyssj"
+                      label="审批日期"
+                      placeholder="选择日期"
+                      :rules="[{ required: true }]"
+                      formatter="yyyy-MM-dd"
+                      required
+                      :readonly="!formEnabled.acceptingForm.agricultureFormEnabled"
+                    />
+                  </van-col>
+                </van-row>
+                <div id="showInfo"></div>
+              </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">{{applicationDetail.ydjfys.zrzybmmc != null?applicationDetail.ydjfsp.zrzybmmc:'自然资源部'}}意见</van-col>
+                  <van-col span="19">
+                    <van-field required :readonly="!formEnabled.acceptingForm.nature_resourceFormEnabled" rows="2" v-model="applicationDetail.ydjfys.zrzybmysyj" :autosize="true" type="textarea" placeholder="乡镇自然资源部门意见" :rules="[{ required: true }]"/>
+                    <van-cell title="负责人:" :rules="[{ required: true }]">
+                      <van-image
+                        width="100"
+                        height="50"
+                        :readonly="!formEnabled.acceptingForm.nature_resourceFormEnabled"
+                        v-if="applicationDetail.ydjfys.zrzybmysjbrxm !='' && applicationDetail.ydjfys.zrzybmysjbrxm !=null
+                              && applicationDetail.ydjfys.zrzybmysjbrxm.endsWith('png')"
+                        :src="$store.getters.baseRoutingUrl+applicationDetail.ydjfys.zrzybmysjbrxm"
+                      ></van-image>
+                      <div  v-if="applicationDetail.ydjfys.zrzybmysjbrxm !='' && applicationDetail.ydjfys.zrzybmysjbrxm !=null
+                              && !applicationDetail.ydjfys.zrzybmysjbrxm.endsWith('png')">{{applicationDetail.ydjfys.zrzybmysjbrxm}}</div>
+                    </van-cell>
+<!--                    <van-cell title="现场照片:">-->
+<!--                      <house-location-plan-comp ref="tHouseApplyEndNature" :uploadDisabled="!formEnabled.acceptingForm.nature_resourceFormEnabled" :jsonData="uploadImgEndNaturePlan.fileList" :proposer-id="uploadImgEndNaturePlan.proposerId" tableName="t_house_apply_end_nature_options"-->
+<!--                                                @uploadFileChanged="(x) => {this.uploadImgEndNaturePlan.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgEndNaturePlan.removeFileList = x;}"-->
+<!--                      />-->
+<!--                    </van-cell>-->
+<!--                    <van-cell title="定位当前位置:" v-if="formEnabled.acceptingForm.nature_resourceFormEnabled">-->
+<!--                      <van-button color="#7AC943" v-model="applicationDetail.tHouseApplyEnd.natureGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApplyEndNature')">定位当前位置</van-button>-->
+<!--                    </van-cell>-->
+<!--                    <van-cell title="查看现场位置:" v-if="!formEnabled.acceptingForm.nature_resourceFormEnabled">-->
+<!--                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.natureGeom !='' || applicationDetail.tHouseApplyEnd.natureGeom !=null" v-model="applicationDetail.tHouseApplyEnd.natureGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApplyEndNature')">查看现场位置</van-button>-->
+<!--                    </van-cell>-->
+                    <field-date-picker
+                      v-model="applicationDetail.ydjfys.zrzybmyssj"
+                      label="审批日期"
+                      placeholder="选择日期"
+                      :rules="[{ required: true }]"
+                      formatter="yyyy-MM-dd"
+                      required
+                      :readonly="!formEnabled.acceptingForm.nature_resourceFormEnabled"
+                    />
+                  </van-col>
+                </van-row>
+              </div>
+            </template>
+            <template v-if="formVisible.acceptingForm.buildingFormVisible">
+              <div class="main_box examine_box">
+                <van-row type="flex" justify="space-between" align="center">
+                  <van-col span="5">{{applicationDetail.ydjfys.zfcxjsbmmc != null?applicationDetail.ydjfsp.zfcxjsbmmc:'住建部'}}意见</van-col>
+                  <van-col span="19">
+                    <van-field required :readonly="!formEnabled.acceptingForm.buildingFormEnabled" v-model="applicationDetail.ydjfys.zfcxjsbmysyj" rows="2" autosize  type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
+                    <van-cell title="负责人:"  :rules="[{ required: true }]">
+                      <van-image
+                        width="100"
+                        height="50"
+                        :readonly="!formEnabled.acceptingForm.buildingFormEnabled"
+                        v-if="applicationDetail.ydjfys.zfcxjsbmysjbrxm !='' && applicationDetail.ydjfys.zfcxjsbmysjbrxm !=null
+                              && applicationDetail.ydjfys.zfcxjsbmysjbrxm.endsWith('png')"
+                        :src="$store.getters.baseRoutingUrl+applicationDetail.ydjfys.zfcxjsbmysjbrxm"
+                      ></van-image>
+                      <div  v-if="applicationDetail.ydjfys.zfcxjsbmysjbrxm !='' && applicationDetail.ydjfys.zfcxjsbmysjbrxm !=null
+                              && !applicationDetail.ydjfys.zfcxjsbmysjbrxm.endsWith('png')">{{applicationDetail.ydjfys.zfcxjsbmysjbrxm}}</div>
+                    </van-cell>
+                    <!--                      <van-cell title="现场照片:">-->
+                    <!--                        <house-location-plan-comp ref="pictureUploadApplyingTHouseApproveOther" :uploadDisabled="!formEnabled.baseApplyForm.buildingFormEnabled" :jsonData="uploadImgOther.fileList" :proposer-id="uploadImgOther.proposerId" tableName="t_house_approve_other_options"-->
+                    <!--                                                     @uploadFileChanged="(x) => {this.uploadImgOther.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgOther.removeFileList = x;}"-->
+                    <!--                        />-->
+                    <!--                      </van-cell>-->
+                    <!--                      <van-cell title="定位当前位置:" v-if="formEnabled.baseApplyForm.buildingFormEnabled">-->
+                    <!--                        <van-button color="#7AC943" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApproveOther')">定位当前位置</van-button>-->
+                    <!--                      </van-cell>-->
+                    <!--                      <van-cell title="查看现场位置:" v-if="!formEnabled.baseApplyForm.buildingFormEnabled">-->
+                    <!--                        <van-button color="#7AC943" v-if="applicationDetail.tHouseApproveOtherOptions.theGeomPoint !='' || applicationDetail.tHouseApproveOtherOptions.theGeomPoint !=null" v-model="applicationDetail.tHouseApproveOtherOptions.theGeomPoint" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApproveOther')">查看现场位置</van-button>-->
+                    <!--                      </van-cell>-->
+                    <field-date-picker
+                      v-model="applicationDetail.ydjfys.zfcxjsbmyssj"
+                      label="审批日期"
+                      placeholder="选择日期"
+                      :rules="[{ required: true }]"
+                      formatter="yyyy-MM-dd"
+                      required
+                      :readonly="!formEnabled.acceptingForm.buildingFormEnabled"
+                    />
+                  </van-col>
+                </van-row>
+              </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/>意见</van-col>
+                  <van-col span="19">
+                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.ydjfys.xzzfysyj" :autosize="true" type="textarea" placeholder="乡镇政府验收意见" :rules="[{ required: true }]"/>
+                    <van-cell title="负责人:"   :rules="[{ required: true }]">
+                      <van-image
+                        width="100"
+                        height="50"
+                        :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                        v-if="applicationDetail.ydjfys.xzzfysjbrxm !='' && applicationDetail.ydjfys.xzzfysjbrxm !=null
+                              && applicationDetail.ydjfys.xzzfysjbrxm.endsWith('png')"
+                        :src="$store.getters.baseRoutingUrl+applicationDetail.ydjfys.xzzfysjbrxm"
+                      ></van-image>
+                      <div  v-if="applicationDetail.ydjfys.xzzfysjbrxm !='' && applicationDetail.ydjfys.xzzfysjbrxm !=null
+                              && !applicationDetail.ydjfys.xzzfysjbrxm.endsWith('png')">{{applicationDetail.ydjfys.xzzfysjbrxm}}</div>
+                    </van-cell>
+<!--                    <van-cell title="现场照片:">-->
+<!--                      <house-location-plan-comp ref="tHouseApplyEndZhen" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgEndZhenPlan.fileList" :proposer-id="uploadImgEndZhenPlan.proposerId" tableName="t_house_apply_end_zhen_options"-->
+<!--                                                @uploadFileChanged="(x) => {this.uploadImgEndZhenPlan.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgEndZhenPlan.removeFileList = x;}"-->
+<!--                      />-->
+<!--                    </van-cell>-->
+<!--                    <van-cell title="定位当前位置:" v-if="formEnabled.acceptingForm.townFormEnabled">-->
+<!--                      <van-button color="#7AC943" v-model="applicationDetail.tHouseApplyEnd.zhenGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommit('tHouseApplyEndZhen')">定位当前位置</van-button>-->
+<!--                    </van-cell>-->
+<!--                    <van-cell title="查看现场位置:" v-if="!formEnabled.acceptingForm.townFormEnabled">-->
+<!--                      <van-button color="#7AC943" v-if="applicationDetail.tHouseApplyEnd.zhenGeom !='' || applicationDetail.tHouseApplyEnd.zhenGeom !=null" v-model="applicationDetail.tHouseApplyEnd.zhenGeom" type="primary" style="float: right;width:100%;height:40px" @click="dingweiCommitLook('tHouseApplyEndZhen')">查看现场位置</van-button>-->
+<!--                    </van-cell>-->
+                    <field-date-picker
+                      v-model="applicationDetail.ydjfys.xzzfyssj"
+                      label="审批日期"
+                      placeholder="选择日期"
+                      :rules="[{ required: true }]"
+                      formatter="yyyy-MM-dd"
+                      required
+                      :readonly="!formEnabled.acceptingForm.townFormEnabled"
+                    />
+                  </van-col>
+                </van-row>
+              </div>
+
+              <van-field rows="3" :autosize="true" type="textarea" label="备注" label-width="auto"  placeholder="备注" :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.ydjfys.bz" input-align="left"></van-field>
+            </template>
+          </template>
+
+        </van-form>
+      </div>
+
+      <!-- 底部按钮 -->
+      <van-goods-action style="z-index: 999;">
+        <van-goods-action-icon icon="label-o" text="附件" @click="openAttachment" color="#1D6FE9" />
+        <template v-if="formVisible.editVisible">
+          <van-goods-action-button type="info" text="保存"  @click="onSubmit('add')" :disabled="!formEnabled.baseApplyEnabled" v-if="formEnabled.baseApplyEnabled"/>
+          <van-goods-action-button type="info" :text="formEnabled.baseApplyEnabled ? '保存并提交' : '提交'"  @click="onSubmit(formEnabled.baseApplyEnabled ? 'save_and_submit' : 'submit')" :disabled="!formEnabled.submitEnabled"/>
+        </template>
+        <template v-else-if="formEnabled.landscopeEnabled">
+          <van-goods-action-button type="info" text="提交开工"  @click="onSubmit('start_and_submit')"/>
+        </template>
+        <template v-else-if="formEnabled.acceptingEnabled">
+          <van-goods-action-button type="info" text="提交验收"  @click="onSubmit('end')"/>
+        </template>
+        <template v-else-if="formVisible.auditVisible">
+          <van-goods-action-button type="info" text="同意"  @click="onSubmit('agree')"/>
+          <van-goods-action-button type="danger" text="驳回"  @click="onSubmit('reject')"/>
+        </template>
+      </van-goods-action>
+
+      <!-- 3组附件 -->
+      <van-popup
+          v-model="attachmentVisible"
+          closeable
+          position="top"
+          :style="{ height: '61.8%' }"
+          :close-on-click-overlay="proposerStatus == 1"
+          :lazy-render="false"
+        >
+          <van-tabs type="card" style="padding-top: 1.35rem;" color="#1D6FE9" :lazy-render="false" v-model="attachmentActive" ref="attachmentDialog">
+            <van-tab title="申请" key="0">
+              <home-apply-upload-comp
+                :businessType="houseApplyUploadComp.businessType"
+                :houseApplyStatus="houseApplyUploadComp.homeApplyStatus"
+                :processKey="houseApplyUploadComp.processKey"
+                :proposerId="houseApplyUploadComp.proposerId"
+                :tableName="houseApplyUploadComp.tableName"
+                :readonly="houseApplyUploadComp.readonly"
+                :userName="sysFarmer.memberName"
+                :full="houseApplyUploadComp.full"
+                @uploadFinished="onUploadFinished"
+              >
+              </home-apply-upload-comp>
+            </van-tab>
+            <van-tab title="开工" key="1" :disabled="active < 1">
+              <home-apply-upload-comp
+                :business-type="houseApplyUploadCompStart.businessType"
+                :house-apply-status="houseApplyUploadCompStart.homeApplyStatus"
+                :process-key="houseApplyUploadCompStart.processKey"
+                :proposer-id="houseApplyUploadCompStart.proposerId"
+                :table-name="houseApplyUploadCompStart.tableName"
+                :readonly="houseApplyUploadCompStart.readonly"
+                :full="houseApplyUploadCompStart.full"
+              >
+              </home-apply-upload-comp>
+            </van-tab>
+            <van-tab title="验收" key="2" :disabled="active < 2">
+              <home-apply-upload-comp
+                :business-type="houseApplyUploadCompEnd.businessType"
+                :house-apply-status="houseApplyUploadCompEnd.homeApplyStatus"
+                :process-key="houseApplyUploadCompEnd.processKey"
+                :proposer-id="houseApplyUploadCompEnd.proposerId"
+                :table-name="houseApplyUploadCompEnd.tableName"
+                :readonly="houseApplyUploadCompEnd.readonly"
+                :full="houseApplyUploadCompEnd.full"
+              >
+              </home-apply-upload-comp>
+            </van-tab>
+          </van-tabs>
+      </van-popup>
+
+      <!-- 当前流程 -->
+      <van-popup
+        v-model="flowVisible"
+        position="top"
+      >
+        <div class="flow_main_box">
+          <van-row>
+            <van-col span="8"><p class="tit" :style="{'background-color': applicationDetail.proposerActiveIndex >= 0 ? '' : '#ABABAB'}">01 申请</p></van-col>
+            <van-col span="8"><p class="tit" :style="{'background-color': applicationDetail.startActiveIndex >= 0 ? '' : '#ABABAB'}">02 开工</p></van-col>
+            <van-col span="8"><p class="tit" :style="{'background-color': applicationDetail.endActiveIndex >= 0 ? '' : '#ABABAB'}">03 验收</p></van-col>
+          </van-row>
+          <van-row>
+            <van-col span="8">
+              <van-steps direction="vertical" active-color="#1D6FE9" :active="applicationDetail.proposerActiveIndex" style="padding-left: 0.853333rem;">
+                <van-step v-for="(item,index) in applicationDetail.applyStepList" :key="index">{{item}}</van-step>
+              </van-steps>
+            </van-col>
+            <van-col span="8">
+              <van-steps direction="vertical" active-color="#1D6FE9" :active="applicationDetail.startActiveIndex" style="padding-left: 0.853333rem;">
+                <van-step v-for="(item,index) in applicationDetail.startStepList" :key="index">{{item}}</van-step>
+              </van-steps>
+            </van-col>
+            <van-col span="8">
+              <van-steps direction="vertical" active-color="#1D6FE9" :active="applicationDetail.endActiveIndex" style="padding-left: 0.853333rem;">
+                <van-step v-for="(item,index) in applicationDetail.endStepList" :key="index">{{item}}</van-step>
+              </van-steps>
+            </van-col>
+          </van-row>
+        </div>
+      </van-popup>
+      <van-popup v-model="showesign" position="bottom" closeable
+                 close-icon="close">
+        <van-row style="margin:0 10%">
+          <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
+        </van-row>
+        <van-row style="margin: 0 5% 5% 5%;border:1px solid #BFBFBF;">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :height="200"
+            :isCrop="isCrop"
+            :lineWidth="lineWidth"
+            :lineColor="lineColor"
+            :bgColor.sync="bgColor"
+            v-if="!resultImg"
+          />
+          <img :src="resultImg" alt="" width="100%" height="100%" v-if="resultImg"/>
+        </van-row>
+        <van-row type="flex" justify="center" style="margin-bottom:20px;">   <!--v-if="!formEnabled.acceptingForm.townFormEnabled"-->
+          <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleReset">清空画板</van-button></van-col>
+          <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button></van-col>
+        </van-row>
+      </van-popup>
+    </div>
+</template>
+
+<script>
+import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+import HouseLocationPlanComp from "@/components/house/HouseLocationPlanComp";
+import FieldSelect from "@/components/form/FieldSelect";
+import { getHomeapplyydjfsqStatus,listHomeapplytype,getQueryLand, saveHomeBaseInfo  , getHomeMembers , allInformationWLHT, checkDuplicateBuilding, checkDuplicateBuildingQuery, customSubmitWLHT, submitStartWLHT, updateStart, submitEndWLHT, getWorkflow ,selectProposerNh,attach} from "@/api/sunVillage_info/homestead/application";
+import CommonMap from "@/components/house/CommonMap";
+import FieldDatePicker from "@/components/form/FieldDatePicker";
+import FieldRadio from "@/components/form/FieldRadio";
+import FieldCheckbox from "@/components/form/FieldCheckbox";
+import MultiImageUploadComp from "@/components/house/MultiImageUploadComp"
+import {formatDate} from "element-ui/src/utils/date-util.js";
+import request from '@/utils/request'
+import {Notify, Dialog} from "vant";
+import {uploadFile} from "@/api/homesteadSurvey/zjdzd";
+import {updateOpretion} from "@/api/onlineHome/homestead/application";
+import {REGION} from '@/utils/global';
+import axios from "axios";
+
+// 意图
+const PROPOSER_VIEW = 1;
+const PROPOSER_EDIT = 2;
+const PROPOSER_ADD = 3;
+// 阶段
+const PROPOSER_STAGE_BASE_APPLY = 0;
+const PROPOSER_STAGE_START = 1;
+const PROPOSER_STAGE_END = 2;
+// 工作流名称
+const PROPOSER_STAGE_BASE_APPLY_ACTIVITY = 'home_apply';
+const PROPOSER_STAGE_START_ACTIVITY = 'home_start';
+const PROPOSER_STAGE_END_ACTIVITY = 'home_check';
+// 附件表名
+const PROPOSER_STAGE_BASE_APPLY_TABLE = 't_homeapply_ydjfsq';
+const PROPOSER_STAGE_START_TABLE = 't_homeapply_ydjfkg';
+const PROPOSER_STAGE_END_TABLE = 't_homeapply_ydjfys';
+// 其他
+const PROPOSER_MODULE = 'home';
+
+export default {
+  name: "homeApplication",
+    components: {
+      FieldCheckbox,
+      FieldRadio, HomeApplyUploadComp, FieldDatePicker, CommonMap, FieldSelect, HouseLocationPlanComp,MultiImageUploadComp},
+    data() {
+    return {
+      // 当前流程步骤
+      active: 0,
+      // 申请ID
+      id: '',
+      // 表单数据
+      applicationDetail: {},
+      // 当前家庭成员展开
+      activeNames:['1'],
+      showNhxx:false,
+      showTyt:false,
+      wztUpdate:false,
+      tytzName:null,
+      //农户信息集合
+      nhxxList:[],
+      zjddmColumns:[],
+      zjdzdxxList:[],
+      zjdzdxxDetailed:{
+        zdszd:null,
+        zdszn:null,
+        zdszx:null,
+        zdszb:null
+      },
+      tytzList: [],
+      jflxColumns:[],
+      zjdzdxxDetailedShow:false,
+      deptId:null,
+      sysFarmer:{memberName:"",dept:null},
+      showZjddm:null,
+      region:null,
+      showZjdzk:false,
+      // 当前显示流程
+      selectedTabName: 0,
+      processKeyField: null,
+      // 表单意图
+      proposerStatus: PROPOSER_VIEW,
+      // 显示控制
+      formVisible: {
+        baseApplyFormVisible: true,
+        editVisible: false,
+        baseApplyForm: {
+          baseFormVisible: true,
+          homesteadFormVisible: false,
+          groupFormVisible: false,
+          villageFormVisible: false,
+          townFormVisible: false,
+          agricultureFormVisible: false,
+          buildingFormVisible: false,
+          nature_resourceFormVisible: false,
+          homesteadForm: {
+            keepVisible: false, // 是否显示宅基地保留输入
+            otherVisible: false, // 是否显示宅基地其他输入
+          }
+        },
+        landscopeVisible: false,
+        landscopeForm: {
+          baseFormVisible: false,
+          nature_resourceFormVisible: false,
+        },
+        acceptingVisible: false,
+        acceptingForm: {
+          baseFormVisible: false,
+          townFormVisible: false,
+          agricultureFormVisible: false,
+          nature_resourceFormVisible: false,
+          buildingFormVisible: false,
+        },
+        auditVisible: false,
+      },
+      // 表单启用控制
+      formEnabled: {
+        baseApplyEnabled: false,
+        submitEnabled: false,
+        ysnrEnable:false,
+        baseApplyForm: {
+          baseFormEnabled: false,
+          homesteadFormEnabled: false,
+          groupFormEnabled: false,
+          villageFormEnabled: false,
+          townFormEnabled: false,
+          agricultureFormEnabled: false,
+          buildingFormEnabled: false,
+          nature_resourceFormEnabled: false,
+        },
+        landscopeEnabled: false,
+        landscopeForm: {
+          baseFormEnabled: false,
+          nature_resourceFormEnabled: false,
+        },
+        acceptingEnabled: false,
+        acceptingForm: {
+          baseFormEnabled: false,
+          townFormEnabled: false,
+          agricultureFormEnabled: false,
+          nature_resourceFormEnabled: false,
+        },
+      },
+      // 申请附件树
+      houseApplyUploadComp: {
+        businessType: PROPOSER_MODULE,
+        proposerId: null,
+        houseApplyStatus: null,
+        processKey: PROPOSER_STAGE_BASE_APPLY_ACTIVITY,
+        tableName: PROPOSER_STAGE_BASE_APPLY_TABLE,
+        attachmentList: [],
+        readonly: false,
+        full: false,
+      },
+      // 开工附件树
+      houseApplyUploadCompStart: {
+        businessType: PROPOSER_MODULE,
+        proposerId: null,
+        houseApplyStatus: null,
+        processKey: PROPOSER_STAGE_START_ACTIVITY,
+        tableName: PROPOSER_STAGE_START_TABLE,
+        attachmentList: [],
+        readonly: false,
+        full: false,
+      },
+      // 验收附件树
+      houseApplyUploadCompEnd: {
+        businessType: PROPOSER_MODULE,
+        proposerId: null,
+        houseApplyStatus: null,
+        processKey: PROPOSER_STAGE_END_ACTIVITY,
+        tableName: PROPOSER_STAGE_END_TABLE,
+        attachmentList: [],
+        readonly: false,
+        full: false,
+      },
+      currentUserRole: null,
+      // 当前位置信息
+      tGeoOrganizationLat: null,
+      tGeoOrganizationLng: null,
+      // 表单默认值
+      form: {
+        villagerOpinion: "经审查，材料真实有效，符合建房安全、无纠纷，同意申报。",
+        villageOption: "经审查，{sqhhzxm}宅基地和建房申请材料真实有效，拟用地{nsqzjddz}符合村庄规划，相邻人{isAdvice}无异议，同意其宅基地和建房申请。",
+        // applicationDetail.tHouseApplyProposer.memberName, applicationDetail.tHouseApplyProposedSituation.location, null
+        groupOption: "经讨论和公示无异议，{sqhhzxm}符合农村宅基地申请资格，同意{sqhhzxm}的农村宅基地和建房申请。",
+        // applicationDetail.tHouseApplyProposer.memberName, applicationDetail.tHouseApplyProposer.memberName
+      },
+      // 工作流
+      taskId: null,
+      instanceId: null,
+      // 村级领导审核
+      uploadImgVillage: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 自然资源领导审批
+      uploadImgNature: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 农村农业部领导审批
+      uploadImgAgriculture: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 其他部门领导审批
+      uploadImgOther: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 镇级领导审批
+      uploadImgTown: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收自然资源领导审批
+      uploadImgEndNaturePlan: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收农村农业部领导审批
+      uploadImgEndNongyePlan: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收其他部门领导审批
+      uploadImgEndBuildingPlan: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收镇级领导审批
+      uploadImgEndZhenPlan: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 申请镇政府审批平面图
+      uploadImg: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 验收镇政府审批平面图
+      uploadImgAccepting: {
+        proposerId: null,
+        fileList: '',
+        uploadFileList: [],
+        removeFileList: [],
+      },
+      // 地图绘制
+      drawInsert: null,
+      // 附件弹出框显示
+      attachmentVisible: false,
+      // 工作流弹出框显示
+      flowVisible: false,
+      // 是/否字典
+      yesNoOptions: [
+        {dictLabel: '是', dictValue: 'Y'},
+        {dictLabel: '否', dictValue: 'N'},
+      ],
+      yhzgxOptions:[],
+      // 当前附件tab
+      attachmentActive: 0,
+      // 家庭成员tab
+      familyMembersActive: 0,
+      //电子签名
+      showesign: false,
+      //部门签字判断
+      onCliceQz:"",
+      lineWidth: 6, // 画笔的线条粗细
+      lineColor: "#000000", // 画笔的颜色
+      bgColor: "", // 画布的背景颜色
+      resultImg: "", // 最终画布生成的base64图片
+      isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+      mapShow:false,
+      mapZbDw:"",
+      mapBcZb:"",   //定位坐标
+      mapZbNow:"", //当前查看坐标
+    };
+  },
+  created() {  this.id = this.$route.query.id;
+    this.type = this.$route.query.type;
+    this.taskId = this.$route.query.taskId;
+    this.instanceId = this.$route.query.instanceId;
+    this.getDicts("family_status").then(response => {
+      let arr = [];
+      response.data.forEach(function (item) {
+        if (item.dictLabel !== '户主') {
+          arr.push(item)
+        }
+      })
+      this.yhzgxOptions = arr;
+    });
+    this.getDicts("building_type").then(response => {
+      this.jflxColumns = response.data;
+    });
+   if(this.type !== "add"){
+     getHomeapplyydjfsqStatus(this.id).then(response => {
+       this.region = response.data.region;
+       this.deptId = response.data.deptId;
+       console.info(response.data.deptId);
+     });
+   }else{
+     this.deptId = this.sysFarmer.deptId;
+   }
+   if(this.type === "todo" || this.type === "done"){
+     this.$set(this.sysFarmer, 'memberName',  this.$store.getters.nickName);
+   }else{
+
+     this.sysFarmer = {deptId:this.$store.state.user.loginDeptId,id:this.$store.state.user.userId};
+   }
+    this.getFormIntent();
+    this.getDetail();
+    // this.getLandCoord();
+  },
+  methods: {
+    guidProduct(){
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    isYiLong: function() {
+      return this.region === REGION.YI_LONG_XIAN;
+    },
+    // 打开工作流程
+    goFlow(){
+      this.flowVisible = true;
+      //window.location='flowChart?id='+this.id + '&processKey=WLHT';
+    },
+    // 初始化当前数据, 有ID则查询, 否则新增
+    getDetail(){
+      this.reset();
+      if(this.id)
+      {
+        if(this.type === "edit"){
+          this.proposerStatus = PROPOSER_EDIT;
+        }
+        allInformationWLHT(this.id).then(response => {
+          listHomeapplytype({deptId: response.data.deptId,status:"0"}).then(res => {
+            this.tytzList = res.rows;
+            for (let i = 0; i < res.rows.length; i++) {
+              //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code});
+              if(res.rows[i].id === response.data.tyhxt){
+                this.tytzName = res.rows[i].name;
+              }
+            }
+          });
+          this.init(response.data);
+        });
+      }
+      else
+      {
+        listHomeapplytype({deptId:this.sysFarmer.deptId,status:"0"}).then(response => {
+          let _this = this;
+          this.tytzList = response.rows;
+          this.init();
+          // this.getApplyerDetail(this.sysFarmer);
+        });
+      }
+    },
+    // 绘制申请地图
+    pointDarw(data) {
+      this.$nextTick(() => {
+        let map = this.$refs.pointDarwMap;
+        if(data === null)
+          if(this.applicationDetail.ydjfkg != null){
+            data = this.applicationDetail.ydjfkg.theGeomJson;
+            this.setMapData(map, data);
+          }
+      });
+    },
+    // 绘制验收地图
+    pointWrapAcceptance(data) {
+      this.$nextTick(() => {
+        let map = this.$refs.pointDarwAcceptanceMap;
+        if(data === null)
+          if(data === null)
+          {
+            if(this.applicationDetail.tHouseApplyEnd && this.applicationDetail.tHouseApplyEnd.theGeom)
+              data = this.applicationDetail.tHouseApplyEnd.theGeom;
+            else {
+              if(this.applicationDetail.tHouseApproveNatureOptions && this.applicationDetail.tHouseApproveNatureOptions.theGeom)
+                data = this.applicationDetail.tHouseApproveNatureOptions.theGeom;
+            }
+          }
+        this.setMapData(map, data);
+      });
+    },
+    // 绘制开工地图
+    paintStartNatureMap(data) {
+      this.$nextTick(() => {
+        let map = this.$refs.startNatureMap;
+        // if(data === null)
+        // {
+        //   if(this.applicationDetail.tHouseApproveNatureOptions && this.applicationDetail.tHouseApproveNatureOptions.theGeom)
+        //     data = this.applicationDetail.tHouseApproveNatureOptions.theGeom;
+        //   else {
+        //     if(this.applicationDetail.theGeom)
+        //       data = this.applicationDetail.theGeom;
+        //   }
+        // }
+        // this.setMapData(map, data);
+      });
+    },
+    // 绘制自然资源部门地图
+    pointDarwNature(data) {
+      this.$nextTick(() => {
+        let map = this.$refs.pointDarwNatureMap;
+        if(data === null)
+        {
+          if(this.applicationDetail.tHouseApproveNatureOptions && this.applicationDetail.tHouseApproveNatureOptions.theGeom)
+            data = this.applicationDetail.tHouseApproveNatureOptions.theGeom;
+          else {
+            if(this.applicationDetail.theGeom)
+              data = this.applicationDetail.theGeom;
+          }
+        }
+        this.setMapData(map, data);
+      });
+    },
+    // 通用设置地图数据函数
+    setMapData(map, data) {
+      //console.log(map, data ? true : false);
+      if(!map) return;
+      if(data)
+      {
+        map.setLayer('pointDarwLayer', data);
+      }
+      else {
+        this.getLandCoord((lng, lat) => {
+          map.setCoord(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        });
+      }
+    },
+    // 点击流程步骤条, 切换流程表单页
+    onStepClicked(index) {
+      this.selectTab(index);
+    },
+    // 全局初始化
+    init(value) {
+      console.log(value);
+      const role = this.$store.getters.roles;
+      this.currentUserRole = role[0];
+      console.log("当前用户角色: " + role);
+      console.info(this.proposerStatus);
+      // 局部变量
+      let homeApplyStatus = value ? value.homeApplyStatus : -1;
+      let proposerId = value ? value.id : null;
+      let hasGroupLevel = false; //value.tHouseApplyProposer.hasOwnProperty('hasGroupLevel') ? value.tHouseApplyProposer.hasGroupLevel : this.isGroupLevel;
+
+      console.log("当前申请状态: " + homeApplyStatus);
+      this.formVisible.editVisible = false;
+
+      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;
+
+      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;
+
+      this.formEnabled.baseApplyEnabled = false;
+      this.formEnabled.submitEnabled = false;
+      this.formEnabled.baseApplyForm.baseFormEnabled = false;
+      this.formEnabled.baseApplyForm.homesteadFormEnabled = false;
+      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;
+
+      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(homeApplyStatus, ["12", '13']);
+          this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "14"]);
+          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", "19", this.isInRoles(role, 'town_leader') ? -99 : '7', this.isInRoles(role, 'town_leader') ? -99 : '8']);
+          this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
+
+          this.formVisible.landscopeVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", "19", "1C", "1D", "1F"]);
+          this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", "19", "1C", "1D", "1F"]);
+
+          this.formVisible.acceptingVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74", "77", "79", "7C", "7F"]);
+          this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74", "77", "79", "7C", "7F"]);
+          this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(homeApplyStatus, ["7C", "7F"]);
+          ;
+          this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(homeApplyStatus, ["79", "7C", "7F"]);
+          this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(homeApplyStatus, ["79", "7C", "7F"]);
+          this.formVisible.acceptingForm.buildingFormVisible = this.isProposeStatus(homeApplyStatus, ["79", "7C", "7F"]);
+          if (this.type == 'done') {
+            this.formVisible.editVisible = false;
+          }
+          console.info(value);
+          this.houseApplyUploadComp.full = true;
+          this.houseApplyUploadComp.readonly = true;
+          this.$set(this.houseApplyUploadComp, "proposerId", proposerId);
+          this.houseApplyUploadComp.homeApplyStatus = homeApplyStatus;
+          this.houseApplyUploadCompStart.full = true;
+          this.houseApplyUploadCompStart.readonly = true;
+          this.houseApplyUploadCompStart.proposerId = proposerId;
+          this.houseApplyUploadCompStart.houseApplyStatus = homeApplyStatus; // == '10' ? '12' : houseApplyStatus;
+          this.houseApplyUploadCompEnd.full = true;
+          this.houseApplyUploadCompEnd.readonly = true;
+          this.houseApplyUploadCompEnd.proposerId = proposerId;
+          this.houseApplyUploadCompEnd.houseApplyStatus = homeApplyStatus;
+          console.info(this.houseApplyUploadComp);
+          // // 初始化自然资源审批现场图
+          // this.uploadImgNature.fileList = value.tHouseApproveNatureOptions ? value.tHouseApproveNatureOptions.naturePlan : '';
+          // this.uploadImgNature.proposerId = value.tHouseApplyProposer.id;
+          // // 初始化农村农业部审批现场图
+          // this.uploadImgAgriculture.fileList = value.tHouseApproveAgricultureOptions ? value.tHouseApproveAgricultureOptions.agriculturePlan : '';
+          // this.uploadImgAgriculture.proposerId = value.tHouseApplyProposer.id;
+          // // 初始化其他部审批现场图
+          // this.uploadImgOther.fileList = value.tHouseApproveOtherOptions ? value.tHouseApproveOtherOptions.otherPlan : '';
+          // this.uploadImgOther.proposerId = value.tHouseApplyProposer.id;
+          // 初始化镇级审批现场图
+          // this.uploadImgTown.fileList = value.tHouseApproveTownOptions ? value.tHouseApproveTownOptions.townPlan : '';
+          // this.uploadImgTown.proposerId = value.tHouseApplyProposer.id;
+          // 初始化验收农村农业部审批现场图
+          // this.uploadImgEndNongyePlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.nongyePlan : '';
+          // this.uploadImgEndNongyePlan.proposerId = value.tHouseApplyProposer.id;
+          // // 初始化验收自然资源部审批现场图
+          // this.uploadImgEndNaturePlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.naturePlan : '';
+          // this.uploadImgEndNaturePlan.proposerId = value.tHouseApplyProposer.id;
+          // // 初始化验收其他部门审批现场图
+          // this.uploadImgEndBuildingPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.buildingPlan : '';
+          // this.uploadImgEndBuildingPlan.proposerId = value.tHouseApplyProposer.id;
+          // // 初始化验收镇级审批现场图
+          // this.uploadImgEndZhenPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.zhenPlan : '';
+          // this.uploadImgEndZhenPlan.proposerId = value.tHouseApplyProposer.id;
+          // 初始化申请平面图
+          this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : '';
+          this.uploadImg.proposerId = this.applicationDetail.id;
+          // 初始化验收平面图
+          this.uploadImgAccepting.fileList = value.ydjfys ? value.ydjfys.jgpmjt : '';
+          this.uploadImgAccepting.proposerId = this.applicationDetail.id;
+          console.info(this.uploadImgAccepting);
+          //地图查看
+          this.applicationDetail = value;
+          this.pointDarw(null);
+          // this.pointDarwNature(null);
+          // this.pointWrapAcceptance(null);
+          // this.paintStartNatureMap(null);
+          // if(value.homeApplyStage == "1" ){
+          //   if(this.applicationDetail.cjxzscyj !=null && this.applicationDetail.cjxzscyj !=''){
+          //     this.formVisible.baseApplyForm.villageFormVisible = true;
+          //   }
+          //   console.info( this.formVisible.baseApplyForm.villageFormVisible);
+          //   if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.zfcxjsbmscyj !=null && this.applicationDetail.ydjfsp.zfcxjsbmscyj !=''){
+          //     this.formVisible.baseApplyForm.buildingFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.nyncbmscyj !=null && this.applicationDetail.ydjfsp.nyncbmscyj !=''){
+          //     this.formVisible.baseApplyForm.agricultureFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.zrzybmscyj !=null && this.applicationDetail.ydjfsp.zrzybmscyj !=''){
+          //     this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.xzzfshpzyj !=null && this.applicationDetail.ydjfsp.xzzfshpzyj !=''){
+          //     this.formVisible.baseApplyForm.townFormVisible = true;
+          //   }
+          // }
+          // if(value.homeApplyStage == "3" ){
+          //   // if(this.applicationDetail.ydjfys.villageOption !=null && this.applicationDetail.ydjfys.villageOption !=''){
+          //   //   this.formVisible.baseApplyForm.villageFormVisible = true;
+          //   // }
+          //   // if(this.applicationDetail.tHouseApproveOtherOptions.approveOption !=null && this.applicationDetail.tHouseApproveOtherOptions.approveOption !=''){
+          //   //   this.formVisible.acceptingForm.baseFormVisible = false;
+          //   // }
+          //   if(this.applicationDetail.ydjfys.nyncbmysyj !=null && this.applicationDetail.ydjfys.nyncbmysyj !=''){
+          //     this.formVisible.acceptingForm.agricultureFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfys.zrzybmysyj !=null && this.applicationDetail.ydjfys.zrzybmysyj !=''){
+          //     this.formVisible.acceptingForm.nature_resourceFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfys.zfcxjsbmysyj !=null && this.applicationDetail.ydjfys.zfcxjsbmysyj !=''){
+          //     this.formVisible.acceptingForm.buildingFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfys.xzzfysyj !=null && this.applicationDetail.ydjfys.xzzfysyj !=''){
+          //     this.formVisible.acceptingForm.townFormVisible = true
+          //   }
+          // }
+          break;
+
+        // 编辑/审批
+        case PROPOSER_EDIT:
+          let handlerName = this.$store.getters.nickName;
+          let handlerTime = this.getDate();
+          this.applicationDetail = value;
+          if (this.type === "todo") {
+            if (this.isProposeStatus(homeApplyStatus, ["14"])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail, "cjxzscr", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail, "cjxzscr", this.$route.query.nickName);
+              }
+            } else if (this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['nature_resource'])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail.ydjfsp, "zrzybmscrxm", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail.ydjfsp, "zrzybmscrxm", this.$route.query.nickName);
+              }
+            } else if (this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['agriculture'])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail.ydjfsp, "nyncbmscrxm", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail.ydjfsp, "nyncbmscrxm", this.$route.query.nickName);
+              }
+            } else if (this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['building'])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail.ydjfsp, "zfcxjsbmscrxm", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail.ydjfsp, "zfcxjsbmscrxm", this.$route.query.nickName);
+              }
+            } else if (this.isProposeStatus(homeApplyStatus, ["1C"]) && this.isInRoles(role, ['town_leader'])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail.ydjfsp, "xzzfshpzrxm", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail.ydjfsp, "xzzfshpzrxm", this.$route.query.nickName);
+              }
+            } else if (this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['nature_resource'])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail.ydjfys, "zrzybmysjbrxm", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail.ydjfys, "zrzybmysjbrxm", this.$route.query.nickName);
+              }
+            } else if (this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['agriculture'])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail.ydjfys, "nyncbmysjbrxm", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail.ydjfys, "nyncbmysjbrxm", this.$route.query.nickName);
+              }
+            } else if (this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['building'])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail.ydjfys, "zfcxjsbmysjbrxm", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail.ydjfys, "zfcxjsbmysjbrxm", this.$route.query.nickName);
+              }
+            } else if (this.isProposeStatus(homeApplyStatus, ["7C"]) && this.isInRoles(role, ['town_leader'])) {
+              if (this.$route.query.electronicSignature != null) {
+                this.$set(this.applicationDetail.ydjfys, "xzzfysjbrxm", this.$route.query.electronicSignature);
+              } else {
+                this.$set(this.applicationDetail.ydjfys, "xzzfysjbrxm", this.$route.query.nickName);
+              }
+            }
+          }
+          if (this.isProposeStatus(homeApplyStatus, ["71", "72", "74", '77', "79", "7C"])) {
+            this.formEnabled.ysnrEnable = true;
+          }
+          this.formVisible.auditVisible = this.type === 'done' || this.type === 'todo';
+          // 申请-组级审批 初始化表单
+          if (hasGroupLevel) {
+            if (this.isProposeStatus(homeApplyStatus, ["32"])) {
+              let defaultGroupOption = this.form.groupOption
+                .replaceAll('{memberName}', this.applicationDetail.sqhhzxm)
+              ;
+              if (!value.tHouseApproveVillageOptions) {
+                this.$set(this.applicationDetail, 'tHouseApproveVillageOptions', {
+                  groupLeader: handlerName,
+                  groupTime: handlerTime,
+                  groupOption: defaultGroupOption
+                });
+              } else {
+                if (!this.applicationDetail.tHouseApproveVillageOptions.groupLeader)
+                  this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'groupLeader', handlerName);
+                if (!this.applicationDetail.tHouseApproveVillageOptions.groupTime)
+                  this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'groupTime', handlerTime);
+                if (!this.applicationDetail.tHouseApproveVillageOptions.groupOption)
+                  this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'groupOption', defaultGroupOption);
+              }
+            }
+          }
+          // 申请-草稿
+          if (this.isProposeStatus(homeApplyStatus, ["11"])) {
+            this.formEnabled.baseApplyForm.baseFormEnabled = true;
+            this.formEnabled.baseApplyEnabled = true;
+            this.formEnabled.submitEnabled = true;
+            this.formVisible.editVisible = true;
+          }
+          // 申请-村级审核
+          else if (this.isProposeStatus(homeApplyStatus, ["14", "15", "17", "19"])) {
+            let neighbor = [];
+            if (this.applicationDetail.nsqzjdszd) neighbor.push(this.applicationDetail.nsqzjdszd);
+            if (this.applicationDetail.nsqzjdszx) neighbor.push(this.applicationDetail.nsqzjdszx);
+            if (this.applicationDetail.nsqzjdszn) neighbor.push(this.applicationDetail.nsqzjdszn);
+            if (this.applicationDetail.nsqzjdszb) neighbor.push(this.applicationDetail.nsqzjdszb);
+            neighbor = neighbor.join('、');
+            if(this.applicationDetail.cjxzscyj != null && this.applicationDetail.cjxzscyj !== "" ){
+              this.$set(this.applicationDetail, 'cjxzscyj', this.applicationDetail.cjxzscyj);
+              this.$set(this.applicationDetail, 'cjxzscsj', this.applicationDetail.cjxzscsj);
+            }else{
+              let defaultVillageOption = this.form.villageOption
+                .replaceAll('{sqhhzxm}', this.applicationDetail.sqhhzxm)
+                .replaceAll('{nsqzjddz}', this.applicationDetail.nsqzjddz)
+                .replaceAll('{isAdvice}', neighbor);
+              this.$set(this.applicationDetail, 'cjxzscyj', defaultVillageOption);
+              this.$set(this.applicationDetail, 'cjxzscsj', handlerTime);
+            }
+
+          }
+            // 申请-镇级审批
+            // else if(this.isProposeStatus(homeApplyStatus, ["19"]))
+            // {
+            //   // 自然资源部门
+            //   if(!value.tHouseApproveNatureOptions)
+            //   {
+            //     this.$set(this.applicationDetail, "tHouseApproveNatureOptions", {
+            //       landArea: null,
+            //       rightsType: null,
+            //       east: null, // 东至
+            //       west: null, // 西至
+            //       south: null, // 南至
+            //       north: null, // 北至
+            //       //approveLeader: handlerName,
+            //       approveLeader: null,
+            //       approveOption: null,
+            //       approveTime: handlerTime,
+            //       theGeom: value.tHouseApplyProposedSituation.theGeom,
+            //       naturePlan: null, //现场拍照
+            //       theGeomPoint: null,  //现场坐标点
+            //     });
+            //   }
+            //   else {
+            //     if(!this.applicationDetail.tHouseApproveNatureOptions.approveLeader)
+            //      // this.$set(this.applicationDetail.tHouseApproveNatureOptions, 'approveLeader', handlerName);
+            //     if(!this.applicationDetail.tHouseApproveNatureOptions.approveTime)
+            //       this.$set(this.applicationDetail.tHouseApproveNatureOptions, 'approveTime', handlerTime);
+            //   }
+            //   // 农村农业部门
+            //   if(!value.tHouseApproveAgricultureOptions)
+            //   {
+            //     this.$set(this.applicationDetail, "tHouseApproveAgricultureOptions", {
+            //       isMembership: null,
+            //       isOnehouse: null,
+            //       isReviewmaterials: null,
+            //       //approveLeader: handlerName,
+            //       approveLeader: null,
+            //       approveOption: null,
+            //       approveTime: handlerTime,
+            //       agriculturePlan: null, //现场拍照
+            //       theGeomPoint: null,  //现场坐标点
+            //     });
+            //   }
+            //   else {
+            //     if(!this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader)
+            //       //this.$set(this.applicationDetail.tHouseApproveAgricultureOptions, 'approveLeader', handlerName);
+            //     if(!this.applicationDetail.tHouseApproveAgricultureOptions.approveTime)
+            //       this.$set(this.applicationDetail.tHouseApproveAgricultureOptions, 'approveTime', handlerTime);
+            //   }
+            //   // 住建部
+            //   if(!value.tHouseApproveOtherOptions)
+            //   {
+            //     this.$set(this.applicationDetail, "tHouseApproveOtherOptions", {
+            //       buildingType: null,
+            //       buildingArea: null,
+            //       buildingFloors: null,
+            //       buildingHight: null,
+            //       buildingLandArea: null,
+            //       designPaper: "1",
+            //       east: null, // 东至
+            //       west: null, // 西至
+            //       south: null, // 南至
+            //       north: null, // 北至
+            //       //approveLeader: handlerName,
+            //       approveLeader: null,
+            //       approveOption: null,
+            //       approveTime: handlerTime,
+            //       otherPlan: null, //现场拍照
+            //       theGeomPoint: null,  //现场坐标点
+            //     });
+            //   }
+            //   else {
+            //     if(!this.applicationDetail.tHouseApproveOtherOptions.approveLeader)
+            //      // this.$set(this.applicationDetail.tHouseApproveOtherOptions, 'approveLeader', handlerName);
+            //     if(!this.applicationDetail.tHouseApproveOtherOptions.approveTime)
+            //       this.$set(this.applicationDetail.tHouseApproveOtherOptions, 'approveTime', handlerTime);
+            //   }
+            //   // 镇政府
+            //   if(!value.tHouseApproveTownOptions)
+            //   {
+            //     this.$set(this.applicationDetail, 'tHouseApproveTownOptions', {
+            //       //approveLeader: handlerName,
+            //       approveLeader: null,
+            //       approveTime: handlerTime,
+            //       townPlan: null, //现场拍照
+            //       theGeomPoint: null,  //现场坐标点
+            //     });
+            //   }
+            //   else {
+            //     if(!this.applicationDetail.tHouseApproveTownOptions.approveLeader)
+            //      // this.$set(this.applicationDetail.tHouseApproveTownOptions, 'approveLeader', handlerName);
+            //     if(!this.applicationDetail.tHouseApproveTownOptions.approveTime)
+            //       this.$set(this.applicationDetail.tHouseApproveTownOptions, 'approveTime', handlerTime);
+            //   }
+            //   // 勘察
+            //   if(!value.tHouseApproveLocationplanOptions)
+            //   {
+            //     this.$set(this.applicationDetail, 'tHouseApproveLocationplanOptions', {
+            //       locationPlan: null,
+            //       cartographicUnit: null,
+            //       surveyPersonnel: handlerName,
+            //       suveyTime: handlerTime,
+            //       cartographer: handlerName,
+            //       cartographicTime: handlerTime,
+            //     });
+            //   }
+            //   else {
+            //     if(!this.applicationDetail.tHouseApproveLocationplanOptions.surveyPersonnel)
+            //       this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'surveyPersonnel', handlerName);
+            //     if(!this.applicationDetail.tHouseApproveLocationplanOptions.suveyTime)
+            //       this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'suveyTime', handlerTime);
+            //     if(!this.applicationDetail.tHouseApproveLocationplanOptions.cartographer)
+            //       this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'cartographer', handlerName);
+            //     if(!this.applicationDetail.tHouseApproveLocationplanOptions.cartographicTime)
+            //       this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'cartographicTime', handlerTime);
+            //   }
+            //   console.info(this.formVisible.auditVisible);
+            // }
+
+          // 开工申请
+          else if (this.isProposeStatus(homeApplyStatus, ["10"])) {
+            if (!this.applicationDetail.tHouseApplyStart) {
+              this.$set(this.applicationDetail, 'tHouseApplyStart', {
+                startDate: null,
+                endDate: null,
+              });
+            }
+          }
+
+            // 验收
+            // else if(this.isProposeStatus(homeApplyStatus, ["71"]))
+            // {
+            //   if(!this.applicationDetail.tHouseApplyEnd)
+            //   {
+            //     this.$set(this.applicationDetail, 'tHouseApplyEnd', {
+            //       //TODO: 开工结束时后台必定生成
+            //     });
+            //   }
+            //   if(this.applicationDetail.tHouseApplyEnd.oldHouseStatus == '0')
+            //     this.applicationDetail.tHouseApplyEnd.oldHouseStatus = null;
+            // }
+          // 开工二道场审批
+
+          else if (this.isProposeStatus(homeApplyStatus, ["39"])){
+            if(this.isInRoles(role, ['nature_resource']))
+            {
+              this.formVisible.landscopeForm.nature_resourceFormEnabled = true;
+              console.info(this.formVisible.landscopeForm.nature_resourceFormEnabled);
+            }
+            }
+          // 验收镇级审批
+          else if(this.isProposeStatus(homeApplyStatus, ["79","7C","7F"]))
+          {
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              if(!this.applicationDetail.ydjfys.jgpmjtjbr) this.applicationDetail.ydjfys.jgpmjtjbr = handlerName;
+              if(!this.applicationDetail.ydjfys.xzzfysjbrxm) //this.applicationDetail.tHouseApplyEnd.zhenName = handlerName;
+              if(!this.applicationDetail.ydjfys.xzzfyssj) this.applicationDetail.ydjfys.xzzfyssj = handlerTime;
+            }
+
+            if(this.isInRoles(role, ['agriculture']))
+            {
+              if(!this.applicationDetail.ydjfys.nyncbmysjbrxm) //this.applicationDetail.tHouseApplyEnd.nongyeName = handlerName;
+              if(!this.applicationDetail.ydjfys.nyncbmyssj) this.applicationDetail.ydjfys.nyncbmyssj = handlerTime;
+            }
+
+            if(this.isInRoles(role, ['nature_resource']))
+            {
+              if(!this.applicationDetail.ydjfys.zrzybmysjbrxm) //this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
+              if(!this.applicationDetail.ydjfys.zrzybmyssj) this.applicationDetail.ydjfys.zrzybmyssj = handlerTime;
+            }
+
+            if(this.isInRoles(role, ['building']))
+            {
+              if(!this.applicationDetail.ydjfys.zfcxjsbmysjbrxm) //this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
+                if(!this.applicationDetail.ydjfys.zfcxjsbmyssj) this.applicationDetail.ydjfys.zfcxjsbmyssj = handlerTime;
+            }
+            if(0)
+            {
+              if(!this.applicationDetail.ydjfys.buildingName) //this.applicationDetail.tHouseApplyEnd.buildingName = handlerName;
+              if(!this.applicationDetail.ydjfys.buildingTime) this.applicationDetail.tHouseApplyEnd.buildingTime = handlerTime;
+            }
+
+            // if(0) {
+            //   if (!this.applicationDetail.ydjfys.isProjectFinished) this.applicationDetail.tHouseApplyEnd.isProjectFinished = 'Y';
+            //   if (!this.applicationDetail.ydjfys.isQualifiedQuality) this.applicationDetail.tHouseApplyEnd.isQualifiedQuality = 'Y';
+            //   if (!this.applicationDetail.ydjfys.hasBuildingRecord) this.applicationDetail.tHouseApplyEnd.hasBuildingRecord = 'Y';
+            //   if (!this.applicationDetail.ydjfys.isSignWarranty) this.applicationDetail.tHouseApplyEnd.isSignWarranty = 'Y';
+            //   if (!this.applicationDetail.ydjfys.isHandleProblem) this.applicationDetail.tHouseApplyEnd.isHandleProblem = 'Y';
+            //   if (!this.applicationDetail.ydjfys.isDesignPaperSame) this.applicationDetail.tHouseApplyEnd.isDesignPaperSame = 'Y';
+            //   if (!this.applicationDetail.ydjfys.isOtherAcceptanceFinished) this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished = 'Y';
+            // }
+          }
+
+          // 可见/隐藏
+          this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(homeApplyStatus, ["1","25"]);
+          this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "31", "71"]);
+
+          if(this.isNotProposeStatus(homeApplyStatus, ["11", "14", "15","17", "31", "34", '71', '74']))
+          {
+
+            if(this.isInRoles(role, ['town_leader', 'agriculture']))
+            {
+              this.formVisible.baseApplyForm.agricultureFormVisible = true;
+              // this.applicationDetail.tHouseApproveAgricultureOptions.approveOption = null;
+              // this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader = null;
+              this.applicationDetail.ydjfsp.nyncbmscsj = handlerTime;
+            }
+            if(this.isInRoles(role, ['town_leader', 'building']))
+            {
+              this.formVisible.baseApplyForm.buildingFormVisible = true;
+              // this.applicationDetail.tHouseApproveOtherOptions.approveOption = null;
+              // this.applicationDetail.tHouseApproveOtherOptions.approveLeader = null;
+              this.applicationDetail.ydjfsp.zfcxjsbmscsj = handlerTime;
+            }
+            if(this.isInRoles(role, ['town_leader', 'nature_resource']))
+            {
+              this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
+              // this.applicationDetail.tHouseApproveNatureOptions.approveOption = null;
+              // this.applicationDetail.tHouseApproveNatureOptions.approveLeader = null;
+              this.applicationDetail.ydjfsp.zrzybmscsj = handlerTime;
+            }
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              this.formVisible.baseApplyForm.townFormVisible = true;
+              // this.applicationDetail.tHouseApproveTownOptions.approveOption = null;
+              // this.applicationDetail.tHouseApproveTownOptions.approveLeader = null;
+              this.applicationDetail.ydjfsp.xzzfshpzsj = handlerTime;
+              this.applicationDetail.ydjfsp.zjdzlpmwzxctksj = handlerTime;
+              this.applicationDetail.ydjfsp.zckcsj = handlerTime;
+              this.wztUpdate = true;
+            }
+          }
+
+          this.formVisible.landscopeVisible = this.isNotProposeStatus(homeApplyStatus, ["12", "14", "15","19", "1C", "1D", '1F',]);
+          this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(homeApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9',"25"]);
+
+          //this.formVisible.baseApplyForm.townFormVisible = this.landscopeVisible
+          this.formVisible.acceptingVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74","77", "79", "7C", "7F"]);
+          this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74", "77","79", "7C", "7F"]);
+        //   selectProposerNh({hzzjhm:this.applicationDetail.sqhhzsfzh,deptId:value.deptId}).then(res => {
+        //     if(res.rows.length > 0){
+        //       this.getMemberCurrentSituation(res.rows[0].id);
+        //     }
+        // });
+
+          (this.isProposeStatus(homeApplyStatus, ["79", "7C","7F"]))
+          {
+            if(this.isInRoles(role, ['town_leader', 'agriculture']))
+            {
+              this.formVisible.acceptingForm.agricultureFormVisible = true;
+            }
+            if(this.isInRoles(role, ['town_leader', 'nature_resource']))
+            {
+              this.formVisible.acceptingForm.nature_resourceFormVisible = true;
+            }
+            if(this.isInRoles(role, ['town_leader', 'building']))
+            {
+              this.formVisible.acceptingForm.buildingFormVisible = true;
+            }
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              this.formVisible.acceptingForm.townFormVisible = true;
+            }
+          }
+          // 禁用/启用
+          this.formEnabled.baseApplyForm.groupFormEnabled = hasGroupLevel && this.isProposeStatus(homeApplyStatus, ["12",'32',"72"]) && this.isInRoles(role, 'village_group_leader');
+          this.formEnabled.baseApplyForm.villageFormEnabled = this.isProposeStatus(homeApplyStatus, ["14","34","74"]) && this.isInRoles(role, 'village_leader');
+          // //驳回时审批意见及签名清空
+          // if(this.formEnabled.baseApplyForm.villageFormEnabled){
+          //   this.applicationDetail.tHouseApproveVillageOptions.villageLeader = null;
+          //   //this.applicationDetail.tHouseApproveVillageOptions.
+          // }
+          if(this.isProposeStatus(homeApplyStatus, ['19',"1C"]))
+          {
+            if(this.isInRoles(role, ['agriculture']))
+            {
+              this.formEnabled.baseApplyForm.agricultureFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['building']))
+            {
+              this.formEnabled.baseApplyForm.buildingFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['nature_resource']))
+            {
+              this.formEnabled.baseApplyForm.nature_resourceFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              this.formEnabled.baseApplyForm.townFormEnabled = true;
+            }
+          }
+          this.formEnabled.landscopeEnabled = this.isProposeStatus(homeApplyStatus, ['31']);
+          this.formEnabled.landscopeForm.baseFormEnabled = this.isProposeStatus(homeApplyStatus, ['31']);
+
+          this.formEnabled.acceptingEnabled = this.isProposeStatus(homeApplyStatus, ['71']);
+          this.formEnabled.acceptingForm.baseFormEnabled = this.isProposeStatus(homeApplyStatus, ['71']);
+          if(this.isProposeStatus(homeApplyStatus, ['79',"7C"]))
+          {
+            if(this.isInRoles(role, ['agriculture']))
+            {
+              this.formEnabled.acceptingForm.agricultureFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['nature_resource']))
+            {
+              this.formEnabled.acceptingForm.nature_resourceFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['building']))
+            {
+              this.formEnabled.acceptingForm.buildingFormEnabled = true;
+            }
+            if(this.isInRoles(role, ['town_leader']))
+            {
+              this.formEnabled.acceptingForm.townFormEnabled = true;
+            }
+          }
+
+          // this.applicationDetail.tHouseApplyProposer = value.tHouseApplyProposer;
+          // this.applicationDetail.tHouseApplyCurrentSituation = value.tHouseApplyCurrentSituation;
+          // this.applicationDetail.tHouseApplyProposedSituation = value.tHouseApplyProposedSituation;
+          //this.formEnabled.landscopeEnabled = value.startDraft;
+
+          //this.formVisible.baseApplyForm.townFormVisible = this.isLandscope(homeApplyStatus, ["12", "13", "14", "15", "16", "17", "28", "19", "18"]);
+          //this.formVisible.baseApplyForm.townFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
+          //this.applicationDetail.tHouseApplyProposer = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
+          //this.formVisible.baseApplyForm.villageFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
+          //this.formVisible.acceptingVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
+
+          if (this.isLandscope()) {
+            this.houseApplyUploadComp.full = true;
+            this.houseApplyUploadCompStart.full = false;
+            this.houseApplyUploadCompEnd.full = false;
+            this.houseApplyUploadComp.readonly = homeApplyStatus != '11';
+            this.houseApplyUploadCompStart.readonly = false;
+            this.houseApplyUploadCompEnd.readonly = true;
+          } else if (this.isAccepting()) {
+            this.houseApplyUploadComp.full = true;
+            this.houseApplyUploadCompStart.full = true;
+            this.houseApplyUploadCompEnd.full = false;
+            this.houseApplyUploadComp.readonly = true;
+            this.houseApplyUploadCompStart.readonly = true;
+            this.houseApplyUploadCompEnd.readonly = false;
+          }
+          else { // this.isBaseApply()
+            this.houseApplyUploadComp.full = false;
+            this.houseApplyUploadCompStart.full = false;
+            this.houseApplyUploadCompEnd.full = false;
+            this.houseApplyUploadComp.readonly = false;
+            this.houseApplyUploadCompStart.readonly = homeApplyStatus == '11' ? false : true;
+            this.houseApplyUploadCompEnd.readonly = true;
+          }
+
+          this.houseApplyUploadComp.proposerId = proposerId;
+          this.houseApplyUploadComp.homeApplyStatus = homeApplyStatus == '12' ? '10' : homeApplyStatus; // 申请通过是10 被驳回是12;
+          this.houseApplyUploadCompStart.proposerId = proposerId;
+          this.houseApplyUploadCompStart.homeApplyStatus = homeApplyStatus == '10' ? '12' : homeApplyStatus; // 申请通过是10 被驳回是12
+          this.houseApplyUploadCompEnd.proposerId = proposerId;
+          this.houseApplyUploadCompEnd.homeApplyStatus = homeApplyStatus;
+          // 初始化村级审核现场图
+          this.uploadImgVillage.fileList = value.tHouseApproveVillageOptions ? value.tHouseApproveVillageOptions.villagePlan : '';
+          this.uploadImgVillage.proposerId = value.id;
+          // 初始化自然资源审批现场图
+          this.uploadImgNature.fileList = value.tHouseApproveNatureOptions ? value.tHouseApproveNatureOptions.naturePlan : '';
+          this.uploadImgNature.proposerId = value.id;
+          // 初始化其他部审批现场图
+          this.uploadImgOther.fileList = value.tHouseApproveOtherOptions ? value.tHouseApproveOtherOptions.otherPlan : '';
+          this.uploadImgOther.proposerId = value.id;
+          // 初始化农村农业部审批现场图
+          this.uploadImgAgriculture.fileList = value.tHouseApproveAgricultureOptions ? value.tHouseApproveAgricultureOptions.agriculturePlan : '';
+          this.uploadImgAgriculture.proposerId = value.id;
+          // 初始化镇级审批现场图
+          this.uploadImgTown.fileList = value.tHouseApproveTownOptions ? value.tHouseApproveTownOptions.townPlan : '';
+          this.uploadImgTown.proposerId = value.id;
+          // 初始化验收农村农业部审批现场图
+          this.uploadImgEndNongyePlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.nongyePlan : '';
+          this.uploadImgEndNongyePlan.proposerId = value.id;
+          // 初始化验收自然资源部审批现场图
+          this.uploadImgEndNaturePlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.naturePlan : '';
+          this.uploadImgEndNaturePlan.proposerId = value.id;
+          // 初始化验收其他部门审批现场图
+          this.uploadImgEndBuildingPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.buildingPlan : '';
+          this.uploadImgEndBuildingPlan.proposerId = value.id;
+          // 初始化验收镇级审批现场图
+          this.uploadImgEndZhenPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.zhenPlan : '';
+          this.uploadImgEndZhenPlan.proposerId = value.id;
+          // 初始化申请平面图
+          this.applicationDetail.tHouseApproveLocationplanOptions = value.tHouseApproveLocationplanOptions;
+          this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : '';
+          this.uploadImg.proposerId = this.applicationDetail.id;
+
+          this.uploadImgAccepting.fileList = value.ydjfys ? value.ydjfys.jgpmjt : '';
+          this.uploadImgAccepting.proposerId = this.applicationDetail.id;
+
+          console.info("-------------------------"+role+"-------------------------");
+          //地图编辑
+          this.pointDarw(null);
+          // this.pointDarwNature(null);
+          // this.pointWrapAcceptance(null);
+          // this.paintStartNatureMap(null);
+          break;
+
+        // 新建
+        case PROPOSER_ADD:
+          this.formEnabled.baseApplyEnabled = true;
+          this.formEnabled.baseApplyForm.baseFormEnabled = true;
+          this.formEnabled.submitEnabled = true;
+          this.formVisible.editVisible = true;
+
+          this.houseApplyUploadComp.full = false;
+          this.houseApplyUploadComp.readonly = false;
+          this.houseApplyUploadComp.homeApplyStatus = '11';
+          this.houseApplyUploadComp.proposerId = -1;
+          this.$nextTick(()=>{
+            getWorkflow(this.sysFarmer.deptId).then((resp) => {
+              this.$set(this.applicationDetail, 'proposerActiveIndex', 0);
+              this.$set(this.applicationDetail, 'startActiveIndex', -1);
+              this.$set(this.applicationDetail, 'endActiveIndex', -1);
+              this.$set(this.applicationDetail, 'applyStepList', resp.data.applyStepList.name);
+              this.$set(this.applicationDetail, 'startStepList', resp.data.startStepList.name);
+              this.$set(this.applicationDetail, 'endStepList', resp.data.endStepList.name);
+            });
+          })
+          this.pointDarw();
+
+          //this.initData();
+          break;
+      }
+
+      // 通用设置
+      // if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
+      if(this.type =='done' && this.applicationDetail.ydjfys == null){
+        if (this.isAccepting()) {
+          this.active = PROPOSER_STAGE_START;
+          this.selectedTabName = PROPOSER_STAGE_START;
+          this.processKeyField = PROPOSER_STAGE_START_ACTIVITY;
+          this.attachmentActive = PROPOSER_STAGE_START;
+        }else if(this.isLandscope()){
+          this.active = PROPOSER_STAGE_START;
+          this.selectedTabName = PROPOSER_STAGE_START;
+          this.processKeyField = PROPOSER_STAGE_START_ACTIVITY;
+          this.attachmentActive = PROPOSER_STAGE_START;
+        }else
+         { // this.isBaseApply()
+          this.active = PROPOSER_STAGE_BASE_APPLY;
+          this.selectedTabName = PROPOSER_STAGE_BASE_APPLY;
+          this.attachmentActive = PROPOSER_STAGE_BASE_APPLY;
+          // 编辑时且为申请通过状态 -> 填写开工
+          if(this.proposerStatus == PROPOSER_EDIT && homeApplyStatus == '10')
+          {
+            this.active = PROPOSER_STAGE_START;
+            this.selectedTabName = PROPOSER_STAGE_START;
+            this.attachmentActive = PROPOSER_STAGE_START;
+          }
+
+          this.processKeyField = PROPOSER_STAGE_BASE_APPLY_ACTIVITY;
+        }
+      } else {
+        console.info(this.applicationDetail);
+        if (this.isLandscope()) {
+          this.active = PROPOSER_STAGE_START;
+          this.selectedTabName = PROPOSER_STAGE_START;
+          this.processKeyField = PROPOSER_STAGE_START_ACTIVITY;
+          this.attachmentActive = PROPOSER_STAGE_START;
+        } else if (this.isAccepting()) {
+          this.active = PROPOSER_STAGE_END;
+          this.selectedTabName = PROPOSER_STAGE_END;
+          // 编辑时且为申请通过状态 -> 查看验收草稿
+          if(this.proposerStatus == PROPOSER_VIEW && this.isProposeStatus(homeApplyStatus, ["3F"])){
+            this.selectedTabName = PROPOSER_STAGE_START;
+          }
+          this.processKeyField = PROPOSER_STAGE_END_ACTIVITY;
+          this.attachmentActive = PROPOSER_STAGE_END;
+        }
+        else { // this.isBaseApply()
+          this.active = PROPOSER_STAGE_BASE_APPLY;
+          this.selectedTabName = PROPOSER_STAGE_BASE_APPLY;
+          this.attachmentActive = PROPOSER_STAGE_BASE_APPLY;
+          // 编辑时且为申请通过状态 -> 填写开工
+          if(this.proposerStatus == PROPOSER_EDIT && homeApplyStatus == '1F')
+          {
+            this.active = PROPOSER_STAGE_START;
+            this.selectedTabName = PROPOSER_STAGE_START;
+            this.attachmentActive = PROPOSER_STAGE_START;
+          }
+
+          this.processKeyField = PROPOSER_STAGE_BASE_APPLY_ACTIVITY;
+        }
+      }
+    },
+    onJflxChanged(val){
+      let _this = this;
+      this.jflxColumns.map(function(item){
+        if(item.dictValue === val){
+          _this.$set(_this.applicationDetail, 'projectName', item.dictLabel);
+          _this.$set(_this.applicationDetail, 'jflx', item.dictValue);
+        }
+      });
+    },
+    // 获取query的意图
+    getFormIntent() {
+      console.log(this.type);
+      switch (this.type) {
+        case 'done':
+        case 'view':
+          this.proposerStatus = PROPOSER_VIEW;
+          break;
+        case 'add':
+          this.proposerStatus = PROPOSER_ADD;
+          break;
+        case 'modify':
+        case 'audit':
+        case 'todo':
+          this.proposerStatus = PROPOSER_EDIT;
+          break;
+        default:
+          this.proposerStatus = PROPOSER_VIEW;
+          break;
+      }
+      return this.proposerStatus;
+    },
+    // 获取日期, yyyy-MM-dd
+    getDate(d) {
+      return formatDate(d ? d : new Date(), 'yyyy-MM-dd');
+    },
+    // 初始化基础表单
+    reset() {
+     this.applicationDetail = {
+       sqhhzxm: "",
+       sqhhzxb: "",
+       sqhhznl: "" /* 年龄*/,
+       sqhhzlxdh: "",
+       sqhhzsfzh: "",
+       sqhhzhkszd: "",
+       sqhjtzz: "",
+       members: 0, // 家庭人口数
+       applyTime: this.getDate(),
+       sqly: "",
+       houseSource: "建房申请来源{农户自制,协管代办}", // 字典
+       homeApplyStatus: "", // 字典
+       auditStatus: "", // 字典
+       taskId: "",
+       taskName: "",
+       instanceId: "",
+       processKey: "",
+       existHomestead: "N",
+       xzjdmj: null, //现宅基地面积
+       qszsh: null,//权属证书号
+       xjzmj: null,//现建筑面积
+       xzjdczqk: null,// 现宅基地处置情况
+       xzjdblmj: null, //现宅基地保留面积m²
+       xzjdqtqk: null,// 现宅基地其他情况
+       nsqzjddz: null, // 拟申请宅基地地址
+       nsqzjdmj: null, // 拟申请宅基地面积
+       nsqzjdszd: null, // 东至
+       nsqzjdszx: null, // 西至
+       nsqzjdszn: null, // 南至
+       nsqzjdszb: null, // 北至
+       nsqzjddldm: "10", // 地类
+       zfjzmj: null, // 建筑面积
+       jzcs: null, // 建筑层数
+       jzgd: null, // 建筑高度
+       sjtz: "1", // 设计图纸
+       sfzqxlqlryj: "1", // 是否征求相邻权利人意见
+       jflx: "4",
+       nsqfjzdmj: null, //房基占地面积
+       sqrjtcyList: [],
+       fileList: []
+     }
+    },
+    //是否有宅基地选项改变
+    existHomesteadChange(name){
+      console.log(name);
+      this.applicationDetail.sfzqxlqlryj =name;
+      // if (name == 'Y'){
+      //   if (!this.applicationDetail.tHouseApplyCurrentSituation){
+      //     //现宅基地情况
+      //     this.$set(this.applicationDetail, 'tHouseApplyCurrentSituation', {
+      //       //宅基地面积
+      //       landArea: null,
+      //       //人均宅基地面积
+      //       landPerArea: null,
+      //       //不动产单元号
+      //       landCertificateNo: null,
+      //       //农民房屋幢号
+      //       houseCertificateNo: null,
+      //       //建筑面积
+      //       buildingArea: null,
+      //       //人均建筑面积
+      //       buildingPerArea: null,
+      //       //现宅基地处置情况 字典 land_isposal
+      //       landIsposal: null
+      //     });
+      //   }
+      // }
+      // else
+      //   this.$set(this.applicationDetail, 'tHouseApplyCurrentSituation', null);
+    },
+    //添加家庭成员
+    addFamily(){
+      this.applicationDetail.tHouseApplyProposer.members++;
+      this.applicationDetail.tHomeapplySqrjtcys.push({
+        //applyProposerId: this.applicationDetail.tHouseApplyFamilyMembers[0].applyProposerId,
+        memberName:null,
+        age:null,
+        familyStatusName:null,
+        idcard :null,
+        householdRegister:null,
+      });
+      this.$nextTick(() => {
+        this.$refs.memberTabs.scrollTo(this.applicationDetail.tHomeapplySqrjtcys.length - 1);
+      });
+    },
+    //删除家庭成员
+    deleteFamily(index){
+      this.applicationDetail.tHouseApplyProposer.members--;
+      this.applicationDetail.tHomeapplySqrjtcys.splice(index,1)
+      this.$nextTick(() => {
+        this.$refs.memberTabs.scrollTo(Math.max(index - 1, 0));
+      });
+    },
+    remoteTransfereeMethod(val){
+      selectProposerNh({hzxm:val,deptId:this.sysFarmer.deptId}).then(res => {
+        this.nhxxList = res.rows;
+        this.showNhxx = true;
+      });
+
+    },
+    //返回上一步操作
+    goBack(){
+
+      // this.$router.push({path: '/sunVillage_info/homeApplication/applicationList'});
+      // this.$router.back(-1);
+      this.$router.push({name: this.$router.back(-1)});
+    },
+    // 当地图绘制完成时
+    onMapDrawFinished(data) {
+      console.info(data);
+      this.drawInsert = data;
+    },
+    // 当申请地图被重置时
+    onMapDrawReseted() {
+      this.drawInsert = null;
+      if(this.applicationDetail.ydjfkg.theGeomJson)
+      {
+        let lastData = JSON.parse(this.applicationDetail.ydjfkg.theGeomJson);
+        if(lastData.hasOwnProperty('coordinates')) // 从后台获取的
+          this.drawInsert = lastData.coordinates;
+      }
+    },
+    // 全局提交
+    onSubmit(intent){
+      console.log(this.applicationDetail, intent);
+      let chars = window.location.href.split("lat=")[1] || "";
+      if(chars !="" && chars != null && chars !=undefined){
+        this.mapBcZb =[window.location.href.split("lng=")[1] || "",(window.location.href.split("lat=")[1] || "").split("&lng=")[0] || ""];
+        this.mapZbQd();
+      }
+      switch (intent) {
+        case 'add':
+        case 'modify':
+          this.saveProposerApply();
+          break;
+        case 'submit':
+          this.submitApplyProposer();
+          break;
+        case 'save_and_submit':
+          this.saveProposerApply(true);
+          break;
+        case 'agree':
+          this.auditProposer(true);
+          break;
+        case 'reject':
+          this.$dialog.confirm({
+            message: '是否确认驳回此条申请',
+          }).then(() => {
+            this.auditProposer(false);
+          });
+          break;
+        case 'start':
+          this.startProposerApply();
+          break;
+        case 'start_and_submit':
+          this.startProposerApply(true);
+          break;
+        case 'end':
+          this.endProposerApply(true);
+          break;
+        default:
+          console.error('Unknown intent! ', intent);
+          break;
+      }
+    },
+    // 初次申请草稿的附件上传
+    onUploadFinished(fileIdList) {
+      console.info(fileIdList);
+      this.$set(this.applicationDetail, "fileList", fileIdList);
+    },
+    // 获取申请人信息
+    getApplyerDetail(val){
+      console.info(val)
+      getHomeMembers({idcard:val.hzzjhm}).then(res => {
+        if(res.data)
+        {
+          this.applicationDetail = res.data;
+          this.$set(this.applicationDetail, 'jflx',  "4");
+          this.$set(this.applicationDetail, 'projectName',  "分户新建");
+          this.$set(this.applicationDetail, 'nsqzjddldm',  "10");
+          this.$set(this.applicationDetail, 'sfzqxlqlryj',  "1");
+          this.$set(this.applicationDetail, 'xzjdczqk',  "1");
+          this.$set(this.applicationDetail, 'suyqrdm',  val.suyqrdm);
+          this.$set(this.applicationDetail, 'deptName',  val.deptName);
+          this.$set(this.applicationDetail, 'createBy',  val.memberName);
+          if(!this.applicationDetail.sfyyzjd)
+            this.applicationDetail.sfyyzjd = 'N';
+          this.applicationDetail.applyTime = this.getDate();
+          this.getMemberCurrentSituation(val.hzzjhm);
+          console.info(this.applicationDetail.sqrjtcyList);
+          if(this.applicationDetail.sqrjtcyList.length > 0)
+          {
+            for(let i = 0; i < this.applicationDetail.sqrjtcyList.length; i++)
+            {
+              this.updateMemberInfo(i);
+            }
+          }
+        }
+      });
+      this.showNhxx = false;
+    },
+    // 检查字符串, 不符合返回true
+    checkString(value, regexp) {
+      let res = value === undefined || value === null || value === '' || value.toString().trim().length === 0;
+      if(res)
+        return true;
+      if(regexp)
+        res = !value.match(regexp);
+      return res;
+    },
+    // 保存申请(是否提交)
+    saveProposerApply(submit) {
+      this.$refs.form.validate().then(() => {
+        let msg = this.validateBaseApplyFormBase();
+        console.info(msg)
+        if(msg)
+        {
+          this.notify(msg, 'danger');
+          return;
+        }
+        // //地图判断
+        // if (this.drawInsert != null) {
+        //   this.applicationDetail.theGeom = JSON.stringify(this.drawInsert);
+        // }
+        // else
+        // {
+        //   if(this.applicationDetail.sfyyzjd === 'Y' && this.applicationDetail.theGeom) // 新增时 && 已有宅基地时 && 重新画过图且被清理掉
+        //   {
+        //     this.applicationDetail.theGeom = this.convertGeom(this.applicationDetail.theGeom);
+        //   }
+        // }
+
+        console.log("进行保存", this.applicationDetail);
+        this.$set(this.applicationDetail, 'applyUserId',  this.sysFarmer.id);
+        this.$set(this.applicationDetail, 'auditStatus',  "0");
+        saveHomeBaseInfo(this.applicationDetail).then((response) => {
+          if(submit)
+          {
+            this.id = response.data;
+            this.submitApplyProposer();
+          }
+          else
+          {
+            this.notify("保存成功", 'success');
+            this.goBack();
+          }
+        }).catch((e) => {
+          this.notify("保存失败!", 'danger');
+        }).finally(() => {
+        });
+      }).catch(e => {
+        let msg = this.validateBaseApplyFormBase();
+        if(msg)
+        {
+          this.notify(msg, 'danger');
+          return;
+        }
+      });
+    },
+    // 判断状态是否符合
+    isProposeStatus(target, arr) {
+      if(!Array.isArray(arr))
+        arr = arr.split(',');
+      return arr.indexOf(target) !== -1;
+    },
+    // 判断状态是否不符合
+    isNotProposeStatus(target, arr) {
+      return !this.isProposeStatus(target, arr);
+    },
+    // 是否当前是申请流程
+    isBaseApply() {
+      return ["11","12","13","14", "15","17", "19", "1C", "1D", "1F"].indexOf(this.applicationDetail.homeApplyStatus) !== -1;
+    },
+    // 是否当前是开工流程
+    isLandscope() {
+      return ["31", "32", "34", "3C", "3F","37", "39"].indexOf(this.applicationDetail.homeApplyStatus) !== -1;
+    },
+    // 是否当前是验收流程
+    isAccepting() {
+      return ["71", "72", "74","77", "79", "7C", "7F"].indexOf(this.applicationDetail.homeApplyStatus) !== -1;
+    },
+    // 获取当前申请人的宅基地信息
+    getMemberCurrentSituation(item) {
+      let _this = this;
+      let farmerCode = this.applicationDetail.nhdm;
+      checkDuplicateBuilding({farmerCode: farmerCode}).then(resp => {
+        if (resp.data) {
+          this.notify(resp.msg, 'danger');
+        } else {
+          checkDuplicateBuildingQuery(item).then(resp => {
+            if(resp.data !=null && resp.data !=""){
+              this.applicationDetail.sfyyzjd ="Y";
+              // 现宅基地及农房情况对象
+              if(resp.data.zjdzdxxList.length > 0){
+                this.zjdzdxxList = resp.data.zjdzdxxList;
+                this.applicationDetail.xzjdmj = resp.data.zjdzdxxList[0].zdmj; //宅基地面积
+                this.applicationDetail.xjzmj =  resp.data.zjdzdxxList[0].scjzmj;
+                this.applicationDetail.qszsh = resp.data.zjdzdxxList[0].zsh;
+                this.showZjddm = resp.data.zjdzdxxList[0].zjddm;
+                this.$set(this.zjdzdxxDetailed, 'zdszd',  resp.data.zjdzdxxList[0].zdszd);
+                this.$set(this.zjdzdxxDetailed, 'zdszn',  resp.data.zjdzdxxList[0].zdszn);
+                this.$set(this.zjdzdxxDetailed, 'zdszx',  resp.data.zjdzdxxList[0].zdszx);
+                this.$set(this.zjdzdxxDetailed, 'zdszb',  resp.data.zjdzdxxList[0].zdszb);
+                this.$set(this.applicationDetail, 'sfyyzjd',  "Y");
+                resp.data.zjdzdxxList.forEach(function(item){
+                  _this.zjddmColumns.push({text:item.zjddm,value:item.zjddm});
+                })
+              }else{
+                this.$set(this.applicationDetail, 'sfyyzjd',  "N");
+              }
+
+              // this.applicationDetail.tHouseApplyCurrentSituation.landPerArea= (resp.data.zdmj/(this.applicationDetail.tHouseApplyProposer.members +1)); //人均宅基地面积
+              // this.applicationDetail.tHouseApplyCurrentSituation.landCertificateNo= resp.data.bdcdyh; //不动产单元号
+              // this.applicationDetail.tHouseApplyCurrentSituation.buildingArea= resp.data.scjzmj; //建筑面积
+              // this.applicationDetail.tHouseApplyCurrentSituation.buildingPerArea= (resp.data.scjzmj/(this.applicationDetail.tHouseApplyProposer.members +1)); //人均建筑面积
+              // this.applicationDetail.tHouseApplyCurrentSituation.houseCertificateNo= resp.data.zrzh; //自然幢号
+              // this.applicationDetail.tHouseApplyCurrentSituation.landIsposal= null; // 现宅基地处置情况
+              // this.applicationDetail.tHouseApplyCurrentSituation.reservedArea= null; // 保留m²
+              // this.applicationDetail.tHouseApplyCurrentSituation.otherRemark= null; // 其他
+              // this.renderMapRegion(resp.data.theGeom);
+            } else {
+              // this.applicationDetail.sfyyzjd ="N";
+              // // 现宅基地及农房情况对象
+              // this.applicationDetail.tHouseApplyCurrentSituation.landArea = null; //宅基地面积
+              // this.applicationDetail.tHouseApplyCurrentSituation.landPerArea= null; //人均宅基地面积
+              // this.applicationDetail.tHouseApplyCurrentSituation.landCertificateNo= null; //权属证书号
+              // this.applicationDetail.tHouseApplyCurrentSituation.buildingPerArea= null; //人均建筑面积
+              // this.applicationDetail.tHouseApplyCurrentSituation.houseCertificateNo= null; //权属证书号
+              // this.applicationDetail.tHouseApplyCurrentSituation.landIsposal= null; // 现宅基地处置情况
+              // this.applicationDetail.tHouseApplyCurrentSituation.reservedArea= null; // 保留m²
+              // this.applicationDetail.tHouseApplyCurrentSituation.otherRemark= null; // 其他
+              // this.renderMapRegion(null);
+            }
+          });
+        }
+      });
+    },
+    // 绘制现有宅基地地图
+    renderMapRegion(json = null) { // json = theGeom
+      this.applicationDetail.tHouseApplyProposedSituation.theGeom = json;
+      if(json)
+      {
+        let obj = JSON.parse(json);
+        this.drawInsert = obj.coordinates;
+      }
+      else
+        this.drawInsert = null;
+      this.pointDarw(null);
+    },
+    // 提交申请
+    submitApplyProposer() {
+      if(this.applicationDetail.auditStatus == '2' && this.selectedTabName == 0){
+        updateOpretion(this.id).then();
+      }
+      customSubmitWLHT(this.id).then((resp) => {
+          this.notify("提交成功", 'success');
+          this.goBack();
+        }).catch((e) => {
+        this.notify("提交失败!", 'danger');
+      }).finally(() => {
+      });
+    },
+    // 判断角色是否符合
+    isInRoles(myRoles, requireRoles) {
+      if(!Array.isArray(myRoles))
+        myRoles = myRoles.split(',');
+      if(!Array.isArray(requireRoles))
+        requireRoles = requireRoles.split(',');
+      for(let r of requireRoles)
+      {
+        if(myRoles.indexOf(r) !== -1)
+          return true;
+      }
+      return false;
+    },
+    // 转换地图数据用于提交后台
+    convertGeom(json) {
+      let data = JSON.parse(json);
+      if(data.hasOwnProperty('coordinates'))
+        return JSON.stringify(data.coordinates);
+      return null;
+    },
+    zkshClick(){
+      if(this.zjdzdxxDetailedShow){
+        this.zjdzdxxDetailedShow = false;
+      }else{
+        this.zjdzdxxDetailedShow = true;
+      }
+    },
+    // 审批(同意/驳回)
+    auditProposer(pass) {
+      let _this = this;
+      switch (this.processKeyField) {
+        case PROPOSER_STAGE_BASE_APPLY_ACTIVITY: {
+          let comment;
+          const role = this.$store.getters.roles[0];
+          let msg = "";
+          switch (role) {
+            case "agriculture":
+              msg = this.validateAgricultureForm(pass);
+              if (msg) {
+                break;
+              }
+              comment = this.applicationDetail.ydjfsp.nyncbmscyj;
+              // if(this.$refs.pictureUploadApplyingTHouseApproveAgriculture && this.$refs.pictureUploadApplyingTHouseApproveAgriculture.isValid()) {
+              //   this.submitHouseApproveAgricultureOptions().then(item=>{
+                  if (msg) {
+                    return;
+                  }
+
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
+                    }).catch(resp => {
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
+                    });
+                // });
+              // } else {
+              //   if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)) {
+              //     msg = "农村农业部门现场拍照不能为空";
+              //     break;
+              //   }
+              // }
+              break;
+            case "building":
+              msg = this.validateBuildingForm(pass);
+              comment = this.applicationDetail.ydjfsp.zfcxjsbmscyj;
+              // if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) {
+                // this.submitHouseApproveOtherOptions().then(item=>{
+                //   setTimeout(() => {
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
+                    }).catch(resp => {
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
+                    });
+                //   }, 500);
+                // });
+              // } else {
+              //   if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.otherPlan)) {
+              //     msg =  "住建部门现场拍照不能为空";
+              //     break;
+              //   }
+              // }
+              break;
+            case "nature_resource":
+              msg = this.validateNatureForm(pass);
+              if (msg) {
+                break;
+              }
+              this.$set(this.applicationDetail, 'tHouseApproveTownOptions', null);
+              this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
+              this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
+              comment = this.applicationDetail.ydjfsp.zrzybmscyj;
+              saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
+                    }).catch(resp => {
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
+                    });
+              break;
+            case "town_leader":
+              // msg = this.validateAgricultureForm(pass);
+              // if (msg) {
+              //   break;
+              // }
+              // msg = this.validateNatureForm();
+              // if (msg) {
+              //   break;
+              // }
+              //
+              // msg = this.validateBuildingForm();
+              // if (msg) {
+              //   break;
+              // }
+              msg = this.validateTownForm();
+              if (msg) {
+                break;
+              }
+              comment = this.applicationDetail.ydjfsp.zfcxjsbmscyj;
+                // this.submitHouseApproveAgricultureOptions().then(item=>{
+                //     _this.submitHouseApproveNatureplanOptions().then(item2=>{
+                //         _this.submitHouseApproveOtherOptions().then(item3=>{
+                //           if(_this.$refs.pictureUploadApplyingTHouseApproveTown && _this.$refs.pictureUploadApplyingTHouseApproveTown.isValid()) {
+                //             _this.submitHouseApproveTownOptions().then(item4=>{
+                //               //地图判断
+                //               if (_this.drawInsert != null) {
+                //                 _this.applicationDetail.tHouseApproveNatureOptions.theGeom = JSON.stringify(_this.drawInsert);
+                //               }
+                //               else {
+                //                 if(_this.applicationDetail.tHouseApproveNatureOptions && _this.applicationDetail.tHouseApproveNatureOptions.theGeom == null){
+                //                   _this.applicationDetail.tHouseApproveNatureOptions.theGeom = _this.convertGeom(_this.applicationDetail.tHouseApplyProposedSituation.theGeom);
+                //                 }
+                //               }
+                              if(!pass){
+                                comment = "驳回";
+                              }
+                              if(this.applicationDetail.ydjfsp.zjdzlpmwzt != null && this.applicationDetail.ydjfsp.zjdzlpmwzt !== "") {
+                                // _this.submitHouseApproveLocationplanOptions(pass, comment).then(item5=>{
+                                  // _this.submitHouseApproveNatureplanOptions().then(item6=>{
+                                  //   setTimeout(() => {
+                                      saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                                        this.complete(pass, comment);
+                                      }).catch(resp => {
+                                        this.notify(msg, 'danger');
+                                        this.notify("保存失败!", 'danger');
+                                      });
+                                    // }, 500);
+                                  // });
+                                // });
+                              }else{
+                                this.notify("宅基地坐落平面位置图不能为空", 'danger');
+                                this.$refs.form.validate().then(() => {}).catch((e)=>{})
+                              }
+                            // });
+                          // } else {
+
+                            // if(!pass){
+                            //   comment = "驳回";
+                            // }
+                            //   setTimeout(() => {
+                            //     saveHouseBaseInfo(_this.applicationDetail).then((response) => {
+                            //       _this.complete(pass, comment);
+                            //     }).catch(resp => {
+                            //       _this.notify(msg, 'danger');
+                            //       _this.notify("保存失败!", 'danger');
+                            //     });
+                            //   }, 500);
+                            // }
+                //           }
+                //         });
+                //     });
+                // });
+              break;
+            default:
+              if(this.checkString(this.applicationDetail.cjxzscyj))
+                msg = '村领导意见不能为空';
+              else
+                comment = this.applicationDetail.cjxzscyj;
+              if (this.checkString(this.applicationDetail.cjxzscr)) {
+                msg = "村级领导签名不能为空";
+              } else
+              if(this.$refs.pictureUploadApplyingTHouseApproveVillage && this.$refs.pictureUploadApplyingTHouseApproveVillage.isValid()) {
+                this.submitHouseApproveVillageplanOptions(pass, comment);
+                return;
+              } else {
+                  setTimeout(() => {
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
+                    }).catch(resp => {
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
+                    });
+                  }, 500);
+              }
+              //}
+            //   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) {
+            this.notify(msg, 'danger');
+            this.$refs.form.validate().then(() => {}).catch((e)=>{})
+            return;
+          }
+        }
+          break;
+        case PROPOSER_STAGE_START_ACTIVITY:
+          let _this = this;
+          const role = this.$store.getters.roles[0];
+          if(role === "nature_resource"){
+            if (this.drawInsert != null) {
+              this.applicationDetail.ydjfkg.theGeomJson = JSON.stringify(this.drawInsert);
+            }
+            else {
+              if(this.applicationDetail.ydjfkg.theGeomJson == null){
+                if(this.applicationDetail.ydjfkg.theGeom == null){
+                  this.notify("请在地图上标注宅基地位置!", 'danger');
+                  break;
+                }else{
+                  this.applicationDetail.ydjfkg.theGeomJson = this.convertGeom(this.applicationDetail.ydjfkg.theGeom);
+                }
+              }
+            }
+            saveHomeBaseInfo(this.applicationDetail).then((response) => {
+              this.complete(pass);
+            }).catch(resp => {
+              this.notify(msg, 'danger');
+              this.notify("保存失败!", 'danger');
+            });
+          }else{
+            this.complete(pass);
+          }
+          break;
+        case PROPOSER_STAGE_END_ACTIVITY : {
+          let comment;
+          let msg = "";
+          const role = this.$store.getters.roles[0];
+          switch (role) {
+            case "agriculture":
+              msg = this.validateAcceptingFormTown(undefined, role);
+              if (msg) {
+                break;
+              }
+              comment = this.applicationDetail.ydjfys.nyncbmysyj;
+                  saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                    this.complete(pass, comment);
+                  }).catch(err => {
+                    this.notify('保存失败', 'danger');
+                  });
+
+              break;
+            case "nature_resource":
+              msg = this.validateAcceptingFormTown(undefined, role);
+              if (msg) {
+                break;
+              }
+              comment = this.applicationDetail.ydjfys.zrzybmysyj;
+              saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                    this.complete(pass, comment);
+                  }).catch(err => {
+                    this.notify('保存失败', 'danger');
+                  });
+              break;
+            case "town_leader":
+              msg = this.validateAcceptingFormTown();
+              if (msg) {
+                break;
+              }
+              comment = this.applicationDetail.ydjfys.xzzfysyj;
+                if (this.applicationDetail.ydjfys.jgpmjt != null) {
+                        saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                        this.complete(pass, comment);
+                      }).catch(err => {
+                        this.notify('保存失败', 'danger');
+                      });
+                }else{
+                    msg =  "竣工平面简图不能为空";
+                }
+
+              break;
+            default:
+              comment = '同意';
+              if (this.applicationDetail.ydjfys.jgpmjt != null) {
+                saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                  this.complete(pass, comment);
+                }).catch(err => {
+                  this.notify('保存失败', 'danger');
+                });
+              }else{
+                msg =  "竣工平面简图不能为空";
+              }
+              break;
+          }
+          if (msg) {
+            this.notify(msg, 'danger');
+            this.$refs.form.validate().then(() => {}).catch(e=>{});
+            return;
+          }
+
+
+
+          // //农村农业部
+          // if (this.$refs.tHouseApplyEndNongye && this.$refs.tHouseApplyEndNongye.isValid()) {
+          //   this.submitHouseApproveEndNongyeOptions();
+          //   return;
+          // }
+          // //自然资源部
+          // if (this.$refs.pictureUploadAccepting && this.$refs.pictureUploadAccepting.isValid()) {
+          //   this.submitHouseApproveEndNatureOptions();
+          //   return;
+          // }
+          // //乡镇领导部
+          // if (this.$refs.pictureUploadAccepting && this.$refs.pictureUploadAccepting.isValid()) {
+          //   this.submitHouseApproveEndBZhenOptions();
+          //   return;
+          // }
+
+          console.log(this.applicationDetail.tHouseApplyEnd);
+
+        }
+          break;
+        default:
+          break;
+      }
+    },
+    //村级领导审批现场图片
+    submitHouseApproveVillageplanOptions(pass, commentText) {
+      this.applicationDetail.tHouseApproveVillageOptions.villagePlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveVillage.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveVillageOptions.villagePlan = JSON.stringify(list);
+        if (this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villagePlan)) {
+          return  "村级现场拍照不能为空";
+        } else {
+          saveHouseBaseInfo(this.applicationDetail).then((response) => {
+            this.complete(pass, commentText);
+          }).catch(resp => {
+            this.notify("保存失败!", 'danger');
+          });
+        }
+      }).catch((x) => {
+        this.notify("村级上传现场照片失败!", 'danger');
+      });
+    },
+    //自然资源部门审批现场图片
+    submitHouseApproveNatureplanOptions() {
+      this.applicationDetail.tHouseApproveNatureOptions.naturePlan = null;
+     return   this.$refs.pictureUploadApplyingTHouseApproveNature.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveNatureOptions.naturePlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApproveNatureOptions.naturePlan)){
+          return "自然资源部门现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("自然资源部门上传现场照片失败!", 'danger');
+      });
+    },
+    //农村农业部门审批现场图片
+    submitHouseApproveAgricultureOptions() {
+      this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveAgriculture.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.agriculturePlan)){
+          return "农村农业部现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("农村农业部上传现场照片失败!", 'danger');
+      });
+    },
+    //其他部门审批现场图片
+    submitHouseApproveOtherOptions() {
+      this.applicationDetail.tHouseApproveOtherOptions.otherPlan = null;
+      return this.$refs.pictureUploadApplyingTHouseApproveOther.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveOtherOptions.otherPlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApproveOtherOptions.otherPlan)){
+          return "其他部门现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("其他部门上传现场照片失败!", 'danger');
+      });
+    },
+    //镇级领导审批现场图片
+    submitHouseApproveTownOptions() {
+      this.applicationDetail.tHouseApproveTownOptions.townPlan = null;
+     return this.$refs.pictureUploadApplyingTHouseApproveTown.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApproveTownOptions.townPlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApproveTownOptions.townPlan)){
+          return "镇级领导现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("镇级领导上传现场照片失败!", 'danger');
+      });
+    },
+    //验收农业部门审批现场图片
+    submitHouseApproveEndNongyeOptions() {
+      this.applicationDetail.tHouseApplyEnd.nongyePlan = null;
+      return this.$refs.tHouseApplyEndNongye.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApplyEnd.nongyePlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApplyEnd.nongyePlan)){
+          return "农业部门现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("农业部门上传现场照片失败!", 'danger');
+      });
+    },
+    //验收自然资源部门审批现场图片
+    submitHouseApproveEndNatureOptions() {
+      this.applicationDetail.tHouseApplyEnd.naturePlan = null;
+      return this.$refs.tHouseApplyEndNature.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApplyEnd.naturePlan = JSON.stringify(list);
+        // if(this.checkString(this.applicationDetail.tHouseApplyEnd.naturePlan)){
+        //   return "自然资源部门现场拍照不能为空";
+        // }
+      }).catch((x) => {
+        this.notify("自然资源部门上传现场照片失败!", 'danger');
+      });
+    },
+    //验收住建部门审批现场图片
+    submitHouseApproveEndBuildingOptions() {
+      this.applicationDetail.tHouseApplyEnd.buildingPlan = null;
+      this.$refs.tHouseApplyEndBuilding.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApplyEnd.buildingPlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApplyEnd.buildingPlan)){
+          return "住建部门现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("住建部门上传现场照片失败!", 'danger');
+      });
+    },
+    //验收镇政府审批现场图片
+    submitHouseApproveEndBZhenOptions() {
+      this.applicationDetail.tHouseApplyEnd.zhenPlan = null;
+      return this.$refs.tHouseApplyEndZhen.updatePlanFiles().then((x) => {
+        let list = [];
+        x.data.forEach((f) => {
+          let item = {
+            id: f.id,
+            fileName: f.fileName,
+            fileUrl: f.fileUrl,
+            fileType: f.fileType,
+            tableId: f.tableId,
+            tableName: f.tableName,
+          };
+          list.push(item);
+        });
+        this.applicationDetail.tHouseApplyEnd.zhenPlan = JSON.stringify(list);
+        if(this.checkString(this.applicationDetail.tHouseApplyEnd.zhenPlan)){
+          return "镇政府现场拍照不能为空";
+        }
+      }).catch((x) => {
+        this.notify("镇政府上传现场照片失败!", 'danger');
+      });
+    },
+    // 带平面图附件上传的镇级申请审批
+    submitHouseApproveLocationplanOptions(pass, commentText) {
+      this.applicationDetail.ydjfsp.zjdzlpmwzt = null;
+     return this.$refs.pictureUploadApplying.updatePlanFiles().then((x) => {
+          let list = [];
+          x.data.forEach((f) => {
+            let item = {
+              id: f.id,
+              fileName: f.fileName,
+              fileUrl: f.fileUrl,
+              fileType: f.fileType,
+              tableId: f.tableId,
+              tableName: f.tableName,
+            };
+            list.push(item);
+          });
+       this.applicationDetail.ydjfsp.zjdzlpmwzt =  list[0].fileUrl;
+        }).catch((x) => {
+        this.notify("上传宅基地坐落平面位置图失败!", 'danger');
+      });
+    },
+    fileUpdate(val){
+      console.info(val)
+      const params = new FormData();
+      params.append("tableId", this.applicationDetail.ydjfsp.id);
+      params.append("tableName", "t_homeapply_ydjfsp");
+      params.append("bizPath", "upload");
+      params.append("fileType", "0");
+      params.append('file', val.file);
+      attach(params).then((resp) => {
+        this.$set(this.applicationDetail.ydjfsp, 'zjdzlpmwzt',resp.fileUrl);
+      });
+    },
+    fileUpdatePmt(val){
+      console.info(val)
+      const params = new FormData();
+      params.append("tableId", this.applicationDetail.ydjfys.id);
+      params.append("tableName", "t_homeapply_ydjfsq");
+      params.append("bizPath", "upload");
+      params.append("fileType", "0");
+      params.append('file', val.file);
+      attach(params).then((resp) => {
+        this.$set(this.applicationDetail.ydjfys, 'jgpmjt',resp.fileUrl);
+      });
+    },
+    // 带平面图附件上传的镇级验收审批
+    submitHouseApplyEndLocationplanOptions(pass, commentText) {
+      return this.$refs.pictureUploadAccepting.updatePlanFiles()
+        .then((x) => {
+          let list = [];
+          x.data.forEach((f) => {
+            let item = {
+              id: f.id,
+              fileName: f.fileName,
+              fileUrl: f.fileUrl,
+              fileType: f.fileType,
+              tableId: f.tableId,
+              tableName: f.tableName,
+            };
+            list.push(item);
+          });
+
+          this.applicationDetail.tHouseApplyEnd.locationPlan = JSON.stringify(list);
+        }).catch((x) => {
+        this.notify("上传宅基地坐落平面位置图失败!", 'danger');
+      });
+    },
+    // 审批工具函数(同意/驳回, 意见)
+    complete(pass, comment) {
+      if(!this.taskId || !this.instanceId)
+      {
+        console.error(this.taskId, this.instanceId);
+        return false;
+      }
+      let data = {
+        taskId: this.taskId,
+        instanceId: this.instanceId,
+        variables: JSON.stringify({
+          pass: pass ? "true" : "false",
+          comment: comment ? comment : (pass ? '同意' : '驳回'),
+        }),
+      };
+      request({
+        url: "/activiti/process/complete",
+        method: "post",
+        params: data,
+      }).then((response) => {
+        this.notify("操作成功", 'success');
+        this.$router.go(0);
+        this.goBack();
+      }).catch(e => {
+        this.notify("操作失败!", 'danger');
+      });
+      return true;
+    },
+    // 请求结果提示工具函数
+    notify(message, type) {
+      Notify.clear();
+      Notify({ type: type || 'primary', message: message });
+    },
+    // 当自然资源部门地图绘制被重置时
+    onNatureMapDrawReseted() {
+      this.drawInsert = null;
+      if(this.applicationDetail.tHouseApproveNatureOptions.theGeom)
+      {
+        let lastData = JSON.parse(this.applicationDetail.tHouseApproveNatureOptions.theGeom);
+        if(lastData.hasOwnProperty('coordinates')) // 从后台获取的
+          this.drawInsert = lastData.coordinates;
+      }
+    },
+    // 当验收地图绘制被重置时
+    onAcceptanceMapDrawReseted() {
+      this.drawInsert = null;
+      if(this.applicationDetail.tHouseApplyEnd.theGeom)
+      {
+        let lastData = JSON.parse(this.applicationDetail.tHouseApplyEnd.theGeom);
+        if(lastData.hasOwnProperty('coordinates')) // 从后台获取的
+          this.drawInsert = lastData.coordinates;
+      }
+    },
+    // 打开附件树
+    openAttachment() {
+      this.attachmentVisible = true;
+      if(this.attachmentActive == this.active)
+        this.$nextTick(() => {
+          this.$refs.attachmentDialog.scrollTo(this.active);
+        });
+    },
+    // 选择步骤页面
+    selectTab(index) {
+      if(index <= this.active)
+      {
+        this.selectedTabName = index;
+      }
+      //console.log(index, this.active,this.selectedTabName);
+    },
+    // 保存开工(是否提交)
+    startProposerApply(submit) {
+        console.info(submit);
+        let msg = this.validateStartFormBase();
+
+        if (msg) {
+          this.notify(msg, 'danger');
+          return;
+        }
+      this.$set(this.applicationDetail, 'applyUserId',  this.sysFarmer.id);
+        saveHomeBaseInfo(this.applicationDetail).then((resp) => {
+          if(submit)
+          {
+            submitStartWLHT(this.applicationDetail.id).then(resp => {
+              this.notify("操作成功", 'success');
+              this.goBack();
+            }).catch((e) => {
+              this.notify("操作失败!", 'danger');
+            });
+          }
+          else
+          {
+            this.notify("保存成功", 'success');
+            this.goBack();
+          }
+        }).catch((e) => {
+          this.notify('保存失败', 'danger');
+        });
+    },
+    // 保存验收(是否提交)
+    endProposerApply(submit) {
+      // this.$refs.form.validate().then(() => {
+        let msg = this.validateAcceptingFormBase();
+        if (msg) {
+          this.notify(msg, 'danger');
+          return;
+        }
+        // if (this.drawInsert != null) {
+        //   this.applicationDetail.tHouseApplyEnd.theGeom = JSON.stringify(this.drawInsert);
+        // }
+        // else {
+        //   if(this.applicationDetail.tHouseApplyEnd.theGeom == null){
+        //     this.applicationDetail.tHouseApplyEnd.theGeom = this.convertGeom(this.applicationDetail.tHouseApproveNatureOptions.theGeom);
+        //   }
+        // }
+      console.info(this.applicationDetail);
+        saveHomeBaseInfo(this.applicationDetail).then(resp => {
+          if(submit)
+          {
+            submitEndWLHT(this.applicationDetail.id).then(resp => {
+              this.notify("操作成功", 'success');
+              this.goBack();
+            }).catch(err => {
+              this.notify("操作失败!", 'danger');
+            });
+          }
+          else
+          {
+            this.notify("保存成功", 'success');
+            this.goBack();
+          }
+        }).catch(err => {
+          this.notify('保存失败', 'danger');
+        });
+      // }).catch(e => {
+      //   let msg = this.validateAcceptingFormBase();
+      //   if (msg) {
+      //     this.notify(msg, 'danger');
+      //     return;
+      //   }
+      // });
+    },
+    // 获取登录人位置坐标
+    getLandCoord(func) {
+      if (func
+        && this.tGeoOrganizationLng !== null && this.tGeoOrganizationLng !== ''
+        && this.tGeoOrganizationLat !== null && this.tGeoOrganizationLat !== '') {
+        this.$nextTick(() => {
+          func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        })
+      }
+      else {
+        console.info(this.deptId);
+        getQueryLand(this.deptId).then((response) => {
+          if (response.code == 200) {
+            let InsertCode = response.data;
+            this.form.orgCode = InsertCode.orgCode;
+            this.tGeoOrganizationLat = InsertCode.lat;
+            this.tGeoOrganizationLng = InsertCode.lng;
+            if(func)
+            {
+              func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+            }
+          }
+        });
+      }
+    },
+    validateBaseApplyFormBase() {
+      if (this.checkString(this.applicationDetail.sqhhzxm)) {
+        return "申请户主姓名不能为空";
+      }
+      if (this.checkString(this.applicationDetail.sqhhzxb)) {
+        return "户主性别不能为空";
+      }
+      if (this.checkString(this.applicationDetail.sqhhznl)) {
+        return "户主年龄不能为空";
+      }
+      if (this.checkString(this.applicationDetail.sqhhzlxdh, /(^\d{7}(\d{4})?$)/)) {
+        return "请填写有效的联系电话";
+      }
+      if (this.checkString(this.applicationDetail.sqhhzsfzh, /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/)) {
+        return "请填写有效的身份证号";
+      }
+      if (this.checkString(this.applicationDetail.sqhhzhkszd)) {
+        return "户口所在地不能为空";
+      }
+      // if (this.checkString(this.applicationDetail.tHouseApplyProposer.familyAddress)) {
+      //   return "家庭住址不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApplyProposer.members)) {
+      //   return "家庭人口数不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApplyProposer.existHomestead)) {
+      //   return "是否已有宅基地不能为空";
+      // }
+
+      for(let i in this.applicationDetail.sqrjtcyList)
+      {
+        let v = this.applicationDetail.sqrjtcyList[i];
+        console.info(v);
+        if (this.checkString(v.xm)) {
+          return "成员姓名不能为空";
+        }
+        if (this.checkString(v.nl)) {
+          return "年龄不能为空";
+        }
+        if (this.checkString(v.yhzgx)) {
+          return "与户主关系不能为空";
+        }
+        if (this.checkString(v.sfzh, /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/)) {
+          return "请填写有效的家庭成员身份证";
+        }
+        if (this.checkString(v.hkszd)) {
+          return "户口所在地不能为空";
+        }
+      }
+
+      if(this.applicationDetail.sfyyzjd === 'Y')
+      {
+        if (this.checkString(this.applicationDetail.xzjdmj)) {
+          return "宅基地面积不能为空";
+        }
+        // if (this.checkString(this.applicationDetail.tHouseApplyCurrentSituation.landPerArea)) {
+        //   return "人均宅基地面积不能为空";
+        // }
+        if (this.checkString(this.applicationDetail.xjzmj)) {
+          return "建筑面积不能为空";
+        }
+        // if (this.checkString(this.applicationDetail.tHouseApplyCurrentSituation.buildingPerArea)) {
+        //   return "人均建筑面积不能为空";
+        // }
+        // if (this.checkString(this.applicationDetail.tHouseApplyCurrentSituation.landCertificateNo)) {
+        //   return "不动产单元号不能为空";
+        // }
+        if (this.checkString(this.applicationDetail.xzjdczqk)) {
+          return "处置情况不能为空";
+        }
+        if(this.applicationDetail.xzjdczqk == '1')
+        {
+          if (this.checkString(this.applicationDetail.xzjdblmj)) {
+            return "保留面积不能为空";
+          }
+        }
+        else if(this.applicationDetail.xzjdczqk == '3')
+        {
+          if (this.checkString(this.applicationDetail.xzjdzqtqk)) {
+            return "处置情况不能为空";
+          }
+        }
+      }
+
+      if (this.checkString(this.applicationDetail.nsqzjdmj)) {
+        return "宅基地面积不能为空";
+      }
+      if (this.checkString(this.applicationDetail.nsqfjzdmj)) {
+        return "房基占地面积不能为空";
+      }
+      if (this.checkString(this.applicationDetail.nsqzjddz)) {
+        return "地址不能为空";
+      }
+      if (this.checkString(this.applicationDetail.nsqzjdszd)) {
+        return "东至不能为空";
+      }
+      if (this.checkString(this.applicationDetail.nsqzjdszx)) {
+        return "西至不能为空";
+      }
+      if (this.checkString(this.applicationDetail.nsqzjdszn)) {
+        return "南至不能为空";
+      }
+      if (this.checkString(this.applicationDetail.nsqzjdszb)) {
+        return "北至不能为空";
+      }
+      if (this.checkString(this.applicationDetail.zfjzmj)) {
+        return "住房建筑面积不能为空";
+      }
+      if (this.checkString(this.applicationDetail.jzcs)) {
+        return "建筑层数不能为空";
+      }
+      if (this.checkString(this.applicationDetail.jzgd)) {
+        return "建筑高度不能为空";
+      }
+      if (this.checkString(this.applicationDetail.sfzqxlqlryj)) {
+        return "征求相邻权利人意见不能为空";
+      }
+      // if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.housingStructure)) {
+      //   return "房屋构造不能为空";
+      // }
+      if (this.checkString(this.applicationDetail.jflx)) {
+        return "建房类型不能为空";
+      }
+      if (this.checkString(this.applicationDetail.nsqzjddldm)) {
+        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 "设计图纸不能为空";
+      // }
+      // if(this.applicationDetail.tHouseApplyProposedSituation.designPaper == '2')
+      // {
+      //   if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.houseTypeId)) {
+      //     return "房屋户型不能为空";
+      //   }
+      // }
+      if (this.checkString(this.applicationDetail.sqly)) {
+        return "申请理由不能为空";
+      }
+
+      return false;
+    },
+    onConfirmZjdxx(val){
+      let _this = this;
+      this.zjdzdxxList.map(function(item){
+        if(item.zjddm === val){
+          _this.applicationDetail.xzjdmj = item.zdmj; //宅基地面积
+          _this.applicationDetail.xjzmj =  item.scjzmj;
+          _this.applicationDetail.qszsh = item.zsh;
+          _this.$set(_this.zjdzdxxDetailed, 'zdszd',  item.zdszd);
+          _this.$set(_this.zjdzdxxDetailed, 'zdszn',  item.zdszn);
+          _this.$set(_this.zjdzdxxDetailed, 'zdszx',  item.zdszx);
+          _this.$set(_this.zjdzdxxDetailed, 'zdszb',  item.zdszb);
+        }
+      });
+      this.showZjdzk = false;
+    },
+    validateNatureForm() {
+      // if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.landArea)) {
+      //   return "用地面积不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.rightsType)) {
+      //   return "土地权属不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.east)) {
+      //   return "北至不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.west)) {
+      //   return "西至不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.south)) {
+      //   return "南至不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.north)) {
+      //   return "北至不能为空";
+      // }
+      if (this.checkString(this.applicationDetail.ydjfsp.zrzybmscyj)) {
+        return "说明不能为空";
+      }
+      else if (this.checkString(this.applicationDetail.ydjfsp.zrzybmscrxm)) {
+        return "自然资源签名不能为空";
+      }
+      return false;
+    },
+    validateAgricultureForm(pass) {
+      // if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.isMembership)) {
+      //   return "成员资格审查不能为空";
+      // }
+      //
+      // if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.isOnehouse)) {
+      //   return "一户一宅情况不能为空";
+      // }
+      //
+      // if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.isReviewmaterials)) {
+      //   return "村委会审查材料不能为空";
+      // }
+      if (this.checkString(this.applicationDetail.ydjfsp.nyncbmscyj)) {
+        return "说明不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfsp.nyncbmscrxm)) {
+        return "农村农业部门签名不能为空";
+      }
+      // if (this.checkString(this.applicationDetail.ydjfsp.theGeomPoint)) {
+      //   return "农村农业部门现场定位不能为空";
+      // }
+
+      // 通过时检查打勾, 农业部门
+      if(pass)
+      {
+        // if(this.applicationDetail.tHouseApproveAgricultureOptions.isMembership != '1')
+        // {
+        //   return "同意申请时需通过成员资格审查";
+        // }
+        // if(this.applicationDetail.tHouseApproveAgricultureOptions.isOnehouse != '1')
+        // {
+        //   return "同意申请时需符合一户一宅情况";
+        // }
+        // if(this.applicationDetail.tHouseApproveAgricultureOptions.isReviewmaterials != '1')
+        // {
+        //   return "同意申请时需齐全村委会审查材料";
+        // }
+      }
+      return false;
+    },
+    validateBuildingForm() {
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.buildingType)) {
+      //   return "建筑类型不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.buildingArea)) {
+      //   return "建筑面积不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.buildingFloors)) {
+      //   return "建筑层数不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.buildingHight)) {
+      //   return "建筑高度不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.buildingLandArea)) {
+      //   return "建筑占地面积不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions)) {
+      //   return "图纸类型不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.east)) {
+      //   return "东至不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.west)) {
+      //   return "西至不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.south)) {
+      //   return "南至不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.north)) {
+      //   return "北至不能为空";
+      // }
+      if (this.checkString(this.applicationDetail.ydjfsp.zfcxjsbmscyj)) {
+        return "说明不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfsp.zfcxjsbmscrxm)) {
+        return "住建部门签名不能为空";
+      }
+      // if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint)) {
+      //   return "住建部门现场定位不能为空";
+      // }
+      return false;
+    },
+    validateTownForm() {
+      if (this.checkString(this.applicationDetail.ydjfsp.zfcxjsbmscyj)) {
+        return "镇政府审批意见不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfsp.xzzfshpzrxm)) {
+        return "镇政府审批签字不能为空";
+      }
+      // if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.theGeomPoint)) {
+      //   return "镇政府审批现场定位不能为空";
+      // }
+      return false;
+    },
+    validateAcceptingFormBase() {
+
+      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.houseCertificateNo)) {
+      //   return "权属证书号（不动产）不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.landCertificateNo)) {
+      //   return "权属证书号（宅基地）不能为空";
+      // }
+      if (this.checkString(this.applicationDetail.ydjfys.pjcg)) {
+        return "批建高度不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfys.pjcs)) {
+        return "批建层数不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfys.jggd)) {
+        return "竣工高度不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfys.jgcs)) {
+        return "竣工层数不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfys.pzzjdmj)) {
+        return "批准宅基地面积不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfys.syzjdmj)) {
+        return "实用宅基地面积不能为空";
+      }
+      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingOtherArea)) {
+      //   return "配套附属设施建筑面积不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.designPaper)) {
+      //   return "建筑风貌不能为空";
+      // }
+      if (this.checkString(this.applicationDetail.ydjfys.cjhtzjdqk)) {
+        return "旧宅基地退还情况不能为空";
+      }
+      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.houseCost)) {
+      //   return "住房造价不能为空";
+      // }
+      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.facadeColor)) {
+      //   return "外立面颜色不能为空";
+      // }
+      if (this.checkString(this.applicationDetail.ydjfys.pzfjzdmj)) {
+        return "批准房基占地面积不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfys.sjfjzdmj)) {
+        return "实际房基占地面积不能为空";
+      }
+      // if (this.checkString(this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy)) {
+      //   return "是否享受住房建设补助政策不能为空";
+      // }
+      // if (this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy === 'Y' && this.checkString(this.applicationDetail.tHouseApplyEnd.enjoySubsidyContent)) {
+      //   return "享受住房建设补助政策不能为空";
+      // }
+
+      return false;
+    },
+    validateAcceptingFormTown(pass, role) {
+      //
+      // 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(!role || role === 'agriculture')
+      {
+        if (this.checkString(this.applicationDetail.ydjfys.nyncbmysyj)) {
+          return "乡镇农业农村部门意见不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.nyncbmysjbrxm)) {
+          return "乡镇农业农村部门经办人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.nyncbmyssj)) {
+          return "乡镇农业农村部门经办时间不能为空";
+        }
+
+      }
+      if(!role || role === 'nature_resource')
+      {
+        if (this.checkString(this.applicationDetail.ydjfys.zrzybmysyj)) {
+          return "乡镇自然资源部门意见不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.zrzybmysjbrxm)) {
+          return "乡镇自然资源部门经办人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.zrzybmyssj)) {
+          return "乡镇自然资源部门经办时间不能为空";
+        }
+      }
+      if(0)
+      {
+        if (this.checkString(this.applicationDetail.ydjfys.zfcxjsbmysyj)) {
+          return "乡镇住建部门意见不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.zfcxjsbmysjbrxm)) {
+          return "乡镇住建部门验收负责人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.zfcxjsbmyssj)) {
+          return "乡镇住建部门验收时间不能为空";
+        }
+        // if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingGeom)) {
+        //   return "住建部门现场定位不能为空";
+        // }
+        // if(this.$refs.tHouseApplyEndBuilding && this.$refs.tHouseApplyEndBuilding.isValid()) {
+        //   this.submitHouseApproveEndBuildingOptions();
+        // } else {
+        //   if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingPlan)) {
+        //     return "住建部门现场拍照不能为空";
+        //   }
+        // }
+      }
+      if(!role)
+      {
+        if (this.checkString(this.applicationDetail.ydjfys.jgpmjtjbr)) {
+          return "竣工平面简图经办人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.xzzfysyj)) {
+          return "乡镇政府验收意见不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.xzzfysjbrxm)) {
+          return "乡镇政府验收负责人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfys.xzzfyssj)) {
+          return "乡镇政府验收时间不能为空";
+        }
+        // if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenGeom)) {
+        //   return "乡镇政府现场定位不能为空";
+        // }
+
+      }
+
+      // 通过时检查打勾, 农业部门
+      if(pass)
+      {
+        // if(this.applicationDetail.tHouseApplyEnd.isProjectFinished != 'Y')
+        // {
+        //   return "同意验收时需已完成工程设计和合同约定的各项内容";
+        // }
+        // if(this.applicationDetail.tHouseApplyEnd.isQualifiedQuality != 'Y')
+        // {
+        //   return "同意验收时需承揽人对完工住房质量自查合格";
+        // }
+        // if(this.applicationDetail.tHouseApplyEnd.hasBuildingRecord != 'Y')
+        // {
+        //   return "同意验收时需有施工记录资料";
+        // }
+        // if(this.applicationDetail.tHouseApplyEnd.isSignWarranty != 'Y')
+        // {
+        //   return "同意验收时需建房村民和承揽人已经共同签署农村住房质量保修书";
+        // }
+        // if(this.applicationDetail.tHouseApplyEnd.isHandleProblem != 'Y')
+        // {
+        //   return "同意验收时需住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题全部整改完毕";
+        // }
+        // if(this.applicationDetail.tHouseApplyEnd.isDesignPaperSame != 'Y')
+        // {
+        //   return "同意验收时需建筑风貌是否与设计图基本一致";
+        // }
+        // if(this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished != 'Y')
+        // {
+        //   return "同意验收时需法律、法规规定的其他验收条件完成情况";
+        // }
+      }
+
+      return false;
+    },
+    onConfirmTytz(val){
+      this.$set(this.applicationDetail, 'tyhxt', val.id);
+      this.tytzName = val.name;
+      this.showTyt = false;
+    },
+    validateStartFormBase() {
+      if (this.checkString(this.applicationDetail.ydjfkg.kgrq)) {
+        return "计划开工时间不能为空";
+      }
+      if (this.checkString(this.applicationDetail.ydjfkg.jgrq)) {
+        return "计划竣工时间不能为空";
+      }
+      return false;
+    },
+    parseIDCard(idcard) {
+      if(!idcard)
+        return false;
+      if(idcard.length !== 18)
+        return false;
+      if(!/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(idcard))
+        return false;
+      let sex = (parseInt(idcard.substr(16, 1)) % 2) ^ 1;
+      let now = new Date().getFullYear();
+      let y = parseInt(idcard.substr(6, 4));
+      let age = Math.max(now - y, 0);
+      return [sex, age];
+    },
+    updateUserInfo() {
+      let res = this.parseIDCard(this.applicationDetail.tHouseApplyProposer.idcard);
+      if(res)
+      {
+        this.applicationDetail.tHouseApplyProposer.sex = res[0];
+        this.applicationDetail.tHouseApplyProposer.age = res[1];
+      }
+    },
+    updateMemberInfo(index) {
+      let res = this.parseIDCard(this.applicationDetail.sqrjtcyList[index].sfzh);
+      if(res)
+      {
+        this.$set(this.applicationDetail.sqrjtcyList[index], 'nl', res[1]);
+      }
+    },
+    searchCommit(data){
+      this.showesign = true;
+      this.onCliceQz = data;
+      console.info(this.$store.getters.baseRoutingUrl);
+      console.log(this.currentUserRole);
+      console.log(this.$store.getters.baseRoutingUrl);
+      console.info(this.applicationDetail.ydjfys.zrzybmysjbrxm);
+      if(this.selectedTabName ==0){
+        if(this.currentUserRole == 'village_leader' && this.onCliceQz =='cjxzscr'  && this.applicationDetail.cjxzscr !='' && this.applicationDetail.cjxzscr !=null){
+          //村级审核人员签字
+          //if(this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageLeader))
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.cjxzscr;
+        } else if((this.currentUserRole == 'nature_resource') && this.onCliceQz =='ydjfsp.zrzybmscrxm'  && this.applicationDetail.ydjfsp.zrzybmscrxm !='' && this.applicationDetail.ydjfsp.zrzybmscrxm !=null){
+          //自然资源部门签字
+
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.ydjfsp.zrzybmscrxm;
+        } else if ((this.currentUserRole == 'town_leader' || this.currentUserRole == 'building') && this.onCliceQz =='ydjfsp.zfcxjsbmscrxm'  && this.applicationDetail.ydjfsp.zfcxjsbmscrxm !='' && this.applicationDetail.ydjfsp.zfcxjsbmscrxm !=null){
+          //住建部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.ydjfsp.zfcxjsbmscrxm;
+        } else if ((this.currentUserRole == 'town_leader' || this.currentUserRole == 'agriculture') && this.onCliceQz =='ydjfsp.nyncbmscrxm'  && this.applicationDetail.ydjfsp.nyncbmscrxm !='' && this.applicationDetail.ydjfsp.nyncbmscrxm !=null){
+          //农村农业部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.ydjfsp.nyncbmscrxm;
+        } else if (this.currentUserRole == 'town_leader'  && this.onCliceQz =='ydjfsp.xzzfshpzrxm' && this.applicationDetail.ydjfsp.xzzfshpzrxm !='' && this.applicationDetail.ydjfsp.xzzfshpzrxm !=null){
+          //镇级领导签字 tHouseApproveTownOptions
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.ydjfsp.xzzfshpzrxm;
+        } 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 == 'agriculture') && this.onCliceQz =='ydjfys.nyncbmysjbrxm'  && this.applicationDetail.ydjfys.nyncbmysjbrxm !='' && this.applicationDetail.ydjfys.nyncbmysjbrxm !=null){
+          //农村农业部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl+this.applicationDetail.ydjfys.nyncbmysjbrxm;
+        }  else if ((this.currentUserRole == 'nature_resource' || this.currentUserRole == 'town_leader') && this.onCliceQz == 'ydjfys.zrzybmysjbrxm' && this.applicationDetail.ydjfys.zrzybmysjbrxm != '' && this.applicationDetail.ydjfys.zrzybmysjbrxm != null) {
+          //自然资源部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl + this.applicationDetail.ydjfys.zrzybmysjbrxm;
+        } else if ((this.currentUserRole == 'building' || this.currentUserRole == 'town_leader') && this.onCliceQz == 'ydjfys.zfcxjsbmysjbrxm' && this.applicationDetail.ydjfys.zfcxjsbmysjbrxm != '' && this.applicationDetail.ydjfys.zfcxjsbmysjbrxm != null) {
+          //镇级领导部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl + this.applicationDetail.ydjfys.zfcxjsbmysjbrxm;
+        } else if ((this.currentUserRole == 'town_leader') && this.onCliceQz == 'ydjfys.xzzfysjbrxm' && this.applicationDetail.ydjfys.xzzfysjbrxm != '' && this.applicationDetail.ydjfys.xzzfysjbrxm != null) {
+          //镇级领导部门签字
+          this.resultImg = this.$store.getters.baseRoutingUrl + this.applicationDetail.ydjfys.xzzfysjbrxm;
+        } else {
+          this.resultImg = null
+          if (this.$refs.esign) {
+            this.$refs.esign.reset();
+          }
+        }
+      }
+    },
+    // 清空画板
+    handleReset() {
+      this.resultImg = null
+      if(this.$refs.esign){
+        this.$refs.esign.reset();
+      }
+    },
+    // 生成签字图
+    handleGenerate() {
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.resultImg = res;
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$message({
+              type: "warning",
+              message: "请签名后再生成签字图片",
+            });
+          });
+        // 在这里向后端发请求把转换后的base64文件传给后端，后端接收以后再转换成图片做静态图片存储
+        // 当然也可以把base64转成流文件blob格式的，类似上传给后端这样，具体哪种方式看后端要求
+        setTimeout(() => {
+          // 这里要使用定时器稍微延后以后就能取到base64数据了，当然也可以再加一个确认按钮，如：确认使用这张base64签名图片
+          // 点击确认以后，在其回调函数中，再把base64的签名图片传给后端用于存储
+          const blobBin = atob(this.resultImg.split(',')[1])
+          let d = []
+          for (let i=0;i<blobBin.length;i++){
+            d.push(blobBin.charCodeAt(i))
+          }
+          const data2 = new FormData();
+          data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
+          uploadFile(data2).then(res => {
+            console.log(res);
+            console.log(this.selectedTabName);
+            console.log(this.currentUserRole);
+            if(this.selectedTabName ==0){
+              if(this.currentUserRole == 'village_leader' && this.onCliceQz =='cjxzscr'){
+                //村级审核人员签字
+                //if(this.checkString(this.applicationDetail.tHouseApproveVillageOptions.villageLeader))
+                this.applicationDetail.cjxzscr = res.fileName;
+              } else if((this.currentUserRole == 'nature_resource' || this.currentUserRole == 'town_leader') && this.onCliceQz =='ydjfsp.zrzybmscrxm'){
+                //自然资源部门签字
+                this.applicationDetail.ydjfsp.zrzybmscrxm = res.fileName;
+              } else if ((this.currentUserRole == 'town_leader' || this.currentUserRole == 'building') && this.onCliceQz =='ydjfsp.zfcxjsbmscrxm'){
+                //其他部门签字
+                this.applicationDetail.ydjfsp.zfcxjsbmscrxm = res.fileName;
+              } else if ((this.currentUserRole == 'town_leader' || this.currentUserRole == 'agriculture') && this.onCliceQz =='ydjfsp.nyncbmscrxm'){
+                //农村农业部门签字
+                this.applicationDetail.ydjfsp.nyncbmscrxm = res.fileName;
+              } else if (this.currentUserRole == 'town_leader'  && this.onCliceQz =='ydjfsp.xzzfshpzrxm'){
+                //镇级领导签字 tHouseApproveTownOptions
+                this.applicationDetail.ydjfsp.xzzfshpzrxm = 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 =='ydjfys.nyncbmysjbrxm'){
+                //农村农业部门签字
+                this.applicationDetail.ydjfys.nyncbmysjbrxm =res.fileName;
+              }  else if ((this.currentUserRole == 'nature_resource' || this.currentUserRole == 'town_leader') && this.onCliceQz == 'ydjfys.zrzybmysjbrxm') {
+                //自然资源部门签字
+               this.applicationDetail.ydjfys.zrzybmysjbrxm =res.fileName;
+              } else if ((this.currentUserRole == 'building' || this.currentUserRole == 'town_leader') && this.onCliceQz == 'ydjfys.zfcxjsbmysjbrxm') {
+                //自然资源部门签字
+                this.applicationDetail.ydjfys.zfcxjsbmysjbrxm =res.fileName;
+              } else if ((this.currentUserRole == 'town_leader') && this.onCliceQz == 'ydjfys.xzzfysjbrxm') {
+                //镇级领导部门签字
+                this.applicationDetail.ydjfys.xzzfysjbrxm =res.fileName;
+              }
+              this.showesign =false;
+            }
+          })
+        }, 200);
+    },
+
+    //定位当前位置
+    dingweiCommit(data){
+      //this.mapShow =true;
+      this.mapZbNow = data;
+      // saveHouseBaseInfo(this.applicationDetail).then((response) => {
+      // }).catch(resp => {
+      //   this.notify("保存失败!", 'danger');
+      // });
+      console.log(document.cookie);
+      console.log(window.location.href);
+      let chars = window.location.href.split("lat=")[1] || "";
+      if(chars !="" && chars != null && chars !=undefined){
+        var urlZb = window.location.href.split("&lat=")[0];
+        window.location = `https://www.nongshen.net/static/tdtLocation/location.html?exiturl=${urlZb}`;
+      } else {
+        window.location = `https://www.nongshen.net/static/tdtLocation/location.html?exiturl=${window.location.href}`;
+      }
+    },
+    dingweiCommitLook(data){
+      this.mapShow =true;
+      var zb;
+      //定位坐标点查看
+      if(data == 'tHomeapplyYdjfkg'){
+        zb  = this.applicationDetail.ydjfkg.theGeomJson;
+      }
+      setTimeout(() => {
+        var zbCl = zb.replace("POINT(","").replace(")","").replace(" ",",");
+        zbCl = JSON.stringify([zbCl]).replaceAll("\"","");
+        var vector_drawing;
+        let projection = new ol.proj.Projection({
+          //地图投影类型
+          code: "EPSG:3857",
+          units: "degrees",
+          //extent:extent
+        });
+        let aerial = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: "http://t0.tianditu.gov.cn/img_w/wmts?" +
+              "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+              "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
+          }),
+          isGroup: true,
+          name: "卫星影像图",
+        });
+
+        let yingxzi = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: "https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
+          }),
+          isGroup: true,
+          name: "天地图文字标注--卫星影像图",
+        });
+        //加载地图
+        let map = new ol.Map({
+          controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
+          layers: [aerial, yingxzi],
+          projection: projection,
+          target: 'uuidMap',
+          logo: 'false',
+          view: new ol.View({
+            center: ol.proj.fromLonLat(JSON.parse(zbCl)),
+            //zoom: false,
+            zoom: 17.9,
+            minZoom: 0, //地图缩小限制
+            maxZoom: 18.3, //地图放大限制
+          }),
+        });
+        var newcenterFeature = new ol.Feature({
+          geometry: new ol.geom.Point(ol.proj.fromLonLat(JSON.parse(zbCl))), //几何信息
+          name: "到场点",
+        });
+        var sourceMapLook = new ol.source.Vector({wrapX: false});
+        vector_drawing = new ol.layer.Vector({
+          source: sourceMapLook,
+        });
+        map.addLayer(vector_drawing);
+        newcenterFeature.setStyle(createLabelStyle()); //设置要素样式
+        sourceMapLook.addFeature(newcenterFeature);
+
+        //矢量标注样式设置函数，设置image为图标ol.style.Icon
+        function createLabelStyle() {
+          return new ol.style.Style({
+            image: new ol.style.Icon({
+              //设置图标偏移
+              anchor: [0.5, 1],
+              //标注样式的起点位置
+              anchorOrigin: "top-right",
+              //X方向单位：分数
+              anchorXUnits: "fraction",
+              //Y方向单位：像素
+              anchorYUnits: "pixels",
+              //偏移起点位置的方向
+              offsetOrigin: "top-right",
+              //透明度
+              opacity: 0.9,
+              //图片路径
+              src: require("../../../../assets/images/housesteadSurvey/mark.png"),
+            }),
+            zIndex: 9999,
+          });
+        }
+      },1000);
+    },
+    mapZbQx(){
+
+    },
+    mapZbQd(){
+      // //申请审批定位
+      // if(this.mapZbNow == 'tHouseApproveVillage' && this.formEnabled.baseApplyForm.villageFormEnabled){
+      //   this.applicationDetail.tHouseApproveVillageOptions.theGeom = JSON.stringify(this.mapBcZb);
+      // }
+      // if (this.mapZbNow == 'tHouseApproveNature' && this.formEnabled.baseApplyForm.nature_resourceFormEnabled){
+      //   this.applicationDetail.tHouseApproveNatureOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApproveAgriculture' && this.formEnabled.baseApplyForm.agricultureFormEnabled){
+      //   this.applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApproveOther' && this.formEnabled.baseApplyForm.buildingFormEnabled){
+      //   this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApproveTown' && this.formEnabled.baseApplyForm.townFormEnabled){
+      //   this.applicationDetail.tHouseApproveTownOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      // }
+      // //验收申请定位
+      // if(this.mapZbNow == 'tHouseApplyEndNongye' && this.formEnabled.acceptingForm.agricultureFormEnabled){
+      //   this.applicationDetail.tHouseApplyEnd.nongyeGeom = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApplyEndNature' && this.formEnabled.acceptingForm.nature_resourceFormEnabled){
+      //   this.applicationDetail.tHouseApplyEnd.natureGeom = JSON.stringify(this.mapBcZb);
+      // }
+      // if(this.mapZbNow == 'tHouseApplyEndZhen' && this.formEnabled.acceptingForm.townFormEnabled){
+      //   this.applicationDetail.tHouseApplyEnd.zhenGeom = JSON.stringify(this.mapBcZb);
+      // }
+      //申请审批定位
+      if(this.formEnabled.baseApplyForm.villageFormEnabled){
+        this.applicationDetail.tHouseApproveVillageOptions.theGeom = JSON.stringify(this.mapBcZb);
+      }
+      if (this.formEnabled.baseApplyForm.nature_resourceFormEnabled){
+        this.applicationDetail.tHouseApproveNatureOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.baseApplyForm.agricultureFormEnabled){
+        this.applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.baseApplyForm.buildingFormEnabled){
+        this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.baseApplyForm.townFormEnabled){
+        this.applicationDetail.tHouseApproveTownOptions.theGeomPoint = JSON.stringify(this.mapBcZb);
+      }
+      //验收申请定位
+      if(this.formEnabled.acceptingForm.agricultureFormEnabled){
+        this.applicationDetail.tHouseApplyEnd.nongyeGeom = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.acceptingForm.nature_resourceFormEnabled){
+        this.applicationDetail.tHouseApplyEnd.natureGeom = JSON.stringify(this.mapBcZb);
+      }
+      if(this.formEnabled.acceptingForm.townFormEnabled){
+        this.applicationDetail.tHouseApplyEnd.zhenGeom = JSON.stringify(this.mapBcZb);
+      }
+
+    },
+  },
+  watch: {
+    selectedTabName: function (newVal, oldVal) {
+      this.$nextTick(() => {
+        if(newVal == PROPOSER_STAGE_BASE_APPLY)
+        {
+          this.pointDarw(null);
+          // this.pointDarwNature(null);
+          this.$refs.pointDarwMap && this.$refs.pointDarwMap.update();
+          this.$refs.pointDarwNatureMap && this.$refs.pointDarwNatureMap.update();
+        }
+        else if(newVal == PROPOSER_STAGE_START) {
+          // this.paintStartNatureMap(null);
+          this.$refs.startNatureMap && this.$refs.startNatureMap.update();
+        }
+        else if(newVal == PROPOSER_STAGE_END) {
+          // this.pointWrapAcceptance(null);
+          this.$refs.pointDarwAcceptanceMap && this.$refs.pointDarwAcceptanceMap.update();
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding-bottom: 5%;
+    .header_main{
+      height: 116px;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+      .return_btn{
+        width: 24px;
+        height: 43.2px;
+        background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 20PX;
+        height: 20PX;
+        background: url('../../../../../static/images/icon/icon_flow.png') center center no-repeat;
+        background-size: 20PX 20PX;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+  }
+  .examine_box .van-col:first-child{
+    color: #FFF!important;
+    font-size: 0.45rem!important;
+    text-align: center!important;
+  }
+  .examine_box .van-col:last-child{
+    background-color: #FFF!important;
+    border-radius: 0.15rem!important;
+    overflow: hidden!important;
+    .van-radio-group--horizontal{
+      padding: 0.2rem 0;
+      border-bottom: 1px solid #eee;
+    }
+  }
+  #mapWrap{
+    width: 96%;
+    margin: 0 auto;
+    border-bottom-left-radius: 12px;
+    border-bottom-right-radius: 12px;
+    overflow: hidden;
+  }
+  .mapBox{
+    position: relative;
+    .mapBox_button{
+      position: absolute;
+      top: 0.2rem;
+      right: 2%;
+    }
+  }
+  .van-steps{
+    padding: 2% 6% 0;
+  }
+  .topTit{
+    margin-top: 0.4rem;
+    font-size: 0.45rem;
+    background-color: #1D6FE9;
+    color: #FFFFFF;
+    line-height: 58px;
+    text-align: center;
+    padding: 15px 0;
+    box-shadow: 0px 3px 6px 0px rgba(15,67,145,0.40);
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .collapse{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    margin-bottom: 15px;
+  }
+  /deep/.van-radio--horizontal{
+    margin-left: 20px;
+    margin-right: 0;
+  }
+  .file-box{
+    padding: 2% 5% 0;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    border-radius: 14px;
+  }
+  .timeTit{
+    text-align: center;
+    font-size: 16px;
+    line-height: 27px;
+  }
+  .action-box{
+    padding: 15px 0!important;
+    margin-top: 0.4rem;
+  }
+  .check-box{
+    margin-top: 0.4rem;
+  }
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+    display: inline-block;
+    width: 0.7rem;
+    height: 0.7rem;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: -0.35rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+    display: inline-block;
+    width: 0.7rem;
+    height: 0.7rem;
+  }
+  .familyList{
+    margin-top: 0.4rem;
+    position: relative;
+  }
+  .noModify{
+    .topTit{
+      background-color:#ABABAB ;
+      box-shadow: 0px 3px 6px 0px rgba(171,171,171,0.40);
+    }
+    .van-cell__title{
+      color: #B4B0B0;
+    }
+  }
+  .flow_main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+    margin-top: 2%;
+    padding: 5% 1%;
+    .van-col{
+      text-align: center;
+    }
+    .tit{
+      background: #1d6fe9;
+      border-radius: 12px;
+      font-size: 0.4rem;
+      font-family: Source Han Sans CN, Source Han Sans CN-Regular;
+      font-weight: 400;
+      color: #ffffff;
+      line-height: 0.65rem;
+      letter-spacing: 0px;
+      width: 70%;
+      margin: 0 auto;
+    }
+    .van-step--vertical{
+      padding-right: 0;
+      text-align: left;
+    }
+    .van-step--vertical:not(:last-child)::after{
+      border: none;
+    }
+    .van-step--finish{
+      color: #1d6fe9;
+    }
+  }
+  .van-goods-action {
+    justify-content: center;
+  }
+  .van-goods-action-button--first {
+    border-radius: 0.053333rem;
+  }
+  .van-goods-action-button--last {
+    border-radius: 0.053333rem;
+  }
+  .van-goods-action-button {
+    margin-left: 0.1rem;
+  }
+  .fuTitle {
+    border-top: 1px solid #e9e9e9;
+    text-align: center;
+    padding: 10px 0px 0px 0px;
+    font-size: 18px;
+    color: #999;
+  }
+  .zkshStyle{
+    margin: 0 50%;
+  }
+  #mapDiv {
+    width: 100%;
+    height: 400px
+  }
+
+  input,
+  b,
+  p {
+    margin-left: 5px;
+    font-size: 14px
+  }
+</style>
diff --git a/src/views/yinnong/homestead/paidExit/paidExitAdd.vue b/src/views/yinnong/homestead/paidExit/paidExitAdd.vue
new file mode 100644
index 00000000..e5d4b01d
--- /dev/null
+++ b/src/views/yinnong/homestead/paidExit/paidExitAdd.vue
@@ -0,0 +1,726 @@
+<template>
+    <div class="app-container">
+<!--      <van-nav-bar-->
+<!--        left-arrow-->
+<!--        fixed-->
+<!--        placeholder-->
+<!--        @click-left="$router.back(-1)"-->
+<!--      >-->
+<!--        <template #title>-->
+<!--          <p style="font-weight: bold;">添加有偿退出</p>-->
+<!--        </template>-->
+<!--      </van-nav-bar>-->
+
+      <div class="header_main">
+        添加有偿退出
+        <div class="return_btn" @click="onClickLeft"></div>
+        <!--      <div class="add_btn" @click="goAdd"></div>-->
+      </div>
+
+      <p class="main_title">申请人基本信息</p>
+      <van-form ref="_Form">
+      <div class="main_box">
+<!--        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>-->
+        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+        <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
+          <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
+            {{item.sqrxm}}
+          </van-cell>
+        </div>
+<!--        <van-field-->
+<!--          readonly-->
+<!--          clickable-->
+<!--          v-model="circulation.zjddm"-->
+<!--          label="宅基地代码"-->
+<!--          placeholder="请选择"-->
+<!--          @click="remoteProposerMethod"-->
+<!--          input-align="right"-->
+<!--          right-icon="arrow-down" :rules="[{ required: true }]" required-->
+<!--        />-->
+<!--        <van-popup v-model="showzjddm" position="bottom">-->
+<!--          <van-picker-->
+<!--            show-toolbar-->
+<!--            :columns="zjdDictionaries"-->
+<!--            value-key="zjddm"-->
+<!--            @confirm="onConfirmZjddm"-->
+<!--            @cancel="showzjddm = false"-->
+<!--          />-->
+<!--        </van-popup>-->
+        <van-field
+          v-model="circulation.zjddm"
+          label="宅基地代码"
+          input-align="right"
+          :rules="[{ required: true }]"
+          required
+        >
+          <template #button>
+            <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
+          </template>
+        </van-field>
+        <van-field
+          readonly
+          clickable
+          v-model="xb"
+          label="性别"
+          placeholder="请选择"
+          @click="showxb = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showxb" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="xbDictionaries"
+            @confirm="onConfirmXb"
+            @cancel="showxb = false"
+          />
+        </van-popup>
+        <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.lxdh" label="联系电话" placeholder="联系电话" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <field-select
+          v-model="circulation.gyqk"
+          label="共有情况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择共有情况"
+          :rules="[{ required: true }]"
+          required
+          remote-url="/open/zdzh/list/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <van-field v-model="circulation.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      </div>
+
+        <p class="main_title">拟申请退出宅基地</p>
+        <van-field v-model="circulation.tcmj" label="面积(㎡)" placeholder="请输入面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+        <field-select
+          v-model="circulation.xz"
+          label="现状"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择现状"
+          :rules="[{ required: true }]"
+          required
+          remote-url="/open/zdzh/list/dsxz"
+          :on-remote-response="'data'"
+        />
+        <van-field v-model="circulation.zjdszd" label="东至" placeholder="东至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.zjdszn" label="南至" placeholder="南至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.zjdszx" label="西至" placeholder="西至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.zjdszb" label="北至" placeholder="北至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <field-select
+          v-model="circulation.dldm"
+          label="地类"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择现状"
+          :rules="[{ required: true }]"
+          required
+          remote-url="/open/zdzh/list/geographic_type"
+          :on-remote-response="'data'"
+        />
+        <p class="main_title">退出宅基地情况</p>
+        <van-field v-model="circulation.tcmj" label="退出面积(㎡)" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+        <van-field v-model="circulation.jzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          v-model="tcqllx"
+          label="退出权利类型"
+          placeholder="请选择退出权利类型"
+          @click="showtcqllx = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtcqllx" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tcqllxDictionaries"
+            @confirm="onConfirmTcqllx"
+            @cancel="showtcqllx = false"
+          />
+        </van-popup>
+
+        <!--<van-field
+          readonly
+          clickable
+          v-model="tclx"
+          label="退出类型"
+          placeholder="请选择退出类型"
+          @click="showtclx = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtclx" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tclxDictionaries"
+            @confirm="onConfirmTclx"
+            @cancel="showtclx = false"
+          />
+        </van-popup>-->
+
+        <van-field
+          readonly
+          clickable
+          v-model="tcfs"
+          label="退出方式"
+          placeholder="请选择退出方式"
+          @click="showtcfs = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtcfs" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tcfsDictionaries"
+            @confirm="onConfirmTcfs"
+            @cancel="showtcfs = false"
+          />
+        </van-popup>
+        <van-field v-model="circulation.tcqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
+      </div>
+        <p class="main_title">现居住情况</p>
+        <van-field v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+        <van-field v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
+        <van-field v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+        <p class="main_title">补偿信息</p>
+        <van-field v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+        <van-field v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+        <field-select
+          v-model="circulation.yctcfs"
+          label="退出类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择退出类型"
+          remote-url="/open/zdzh/list/yctcfs"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="circulation.bcfs"
+          label="补偿方式"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择退出类型"
+          remote-url="/open/zdzh/list/bcfs"
+          :on-remote-response="'data'"
+        />
+        <field-date-picker
+          v-model="circulation.bcsj"
+          label="补偿时间"
+          placeholder="选择日期"
+          formatter="yyyy-MM-dd"
+        />
+        <p class="main_title">其他</p>
+
+        <van-field v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>
+        <field-date-picker
+          v-model="circulation.sqrq"
+          label="申请日期"
+          placeholder="选择日期"
+          :rules="[{ required: true }]"
+          formatter="yyyy-MM-dd"
+          required
+        />
+        <van-field v-model="circulation.jbrxm" label="经办人姓名" placeholder="请输入经办人姓名" input-align="right" label-width="auto"/>
+        <field-date-picker
+          v-model="circulation.pzrq"
+          label="批准日期"
+          placeholder="选择日期"
+          :rules="[{ required: true }]"
+          formatter="yyyy-MM-dd"
+          required
+        />
+        <field-date-picker
+          v-model="circulation.barq"
+          label="备案日期"
+          placeholder="选择日期"
+          :rules="[{ required: true }]"
+          formatter="yyyy-MM-dd"
+          required
+        />
+
+        <van-dialog v-model="mapShow" show-cancel-button>
+          <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.sqrxm" :landStatus="landStatus" :deptId="sysFarmer.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+        </van-dialog>
+        <!-- 3组附件 -->
+        <van-popup
+          v-model="attachmentVisible"
+          closeable
+          position="top"
+          :style="{ height: '61.8%' }"
+          :close-on-click-overlay="proposerStatus == 1"
+          :lazy-render="false"
+        >
+          <van-tabs type="card" style="padding-top: 1.35rem;" color="#1D6FE9" :lazy-render="false" v-model="attachmentActive" ref="attachmentDialog">
+            <van-tab title="退出附件" key="0">
+              <home-apply-upload-comp
+                :business-type="houseApplyUploadComp.businessType"
+                :house-apply-status="houseApplyUploadComp.homeApplyStatus"
+                :process-key="houseApplyUploadComp.processKey"
+                :proposer-id="houseApplyUploadComp.proposerId"
+                :table-name="houseApplyUploadComp.tableName"
+                :readonly="houseApplyUploadComp.readonly"
+                :userName="sysFarmer.memberName"
+                :full="houseApplyUploadComp.full"
+                @uploadFinished="onUploadFinished"
+              >
+              </home-apply-upload-comp>
+            </van-tab>
+          </van-tabs>
+        </van-popup>
+      </van-form>
+      <van-goods-action style="z-index: 999;">
+        <van-goods-action-icon icon="label-o" text="附件" @click="openAttachment" color="#1D6FE9" />
+          <van-goods-action-button type="info" text="保存"  @click="goSubmit(false)" />
+          <van-goods-action-button type="info" text="提交"  @click="goSubmit(true)"/>
+      </van-goods-action>
+    </div>
+</template>
+
+<script>
+import {  getShyqrs,dyAdd,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
+import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+import FieldSelect from "@/components/form/FieldSelect";
+import FieldDatePicker from "@/components/form/FieldDatePicker";
+import {formatDate} from "element-ui/src/utils/date-util.js";
+import { } from "@/api/onlineHome/homestead/paidExit";
+import {Notify} from "vant";
+import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
+import Cookies from "js-cookie";
+const PROPOSER_VIEW = 1;
+// 工作流名称
+const PROPOSER_STAGE_BASE_APPLY_ACTIVITY = 'home_usetc';
+// 附件表名
+const PROPOSER_STAGE_BASE_APPLY_TABLE = 't_homeuse_zyyctc';
+// 其他
+const PROPOSER_MODULE = 'home';
+export default {
+  name: "paidExitAdd",
+  components: { MapGisObtainTc,FieldSelect,FieldDatePicker,HomeApplyUploadComp },
+  data() {
+    return {
+      tcqllxDictionaries:[],//退出权利类型
+      tclxDictionaries:[],//退出类型
+      tcfsDictionaries:[],//退出方式
+      yctcfsDictionaries:[],//有偿退出方式
+      xbDictionaries:[],//申请人证件类型
+      bcfsDictionaries:[],//补偿方式
+      zjdDictionaries:[],//宅基地代码
+      getObligeeOptions:[],//下拉框列表
+      sysFarmer:{deptId:this.$store.state.user.loginDeptId,memberName:this.$store.state.user.nickName},
+      tcqllx:'整体退出',
+      tclx:'有偿退出',
+      tcfs:'使用权',
+      yctcfs:'暂时退出',
+      xb:'男',
+      bcfs:'',
+      zjddm:'',
+      landStatus:"1",
+      showtcqllx: false,
+      showtclx: false,
+      showtcfs: false,
+      showyctcfs: false,
+      showxb: false,
+      showbcfs: false,
+      showzjddm: false,
+      showDropList: false,//是否显示下拉框
+      attachmentVisible:false,
+      active: 0,
+      // 表单意图
+      proposerStatus: PROPOSER_VIEW,
+      // 家庭成员tab
+      familyMembersActive: 0,
+      circulation:{
+        // 申请类型  1-宅基地退出
+        sqlx: '1',
+        xb:"1",
+        gyqk:"1",
+        xz:"1",
+        tcfs:"01",
+        jzmj:0.00,
+        tcqllx:"01",
+        xjzmj:0.00,
+        dldm:"10",
+        // 退出类型  01-有偿退出   02-无偿退出
+        tclx: '01',
+      },
+      // 当前附件tab
+      attachmentActive: 0,
+      // 申请附件树
+      houseApplyUploadComp: {
+        businessType: PROPOSER_MODULE,
+        proposerId: -1,
+        homeApplyStatus: "11",
+        processKey: PROPOSER_STAGE_BASE_APPLY_ACTIVITY,
+        tableName: PROPOSER_STAGE_BASE_APPLY_TABLE,
+        attachmentList: [],
+        readonly: false,
+        full: false,
+      },
+      mapShow: false,
+    };
+  },
+  created() {
+    this.getDictionaries();
+  },
+  methods: {
+    getDictionaries(){
+      //退出权利类型
+      this.houseGetDicts("tcqllx").then((res) => {
+        for(var i = 0 ; i < res.data.length ; i++){
+          this.tcqllxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
+        }
+      });
+      //退出类型
+      /*this.houseGetDicts("tclx").then((res) => {
+        for(var i = 0 ; i < res.data.length ; i++){
+          this.tclxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
+        }
+      });*/
+      //退出方式
+      this.houseGetDicts("tcfs").then((res) => {
+        for(var i = 0 ; i < res.data.length ; i++){
+          this.tcfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
+        }
+      });
+      //申请人证件类型
+      this.houseGetDicts("sys_user_sex").then((res) => {
+        for(var i = 0 ; i < res.data.length ; i++){
+          this.xbDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
+        }
+      });
+      //补偿方式
+      this.houseGetDicts("bcfs").then((res) => {
+        for(var i = 0 ; i < res.data.length ; i++){
+          this.bcfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
+        }
+      });
+      this.$set(this.circulation, 'yctcfs', "1");
+      this.$set(this.circulation, 'bcfs', "01");
+      this.$set(this.circulation, 'bcje', 0.00);
+      this.$set(this.circulation, 'dmfzwbc', 0.00);
+      //宅基地代码
+      /*zjdzd().then(zjdRes => {
+        for( let i = 0 ; i < zjdRes.rows.length ; i++){
+          this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
+        }
+        if(this.zjdDictionaries.length > 0)
+          this.onConfirmZjddm(this.zjdDictionaries[0]);
+      });*/
+      // getExitProposerDetail().then(res => {
+      //   if (res.data) {
+      //     let data = res.data;
+      //     this.$set(this.circulation, 'sqrxm', data.shyqrdbxm);
+      //     this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
+      //     this.$set(this.circulation, 'sqrzjlx', data.shyqrdbzjlx);
+      //     if(data.shyqrdbzjlx) {
+      //       let val = this.zjlxDictionaries.find((x) => x.value == data.shyqrdbzjlx);
+      //       if(val)
+      //         this.zjlx = val.text;
+      //     }
+      //   }
+      // });
+    },
+    /*onConfirmZjddm(data){
+      console.log(data)
+      this.circulation.zjddm = data;
+      this.showzjddm = false;
+      getByZjddm({zjddm: data,}).then(qlrRes => {
+        let data = qlrRes.data;
+        console.log(data)
+        this.$set(this.circulation, 'sqrxm', data.shyqrdbxm);
+        this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
+        this.$set(this.circulation, 'sqrzjlx', data.shyqrdbzjlx);
+        if(data.shyqrdbzjlx)
+        {
+          let val = this.zjlxDictionaries.find((x) => x.value == data.shyqrdbzjlx);
+          if(val)
+            this.zjlx = val.text;
+        }
+        this.$forceUpdate();
+      });
+    },*/
+    // 初次申请草稿的附件上传
+    onUploadFinished(fileIdList) {
+      this.$set(this.circulation, "fileList", fileIdList);
+    },
+    onConfirmZjddm(data){
+      console.log(data);
+      this.showzjddm = false;
+      if (data) {
+        this.$set(this.circulation, 'zjddm', data.zjddm);
+        this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
+        this.$set(this.circulation, 'sqrzjlx', data.shyqrdbzjlx);
+        if(data.shyqrdbzjlx)
+        {
+          let val = this.zjlxDictionaries.find((x) => x.value == data.shyqrdbzjlx);
+          if(val)
+            this.zjlx = val.text;
+        }
+      }
+      // this.$forceUpdate();
+    },
+    onConfirmXb(data){
+      this.xb = data.text;
+      this.circulation.xb = data.value;
+      this.showxb = false;
+    },
+    onConfirmTcqllx(data){
+      this.tcqllx = data.text;
+      this.circulation.tcqllx = data.value;
+      this.showtcqllx = false;
+    },
+    /*onConfirmTclx(data){
+      this.tclx = data.text;
+      this.circulation.tclx = data.value;
+      this.showtclx = false;
+    },*/
+    onConfirmTcfs(data){
+      this.tcfs = data.text;
+      this.circulation.tcfs = data.value;
+      this.showtcfs = false;
+    },
+    onConfirmYctcfs(data){
+      this.yctcfs = data.text;
+      this.circulation.yctcfs = data.value;
+      this.showyctcfs = false;
+    },
+    onConfirmBcfs(data){
+      this.bcfs = data.text;
+      this.circulation.bcfs = data.value;
+      this.showbcfs = false;
+    },
+    goSubmit(submit){
+      console.log(this.circulation);
+      this.$refs._Form.validate().then(() => {
+        // 设置初始状态为草稿，0 代表草稿
+        this.$set(this.circulation, "auditStatus", '0');
+      dyAdd(this.circulation).then(response => {
+        if(response.code = 200){
+          if(submit)
+          {
+            zyyctcApply(response.data).then((resp) => {
+              this.$toast.success('提交成功');
+              this.back();
+            });
+          }
+          else {
+            this.$toast.success('保存成功');
+            this.back();
+          }
+        }
+      })
+      }).catch((e) => {
+        Notify({ type: 'danger', message: '请填写完整的表单项' });
+      });
+    },
+    back() {
+      setTimeout(() => this.$router.back(-1), 1000)
+    },
+    remoteProposerMethod() {
+      this.showzjddm = true;
+      this.zjdDictionaries = [];
+      if (this.circulation.sqrxm) {
+        getShyqrs({shyqrdbxm:this.circulation.sqrxm}).then(response => {
+          this.zjdDictionaries = response.data.map(item => {
+            return {
+              zjddm: item.zjddm,
+              shyqrdbxm: item.shyqrdbxm,
+              shyqrdbzjlx: item.shyqrdbzjlx,
+              shyqrdbzjhm: item.shyqrdbzjhm
+            }
+          });
+        });
+      } else {
+        this.zjdDictionaries = [];
+      }
+    },
+    /** 模糊查询人员信息 */
+    remoteTransfereeMethod(query) {
+      if (query !== "") {
+        getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
+          if (response.code == 200) {
+            this.getObligeeOptions = response.rows.map(function (item) {
+            return {
+                      sqrxm:item.shyqrdbxm,
+                      sqrxb:item.xb,
+                      sqrzjhm:item.shyqrdbzjhm,
+                      sqrnhdm:item.nhdm,
+                      sqrzjlx:item.shyqrdbzjlx,
+                      sqrdh:item.dh,
+                      gyfs:item.gyfs,
+                      dz:item.dz,
+                      deptId:item.deptId,
+                      deptName:item.deptName,
+                    }
+            })
+            //设置模糊查询的下拉框和滚动条
+            if (this.getObligeeOptions.length > 0) {
+              this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
+              //设置模糊查询的和滚动条
+              this.$nextTick(() => {
+                if (this.getObligeeOptions.length > 4) {
+                  let height = document.getElementById("vanCell").offsetHeight * 4;
+                  document.getElementById("dropList").style.height = height + "px";
+                  document.getElementById("dropList").style.overflow = "scroll";
+                } else {
+                  document.getElementById("dropList").style.height = "";
+                  document.getElementById("dropList").style.overflow = "visible";
+                }
+              });
+            } else {
+              this.showDropList = false;
+            }
+          }
+        });
+      } else {
+        this.getObligeeOptions = [];
+        this.showDropList = false;
+      }
+    },
+    // 打开附件树
+    openAttachment() {
+      this.attachmentVisible = true;
+      if(this.attachmentActive == this.active)
+        this.$nextTick(() => {
+          this.$refs.attachmentDialog.scrollTo(this.active);
+        });
+    },
+    shyqrdmxmChange(val){
+      this.$set(this.circulation, "sqrxm", val.sqrxm);
+      this.$set(this.circulation, "deptId", val.deptId);
+      this.$set(this.circulation, "deptName", val.deptName);
+      this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
+      this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+      this.$set(this.circulation, "sqrnhdm", val.sqrnhdm);
+      this.$set(this.circulation, "gyqk", val.gyfs);
+      this.$set(this.circulation, "xb", val.sqrxb);
+      this.$set(this.circulation, "lxdh", val.sqrdh);
+      this.$set(this.circulation, "hkszd", val.dz);
+      this.getObligeeOptions=[];
+      this.showDropList = false;
+    },
+    mapLook(){
+      this.mapShow = true;
+      setTimeout(() => {
+        this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+      },1000);
+    },
+    // 获取日期, yyyy-MM-dd
+    getDate(d) {
+      return formatDate(d ? d : new Date(), 'yyyy-MM-dd');
+    },
+    /** 查找地图中宅基地 */
+    closeMoule: function (data) {
+      this.circulation.zjddm = data;
+      let _this = this;
+      let handlerTime = this.getDate();
+      this.$set(this.circulation, "sqrq", handlerTime);
+      this.$set(this.circulation, "pzrq", handlerTime);
+      this.$set(this.circulation, "barq", handlerTime);
+      getByLyZjddm(data).then((response) => {
+        this.$set(this.circulation, "ntcmj", response.data.zdmj);
+        this.$set(this.circulation, "tcmj", response.data.zdmj);
+        this.$set(this.circulation, "zjdszd", response.data.zdszd);
+        this.$set(this.circulation, "zjdszn", response.data.zdszn);
+        this.$set(this.circulation, "zjdszx", response.data.zdszx);
+        this.$set(this.circulation, "zjdszb", response.data.zdszb);
+        this.$set(this.circulation, "theGeomJson", response.data.theGeomJson);
+        this.$set(this.circulation, "tcqszsh", response.data.zsh);
+        listHomesteadnmfw({zjddm: data}).then((res) => {
+          res.rows.map(function(item){
+            _this.$set(_this.circulation, "jzmj", Number(_this.circulation.jzmj) + Number(item.jzmj));
+            _this.$set(_this.circulation, "xjzmj", Number(_this.circulation.xjzmj) + Number(item.jzmj));
+          });
+        });
+        // const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if(response.data.zdt != null && response.data.zdt !== ""){
+          this.$set(this.form, "xzzp", response.rows[0].zdt);
+        }
+      });
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding-bottom: 2%;
+    .header_main{
+      height: 116px;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+      margin-bottom: 2%;
+      .return_btn{
+        width: 24px;
+        height: 43.2px;
+        background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 56.4px;
+        height: 40.8px;
+        background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+        background-size: 47px 34px;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+
+  }
+  /*#dropList::-webkit-scrollbar {*/
+  /*  !*滚动条整体样式*!*/
+  /*  width: 5px;     !*高宽分别对应横竖滚动条的尺寸*!*/
+  /*  height: 1px;*/
+  /*}*/
+  /*#dropList::-webkit-scrollbar-thumb {*/
+  /*  !*滚动条里面小方块*!*/
+  /*  border-radius: 10px;*/
+  /*  background: #fff;*/
+  /*  box-shadow: inset 0 0 5px rgb(0, 122, 204);*/
+  /*}*/
+  /*#dropList::-webkit-scrollbar-track {*/
+  /*  border-radius: 10px;*/
+  /*  background: #fff;*/
+  /*  !*滚动条里面轨道*!*/
+  /*  box-shadow: inset 0 0 5px rgba( 0, 0, 0, .1);*/
+  /*}*/
+</style>
diff --git a/src/views/yinnong/homestead/paidExit/paidExitDetail.vue b/src/views/yinnong/homestead/paidExit/paidExitDetail.vue
index cf19d57c..6b370181 100644
--- a/src/views/yinnong/homestead/paidExit/paidExitDetail.vue
+++ b/src/views/yinnong/homestead/paidExit/paidExitDetail.vue
@@ -798,10 +798,9 @@
 
 <style scoped lang="scss">
   .app-container {
-    padding-bottom: 2%;
   .header_main{
     height: 116px;
-    background: url('../../../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
     background-size: 100% 100%;
     position: fixed;
     top: 0;
@@ -812,7 +811,6 @@
     text-align: center;
     color: #fff;
     position: relative;
-    margin-bottom: 2%;
   .return_btn{
     width: 24px;
     height: 43.2px;
diff --git a/src/views/yinnong/homestead/paidExit/paidExitList.vue b/src/views/yinnong/homestead/paidExit/paidExitList.vue
index 0d8fab76..846cae67 100644
--- a/src/views/yinnong/homestead/paidExit/paidExitList.vue
+++ b/src/views/yinnong/homestead/paidExit/paidExitList.vue
@@ -1,23 +1,10 @@
 <template>
   <div class="app-container">
-    <!--      <van-nav-bar-->
-    <!--        left-arrow-->
-    <!--        fixed-->
-    <!--        placeholder-->
-    <!--        @click-left="$router.back(-1)"-->
-    <!--        @click-right="goAdd"-->
-    <!--      >-->
-    <!--        <template #title>-->
-    <!--          <p style="font-weight: bold;">有偿退出</p>-->
-    <!--        </template>-->
-    <!--        <template #right>-->
-    <!--          <van-icon name="add" size="18" />-->
-    <!--        </template>-->
-    <!--      </van-nav-bar>-->
 
     <div class="header_main">
       有偿退出
       <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn" @click="goAdd"></div>
     </div>
 
     <van-list
@@ -27,7 +14,7 @@
       @load="getList"
     >
       <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-        <van-cell :title="item.zjddm" :value="item.auditStatus" center :to="{name:'paidExitDetail', query: {id:item.id}}" >
+        <van-cell :title="item.zjddm" :value="selectDictLabel(auditStatus, item.auditStatus)" center :to="{name:'paidExitDetail', query: {id:item.id}}" >
           <template #icon>
             <van-icon name="../../../static/images/onlineHome/icon_zjd3.png" size="30" color="#539FFD" style="margin-right: 10px;" />
           </template>
@@ -35,6 +22,19 @@
             <p><b style="color: #539FFD;">{{item.tcfs}}</b><i style="margin-right: 0.5rem;"></i><b style="color: #333333;">{{item.sqrxm}}</b><i style="margin-right: 0.5rem;"></i>{{item.tcmj}}㎡</p>
           </template>
         </van-cell>
+        <template #right>
+          <van-row>
+            <van-col>
+              <van-button square text="修改" v-if="item.auditStatus=='0'" :to="{name:'homesteadPaidExitModify', query: {id:item.id}}" type="info" class="delete-button" />
+            </van-col>
+            <van-col>
+              <van-button square text="提交" type="primary" v-if="item.auditStatus=='0'" class="delete-button" @click="goSubmit(item)" />
+            </van-col>
+            <van-col>
+              <van-button square text="删除" v-if="item.auditStatus=='0'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
+            </van-col>
+          </van-row>
+        </template>
       </van-swipe-cell>
     </van-list>
   </div>
@@ -91,6 +91,9 @@
       });
     },
     methods: {
+      goAdd(){
+        window.location = '/homesteadPaidExitAdd';
+      },
       getList(){
         setTimeout(() => {
           this.deptId = this.$store.state.user.loginDeptId;
@@ -100,9 +103,9 @@
               response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
               response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
               response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
-              response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
               this.applicationList.push(response.rows[i]);
             }
+            console.info(this.applicationList);
             if(this.applicationList.length >= response.total){
               this.finished = true;
               return;
@@ -138,7 +141,7 @@
           if (response.code = 200) {
             this.$toast.success('提交成功');
             setTimeout(function () {
-              window.location.replace("/sunVillage_info/paidExit/paidExitList")
+              window.location.replace("/paidExit")
             }, 1000)
           }
         })
@@ -151,7 +154,7 @@
   .app-container {
   .header_main{
     height: 116px;
-    background: url('../../../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
     background-size: 100% 100%;
     position: fixed;
     top: 0;
diff --git a/src/views/yinnong/homestead/paidExit/paidExitModify.vue b/src/views/yinnong/homestead/paidExit/paidExitModify.vue
new file mode 100644
index 00000000..a811a0e1
--- /dev/null
+++ b/src/views/yinnong/homestead/paidExit/paidExitModify.vue
@@ -0,0 +1,634 @@
+<template>
+  <div class="app-container">
+<!--    <van-nav-bar-->
+<!--      left-arrow-->
+<!--      fixed-->
+<!--      placeholder-->
+<!--      @click-left="$router.back(-1)"-->
+<!--    >-->
+<!--      <template #title>-->
+<!--        <p style="font-weight: bold;">修改有偿退出</p>-->
+<!--      </template>-->
+<!--    </van-nav-bar>-->
+
+    <div class="header_main">
+      修改有偿退出
+      <div class="return_btn" @click="onClickLeft"></div>
+      <!--      <div class="add_btn" @click="goAdd"></div>-->
+    </div>
+
+    <van-form ref="_Form">
+      <div class="main_box">
+        <!--        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>-->
+        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+        <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
+          <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
+            {{item.sqrxm}}
+          </van-cell>
+        </div>
+        <!--        <van-field-->
+        <!--          readonly-->
+        <!--          clickable-->
+        <!--          v-model="circulation.zjddm"-->
+        <!--          label="宅基地代码"-->
+        <!--          placeholder="请选择"-->
+        <!--          @click="remoteProposerMethod"-->
+        <!--          input-align="right"-->
+        <!--          right-icon="arrow-down" :rules="[{ required: true }]" required-->
+        <!--        />-->
+        <!--        <van-popup v-model="showzjddm" position="bottom">-->
+        <!--          <van-picker-->
+        <!--            show-toolbar-->
+        <!--            :columns="zjdDictionaries"-->
+        <!--            value-key="zjddm"-->
+        <!--            @confirm="onConfirmZjddm"-->
+        <!--            @cancel="showzjddm = false"-->
+        <!--          />-->
+        <!--        </van-popup>-->
+        <van-field
+          v-model="circulation.zjddm"
+          label="宅基地代码"
+          input-align="right"
+          :rules="[{ required: true }]"
+          required
+        >
+          <template #button>
+            <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
+          </template>
+        </van-field>
+        <field-select
+          v-model="circulation.xb"
+          label="性別"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择现状"
+          :rules="[{ required: true }]"
+          required
+          remote-url="/open/zdzh/list/sys_user_sex"
+          :on-remote-response="'data'"
+        />
+
+        <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.lxdh" label="联系电话" placeholder="联系电话" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <field-select
+          v-model="circulation.gyqk"
+          label="共有情况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择共有情况"
+          :rules="[{ required: true }]"
+          required
+          remote-url="/open/zdzh/list/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <van-field v-model="circulation.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      </div>
+      <p class="main_title">拟申请退出宅基地</p>
+      <van-field v-model="circulation.tcmj" label="面积(㎡)" placeholder="请输入面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <field-select
+        v-model="circulation.xz"
+        label="现状"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择现状"
+        :rules="[{ required: true }]"
+        required
+        remote-url="/open/zdzh/list/dsxz"
+        :on-remote-response="'data'"
+      />
+      <van-field v-model="circulation.zjdszd" label="东至" placeholder="东至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field v-model="circulation.zjdszn" label="南至" placeholder="南至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field v-model="circulation.zjdszx" label="西至" placeholder="西至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field v-model="circulation.zjdszb" label="北至" placeholder="北至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <field-select
+        v-model="circulation.dldm"
+        label="地类"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择现状"
+        :rules="[{ required: true }]"
+        required
+        remote-url="/open/zdzh/list/geographic_type"
+        :on-remote-response="'data'"
+      />
+      <p class="main_title">退出宅基地情况</p>
+      <van-field v-model="circulation.tcmj" label="退出面积(㎡)" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field v-model="circulation.jzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          v-model="tcqllx"
+          label="退出权利类型"
+          placeholder="请选择退出权利类型"
+          @click="showtcqllx = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtcqllx" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tcqllxDictionaries"
+            @confirm="onConfirmTcqllx"
+            @cancel="showtcqllx = false"
+          />
+        </van-popup>
+
+        <!--<van-field
+          readonly
+          clickable
+          v-model="tclx"
+          label="退出类型"
+          placeholder="请选择退出类型"
+          @click="showtclx = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtclx" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tclxDictionaries"
+            @confirm="onConfirmTclx"
+            @cancel="showtclx = false"
+          />
+        </van-popup>-->
+
+        <van-field
+          readonly
+          clickable
+          v-model="tcfs"
+          label="退出方式"
+          placeholder="请选择退出方式"
+          @click="showtcfs = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtcfs" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tcfsDictionaries"
+            @confirm="onConfirmTcfs"
+            @cancel="showtcfs = false"
+          />
+        </van-popup>
+
+        <van-field v-model="circulation.tcqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
+      </div>
+      <p class="main_title">现居住情况</p>
+      <van-field v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
+      <van-field v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+      <p class="main_title">补偿信息</p>
+      <van-field v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+      <van-field v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+      <field-select
+        v-model="circulation.yctcfs"
+        label="退出类型"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/open/zdzh/list/yctcfs"
+        :on-remote-response="'data'"
+      />
+      <field-select
+        v-model="circulation.bcfs"
+        label="补偿方式"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/open/zdzh/list/bcfs"
+        :on-remote-response="'data'"
+      />
+      <field-date-picker
+        v-model="circulation.bcsj"
+        label="补偿时间"
+        placeholder="选择日期"
+        formatter="yyyy-MM-dd"
+      />
+      <p class="main_title">其他</p>
+
+      <van-field v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>
+      <field-date-picker
+        v-model="circulation.sqrq"
+        label="申请日期"
+        placeholder="选择日期"
+        :rules="[{ required: true }]"
+        formatter="yyyy-MM-dd"
+        required
+      />
+      <van-field v-model="circulation.jbrxm" label="经办人姓名" placeholder="请输入经办人姓名" input-align="right" label-width="auto"/>
+      <field-date-picker
+        v-model="circulation.pzrq"
+        label="批准日期"
+        placeholder="选择日期"
+        :rules="[{ required: true }]"
+        formatter="yyyy-MM-dd"
+        required
+      />
+      <field-date-picker
+        v-model="circulation.barq"
+        label="备案日期"
+        placeholder="选择日期"
+        :rules="[{ required: true }]"
+        formatter="yyyy-MM-dd"
+        required
+      />
+
+      <van-dialog v-model="mapShow" show-cancel-button>
+        <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.sqrxm" :landStatus="landStatus" :deptId="sysFarmer.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+      </van-dialog>
+      <!-- 3组附件 -->
+      <van-popup
+        v-model="attachmentVisible"
+        closeable
+        position="top"
+        :style="{ height: '61.8%' }"
+        :close-on-click-overlay="proposerStatus == 1"
+        :lazy-render="false"
+      >
+        <van-tabs type="card" style="padding-top: 1.35rem;" color="#1D6FE9" :lazy-render="false" v-model="attachmentActive" ref="attachmentDialog">
+          <van-tab title="退出附件" key="0">
+            <home-apply-upload-comp
+              :business-type="houseApplyUploadComp.businessType"
+              :house-apply-status="houseApplyUploadComp.homeApplyStatus"
+              :process-key="houseApplyUploadComp.processKey"
+              :proposer-id="houseApplyUploadComp.proposerId"
+              :table-name="houseApplyUploadComp.tableName"
+              :readonly="houseApplyUploadComp.readonly"
+              :userName="sysFarmer.memberName"
+              :full="houseApplyUploadComp.full"
+              @uploadFinished="onUploadFinished"
+            >
+            </home-apply-upload-comp>
+          </van-tab>
+        </van-tabs>
+      </van-popup>
+    </van-form>
+    <van-goods-action style="z-index: 999;">
+      <van-goods-action-icon icon="label-o" text="附件" @click="openAttachment" color="#1D6FE9" />
+      <van-goods-action-button type="info" text="保存"  @click="goEdit" />
+      <van-goods-action-button type="info" text="提交"  @click="goSubmit"/>
+    </van-goods-action>
+  </div>
+</template>
+
+<script>
+  import {  getZyyctc,getShyqrs,zyyctcEdit,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
+  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import FieldDatePicker from "@/components/form/FieldDatePicker";
+  import {formatDate} from "element-ui/src/utils/date-util.js";
+  import { } from "@/api/onlineHome/homestead/paidExit";
+  import {Notify} from "vant";
+  import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
+  import Cookies from "js-cookie";
+  const PROPOSER_VIEW = 1;
+  // 工作流名称
+  const PROPOSER_STAGE_BASE_APPLY_ACTIVITY = 'home_usetc';
+  // 附件表名
+  const PROPOSER_STAGE_BASE_APPLY_TABLE = 't_homeuse_zyyctc';
+  // 其他
+  const PROPOSER_MODULE = 'home';
+  export default {
+    name: "paidExitModify",
+    components: { MapGisObtainTc,FieldSelect,FieldDatePicker,HomeApplyUploadComp },
+    data() {
+      return {
+        tcqllxDictionaries:[],//退出权利类型
+        tclxDictionaries:[],//退出类型
+        tcfsDictionaries:[],//退出方式
+        xbDictionaries:[],//申请人证件类型
+        zjlxDictionaries:[],
+        bcfsDictionaries:[],//补偿方式
+        zjdDictionaries:[],//宅基地代码
+        getObligeeOptions:[],//下拉框列表
+        sysFarmer:{deptId:this.$store.state.user.loginDeptId,memberName:this.$store.state.user.nickName},
+        tcqllx:'',
+        tclx:'',
+        tcfs:'',
+        xb:'',
+        bcfs:'',
+        zjddm:'',
+        landStatus:"1",
+        showtcqllx: false,
+        showtclx: false,
+        showtcfs: false,
+        showxb: false,
+        showbcfs: false,
+        showzjddm: false,
+        showDropList: false,//是否显示下拉框
+        mapShow: false,
+        attachmentVisible:false,
+        active: 0,
+        // 表单意图
+        proposerStatus: PROPOSER_VIEW,
+        circulation:{},
+        // 当前附件tab
+        attachmentActive: 0,
+        // 申请附件树
+        houseApplyUploadComp: {
+          businessType: PROPOSER_MODULE,
+          proposerId: this.$route.query.id,
+          homeApplyStatus: "11",
+          processKey: PROPOSER_STAGE_BASE_APPLY_ACTIVITY,
+          tableName: PROPOSER_STAGE_BASE_APPLY_TABLE,
+          attachmentList: [],
+          readonly: false,
+          full: false,
+        },
+      };
+    },
+    created() {
+      this.getDictionaries();
+    },
+    methods: {
+      getDictionaries(){
+        getZyyctc(this.$route.query.id).then(response => {
+          //退出权利类型
+          this.houseGetDicts("tcqllx").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.tcqllxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.tcqllx = this.selectDictLabel(res.data, response.data.tcqllx);
+          });
+          //退出方式
+          this.houseGetDicts("tcfs").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.tcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.tcfs = this.selectDictLabel(res.data, response.data.tcfs);
+          });
+          //申请人证件类型
+          this.houseGetDicts("zjlx").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.zjlxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.zjlx = this.selectDictLabel(res.data, response.data.sqrzjlx);
+          });
+
+          this.circulation = response.data;
+          console.info(this.circulation);
+        });
+      },
+      onConfirmZjddm(data){
+        console.log(data);
+        this.showzjddm = false;
+        if (data) {
+          this.$set(this.circulation, 'zjddm', data.zjddm);
+          this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
+          this.$set(this.circulation, 'sqrzjlx', data.shyqrdbzjlx);
+          if(data.shyqrdbzjlx)
+          {
+            let val = this.zjlxDictionaries.find((x) => x.value == data.shyqrdbzjlx);
+            if(val)
+              this.zjlx = val.text;
+          }
+        }
+        // this.$forceUpdate();
+      },
+      onConfirmXb(data){
+        this.xb = data.text;
+        this.circulation.xb = data.value;
+        this.showxb = false;
+      },
+      // 初次申请草稿的附件上传
+      onUploadFinished(fileIdList) {
+        this.$set(this.circulation, "fileList", fileIdList);
+      },
+      onConfirmTcqllx(data){
+        this.tcqllx = data.text;
+        this.circulation.tcqllx = data.value;
+        this.showtcqllx = false;
+      },
+      /*onConfirmTclx(data){
+        this.tclx = data.text;
+        this.circulation.tclx = data.value;
+        this.showtclx = false;
+      },*/
+      onConfirmTcfs(data){
+        this.tcfs = data.text;
+        this.circulation.tcfs = data.value;
+        this.showtcfs = false;
+      },
+      onConfirmBcfs(data){
+        this.bcfs = data.text;
+        this.circulation.bcfs = data.value;
+        this.showbcfs = false;
+      },
+      goEdit(){
+        console.log(this.circulation);
+        this.$refs._Form.validate().then(() => {
+        zyyctcEdit(this.circulation).then(response => {
+          if(response.code = 200){
+            this.$toast.success('保存成功');
+            this.$router.back(-1);
+          }
+        })
+        }).catch((e) => {
+          Notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
+      },
+      goSubmit(){
+        this.$refs._Form.validate().then(() => {
+          this.$set(this.circulation, 'updateBy', this.sysFarmer.memberName);
+          zyyctcEdit(this.circulation).then(response => {
+            zyyctcApply(this.$route.query.id).then(response => {
+              if(response.code = 200){
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  this.$router.back(-1);
+                },1000)
+              }
+            });
+          });
+        }).catch((e) => {
+          Notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
+      },
+      remoteProposerMethod() {
+        this.showzjddm = true;
+        this.zjdDictionaries = [];
+        if (this.circulation.sqrxm) {
+          getShyqrs({shyqrdbxm:this.circulation.sqrxm}).then(response => {
+            this.zjdDictionaries = response.data.map(item => {
+              return {
+                zjddm: item.zjddm,
+                shyqrdbxm: item.shyqrdbxm,
+                shyqrdbzjlx: item.shyqrdbzjlx,
+                shyqrdbzjhm: item.shyqrdbzjhm
+              }
+            });
+          });
+        } else {
+          this.zjdDictionaries = [];
+        }
+      },
+      // 打开附件树
+      openAttachment() {
+        this.attachmentVisible = true;
+        if(this.attachmentActive == this.active)
+          this.$nextTick(() => {
+            this.$refs.attachmentDialog.scrollTo(this.active);
+          });
+      },
+      /** 模糊查询人员信息 */
+      remoteTransfereeMethod(query) {
+        if (query !== "") {
+          getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
+            if (response.code == 200) {
+              this.getObligeeOptions = response.rows.map(function (item) {
+                return {
+                  sqrxm:item.shyqrdbxm,
+                  sqrxb:item.xb,
+                  sqrzjhm:item.shyqrdbzjhm,
+                  sqrzjlx:item.shyqrdbzjlx,
+                  sqrdh:item.dh,
+                  gyfs:item.gyfs,
+                  dz:item.dz,
+                  deptId:item.deptId,
+                  deptName:item.deptName,
+                }
+              })
+              //设置模糊查询的下拉框和滚动条
+              if (this.getObligeeOptions.length > 0) {
+                this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
+                //设置模糊查询的和滚动条
+                this.$nextTick(() => {
+                  if (this.getObligeeOptions.length > 4) {
+                    let height = document.getElementById("vanCell").offsetHeight * 4;
+                    document.getElementById("dropList").style.height = height + "px";
+                    document.getElementById("dropList").style.overflow = "scroll";
+                  } else {
+                    document.getElementById("dropList").style.height = "";
+                    document.getElementById("dropList").style.overflow = "visible";
+                  }
+                });
+              } else {
+                this.showDropList = false;
+              }
+            }
+          });
+        } else {
+          this.getObligeeOptions = [];
+          this.showDropList = false;
+        }
+      },
+      shyqrdmxmChange(val){
+        console.info(val);
+        this.$set(this.circulation, "sqrxm", val.sqrxm);
+        this.$set(this.circulation, "deptId", val.deptId);
+        this.$set(this.circulation, "deptName", val.deptId);
+        this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+        this.$set(this.circulation, "gyqk", val.gyfs);
+        this.$set(this.circulation, "xb", val.sqrxb);
+        this.$set(this.circulation, "lxdh", val.sqrdh);
+        this.$set(this.circulation, "hkszd", val.dz);
+        this.getObligeeOptions=[];
+        this.showDropList = false;
+      },
+      // 获取日期, yyyy-MM-dd
+      getDate(d) {
+        return formatDate(d ? d : new Date(), 'yyyy-MM-dd');
+      },
+      /** 查找地图中宅基地 */
+      closeMoule: function (data) {
+        this.circulation.zjddm = data;
+        let _this = this;
+        let handlerTime = this.getDate();
+        this.$set(this.circulation, "sqrq", handlerTime);
+        this.$set(this.circulation, "pzrq", handlerTime);
+        this.$set(this.circulation, "barq", handlerTime);
+        getByLyZjddm(data).then((response) => {
+          this.$set(this.circulation, "ntcmj", response.data.zdmj);
+          this.$set(this.circulation, "tcmj", response.data.zdmj);
+          this.$set(this.circulation, "zjdszd", response.data.zdszd);
+          this.$set(this.circulation, "zjdszn", response.data.zdszn);
+          this.$set(this.circulation, "zjdszx", response.data.zdszx);
+          this.$set(this.circulation, "zjdszb", response.data.zdszb);
+          this.$set(this.circulation, "theGeomJson", response.data.theGeomJson);
+          this.$set(this.circulation, "tcqszsh", response.data.zsh);
+          listHomesteadnmfw({zjddm: data}).then((response) => {
+            response.rows.map(function(item){
+              _this.$set(_this.circulation, "jzmj", Number(_this.circulation.jzmj) + Number(item.jzmj));
+              _this.$set(_this.circulation, "xjzmj", Number(_this.circulation.xjzmj) + Number(item.jzmj));
+            });
+          });
+          // const baseImgUrl = this.$store.getters.baseRoutingUrl;
+          if(response.rows[0].zdt != null && response.rows[0].zdt !== ""){
+            this.$set(this.form, "xzzp", response.rows[0].zdt);
+          }
+        });
+      },
+      mapLook(){
+        this.mapShow = true;
+        setTimeout(() => {
+          this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+        },1000);
+      },
+    },
+
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding-bottom: 2%;
+    .header_main{
+      height: 116px;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+      margin-bottom: 2%;
+      .return_btn{
+        width: 24px;
+        height: 43.2px;
+        background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 56.4px;
+        height: 40.8px;
+        background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+        background-size: 47px 34px;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+
+  }
+</style>
diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue
index 03c48010..50b9f487 100644
--- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue
+++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue
@@ -1,15 +1,9 @@
 <template>
   <div class="app-container">
-    <van-nav-bar
-      left-arrow
-      fixed
-      placeholder
-      @click-left="$router.back(-1)"
-    >
-      <template #title>
-        <p style="font-weight: bold;">添加有偿使用</p>
-      </template>
-    </van-nav-bar>
+    <div class="header_main">
+      有偿使用
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
     <div class="main_box">
       <van-field v-model="circulation.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
       <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
@@ -410,7 +404,38 @@
 
 <style scoped lang="scss">
   .app-container {
-    padding: 2% 0;
+  .header_main{
+    height: 116px;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+  .return_btn{
+    width: 24px;
+    height: 43.2px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  .add_btn{
+    width: 56.4px;
+    height: 40.8px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+    background-size: 47px 34px;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+  }
   }
   .main_title{
     font-size: 0.4rem;
diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeDteail.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeDteail.vue
index 10d11403..82363c52 100644
--- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeDteail.vue
+++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeDteail.vue
@@ -1,15 +1,9 @@
 <template>
   <div class="app-container">
-    <van-nav-bar
-      left-arrow
-      fixed
-      placeholder
-      @click-left="$router.back(-1)"
-    >
-      <template #title>
-        <p style="font-weight: bold;">有偿使用</p>
-      </template>
-    </van-nav-bar>
+    <div class="header_main">
+      有偿使用
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
     <div class="main_box">
       <van-field
         readonly
@@ -228,7 +222,38 @@
 
 <style scoped lang="scss">
   .app-container {
-    padding: 2% 0;
+  .header_main{
+    height: 116px;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+  .return_btn{
+    width: 24px;
+    height: 43.2px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  .add_btn{
+    width: 56.4px;
+    height: 40.8px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+    background-size: 47px 34px;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+  }
   }
   .main_title{
     font-size: 0.4rem;
diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue
index d395120f..18d6c1da 100644
--- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue
+++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue
@@ -1,19 +1,10 @@
 <template>
   <div class="app-container">
-    <van-nav-bar
-      left-arrow
-      fixed
-      placeholder
-      @click-left="$router.back(-1)"
-      @click-right="goAdd"
-    >
-      <template #title>
-        <p style="font-weight: bold;">有偿使用</p>
-      </template>
-              <template #right>
-                <van-icon name="add" size="18" />
-              </template>
-    </van-nav-bar>
+    <div class="header_main">
+      有偿使用
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn" @click="goAdd"></div>
+    </div>
     <van-list
       v-model="loading"
       :finished="finished"
@@ -134,7 +125,38 @@
 
 <style scoped lang="scss">
   .app-container {
-    padding: 0.2rem 3%;
+  .header_main{
+    height: 116px;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+  .return_btn{
+    width: 24px;
+    height: 43.2px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  .add_btn{
+    width: 56.4px;
+    height: 40.8px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+    background-size: 47px 34px;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+  }
   }
   /deep/.van-cell__title{
     flex: 0.7;
diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue
index 8fdbd7e0..17653d3b 100644
--- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue
+++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue
@@ -1,15 +1,9 @@
 <template>
   <div class="app-container">
-    <van-nav-bar
-      left-arrow
-      fixed
-      placeholder
-      @click-left="$router.back(-1)"
-    >
-      <template #title>
-        <p style="font-weight: bold;">修改有偿使用</p>
-      </template>
-    </van-nav-bar>
+    <div class="header_main">
+      有偿使用
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
     <div class="main_box">
       <van-field readonly v-model="circulation.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
       <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
@@ -420,7 +414,38 @@
 
 <style scoped lang="scss">
   .app-container {
-    padding: 2% 0;
+  .header_main{
+    height: 116px;
+    background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+  .return_btn{
+    width: 24px;
+    height: 43.2px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  .add_btn{
+    width: 56.4px;
+    height: 40.8px;
+    background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+    background-size: 47px 34px;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+  }
   }
   .main_title{
     font-size: 0.4rem;

From 5c810a131e52ef09697fa968341342873be941a3 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Fri, 11 Aug 2023 15:29:29 +0800
Subject: [PATCH 03/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/cbht.js                    |  35 ++
 .../village/contractor/contractWord.vue       | 393 ++++++++++++------
 2 files changed, 290 insertions(+), 138 deletions(-)
 create mode 100644 src/api/contracted/cbht.js

diff --git a/src/api/contracted/cbht.js b/src/api/contracted/cbht.js
new file mode 100644
index 00000000..8c1b3863
--- /dev/null
+++ b/src/api/contracted/cbht.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+
+// 获取承包合同详情
+export function getCbht(cbfbm) {
+  return request({
+    url: '/service/cbht/obtain/' + cbfbm,
+    method: 'get'
+  });
+}
+
+// 新增承包合同信息
+export function addCbht(data) {
+  return request({
+    url: '/service/cbht/insert',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改承包合同信息
+export function updateCbht(data) {
+  return request({
+    url: '/service/cbht/edit',
+    method: 'post',
+    data: data
+  });
+}
+
+// 承包合同延期
+export function extendCbht(id) {
+  return request({
+    url: '/service/cbht/extension/' + id,
+    method: 'get'
+  });
+}
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index bc5ab0ac..b14e1c4c 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -8,119 +8,147 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
 
     <div class="tap_block">
-      <p @click="$router.push({path:'/contracted/village/contractorDetail'})">承包方</p>
-      <p @click="$router.push({path:'/contracted/village/contractorFamily'})">家庭成员</p>
+      <p @click="skip('contractedVillageContractorDetail')">承包方</p>
+      <p @click="skip('contractedVillageContractorFamily')">家庭成员</p>
       <p class="active">承包合同</p>
-      <p @click="$router.push({path:'/contracted/village/contractorLand'})">承包地</p>
+      <p @click="skip('contractedVillageContractorLand')">承包地</p>
     </div>
 
     <div class="list_main">
-      <van-field v-model="value" label="承包合同代码：" placeholder="请输入承包合同代码" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="原承包合同代码：" placeholder="请输入原承包合同代码" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="发包方代码：" placeholder="请输入发包方代码" required :border="false" input-align="right" />
-      <van-field
-        v-model="value"
-        label="承包方类型："
-        placeholder="请选择承包方类型"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showType = true"
-      />
-      <van-popup v-model="showType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="typeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmTypeOptions"
-          @cancel="showType = false"
+      <van-form ref="formData">
+        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="left" />
+        <van-field v-model="form.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field
+          v-model="cbflxText"
+          label="承包方类型："
+          placeholder="请选择承包方类型"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showType = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="承包方名称：" placeholder="请输入承包方名称" required :border="false" input-align="right" />
-      <van-field v-model="value" label="承包方代码：" placeholder="请输入承包方代码" required :border="false" input-align="right" />
-      <van-field
-        v-model="value"
-        label="承包方式："
-        placeholder="请选择承包方式"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showZjType = true"
-      />
-      <van-popup v-model="showZjType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="zjTypeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmZjTypeOptions"
-          @cancel="showZjType = false"
+        <van-popup v-model="showType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="cbflxOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmTypeOptions"
+            @cancel="showType = false"
+          />
+        </van-popup>
+        <van-field v-model="form.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field
+          v-model="cbfsText"
+          label="承包方式："
+          placeholder="请选择承包方式"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showCbfs = true"
         />
-      </van-popup>
-
-      <van-field
-        v-model="value"
-        label="签订时间："
-        placeholder="请选择签订时间"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showQDSJ = true"
-      />
-      <van-popup v-model="showQDSJ" position="bottom">
-        <van-datetime-picker
-          v-model="currentDate"
-          type="date"
-          title="选择年月日"
-          :min-date="minDate"
-          :max-date="maxDate"
+        <van-popup v-model="showCbfs" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="cbfsOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmCbfsOptions"
+            @cancel="showCbfs = false"
+          />
+        </van-popup>
+        <van-field
+          v-model="form.qdsj"
+          label="签订时间："
+          placeholder="请选择签订时间"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showQDSJ = true"
         />
-      </van-popup>
-
-      <van-field
-        v-model="value"
-        label="承包起始："
-        placeholder="请选择承包起始"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showCBQS = true"
-      />
-      <van-popup v-model="showCBQS" position="bottom">
-        <van-datetime-picker
-          v-model="currentDate"
-          type="date"
-          title="选择年月日"
-          :min-date="minDate"
-          :max-date="maxDate"
+        <van-popup v-model="showQDSJ" position="bottom">
+          <van-datetime-picker
+            :value="form.qdsj ? new Date(form.qdsj) : new Date()"
+            type="date"
+            title="请选择签订时间"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmQdsj"
+            @cancel="showQDSJ = false"
+          />
+        </van-popup>
+        <van-field
+          v-model="form.cbqxq"
+          label="承包起始时间："
+          placeholder="请选择起始时间"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showCbqxq = true"
+        >
+          <template #button v-if="form.id">
+            <van-button size="small" type="primary" native-type="button" @click.stop="extension">延期</van-button>
+          </template>
+        </van-field>
+        <van-popup v-model="showCbqxq" position="bottom">
+          <van-datetime-picker
+            :value="form.cbqxq ? new Date(form.cbqxq) : new Date()"
+            type="date"
+            title="请选择起始时间"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmCbqxq"
+            @cancel="showCbqxq = false"
+          />
+        </van-popup>
+
+        <van-field
+          v-model="form.cbqxz"
+          label="承包结束时间："
+          placeholder="请选择结束时间"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showCbqxz = true"
         />
-      </van-popup>
-
-
-
-      <van-field v-model="value" label="承包结束：" placeholder="请输入承包结束" required :border="false" input-align="right" />
-      <van-field v-model="value" label="承包地块数：" placeholder="请输入承包地块数" required :border="false" input-align="right" />
-      <van-field v-model="value" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :border="false" input-align="right" label-width="auto" />
-      <p class="btn">保存</p>
+        <van-popup v-model="showCbqxz" position="bottom">
+          <van-datetime-picker
+            :value="form.cbqxz ? new Date(form.cbqxz) : new Date()"
+            type="date"
+            title="请选择结束时间"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmCbqxz"
+            @cancel="showCbqxz = false"
+          />
+        </van-popup>
+        <van-field v-model="form.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
+        <van-field v-model="form.htzmjm" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
+      </van-form>
+      <p class="btn" @click="submitForm">保存</p>
     </div>
 
 
@@ -129,6 +157,7 @@
 <script>
   import Cookies from "js-cookie";
   import contractorHeader from "./contractorHeader";
+  import { getCbht, addCbht, updateCbht, extendCbht } from "@/api/contracted/cbht";
 
   export default {
     name: "contractedVillageContractor",
@@ -137,51 +166,135 @@
     },
     data() {
       return {
-        loading:false,
-        finished:true,
-        value:'',
-        showType:false,
-        showZjType:false,
-        showQDSJ:false,
-        showCBQS:false,
-        typeOptions:[{
-          dictLabel:'类型1',
-          dictValue:'1',
-        }],
-        zjTypeOptions:[{
-          dictLabel:'类型2',
-          dictValue:'1',
-        }],
-        CYBZOptions:[{
-          dictLabel:'类型2',
-          dictValue:'1',
-        }],
-        radio:1,
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
+        form: {},                 // 承包合同表单信息
+        cbfsOptions: [],          // 承包方式字典
+        cbfsText: null,           // 承包方式标签名
+        showCbfs: false,          // 控制承包方式字典弹出层的显示和隐藏
+        cbflxOptions: [],         // 承包方类型字典
+        cbflxText: null,          // 承包方类型标签名
+        showType: false,          // 控制承包方类型字典弹出层的显示和隐藏
+        showQDSJ: false,          // 控制签订时间弹出层的显示和隐藏
+        showCbqxq: false,         // 控制承包起始时间弹出层的显示和隐藏
+        showCbqxz: false,         // 控制承包结束时间弹出层的显示和隐藏
+        minDate: new Date(1978, 0, 1),
+        maxDate: new Date(2100, 11, 31),
       };
     },
     created() {
-
+      this.getDicts("jyq_method").then(response => {
+        this.cbfsOptions = response.data;
+      });
+      this.getDicts("cbf_type").then(response => {
+        this.cbflxOptions = response.data;
+      });
+      this.getDetail();
     },
     methods: {
-      getList(){
-
+      getDetail(){
+        getCbht(this.$route.params.cbfbm).then(response => {
+          this.form = response.data;
+          if (this.form) {
+            this.cbflxText = this.selectDictLabel(this.cbflxOptions, this.form.cbflx);
+            this.cbfsText = this.selectDictLabel(this.cbfsOptions, this.form.cbfs);
+          } else {
+            this.resetForm();
+          }
+        });
       },
-      onSearch(){
-
+      onConfirmTypeOptions(value) {
+        this.form.cbflx = value.dictValue;
+        this.cbflxText = value.dictLabel;
+        this.showType = false;
       },
-      onConfirmTypeOptions(){
-
+      onConfirmCbfsOptions(value) {
+        this.form.cbfs = value.dictValue;
+        this.cbfsText = value.dictLabel;
+        this.showCbfs = false;
       },
-      onConfirmZjTypeOptions(){
-
+      onConfirmQdsj(data) {
+        this.form.qdsj = this.format(data, 'yyyy-MM-dd');
+        this.showQDSJ = false
       },
-      onConfirmCYBZOptions(){
-
+      onConfirmCbqxq(data) {
+        this.form.cbqxq = this.format(data, 'yyyy-MM-dd');
+        this.showCbqxq = false;
       },
-
+      onConfirmCbqxz(data) {
+        this.form.cbqxz = this.format(data, 'yyyy-MM-dd');
+        this.showCbqxz = false;
+      },
+      skip(name) {
+        this.$router.push({
+          name: name,
+          params: {
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
+      },
+      submitForm() {
+        this.$refs.formData.validate().then(() => {
+          if (this.form.id) {
+            updateCbht(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                });
+              }
+            });
+          } else {
+            this.form.deptId = this.$route.params.deptId;
+            addCbht(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                });
+              }
+            });
+          }
+        }).catch(() => {
+          this.$notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
+      },
+      resetForm() {
+        this.form = {
+          deptId: null,
+          cbhtbm: null,
+          ycbhtbm: null,
+          fbfbm: null,
+          cbflx: null,
+          cbfmc: null,
+          cbfbm: null,
+          cbfs: null,
+          qdsj: null,
+          cbqxq: null,
+          cbqxz: null,
+          cbdkzs: null,
+          htzmjm: null,
+        };
+      },
+      extension() {
+        this.$dialog.confirm({
+          message: '是否确认将此份承包合同的承包期限延长30年？',
+        }).then(() => {
+          // on confirm
+          extendCbht(this.form.id).then(response => {
+            if (response.code == 200) {
+              this.$toast.success('延期成功');
+              this.form.cbqxq = response.data.startTime;
+              this.form.cbqxz = response.data.endTime;
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      }
     },
   };
 </script>
@@ -219,6 +332,10 @@
     overflow: initial;
   }
 
+  /deep/ .van-field__label {
+    width: 225px;
+  }
+
   /* .tb_main{
     position: relative;
     p{

From 45a3519fa45440f3d895b4d57f994c5b68b4c824 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Wed, 16 Aug 2023 17:55:12 +0800
Subject: [PATCH 04/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=9C=B0=E5=9D=97?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/cbdkxx.js                  |  54 +++
 src/api/contracted/dk.js                      |  10 +
 src/components/house/CommonMap.vue            |   9 +-
 .../village/contractor/contractWord.vue       |  76 +--
 .../village/contractor/contractorDetail.vue   |   6 +-
 .../contractor/contractorDetailAdd.vue        |  10 +-
 .../village/contractor/contractorLand.vue     | 176 ++++---
 .../contractor/contractorLandDetail.vue       | 434 +++++++++++++-----
 .../village/contractor/contractorLandMap.vue  |  18 +-
 9 files changed, 572 insertions(+), 221 deletions(-)
 create mode 100644 src/api/contracted/cbdkxx.js
 create mode 100644 src/api/contracted/dk.js

diff --git a/src/api/contracted/cbdkxx.js b/src/api/contracted/cbdkxx.js
new file mode 100644
index 00000000..4369f560
--- /dev/null
+++ b/src/api/contracted/cbdkxx.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request';
+
+// 承包地块信息列表
+export function listCbdkxx(params) {
+    return request({
+      url: '/service/cbdkxx/mobile/list',
+      method: 'get',
+      params: params
+    });
+}
+
+// 承包地块详情
+export function getCbdkxx(id) {
+  return request({
+    url: '/service/cbdkxx/get/' + id,
+    method: 'get'
+  });
+}
+
+// 新增承包地块信息
+export function addCbdkxx(data) {
+  return request({
+    url: '/service/cbdkxx/insert',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改承包地块信息
+export function updateCbdkxx(data) {
+  return request({
+    url: '/service/cbdkxx/modify',
+    method: 'post',
+    data: data
+  });
+}
+
+// 删除承包地块信息
+export function deleteCbdkxx(id) {
+  return request({
+    url: '/service/cbdkxx/delete/' + id,
+    method: 'get'
+  });
+}
+
+// 转出承包地块
+export function transferCbdkxx(params) {
+  return request({
+    url: '/service/cbdkxx/transfer',
+    method: 'get',
+    params: params
+  });
+}
+
diff --git a/src/api/contracted/dk.js b/src/api/contracted/dk.js
new file mode 100644
index 00000000..cb464e34
--- /dev/null
+++ b/src/api/contracted/dk.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+
+// 地块信息列表
+export function listDk(params) {
+  return request({
+    url: '/service/dk/list',
+    method: 'get',
+    params: params
+  });
+}
diff --git a/src/components/house/CommonMap.vue b/src/components/house/CommonMap.vue
index 5209e3d0..54615aa8 100644
--- a/src/components/house/CommonMap.vue
+++ b/src/components/house/CommonMap.vue
@@ -105,7 +105,7 @@ export default {
         view: new ol.View({
           center: ol.proj.fromLonLat(this.coord),
           //zoom: false,
-          zoom: 17.9,
+          zoom: 17,
           minZoom: this.minMapZoom, //地图缩小限制
           maxZoom: this.maxMapZoom, //地图放大限制
         }),
@@ -248,6 +248,7 @@ export default {
           self.drawInsert = null;
           self.mapObject.removeInteraction(draw);
           self.popLayer(COMMON_MAP_DRAW_LAYER_NAME);
+          self.$emit("drawFinished", null);
           //console.log("drawRemove");
         });
         //还原之前图层
@@ -308,9 +309,9 @@ export default {
       this.mapObject.getView().animate({
         // 只设置需要的属性即可
         center: center, // 中心点
-        zoom: 17.9, // 缩放级别
+        zoom: 17, // 缩放级别
         rotation: undefined, // 缩放完成view视图旋转弧度
-        duration: 1000, // 缩放持续时间，默认不需要设置
+        duration: 300, // 缩放持续时间，默认不需要设置
       });
       return true;
     },
@@ -371,7 +372,7 @@ export default {
       this.mapObject.getView().animate({
         // 只设置需要的属性即可
         center: center, // 中心点
-        zoom: 17.9, // 缩放级别
+        zoom: 17, // 缩放级别
         rotation: undefined, // 缩放完成view视图旋转弧度
         duration: 1000, // 缩放持续时间，默认不需要设置
       });
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index b14e1c4c..fc76152a 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -19,7 +19,7 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" />
         <van-field v-model="form.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="left" />
         <van-field v-model="form.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field
@@ -44,7 +44,7 @@
             @cancel="showType = false"
           />
         </van-popup>
-        <van-field v-model="form.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" />
         <van-field v-model="form.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field
           v-model="cbfsText"
@@ -105,7 +105,7 @@
           clickable
           @click="showCbqxq = true"
         >
-          <template #button v-if="form.id">
+          <template #button>
             <van-button size="small" type="primary" native-type="button" @click.stop="extension">延期</van-button>
           </template>
         </van-field>
@@ -178,6 +178,7 @@
         showCbqxz: false,         // 控制承包结束时间弹出层的显示和隐藏
         minDate: new Date(1978, 0, 1),
         maxDate: new Date(2100, 11, 31),
+        isDisabled: false
       };
     },
     created() {
@@ -196,7 +197,9 @@
           if (this.form) {
             this.cbflxText = this.selectDictLabel(this.cbflxOptions, this.form.cbflx);
             this.cbfsText = this.selectDictLabel(this.cbfsOptions, this.form.cbfs);
+            this.isDisabled = true;
           } else {
+            this.isDisabled = false;
             this.resetForm();
           }
         });
@@ -254,6 +257,9 @@
                   icon: 'success',
                   message: '保存成功',
                   duration:"1000",
+                  onClose: () => {
+                    this.getDetail();
+                  }
                 });
               }
             });
@@ -280,20 +286,22 @@
         };
       },
       extension() {
-        this.$dialog.confirm({
-          message: '是否确认将此份承包合同的承包期限延长30年？',
-        }).then(() => {
-          // on confirm
-          extendCbht(this.form.id).then(response => {
-            if (response.code == 200) {
-              this.$toast.success('延期成功');
-              this.form.cbqxq = response.data.startTime;
-              this.form.cbqxz = response.data.endTime;
-            }
+        if (this.form.id) {
+          this.$dialog.confirm({
+            message: '是否确认将此份承包合同的承包期限延长30年？',
+          }).then(() => {
+            // on confirm
+            extendCbht(this.form.id).then(response => {
+              if (response.code == 200) {
+                this.$toast.success('延期成功');
+                this.form.cbqxq = response.data.startTime;
+                this.form.cbqxz = response.data.endTime;
+              }
+            });
+          }).catch(() => {
+            // on cancel
           });
-        }).catch(() => {
-          // on cancel
-        });
+        }
       }
     },
   };
@@ -336,24 +344,28 @@
     width: 225px;
   }
 
-  /* .tb_main{
-    position: relative;
-    p{
-      position: absolute;
-      display: inline-block;
-      margin-left: 10PX;
-    }
+  /deep/ .van-field--disabled .van-field__label {
+    color: #646566;
   }
 
-  .tb{
-    font-size: 12px;
-    color: #ff8900;
-    background: #daf6e7;
-    border: 1px solid #d7be6e;
-    padding: 2PX 8PX;
-    border-radius: 50PX;
-    margin-right: 5PX;
-  } */
+    /* .tb_main{
+      position: relative;
+      p{
+        position: absolute;
+        display: inline-block;
+        margin-left: 10PX;
+      }
+    }
+
+    .tb{
+      font-size: 12px;
+      color: #ff8900;
+      background: #daf6e7;
+      border: 1px solid #d7be6e;
+      padding: 2PX 8PX;
+      border-radius: 50PX;
+      margin-right: 5PX;
+    } */
 
   .tap_block{
     width: 100%;
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index 7372ed3b..4836fd5c 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -19,6 +19,7 @@
 
     <div class="list_main">
       <van-form ref="formData">
+        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left" disabled />
         <van-field
           v-model="form.cbflxText"
           label="类型："
@@ -41,7 +42,6 @@
             @cancel="showType = false"
           />
         </van-popup>
-        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left" readonly />
         <van-field v-model="form.cbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field
           v-model="form.cbfzjlxText"
@@ -197,6 +197,10 @@
     overflow: initial;
   }
 
+  /deep/ .van-field--disabled .van-field__label {
+    color: #646566;
+  }
+
   /* .tb_main{
     position: relative;
     p{
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index 7d694142..a5c5ece2 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -10,6 +10,11 @@
     </van-nav-bar>
 
     <div class="list_main">
+      <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left">
+        <template #button>
+          <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+        </template>
+      </van-field>
       <van-form ref="formData">
         <van-field
           v-model="cbflxText"
@@ -33,11 +38,6 @@
             @cancel="showType = false"
           />
         </van-popup>
-        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left">
-          <template #button>
-            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
-          </template>
-        </van-field>
         <van-field v-model="form.cbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field
           v-model="cbfzjlxText"
diff --git a/src/views/contracted/village/contractor/contractorLand.vue b/src/views/contracted/village/contractor/contractorLand.vue
index f11dda6c..94b5585b 100644
--- a/src/views/contracted/village/contractor/contractorLand.vue
+++ b/src/views/contracted/village/contractor/contractorLand.vue
@@ -8,65 +8,73 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
 
     <div class="tap_block">
-      <p @click="$router.push({path:'/contracted/village/contractorDetail'})">承包方</p>
-      <p @click="$router.push({path:'/contracted/village/contractorFamily'})">家庭成员</p>
-      <p @click="$router.push({path:'/contracted/village/contractorWord'})">承包合同</p>
+      <p @click="skip('contractedVillageContractorDetail')">承包方</p>
+      <p @click="skip('contractedVillageContractorFamily')">家庭成员</p>
+      <p @click="skip('contractedVillageContractorWord')">承包合同</p>
       <p class="active">承包地</p>
     </div>
 
     <div class="function_main">
-      <div class="function_btn1" @click="goMap">
+      <div class="function_btn1" @click="skip('contractedVillageContractorLandMap')">
         <p class="active">进入地图 <span class="sanjiao-right"></span></p>
       </div>
-      <div class="function_btn2" @click="goDetail">
+      <div class="function_btn2" @click="goDetail()">
         <p class="active"> + 新增</p>
       </div>
     </div>
 
     <div class="list_main">
 
-      <van-swipe-cell v-for="(item,index) in 10">
-
-        <div class="item" @click="goDetail">
-
+      <van-swipe-cell v-for="(item,index) in landList" :key="item.id">
+        <div class="item" @click="goDetail(item.id)">
           <div class="item_tt">
-            <p>西湖地块名称名称名称</p>
-            <p>371481199201011234</p>
+            <p>{{ item.dkmc }}</p>
+            <p>{{ item.dkbm }}</p>
           </div>
-
           <div class="item_type">
-            <p>3.5亩</p>
-            <p>旱地</p>
-            <p><span>2</span>等地</p>
-            <p>种植业</p>
-            <p>基本农田:是</p>
+            <p>{{ item.htmjm }}亩</p>
+<!--            <p>{{ item.tdlylx }}</p>-->
+            <p>{{ item.dldj }}</p>
+            <p>{{ item.tdyt }}</p>
+            <p>基本农田:{{ item.sfjbnt }}</p>
           </div>
-
           <div class="item_direction">
-            <p>张三指界</p>
-            <p>东:张琪</p>
-            <p>西:马六</p>
-            <p>南:河流</p>
-            <p>北:道路</p>
+<!--            <p>{{ item.zjrxm }}指界</p>-->
+            <p>东:{{ item.dkdz }}</p>
+            <p>西:{{ item. dkxz }}</p>
+            <p>南:{{ item.dknz }}</p>
+            <p>北:{{ item.dkbz }}</p>
           </div>
-
         </div>
         <template #right>
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
-            <div class="opera_btn delete">
-              <p>取消<br/>承包</p>
-            </div>
-            <div class="opera_btn edit">
+            <div class="opera_btn edit" @click="transferLand(item.id)">
               <p>转给<br/>他方</p>
             </div>
+            <div class="opera_btn delete" @click="deleteLand(item.id, index)">
+              <p>取消<br/>承包</p>
+            </div>
           </div>
         </template>
       </van-swipe-cell>
-
+      <van-popup v-model="showContractorPopup" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="contractorList"
+          @confirm="onConfirmContractorOptions"
+          @cancel="showContractorPopup = false"
+        >
+          <template #option="option">
+            <div style="display: flex; flex-direction: column; align-items: center;">
+              <div>{{option.cbfmc}}-{{option.cbfbm}}</div>
+            </div>
+          </template>
+        </van-picker>
+      </van-popup>
     </div>
 
 
@@ -75,6 +83,8 @@
 <script>
   import Cookies from "js-cookie";
   import contractorHeader from "./contractorHeader";
+  import { listCbdkxx, deleteCbdkxx, transferCbdkxx } from "@/api/contracted/cbdkxx";
+  import { listCbf } from "@/api/contracted/cbf";
 
   export default {
     name: "contractedVillageContractor",
@@ -83,44 +93,98 @@
     },
     data() {
       return {
-        loading:false,
-        finished:true,
-        value:'',
-        showType:false,
-        showZjType:false,
-        typeOptions:[{
-          dictLabel:'类型1',
-          dictValue:'1',
-        }],
-        zjTypeOptions:[{
-          dictLabel:'类型2',
-          dictValue:'1',
-        }],
+        landList: [],                   // 承包地块列表
+        contractorList: [],             // 承包方列表
+        showContractorPopup: false,     // 控制承包方信息弹出层的显示和隐藏
+        transferLandId: null            // 转出的承包地块ID
       };
     },
     created() {
-
+      this.getList();
+      this.getContractorList();
     },
     methods: {
       getList(){
-
+        listCbdkxx({cbfbm: this.$route.params.cbfbm, translate_dict: 1}).then(response => {
+          this.landList = response.rows;
+        });
       },
-      onSearch(){
-
+      getContractorList() {
+        listCbf({deptId: this.$route.params.deptId}).then(response => {
+          this.contractorList = response.rows;
+        });
       },
-      onConfirmTypeOptions(){
-
+      goDetail(id){
+        this.$router.push({
+          name: 'contractedVillageContractorLandDetail',
+          params: {
+            id: id,
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
       },
-      onConfirmZjTypeOptions(){
-
+      skip(name) {
+        this.$router.push({
+          name: name,
+          params: {
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
       },
-      goDetail(){
-        this.$router.push({path:'/contracted/village/contractorLandDetail'});
+      transferLand(id) {
+        this.transferLandId = id;
+        this.showContractorPopup = true;
       },
-      goMap(){
-        this.$router.push({path:'/contracted/village/contractorLandMap'});
+      onConfirmContractorOptions(value) {
+        this.$dialog.confirm({
+          message: '是否确认将此承包地块转给' + value.cbfmc + '？',
+        }).then(() => {
+          // on confirm
+          this.showContractorPopup = false;
+          transferCbdkxx({id: this.transferLandId, cbfbm: value.cbfbm}).then(response => {
+            if (response.code == 200) {
+              this.$toast({
+                icon: 'success',
+                message: '转出成功',
+                duration:"1000",
+                onClose: () => {
+                  const index = this.landList.findIndex(item => item.id === this.transferLandId);
+                  this.landList.splice(index, 1);
+                }
+              });
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      },
+      deleteLand(id, index) {
+        this.$dialog.confirm({
+          message: '是否确认取消承包此地块？',
+        }).then(() => {
+          // on confirm
+          deleteCbdkxx(id).then(res => {
+            if (res.code == 200) {
+              this.$toast({
+                icon: 'success',
+                message: '取消成功',
+                duration: "1000",
+                onClose: () => {
+                  this.landList.splice(index, 1);
+                }
+              });
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
       }
-
     },
   };
 </script>
diff --git a/src/views/contracted/village/contractor/contractorLandDetail.vue b/src/views/contracted/village/contractor/contractorLandDetail.vue
index 78f0e63b..dba09bbe 100644
--- a/src/views/contracted/village/contractor/contractorLandDetail.vue
+++ b/src/views/contracted/village/contractor/contractorLandDetail.vue
@@ -1,101 +1,120 @@
 <template>
   <div class="app-container">
 
-    <van-nav-bar left-arrow fixed placeholder @click-left="onClickLeft" >
+    <van-nav-bar left-arrow fixed placeholder @click-left="goBack" >
       <template #title>
         <div class="tb_main">
-<!--          B村<p><span class="tb">签字完成</span><span class="tb">异常挂起</span></p>-->
-          2222
+          {{ titleName }}
         </div>
       </template>
     </van-nav-bar>
 
-    <div class="tap_block">
-      <p @click="$router.push({path:'/contracted/village/contractorDetail'})">承包方</p>
-      <p @click="$router.push({path:'/contracted/village/contractorFamily'})">家庭成员</p>
-      <p @click="$router.push({path:'/contracted/village/contractorWord'})">承包合同</p>
-      <p class="active">承包地</p>
-    </div>
-
     <div class="list_main">
-      <van-field v-model="value" label="地块代码：" placeholder="请输入地块代码" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="地块名称：" placeholder="请输入地块名称" required :border="false" input-align="right" label-width="auto" />
-
-      <van-field v-model="value" label="土地利用类型："
-        placeholder="请选择土地利用类型"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showType = true"
-      />
-      <van-popup v-model="showType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="typeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmTypeOptions"
-          @cancel="showType = false"
+      <van-form ref="formData">
+        <van-field v-model="form.dkbm" label="地块代码：" placeholder="请选择地块代码" required :rules="[{ required: true }]" :border="false"
+                   input-align="right" right-icon="arrow-down" readonly clickable @click="openLandCodePopup" :disabled="isDisabled" />
+        <van-popup v-model="showLandCode" position="bottom">
+          <van-picker
+            ref="landCodePicker"
+            show-toolbar
+            :columns="landList"
+            @confirm="onConfirmLandCodeOptions"
+            @cancel="showLandCode = false"
+          >
+            <template #option="option">
+              <div style="display: flex; flex-direction: column; align-items: center;">
+                <div>{{option.dkmc}}-{{option.dkbm}}</div>
+              </div>
+            </template>
+          </van-picker>
+        </van-popup>
+        <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field
+          v-model="tdlylxText"
+          label="土地利用类型："
+          placeholder="请选择土地利用类型"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showLandUseType = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="地力等级："
-        placeholder="请选择地力等级"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showZjType = true"
-      />
-      <van-popup v-model="showZjType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="zjTypeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmZjTypeOptions"
-          @cancel="showZjType = false"
+        <van-popup v-model="showLandUseType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tdlylxOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmLandUseTypeOptions"
+            @cancel="showLandUseType = false"
+          />
+        </van-popup>
+        <van-field
+          v-model="dldjText"
+          label="地力等级："
+          placeholder="请选择地力等级"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showLandGrade = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="土地用途："
-        placeholder="请选择土地用途"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showTDYT = true"
-      />
-      <van-popup v-model="showTDYT" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="TDYTOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmTDYTOptions"
-          @cancel="showTDYT = false"
+        <van-popup v-model="showLandGrade" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="dldjOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmLandGradeOptions"
+            @cancel="showLandGrade = false"
+          />
+        </van-popup>
+        <van-field
+          v-model="tdytText"
+          label="土地用途："
+          placeholder="请选择土地用途"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showLandPurpose = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="基本农用：" placeholder="请输入基本农用" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="实测面积(亩)：" placeholder="请输入实测面积(亩)" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="指界：" placeholder="请输入指界" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="东面：" placeholder="请输入东面" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="西面：" placeholder="请输入西面" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="南面：" placeholder="请输入南面" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="北面：" placeholder="请输入北面" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="备注：" placeholder="请输入备注" required :border="false" input-align="right" label-width="auto" />
-
-      <div class="mapBox"></div>
-
-      <p class="btn">保存</p>
+        <van-popup v-model="showLandPurpose" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tdytOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmTDYTOptions"
+            @cancel="showLandPurpose = false"
+          />
+        </van-popup>
+        <van-field v-model="form.sfjbnt" label="基本农田：" placeholder="请选择基本农田" required :rules="[{ required: true }]" :border="false" input-align="right">
+          <template #input>
+            <van-radio-group v-model="form.sfjbnt" direction="horizontal">
+              <van-radio v-for="item in sfjbntOptions" :key="item.dictValue" :name="item.dictValue">{{ item.dictLabel }}</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field v-model="form.htmjm" type="number" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" :border="false" input-align="right" />
+
+        <div class="mapBox">
+          <common-map ref="contractedLandMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
+        </div>
+      </van-form>
+      <p class="btn" @click="submitForm">保存</p>
     </div>
 
 
@@ -103,54 +122,223 @@
 </template>
 <script>
   import Cookies from "js-cookie";
+  import { getCbdkxx, addCbdkxx, updateCbdkxx } from "@/api/contracted/cbdkxx";
+  import { listDk } from "@/api/contracted/dk";
+  import { getDept } from "@/api/contracted";
+  import CommonMap from "@/components/house/CommonMap";
+
   export default {
     name: "contractedVillageContractor",
+    components: {
+      CommonMap
+    },
     data() {
       return {
-        loading:false,
-        finished:true,
-        value:'',
-        showType:false,
-        showZjType:false,
-        showTDYT:false,
-        typeOptions:[{
-          dictLabel:'类型1',
-          dictValue:'1',
-        }],
-        zjTypeOptions:[{
-          dictLabel:'类型2',
-          dictValue:'1',
-        }],
-        TDYTOptions:[{
-          dictLabel:'类型2',
-          dictValue:'1',
-        }],
-        radio:1,
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
+        titleName: '',                    // 标题信息
+        isDisabled: false,                // 是否禁用
+        form: {},                         // 承包地信息表单
+        showLandCode: false,              // 控制地块代码弹出层的显示和隐藏
+        tdlylxOptions: [],                // 土地利用类型字典
+        tdlylxText: null,                 // 土地利用类型标签名
+        showLandUseType: false,           // 控制土地利用类型字典弹出层的显示和隐藏
+        dldjOptions: [],                  // 地力等级字典
+        dldjText: null,                   // 地力等级标签名
+        showLandGrade: false,             // 控制地力等级字典弹出层的显示和隐藏
+        tdytOptions: [],                  // 土地用途字典
+        tdytText: null,                   // 土地用途标签名
+        showLandPurpose: false,           // 控制土地用途字典弹出层的显示和隐藏
+        sfjbntOptions: [],                // 是否基本农田字典
+        landList: [],                     // 地块信息列表
       };
     },
     created() {
-
+      this.getDicts("land_use").then(response => {
+        this.tdlylxOptions = response.data;
+      });
+      this.getDicts("land_grade").then(response => {
+        this.dldjOptions = response.data;
+      });
+      this.getDicts("use_code").then(response => {
+        this.tdytOptions = response.data;
+      });
+      this.getDicts("is_common").then(response => {
+        this.sfjbntOptions = response.data;
+      });
+      if (this.$route.params.id) {
+        this.titleName = '修改承包地信息';
+        this.isDisabled = true;
+        this.getDetail();
+      } else {
+        this.titleName = '新增承包地信息';
+        this.resetForm();
+        this.getCoordinates();
+        this.getLandList();
+      }
     },
     methods: {
-      getList(){
-
+      getCoordinates() {
+        getDept(this.$route.params.deptId).then(response => {
+          const lng = response.data.lng;
+          const lat = response.data.lat;
+          if (lng && lat) {
+            this.$nextTick(() => {
+              this.$refs.contractedLandMap.setCoord(lng, lat);
+            });
+          }
+        });
       },
-      onSearch(){
-
+      getLandList() {
+        // 查询出非承包地块(dklb != '10')且未流转(dkzt = '1')的地块信息
+        listDk({deptId: this.$route.params.deptId, jtdklb: '10', dkzt: '1'}).then(response => {
+          this.landList = response.rows;
+        });
       },
-      onConfirmTypeOptions(){
-
+      getDetail(){
+        getCbdkxx(this.$route.params.id).then(response => {
+          this.form = response.data;
+          this.tdlylxText = this.selectDictLabel(this.tdlylxOptions, response.data.tdlylx);
+          this.dldjText = this.selectDictLabel(this.dldjOptions, response.data.dldj);
+          this.tdytText = this.selectDictLabel(this.tdytOptions, response.data.tdyt);
+          if (response.data.theGeomJson) {
+            this.form.theGeom = JSON.stringify(JSON.parse(response.data.theGeomJson).coordinates);
+            this.$nextTick(() => {
+              this.$refs.contractedLandMap.setLayer('_Draw_layer', response.data.theGeomJson);
+            });
+          } else {
+            this.getCoordinates();
+          }
+        });
       },
-      onConfirmZjTypeOptions(){
-
+      resetForm() {
+        this.form = {
+          deptId: null,
+          cbfbm: null,
+          dkbm: null,
+          dkmc: null,
+          tdlylx: null,
+          dldj: null,
+          tdyt: null,
+          sfjbnt: null,
+          htmjm: null,
+          zjrxm: null,
+          dkdz: null,
+          dkxz: null,
+          dknz: null,
+          dkbz: null,
+          dkbzxx: null,
+          theGeom: null
+        };
       },
-      onConfirmTDYTOptions(){
-
+      openLandCodePopup() {
+        /* if (this.form.dkbm) {
+          const index = this.landList.findIndex(item => item.dkbm === this.form.dkbm);
+          this.$refs.landCodePicker.setColumnIndex(0, index);
+        } */
+        if (!this.isDisabled) {
+          this.showLandCode = true;
+        }
+      },
+      onConfirmLandCodeOptions(value) {
+        this.form.dkbm = value.dkbm;
+        this.form.dkmc = value.dkmc;
+        this.form.tdlylx = value.tdlylx;
+        this.tdlylxText = this.selectDictLabel(this.tdlylxOptions, value.tdlylx);
+        this.form.dldj = value.dldj;
+        this.dldjText = this.selectDictLabel(this.dldjOptions, value.dldj);
+        this.form.tdyt = value.tdyt
+        this.tdytText = this.selectDictLabel(this.tdytOptions, value.tdyt);
+        this.form.sfjbnt = value.sfjbnt;
+        this.form.htmjm = value.scmjm;
+        this.form.zjrxm = value.zjrxm;
+        this.form.dkdz = value.dkdz;
+        this.form.dkxz = value.dkxz
+        this.form.dknz = value.dknz;
+        this.form.dkbz = value.dkbz;
+        this.form.dkbzxx = value.dkbzxx;
+        if (value.theGeomJson) {
+          this.form.theGeom = JSON.stringify(JSON.parse(value.theGeomJson).coordinates);
+          this.$refs.contractedLandMap.setLayer('_Draw_layer', value.theGeomJson);
+        } else {
+          this.form.theGeom = null;
+        }
+        this.showLandCode = false;
+      },
+      onConfirmLandUseTypeOptions(value) {
+        this.form.tdlylx = value.dictValue;
+        this.tdlylxText = value.dictLabel;
+        this.showLandUseType = false;
+      },
+      onConfirmLandGradeOptions(value) {
+        this.form.dldj = value.dictValue;
+        this.dldjText = value.dictLabel;
+        this.showLandGrade = false;
+      },
+      onConfirmTDYTOptions(value){
+        this.form.tdyt = value.dictValue;
+        this.tdytText = value.dictLabel;
+        this.showLandPurpose = false;
+      },
+      goBack() {
+        this.$router.push({
+          name: 'contractedVillageContractorLand',
+          params: {
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
+      },
+      submitForm() {
+        this.$refs.formData.validate().then(() => {
+          if (this.$route.params.id) {
+            updateCbdkxx(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.goBack();
+                  }
+                });
+              }
+            });
+            /* updateJtcy(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.goBack();
+                  }
+                });
+              }
+            }); */
+          } else {
+            this.form.deptId = this.$route.params.deptId;
+            this.form.cbfbm = this.$route.params.cbfbm;
+            addCbdkxx(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.goBack();
+                  }
+                });
+              }
+            });
+          }
+        }).catch(() => {
+          this.$notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
+      },
+      onMapDrawFinished(data) {
+        this.form.theGeom = JSON.stringify(data);
       },
-
     },
   };
 </script>
@@ -188,6 +376,14 @@
     overflow: initial;
   }
 
+  /deep/ .van-field--disabled .van-field__label {
+    color: #646566;
+  }
+
+  /deep/ .van-field__label {
+    width: 7em;
+  }
+
   .tb_main{
     position: relative;
     p{
diff --git a/src/views/contracted/village/contractor/contractorLandMap.vue b/src/views/contracted/village/contractor/contractorLandMap.vue
index 2bec3413..82c13c6c 100644
--- a/src/views/contracted/village/contractor/contractorLandMap.vue
+++ b/src/views/contracted/village/contractor/contractorLandMap.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
 
-    <van-nav-bar left-arrow fixed placeholder @click-left="onClickLeft" >
+    <van-nav-bar left-arrow fixed placeholder @click-left="goBack" >
       <template #title>
         <div class="tb_main">
 <!--          B村<p><span class="tb">签字完成</span><span class="tb">异常挂起</span></p>-->
@@ -10,12 +10,12 @@
       </template>
     </van-nav-bar>
 
-    <div class="tap_block">
+    <!-- <div class="tap_block">
       <p @click="$router.push({path:'/contracted/village/contractorDetail'})">承包方</p>
       <p @click="$router.push({path:'/contracted/village/contractorFamily'})">家庭成员</p>
       <p @click="$router.push({path:'/contracted/village/contractorWord'})">承包合同</p>
       <p class="active">承包地</p>
-    </div>
+    </div> -->
 
     <div class="mapBox"></div>
 
@@ -34,7 +34,17 @@
 
     },
     methods: {
-
+      goBack() {
+        this.$router.push({
+          name: 'contractedVillageContractorLand',
+          params: {
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
+      },
     },
   };
 </script>

From c8487b4e0be92309a670ccb0bb47c7db761aff1a Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 17 Aug 2023 14:48:41 +0800
Subject: [PATCH 05/28] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/cbfjtcy.js                 |  24 ++++
 .../village/contractor/contractorFamily.vue   | 118 ++++++++++++++++--
 2 files changed, 135 insertions(+), 7 deletions(-)

diff --git a/src/api/contracted/cbfjtcy.js b/src/api/contracted/cbfjtcy.js
index d3cd5919..9e7144b1 100644
--- a/src/api/contracted/cbfjtcy.js
+++ b/src/api/contracted/cbfjtcy.js
@@ -43,4 +43,28 @@ export function deleteJtcy(id) {
   });
 }
 
+// 家庭成员分户
+export function divisionJtcy(id) {
+  return request({
+    url: '/service/jtcy/division/' + id,
+    method: 'get'
+  });
+}
+
+// 家庭成员移户
+export function transferJtcy(params) {
+  return request({
+    url: '/service/jtcy/transfer',
+    method: 'get',
+    params: params
+  });
+}
+
+// 家庭成员设为户主
+export function setHouseholder(id) {
+  return request({
+    url: '/service/jtcy/householder/' + id,
+    method: 'get'
+  });
+}
 
diff --git a/src/views/contracted/village/contractor/contractorFamily.vue b/src/views/contracted/village/contractor/contractorFamily.vue
index 060026d4..7f60a3e1 100644
--- a/src/views/contracted/village/contractor/contractorFamily.vue
+++ b/src/views/contracted/village/contractor/contractorFamily.vue
@@ -44,13 +44,13 @@
         <template #right>
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
-            <div class="opera_btn edit">
+            <div class="opera_btn edit" @click="householdDivision(item, index)">
               <p>分户</p>
             </div>
-            <div class="opera_btn view">
+            <div class="opera_btn view" @click="householdTransfer(item)">
               <p>移户</p>
             </div>
-            <div class="opera_btn list">
+            <div class="opera_btn list" @click="houseHolder(item)">
               <p>设为<br/>户主</p>
             </div>
             <div class="opera_btn delete" @click="deleteFamilyMember(item.id, index)">
@@ -62,14 +62,29 @@
       <!-- getDetail不加(), 第一个参数默认传递的是event，getDetail加(), 需要手动传递$event -->
       <p class="btn" @click="goDetail()">新增</p>
     </div>
-
+    <van-popup v-model="showContractorPopup" position="bottom">
+      <van-picker
+        title="请选择新户主"
+        show-toolbar
+        :columns="contractorList"
+        @confirm="onConfirmContractorOptions"
+        @cancel="showContractorPopup = false"
+      >
+        <template #option="option">
+          <div style="display: flex; flex-direction: column; align-items: center;">
+            <div>{{option.cbfmc}}-{{option.cbfbm}}</div>
+          </div>
+        </template>
+      </van-picker>
+    </van-popup>
 
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
   import contractorHeader from "./contractorHeader";
-  import { listJtcy, deleteJtcy } from "@/api/contracted/cbfjtcy";
+  import { listJtcy, deleteJtcy, divisionJtcy, transferJtcy, setHouseholder } from "@/api/contracted/cbfjtcy";
+  import { listCbf } from "@/api/contracted/cbf";
 
   export default {
     name: "contractedVillageContractor",
@@ -78,12 +93,15 @@
     },
     data() {
       return {
-        // 家庭成员列表
-        familyList: [],
+        familyList: [],                 // 家庭成员列表
+        contractorList: [],             // 承包方列表
+        showContractorPopup: false,     // 控制承包方信息弹出层的显示和隐藏
+        transferMemberId: null          // 转出的成员ID
       };
     },
     created() {
       this.getList();
+      this.getContractorList();
     },
     methods: {
       getList(){
@@ -91,6 +109,11 @@
           this.familyList = response.rows;
         });
       },
+      getContractorList() {
+        listCbf({deptId: this.$route.params.deptId}).then(response => {
+          this.contractorList = response.rows;
+        });
+      },
       skip(name) {
         this.$router.push({
           name: name,
@@ -128,6 +151,87 @@
         }).catch(() => {
           // on cancel
         });
+      },
+      householdDivision(item, index) {
+        if (item.yhzgx === '户主') {
+          this.$toast.fail('该成员身份为户主，不能分户');
+          return false;
+        }
+        this.$dialog.confirm({
+          message: '是否确认将该成员新分一户并设为户主？',
+        }).then(() => {
+          // on confirm
+          divisionJtcy(item.id).then(res => {
+            if (res.code == 200) {
+              this.$toast({
+                icon: 'success',
+                message: '分户成功',
+                duration: "1000",
+                onClose: () => {
+                  this.familyList.splice(index, 1);
+                }
+              });
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      },
+      householdTransfer(item) {
+        if (item.yhzgx === '户主') {
+          this.$toast.fail('该成员身份为户主，不能移户');
+          return false;
+        }
+        this.transferMemberId = item.id;
+        this.showContractorPopup = true;
+      },
+      onConfirmContractorOptions(value) {
+        this.$dialog.confirm({
+          message: '是否确认将该成员移到' + value.cbfmc + '户内？',
+        }).then(() => {
+          // on confirm
+          this.showContractorPopup = false;
+          transferJtcy({id: this.transferMemberId, cbfbm: value.cbfbm}).then(response => {
+            if (response.code == 200) {
+              this.$toast({
+                icon: 'success',
+                message: '移户成功',
+                duration:"1000",
+                onClose: () => {
+                  const index = this.familyList.findIndex(item => item.id === this.transferMemberId);
+                  this.familyList.splice(index, 1);
+                }
+              });
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      },
+      houseHolder(item) {
+        if (item.yhzgx === '户主') {
+          this.$toast.fail('该成员身份为户主，无需设置');
+          return false;
+        }
+        this.$dialog.confirm({
+          message: '是否确认将该成员设为户主？',
+        }).then(() => {
+          // on confirm
+          setHouseholder(item.id).then(res => {
+            if (res.code == 200) {
+              this.$toast({
+                icon: 'success',
+                message: '设置户主成功',
+                duration: "1000",
+                onClose: () => {
+                  this.getList();
+                }
+              });
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
       }
     },
   };

From f1681cd697d9801ea386d3c3f1c327f323a3a073 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 17 Aug 2023 18:35:53 +0800
Subject: [PATCH 06/28] =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/fbf.js                     |  28 +++
 .../contracted/village/employer/employer.vue  | 164 ++++++++++++------
 2 files changed, 138 insertions(+), 54 deletions(-)
 create mode 100644 src/api/contracted/fbf.js

diff --git a/src/api/contracted/fbf.js b/src/api/contracted/fbf.js
new file mode 100644
index 00000000..2f6bd64b
--- /dev/null
+++ b/src/api/contracted/fbf.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 获取承包方列表
+export function listFbf(params) {
+  return request({
+    url: '/service/fbf/list',
+    method: 'get',
+    params: params
+  });
+}
+
+// 新增发包方信息
+export function addFbf(data) {
+  return request({
+    url: '/service/fbf/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发包方信息
+export function updateFbf(data) {
+  return request({
+    url: '/service/fbf/edit',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index 96a634eb..6eff0d66 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -17,40 +17,41 @@
     </div>
 
     <div class="list_main">
-      <van-field v-model="value" label="代码：" placeholder="请输入代码" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="名称：" placeholder="请输入名称" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="负责人：" placeholder="请输入负责人" required :border="false" input-align="right" label-width="auto" />
-
-      <van-field v-model="value" label="证件类型："
-        placeholder="请选择证件类型"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showType = true"
-      />
-      <van-popup v-model="showType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="typeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmTypeOptions"
-          @cancel="showType = false"
+      <van-form ref="formData">
+        <van-field v-model="form.fbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled" />
+        <van-field v-model="form.fbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.fbffzrxm" label="负责人姓名：" placeholder="请输入负责人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="credentialTypeText" label="证件类型："
+          placeholder="请选择证件类型"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          readonly
+          clickable
+          @click="showCredentialType = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="证件号码：" placeholder="请输入证件号码" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="联系电话：" placeholder="请输入联系电话" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="地址：" placeholder="请输入地址" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="邮编：" placeholder="请输入邮编" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="调查记事：" placeholder="请输入调查记事" required :border="false" input-align="right" label-width="auto" />
-      <van-field readonly v-model="value" label="签字(上传图片)：" :border="false" input-align="right" label-width="auto" />
-
+        <van-popup v-model="showCredentialType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="credentialTypeOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmTypeOptions"
+            @cancel="showCredentialType = false"
+          />
+        </van-popup>
+        <van-field v-model="form.fzrzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.lxdh" label="联系电话：" placeholder="请输入联系电话" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.fbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.yzbm" label="邮政编码：" placeholder="请输入邮政编码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.fbfdcjs" label="调查记事：" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field label="签字图片：" readonly :border="false" label-width="auto" />
+        <img :src="'/api'+form.fbfdcqz" width="100%" alt="" />
+      </van-form>
       <div class="btn_main">
-        <p class="btn">保存</p>
+        <p class="btn" @click="submitForm">保存</p>
         <p class="btn1">签字</p>
       </div>
     </div>
@@ -60,40 +61,91 @@
 </template>
 <script>
   import Cookies from "js-cookie";
+  import { listFbf, addFbf, updateFbf } from "@/api/contracted/fbf";
+
   export default {
     name: "contractedVillageContractor",
     data() {
       return {
-        loading:false,
-        finished:true,
-        value:'',
-        showType:false,
-        typeOptions:[{
-          dictLabel:'类型1',
-          dictValue:'1',
-        }],
+        form: {},                         // 发包方信息表单
+        isDisabled: false,                // 是否禁用
+        credentialTypeOptions: [],        // 证件类型字典
+        credentialTypeText: null,         // 证件类型标签名
+        showCredentialType: false,        // 控制证件类型字典弹出层的显示和隐藏
       };
     },
     created() {
-
+      this.getDicts("cert_type").then(response => {
+        this.credentialTypeOptions = response.data;
+      });
+      this.getDetail();
     },
     methods: {
-      getList(){
-
+      getDetail() {
+        listFbf({deptId: this.$route.query.deptId}).then(response => {
+          if (response.rows.length > 0) {
+            this.form = response.rows[0];
+            this.isDisabled = true;
+            this.$nextTick(() => {
+              this.credentialTypeText = this.selectDictLabel(this.credentialTypeOptions, this.form.fzrzjlx);
+            });
+          } else {
+            this.resetForm();
+            this.isDisabled = false;
+          }
+        });
       },
-      onSearch(){
-
+      onConfirmTypeOptions(value){
+        this.form.fzrzjlx = value.dictValue;
+        this.credentialTypeText = value.dictLabel;
+        this.showCredentialType = false;
       },
-      onConfirmTypeOptions(){
-
+      submitForm() {
+        this.$refs.formData.validate().then(() => {
+          if (this.form.id) {
+            updateFbf(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                });
+              }
+            });
+          } else {
+            this.form.deptId = this.$route.query.deptId;
+            addFbf(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.getDetail();
+                  }
+                });
+              }
+            });
+          }
+        }).catch(() => {
+          this.$notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
       },
-      onConfirmZjTypeOptions(){
-
-      },
-      onConfirmTDYTOptions(){
-
-      },
-
+      resetForm() {
+        this.form = {
+          deptId: null,
+          fbfbm: null,
+          fbfmc: null,
+          fbffzrxm: null,
+          fzrzjlx: null,
+          fzrzjhm: null,
+          lxdh: null,
+          fbfdz: null,
+          yzbm: null,
+          fbfdcjs: null,
+          fbfdcqz: null
+        }
+      }
     },
   };
 </script>
@@ -131,6 +183,10 @@
     overflow: initial;
   }
 
+  /deep/ .van-field--disabled .van-field__label {
+    color: #646566;
+  }
+
   .tb_main{
     position: relative;
     p{

From c0cae56e97ae1ddbc943b44c1d7512604a71e185 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Fri, 18 Aug 2023 16:29:32 +0800
Subject: [PATCH 07/28] =?UTF-8?q?=E5=9C=B0=E5=9D=97=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/dk.js                      |  44 ++
 .../village/contractor/contractor.vue         |  12 +-
 .../contractor/contractorDetailAdd.vue        |  10 +-
 .../contractor/contractorLandDetail.vue       |  19 +-
 .../contracted/village/massif/massif.vue      | 148 +++++-
 .../village/massif/massifDetail.vue           | 464 ++++++++++++------
 6 files changed, 516 insertions(+), 181 deletions(-)

diff --git a/src/api/contracted/dk.js b/src/api/contracted/dk.js
index cb464e34..8f5b92be 100644
--- a/src/api/contracted/dk.js
+++ b/src/api/contracted/dk.js
@@ -8,3 +8,47 @@ export function listDk(params) {
     params: params
   });
 }
+
+// 地块信息详情
+export function getDk(id) {
+  return request({
+    url: '/service/dk/get/' + id,
+    method: 'get'
+  });
+}
+
+// 新增地块属性信息
+export function addDk(data) {
+  return request({
+    url: '/service/dk/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改地块属性信息
+export function updateDk(data) {
+  return request({
+    url: '/service/dk/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除地块信息
+export function deleteDk(id) {
+  return request({
+    url: '/service/dk/remove/' + id,
+    method: 'get'
+  });
+}
+
+
+// 生成地块编码
+export function generateLandCode(params) {
+  return request({
+    url: '/service/dk/generateCode',
+    method: 'get',
+    params: params
+  });
+}
diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue
index 53419da0..51d142ce 100644
--- a/src/views/contracted/village/contractor/contractor.vue
+++ b/src/views/contracted/village/contractor/contractor.vue
@@ -166,8 +166,16 @@
             // on confirm
             deleteCbf(id).then(res => {
               if(res.code == 200){
-                this.$toast.success('删除成功');
-                this.cbfList.splice(index, 1);
+                this.$toast({
+                  icon: 'success',
+                  message: '删除成功',
+                  duration: "1000",
+                  onClose: () => {
+                    this.cbfList.splice(index, 1);
+                    this.totalNum = this.totalNum - 1;
+                  }
+                });
+
               }
             });
           }).catch(() => {
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index a5c5ece2..d6706e8c 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -10,12 +10,12 @@
     </van-nav-bar>
 
     <div class="list_main">
-      <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left">
-        <template #button>
-          <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
-        </template>
-      </van-field>
       <van-form ref="formData">
+        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left">
+          <template #button>
+            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+          </template>
+        </van-field>
         <van-field
           v-model="cbflxText"
           label="类型："
diff --git a/src/views/contracted/village/contractor/contractorLandDetail.vue b/src/views/contracted/village/contractor/contractorLandDetail.vue
index dba09bbe..499cb6eb 100644
--- a/src/views/contracted/village/contractor/contractorLandDetail.vue
+++ b/src/views/contracted/village/contractor/contractorLandDetail.vue
@@ -304,18 +304,6 @@
                 });
               }
             });
-            /* updateJtcy(this.form).then(response => {
-              if (response.code == 200) {
-                this.$toast({
-                  icon: 'success',
-                  message: '保存成功',
-                  duration:"1000",
-                  onClose: () => {
-                    this.goBack();
-                  }
-                });
-              }
-            }); */
           } else {
             this.form.deptId = this.$route.params.deptId;
             this.form.cbfbm = this.$route.params.cbfbm;
@@ -337,7 +325,12 @@
         });
       },
       onMapDrawFinished(data) {
-        this.form.theGeom = JSON.stringify(data);
+        if (data) {
+          this.form.theGeom = JSON.stringify(data);
+        } else {
+          this.form.theGeom = null;
+        }
+
       },
     },
   };
diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue
index 68f26e01..a5cf25bd 100644
--- a/src/views/contracted/village/massif/massif.vue
+++ b/src/views/contracted/village/massif/massif.vue
@@ -16,68 +16,170 @@
         v-model="value"
         shape="round"
         background="transparent"
-        placeholder="请输入姓名搜索"
+        placeholder="请输入地块代码搜索"
         @search="onSearch"
       ></van-search>
 
-      <div class="search_btn">
+      <div class="search_btn" @click="goDetail()">
         <p class="active"> + 新增</p>
       </div>
 
     </div>
 
     <div class="second_tap">
-      <p class="active">承包</p>
+      <!-- <p class="active">承包</p>
       <p>自留</p>
       <p>机动</p>
       <p>开荒</p>
-      <p>其他</p>
+      <p>其他</p> -->
+      <p v-for="dict in dklbOptions" :key="dict.dictValue" :class="{active: landCategory === dict.dictValue}" @click="landCategoryChange(dict.dictValue, dict.dictLabel)">{{dict.dictLabel}}</p>
     </div>
 
-    <p class="page_tab">自留地 <span>5153亩</span></p>
+    <p class="page_tab">{{ tagName }} <span>{{ totalNum }}块</span></p>
     <div class="list_main">
       <van-row style="color: #888888;font-size: 14px;">
         <van-col span="9">地块代码</van-col>
         <van-col span="10">地块名称</van-col>
         <van-col span="5">面积（亩）</van-col>
       </van-row>
-      <van-swipe-cell v-for="(item,index) in 50">
-        <van-row @click="goDetail">
-          <van-col span="9">45412353553</van-col>
-          <van-col span="10">西湖地地块名称</van-col>
-          <van-col span="5" style="color: #f78200">7</van-col>
-        </van-row>
-        <template #right>
-          <van-button square type="danger" text="删除" />
-        </template>
-      </van-swipe-cell>
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        :immediate-check="false"
+        @load="getList"
+      >
+        <van-swipe-cell v-for="(item,index) in landList">
+          <van-row @click="goDetail(item.id)">
+            <van-col span="9">{{ item.dkbm }}</van-col>
+            <van-col span="10">{{ item.dkmc }}</van-col>
+            <van-col span="5" style="color: #f78200">{{ item.scmjm }}</van-col>
+          </van-row>
+          <template #right>
+            <van-button square type="danger" text="删除" native-type="button" @click="deleteLand(item.id, index)" />
+          </template>
+        </van-swipe-cell>
+      </van-list>
     </div>
 
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
+  import { listDk, deleteDk } from "@/api/contracted/dk";
+
   export default {
     name: "contractedVillageContractor",
     data() {
       return {
         loading:false,
-        finished:true,
-        value:''
+        finished:false,
+        value:'',
+        // 查询参数
+        queryParams: {
+          deptId: null,
+          dkbm: null,
+          dklb: null,
+          pageNum:1,
+          pageSize:20,
+        },
+        // 地块类别字典
+        dklbOptions: [],
+        // 地块类别
+        landCategory: null,
+        // 当前选中的地块类别
+        tagName: null,
+        // 当前调查状态下的地块总数
+        totalNum: 0,
+        // 地块列表
+        landList: [],
       };
     },
     created() {
-
+      this.queryParams.deptId = this.$route.query.deptId;
+      this.getDicts("land_type").then(response => {
+        this.dklbOptions = response.data;
+        if (this.dklbOptions.length > 0) {
+          this.queryParams.dklb = this.dklbOptions[0].dictValue;
+          this.landCategory = this.dklbOptions[0].dictValue;
+          this.tagName = this.dklbOptions[0].dictLabel;
+        }
+        this.getList();
+      });
     },
     methods: {
       getList(){
-
+        this.loading = true;
+        listDk(this.queryParams).then(response => {
+          response.rows.forEach(item => {
+            this.landList.push(item);
+          });
+          this.totalNum = response.total;
+          if (this.landList.length >= response.total) {
+            this.finished = true;
+            return;
+          } else {
+            this.loading = false;
+            this.queryParams.pageNum += 1;
+          }
+        });
       },
       onSearch(){
-
+        this.queryParams.dkbm = this.value;
+        this.queryData();
+      },
+      landCategoryChange(dictValue, dictLabel) {
+        this.landCategory = dictValue;
+        this.queryParams.dklb = dictValue;
+        this.tagName = dictLabel;
+        this.totalNum = 0;
+        this.queryData();
+      },
+      queryData() {
+        this.queryParams.pageNum = 1;
+        this.finished = false;
+        this.landList = [];
+        this.getList();
+      },
+      goDetail(id){
+        if (id) {
+          this.$router.push({
+            path:'/contracted/village/massifDetail',
+            query: {
+              deptId: this.$route.query.deptId,
+              id: id
+            }
+          });
+        } else {
+          this.$router.push({
+            path:'/contracted/village/massifDetail',
+            query: {
+              deptId: this.$route.query.deptId
+            }
+          });
+        }
       },
-      goDetail(){
-        this.$router.push({path:'/contracted/village/massifDetail', query: { deptId: this.$route.query.deptId, deptName: this.$route.query.deptName }});
+      deleteLand(id, index) {
+        this.$dialog.confirm({
+          message: '是否确认删除此地块？',
+        }).then(() => {
+          // on confirm
+          deleteDk(id).then(res => {
+            if (res.code == 200) {
+              this.$toast({
+                icon: 'success',
+                message: '删除成功',
+                duration: "1000",
+                onClose: () => {
+                  this.landList.splice(index, 1);
+                  this.totalNum = this.totalNum - 1;
+                }
+              });
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
       }
     },
   };
@@ -162,7 +264,7 @@
       background: #dbf1ea;
       border: 1px solid #cdcdcd;
       color: #5f5f5f;
-      padding: 5PX 15PX;
+      padding: 5PX 8PX;
       margin-right: 3vw;
       border-radius: 50PX;
     }
diff --git a/src/views/contracted/village/massif/massifDetail.vue b/src/views/contracted/village/massif/massifDetail.vue
index 35aac571..83596cb8 100644
--- a/src/views/contracted/village/massif/massifDetail.vue
+++ b/src/views/contracted/village/massif/massifDetail.vue
@@ -1,149 +1,151 @@
 <template>
   <div class="app-container">
 
-    <van-nav-bar left-arrow fixed placeholder @click-left="onClickLeft" >
+    <van-nav-bar left-arrow fixed placeholder @click-left="goBack" >
       <template #title>
         <div class="tb_main">
-          {{$route.query.deptName}}
+          {{ titleName }}
         </div>
       </template>
     </van-nav-bar>
 
-    <div class="tap_block">
+    <!-- <div class="tap_block">
       <p @click="$router.push({path:'/contracted/village/contractor', query: { deptId: $route.query.deptId, deptName: $route.query.deptName }})">承包方</p>
       <p @click="$router.push({path:'/contracted/village/employer', query: { deptId: $route.query.deptId, deptName: $route.query.deptName }})">发包方</p>
       <p class="active">地块</p>
       <p @click="$router.push({path:'/contracted/village/map', query: { deptId: $route.query.deptId, deptName: $route.query.deptName }})">地图</p>
-    </div>
+    </div> -->
 
     <div class="list_main">
-      <van-field v-model="value" label="地块代码：" placeholder="请输入地块代码" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="地块名称：" placeholder="请输入地块名称" required :border="false" input-align="right" label-width="auto" />
-
-      <van-field v-model="value" label="所有权性质："
-        placeholder="请选择所有权性质"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showType = true"
-      />
-      <van-popup v-model="showSYQXZ" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="typeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmTypeOptions"
-          @cancel="showSYQXZ = false"
+      <van-form ref="formData">
+        <van-field v-model="form.dkbm" label="地块代码：" placeholder="请输入地块代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled">
+          <template #button v-if="!$route.query.id">
+            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+          </template>
+        </van-field>
+        <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="syqxzText" label="所有权性质："
+                   placeholder="请选择所有权性质"
+                   required
+                   :rules="[{ required: true }]"
+                   :border="false"
+                   input-align="right"
+                   right-icon="arrow-down"
+                   readonly
+                   clickable
+                   @click="showOwnership = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="地块类别："
-        placeholder="请选择地块类别"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showZjType = true"
-      />
-      <van-popup v-model="showDKLB" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="zjTypeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmZjTypeOptions"
-          @cancel="showDKLB = false"
+        <van-popup v-model="showOwnership" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="syqxzOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmOwnershipOptions"
+            @cancel="showOwnership = false"
+          />
+        </van-popup>
+        <van-field v-model="dklbText" label="地块类别："
+                   placeholder="请选择地块类别"
+                   required
+                   :rules="[{ required: true }]"
+                   :border="false"
+                   input-align="right"
+                   right-icon="arrow-down"
+                   readonly
+                   clickable
+                   @click="showLandCategory = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="土地利用类型："
-        placeholder="请选择土地利用类型"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showType = true"
-      />
-      <van-popup v-model="showType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="typeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmTypeOptions"
-          @cancel="showType = false"
+        <van-popup v-model="showLandCategory" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="dklbOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmLandCategoryOptions"
+            @cancel="showLandCategory = false"
+          />
+        </van-popup>
+        <van-field v-model="tdlylxText" label="土地利用类型："
+                   placeholder="请选择土地利用类型"
+                   required
+                   :rules="[{ required: true }]"
+                   :border="false"
+                   input-align="right"
+                   right-icon="arrow-down"
+                   readonly
+                   clickable
+                   @click="showLandType = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="地力等级："
-        placeholder="请选择地力等级"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showZjType = true"
-      />
-      <van-popup v-model="showZjType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="zjTypeOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmZjTypeOptions"
-          @cancel="showZjType = false"
+        <van-popup v-model="showLandType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tdlylxOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmLandTypeOptions"
+            @cancel="showLandType = false"
+          />
+        </van-popup>
+        <van-field v-model="dldjText" label="地力等级："
+                   placeholder="请选择地力等级"
+                   required
+                   :rules="[{ required: true }]"
+                   :border="false"
+                   input-align="right"
+                   right-icon="arrow-down"
+                   readonly
+                   clickable
+                   @click="showLandGrade = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="土地用途："
-        placeholder="请选择土地用途"
-        required
-        :border="false"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-        readonly
-        clickable
-        @click="showTDYT = true"
-      />
-      <van-popup v-model="showTDYT" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="TDYTOptions"
-          value-key="dictLabel"
-          @confirm="onConfirmTDYTOptions"
-          @cancel="showTDYT = false"
+        <van-popup v-model="showLandGrade" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="dldjOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmLandGradeOptions"
+            @cancel="showLandGrade = false"
+          />
+        </van-popup>
+        <van-field v-model="tdytText" label="土地用途："
+                   placeholder="请选择土地用途"
+                   required
+                   :rules="[{ required: true }]"
+                   :border="false"
+                   input-align="right"
+                   right-icon="arrow-down"
+                   readonly
+                   clickable
+                   @click="showLandPurpose = true"
         />
-      </van-popup>
-
-      <van-field v-model="value" label="基本农田：" required :border="false" input-align="right" >
-        <template #input>
-          <van-radio-group v-model="radio" direction="horizontal">
-            <van-radio name="1">是</van-radio>
-            <van-radio name="2">否</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field v-model="value" label="实测面积(亩)：" placeholder="请输入实测面积(亩)" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="指界人：" placeholder="请输入指界人" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="东面：" placeholder="请输入东面" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="西面：" placeholder="请输入西面" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="南面：" placeholder="请输入南面" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="北面：" placeholder="请输入北面" required :border="false" input-align="right" label-width="auto" />
-      <van-field v-model="value" label="备注：" placeholder="请输入备注" :border="false" input-align="right" label-width="auto" />
-
-      <div class="mapBox"></div>
-
-      <p class="btn">保存</p>
+        <van-popup v-model="showLandPurpose" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tdytOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmLandPurposeOptions"
+            @cancel="showLandPurpose = false"
+          />
+        </van-popup>
+        <van-field v-model="form.sfjbnt" label="基本农田：" required :rules="[{ required: true }]" :border="false" input-align="right" >
+          <template #input>
+            <van-radio-group v-model="form.sfjbnt" direction="horizontal">
+              <!-- <van-radio name="1">是</van-radio>
+              <van-radio name="2">否</van-radio> -->
+              <van-radio v-for="dict in sfjbntOptions" :ke="dict.dictValue" :name="dict.dictValue">{{ dict.dictLabel }}</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field v-model="form.scmjm" type="number" label="实测面积(亩)：" placeholder="请输入实测面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" :border="false" input-align="right" />
+
+        <div class="mapBox">
+          <common-map ref="landMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
+        </div>
+      </van-form>
+      <p class="btn" @click="submitForm">保存</p>
     </div>
 
 
@@ -151,8 +153,15 @@
 </template>
 <script>
   import Cookies from "js-cookie";
+  import { getDk, addDk, updateDk, generateLandCode } from "@/api/contracted/dk";
+  import { getDept } from "@/api/contracted";
+  import CommonMap from "@/components/house/CommonMap";
+
   export default {
     name: "contractedVillageContractor",
+    components: {
+      CommonMap
+    },
     data() {
       return {
         loading:false,
@@ -179,28 +188,199 @@
         minDate: new Date(2020, 0, 1),
         maxDate: new Date(2025, 10, 1),
         currentDate: new Date(2021, 0, 17),
+
+        titleName: '',                    // 标题信息
+        isDisabled: false,                // 是否禁用
+        form: {},                         // 地块信息表单
+        syqxzOptions: [],                 // 所有权性质字典
+        syqxzText: null,                  // 所有权性质标签名
+        showOwnership: false,             // 控制所有权性质字典弹出层的显示和隐藏
+        dklbOptions: [],                  // 地块类别字典
+        dklbText: null,                   // 地块类别标签名
+        showLandCategory: false,          // 控制的地块类别字典弹出层的显示和隐藏
+        dldjOptions: [],                  // 地力等级字典
+        dldjText: null,                   // 地力等级标签名
+        showLandGrade: false,             // 控制地力等级字典弹出层的显示和隐藏
+        tdytOptions: [],                  // 土地用途字典
+        tdytText: null,                   // 土地用途标签名
+        showLandPurpose: false,           // 控制土地用途字典弹出层的显示和隐藏
+        tdlylxOptions: [],                // 土地利用类型
+        tdlylxText: null,                 // 土地利用类型标签名
+        showLandType: false,              // 控制土地利用类型字典弹出层的显示和隐藏
+        sfjbntOptions: [],                // 是否基本农田字典
       };
     },
     created() {
-
+      this.getDicts("land_ownership").then(response => {
+        this.syqxzOptions = response.data;
+      });
+      this.getDicts("land_type").then(response => {
+        this.dklbOptions = response.data;
+      });
+      this.getDicts("land_grade").then(response => {
+        this.dldjOptions = response.data;
+      });
+      this.getDicts("use_code").then(response => {
+        this.tdytOptions = response.data;
+      });
+      this.getDicts("land_use").then(response => {
+        this.tdlylxOptions = response.data;
+      });
+      this.getDicts("is_common").then(response => {
+        this.sfjbntOptions = response.data;
+      });
+    },
+    mounted() {
+      if (this.$route.query.id) {
+        this.titleName = '修改地块信息';
+        this.isDisabled = true;
+        this.getDetail();
+      } else {
+        this.titleName = '新增地块信息';
+        this.resetForm();
+        this.getCoordinates();
+      }
     },
     methods: {
-      getList(){
-
+      getDetail() {
+        getDk(this.$route.query.id).then(response => {
+          const data = response.data;
+          this.form = data;
+          this.syqxzText = this.selectDictLabel(this.syqxzOptions, data.syqxz);
+          this.dklbText = this.selectDictLabel(this.dklbOptions, data.dklb);
+          this.dldjText = this.selectDictLabel(this.dldjOptions, data.dldj);
+          this.tdytText = this.selectDictLabel(this.tdytOptions, data.tdyt);
+          this.tdlylxText = this.selectDictLabel(this.tdlylxOptions, data.tdlylx);
+          if (response.data.theGeomJson) {
+            this.form.theGeom = JSON.stringify(JSON.parse(response.data.theGeomJson).coordinates);
+            this.$nextTick(() => {
+              this.$refs.landMap.setLayer('_Draw_layer', response.data.theGeomJson);
+            });
+          } else {
+            this.getCoordinates();
+          }
+        });
       },
-      onSearch(){
-
+      resetForm() {
+        this.form = {
+          deptId: null,
+          dkbm: null,
+          dkmc: null,
+          syqxz: null,
+          dklb: null,
+          tdlylx: null,
+          dldj: null,
+          tdyt: null,
+          sfjbnt: '1',
+          scmjm: null,
+          zjrxm: null,
+          dkdz: null,
+          dkxz: null,
+          dknz: null,
+          dkbz: null,
+          dkbzxx: null,
+          theGeom: null
+        };
       },
-      onConfirmTypeOptions(){
-
+      getCoordinates() {
+        getDept(this.$route.query.deptId).then(response => {
+          const lng = response.data.lng;
+          const lat = response.data.lat;
+          if (lng && lat) {
+            this.$nextTick(() => {
+              this.$refs.landMap.setCoord(lng, lat);
+            });
+          }
+        });
       },
-      onConfirmZjTypeOptions(){
-
+      onConfirmOwnershipOptions(value){
+        this.form.syqxz = value.dictValue;
+        this.syqxzText = value.dictLabel;
+        this.showOwnership = false;
       },
-      onConfirmTDYTOptions(){
-
+      onConfirmLandCategoryOptions(value){
+        this.form.dklb = value.dictValue;
+        this.dklbText = value.dictLabel;
+        this.showLandCategory = false;
       },
-
+      onConfirmLandTypeOptions(value) {
+        this.form.tdlylx = value.dictValue;
+        this.tdlylxText = value.dictLabel;
+        this.showLandType = false;
+      },
+      onConfirmLandGradeOptions(value) {
+        this.form.dldj = value.dictValue
+        this.dldjText = value.dictLabel;
+        this.showLandGrade = false;
+      },
+      onConfirmLandPurposeOptions(value){
+        this.form.tdyt = value.dictValue;
+        this.tdytText = value.dictLabel;
+        this.showLandPurpose = false;
+      },
+      submitForm() {
+        this.$refs.formData.validate().then(() => {
+          if (this.$route.query.id) {
+            updateDk(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.goBack();
+                  }
+                });
+              }
+            });
+          } else {
+            this.form.deptId = this.$route.query.deptId;
+            addDk(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.goBack();
+                  }
+                });
+              }
+            });
+            /* this.form.deptId = this.$route.params.deptId;
+            this.form.cbfbm = this.$route.params.cbfbm;
+            addCbdkxx(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.goBack();
+                  }
+                });
+              }
+            }); */
+          }
+        }).catch(() => {
+          this.$notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
+      },
+      onMapDrawFinished(data) {
+        if (data) {
+          this.form.theGeom = JSON.stringify(data);
+        } else {
+          this.form.theGeom = null;
+        }
+      },
+      generateCode() {
+        generateLandCode({deptId: this.$route.query.deptId}).then(response => {
+          this.$set(this.form, 'dkbm', response.data);
+        });
+      },
+      goBack() {
+        history.back(-1);
+      }
     },
   };
 </script>
@@ -238,6 +418,14 @@
     overflow: initial;
   }
 
+  /deep/ .van-field--disabled .van-field__label {
+    color: #646566;
+  }
+
+  /deep/ .van-field__label {
+    width: 7em;
+  }
+
   .tb_main{
     position: relative;
     p{

From 6634a2236e9425b62fc22df6a3ac3bc450c1a0d3 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Mon, 21 Aug 2023 13:31:52 +0800
Subject: [PATCH 08/28] =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E7=AD=BE=E5=AD=97=E5=92=8C=E6=89=BF=E5=8C=85=E6=96=B9?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E7=AD=BE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/cbf.js                     |   9 ++
 src/api/contracted/fbf.js                     |   9 ++
 .../village/contractor/contractorHeader.vue   | 129 +++++++++++++++++-
 .../contracted/village/employer/employer.vue  | 123 ++++++++++++++++-
 4 files changed, 265 insertions(+), 5 deletions(-)

diff --git a/src/api/contracted/cbf.js b/src/api/contracted/cbf.js
index e103e88b..157ae997 100644
--- a/src/api/contracted/cbf.js
+++ b/src/api/contracted/cbf.js
@@ -51,3 +51,12 @@ export function generateContractorCode(params) {
     params: params
   });
 }
+
+// 承包方调查签字
+export function contractorSignature(data) {
+  return request({
+    url: '/service/cbf/surveySign',
+    method: 'post',
+    data: data
+  });
+}
diff --git a/src/api/contracted/fbf.js b/src/api/contracted/fbf.js
index 2f6bd64b..cc4206fc 100644
--- a/src/api/contracted/fbf.js
+++ b/src/api/contracted/fbf.js
@@ -26,3 +26,12 @@ export function updateFbf(data) {
     data: data
   })
 }
+
+// 发包方调查签字
+export function manualSignature(data) {
+  return request({
+    url: '/service/fbf/surveySign',
+    method: 'post',
+    data: data
+  });
+}
diff --git a/src/views/contracted/village/contractor/contractorHeader.vue b/src/views/contracted/village/contractor/contractorHeader.vue
index 3c02d2b2..7ab7c021 100644
--- a/src/views/contracted/village/contractor/contractorHeader.vue
+++ b/src/views/contracted/village/contractor/contractorHeader.vue
@@ -3,24 +3,128 @@
     <van-nav-bar left-arrow fixed placeholder @click-left="goBack">
       <template #title>
         <div class="tb_main">
-          {{ contractorName }}<p><span class="tb">签字完成</span><span class="tb">异常挂起</span></p>
+          {{ contractorName }}<p><span class="tb" @click="handleSign">签字完成</span><span class="tb">异常挂起</span></p>
         </div>
       </template>
     </van-nav-bar>
+
+    <van-popup v-model="showSignPopup" closeable position="right" :style="{ height: '100%' }" >
+      <van-cell-group style="width: 100%;height:100%;overflow: hidden;padding-top: 10px;padding-bottom: 10px;">
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+          />
+        </div>
+        <img src="../../../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT" style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <div class="signature-footer">
+          <van-button @click="handleReset" class="clearBtn" type="info" plain  size="small">清空画板</van-button>
+          <van-button @click="handleGenerate" type="info" size="small">保存签字</van-button>
+        </div>
+      </van-cell-group>
+    </van-popup>
+
   </div>
 </template>
 <script>
   import { getDept } from "@/api/contracted";
+  import { contractorSignature } from "@/api/contracted/cbf";
+  import vueEsign from "vue-esign";
+  import $ from "jquery";
 
   export default {
     name: 'contractedVillageHeader',
     props: ['deptId', 'contractorCode', 'contractorName', 'surveyStatus'],
+    components: {
+      vueEsign
+    },
+    data() {
+      return {
+        // 控制签字面板的显示和隐藏
+        showSignPopup: false,
+        height: null,
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
+      };
+    },
+    created() {
+      this.height = window.screen.height * 1.28 - 20;
+    },
     methods: {
       goBack() {
         getDept(this.deptId).then(response => {
           this.$router.push({path:'/contracted/village/contractor', query: { deptId: this.deptId, deptName: response.data.deptName }});
         });
-      }
+      },
+      handleSign() {
+        this.showSignPopup = true;
+        this.handleReset();
+      },
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      // 清空画板
+      handleReset() {
+        if (this.$refs.esign) {
+          this.$refs.esign.reset();
+        }
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图片
+      handleGenerate() {
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData()  // 创建form对象
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('cbfbm', this.contractorCode);
+            contractorSignature(param).then(response => {
+              if (response.code === 200) {
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '签字成功',
+                  duration: "1000",
+                  onClose: () => {
+                    this.showSignPopup = false;
+                    this.goBack();
+                  }
+                });
+              }
+            });
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob(dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
     }
   }
 </script>
@@ -43,4 +147,25 @@
     border-radius: 50PX;
     margin-right: 5PX;
   }
+
+  .signature-box {
+    border: 1px dashed #666;
+    margin: 2px 20px;
+    height: 100%;
+    /*canvas{*/
+    /*  height: 100%!important;*/
+    /*}*/
+  }
+
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0PX;
+
+    .clearBtn {
+      margin-left: 15px;
+    }
+  }
 </style>
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index 6eff0d66..3410db79 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -52,19 +52,45 @@
       </van-form>
       <div class="btn_main">
         <p class="btn" @click="submitForm">保存</p>
-        <p class="btn1">签字</p>
+        <p class="btn1" @click="handleSign">签字</p>
       </div>
     </div>
 
+    <van-popup v-model="showSignPopup" closeable position="right" :style="{ height: '100%' }" >
+      <van-cell-group style="width: 100%;height:100%;overflow: hidden;padding-top: 10px;padding-bottom: 10px;">
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+          />
+        </div>
+        <img src="../../../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT" style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <div class="signature-footer">
+          <van-button @click="handleReset" class="clearBtn" type="info" plain  size="small">清空画板</van-button>
+          <van-button @click="handleGenerate" type="info" size="small">保存签字</van-button>
+        </div>
+      </van-cell-group>
+    </van-popup>
 
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
-  import { listFbf, addFbf, updateFbf } from "@/api/contracted/fbf";
+  import { listFbf, addFbf, updateFbf, manualSignature } from "@/api/contracted/fbf";
+  import vueEsign from "vue-esign";
+  import $ from "jquery";
 
   export default {
     name: "contractedVillageContractor",
+    components: {
+      vueEsign
+    },
     data() {
       return {
         form: {},                         // 发包方信息表单
@@ -72,9 +98,22 @@
         credentialTypeOptions: [],        // 证件类型字典
         credentialTypeText: null,         // 证件类型标签名
         showCredentialType: false,        // 控制证件类型字典弹出层的显示和隐藏
+
+        // 控制签字面板的显示和隐藏
+        showSignPopup: false,
+        height: null,
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
       };
     },
     created() {
+      this.height = window.screen.height * 1.28 - 20;
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
       });
@@ -145,7 +184,64 @@
           fbfdcjs: null,
           fbfdcqz: null
         }
-      }
+      },
+      handleSign() {
+        this.showSignPopup = true;
+        this.handleReset();
+      },
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      // 清空画板
+      handleReset() {
+        if (this.$refs.esign) {
+          this.$refs.esign.reset();
+        }
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图片
+      handleGenerate() {
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData();  // 创建form对象
+            param.append('file', wj);  // 通过append向form对象添加数据
+            param.append('deptId', this.$route.query.deptId);
+            manualSignature(param).then(response => {
+              if (response.code === 200) {
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '签字成功',
+                  duration: "1000",
+                  onClose: () => {
+                    this.showSignPopup = false;
+                    this.form.fbfdcqz = response.data;
+                  }
+                });
+              }
+            });
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob(dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
     },
   };
 </script>
@@ -308,4 +404,25 @@
     margin: 2vh auto;
   }
 
+  .signature-box {
+    border: 1px dashed #666;
+    margin: 2px 20px;
+    height: 100%;
+    /*canvas{*/
+    /*  height: 100%!important;*/
+    /*}*/
+  }
+
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0PX;
+
+    .clearBtn {
+      margin-left: 15px;
+    }
+  }
+
 </style>

From 7118109e163a5050b4e4672bde0e42b3245f7278 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Mon, 21 Aug 2023 16:18:54 +0800
Subject: [PATCH 09/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E5=BC=82=E5=B8=B8=E6=8C=82=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/cbf.js                     |  9 +++
 .../village/contractor/contractorHeader.vue   | 61 ++++++++++++++++++-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/api/contracted/cbf.js b/src/api/contracted/cbf.js
index 157ae997..ef09f270 100644
--- a/src/api/contracted/cbf.js
+++ b/src/api/contracted/cbf.js
@@ -60,3 +60,12 @@ export function contractorSignature(data) {
     data: data
   });
 }
+
+// 调查挂起
+export function hangUp(data) {
+  return request({
+    url: '/service/cbf/hangUp',
+    method: 'post',
+    data: data
+  });
+}
diff --git a/src/views/contracted/village/contractor/contractorHeader.vue b/src/views/contracted/village/contractor/contractorHeader.vue
index 7ab7c021..3a130213 100644
--- a/src/views/contracted/village/contractor/contractorHeader.vue
+++ b/src/views/contracted/village/contractor/contractorHeader.vue
@@ -3,7 +3,7 @@
     <van-nav-bar left-arrow fixed placeholder @click-left="goBack">
       <template #title>
         <div class="tb_main">
-          {{ contractorName }}<p><span class="tb" @click="handleSign">签字完成</span><span class="tb">异常挂起</span></p>
+          {{ contractorName }}<p><span class="tb" @click="handleSign">签字完成</span><span class="tb" @click="handleHangUp">异常挂起</span></p>
         </div>
       </template>
     </van-nav-bar>
@@ -30,11 +30,19 @@
       </van-cell-group>
     </van-popup>
 
+    <van-dialog v-model="showRemark" title="异常挂起备注" show-cancel-button confirmButtonText="保存" cancelButtonText="关闭"
+                :before-close="onBeforeClose" @confirm="handleConfirm">
+      <van-form ref="remarkForm" class="remarkForm">
+        <van-field v-model="remark" label="备注信息:" type="textarea" rows="4" placeholder="请输入备注信息" required
+                   :rules="[{ required: true }]" input-align="left" label-width="auto" />
+      </van-form>
+    </van-dialog>
+
   </div>
 </template>
 <script>
   import { getDept } from "@/api/contracted";
-  import { contractorSignature } from "@/api/contracted/cbf";
+  import { contractorSignature, hangUp } from "@/api/contracted/cbf";
   import vueEsign from "vue-esign";
   import $ from "jquery";
 
@@ -57,6 +65,10 @@
           resultImg: "", // 最终画布生成的base64图片
           isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         },
+        // 控制异常信息备注提示框的显示和隐藏
+        showRemark: false,
+        // 异常备注信息
+        remark: null,
       };
     },
     created() {
@@ -125,10 +137,55 @@
           type: mime
         })
       },
+      // 异常挂起
+      handleHangUp() {
+        this.showRemark = true;
+        this.remark = null;
+      },
+      // van-dialog 点击confirm事件不自动关闭
+      onBeforeClose(action, done) {
+        if (action === 'confirm') {
+          return done(false);
+        } else {
+          return done();
+        }
+      },
+      handleConfirm() {
+        this.$refs.remarkForm.validate().then(() => {
+          let data = new FormData()  // 创建form对象
+          data.append('cbfbm', this.contractorCode);
+          data.append('remark', this.remark);
+          hangUp(data).then(response => {
+            if (response.code === 200) {
+              this.$toast({
+                icon: 'success',
+                message: '当前承包方调查已被挂起',
+                duration: '2000',
+                onClose: () => {
+                  this.showRemark = false;
+                  this.goBack();
+                }
+              });
+            }
+          });
+        }).catch(() => {
+          this.$notify({ type: 'danger', message: '请填写备注信息' });
+        });
+      }
     }
   }
 </script>
 <style scoped lang="scss">
+
+  /deep/ .remarkForm .van-cell__value {
+    border: 1px solid #b0b3ba;
+    border-radius: 5px;
+    padding: 0 15px;
+    .van-field__control {
+      color: #646566;
+    }
+  }
+
   .tb_main{
     position: relative;
     p{

From 17c8aee2bb4ca2d7dad4bcdf461eaae08b3b1849 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 22 Aug 2023 10:02:55 +0800
Subject: [PATCH 10/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contracted/village/contractor/contractWord.vue   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index fc76152a..f72362e4 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -19,7 +19,11 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" />
+        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled">
+          <template #button v-if="!isDisabled">
+            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+          </template>
+        </van-field>
         <van-field v-model="form.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="left" />
         <van-field v-model="form.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field
@@ -302,6 +306,12 @@
             // on cancel
           });
         }
+      },
+      generateCode() {
+        this.form.cbhtbm = this.$route.params.cbfbm + 'J';
+        this.form.fbfbm = this.$route.params.cbfbm.substring(0, 14);
+        this.form.cbfmc = this.$route.params.cbfmc;
+        this.form.cbfbm = this.$route.params.cbfbm;
       }
     },
   };

From 5dc0d25380589b6c36ed0c958cf3147aaf619777 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 22 Aug 2023 13:41:05 +0800
Subject: [PATCH 11/28] =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/fbf.js                           |  9 +++++++++
 .../contracted/village/contractor/contractWord.vue  |  8 ++++----
 src/views/contracted/village/employer/employer.vue  | 13 +++++++++++--
 src/views/contracted/village/massif/massif.vue      |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/api/contracted/fbf.js b/src/api/contracted/fbf.js
index cc4206fc..5c25ebef 100644
--- a/src/api/contracted/fbf.js
+++ b/src/api/contracted/fbf.js
@@ -35,3 +35,12 @@ export function manualSignature(data) {
     data: data
   });
 }
+
+// 生成发包方编码
+export function generateEmployerCode(params) {
+  return request({
+    url: '/service/fbf/generateCode',
+    method: 'get',
+    params: params
+  });
+}
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index f72362e4..259236d0 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -19,9 +19,9 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled">
+        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" label-width="auto" :disabled="isDisabled">
           <template #button v-if="!isDisabled">
-            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成</van-button>
           </template>
         </van-field>
         <van-field v-model="form.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="left" />
@@ -109,8 +109,8 @@
           clickable
           @click="showCbqxq = true"
         >
-          <template #button>
-            <van-button size="small" type="primary" native-type="button" @click.stop="extension">延期</van-button>
+          <template #button v-if="isDisabled">
+            <van-button size="mini" type="primary" native-type="button" @click.stop="extension">延期</van-button>
           </template>
         </van-field>
         <van-popup v-model="showCbqxq" position="bottom">
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index 3410db79..4eacddbc 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -18,7 +18,11 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.fbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled" />
+        <van-field v-model="form.fbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled">
+          <template #button v-if="!isDisabled">
+            <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+          </template>
+        </van-field>
         <van-field v-model="form.fbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
         <van-field v-model="form.fbffzrxm" label="负责人姓名：" placeholder="请输入负责人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
         <van-field v-model="credentialTypeText" label="证件类型："
@@ -82,7 +86,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import { listFbf, addFbf, updateFbf, manualSignature } from "@/api/contracted/fbf";
+  import { listFbf, addFbf, updateFbf, manualSignature, generateEmployerCode } from "@/api/contracted/fbf";
   import vueEsign from "vue-esign";
   import $ from "jquery";
 
@@ -134,6 +138,11 @@
           }
         });
       },
+      generateCode() {
+        generateEmployerCode({deptId: this.$route.query.deptId}).then(response => {
+          this.$set(this.form, 'fbfbm', response.data);
+        });
+      },
       onConfirmTypeOptions(value){
         this.form.fzrzjlx = value.dictValue;
         this.credentialTypeText = value.dictLabel;
diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue
index a5cf25bd..fa30169d 100644
--- a/src/views/contracted/village/massif/massif.vue
+++ b/src/views/contracted/village/massif/massif.vue
@@ -264,7 +264,7 @@
       background: #dbf1ea;
       border: 1px solid #cdcdcd;
       color: #5f5f5f;
-      padding: 5PX 8PX;
+      padding: 5PX 5PX;
       margin-right: 3vw;
       border-radius: 50PX;
     }

From b7d4d490f15831a21eb9b2869f5de6e83967fc37 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 22 Aug 2023 15:14:09 +0800
Subject: [PATCH 12/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E5=AE=B6?=
 =?UTF-8?q?=E5=BA=AD=E6=88=90=E5=91=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contracted/village/contractor/contractorFamily.vue    | 1 +
 .../contracted/village/contractor/contractorFamilyDetail.vue    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/contracted/village/contractor/contractorFamily.vue b/src/views/contracted/village/contractor/contractorFamily.vue
index 7f60a3e1..d6325f94 100644
--- a/src/views/contracted/village/contractor/contractorFamily.vue
+++ b/src/views/contracted/village/contractor/contractorFamily.vue
@@ -224,6 +224,7 @@
                 message: '设置户主成功',
                 duration: "1000",
                 onClose: () => {
+                  this.$route.params.cbfmc = item.cyxm;
                   this.getList();
                 }
               });
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index 9345bec3..98d8f6cf 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -100,7 +100,7 @@
           />
         </van-popup>
         <van-field v-model="form.cybzsm" label="备注说明：" placeholder="请输入备注说明" :border="false" input-align="right" />
-        <van-field v-model="form.cycgfs" label="持股份数：" placeholder="请输入持股份数" :border="false" input-align="right" />
+        <van-field v-model="form.cycgfs" label="持股份数：" type="number" placeholder="请输入持股份数" :border="false" input-align="right" />
         <van-field v-model="form.gqzbh" label="股权编号：" placeholder="请输入股权编号" :border="false" input-align="right" />
       </van-form>
       <p class="btn" @click="submitForm">保存</p>

From 9c38da0d86a221cbbbc2bf84dc14a3154832778f Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 22 Aug 2023 15:58:21 +0800
Subject: [PATCH 13/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../village/contractor/contractorLand.vue     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/views/contracted/village/contractor/contractorLand.vue b/src/views/contracted/village/contractor/contractorLand.vue
index 94b5585b..69fc61ea 100644
--- a/src/views/contracted/village/contractor/contractorLand.vue
+++ b/src/views/contracted/village/contractor/contractorLand.vue
@@ -85,6 +85,7 @@
   import contractorHeader from "./contractorHeader";
   import { listCbdkxx, deleteCbdkxx, transferCbdkxx } from "@/api/contracted/cbdkxx";
   import { listCbf } from "@/api/contracted/cbf";
+  import { getCbht } from "@/api/contracted/cbht";
 
   export default {
     name: "contractedVillageContractor",
@@ -115,6 +116,29 @@
         });
       },
       goDetail(id){
+        if (!id) {
+          // 新增时，查看承包合同是否存在
+          getCbht(this.$route.params.cbfbm).then(response => {
+            if (!response.data) {
+              this.$toast({
+                icon: 'fail', // 找到自己需要的图标
+                message: '承包合同不存在，请先添加承包合同信息',
+                duration:"2000"
+              });
+              return ;
+            } else {
+              this.$router.push({
+                name: 'contractedVillageContractorLandDetail',
+                params: {
+                  deptId: this.$route.params.deptId,
+                  cbfbm: this.$route.params.cbfbm,
+                  cbfmc: this.$route.params.cbfmc,
+                  surveyStatus: this.$route.params.surveyStatus
+                }
+              });
+            }
+          });
+        } else {
         this.$router.push({
           name: 'contractedVillageContractorLandDetail',
           params: {
@@ -125,6 +149,7 @@
             surveyStatus: this.$route.params.surveyStatus
           }
         });
+        }
       },
       skip(name) {
         this.$router.push({

From d2a2f595f2d3295f734db07b57684afe3c704192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 22 Aug 2023 17:12:19 +0800
Subject: [PATCH 14/28] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/projectDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index dbb150f5..57db1e2e 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -370,7 +370,7 @@ export default {
           this.detail.projectNumber = this.selectDictLabel(res.data,response.data.projectNumber);
         });
         this.getDicts("sub_object_type").then(res => {
-          this.detail.projectType = this.selectDictLabel(res.data,response.data.projectType);
+          // this.detail.projectType = this.selectDictLabel(res.data,response.data.projectType);
         });
         this.getDicts("economic_type").then(res => {
           this.detail.economicType = this.selectDictLabel(res.data,response.data.economicType);

From c971988a35d3b149ff52a467207b75837b1cf8a0 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 22 Aug 2023 18:06:08 +0800
Subject: [PATCH 15/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contracted/cbf.js                     |  8 ++
 .../village/contractor/contractWord.vue       | 18 +++--
 .../village/contractor/contractor.vue         | 78 ++++++++++++++++++-
 .../village/contractor/contractorDetail.vue   |  6 +-
 .../contractor/contractorDetailAdd.vue        |  8 +-
 .../contractor/contractorFamilyDetail.vue     | 10 ++-
 .../village/contractor/contractorHeader.vue   |  4 +-
 7 files changed, 111 insertions(+), 21 deletions(-)

diff --git a/src/api/contracted/cbf.js b/src/api/contracted/cbf.js
index ef09f270..dc3d315b 100644
--- a/src/api/contracted/cbf.js
+++ b/src/api/contracted/cbf.js
@@ -17,6 +17,14 @@ export function getCbf(cbfbm) {
   });
 }
 
+// 获取承包方详情
+export function getCbfById(id) {
+  return request({
+    url: '/service/cbf/get/' + id,
+    method: 'get'
+  });
+}
+
 // 新增承包方信息
 export function addCbf(data) {
   return request({
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index 259236d0..ae1210c9 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -87,7 +87,7 @@
         />
         <van-popup v-model="showQDSJ" position="bottom">
           <van-datetime-picker
-            :value="form.qdsj ? new Date(form.qdsj) : new Date()"
+            :value="new Date(form.qdsj)"
             type="date"
             title="请选择签订时间"
             :min-date="minDate"
@@ -172,10 +172,10 @@
       return {
         form: {},                 // 承包合同表单信息
         cbfsOptions: [],          // 承包方式字典
-        cbfsText: null,           // 承包方式标签名
+        cbfsText: '家庭承包',           // 承包方式标签名
         showCbfs: false,          // 控制承包方式字典弹出层的显示和隐藏
         cbflxOptions: [],         // 承包方类型字典
-        cbflxText: null,          // 承包方类型标签名
+        cbflxText: '农户',          // 承包方类型标签名
         showType: false,          // 控制承包方类型字典弹出层的显示和隐藏
         showQDSJ: false,          // 控制签订时间弹出层的显示和隐藏
         showCbqxq: false,         // 控制承包起始时间弹出层的显示和隐藏
@@ -192,7 +192,11 @@
       this.getDicts("cbf_type").then(response => {
         this.cbflxOptions = response.data;
       });
-      this.getDetail();
+    },
+    mounted() {
+      setTimeout(() => {
+        this.getDetail();
+      }, 500);
     },
     methods: {
       getDetail(){
@@ -278,11 +282,11 @@
           cbhtbm: null,
           ycbhtbm: null,
           fbfbm: null,
-          cbflx: null,
+          cbflx: '1',
           cbfmc: null,
           cbfbm: null,
-          cbfs: null,
-          qdsj: null,
+          cbfs: '110',
+          qdsj: this.format(new Date(), 'yyyy-MM-dd'),
           cbqxq: null,
           cbqxz: null,
           cbdkzs: null,
diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue
index 51d142ce..c03c9374 100644
--- a/src/views/contracted/village/contractor/contractor.vue
+++ b/src/views/contracted/village/contractor/contractor.vue
@@ -54,18 +54,33 @@
             <van-col span="5" style="color: #f78200">{{ item.cbfcysl }}</van-col>
           </van-row>
           <template #right>
-            <van-button square type="danger" text="删除" native-type="button" @click="deleteContractor(item.id, index)" />
+            <!-- <van-button v-if="surveyStatus === '2'" square type="warning" text="挂起原因" native-type="button" @click="handleViewRemark(item.id)" />
+            <van-button square type="danger" text="删除" native-type="button" @click="deleteContractor(item.id, index)" /> -->
+            <div class="operation">
+              <!-- delete 删除 edit编辑 view查看 list榜单 -->
+              <div class="opera_btn view" v-if="surveyStatus === '2'" @click="handleViewRemark(item.id)">
+                <p>挂起原因</p>
+              </div>
+              <div class="opera_btn delete" @click="deleteContractor(item.id, index)">
+                <p>删除</p>
+              </div>
+            </div>
           </template>
         </van-swipe-cell>
       </van-list>
     </div>
-
-
+    <!-- 异常挂起备注信息弹出框 -->
+    <van-dialog v-model="showRemark" title="异常挂起原因" :show-confirm-button="false" show-cancel-button cancelButtonText="关闭">
+      <van-form ref="remarkForm" class="remarkForm">
+        <van-field v-model="remark" label="挂起原因:" type="textarea" rows="4" placeholder="挂起原因" input-align="left"
+                   label-width="auto" />
+      </van-form>
+    </van-dialog>
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
-  import { listCbf, deleteCbf } from "@/api/contracted/cbf";
+  import { listCbf, getCbfById, deleteCbf } from "@/api/contracted/cbf";
 
   export default {
     name: "contractedVillageContractor",
@@ -85,6 +100,9 @@
           surveyStatus: null,
           pageNum:1,
           pageSize:20,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
         },
         // 承包方列表
         cbfList: [],
@@ -92,6 +110,10 @@
         tagName: null,
         // 当前调查状态下的承包方总数
         totalNum: 0,
+        // 控制异常信息备注提示框的显示和隐藏
+        showRemark: false,
+        // 异常备注信息
+        remark: null,
       };
     },
     created() {
@@ -181,6 +203,13 @@
           }).catch(() => {
             // on cancel
           });
+      },
+      handleViewRemark(id) {
+        this.remark = null;
+        getCbfById(id).then(response => {
+          this.showRemark = true;
+          this.remark = response.data.surveyRemark;
+        });
       }
     },
   };
@@ -214,6 +243,15 @@
     flex: 1;
   }
 
+  /deep/ .remarkForm .van-cell__value {
+    border: 1px solid #b0b3ba;
+    border-radius: 5px;
+    padding: 0 15px;
+    .van-field__control {
+      color: #646566;
+    }
+  }
+
   .tap_block{
     width: 100%;
     display: flex;
@@ -304,4 +342,36 @@
     }
   }
 
+  .operation{
+    display: flex;
+    align-items: center;
+    justify-content: right;
+    text-align: center;
+    background: #fff;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    height: 100%;
+    border-radius: 30px;
+    margin-left: 2vw;
+    overflow: hidden;
+    .opera_btn{
+      height: 100%;
+      display: flex;
+      align-items: center;
+      color: #ffffff;
+      padding: 0 5vw;
+      &.delete{
+        background:#ff3737;
+      }
+      &.edit{
+        background: #a5f790;
+      }
+      &.view{
+        background: #48e5a2;
+      }
+      &.list{
+        background: #fb9627;
+      }
+    }
+  }
+
 </style>
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index 4836fd5c..2d01dac8 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -112,7 +112,11 @@
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
       });
-      this.getDetail();
+    },
+    mounted() {
+      setTimeout(() => {
+        this.getDetail();
+      }, 500);
     },
     methods: {
       getDetail(){
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index d6706e8c..d8f4ad68 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -88,9 +88,9 @@
         form: {
           deptId: null,
           cbfbm: null,
-          cbflx: null,
+          cbflx: '1',
           cbfmc: null,
-          cbfzjlx: null,
+          cbfzjlx: '1',
           cbfzjhm: null,
           cbfdz: null,
           yzbm: null,
@@ -99,9 +99,9 @@
           cbfdcjs: null,
         },
         // 承包方类型(标签名)
-        cbflxText: null,
+        cbflxText: '农户',
         // 承包方证件类型(标签名)
-        cbfzjlxText: null,
+        cbfzjlxText: '居民身份证',
         // 承包方类型字典
         contractorTypeOptions: [],
         // 承包方证件类型字典
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index 98d8f6cf..84ae82ba 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -121,7 +121,7 @@
         form: {},                       // 承包方家庭成员表单信息
         cyxbOptions: [],                // 成员性别字典
         cyzjlxOptions: [],              // 成员证件类型字典
-        cyzjlxText: null,               // 成员证件类型标签名
+        cyzjlxText: '居民身份证',        // 成员证件类型标签名
         showCredentialType: false,      // 控制证件类型字典弹出层的显示和隐藏
         cybzOptions: [],                // 成员备注字典
         cybzText: null,                 // 成员备注标签名
@@ -148,9 +148,13 @@
       this.getDicts("family_status").then(response => {
         this.familyStatusOptions = response.data;
       });
+    },
+    mounted() {
       if (this.$route.params.id) {
         this.titleName = "修改家庭成员信息";
-        this.getDetail();
+        setTimeout(() => {
+          this.getDetail();
+        }, 500);
       } else {
         this.titleName = "新增家庭成员信息";
         this.resetForm();
@@ -234,7 +238,7 @@
           cyxb: '1',
           yhzgx: null,
           sfgyr: '1',
-          cyzjlx: null,
+          cyzjlx: '1',
           cyzjhm: null,
           cybz: null,
           cybzsm: null,
diff --git a/src/views/contracted/village/contractor/contractorHeader.vue b/src/views/contracted/village/contractor/contractorHeader.vue
index 3a130213..917bdcc9 100644
--- a/src/views/contracted/village/contractor/contractorHeader.vue
+++ b/src/views/contracted/village/contractor/contractorHeader.vue
@@ -30,10 +30,10 @@
       </van-cell-group>
     </van-popup>
 
-    <van-dialog v-model="showRemark" title="异常挂起备注" show-cancel-button confirmButtonText="保存" cancelButtonText="关闭"
+    <van-dialog v-model="showRemark" title="异常挂起原因" show-cancel-button confirmButtonText="保存" cancelButtonText="关闭"
                 :before-close="onBeforeClose" @confirm="handleConfirm">
       <van-form ref="remarkForm" class="remarkForm">
-        <van-field v-model="remark" label="备注信息:" type="textarea" rows="4" placeholder="请输入备注信息" required
+        <van-field v-model="remark" label="挂起原因:" type="textarea" rows="4" placeholder="请输入挂起原因" required
                    :rules="[{ required: true }]" input-align="left" label-width="auto" />
       </van-form>
     </van-dialog>

From 209b11139b90c4135f1811906355b7c1e82f0267 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 23 Aug 2023 10:26:54 +0800
Subject: [PATCH 16/28] =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E3=80=81?=
 =?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E5=AE=A1=E6=A0=B8=E7=AD=BE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/homesteadSurvey/nhhncy.js             |  17 +
 src/api/sunVillage_info/sysCbf.js             |  60 ++
 src/api/sunVillage_info/sysFbf.js             |  18 +
 src/views/homesteadSurvey/add.vue             |   3 +-
 src/views/homesteadSurvey/index.vue           |   4 +
 src/views/homesteadSurvey/list2.vue           |  63 +-
 src/views/sunVillage_info/list_chronicles.vue |  73 ++-
 .../list_chronicles_process.vue               | 189 +++++-
 .../list_chronicles_single_process.vue        | 235 +++++++-
 src/views/sunVillage_info/list_contractor.vue |  72 ++-
 .../list_contractor_process.vue               | 210 ++++++-
 .../list_contractor_single_process.vue        | 540 ++++++++++++------
 .../sunVillage_info/list_employer_process.vue | 207 ++++++-
 .../sunVillage_info/list_signature_pdf.vue    |   1 -
 14 files changed, 1374 insertions(+), 318 deletions(-)
 create mode 100644 src/api/sunVillage_info/sysCbf.js
 create mode 100644 src/api/sunVillage_info/sysFbf.js

diff --git a/src/api/homesteadSurvey/nhhncy.js b/src/api/homesteadSurvey/nhhncy.js
index 76bc8ea3..6830eacc 100644
--- a/src/api/homesteadSurvey/nhhncy.js
+++ b/src/api/homesteadSurvey/nhhncy.js
@@ -25,6 +25,23 @@ export function getNhhncy(id) {
     method: 'get'
   })
 }
+// 查询列表
+export function queryHomesteadnhhncyList(query) {
+  return request({
+    url: '/home/homesteadnhhncy/queryList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+export function addOutsidenhhncy(data) {
+  return request({
+    url: '/home/homesteadnhhncy/outsideAdd',
+    method: 'post',
+    data: data
+  })
+}
 
 // 新增数据调查-农户户内成员
 export function addNhhncy(data) {
diff --git a/src/api/sunVillage_info/sysCbf.js b/src/api/sunVillage_info/sysCbf.js
new file mode 100644
index 00000000..2e89b41c
--- /dev/null
+++ b/src/api/sunVillage_info/sysCbf.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+//查询列表
+export function getList(data){
+  return request({
+    url:'/service/cbf/list',
+    method:'get',
+    params:data
+  })
+}
+//查询承包地块列表
+export function getCbdkms(data){
+  return request({
+    url:'/service/cbdkxx/getCbdkms',
+    method:'get',
+    params:data
+  })
+}
+
+//修改
+export function updateSysCfb(data){
+  return request({
+    url:'/service/cbf/edit',
+    method: 'post',
+    data: data
+  })
+}
+//批量修改承包方记事签字
+export function updateBatchSign(data,gsjs){
+  return request({
+    url:'/service/cbf/updateBatchSign?gsjs='+gsjs,
+    method: 'post',
+    data: data
+  })
+}
+//修改承包方记事签字
+export function updateSign(data){
+  return request({
+    url:'/service/cbf/updateSign',
+    method: 'post',
+    data: data
+  })
+}
+//批量修改承包方审核签字
+export function examineBatchSign(data,shyj){
+  return request({
+    url:'/service/cbf/examineBatchSign?shyj='+shyj,
+    method: 'post',
+    data: data
+  })
+}
+//修改承包方审核签字
+export function examineSign(data){
+  return request({
+    url:'/service/cbf/examineSign',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/src/api/sunVillage_info/sysFbf.js b/src/api/sunVillage_info/sysFbf.js
new file mode 100644
index 00000000..5af4237e
--- /dev/null
+++ b/src/api/sunVillage_info/sysFbf.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+//查询列表
+export function getSysFfb(data){
+  return request({
+    url:'/service/fbf/sysFbfSelect',
+    method:'get',
+    params:data
+  })
+}
+//修改
+export function auditSign(data){
+  return request({
+    url:'/service/fbf/auditSign',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 246d896a..9d05181b 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -848,6 +848,7 @@ export default {
           Dialog({ type: 'danger', message: '请在地图上标注宅基地所在位置！' });
           return;
         }
+        this.permission = "false";
         if(this.form.id == null){
 
           let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
@@ -855,7 +856,7 @@ export default {
           if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
           this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
           this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
-          this.$set(this.form, 'surveyId', surveyItem.id);
+          this.$set(this.form, 'surveyId', surveyItem.id)
           addZjdzd(this.form).then(response => {
             let _this =this;
             getZjdzd(response.data).then((res) => {
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index ff160ab5..014ff227 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -229,6 +229,7 @@
             console.info(userId);
             this.nickName = this.$store.state.user.nickName;
             this.$set(this.queryParams, "rwzxr", userId);
+            this.$set(this.queryParams, "params", {deptId:100});
             this.getList();
           },1000)
 
@@ -331,6 +332,7 @@
           if(this.active==1){
             let params = {
               "rwfbzt":"PUBLISHED",
+              "params":{deptId:this.$store.state.user.loginDeptId},
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
@@ -346,6 +348,7 @@
             let params = {
               "rwwczt": "PUBLISHED",
               "rwfbzt":"PUBLISHED",
+              "params":{deptId:this.$store.state.user.loginDeptId},
               "pageNum": this.countwhc+1,
               "pageSize":10,
             }
@@ -361,6 +364,7 @@
             let params = {
               "rwwczt": "UNPUBLISHED",
               "rwfbzt":"PUBLISHED",
+              "params":{deptId:this.$store.state.user.loginDeptId},
               "pageNum": this.countqb+1,
               "pageSize":10,
             }
diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue
index d841f650..a4b1d165 100644
--- a/src/views/homesteadSurvey/list2.vue
+++ b/src/views/homesteadSurvey/list2.vue
@@ -53,6 +53,7 @@
       <van-search  v-model="nhvalue" placeholder="请输入农户姓名或证件号" show-action @search="onSearchnh">
         <template #action>
           <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClicknh" style="vertical-align:middle;"/>
+          <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClickWcnh" style="vertical-align:middle;"/>
         </template>
       </van-search>
     </van-sticky>
@@ -83,6 +84,27 @@
       </template>
     </van-cell>
     </van-list>
+    <van-dialog v-model="outsideOpen"  title="外村农户" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="outsideSubmitForm" >
+      <van-row>
+        <van-col span="24">
+          <van-field  v-model="outsideForm.nhdm" label="外村农户" placeholder="外村农户" input-align="right"  required :rules="[{ required: true }]"  @click="showWcnh = true"/>
+          <van-popup  v-model="showWcnh" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="wcnhList"
+              @confirm="nhChange"
+              value-key="nhValue"
+              @cancel="showWcnh = false"
+            />
+          </van-popup>
+          <br/>
+          <br/>
+        </van-col>
+
+      </van-row>
+
+
+    </van-dialog>
 <!--    </van-pull-refresh>-->
   </div>
 </template>
@@ -90,7 +112,7 @@
 <script>
     import {getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
-    import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
+    import {addNhhncy, delNhhncy,queryHomesteadnhhncyList, addOutsidenhhncy,exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
     import {listSuyqr,updateSuyqr,addSuyqr} from "@/api/homesteadSurvey/suyqr";
     import {listZrz,getZrzZjdDmList,getZrz} from "@/api/homesteadSurvey/zrz";
@@ -149,6 +171,7 @@
           showhzlx:false,
           showhncylist:false,
           showhncy:false,
+          showWcnh: false,
           activeBtn:2,
           value:'',
           // 宅基地搜索框
@@ -243,6 +266,9 @@
           searchBarOperVisbile: false,
           mapDataAll: [],
           showSearch:false,
+          outsideOpen:false,
+          outsideForm:{nhdm:null},
+          wcnhList:[],
           bottomHeight:'0px',
           //搜索---end
           //测面
@@ -769,6 +795,30 @@
           this.$cookies.remove("search");
           this.$router.push({name:'hncyDetails',query:{item:{}}});
         },
+        /** 新增外村农户按钮操作 */
+        onClickWcnh(){
+          this.getWcnhList().then((resp) => {
+            this.outsideOpen = true;
+          });
+        },
+        getWcnhList() {
+          return queryHomesteadnhhncyList({
+            yhzgx: '02',
+            searchValue: 'id, dept_id, book_id, dept_name, YSDM, NHDM, XM, ZJLX, ZJHM, XB, YHZGX, HKLX, LXDH, HYZK, SFBJTJJZZCY, CYBZ, CYBZSM, SJLY, occupation, jzqk,' +
+              'sfwbh, sfpkh, jzhcssfyzf, zqtczsfyzf, sfbccm, sfjbzgq, txdz, hkszd,' +
+              'create_by, create_time, update_by, update_time',
+            sfbccm:"0",
+          }).then((resp) => {
+            this.wcnhList = resp.rows;
+            this.wcnhList.map(function (item) {
+              item.nhValue = item.xm+" "+item.zjhm;
+            })
+          });
+        },
+        nhChange(val){
+          this.outsideForm = val;
+          this.showWcnh = false;
+        },
         // 返回
         onClickLeft(){
           this.$cookies.set("search","")
@@ -4743,6 +4793,7 @@
             return v.toString(16);
           });
         },
+
         //宅基地点击地图核查
         zjdHc(){
           if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
@@ -4865,6 +4916,16 @@
           value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true;
           value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true;
         },
+        /** 外村农户提交按钮 */
+        outsideSubmitForm() {
+          addOutsidenhhncy(this.outsideForm).then(response => {
+            if(response.code != 200) throw response.msg;
+            this.$toast("新增成功");
+            this.outsideOpen = false;
+            this.getList();
+            this.outDiglogStatus = true;
+          }).catch(() => this.outDiglogStatus = true);
+        },
         closeSearchBox(){
           this.showSearch = false ;
           var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
diff --git a/src/views/sunVillage_info/list_chronicles.vue b/src/views/sunVillage_info/list_chronicles.vue
index b4343548..11432f0a 100644
--- a/src/views/sunVillage_info/list_chronicles.vue
+++ b/src/views/sunVillage_info/list_chronicles.vue
@@ -7,35 +7,37 @@
        <div class="search_info">
           <div class="search_block">
               <i class="icon"></i>
-              <input type="text" class="ipt" v-model="value" placeholder="搜索" >
+              <input type="text" class="ipt" v-model="queryParams.cbfmc" placeholder="搜索" >
           </div>
-          <div class="total">查询</div>
+          <div class="total" @click="getCbfCount">查询</div>
        </div>
        <div class="list_main">
          <van-list
-           v-model="loading"
+           v-model:loading="loading"
            :finished="finished"
            finished-text="没有更多了"
+           @load="onRefreshContractor"
+           :immediate-check="false"
          >
-           <van-swipe-cell v-for="item in 10" :key="item">
-             <div class="item">
+           <van-swipe-cell v-for="(item,index) in cbfList" :key="'cbfjs'+index">
+             <div class="item" style="height: 100px;" @click="$router.push({path:'/sunVillage_info/list_chronicles_single_process',query:{item:item,status:false}})">
                <div class="info">
                  <div class="title">
                    <i class="icon_box"></i>
-                   <p class="news_title">李佳佳</p>
+                   <p class="news_title">{{item.cbfmc}}</p>
                  </div>
                  <div class="time">
-                   <p><img src="../../assets/images/sunVillage_info/contractor_icon_04.png" width="14">444444444</p>
-                   <p><img src="../../assets/images/sunVillage_info/contractor_icon_05.png" width="14">13人</p>
+                   <p><img src="../../assets/images/sunVillage_info/contractor_icon_04.png" width="14">{{item.lxdh}}</p>
+                   <p><img src="../../assets/images/sunVillage_info/contractor_icon_05.png" width="14">{{item.cbfcysl}}</p>
                  </div>
                </div>
                <div style="width: 30%;">
-                 <img src="../../assets/images/sunVillage_info/contractor_icon_06.png" style="width: 100%" alt="">
+                 <img  :src="'/api'+item.gsjsrqz" width="100%" alt="" v-if="item.gsjsrqz" >
                </div>
              </div>
              <template #right>
                <div class="operation">
-                 <div class="opera_btn" @click="$router.push({path:'/sunVillage_info/list_chronicles_single_process'})">
+                 <div class="opera_btn" @click="$router.push({path:'/sunVillage_info/list_chronicles_single_process',query:{item:item,status:true}})">
                    <img src="../../assets/images/sunVillage_info/contractor_icon_07.png" alt="" width="25">
                    <p>记事签字</p>
                  </div>
@@ -47,14 +49,7 @@
      </div>
  </template>
  <script>
-   import {
-     listResource,
-     commonAttach,
-     attachmentList,
-     systemAttachment,
-     delResource,
-     updateResource
-   } from "@/api/sunVillage_info/fixedAssets";
+   import { getList} from "@/api/sunVillage_info/sysCbf";
    import request from '@/utils/request'
    import MapGisLine from "@/components/Map/MapGisLine";
    export default {
@@ -64,15 +59,49 @@
        return {
          loading: false,
          finished: false,
-
-         value:'',
+         cbfList:[],
+         countcbf:0,
+         queryParams:{
+           pageNum: 1,
+           pageSize: 10,
+           cbfbm:null},
        };
      },
      created() {
-
+      this.getCbfCount();
      },
      methods: {
-
+       getCbfCount(){
+         getList(this.queryParams).then(res=>{
+           this.cbfList = res.rows;
+           if(this.cbfList.length >= res.total){
+             this.finished = true;
+           }else{
+             this.loading = false;
+             this.queryParams.pageNum += 1 ;
+           }
+         });
+       },
+       onRefreshContractor(){
+         if(this.loading){
+           let params = {
+             "cbfbm":this.queryParams.cbfbm,
+             "pageNum": this.countcbf+1,
+             "pageSize":10,
+           }
+           getList(params).then((response) => {
+             if(response.rows.length>0&&this.cbfList.length<response.total){
+               response.rows.map(res => {
+                 this.cbfList.unshift(res)
+               })
+               this.loading = false;
+               this.countcbf++
+             }else{
+               this.finished = true;
+             }
+           });
+         }
+       },
      },
    }
  </script>
diff --git a/src/views/sunVillage_info/list_chronicles_process.vue b/src/views/sunVillage_info/list_chronicles_process.vue
index ede7cbe0..f8ad8471 100644
--- a/src/views/sunVillage_info/list_chronicles_process.vue
+++ b/src/views/sunVillage_info/list_chronicles_process.vue
@@ -8,24 +8,24 @@
       <div class="information_main">
         <div class="titBox">
           <img src="../../assets/images/sunVillage_info/contractor_icon_01.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
-          <p class="tit">娃娃村</p>
+          <p class="tit">{{this.$store.state.user.deptName}}</p>
         </div>
 
         <div class="information_content">
           <div class="information_block">
-            <p class="block_num">共有承包方<span>800</span>户</p>
+            <p class="block_num">共有承包方<span>{{cbfCount}}</span>户</p>
           </div>
           <div class="information_block">
-            <p class="block_num">共有承包方<span>800</span>户</p>
+            <p class="block_num">承包地<span>{{cbfdkCount}}</span>亩</p>
           </div>
         </div>
 
       </div>
 
-      <div class="subForm">
+      <div class="subForm" v-if="!showJsxx">
         <img src="../../assets/images/sunVillage_info/list_employer_process_icon_01.png" alt="">
         <van-field
-          v-model="value"
+          v-model="form.gsjs"
           rows="3"
           autosize
           required
@@ -35,46 +35,178 @@
         />
       </div>
 
-      <div class="subForm2">
+      <div class="subForm2" v-if="showJsxx">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
-        <van-field readonly v-model="value" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="审核人" placeholder="审核人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
+        <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
+        <van-cell title="记事人" style="border: none;" >
+          <van-field readonly style="padding: 0 0;height: 30px;" label="记事人" input-align="right" :border="false" >
+            <template #label>
+              <img  :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+            </template>
+          </van-field>
+        </van-cell>
+        <van-field readonly v-model="form.gsjsrq" label="记事日期" placeholder="审核日期" input-align="right" :border="false" />
 
         <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_icon_09.png" alt="">
       </div>
 
-      <div style="margin: 30px auto 0;width: 50%;">
-        <van-button round block type="primary" native-type="submit">
+      <div style="margin: 30px auto 0;width: 50%;" v-if="!showJsxx">
+        <van-button round block type="primary" native-type="submit" @click="onSign()">
           批量记事签字
         </van-button>
       </div>
 
-      <div style="margin: 30px auto 0;width: 50%;">
+      <div style="margin: 30px auto 0;width: 50%;" v-if="showJsxx">
         <van-button round block type="primary" native-type="submit" :to="{name:'sunVillageInfoListChronicles'}">
           单独记事签字
         </van-button>
       </div>
-
+      <van-popup v-model="showesign" closeable position="right" :style="{ height: '100%' }"
+                 close-icon="close">
+        <van-row style="margin:0 10%">
+          <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
+        </van-row>
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+            v-if="!signature.resultImg"
+          />
+        </div>
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
+             style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
+        <div class="signature-footer"  v-if="!signature.resultImg">
+          <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
+          <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
+          </van-row>
+        </div>
+      </van-popup>
     </div>
 </template>
 
 <script>
-  import { financePublicDetail , openAdd } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { getList,getCbdkms,updateSysCfb,updateBatchSign} from "@/api/sunVillage_info/sysCbf";
+  import $ from "jquery";
   export default {
     name: "certificateList",
     data() {
       return {
-        value:''
+        value:'',
+        cbfCount:0,
+        cbfdkCount:0,
+        showJsxx:false,
+        showesign:false,
+        height:0,
+        form:{},
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
       };
     },
     created() {
-
+      this.getCbfCount();
+      this.getCbfdkCount();
+      this.height = window.screen.height * 1.28 - 20;
     },
     methods: {
+      getCbfCount(){
+        getList({}).then(res=>{
+          this.cbfCount = res.total;
+          this.form = res.rows[0];
+          if(this.form.gsjsrqz != null){
+            this.showJsxx = true;
+          }
+        });
+      },
+      getCbfdkCount(){
+        getCbdkms({}).then(res=>{
+          this.cbfdkCount = res.data;
+        });
+      },
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      onSign(){
+        this.showesign = true;
+      },
+      // 清空画板
+      handleReset() {
+        this.resultImg = null
+        if(this.$refs.esign){
+          this.$refs.esign.reset();
+        }
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图
+      handleGenerate() {
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            console.info(res)
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData();
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+            this.showesign = false;
+            this.$toast.loading({
+              message: "数据处理中",
+              forbidClick: true,
+              duration: 40000,
+            });
+            updateBatchSign(param,this.form.gsjs).then((res) => {
+              this.$toast.clear();
+              this.getCbfCount();
+              this.$notify({type: 'success', message: '签字成功'});
+
+              })
+              // this.mainImgArr.push(r1.fileName)
+            // let param = new FormData()  // 创建form对象
+            // param.append('file', wj)  // 通过append向form对象添加数据
+            // param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+            // zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
+            //   this.$notify({type: 'success', message: '签字成功'});
+            //   this.showesign = false;
+            //   getZjdzd(this.zjdzdxx.id).then((response) => {
+            //     localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
+            //     location.reload();
+            //   });
+
 
+            // });
+
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob (dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
     },
   }
 </script>
@@ -85,6 +217,27 @@
     background-size: 100% 100%;
     border: none;
   }
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0px;
+
+  }
+
+  .van-cell::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 0.426667rem;
+    bottom: 0;
+    left: 0.426667rem;
+    border:none;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+  }
 .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;
diff --git a/src/views/sunVillage_info/list_chronicles_single_process.vue b/src/views/sunVillage_info/list_chronicles_single_process.vue
index 2b5e1f95..19411eda 100644
--- a/src/views/sunVillage_info/list_chronicles_single_process.vue
+++ b/src/views/sunVillage_info/list_chronicles_single_process.vue
@@ -9,24 +9,41 @@
           <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
           <p class="tit">信息核对</p>
         </div>
-        <van-field readonly v-model="value" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="电话" placeholder="电话" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="公示记事时间" placeholder="公示记事时间" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="承包方公示结果意见" placeholder="承包方公示结果意见" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="承包方公示结果签字" placeholder="承包方公示结果签字" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="承包方公示日期" placeholder="承包方公示日期" input-align="right" :border="false" />
+        <van-field readonly v-model="form.cbfmc" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false" />
+        <field-select
+          v-model="form.cbfzjlx"
+          label="承包方类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择证件类型"
+          :rules="[{ required: true }]"
+          readonly
+          remote-url="/open/zdzh/list/cert_type"
+          :on-remote-response="'data'"
+        />
+        <van-field readonly v-model="form.cbfzjhm" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
+        <van-field readonly v-model="form.lxdh" label="电话" placeholder="电话" input-align="right" :border="false" />
+        <van-field readonly v-model="form.cbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
+        <van-field readonly v-model="form.gsjs" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
+<!--        <van-field readonly v-model="form.gsjsrqz" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />-->
+        <van-cell title="公示记事人签字" >
+          <van-field style="padding: 0 0;height: 30px;" readonly label="公示记事人签字" input-align="right" :border="false" >
+            <template #label>
+              <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+            </template>
+          </van-field>
+        </van-cell>
+        <van-field readonly v-model="form.gsjsrq" label="公示记事时间" placeholder="公示记事时间" input-align="right" :border="false" />
+        <van-field readonly v-model="form.gsjgyj" label="承包方公示结果意见" placeholder="承包方公示结果意见" input-align="right" :border="false" />
+        <van-field readonly v-model="form.gsjgqz" label="承包方公示结果签字" placeholder="承包方公示结果签字" input-align="right" :border="false" />
+        <van-field readonly v-model="form.gsjgqzrq" label="承包方公示日期" placeholder="承包方公示日期" input-align="right" :border="false" />
 
       </div>
 
-      <div class="subForm">
+      <div class="subForm" v-if="!showForm2">
         <img src="../../assets/images/sunVillage_info/list_employer_process_icon_01.png" alt="">
         <van-field
-          v-model="value"
+          v-model="form.gsjs"
           rows="3"
           autosize
           required
@@ -35,44 +52,186 @@
           :border="false"
           class="textarea"
         />
-        <van-field readonly value="123" label="记事人" placeholder="记事人" input-align="right" :border="false" />
-        <van-field readonly value="123" label="记事时间" placeholder="记事时间" input-align="right" :border="false" />
+        <van-cell title="记事人" style="color: #ffffff;" >
+          <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="记事人" input-align="right" :border="false" >
+            <template #label>
+              <img :src="'/api'+form.gsjsrqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsjsrqz" >
+            </template>
+          </van-field>
+        </van-cell>
+        <van-field readonly v-model="form.gsjsrq" label="记事时间" placeholder="记事时间" input-align="right" :border="false" />
 
       </div>
 
-      <div class="subForm2">
+      <div class="subForm2" v-if="showForm2">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
-        <van-field readonly v-model="value" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="记事人" placeholder="记事人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="记事日期" placeholder="记事日期" input-align="right" :border="false" />
+        <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
+        <van-cell title="记事人" >
+          <van-field style="padding: 0 0;height: 30px;" readonly label="记事人" input-align="right" :border="false" >
+            <template #label>
+              <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+            </template>
+          </van-field>
+        </van-cell>
+        <van-field readonly v-model="form.gsjsrq" label="记事日期" placeholder="记事日期" input-align="right" :border="false" />
 
         <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_icon_09.png" alt="">
       </div>
-      <div style="margin: 30px auto 0;width: 50%;">
-        <van-button round block type="primary" native-type="submit">
+      <div style="margin: 30px auto 0;width: 50%;"  v-if="!showForm2">
+        <van-button round block type="primary" native-type="submit"  @click="onSign()" >
           审核签字
         </van-button>
       </div>
-
+      <van-popup v-model="showesign" closeable position="right" :style="{ height: '100%' }"
+                 close-icon="close">
+        <van-row style="margin:0 10%">
+          <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
+        </van-row>
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+            v-if="!signature.resultImg"
+          />
+        </div>
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
+             style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
+        <div class="signature-footer"  v-if="!signature.resultImg">
+          <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
+          <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
+          </van-row>
+        </div>
+      </van-popup>
     </div>
 </template>
 
 <script>
-  import { financePublicDetail , openAdd } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { updateSign } from "@/api/sunVillage_info/sysCbf";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import $ from "jquery";
   export default {
     name: "certificateList",
+    components: {FieldSelect},
     data() {
       return {
-        value:''
+        form:{},
+        showForm2:false,
+        showesign:false,
+        height:0,
+        options: {
+          cert_type: [],
+        },
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
       };
     },
     created() {
-
+      this.form = this.$route.query.item;
+      this.InitOptions();
+      this.height = window.screen.height * 1.28 - 20;
+      if(this.$route.query.status === "true"){
+        this.showForm2 =false;
+      }else{
+        this.showForm2 =true;
+      }
     },
     methods: {
+      InitOptions() {
+        for(let k in this.options)
+        {
+          this.getDicts(k).then((resp) => this.options[k] = resp.data);
+        }
+      },
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      onSign(){
+        this.showesign = true;
+      },
+      // 清空画板
+      handleReset() {
+        this.resultImg = null
+        if(this.$refs.esign){
+          this.$refs.esign.reset();
+        }
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图
+      handleGenerate() {
+        console.info( this.$refs.esign
+          .generate() );
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            console.info(res)
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData();
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('id', this.form.id)
+            param.append('gsjs', this.form.gsjs)
+            this.showesign = false;
+            this.$toast.loading({
+              message: "数据处理中",
+              forbidClick: true,
+              duration: 40000,
+            });
+            updateSign(param).then((r1) => {
+              this.$toast.clear();
+              // this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
+              this.$notify({type: 'success', message: '签字成功'});
+              this.showForm2 = true;
+              this.form = r1.data;
+              this.$router.push({name:'sunVillageInfoListChronicles'})
+              // this.mainImgArr.push(r1.fileName)
+            })
+            // let param = new FormData()  // 创建form对象
+            // param.append('file', wj)  // 通过append向form对象添加数据
+            // param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+            // zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
+            //   this.$notify({type: 'success', message: '签字成功'});
+            //   this.showesign = false;
+            //   getZjdzd(this.zjdzdxx.id).then((response) => {
+            //     localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
+            //     location.reload();
+            //   });
 
+
+            // });
+
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob (dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
     },
   }
 </script>
@@ -83,7 +242,27 @@
     background-size: 100% 100%;
     border: none;
   }
-.home_wrapper{
+  .van-cell::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 0.426667rem;
+    bottom: 0;
+    left: 0.426667rem;
+    border:none;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+  }
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0px;
+
+  }
+  .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;
     width: 100vw;
diff --git a/src/views/sunVillage_info/list_contractor.vue b/src/views/sunVillage_info/list_contractor.vue
index cb95e143..d25f4f3f 100644
--- a/src/views/sunVillage_info/list_contractor.vue
+++ b/src/views/sunVillage_info/list_contractor.vue
@@ -7,35 +7,36 @@
        <div class="search_info">
           <div class="search_block">
               <i class="icon"></i>
-              <input type="text" class="ipt" v-model="value" placeholder="搜索" >
+              <input type="text" class="ipt" v-model="queryParams.cbfmc" placeholder="搜索" >
           </div>
-          <div class="total">查询</div>
+         <div class="total" @click="getCbfCount">查询</div>
        </div>
        <div class="list_main">
          <van-list
-           v-model="loading"
+           v-model:loading="loading"
            :finished="finished"
            finished-text="没有更多了"
+           @load="onRefreshContractor"
          >
-           <van-swipe-cell v-for="item in 10" :key="item">
-             <div class="item">
+           <van-swipe-cell v-for="(item,index) in cbfList" :key="'cbf'+index">
+             <div class="item"  @click="$router.push({path:'/sunVillage_info/list_contractor_single_process',query:{item:item,status:false}})">
                <div class="info">
                  <div class="title">
                    <i class="icon_box"></i>
-                   <p class="news_title">李佳佳</p>
+                   <p class="news_title">{{item.cbfmc}}</p>
                  </div>
                  <div class="time">
-                   <p><img src="../../assets/images/sunVillage_info/contractor_icon_04.png" width="14">444444444</p>
-                   <p><img src="../../assets/images/sunVillage_info/contractor_icon_05.png" width="14">13人</p>
+                   <p><img src="../../assets/images/sunVillage_info/contractor_icon_04.png" width="14">{{item.lxdh}}</p>
+                   <p><img src="../../assets/images/sunVillage_info/contractor_icon_05.png" width="14">{{item.cbfcysl}}</p>
                  </div>
                </div>
                <div style="width: 30%;">
-                 <img src="../../assets/images/sunVillage_info/contractor_icon_06.png" style="width: 100%" alt="">
+                 <img  :src="'/api'+item.gsshqz" width="100%" alt="" v-if="item.gsshqz" >
                </div>
              </div>
              <template #right>
                <div class="operation">
-                 <div class="opera_btn" @click="$router.push({path:'/sunVillage_info/list_contractor_single_process'})">
+                 <div class="opera_btn" @click="$router.push({path:'/sunVillage_info/list_contractor_single_process',query:{item:item,status:true}})">
                    <img src="../../assets/images/sunVillage_info/contractor_icon_07.png" alt="" width="25">
                    <p>审核签字</p>
                  </div>
@@ -49,14 +50,7 @@
      </div>
  </template>
  <script>
-   import {
-     listResource,
-     commonAttach,
-     attachmentList,
-     systemAttachment,
-     delResource,
-     updateResource
-   } from "@/api/sunVillage_info/fixedAssets";
+   import { getList} from "@/api/sunVillage_info/sysCbf";
    import request from '@/utils/request'
    import MapGisLine from "@/components/Map/MapGisLine";
    export default {
@@ -66,15 +60,51 @@
        return {
          loading: false,
          finished: false,
-
+         cbfList:[],
+         countcbf:0,
+         queryParams:{
+           pageNum: 1,
+           pageSize: 10,
+           cbfbm:null},
          value:'',
        };
      },
      created() {
-
+       this.getCbfCount();
      },
      methods: {
-
+       getCbfCount(){
+         getList(this.queryParams).then(res=>{
+           this.cbfList = res.rows;
+           if(this.cbfList.length >= res.total){
+             this.finished = true;
+             return;
+           }else{
+             this.loading = false;
+             this.queryParams.pageNum += 1 ;
+           }
+         });
+       },
+       onRefreshContractor(){
+        if(this.loading){
+          let params = {
+            "cbfbm":this.queryParams.cbfbm,
+            "pageNum": this.countcbf+1,
+            "pageSize":10,
+          }
+          getList(params).then((response) => {
+            if(response.rows.length>0&&this.cbfList.length<response.total){
+              response.rows.map(res => {
+                this.cbfList.unshift(res)
+              })
+              this.loading = false;
+              this.countcbf++
+            }else{
+              this.finished = true;
+            }
+          });
+        }
+       },
      },
    }
  </script>
diff --git a/src/views/sunVillage_info/list_contractor_process.vue b/src/views/sunVillage_info/list_contractor_process.vue
index 678b75d2..6fac2c86 100644
--- a/src/views/sunVillage_info/list_contractor_process.vue
+++ b/src/views/sunVillage_info/list_contractor_process.vue
@@ -8,21 +8,21 @@
       <div class="information_main">
         <div class="titBox">
           <img src="../../assets/images/sunVillage_info/contractor_icon_01.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
-          <p class="tit">娃娃村</p>
+          <p class="tit">{{this.$store.state.user.deptName}}</p>
         </div>
 
         <div class="information_content">
           <div class="information_block">
-            <p class="block_num">800<span>户</span></p>
+            <p class="block_num">{{cbfCount}}<span>户</span></p>
             <p class="block_name">承包方</p>
           </div>
           <div class="information_block">
-            <p class="block_num">800<span>户</span></p>
-            <p class="block_name">承包方</p>
+            <p class="block_num">{{cbfdkCount}}<span>户</span></p>
+            <p class="block_name">承包地</p>
           </div>
           <div class="information_block">
-            <p class="block_num">800<span>户</span></p>
-            <p class="block_name">承包方</p>
+            <p class="block_num">{{cbfGsqzCount}}<span>户</span></p>
+            <p class="block_name">已公示签字确认</p>
           </div>
         </div>
 
@@ -33,15 +33,21 @@
           <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
           <p class="tit">信息核对</p>
         </div>
-        <van-field readonly v-model="value" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="公示记事日期" placeholder="公示记事日期" input-align="right" :border="false" />
+        <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
+        <van-cell title="记事人" style="border: none;" >
+          <van-field readonly style="padding: 0 0;height: 30px;" label="记事人" input-align="right" :border="false" >
+            <template #label>
+              <img  :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+            </template>
+          </van-field>
+        </van-cell>
+        <van-field readonly v-model="form.gsjsrq" label="记事日期" placeholder="审核日期" input-align="right" :border="false" />
       </div>
 
-      <div class="subForm">
+      <div class="subForm" v-if="!showForm2">
         <img src="../../assets/images/sunVillage_info/list_employer_process_icon_01.png" alt="">
         <van-field
-          v-model="value"
+          v-model="form.gsshyj"
           rows="3"
           autosize
           required
@@ -51,46 +57,182 @@
         />
       </div>
 
-      <div class="subForm2">
+      <div class="subForm2" v-if="showForm2">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
-        <van-field readonly v-model="value" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="审核人" placeholder="审核人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
+        <van-field readonly v-model="form.gsshyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
+        <van-cell title="审核人" style="border: none;" >
+          <van-field readonly style="padding: 0 0;height: 30px;" label="审核人" input-align="right" :border="false" >
+            <template #label>
+              <img  :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
+            </template>
+          </van-field>
+        </van-cell>
+        <van-field readonly v-model="form.gsshrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
 
         <img class="bottomImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_04.png" alt="">
       </div>
 
-      <div style="margin: 30px auto 0;width: 50%;">
-        <van-button round block type="primary" native-type="submit">
+      <div style="margin: 30px auto 0;width: 50%;" v-if="!showForm2">
+        <van-button round block type="primary" native-type="submit"  @click="onSign()">
           批量审核签字
         </van-button>
       </div>
 
-      <div style="margin: 30px auto 0;width: 50%;">
+      <div style="margin: 30px auto 0;width: 50%;" v-if="showForm2">
         <van-button round block type="primary" native-type="submit" :to="{name:'sunVillageInfoListContractor'}">
           单独审核签字
         </van-button>
       </div>
-
+      <van-popup v-model="showesign" closeable position="right" :style="{ height: '100%' }"
+                 close-icon="close">
+        <van-row style="margin:0 10%">
+          <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
+        </van-row>
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+            v-if="!signature.resultImg"
+          />
+        </div>
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
+             style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
+        <div class="signature-footer"  v-if="!signature.resultImg">
+          <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
+          <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
+          </van-row>
+        </div>
+      </van-popup>
     </div>
 </template>
 
 <script>
-  import { financePublicDetail , openAdd } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { getList,getCbdkms,updateSysCfb,examineBatchSign} from "@/api/sunVillage_info/sysCbf";
+  import $ from "jquery";
   export default {
     name: "certificateList",
     data() {
       return {
-        value:''
+        height:0,
+        cbfCount:0,
+        cbfdkCount:0,
+        cbfGsqzCount:0,
+        showForm2:false,
+        showesign:false,
+        form:{},
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
       };
     },
     created() {
-
+      this.getCbfCount();
+      this.getCbfdkCount();
+      this.getCbfGsqzCount();
+      this.height = window.screen.height * 1.28 - 20;
     },
     methods: {
+      getCbfCount(){
+        getList({}).then(res=>{
+          this.cbfCount = res.total;
+          this.form = res.rows[0];
+          if(this.form.gsshqz != null){
+            this.showForm2 = true;
+          }
+        });
+      },
+      getCbfGsqzCount(){
+        getList({params:{gsqz:true}}).then(res=>{
+          this.cbfGsqzCount = res.total;
+        });
+      },
+      getCbfdkCount(){
+        getCbdkms({}).then(res=>{
+          this.cbfdkCount = res.data;
+        });
+      },
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      onSign(){
+        this.showesign = true;
+      },
+      // 清空画板
+      handleReset() {
+        this.resultImg = null
+        if(this.$refs.esign){
+          this.$refs.esign.reset();
+        }
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图
+      handleGenerate() {
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData();
+            param.append('file', wj)  // 通过append向form对象添加数据
+            this.showesign = false;
+            this.$toast.loading({
+              message: "数据处理中",
+              forbidClick: true,
+              duration: 40000,
+            });
+            examineBatchSign(param,this.form.gsshyj).then((res) => {
+              this.$toast.clear();
+              this.getCbfCount();
+              this.$notify({type: 'success', message: '签字成功'});
+
+            })
+            // this.mainImgArr.push(r1.fileName)
+            // let param = new FormData()  // 创建form对象
+            // param.append('file', wj)  // 通过append向form对象添加数据
+            // param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+            // zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
+            //   this.$notify({type: 'success', message: '签字成功'});
+            //   this.showesign = false;
+            //   getZjdzd(this.zjdzdxx.id).then((response) => {
+            //     localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
+            //     location.reload();
+            //   });
 
+
+            // });
+
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob (dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
     },
   }
 </script>
@@ -101,6 +243,26 @@
     background-size: 100% 100%;
     border: none;
   }
+  .van-cell::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 0.426667rem;
+    bottom: 0;
+    left: 0.426667rem;
+    border:none;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+  }
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0px;
+
+  }
 .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;
diff --git a/src/views/sunVillage_info/list_contractor_single_process.vue b/src/views/sunVillage_info/list_contractor_single_process.vue
index 60607078..effb7141 100644
--- a/src/views/sunVillage_info/list_contractor_single_process.vue
+++ b/src/views/sunVillage_info/list_contractor_single_process.vue
@@ -1,78 +1,236 @@
 <template>
-    <div class="home_wrapper">
-      <div class="header_main" >
-        承包方审核
-        <div class="return_btn" @click="onClickLeft"></div>
+  <div class="home_wrapper">
+    <div class="header_main" >
+      承包方审核
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <div class="list_main">
+      <div class="titBox">
+        <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
+        <p class="tit">信息核对</p>
       </div>
-      <div class="list_main">
-        <div class="titBox">
-          <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
-          <p class="tit">信息核对</p>
-        </div>
-        <van-field readonly v-model="value" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="电话" placeholder="电话" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="公示记事时间" placeholder="公示记事时间" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="承包方公示结果意见" placeholder="承包方公示结果意见" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="承包方公示结果签字" placeholder="承包方公示结果签字" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="承包方公示日期" placeholder="承包方公示日期" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfmc" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false" />
+      <field-select
+        v-model="form.cbfzjlx"
+        label="承包方类型"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择证件类型"
+        :rules="[{ required: true }]"
+        readonly
+        remote-url="/open/zdzh/list/cert_type"
+        :on-remote-response="'data'"
+      />
+      <van-field readonly v-model="form.cbfzjhm" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
+      <van-field readonly v-model="form.lxdh" label="电话" placeholder="电话" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsjs" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
+      <!--        <van-field readonly v-model="form.gsjsrqz" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />-->
+      <van-cell title="公示记事人签字" >
+        <van-field style="padding: 0 0;height: 30px;" readonly label="公示记事人签字" input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.gsjsrq" label="公示记事时间" placeholder="公示记事时间" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsjgyj" label="承包方公示结果意见" placeholder="承包方公示结果意见" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsjgqz" label="承包方公示结果签字" placeholder="承包方公示结果签字" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsjgqzrq" label="承包方公示日期" placeholder="承包方公示日期" input-align="right" :border="false" />
 
-      </div>
+    </div>
 
-      <div class="subForm">
-        <img src="../../assets/images/sunVillage_info/list_employer_process_icon_01.png" alt="">
-        <van-field
-          v-model="value"
-          rows="3"
-          autosize
-          required
-          label="审批意见"
-          type="textarea"
-          :border="false"
-          class="textarea"
-        />
-        <van-field readonly value="123" label="审核人" placeholder="承包方公示日期" input-align="right" :border="false" />
-        <van-field readonly value="123" label="审核日期" placeholder="承包方公示日期" input-align="right" :border="false" />
+    <div class="subForm" v-if="!showForm2">
+      <img src="../../assets/images/sunVillage_info/list_employer_process_icon_01.png" alt="">
+      <van-field
+        v-model="form.gsshyj"
+        rows="3"
+        autosize
+        required
+        label="审核意见"
+        type="textarea"
+        :border="false"
+        class="textarea"
+      />
+      <van-cell title="审核人" style="color: #ffffff;" >
+        <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="审核人" input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.gsshqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsshqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.gsshrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
 
-      </div>
+    </div>
 
-      <div class="subForm2">
-        <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
-        <van-field readonly v-model="value" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="审核人" placeholder="审核人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
+    <div class="subForm2" v-if="showForm2">
+      <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
+      <van-field readonly v-model="form.gsshyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
+      <van-cell title="审核人" >
+        <van-field style="padding: 0 0;height: 30px;" readonly label="审核人" input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.gsshrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
 
-        <img class="bottomImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_04.png" alt="">
+      <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_icon_09.png" alt="">
+    </div>
+    <div style="margin: 30px auto 0;width: 50%;"  v-if="!showForm2">
+      <van-button round block type="primary" native-type="submit"  @click="onSign()" >
+        审核签字
+      </van-button>
+    </div>
+    <van-popup v-model="showesign" closeable position="right" :style="{ height: '100%' }"
+               close-icon="close">
+      <van-row style="margin:0 10%">
+        <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
+      </van-row>
+      <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+        <vue-esign
+          ref="esign"
+          class="mySign"
+          :width="500"
+          :height="height"
+          :isCrop="signature.isCrop"
+          :lineWidth="signature.lineWidth"
+          :lineColor="signature.lineColor"
+          :bgColor.sync="signature.bgColor"
+          v-if="!signature.resultImg"
+        />
       </div>
-      <div style="margin: 30px auto 0;width: 50%;">
-        <van-button round block type="primary" native-type="submit">
-          审核签字
-        </van-button>
+      <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
+           style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+      <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
+      <div class="signature-footer"  v-if="!signature.resultImg">
+        <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
+        <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
+        </van-row>
       </div>
-
-    </div>
+    </van-popup>
+  </div>
 </template>
 
 <script>
-  import { financePublicDetail , openAdd } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { examineSign } from "@/api/sunVillage_info/sysCbf";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import $ from "jquery";
   export default {
     name: "certificateList",
+    components: {FieldSelect},
     data() {
       return {
-        value:''
+        form:{},
+        showForm2:false,
+        showesign:false,
+        height:0,
+        options: {
+          cert_type: [],
+        },
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
       };
     },
     created() {
-
+      this.form = this.$route.query.item;
+      this.InitOptions();
+      this.height = window.screen.height * 1.28 - 20;
+      if(this.$route.query.status === "true"){
+        this.showForm2 =false;
+      }else{
+        this.showForm2 =true;
+      }
     },
     methods: {
+      InitOptions() {
+        for(let k in this.options)
+        {
+          this.getDicts(k).then((resp) => this.options[k] = resp.data);
+        }
+      },
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      onSign(){
+        this.showesign = true;
+      },
+      // 清空画板
+      handleReset() {
+        this.resultImg = null
+        if(this.$refs.esign){
+          this.$refs.esign.reset();
+        }
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图
+      handleGenerate() {
+        console.info( this.$refs.esign
+          .generate() );
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            console.info(res)
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData();
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('id', this.form.id)
+            param.append('shyj', this.form.gsshyj)
+            this.showesign = false;
+            this.$toast.loading({
+              message: "数据处理中",
+              forbidClick: true,
+              duration: 40000,
+            });
+            examineSign(param).then((r1) => {
+              this.$toast.clear();
+              // this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
+              this.$notify({type: 'success', message: '签字成功'});
+              this.showForm2 = true;
+              this.form = r1.data;
+              this.$router.push({name:'sunVillageInfoListContractor'})
+            })
+            // let param = new FormData()  // 创建form对象
+            // param.append('file', wj)  // 通过append向form对象添加数据
+            // param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+            // zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
+            //   this.$notify({type: 'success', message: '签字成功'});
+            //   this.showesign = false;
+            //   getZjdzd(this.zjdzdxx.id).then((response) => {
+            //     localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
+            //     location.reload();
+            //   });
+
+
+            // });
 
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob (dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
     },
   }
 </script>
@@ -83,82 +241,102 @@
     background-size: 100% 100%;
     border: none;
   }
-.home_wrapper{
+  .van-cell::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 0.426667rem;
+    bottom: 0;
+    left: 0.426667rem;
+    border:none;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+  }
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0px;
+
+  }
+  .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;
     width: 100vw;
-    .header_main {
-        height: 116px;
-        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
-        background-size: 100% 100%;
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100%;
-        font-size: 36px;
-        line-height: 116px;
-        text-align: center;
-        color: #fff;
-        position: relative;
+  .header_main {
+    height: 116px;
+    background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
 
-        .return_btn {
-            width: 24px;
-            height: 43.2px;
-            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
-            background-size: 20px 36px;
-            position: absolute;
-            left: 38px;
-            top: 36px;
-        }
-    }
-    .release_head{
-        height: 90px;
-        padding:0 23px;
-        display: flex;
-        align-items: center;
-        font-size: 26px;
-        color: #929292;
-        .people{
-            flex: 1;
-            display: flex;
-            align-items: center;
-            .icon{
-                width: 24px;
-                height: 21px;
-                background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
-                background-size: 100% 100%;
-                display: block;
-                margin-right: 8px;
-            }
-        }
-        .time{
-            flex: 1;
-            display: flex;
-            align-items: center;
-            justify-content:flex-end;
-            .icon{
-                width: 25px;
-                height: 25px;
-                background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
-                background-size: 100% 100%;
-                display: block;
-                margin-right: 8px;
-            }
-        }
-    }
-    .release_conetnt{
-        padding:0 22px;
-        font-size: 32px;
-        color: #252525;
-        line-height: 44px;
-        img{
-            max-width: 100%;
-            margin-bottom: 16px;
-        }
-        p{
-            margin-bottom: 16px;
-        }
-    }
+  .return_btn {
+    width: 24px;
+    height: 43.2px;
+    background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  }
+  .release_head{
+    height: 90px;
+    padding:0 23px;
+    display: flex;
+    align-items: center;
+    font-size: 26px;
+    color: #929292;
+  .people{
+    flex: 1;
+    display: flex;
+    align-items: center;
+  .icon{
+    width: 24px;
+    height: 21px;
+    background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+    background-size: 100% 100%;
+    display: block;
+    margin-right: 8px;
+  }
+  }
+  .time{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content:flex-end;
+  .icon{
+    width: 25px;
+    height: 25px;
+    background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+    background-size: 100% 100%;
+    display: block;
+    margin-right: 8px;
+  }
+  }
+  }
+  .release_conetnt{
+    padding:0 22px;
+    font-size: 32px;
+    color: #252525;
+    line-height: 44px;
+  img{
+    max-width: 100%;
+    margin-bottom: 16px;
+  }
+  p{
+    margin-bottom: 16px;
+  }
+  }
   .list_main{
     padding:25px;
     background: #ffffff;
@@ -176,46 +354,46 @@
     box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
     position: relative;
     padding-top: 10vw;
-    img{
-      position: absolute;
-      left: 50%;
-      width: 15vw;
-      transform: translate(-50%,calc(-50% - 10vw));
-      border: 5PX solid #e9e9e9;
-      border-radius: 100%;
-    }
-    /deep/ .van-field__label{
-      /*padding-left: 10PX;*/
-      width: auto;
-      display: flex;
-      align-items: start;
-      color: #ffffff;
-      margin-right: 6vw;
-    }
-    /deep/ .van-cell{
-      background-color: transparent;
-    }
-    .textarea{
-      /deep/ .van-field__value{
-        background-color: #ffffff;
-        border-radius: 10PX;
-      }
-      /deep/ .van-field__control{
-        padding: 12PX;
-        color: #666666;
-      }
-    }
-    /deep/ .van-field__value{
-      background-color: transparent;
-      border-radius: 10PX;
-    }
-    /deep/ .van-field__control{
-      padding: 0PX;
-      color: #ffffff;
-    }
-    /deep/ .van-cell--required::before{
-      left: 60PX;
-    }
+  img{
+    position: absolute;
+    left: 50%;
+    width: 15vw;
+    transform: translate(-50%,calc(-50% - 10vw));
+    border: 5PX solid #e9e9e9;
+    border-radius: 100%;
+  }
+  /deep/ .van-field__label{
+    /*padding-left: 10PX;*/
+    width: auto;
+    display: flex;
+    align-items: start;
+    color: #ffffff;
+    margin-right: 6vw;
+  }
+  /deep/ .van-cell{
+    background-color: transparent;
+  }
+  .textarea{
+  /deep/ .van-field__value{
+    background-color: #ffffff;
+    border-radius: 10PX;
+  }
+  /deep/ .van-field__control{
+    padding: 12PX;
+    color: #666666;
+  }
+  }
+  /deep/ .van-field__value{
+    background-color: transparent;
+    border-radius: 10PX;
+  }
+  /deep/ .van-field__control{
+    padding: 0PX;
+    color: #ffffff;
+  }
+  /deep/ .van-cell--required::before{
+    left: 60PX;
+  }
   }
   .subForm2{
     padding:25px;
@@ -226,21 +404,21 @@
     box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
     position: relative;
     padding-top: 10vw;
-    .topImg{
-      position: absolute;
-      left: 50%;
-      width: 15vw;
-      transform: translate(-50%,calc(-50% - 10vw));
-      border: 5PX solid #e9e9e9;
-      border-radius: 100%;
-    }
-    .bottomImg{
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      width: 25vw;
-      transform: translate(-50%,-50%);
-    }
+  .topImg{
+    position: absolute;
+    left: 50%;
+    width: 15vw;
+    transform: translate(-50%,calc(-50% - 10vw));
+    border: 5PX solid #e9e9e9;
+    border-radius: 100%;
+  }
+  .bottomImg{
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 25vw;
+    transform: translate(-50%,-50%);
+  }
   }
   .titBox{
     display: flex;
@@ -264,5 +442,5 @@
   /deep/ .van-cell--required::before{
     left: 85PX;
   }
-}
+  }
 </style>
diff --git a/src/views/sunVillage_info/list_employer_process.vue b/src/views/sunVillage_info/list_employer_process.vue
index 3dd683a9..8a03f841 100644
--- a/src/views/sunVillage_info/list_employer_process.vue
+++ b/src/views/sunVillage_info/list_employer_process.vue
@@ -9,22 +9,30 @@
           <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
           <p class="tit">信息核对</p>
         </div>
-        <van-field readonly v-model="value" label="编码" placeholder="编码" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="名称" placeholder="名称" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="负责人" placeholder="负责人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="证件类型" placeholder="证件类型" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="调查员" placeholder="调查员" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="调查日期" placeholder="调查日期" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="调查签字" placeholder="调查签字" input-align="right" :border="false" />
+        <van-field readonly v-model="form.fbfbm" label="编码" placeholder="编码" input-align="right" :border="false" />
+        <van-field readonly v-model="form.fbfdcy" label="名称" placeholder="名称" input-align="right" :border="false" />
+        <van-field readonly v-model="form.fbffzrxm" label="负责人" placeholder="负责人" input-align="right" :border="false" />
+        <van-field readonly v-model="form.fzrzjlx" label="证件类型" placeholder="证件类型" input-align="right" :border="false" />
+        <van-field readonly v-model="form.fzrzjhm" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
+        <van-field readonly v-model="form.fbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
+        <van-field readonly v-model="form.fbfdcy" label="调查员" placeholder="调查员" input-align="right" :border="false" />
+        <van-field readonly v-model="form.fbfdcrq" label="调查日期" placeholder="调查日期" input-align="right" :border="false" />
+        <van-cell title="调查签名" >
+        <van-field style="padding: 0 0;" readonly label="调查签名" input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.fbfdcqz" width="10%" alt="" v-if="form.fbfdcqz" >
+          </template>
+        </van-field>
+        </van-cell>
+<!--        <van-col :span="12">  <van-field readonly label="调查签名" input-align="right" :border="false" /></van-col>-->
+<!--        <van-col :span="12"><img :src="'/api'+form.fbfdcqz" width="100%" alt="" v-if="form.fbfdcqz" ></van-col>-->
 
       </div>
 
-      <div class="subForm">
+      <div class="subForm"  v-if="!showShenHe">
         <img src="../../assets/images/sunVillage_info/list_employer_process_icon_01.png" alt="">
         <van-field
-          v-model="value"
+          v-model="form.shyj"
           rows="3"
           autosize
           required
@@ -34,39 +42,174 @@
         />
       </div>
 
-      <div class="subForm2">
+      <div class="subForm2" v-if="showShenHe">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
-        <van-field readonly v-model="value" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="审核人" placeholder="审核人" input-align="right" :border="false" />
-        <van-field readonly v-model="value" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
+        <van-field readonly v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
+        <van-cell title="审核人" style="border: none;height: 40px;" >
+          <van-field readonly style="padding: 0 0;" label="审核人" input-align="right" :border="false" >
+            <template #label>
+              <img :src="'/api'+form.shrqz" width="10%" alt="" v-if="form.shrqz" >
+            </template>
+          </van-field>
+        </van-cell>
+        <van-field readonly v-model="form.shrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
 
         <img class="bottomImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_04.png" alt="">
       </div>
-      <div style="margin: 30px auto 0;width: 50%;">
-        <van-button round block type="primary" native-type="submit">
+      <div style="margin: 30px auto 0;width: 50%;" v-if="showShqz && !showShenHe">
+        <van-button round block type="primary" native-type="submit" @click="onSign()">
           审核签字
         </van-button>
       </div>
-
+      <van-popup v-model="showesign" closeable position="right" :style="{ height: '100%' }"
+                 close-icon="close">
+        <van-row style="margin:0 10%">
+          <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
+        </van-row>
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+            v-if="!signature.resultImg"
+          />
+        </div>
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
+             style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
+        <div class="signature-footer"  v-if="!signature.resultImg">
+          <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
+          <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
+          </van-row>
+        </div>
+      </van-popup>
     </div>
 </template>
 
 <script>
-  import { financePublicDetail , openAdd } from "@/api/sunVillage_info/fixedAssets";
+  import { getSysFfb,auditSign} from "@/api/sunVillage_info/sysFbf";
+  import  { commonUpload } from "@/api/homestead/index";
+  import $ from "jquery";
   import Cookies from "js-cookie";
   import request from '@/utils/request'
   export default {
     name: "certificateList",
     data() {
       return {
-        value:''
+        value:'',
+        showesign:false,
+        showShenHe:false,
+        showShqz:true,
+        height:0,
+        form:{},
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
       };
     },
     created() {
-
+      this.getSysFfb();
+      this.height = window.screen.height * 1.28 - 20;
     },
     methods: {
+        getSysFfb(){
+          getSysFfb().then(response => {
+            if(response.data.length > 0){
+              this.form = response.data[0];
+              if(this.form.shrqz != null){
+                this.showShenHe = true;
+              }
+              console.info(this.form);
+            }
+
+          });
+        },
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      onSign(){
+        this.showesign = true;
+      },
+      // 清空画板
+      handleReset() {
+        this.resultImg = null
+        if(this.$refs.esign){
+          this.$refs.esign.reset();
+        }
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图
+      handleGenerate() {
+        console.info( this.$refs.esign
+          .generate() );
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            console.info(res)
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData();
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('id', this.form.id)
+            param.append('shyj', this.form.shyj)
+            this.$toast.loading({
+              message: "数据处理中",
+              forbidClick: true,
+              duration: 40000,
+            });
+            auditSign(param).then((r1) => {
+              this.$toast.clear();
+              // this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
+              this.$notify({type: 'success', message: '签字成功'});
+              this.showShqz = false;
+              this.showesign = false;
+              this.getSysFfb();
+              // this.mainImgArr.push(r1.fileName)
+            })
+            // let param = new FormData()  // 创建form对象
+            // param.append('file', wj)  // 通过append向form对象添加数据
+            // param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+            // zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
+            //   this.$notify({type: 'success', message: '签字成功'});
+            //   this.showesign = false;
+            //   getZjdzd(this.zjdzdxx.id).then((response) => {
+            //     localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
+            //     location.reload();
+            //   });
+
 
+            // });
+
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob (dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
     },
   }
 </script>
@@ -77,6 +220,28 @@
     background-size: 100% 100%;
     border: none;
   }
+
+  .van-cell::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 0.426667rem;
+    bottom: 0;
+    left: 0.426667rem;
+    border:none;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+  }
+
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0px;
+
+  }
 .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;
diff --git a/src/views/sunVillage_info/list_signature_pdf.vue b/src/views/sunVillage_info/list_signature_pdf.vue
index ca71f427..2e69414a 100644
--- a/src/views/sunVillage_info/list_signature_pdf.vue
+++ b/src/views/sunVillage_info/list_signature_pdf.vue
@@ -45,7 +45,6 @@
         this.$toast.loading({
           message: "正在加载文件",
           forbidClick: true,
-          duration: 20000,
         });
         loadingTask.promise.then(pdf => {
           this.numPages = pdf.numPages

From ceafc4dee98af910e7dc06d204aeb67ac16c576e Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 23 Aug 2023 13:21:44 +0800
Subject: [PATCH 17/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_contractor_process.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sunVillage_info/list_contractor_process.vue b/src/views/sunVillage_info/list_contractor_process.vue
index 6fac2c86..3cef5f1c 100644
--- a/src/views/sunVillage_info/list_contractor_process.vue
+++ b/src/views/sunVillage_info/list_contractor_process.vue
@@ -17,7 +17,7 @@
             <p class="block_name">承包方</p>
           </div>
           <div class="information_block">
-            <p class="block_num">{{cbfdkCount}}<span>户</span></p>
+            <p class="block_num">{{cbfdkCount}}<span>亩</span></p>
             <p class="block_name">承包地</p>
           </div>
           <div class="information_block">

From 000fed4f25074202eafbdc8dc4ebf961955da90d Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 23 Aug 2023 15:32:47 +0800
Subject: [PATCH 18/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E3=80=81?=
 =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E5=AE=A1=E6=A0=B8=E7=AD=BE=E5=AD=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/sysCbf.js               |  8 ++++++++
 .../sunVillage_info/list_chronicles_process.vue | 17 ++++++++++++-----
 .../sunVillage_info/list_contractor_process.vue | 17 ++++++++++++-----
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/api/sunVillage_info/sysCbf.js b/src/api/sunVillage_info/sysCbf.js
index 2e89b41c..0237f578 100644
--- a/src/api/sunVillage_info/sysCbf.js
+++ b/src/api/sunVillage_info/sysCbf.js
@@ -16,6 +16,14 @@ export function getCbdkms(data){
     params:data
   })
 }
+//查询承包方调查
+export function getCbfdcList(data){
+  return request({
+    url:'/service/cbfdc/list',
+    method:'get',
+    params:data
+  })
+}
 
 //修改
 export function updateSysCfb(data){
diff --git a/src/views/sunVillage_info/list_chronicles_process.vue b/src/views/sunVillage_info/list_chronicles_process.vue
index f8ad8471..7aa5c815 100644
--- a/src/views/sunVillage_info/list_chronicles_process.vue
+++ b/src/views/sunVillage_info/list_chronicles_process.vue
@@ -92,7 +92,7 @@
 </template>
 
 <script>
-  import { getList,getCbdkms,updateSysCfb,updateBatchSign} from "@/api/sunVillage_info/sysCbf";
+  import { getList,getCbfdcList,getCbdkms,updateSysCfb,updateBatchSign} from "@/api/sunVillage_info/sysCbf";
   import $ from "jquery";
   export default {
     name: "certificateList",
@@ -116,6 +116,7 @@
       };
     },
     created() {
+      this.getCbfdc();
       this.getCbfCount();
       this.getCbfdkCount();
       this.height = window.screen.height * 1.28 - 20;
@@ -124,9 +125,15 @@
       getCbfCount(){
         getList({}).then(res=>{
           this.cbfCount = res.total;
-          this.form = res.rows[0];
-          if(this.form.gsjsrqz != null){
-            this.showJsxx = true;
+        });
+      },
+      getCbfdc(){
+        getCbfdcList({}).then(res=>{
+          if(res.total > 0){
+            this.form = res.rows[0];
+            if(this.form.gsjsrqz != null){
+              this.showJsxx = true;
+            }
           }
         });
       },
@@ -168,7 +175,7 @@
             });
             updateBatchSign(param,this.form.gsjs).then((res) => {
               this.$toast.clear();
-              this.getCbfCount();
+              this.getCbfdc();
               this.$notify({type: 'success', message: '签字成功'});
 
               })
diff --git a/src/views/sunVillage_info/list_contractor_process.vue b/src/views/sunVillage_info/list_contractor_process.vue
index 3cef5f1c..0d3dd882 100644
--- a/src/views/sunVillage_info/list_contractor_process.vue
+++ b/src/views/sunVillage_info/list_contractor_process.vue
@@ -114,7 +114,7 @@
 </template>
 
 <script>
-  import { getList,getCbdkms,updateSysCfb,examineBatchSign} from "@/api/sunVillage_info/sysCbf";
+  import { getList,getCbdkms,getCbfdcList,updateSysCfb,examineBatchSign} from "@/api/sunVillage_info/sysCbf";
   import $ from "jquery";
   export default {
     name: "certificateList",
@@ -138,6 +138,7 @@
       };
     },
     created() {
+      this.getCbfdc();
       this.getCbfCount();
       this.getCbfdkCount();
       this.getCbfGsqzCount();
@@ -147,9 +148,15 @@
       getCbfCount(){
         getList({}).then(res=>{
           this.cbfCount = res.total;
-          this.form = res.rows[0];
-          if(this.form.gsshqz != null){
-            this.showForm2 = true;
+        });
+      },
+      getCbfdc(){
+        getCbfdcList({}).then(res=>{
+          if(res.total > 0){
+            this.form = res.rows[0];
+            if(this.form.gsshqz != null){
+              this.showForm2 = true;
+            }
           }
         });
       },
@@ -194,7 +201,7 @@
             });
             examineBatchSign(param,this.form.gsshyj).then((res) => {
               this.$toast.clear();
-              this.getCbfCount();
+              this.getCbfdc();
               this.$notify({type: 'success', message: '签字成功'});
 
             })

From fccbea388b0748fe85b05f2569793198efea71b3 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Wed, 23 Aug 2023 15:47:07 +0800
Subject: [PATCH 19/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=97=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/config.js                 |   8 +
 src/views/contracted/village/map/map.vue | 584 ++++++++++++++++++++++-
 2 files changed, 575 insertions(+), 17 deletions(-)

diff --git a/src/api/system/config.js b/src/api/system/config.js
index 87f0d628..e785df14 100644
--- a/src/api/system/config.js
+++ b/src/api/system/config.js
@@ -15,3 +15,11 @@ export function getSystemAttachmentUrl() {
     method: 'get'
   })
 }
+
+// 根据参数键名查询参数值
+export function getConfigKey(configKey) {
+  return request({
+    url: '/open/typz/configKey/' + configKey,
+    method: 'get'
+  })
+}
diff --git a/src/views/contracted/village/map/map.vue b/src/views/contracted/village/map/map.vue
index 7890df5b..f0e47b7a 100644
--- a/src/views/contracted/village/map/map.vue
+++ b/src/views/contracted/village/map/map.vue
@@ -13,6 +13,7 @@
     </div>
 
     <div style="position:relative;">
+      <div class="mapBox" id="landMapBox"></div>
       <div class="legend_main">
         <div class="legend">
           <p class="legend_tt">图例
@@ -24,33 +25,560 @@
           <div><i></i><p>开荒地</p></div>
           <div><i></i><p>其他地</p></div>
         </div>
-        <div class="legend_second">
-          <p class="legend_tt">
+        <div class="legend_second" >
+          <p class="legend_tt" id="drawLandPolygon">
             <img src="../../../../../static/images/contracted/map_icon_02.png" alt="">画图
           </p>
         </div>
       </div>
-      <div class="mapBox"></div>
+    </div>
+
+    <div class="landPopup">
+      <van-dialog v-model="open" :title="title" :show-confirm-button="false" :show-cancel-button="false">
+        <van-form ref="landForm">
+          <van-field v-model="form.dkbm" label="地块代码：" placeholder="请输入地块代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" > <!-- :disabled="isDisabled" -->
+            <template #button v-if="!isDisabled">
+              <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
+            </template>
+          </van-field>
+          <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" />
+          <van-field v-model="syqxzText" label="所有权性质："
+                     placeholder="请选择所有权性质"
+                     required
+                     :rules="[{ required: true }]"
+                     :border="false"
+                     input-align="right"
+                     right-icon="arrow-down"
+                     readonly
+                     clickable
+                     @click="showOwnership = true"
+          />
+          <van-popup v-model="showOwnership" position="bottom" get-container=".app-container">
+            <van-picker
+              show-toolbar
+              :columns="syqxzOptions"
+              value-key="dictLabel"
+              @confirm="onConfirmOwnershipOptions"
+              @cancel="showOwnership = false"
+            />
+          </van-popup>
+          <van-field v-model="dklbText" label="地块类别："
+                     placeholder="请选择地块类别"
+                     required
+                     :rules="[{ required: true }]"
+                     :border="false"
+                     input-align="right"
+                     right-icon="arrow-down"
+                     readonly
+                     clickable
+                     @click="showLandCategory = true"
+          />
+          <van-popup v-model="showLandCategory" position="bottom" get-container=".app-container">
+            <van-picker
+              show-toolbar
+              :columns="dklbOptions"
+              value-key="dictLabel"
+              @confirm="onConfirmLandCategoryOptions"
+              @cancel="showLandCategory = false"
+            />
+          </van-popup>
+          <van-field v-model="tdlylxText" label="土地利用类型："
+                     placeholder="请选择土地利用类型"
+                     required
+                     :rules="[{ required: true }]"
+                     :border="false"
+                     input-align="right"
+                     right-icon="arrow-down"
+                     readonly
+                     clickable
+                     @click="showLandType = true"
+          />
+          <van-popup v-model="showLandType" position="bottom" get-container=".app-container">
+            <van-picker
+              show-toolbar
+              :columns="tdlylxOptions"
+              value-key="dictLabel"
+              @confirm="onConfirmLandTypeOptions"
+              @cancel="showLandType = false"
+            />
+          </van-popup>
+          <van-field v-model="dldjText" label="地力等级："
+                     placeholder="请选择地力等级"
+                     required
+                     :rules="[{ required: true }]"
+                     :border="false"
+                     input-align="right"
+                     right-icon="arrow-down"
+                     readonly
+                     clickable
+                     @click="showLandGrade = true"
+          />
+          <van-popup v-model="showLandGrade" position="bottom" get-container=".app-container">
+            <van-picker
+              show-toolbar
+              :columns="dldjOptions"
+              value-key="dictLabel"
+              @confirm="onConfirmLandGradeOptions"
+              @cancel="showLandGrade = false"
+            />
+          </van-popup>
+          <van-field v-model="tdytText" label="土地用途："
+                     placeholder="请选择土地用途"
+                     required
+                     :rules="[{ required: true }]"
+                     :border="false"
+                     input-align="right"
+                     right-icon="arrow-down"
+                     readonly
+                     clickable
+                     @click="showLandPurpose = true"
+          />
+          <van-popup v-model="showLandPurpose" position="bottom" get-container=".app-container">
+            <van-picker
+              show-toolbar
+              :columns="tdytOptions"
+              value-key="dictLabel"
+              @confirm="onConfirmLandPurposeOptions"
+              @cancel="showLandPurpose = false"
+            />
+          </van-popup>
+          <van-field v-model="form.sfjbnt" label="基本农田：" required :rules="[{ required: true }]" :border="false" input-align="right" >
+            <template #input>
+              <van-radio-group v-model="form.sfjbnt" direction="horizontal">
+                <!-- <van-radio name="1">是</van-radio>
+                <van-radio name="2">否</van-radio> -->
+                <van-radio v-for="dict in sfjbntOptions" :ke="dict.dictValue" :name="dict.dictValue">{{ dict.dictLabel }}</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field v-model="form.scmjm" type="number" label="实测面积(亩)：" placeholder="请输入实测面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="right" />
+          <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" />
+          <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+          <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+          <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+          <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" />
+          <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" :border="false" input-align="right" />
+        </van-form>
+        <div class="footer_main">
+          <van-button type="default" hairline size="large" @click="closePopup">关闭弹窗</van-button>
+          <van-button type="danger" hairline size="large" @click="deleteLand(form.id)" v-if="showDeleteBtn">删除地块</van-button>
+          <van-button type="info" hairline size="large" @click="saveLand" v-if="showSaveBtn">保存信息</van-button>
+        </div>
+    </van-dialog>
     </div>
 
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
+  import { getConfigKey } from "@/api/system/config";
+  import { getDept } from "@/api/contracted";
+  import { getDk, addDk, updateDk, deleteDk, generateLandCode } from "@/api/contracted/dk";
+  import $ from "jquery";
+
   export default {
     name: "contractedVillageContractor",
     data() {
       return {
-        loading:false,
-        finished:true,
-        value:''
+        form: {},                         // 地块信息表单参数
+        map: "",                          // 地图
+        mapGeoServerUrl: "",              // geoserver地址
+        mapCenterLocation: [],            // 地图中心坐标
+        landLayerName: "",                // 地块图层名称
+        landLayer: "",                    // 地块图层
+        mapBorder: "",                    // 地图边界
+        villageBorderLayerName: "",       // 乡镇边界图层名称
+        vectorLayer: "",                  // 绘制的矢量图层
+
+        title: "",                        // 弹出层标题
+        open: false,                      // 是否显示地块弹出层
+        syqxzOptions: [],                 // 所有权性质字典
+        syqxzText: null,                  // 所有权性质标签名
+        showOwnership: false,             // 控制所有权性质字典弹出层的显示和隐藏
+        dklbOptions: [],                  // 地块类别字典
+        dklbText: null,                   // 地块类别标签名
+        showLandCategory: false,          // 控制的地块类别字典弹出层的显示和隐藏
+        dldjOptions: [],                  // 地力等级字典
+        dldjText: null,                   // 地力等级标签名
+        showLandGrade: false,             // 控制地力等级字典弹出层的显示和隐藏
+        tdytOptions: [],                  // 土地用途字典
+        tdytText: null,                   // 土地用途标签名
+        showLandPurpose: false,           // 控制土地用途字典弹出层的显示和隐藏
+        tdlylxOptions: [],                // 土地利用类型
+        tdlylxText: null,                 // 土地利用类型标签名
+        showLandType: false,              // 控制土地利用类型字典弹出层的显示和隐藏
+        sfjbntOptions: [],                // 是否基本农田字典
+        showSaveBtn: false,               // 控制保存按钮的显示隐藏
+        showDeleteBtn: false,             // 控制删除按钮的显示隐藏
+        isDisabled: false,                // 是否禁用
       };
     },
     created() {
-
+      this.getDicts("land_ownership").then(response => {
+        this.syqxzOptions = response.data;
+      });
+      this.getDicts("land_type").then(response => {
+        this.dklbOptions = response.data;
+      });
+      this.getDicts("land_grade").then(response => {
+        this.dldjOptions = response.data;
+      });
+      this.getDicts("use_code").then(response => {
+        this.tdytOptions = response.data;
+      });
+      this.getDicts("land_use").then(response => {
+        this.tdlylxOptions = response.data;
+      });
+      this.getDicts("is_common").then(response => {
+        this.sfjbntOptions = response.data;
+      });
+      // 获取geoserver的地址
+      this.getGeoServerUrl();
+      // 获取地块图层名称
+      this.getLandLayerName();
+      // 获取村边界的图层名称
+      this.getVillageBorderLayerName();
+    },
+    mounted() {
+      // 初始化地图
+      setTimeout(() => {
+        this.initMap();
+      }, 500);
     },
     methods: {
+      // 获取geoserver的地址
+      getGeoServerUrl() {
+        getConfigKey("system.geoServer.url").then(response => {
+          this.mapGeoServerUrl = response.msg;
+        });
+      },
+      // 获取地块图层名称
+      getLandLayerName() {
+        getConfigKey("geoserver.layer.landCategory").then(response => {
+          this.landLayerName = response.msg;
+        });
+      },
+      // 获取村边界的图层名称
+      getVillageBorderLayerName() {
+        getConfigKey("geoserver.layer.villageBorder").then(response => {
+          this.villageBorderLayerName = response.msg;
+        });
+      },
+      // 初始化地图
+      initMap() {
+        getDept(this.$route.query.deptId).then(response => {
+          let dept = response.data;
+          if (dept.lng && dept.lat) {
+            this.mapCenterLocation = [dept.lng, dept.lat];
+          } else {
+            this.mapCenterLocation = [116.391458, 39.902377];
+          }
+          document.getElementById("landMapBox").innerHTML = "";
+          // 定义地图投影
+          let projection = new ol.proj.Projection({
+            code: "EPSG:3857",
+            units: "degrees",
+          });
+          // 定义地图图层
+          let aerial = new ol.layer.Tile({
+            source: new ol.source.XYZ({
+              url: "http://t{0-7}.tianditu.com/img_w/wmts?" +
+                "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+                "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
+            }),
+            isGroup: true,
+            name: "卫星影像图",
+          });
+          let yingxzi = new ol.layer.Tile({
+            source: new ol.source.XYZ({
+              url: "http://t{0-7}.tianditu.com/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
+            }),
+            isGroup: true,
+            name: "天地图文字标注--卫星影像图",
+          });
+          //加载地图
+          this.map = new ol.Map({
+            controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]),
+            layers: [aerial, yingxzi],
+            projection: projection,
+            target: "landMapBox",
+            view: new ol.View({
+              center: ol.proj.fromLonLat(this.mapCenterLocation), // 地图中心坐标
+              zoom: 15.5,
+              minZoom: 1, //地图缩小限制
+              maxZoom: 18, //地图放大限制
+              // extent: [13481224.75161,5667110.83528,13811063.06278,5880284.11416]
+            }),
+          });
+          // // 添加村边界
+          this.addVillageBorder();
+          // 添加地块图层
+          this.addLandLayer();
+          // 绘制地块
+          $("#drawLandPolygon").click(() => {
+            // 创建矢量数据源
+            let vectorSource = new ol.source.Vector({
+              wrapX: false,
+            });
+            // 创建矢量图层
+            this.vectorLayer = new ol.layer.Vector({
+              source: vectorSource,
+            });
+            // 添加图层
+            this.map.addLayer(this.vectorLayer);
+            // 地图交互-绘制图形
+            let drawInteraction = new ol.interaction.Draw({
+              source: vectorSource,
+              type: "Polygon",
+            });
+            // 添加交互
+            this.map.addInteraction(drawInteraction);
+            drawInteraction.on('drawend', (evt) => {
+              // 移除交互
+              this.map.removeInteraction(drawInteraction);
+              let coordinates = evt.feature.getGeometry().getCoordinates();
+              this.reset();
+              this.form.theGeom = JSON.stringify(coordinates);
+              this.title = "添加地块信息";
+              this.showSaveBtn = true;
+              this.showDeleteBtn = false;
+              this.isDisabled = false;
+              setTimeout(() => {
+                this.open = true;
+              }, 10);
 
+            });
+          });
+          // 地图点击事件
+          this.map.on("click", (evt) => {
+            // 点击宅基地查看详情
+            if (this.landLayer) {
+              const viewResolution = this.map.getView().getResolution();
+              const url = this.landLayer.getSource()
+                .getFeatureInfoUrl(evt.coordinate, viewResolution, 'EPSG:3857', {'INFO_FORMAT': 'application/json'});
+              if (url) {
+                fetch(url)
+                  .then(response => response.json())
+                  .then(data => {
+                    if (data.features.length > 0) {
+                      let id = data.features[0].id.split(".")[1];
+                      getDk(id).then(response => {
+                        const data = response.data;
+                        this.reset();
+                        this.form = data;
+                        this.syqxzText = this.selectDictLabel(this.syqxzOptions, data.syqxz);
+                        this.dklbText = this.selectDictLabel(this.dklbOptions, data.dklb);
+                        this.dldjText = this.selectDictLabel(this.dldjOptions, data.dldj);
+                        this.tdytText = this.selectDictLabel(this.tdytOptions, data.tdyt);
+                        this.tdlylxText = this.selectDictLabel(this.tdlylxOptions, data.tdlylx);
+                        this.title = "查看地块信息";
+                        this.showSaveBtn = false;
+                        this.showDeleteBtn = true;
+                        this.isDisabled = true;
+                        setTimeout(() => {
+                          this.open = true;
+                        }, 10);
+                      });
+
+                      /* if (this.selectedHomesteadLayer) {
+                        this.map.removeLayer(this.selectedHomesteadLayer);
+                        this.selectedHomesteadLayer = "";
+                      }
+                      this.selectedHomesteadLayer = new ol.layer.Vector({
+                        source: new ol.source.Vector({
+                          features: new ol.format.GeoJSON().readFeatures(data)
+                        }),
+                        name: 'selectedHomesteadLayer',
+                        style: new ol.style.Style({
+                          fill: new ol.style.Fill({
+                            //矢量图层填充颜色，以及透明度
+                            color: "rgba(255, 84, 87, 0.3)",
+                          }),
+                          stroke: new ol.style.Stroke({
+                            //边界样式
+                            color: "#ff5457",
+                            width: 3,
+                          }),
+                        })
+                      });
+                      // this.map.addLayer(this.selectedHomesteadLayer);
+                      this.map.getLayers().insertAt(4, this.selectedHomesteadLayer);*/
+                    }
+                  });
+              }
+            }
+          });
+        });
+      },
+      // 添加地块图层
+      addLandLayer() {
+        this.landLayer = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: this.mapGeoServerUrl + '/wms',
+            params: {
+              LAYERS: this.landLayerName,
+              cql_filter: "dept_id = '" + this.$route.query.deptId + "'",
+              SRID: 3857,
+              abc: Math.random()        // 无效参数，保证每次发送的请求都不一样
+            }
+          }),
+          name: 'landLayer'
+        });
+        this.map.getLayers().insertAt(3, this.landLayer);
+        // this.map.addLayer(this.landLayer);
+      },
+      // 添加村边界
+      addVillageBorder() {
+        this.mapBorder = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: this.mapGeoServerUrl + '/wms',
+            params: {
+              LAYERS: this.villageBorderLayerName,
+              cql_filter: "dept_id = '" + this.$route.query.deptId + "'",
+              SRID: 3857,
+            },
+          }),
+          name: 'villageBorderLayer'
+        });
+        this.map.getLayers().insertAt(2, this.mapBorder);
+      },
+      saveLand() {
+        this.$refs.landForm.validate().then(() => {
+          if (this.form.id) {
+            this.showSaveBtn = false;
+            updateDk(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.open = false;
+                    this.showSaveBtn = true;
+                  }
+                });
+              }
+            });
+          } else {
+            this.form.deptId = this.$route.query.deptId;
+            this.showSaveBtn = false;
+            addDk(this.form).then(response => {
+              if (response.code == 200) {
+                this.$toast({
+                  icon: 'success',
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose: () => {
+                    this.open = false;
+                    this.showSaveBtn = true;
+                    // 移除矢量图层
+                    this.map.removeLayer(this.vectorLayer);
+                    this.vectorLayer = "";
+                    // 移除地块图层重新加载
+                    this.map.removeLayer(this.landLayer);
+                    this.landLayer = "";
+                    this.addLandLayer();
+                  }
+                });
+              }
+            });
+          }
+        }).catch(() => {
+          this.$notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
+      },
+      deleteLand(id) {
+        this.$dialog.confirm({
+          message: '是否确认删除此地块？',
+        }).then(() => {
+          // on confirm
+          this.showDeleteBtn = false;
+          deleteDk(id).then(res => {
+            if (res.code == 200) {
+              this.$toast({
+                icon: 'success',
+                message: '删除成功',
+                duration: "1000",
+                onClose: () => {
+                  this.open = false;
+                  this.showDeleteBtn = true;
+                  // 移除地块图层重新加载
+                  this.map.removeLayer(this.landLayer);
+                  this.landLayer = "";
+                  this.addLandLayer();
+                }
+              });
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      },
+      onConfirmOwnershipOptions(value){
+        this.form.syqxz = value.dictValue;
+        this.syqxzText = value.dictLabel;
+        this.showOwnership = false;
+      },
+      onConfirmLandCategoryOptions(value){
+        this.form.dklb = value.dictValue;
+        this.dklbText = value.dictLabel;
+        this.showLandCategory = false;
+      },
+      onConfirmLandTypeOptions(value) {
+        this.form.tdlylx = value.dictValue;
+        this.tdlylxText = value.dictLabel;
+        this.showLandType = false;
+      },
+      onConfirmLandGradeOptions(value) {
+        this.form.dldj = value.dictValue
+        this.dldjText = value.dictLabel;
+        this.showLandGrade = false;
+      },
+      onConfirmLandPurposeOptions(value){
+        this.form.tdyt = value.dictValue;
+        this.tdytText = value.dictLabel;
+        this.showLandPurpose = false;
+      },
+      generateCode() {
+        generateLandCode({deptId: this.$route.query.deptId}).then(response => {
+          this.$set(this.form, 'dkbm', response.data);
+        });
+      },
+      closePopup() {
+        // 移除矢量图层
+        if (this.vectorLayer) {
+          this.map.removeLayer(this.vectorLayer);
+          this.vectorLayer = "";
+        }
+        this.open = false;
+        this.reset();
+      },
+      reset() {
+        this.form = {
+          deptId: null,
+          dkbm: null,
+          dkmc: null,
+          syqxz: null,
+          dklb: null,
+          tdlylx: null,
+          dldj: null,
+          tdyt: null,
+          sfjbnt: '1',
+          scmjm: null,
+          zjrxm: null,
+          dkdz: null,
+          dkxz: null,
+          dknz: null,
+          dkbz: null,
+          dkbzxx: null,
+          theGeom: null
+        };
+        this.syqxzText = null;
+        this.dklbText = null;
+        this.dldjText = null;
+        this.tdytText = null;
+        this.tdlylxText = null;
+      },
     },
   };
 </script>
@@ -74,6 +602,20 @@
     border: none;
   }
 
+  /deep/ .van-field--disabled .van-field__label {
+    color: #646566;
+  }
+
+  /deep/ .landPopup .van-dialog {
+    width: 90%;
+    height: 85%;
+    overflow-y: auto;
+  }
+
+  /deep/ .landPopup .van-field__label {
+    width: 7em;
+  }
+
   .head{
     padding: 0 4vw;
   }
@@ -140,24 +682,24 @@
         margin-right: 10PX;
       }
       &:nth-child(2) i{
-        background: rgba(12,255,0,.5);
-        border-color: rgba(12,255,0,1);
+        background: rgba(22,233,15,.7);
+        border-color: rgba(22,233,15,1);
       }
       &:nth-child(3) i{
-        background: rgba(255,137,5,.5);
-        border-color: rgba(255,137,5,1);
+        background: rgba(1,198,222,.7);
+        border-color: rgba(1,198,222,1);
       }
       &:nth-child(4) i{
-        background: rgba(246,255,0,.5);
-        border-color: rgba(246,255,0,1);
+        background: rgba(238,238,0,.7);
+        border-color: rgba(238,238,0,1);
       }
       &:nth-child(5) i{
-        background: rgba(168,0,255,.5);
-        border-color: rgba(168,0,255,1);
+        background: rgba(238,60,60,.7);
+        border-color: rgba(238,60,60,1);
       }
       &:nth-child(6) i{
-        background: rgba(0,234,255,.5);
-        border-color: rgba(0,234,255,1);
+        background: rgba(235,134,0,.7);
+        border-color: rgba(235,134,0,1);
       }
     }
   }
@@ -169,4 +711,12 @@
     background-image: linear-gradient(to right,#c6fe8b,#48e5a2);
   }
 
+  .footer_main {
+    flex: 0 0 120px;
+    background: #ccc;
+    display: flex;
+    justify-content: center; /* 相对父元素水平居中 */
+    align-items: center; /*  子元素相对父元素垂直居中 */
+  }
+
 </style>

From c3b48ae1447fb61bf129b57bb1a1bce4c1930755 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Wed, 23 Aug 2023 17:11:39 +0800
Subject: [PATCH 20/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=9C=B0=E5=9D=97=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../village/contractor/contractorLandMap.vue  | 197 +++++++++++++++++-
 1 file changed, 188 insertions(+), 9 deletions(-)

diff --git a/src/views/contracted/village/contractor/contractorLandMap.vue b/src/views/contracted/village/contractor/contractorLandMap.vue
index 82c13c6c..8091086f 100644
--- a/src/views/contracted/village/contractor/contractorLandMap.vue
+++ b/src/views/contracted/village/contractor/contractorLandMap.vue
@@ -4,36 +4,79 @@
     <van-nav-bar left-arrow fixed placeholder @click-left="goBack" >
       <template #title>
         <div class="tb_main">
-<!--          B村<p><span class="tb">签字完成</span><span class="tb">异常挂起</span></p>-->
           地图
         </div>
       </template>
     </van-nav-bar>
 
-    <!-- <div class="tap_block">
-      <p @click="$router.push({path:'/contracted/village/contractorDetail'})">承包方</p>
-      <p @click="$router.push({path:'/contracted/village/contractorFamily'})">家庭成员</p>
-      <p @click="$router.push({path:'/contracted/village/contractorWord'})">承包合同</p>
-      <p class="active">承包地</p>
-    </div> -->
+    <div class="mapBox" id="contractedLandMapBox"></div>
 
-    <div class="mapBox"></div>
+    <div class="contractedLandPopup">
+      <van-dialog v-model="open" title="承包地信息" :show-confirm-button="false" :show-cancel-button="true" cancel-button-text="关闭">
+        <van-form ref="landForm">
+          <van-field v-model="form.dkbm" label="地块代码：" :border="true" input-align="right" />
+          <van-field v-model="form.dkmc" label="地块名称：" :border="true" input-align="right" />
+          <van-field v-model="form.syqxz" label="所有权性质：" :border="true" input-align="right" />
+          <van-field v-model="form.dklb" label="地块类别：" :border="true" input-align="right" />
+          <van-field v-model="form.tdlylx" label="土地利用类型：" :border="true" input-align="right" />
+          <van-field v-model="form.dldj" label="地力等级：" :border="true" input-align="right" />
+          <van-field v-model="form.tdyt" label="土地用途：" :border="true" input-align="right" />
+          <van-field v-model="form.sfjbnt" label="基本农田：" :border="true" input-align="right" />
+          <van-field v-model="form.scmjm" label="实测面积(亩)：" :border="true" input-align="right" />
+          <van-field v-model="form.zjrxm" label="指界人姓名：" :border="true" input-align="right" />
+          <van-field v-model="form.dkdz" label="地块东至：" :border="true" input-align="right" />
+          <van-field v-model="form.dkxz" label="地块西至：" :border="true" input-align="right" />
+          <van-field v-model="form.dknz" label="地块南至：" :border="true" input-align="right" />
+          <van-field v-model="form.dkbz" label="地块北至：" :border="true" input-align="right" />
+          <van-field v-model="form.dkbzxx" label="地块备注信息：" :border="true" input-align="right" />
+        </van-form>
+      </van-dialog>
+    </div>
 
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
+  import { getConfigKey } from "@/api/system/config";
+  import { listCbdkxx } from "@/api/contracted/cbdkxx";
+  import { getDept } from "@/api/contracted";
+
   export default {
     name: "contractedVillageContractor",
     data() {
       return {
+        form: {},                       // 承包地信息表单
+        open: false,                    // 是否显示承包地信息弹出层
 
+        map: "",                        // 地图
+        mapGeoServerUrl: "",            // geoserver地址
+        mapCenterLocation: [],          // 地图中心坐标
+        landLayerName: "",              // 地块图层名称
       };
     },
     created() {
-
+      // 获取geoserver的地址
+      this.getGeoServerUrl();
+      // 获取地块图层名称
+      this.getLandLayerName();
+    },
+    mounted() {
+      // 获取承包地块列表
+      this.getContractedLandList();
     },
     methods: {
+      // 获取geoserver的地址
+      getGeoServerUrl() {
+        getConfigKey("system.geoServer.url").then(response => {
+          this.mapGeoServerUrl = response.msg;
+        });
+      },
+      // 获取地块图层名称
+      getLandLayerName() {
+        getConfigKey("geoserver.layer.dk").then(response => {
+          this.landLayerName = response.msg;
+        });
+      },
       goBack() {
         this.$router.push({
           name: 'contractedVillageContractorLand',
@@ -45,6 +88,133 @@
           }
         });
       },
+      getContractedLandList() {
+        listCbdkxx({cbfbm: this.$route.params.cbfbm, translate_dict: 1}).then(response => {
+          const landList = response.rows;
+          this.map = "";
+          setTimeout(() => {
+            this.drawMap(landList);
+          }, 500);
+        });
+      },
+      drawMap(landList) {
+        getDept(this.$route.params.deptId).then(response => {
+          let dept = response.data;
+          if (dept.lng && dept.lat) {
+            this.mapCenterLocation = [dept.lng, dept.lat];
+          } else {
+            this.mapCenterLocation = [116.391458, 39.902377];
+          }
+
+          document.getElementById("contractedLandMapBox").innerHTML = "";
+          // 定义地图投影
+          let projection = new ol.proj.Projection({
+            code: "EPSG:3857",
+            units: "degrees",
+          });
+          // 定义地图图层
+          let aerial = new ol.layer.Tile({
+            source: new ol.source.XYZ({
+              url: "http://t{0-7}.tianditu.com/img_w/wmts?" +
+                "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+                "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
+            }),
+            isGroup: true,
+            name: "卫星影像图",
+          });
+          let yingxzi = new ol.layer.Tile({
+            source: new ol.source.XYZ({
+              url: "http://t{0-7}.tianditu.com/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
+            }),
+            isGroup: true,
+            name: "天地图文字标注--卫星影像图",
+          });
+          //加载地图
+          this.map = new ol.Map({
+            controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]),
+            layers: [aerial, yingxzi],
+            projection: projection,
+            target: "contractedLandMapBox",
+            view: new ol.View({
+              center: ol.proj.fromLonLat(this.mapCenterLocation), // 地图中心坐标
+              zoom: 17,
+              minZoom: 1, //地图缩小限制
+              maxZoom: 18, //地图放大限制
+              // extent: [13481224.75161,5667110.83528,13811063.06278,5880284.11416]
+            }),
+          });
+          // 添加全部的地块图层
+          this.addLandLayer();
+          // 添加承包地块图层
+          this.addContractedLandLayer(landList);
+
+          // 地图点击事件
+          this.map.on("click", (evt) => {
+            let feature = this.map.forEachFeatureAtPixel(
+              evt.pixel,
+              (feature) => feature
+            );
+            if (feature) {
+              // 镇级：加载村级坐标点
+              if (feature.get('level') === 'contractedLand') {
+                this.form = feature.get('landInfo');
+                this.open = true;
+              }
+            }
+          });
+        });
+      },
+      // 添加全部的地块图层
+      addLandLayer() {
+        const landLayer = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: this.mapGeoServerUrl + '/wms',
+            params: {
+              LAYERS: this.landLayerName,
+              cql_filter: "dept_id = '" + this.$route.params.deptId + "'",
+              SRID: 3857,
+            }
+          }),
+          name: 'landLayer'
+        });
+        this.map.getLayers().insertAt(3, landLayer);
+        // this.map.addLayer(landLayer);
+      },
+      // 添加承包地块图层
+      addContractedLandLayer(landList) {
+        if (landList.length === 0) {
+          return ;
+        }
+        let features = [];
+        landList.forEach(item => {
+          if (item.theGeomJson) {
+            const iconFeature = new ol.Feature({
+              geometry: new ol.geom.MultiPolygon(JSON.parse(item.theGeomJson).coordinates),
+              level: 'contractedLand',
+              landInfo: item
+            });
+            features.push(iconFeature);
+          }
+        });
+        const contractedLandLayer = new ol.layer.Vector({
+          source: new ol.source.Vector({
+            features: features
+          }),
+          name: 'contractedLandLayer',
+          style: new ol.style.Style({
+            fill: new ol.style.Fill({
+              color: "rgba(255, 84, 87, 0.5)"
+            }),
+            stroke: new ol.style.Stroke({
+              color: "#ff5457",
+              width: 3
+            })
+          })
+        });
+        this.map.getLayers().insertAt(4, contractedLandLayer);
+        this.map.getView().fit(contractedLandLayer.getSource().getExtent());
+        // this.map.getView().setZoom(15);
+      }
     },
   };
 </script>
@@ -82,6 +252,15 @@
     overflow: initial;
   }
 
+  /deep/ .contractedLandPopup .van-dialog {
+    height: 85%;
+    overflow-y: auto;
+  }
+
+  /deep/ .contractedLandPopup .van-field__label {
+    width: 7em;
+  }
+
   .tb_main{
     position: relative;
     p{

From 53a78fd760c86cee145dfbe36987ff5eb5794294 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 23 Aug 2023 17:23:34 +0800
Subject: [PATCH 21/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E3=80=81?=
 =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E5=AE=A1=E6=89=B9=E7=AD=BE=E5=AD=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |  8 ++++
 src/views/sunVillage_info/list_cbf.vue        | 42 ++++++++++++++++++-
 .../list_chronicles_process.vue               |  2 +-
 .../list_chronicles_single_process.vue        | 17 +++++---
 .../list_contractor_process.vue               |  6 +--
 .../list_contractor_single_process.vue        | 16 ++++---
 .../sunVillage_info/list_employer_process.vue |  4 +-
 7 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 3ec3a57b..d9f6920b 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -814,6 +814,14 @@ export function cbhtSecondSign(data,id) {
     data: data
   })
 }
+// 承包方公示结果签字
+export function updateGsjgSign(data) {
+  return request({
+    url: '/open/home/mobile/updateGsjgSign',
+    method: 'post',
+    data: data
+  })
+}
 
 // 附件查询
 export function attachmentQuery(query) {
diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue
index ac005a0a..7051547e 100644
--- a/src/views/sunVillage_info/list_cbf.vue
+++ b/src/views/sunVillage_info/list_cbf.vue
@@ -44,6 +44,10 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div> -->
+              <div class="opera_btn" @click="openPopupGsjg(item.cbfbm)">
+                <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="30">
+                <p>公示结果签名</p>
+              </div>
               <div class="opera_btn">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
@@ -73,7 +77,8 @@
         </div>
         <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT" style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
         <div class="signature-footer">
-          <van-button @click="handleGenerate" type="info" size="small">保存签字</van-button>
+          <van-button @click="handleGenerate" v-if="!showGsjgqz" type="info" size="small">保存签字</van-button>
+          <van-button @click="handleGenerateGsjg" v-if="showGsjgqz" type="info" size="small">保存签字</van-button>
           <van-button @click="handleReset" class="clearBtn" type="info" plain  size="small">清空画板</van-button>
         </div>
       </van-cell-group>
@@ -90,7 +95,7 @@
 </template>
 
 <script>
-  import { getCbf, getCbhtList, cbhtSecondSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
+  import { getCbf, getCbhtList, cbhtSecondSign,updateGsjgSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
   import Cookies from "js-cookie";
@@ -107,6 +112,7 @@
         showFile: false,
         fileList: [],
         listLength: '0',
+        cbfbm:"",
         queryParams: {
           pageNum: 1,
           pageSize: 10,
@@ -171,11 +177,20 @@
       },
       openPopup(id, url) {
         this.show = true;
+        this.showGsjgqz = false;
         this.signaId = id;
         this.$nextTick(() => {
           this.handleReset();
         });
       },
+      openPopupGsjg(cbfbm, url) {
+        this.show = true;
+        this.showGsjgqz = true;
+        this.cbfbm = cbfbm;
+        this.$nextTick(() => {
+          this.handleReset();
+        });
+      },
       openPopupFile(id){
         this.fileList = [];
         this.signaId = id;
@@ -248,6 +263,29 @@
             this.$toast.fail('请签名后再保存签字');
           });
       },
+      handleGenerateGsjg(){
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData()  // 创建form对象
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('cbfbm', this.cbfbm)
+            updateGsjgSign(param).then(response => {
+              this.$notify({type: 'success', message: '签字成功'});
+              this.show = false;
+              // location.reload();
+              this.applicationList = [];
+              this.getList();
+            });
+
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
       dataURLtoBlob(dataurl, filename = 'file') {
         let arr = dataurl.split(',')
         let mime = arr[0].match(/:(.*?);/)[1]
diff --git a/src/views/sunVillage_info/list_chronicles_process.vue b/src/views/sunVillage_info/list_chronicles_process.vue
index 7aa5c815..9b9ac602 100644
--- a/src/views/sunVillage_info/list_chronicles_process.vue
+++ b/src/views/sunVillage_info/list_chronicles_process.vue
@@ -38,7 +38,7 @@
       <div class="subForm2" v-if="showJsxx">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
         <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
-        <van-cell title="记事人" style="border: none;" >
+        <van-cell title="记事人" style="border: none;color: #646566;" >
           <van-field readonly style="padding: 0 0;height: 30px;" label="记事人" input-align="right" :border="false" >
             <template #label>
               <img  :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
diff --git a/src/views/sunVillage_info/list_chronicles_single_process.vue b/src/views/sunVillage_info/list_chronicles_single_process.vue
index 19411eda..40e0f39e 100644
--- a/src/views/sunVillage_info/list_chronicles_single_process.vue
+++ b/src/views/sunVillage_info/list_chronicles_single_process.vue
@@ -26,7 +26,7 @@
         <van-field readonly v-model="form.cbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
         <van-field readonly v-model="form.gsjs" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
 <!--        <van-field readonly v-model="form.gsjsrqz" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />-->
-        <van-cell title="公示记事人签字" >
+        <van-cell title="公示记事人签字" style="color: #646566;">
           <van-field style="padding: 0 0;height: 30px;" readonly label="公示记事人签字" input-align="right" :border="false" >
             <template #label>
               <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
@@ -35,7 +35,14 @@
         </van-cell>
         <van-field readonly v-model="form.gsjsrq" label="公示记事时间" placeholder="公示记事时间" input-align="right" :border="false" />
         <van-field readonly v-model="form.gsjgyj" label="承包方公示结果意见" placeholder="承包方公示结果意见" input-align="right" :border="false" />
-        <van-field readonly v-model="form.gsjgqz" label="承包方公示结果签字" placeholder="承包方公示结果签字" input-align="right" :border="false" />
+
+        <van-cell title="承包方公示结果签字" style="color: #646566;" >
+          <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="承包方公示结果签字" input-align="right" :border="false" >
+            <template #label>
+              <img :src="'/api'+form.gsjgqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsjgqz" >
+            </template>
+          </van-field>
+        </van-cell>
         <van-field readonly v-model="form.gsjgqzrq" label="承包方公示日期" placeholder="承包方公示日期" input-align="right" :border="false" />
 
       </div>
@@ -55,7 +62,7 @@
         <van-cell title="记事人" style="color: #ffffff;" >
           <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="记事人" input-align="right" :border="false" >
             <template #label>
-              <img :src="'/api'+form.gsjsrqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsjsrqz" >
+              <img :src="'/api'+form.gsjsrqz" style="top:55px;border:none;width: 40%;"  alt="" v-if="form.gsjsrqz" >
             </template>
           </van-field>
         </van-cell>
@@ -66,10 +73,10 @@
       <div class="subForm2" v-if="showForm2">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
         <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
-        <van-cell title="记事人" >
+        <van-cell title="记事人" style="color: #646566;">
           <van-field style="padding: 0 0;height: 30px;" readonly label="记事人" input-align="right" :border="false" >
             <template #label>
-              <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+              <img :src="'/api'+form.gsjsrqz" style="width: 10%;" alt="" v-if="form.gsjsrqz" >
             </template>
           </van-field>
         </van-cell>
diff --git a/src/views/sunVillage_info/list_contractor_process.vue b/src/views/sunVillage_info/list_contractor_process.vue
index 0d3dd882..75966858 100644
--- a/src/views/sunVillage_info/list_contractor_process.vue
+++ b/src/views/sunVillage_info/list_contractor_process.vue
@@ -34,7 +34,7 @@
           <p class="tit">信息核对</p>
         </div>
         <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
-        <van-cell title="记事人" style="border: none;" >
+        <van-cell title="记事人" style="border: none;color: #646566;" >
           <van-field readonly style="padding: 0 0;height: 30px;" label="记事人" input-align="right" :border="false" >
             <template #label>
               <img  :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
@@ -60,10 +60,10 @@
       <div class="subForm2" v-if="showForm2">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
         <van-field readonly v-model="form.gsshyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-        <van-cell title="审核人" style="border: none;" >
+        <van-cell title="审核人" style="border: none;color: #646566;" >
           <van-field readonly style="padding: 0 0;height: 30px;" label="审核人" input-align="right" :border="false" >
             <template #label>
-              <img  :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
+              <img  :src="'/api'+form.gsshqz" style="width: 10%;" alt="" v-if="form.gsshqz" >
             </template>
           </van-field>
         </van-cell>
diff --git a/src/views/sunVillage_info/list_contractor_single_process.vue b/src/views/sunVillage_info/list_contractor_single_process.vue
index effb7141..d05455d3 100644
--- a/src/views/sunVillage_info/list_contractor_single_process.vue
+++ b/src/views/sunVillage_info/list_contractor_single_process.vue
@@ -26,7 +26,7 @@
       <van-field readonly v-model="form.cbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
       <van-field readonly v-model="form.gsjs" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
       <!--        <van-field readonly v-model="form.gsjsrqz" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />-->
-      <van-cell title="公示记事人签字" >
+      <van-cell title="公示记事人签字" style="color: #646566;">
         <van-field style="padding: 0 0;height: 30px;" readonly label="公示记事人签字" input-align="right" :border="false" >
           <template #label>
             <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
@@ -35,7 +35,13 @@
       </van-cell>
       <van-field readonly v-model="form.gsjsrq" label="公示记事时间" placeholder="公示记事时间" input-align="right" :border="false" />
       <van-field readonly v-model="form.gsjgyj" label="承包方公示结果意见" placeholder="承包方公示结果意见" input-align="right" :border="false" />
-      <van-field readonly v-model="form.gsjgqz" label="承包方公示结果签字" placeholder="承包方公示结果签字" input-align="right" :border="false" />
+      <van-cell title="承包方公示结果签字" style="color: #646566;">
+      <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="承包方公示结果签字" input-align="right" :border="false" >
+        <template #label>
+          <img :src="'/api'+form.gsjgqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsjgqz" >
+        </template>
+      </van-field>
+    </van-cell>
       <van-field readonly v-model="form.gsjgqzrq" label="承包方公示日期" placeholder="承包方公示日期" input-align="right" :border="false" />
 
     </div>
@@ -55,7 +61,7 @@
       <van-cell title="审核人" style="color: #ffffff;" >
         <van-field style="padding: 0 0;height: 30px;width: 100%;background-color: #ffffff; border-radius: 5PX;" readonly label="审核人" input-align="right" :border="false" >
           <template #label>
-            <img :src="'/api'+form.gsshqz" style="top:55px;border:none;" width="10%" alt="" v-if="form.gsshqz" >
+            <img :src="'/api'+form.gsshqz" style="top:55px;border:none;width: 80%;" alt="" v-if="form.gsshqz" >
           </template>
         </van-field>
       </van-cell>
@@ -66,10 +72,10 @@
     <div class="subForm2" v-if="showForm2">
       <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
       <van-field readonly v-model="form.gsshyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-      <van-cell title="审核人" >
+      <van-cell title="审核人" style="color: #646566;">
         <van-field style="padding: 0 0;height: 30px;" readonly label="审核人" input-align="right" :border="false" >
           <template #label>
-            <img :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
+            <img :src="'/api'+form.gsshqz" style="width: 20%;" alt="" v-if="form.gsshqz" >
           </template>
         </van-field>
       </van-cell>
diff --git a/src/views/sunVillage_info/list_employer_process.vue b/src/views/sunVillage_info/list_employer_process.vue
index 8a03f841..0f28772c 100644
--- a/src/views/sunVillage_info/list_employer_process.vue
+++ b/src/views/sunVillage_info/list_employer_process.vue
@@ -17,7 +17,7 @@
         <van-field readonly v-model="form.fbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
         <van-field readonly v-model="form.fbfdcy" label="调查员" placeholder="调查员" input-align="right" :border="false" />
         <van-field readonly v-model="form.fbfdcrq" label="调查日期" placeholder="调查日期" input-align="right" :border="false" />
-        <van-cell title="调查签名" >
+        <van-cell title="调查签名" style="color: #646566;">
         <van-field style="padding: 0 0;" readonly label="调查签名" input-align="right" :border="false" >
           <template #label>
             <img :src="'/api'+form.fbfdcqz" width="10%" alt="" v-if="form.fbfdcqz" >
@@ -45,7 +45,7 @@
       <div class="subForm2" v-if="showShenHe">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
         <van-field readonly v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-        <van-cell title="审核人" style="border: none;height: 40px;" >
+        <van-cell title="审核人" style="border: none;height: 40px;color: #646566;" >
           <van-field readonly style="padding: 0 0;" label="审核人" input-align="right" :border="false" >
             <template #label>
               <img :src="'/api'+form.shrqz" width="10%" alt="" v-if="form.shrqz" >

From a45ffd8bcca544ec817b01427c29f1b8a9410b3b Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 24 Aug 2023 10:03:26 +0800
Subject: [PATCH 22/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../village/contractor/contractWord.vue          | 16 +++++++++-------
 .../village/contractor/contractorDetail.vue      |  4 ++--
 .../village/contractor/contractorDetailAdd.vue   |  4 ++--
 .../contractor/contractorFamilyDetail.vue        |  7 ++++---
 .../contracted/village/employer/employer.vue     |  9 +++++----
 .../contracted/village/massif/massifDetail.vue   |  2 +-
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index ae1210c9..8727bb85 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -19,13 +19,13 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" label-width="auto" :disabled="isDisabled">
+        <van-field v-model="form.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" required :rules="[{ required: true }]" :border="false" input-align="left" label-width="auto" :disabled="isDisabled" maxlength="19">
           <template #button v-if="!isDisabled">
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成</van-button>
           </template>
         </van-field>
-        <van-field v-model="form.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="left" />
-        <van-field v-model="form.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="left" maxlength="19" />
+        <van-field v-model="form.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="14" />
         <van-field
           v-model="cbflxText"
           label="承包方类型："
@@ -48,7 +48,7 @@
             @cancel="showType = false"
           />
         </van-popup>
-        <van-field v-model="form.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" />
+        <van-field v-model="form.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" maxlength="18" />
         <van-field v-model="form.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field
           v-model="cbfsText"
@@ -149,7 +149,7 @@
             @cancel="showCbqxz = false"
           />
         </van-popup>
-        <van-field v-model="form.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
+        <van-field v-model="form.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" required :rules="[{ required: true }]" :border="false" input-align="left" type="digit" />
         <van-field v-model="form.htzmjm" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
       </van-form>
       <p class="btn" @click="submitForm">保存</p>
@@ -172,10 +172,10 @@
       return {
         form: {},                 // 承包合同表单信息
         cbfsOptions: [],          // 承包方式字典
-        cbfsText: '家庭承包',           // 承包方式标签名
+        cbfsText: null,           // 承包方式标签名
         showCbfs: false,          // 控制承包方式字典弹出层的显示和隐藏
         cbflxOptions: [],         // 承包方类型字典
-        cbflxText: '农户',          // 承包方类型标签名
+        cbflxText: null,          // 承包方类型标签名
         showType: false,          // 控制承包方类型字典弹出层的显示和隐藏
         showQDSJ: false,          // 控制签订时间弹出层的显示和隐藏
         showCbqxq: false,         // 控制承包起始时间弹出层的显示和隐藏
@@ -292,6 +292,8 @@
           cbdkzs: null,
           htzmjm: null,
         };
+        this.cbfsText = '家庭承包';
+        this.cbflxText = '农户';
       },
       extension() {
         if (this.form.id) {
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index 2d01dac8..268da6e3 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -19,7 +19,7 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left" disabled />
+        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left" disabled maxlength="18" />
         <van-field
           v-model="form.cbflxText"
           label="类型："
@@ -68,7 +68,7 @@
 
         <van-field v-model="form.cbfzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field v-model="form.cbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" />
-        <van-field v-model="form.yzbm" label="邮编：" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.yzbm" label="邮编：" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="6" />
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" />
       </van-form>
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index d8f4ad68..b37953f4 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -11,7 +11,7 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left">
+        <van-field v-model="form.cbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="18">
           <template #button>
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
           </template>
@@ -64,7 +64,7 @@
 
         <van-field v-model="form.cbfzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field v-model="form.cbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" />
-        <van-field v-model="form.yzbm" label="邮编：" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.yzbm" label="邮编：" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="6" />
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" />
       </van-form>
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index 84ae82ba..c0585910 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -100,8 +100,8 @@
           />
         </van-popup>
         <van-field v-model="form.cybzsm" label="备注说明：" placeholder="请输入备注说明" :border="false" input-align="right" />
-        <van-field v-model="form.cycgfs" label="持股份数：" type="number" placeholder="请输入持股份数" :border="false" input-align="right" />
-        <van-field v-model="form.gqzbh" label="股权编号：" placeholder="请输入股权编号" :border="false" input-align="right" />
+        <!-- <van-field v-model="form.cycgfs" label="持股份数：" type="number" placeholder="请输入持股份数" :border="false" input-align="right" />
+        <van-field v-model="form.gqzbh" label="股权编号：" placeholder="请输入股权编号" :border="false" input-align="right" /> -->
       </van-form>
       <p class="btn" @click="submitForm">保存</p>
     </div>
@@ -121,7 +121,7 @@
         form: {},                       // 承包方家庭成员表单信息
         cyxbOptions: [],                // 成员性别字典
         cyzjlxOptions: [],              // 成员证件类型字典
-        cyzjlxText: '居民身份证',        // 成员证件类型标签名
+        cyzjlxText: null,               // 成员证件类型标签名
         showCredentialType: false,      // 控制证件类型字典弹出层的显示和隐藏
         cybzOptions: [],                // 成员备注字典
         cybzText: null,                 // 成员备注标签名
@@ -245,6 +245,7 @@
           cycgfs: null,
           gqzbh: null
         };
+        this.cyzjlxText = '居民身份证';
       }
     },
   };
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index 4eacddbc..d2429816 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -18,7 +18,7 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.fbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled">
+        <van-field v-model="form.fbfbm" label="代码：" placeholder="请输入代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled" maxlength="14">
           <template #button v-if="!isDisabled">
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
           </template>
@@ -49,7 +49,7 @@
         <van-field v-model="form.fzrzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
         <van-field v-model="form.lxdh" label="联系电话：" placeholder="请输入联系电话" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
         <van-field v-model="form.fbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
-        <van-field v-model="form.yzbm" label="邮政编码：" placeholder="请输入邮政编码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.yzbm" label="邮政编码：" placeholder="请输入邮政编码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="6" />
         <van-field v-model="form.fbfdcjs" label="调查记事：" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
         <van-field label="签字图片：" readonly :border="false" label-width="auto" />
         <img :src="'/api'+form.fbfdcqz" width="100%" alt="" />
@@ -185,14 +185,15 @@
           fbfbm: null,
           fbfmc: null,
           fbffzrxm: null,
-          fzrzjlx: null,
+          fzrzjlx: '1',
           fzrzjhm: null,
           lxdh: null,
           fbfdz: null,
           yzbm: null,
           fbfdcjs: null,
           fbfdcqz: null
-        }
+        };
+        this.credentialTypeText = '居民身份证';
       },
       handleSign() {
         this.showSignPopup = true;
diff --git a/src/views/contracted/village/massif/massifDetail.vue b/src/views/contracted/village/massif/massifDetail.vue
index 83596cb8..41682dc6 100644
--- a/src/views/contracted/village/massif/massifDetail.vue
+++ b/src/views/contracted/village/massif/massifDetail.vue
@@ -18,7 +18,7 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.dkbm" label="地块代码：" placeholder="请输入地块代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled">
+        <van-field v-model="form.dkbm" label="地块代码：" placeholder="请输入地块代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" :disabled="isDisabled" maxlength="19">
           <template #button v-if="!$route.query.id">
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
           </template>

From 8545ca0e0506491f32b3379104cdc78da590e849 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 24 Aug 2023 13:18:42 +0800
Subject: [PATCH 23/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contracted/village/contractor/contractWord.vue | 2 +-
 .../contracted/village/contractor/contractorDetail.vue   | 3 ++-
 .../contracted/village/contractor/contractorFamily.vue   | 4 ++--
 .../village/contractor/contractorFamilyDetail.vue        | 2 +-
 .../contracted/village/contractor/contractorHeader.vue   | 9 ++++++++-
 .../contracted/village/contractor/contractorLand.vue     | 4 ++--
 .../village/contractor/contractorLandDetail.vue          | 2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index 8727bb85..0e40143e 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -152,7 +152,7 @@
         <van-field v-model="form.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" required :rules="[{ required: true }]" :border="false" input-align="left" type="digit" />
         <van-field v-model="form.htzmjm" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
       </van-form>
-      <p class="btn" @click="submitForm">保存</p>
+      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
     </div>
 
 
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index 268da6e3..acb07a1e 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -72,7 +72,7 @@
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" />
       </van-form>
-      <p class="btn" @click="submitForm">保存</p>
+      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
     </div>
 
 
@@ -106,6 +106,7 @@
       }
     },
     created() {
+      console.log(this.$route.params);
       this.getDicts("cbf_type").then(response => {
         this.contractorTypeOptions = response.data;
       });
diff --git a/src/views/contracted/village/contractor/contractorFamily.vue b/src/views/contracted/village/contractor/contractorFamily.vue
index d6325f94..22e13cb5 100644
--- a/src/views/contracted/village/contractor/contractorFamily.vue
+++ b/src/views/contracted/village/contractor/contractorFamily.vue
@@ -41,7 +41,7 @@
           </div>
           <p class="item_right">{{ item.sfgyr }}</p>
         </div>
-        <template #right>
+        <template #right v-if="$route.params.surveyStatus!=='3'">
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
             <div class="opera_btn edit" @click="householdDivision(item, index)">
@@ -60,7 +60,7 @@
         </template>
       </van-swipe-cell>
       <!-- getDetail不加(), 第一个参数默认传递的是event，getDetail加(), 需要手动传递$event -->
-      <p class="btn" @click="goDetail()">新增</p>
+      <p class="btn" @click="goDetail()" v-if="$route.params.surveyStatus!=='3'">新增</p>
     </div>
     <van-popup v-model="showContractorPopup" position="bottom">
       <van-picker
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index c0585910..04a34727 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -103,7 +103,7 @@
         <!-- <van-field v-model="form.cycgfs" label="持股份数：" type="number" placeholder="请输入持股份数" :border="false" input-align="right" />
         <van-field v-model="form.gqzbh" label="股权编号：" placeholder="请输入股权编号" :border="false" input-align="right" /> -->
       </van-form>
-      <p class="btn" @click="submitForm">保存</p>
+      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
     </div>
 
 
diff --git a/src/views/contracted/village/contractor/contractorHeader.vue b/src/views/contracted/village/contractor/contractorHeader.vue
index 917bdcc9..9058cc55 100644
--- a/src/views/contracted/village/contractor/contractorHeader.vue
+++ b/src/views/contracted/village/contractor/contractorHeader.vue
@@ -3,7 +3,7 @@
     <van-nav-bar left-arrow fixed placeholder @click-left="goBack">
       <template #title>
         <div class="tb_main">
-          {{ contractorName }}<p><span class="tb" @click="handleSign">签字完成</span><span class="tb" @click="handleHangUp">异常挂起</span></p>
+          {{ contractorName }}<p v-if="showBtn"><span class="tb" @click="handleSign">签字完成</span><span class="tb" @click="handleHangUp">异常挂起</span></p>
         </div>
       </template>
     </van-nav-bar>
@@ -69,10 +69,17 @@
         showRemark: false,
         // 异常备注信息
         remark: null,
+        // 控制签字按钮和挂起按钮的显示和隐藏
+        showBtn: true,
       };
     },
     created() {
       this.height = window.screen.height * 1.28 - 20;
+      if (this.surveyStatus === '3') {
+        this.showBtn = false;
+      } else {
+        this.showBtn = true;
+      }
     },
     methods: {
       goBack() {
diff --git a/src/views/contracted/village/contractor/contractorLand.vue b/src/views/contracted/village/contractor/contractorLand.vue
index 69fc61ea..d8602f8b 100644
--- a/src/views/contracted/village/contractor/contractorLand.vue
+++ b/src/views/contracted/village/contractor/contractorLand.vue
@@ -21,7 +21,7 @@
       <div class="function_btn1" @click="skip('contractedVillageContractorLandMap')">
         <p class="active">进入地图 <span class="sanjiao-right"></span></p>
       </div>
-      <div class="function_btn2" @click="goDetail()">
+      <div class="function_btn2" @click="goDetail()" v-if="$route.params.surveyStatus!=='3'">
         <p class="active"> + 新增</p>
       </div>
     </div>
@@ -49,7 +49,7 @@
             <p>北:{{ item.dkbz }}</p>
           </div>
         </div>
-        <template #right>
+        <template #right v-if="$route.params.surveyStatus!=='3'">
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
             <div class="opera_btn edit" @click="transferLand(item.id)">
diff --git a/src/views/contracted/village/contractor/contractorLandDetail.vue b/src/views/contracted/village/contractor/contractorLandDetail.vue
index 499cb6eb..868f6df9 100644
--- a/src/views/contracted/village/contractor/contractorLandDetail.vue
+++ b/src/views/contracted/village/contractor/contractorLandDetail.vue
@@ -114,7 +114,7 @@
           <common-map ref="contractedLandMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
         </div>
       </van-form>
-      <p class="btn" @click="submitForm">保存</p>
+      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
     </div>
 
 

From ee13301137e118fde9ca61d3b531043390d8f609 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 24 Aug 2023 16:54:48 +0800
Subject: [PATCH 24/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contracted/index.vue                | 12 +++-
 .../village/contractor/contractWord.vue       |  8 ++-
 .../village/contractor/contractor.vue         |  7 ++-
 .../village/contractor/contractorDetail.vue   | 13 ++---
 .../village/contractor/contractorFamily.vue   | 10 ++--
 .../contractor/contractorFamilyDetail.vue     |  4 +-
 .../village/contractor/contractorHeader.vue   |  9 +--
 .../village/contractor/contractorLand.vue     | 10 ++--
 .../contractor/contractorLandDetail.vue       |  4 +-
 .../village/contractor/contractorLandMap.vue  | 56 ++++++++++++++++++-
 .../contracted/village/employer/employer.vue  |  4 +-
 src/views/contracted/village/map/map.vue      |  6 +-
 .../contracted/village/massif/massif.vue      |  7 ++-
 .../village/massif/massifDetail.vue           |  4 +-
 14 files changed, 117 insertions(+), 37 deletions(-)

diff --git a/src/views/contracted/index.vue b/src/views/contracted/index.vue
index 3d530d3b..b5be8bda 100644
--- a/src/views/contracted/index.vue
+++ b/src/views/contracted/index.vue
@@ -55,9 +55,9 @@
               </div>
             </div>
           </div>
-          <template #right>
+          <!-- <template #right>
             <div class="operation">
-              <!-- delete 删除 edit编辑 view查看 list榜单 -->
+              delete 删除 edit编辑 view查看 list榜单
               <div class="opera_btn">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
@@ -75,7 +75,7 @@
                 <p>线下合同</p>
               </div>
             </div>
-          </template>
+          </template> -->
         </van-swipe-cell>
       </van-list>
     </div>
@@ -122,6 +122,12 @@
         });
       },
       goDetail(item){
+        // 调查任务完成状态：已完成标记为1，未完成标记为2
+        let status = '1';
+        if (item.surStatus === 'UNFINISHED') {
+          status = '2';
+        }
+        Cookies.set('taskStatus', status, { expires: 30 });
         this.$router.push({path:'/contracted/village/contractor', query: { deptId: item.deptId, deptName: item.deptName }})
       },
       onSelect(action) {
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index 0e40143e..6dfc7ab9 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -8,7 +8,7 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus" :task-status="taskStatus"></contractor-header>
 
     <div class="tap_block">
       <p @click="skip('contractedVillageContractorDetail')">承包方</p>
@@ -152,7 +152,7 @@
         <van-field v-model="form.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" required :rules="[{ required: true }]" :border="false" input-align="left" type="digit" />
         <van-field v-model="form.htzmjm" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
       </van-form>
-      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
 
 
@@ -182,10 +182,12 @@
         showCbqxz: false,         // 控制承包结束时间弹出层的显示和隐藏
         minDate: new Date(1978, 0, 1),
         maxDate: new Date(2100, 11, 31),
-        isDisabled: false
+        isDisabled: false,
+        taskStatus: null,         // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("jyq_method").then(response => {
         this.cbfsOptions = response.data;
       });
diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue
index c03c9374..f8e2a9ea 100644
--- a/src/views/contracted/village/contractor/contractor.vue
+++ b/src/views/contracted/village/contractor/contractor.vue
@@ -20,7 +20,7 @@
         @search="onSearch"
       ></van-search>
 
-      <div class="search_btn" @click="addContractor">
+      <div class="search_btn" @click="addContractor" v-if="taskStatus === '2'">
         <p class="active"> + 新增</p>
       </div>
 
@@ -61,7 +61,7 @@
               <div class="opera_btn view" v-if="surveyStatus === '2'" @click="handleViewRemark(item.id)">
                 <p>挂起原因</p>
               </div>
-              <div class="opera_btn delete" @click="deleteContractor(item.id, index)">
+              <div class="opera_btn delete" v-if="taskStatus === '2'" @click="deleteContractor(item.id, index)">
                 <p>删除</p>
               </div>
             </div>
@@ -114,9 +114,12 @@
         showRemark: false,
         // 异常备注信息
         remark: null,
+        // 调查任务的完成状态：1表示已完成，2表示未完成
+        taskStatus: null,
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.queryParams.deptId = this.$route.query.deptId;
       this.getDicts("confirmed_survey_status").then(response => {
         this.surveyStatusOptions = response.data;
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index acb07a1e..b8fc2b66 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -8,7 +8,7 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus" :task-status="taskStatus"></contractor-header>
 
     <div class="tap_block">
       <p class="active">承包方</p>
@@ -72,7 +72,7 @@
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" />
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" />
       </van-form>
-      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
 
 
@@ -98,15 +98,12 @@
         contractorTypeOptions: [],
         // 承包方证件类型字典
         credentialTypeOptions: [],
+        // 调查任务的完成状态：1表示已完成，2表示未完成
+        taskStatus: null,
       };
     },
-    watch: {
-      '$route': function() {
-        window.location.reload();
-      }
-    },
     created() {
-      console.log(this.$route.params);
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("cbf_type").then(response => {
         this.contractorTypeOptions = response.data;
       });
diff --git a/src/views/contracted/village/contractor/contractorFamily.vue b/src/views/contracted/village/contractor/contractorFamily.vue
index 22e13cb5..4a1588a6 100644
--- a/src/views/contracted/village/contractor/contractorFamily.vue
+++ b/src/views/contracted/village/contractor/contractorFamily.vue
@@ -8,7 +8,7 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus" :task-status="taskStatus"></contractor-header>
 
     <div class="tap_block">
       <p @click="skip('contractedVillageContractorDetail')">承包方</p>
@@ -41,7 +41,7 @@
           </div>
           <p class="item_right">{{ item.sfgyr }}</p>
         </div>
-        <template #right v-if="$route.params.surveyStatus!=='3'">
+        <template #right v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
             <div class="opera_btn edit" @click="householdDivision(item, index)">
@@ -60,7 +60,7 @@
         </template>
       </van-swipe-cell>
       <!-- getDetail不加(), 第一个参数默认传递的是event，getDetail加(), 需要手动传递$event -->
-      <p class="btn" @click="goDetail()" v-if="$route.params.surveyStatus!=='3'">新增</p>
+      <p class="btn" @click="goDetail()" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">新增</p>
     </div>
     <van-popup v-model="showContractorPopup" position="bottom">
       <van-picker
@@ -96,10 +96,12 @@
         familyList: [],                 // 家庭成员列表
         contractorList: [],             // 承包方列表
         showContractorPopup: false,     // 控制承包方信息弹出层的显示和隐藏
-        transferMemberId: null          // 转出的成员ID
+        transferMemberId: null,         // 转出的成员ID
+        taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getList();
       this.getContractorList();
     },
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index 04a34727..24b4e23d 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -103,7 +103,7 @@
         <!-- <van-field v-model="form.cycgfs" label="持股份数：" type="number" placeholder="请输入持股份数" :border="false" input-align="right" />
         <van-field v-model="form.gqzbh" label="股权编号：" placeholder="请输入股权编号" :border="false" input-align="right" /> -->
       </van-form>
-      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
 
 
@@ -130,9 +130,11 @@
         familyStatusOptions: [],        // 家庭身份字典
         familyStatusText: null,         // 家庭身份标签名
         showFamilyStatus: false,        // 控制家庭身份字典弹出层的显示和隐藏
+        taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("sys_user_sex").then(response => {
         this.cyxbOptions = response.data;
       });
diff --git a/src/views/contracted/village/contractor/contractorHeader.vue b/src/views/contracted/village/contractor/contractorHeader.vue
index 9058cc55..fc8547a9 100644
--- a/src/views/contracted/village/contractor/contractorHeader.vue
+++ b/src/views/contracted/village/contractor/contractorHeader.vue
@@ -48,7 +48,7 @@
 
   export default {
     name: 'contractedVillageHeader',
-    props: ['deptId', 'contractorCode', 'contractorName', 'surveyStatus'],
+    props: ['deptId', 'contractorCode', 'contractorName', 'surveyStatus', 'taskStatus'],
     components: {
       vueEsign
     },
@@ -75,10 +75,11 @@
     },
     created() {
       this.height = window.screen.height * 1.28 - 20;
-      if (this.surveyStatus === '3') {
-        this.showBtn = false;
-      } else {
+      if (this.taskStatus === '2' && this.surveyStatus !== '3') {
         this.showBtn = true;
+
+      } else {
+        this.showBtn = false;
       }
     },
     methods: {
diff --git a/src/views/contracted/village/contractor/contractorLand.vue b/src/views/contracted/village/contractor/contractorLand.vue
index d8602f8b..59efe841 100644
--- a/src/views/contracted/village/contractor/contractorLand.vue
+++ b/src/views/contracted/village/contractor/contractorLand.vue
@@ -8,7 +8,7 @@
         </div>
       </template>
     </van-nav-bar> -->
-    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus"></contractor-header>
+    <contractor-header :dept-id="$route.params.deptId" :contractor-code="$route.params.cbfbm" :contractor-name="$route.params.cbfmc" :survey-status="$route.params.surveyStatus" :task-status="taskStatus"></contractor-header>
 
     <div class="tap_block">
       <p @click="skip('contractedVillageContractorDetail')">承包方</p>
@@ -21,7 +21,7 @@
       <div class="function_btn1" @click="skip('contractedVillageContractorLandMap')">
         <p class="active">进入地图 <span class="sanjiao-right"></span></p>
       </div>
-      <div class="function_btn2" @click="goDetail()" v-if="$route.params.surveyStatus!=='3'">
+      <div class="function_btn2" @click="goDetail()" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">
         <p class="active"> + 新增</p>
       </div>
     </div>
@@ -49,7 +49,7 @@
             <p>北:{{ item.dkbz }}</p>
           </div>
         </div>
-        <template #right v-if="$route.params.surveyStatus!=='3'">
+        <template #right v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">
           <div class="operation">
             <!-- delete 删除 edit编辑 view查看 list榜单 -->
             <div class="opera_btn edit" @click="transferLand(item.id)">
@@ -97,10 +97,12 @@
         landList: [],                   // 承包地块列表
         contractorList: [],             // 承包方列表
         showContractorPopup: false,     // 控制承包方信息弹出层的显示和隐藏
-        transferLandId: null            // 转出的承包地块ID
+        transferLandId: null,           // 转出的承包地块ID
+        taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getList();
       this.getContractorList();
     },
diff --git a/src/views/contracted/village/contractor/contractorLandDetail.vue b/src/views/contracted/village/contractor/contractorLandDetail.vue
index 868f6df9..a410ab42 100644
--- a/src/views/contracted/village/contractor/contractorLandDetail.vue
+++ b/src/views/contracted/village/contractor/contractorLandDetail.vue
@@ -114,7 +114,7 @@
           <common-map ref="contractedLandMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
         </div>
       </van-form>
-      <p class="btn" @click="submitForm" v-if="$route.params.surveyStatus!=='3'">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
 
 
@@ -149,9 +149,11 @@
         showLandPurpose: false,           // 控制土地用途字典弹出层的显示和隐藏
         sfjbntOptions: [],                // 是否基本农田字典
         landList: [],                     // 地块信息列表
+        taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("land_use").then(response => {
         this.tdlylxOptions = response.data;
       });
diff --git a/src/views/contracted/village/contractor/contractorLandMap.vue b/src/views/contracted/village/contractor/contractorLandMap.vue
index 8091086f..cecbd065 100644
--- a/src/views/contracted/village/contractor/contractorLandMap.vue
+++ b/src/views/contracted/village/contractor/contractorLandMap.vue
@@ -9,7 +9,18 @@
       </template>
     </van-nav-bar>
 
-    <div class="mapBox" id="contractedLandMapBox"></div>
+    <div style="position:relative;">
+      <div class="mapBox" id="contractedLandMapBox"></div>
+      <div class="legend_main">
+        <div class="legend">
+          <p class="legend_tt">图例
+            <img src="../../../../../static/images/contracted/map_icon_01.png" alt="">
+          </p>
+          <div><i></i><p>地块</p></div>
+          <div><i></i><p>承包地块</p></div>
+        </div>
+      </div>
+    </div>
 
     <div class="contractedLandPopup">
       <van-dialog v-model="open" title="承包地信息" :show-confirm-button="false" :show-cancel-button="true" cancel-button-text="关闭">
@@ -310,4 +321,47 @@
     transform: translateX(-4vw);
   }
 
+  .legend_main{
+    position: absolute;
+    top: 5vh;
+    right: 0;
+  }
+
+  .legend_tt{
+    font-size: 16PX;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    img{
+      width: 20PX;
+    }
+  }
+
+  .legend{
+    background: rgba(255,255,255,.5);
+    padding: 2vh;
+    border-radius: 10PX;
+    div{
+      display: flex;
+      align-items: center;
+      margin-top: 2vh;
+      i{
+        display: block;
+        width: 15PX;
+        height: 15PX;
+        border: 1px solid;
+        border-radius: 3PX;
+        margin-right: 10PX;
+      }
+      &:nth-child(2) i{
+        background: rgba(22,233,15,.7);
+        border-color: rgba(22,233,15,1);
+      }
+      &:nth-child(3) i{
+        background: rgba(255,84,87,.7);
+        border-color: rgba(255,84,87,1);
+      }
+    }
+  }
+
 </style>
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index d2429816..81214495 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -54,7 +54,7 @@
         <van-field label="签字图片：" readonly :border="false" label-width="auto" />
         <img :src="'/api'+form.fbfdcqz" width="100%" alt="" />
       </van-form>
-      <div class="btn_main">
+      <div class="btn_main" v-if="taskStatus === '2'">
         <p class="btn" @click="submitForm">保存</p>
         <p class="btn1" @click="handleSign">签字</p>
       </div>
@@ -102,6 +102,7 @@
         credentialTypeOptions: [],        // 证件类型字典
         credentialTypeText: null,         // 证件类型标签名
         showCredentialType: false,        // 控制证件类型字典弹出层的显示和隐藏
+        taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
 
         // 控制签字面板的显示和隐藏
         showSignPopup: false,
@@ -117,6 +118,7 @@
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.height = window.screen.height * 1.28 - 20;
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
diff --git a/src/views/contracted/village/map/map.vue b/src/views/contracted/village/map/map.vue
index f0e47b7a..81794a5e 100644
--- a/src/views/contracted/village/map/map.vue
+++ b/src/views/contracted/village/map/map.vue
@@ -25,7 +25,7 @@
           <div><i></i><p>开荒地</p></div>
           <div><i></i><p>其他地</p></div>
         </div>
-        <div class="legend_second" >
+        <div class="legend_second" v-if="taskStatus === '2'">
           <p class="legend_tt" id="drawLandPolygon">
             <img src="../../../../../static/images/contracted/map_icon_02.png" alt="">画图
           </p>
@@ -161,7 +161,7 @@
         </van-form>
         <div class="footer_main">
           <van-button type="default" hairline size="large" @click="closePopup">关闭弹窗</van-button>
-          <van-button type="danger" hairline size="large" @click="deleteLand(form.id)" v-if="showDeleteBtn">删除地块</van-button>
+          <van-button type="danger" hairline size="large" @click="deleteLand(form.id)" v-if="taskStatus === '2' && showDeleteBtn">删除地块</van-button>
           <van-button type="info" hairline size="large" @click="saveLand" v-if="showSaveBtn">保存信息</van-button>
         </div>
     </van-dialog>
@@ -211,9 +211,11 @@
         showSaveBtn: false,               // 控制保存按钮的显示隐藏
         showDeleteBtn: false,             // 控制删除按钮的显示隐藏
         isDisabled: false,                // 是否禁用
+        taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("land_ownership").then(response => {
         this.syqxzOptions = response.data;
       });
diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue
index fa30169d..46b17964 100644
--- a/src/views/contracted/village/massif/massif.vue
+++ b/src/views/contracted/village/massif/massif.vue
@@ -20,7 +20,7 @@
         @search="onSearch"
       ></van-search>
 
-      <div class="search_btn" @click="goDetail()">
+      <div class="search_btn" @click="goDetail()" v-if="taskStatus === '2'">
         <p class="active"> + 新增</p>
       </div>
 
@@ -55,7 +55,7 @@
             <van-col span="10">{{ item.dkmc }}</van-col>
             <van-col span="5" style="color: #f78200">{{ item.scmjm }}</van-col>
           </van-row>
-          <template #right>
+          <template #right v-if="taskStatus === '2'">
             <van-button square type="danger" text="删除" native-type="button" @click="deleteLand(item.id, index)" />
           </template>
         </van-swipe-cell>
@@ -93,9 +93,12 @@
         totalNum: 0,
         // 地块列表
         landList: [],
+        // 调查任务的完成状态：1表示已完成，2表示未完成
+        taskStatus: null,
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.queryParams.deptId = this.$route.query.deptId;
       this.getDicts("land_type").then(response => {
         this.dklbOptions = response.data;
diff --git a/src/views/contracted/village/massif/massifDetail.vue b/src/views/contracted/village/massif/massifDetail.vue
index 41682dc6..3df9f003 100644
--- a/src/views/contracted/village/massif/massifDetail.vue
+++ b/src/views/contracted/village/massif/massifDetail.vue
@@ -145,7 +145,7 @@
           <common-map ref="landMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
         </div>
       </van-form>
-      <p class="btn" @click="submitForm">保存</p>
+      <p class="btn" @click="submitForm" v-if="taskStatus === '2'">保存</p>
     </div>
 
 
@@ -208,9 +208,11 @@
         tdlylxText: null,                 // 土地利用类型标签名
         showLandType: false,              // 控制土地利用类型字典弹出层的显示和隐藏
         sfjbntOptions: [],                // 是否基本农田字典
+        taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
       };
     },
     created() {
+      this.taskStatus = Cookies.get('taskStatus');
       this.getDicts("land_ownership").then(response => {
         this.syqxzOptions = response.data;
       });

From 78501fab687ecd2512190b3d90e83b23e535ebf6 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 24 Aug 2023 17:44:59 +0800
Subject: [PATCH 25/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contracted/village/massif/massif.vue      | 14 ++++++++----
 .../village/massif/massifDetail.vue           | 22 +++++++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue
index 46b17964..dac05e2d 100644
--- a/src/views/contracted/village/massif/massif.vue
+++ b/src/views/contracted/village/massif/massif.vue
@@ -82,6 +82,9 @@
           dklb: null,
           pageNum:1,
           pageSize:20,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
         },
         // 地块类别字典
         dklbOptions: [],
@@ -103,9 +106,10 @@
       this.getDicts("land_type").then(response => {
         this.dklbOptions = response.data;
         if (this.dklbOptions.length > 0) {
-          this.queryParams.dklb = this.dklbOptions[0].dictValue;
-          this.landCategory = this.dklbOptions[0].dictValue;
-          this.tagName = this.dklbOptions[0].dictLabel;
+          const dklb = this.$route.query.dklb;
+          this.queryParams.dklb = dklb ? dklb : this.dklbOptions[0].dictValue;
+          this.landCategory = dklb ? dklb : this.dklbOptions[0].dictValue;
+          this.tagName = dklb ? this.selectDictLabel(this.dklbOptions, dklb) : this.dklbOptions[0].dictLabel;
         }
         this.getList();
       });
@@ -150,6 +154,7 @@
             path:'/contracted/village/massifDetail',
             query: {
               deptId: this.$route.query.deptId,
+              deptName: this.$route.query.deptName,
               id: id
             }
           });
@@ -157,7 +162,8 @@
           this.$router.push({
             path:'/contracted/village/massifDetail',
             query: {
-              deptId: this.$route.query.deptId
+              deptId: this.$route.query.deptId,
+              deptName: this.$route.query.deptName
             }
           });
         }
diff --git a/src/views/contracted/village/massif/massifDetail.vue b/src/views/contracted/village/massif/massifDetail.vue
index 3df9f003..1d602652 100644
--- a/src/views/contracted/village/massif/massifDetail.vue
+++ b/src/views/contracted/village/massif/massifDetail.vue
@@ -213,6 +213,8 @@
     },
     created() {
       this.taskStatus = Cookies.get('taskStatus');
+      console.log(this.$route.query);
+      console.log(this.$route.params);
       this.getDicts("land_ownership").then(response => {
         this.syqxzOptions = response.data;
       });
@@ -330,7 +332,15 @@
                   message: '保存成功',
                   duration:"1000",
                   onClose: () => {
-                    this.goBack();
+                    // this.goBack();
+                    this.$router.push({
+                      path:'/contracted/village/massif',
+                      query: {
+                        deptId: this.$route.query.deptId,
+                        deptName: this.$route.query.deptName,
+                        dklb: this.form.dklb
+                      }
+                    });
                   }
                 });
               }
@@ -344,7 +354,15 @@
                   message: '保存成功',
                   duration:"1000",
                   onClose: () => {
-                    this.goBack();
+                    // this.goBack();
+                    this.$router.push({
+                      path:'/contracted/village/massif',
+                      query: {
+                        deptId: this.$route.query.deptId,
+                        deptName: this.$route.query.deptName,
+                        dklb: this.form.dklb
+                      }
+                    });
                   }
                 });
               }

From 9018a2e20fb61f823db3a4ce1afb181e89c24cc3 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Fri, 25 Aug 2023 10:37:48 +0800
Subject: [PATCH 26/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E3=80=81?=
 =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/sysCbf.js             |   9 +
 src/permission.js                             |   1 +
 src/router/index.js                           |  18 +
 .../sunVillage_info/index_code_rights.vue     |   3 +
 src/views/sunVillage_info/list_cbfsq.vue      | 385 ++++++++++++++++++
 src/views/sunVillage_info/list_fbfsq.vue      | 317 ++++++++++++++
 6 files changed, 733 insertions(+)
 create mode 100644 src/views/sunVillage_info/list_cbfsq.vue
 create mode 100644 src/views/sunVillage_info/list_fbfsq.vue

diff --git a/src/api/sunVillage_info/sysCbf.js b/src/api/sunVillage_info/sysCbf.js
index 0237f578..70dfc3aa 100644
--- a/src/api/sunVillage_info/sysCbf.js
+++ b/src/api/sunVillage_info/sysCbf.js
@@ -8,6 +8,15 @@ export function getList(data){
     params:data
   })
 }
+//承包方查询
+export function getCbfList(data){
+  return request({
+    url:'/open/villageAffairs/public/cbfList',
+    method:'get',
+    params:data
+  })
+}
+
 //查询承包地块列表
 export function getCbdkms(data){
   return request({
diff --git a/src/permission.js b/src/permission.js
index 5ab4b568..86bb087a 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -118,6 +118,7 @@ const whiteList = [
   '/sunVillage_info/arbitrationDetail',
   '/sunVillage_info/familyMember',
   '/sunVillage_info/familyMemberDetail',
+  '/sunVillage_info/list_cbfsq',
   '/sunVillage_info/list_signature',
   '/sunVillage_info/list_official',
   '/sunVillage_info/list_signature_add',
diff --git a/src/router/index.js b/src/router/index.js
index 2e5fd561..59543d55 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3624,6 +3624,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_chronicles_single_process'], resolve)
   },
+  { ////阳光村务（新）-- 发包方授权
+    path: '/sunVillage_info/list_fbfsq',
+    name: 'sunVillageInfoListFbfsq',
+    meta: {
+      title: '发包方授权',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_fbfsq'], resolve)
+  },
   { // 综合填报
     path: '/sunVillage_info/entityReportList',
     name: 'entityReportList',
@@ -4011,6 +4020,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/familyMember/familyMemberDetail'], resolve)
   },
+  {
+    path: '/sunVillage_info/list_cbfsq',
+    name: 'sunVillageInfoListCbfsq',
+    meta: {
+      title: '承包方授权',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_cbfsq'], resolve)
+  },
   { ////阳光村务（新）-- 合同信息
     path: '/sunVillage_info/list_vote_detail',
     name: 'sunVillageInfoListVoteDetail',
diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue
index fdd2fe25..a98ee40b 100644
--- a/src/views/sunVillage_info/index_code_rights.vue
+++ b/src/views/sunVillage_info/index_code_rights.vue
@@ -241,6 +241,9 @@
               &:nth-child(4n+1){
                 margin-top: 15PX;
               }
+              &:nth-child(5n+1){
+                 margin-top: 15PX;
+               }
               &:nth-child(1){
                 margin-top: 0PX;
               }
diff --git a/src/views/sunVillage_info/list_cbfsq.vue b/src/views/sunVillage_info/list_cbfsq.vue
new file mode 100644
index 00000000..e17ab379
--- /dev/null
+++ b/src/views/sunVillage_info/list_cbfsq.vue
@@ -0,0 +1,385 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main" >
+      承包方授权
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <div class="list_main">
+      <div class="titBox">
+        <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
+        <p class="tit">承包方授权</p>
+      </div>
+      <van-field readonly v-model="cbfTypeName" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfbm" label="承包方代码" placeholder="承包方代码" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfmc" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false" />
+      <van-field readonly v-model="zjlxName" label="承包方证件类型" placeholder="承包方证件类型" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfzjhm" label="承包方证件号码" placeholder="承包方证件号码" input-align="right" :border="false" />
+      <van-field readonly v-model="form.lxdh" label="联系电话" placeholder="联系电话" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfcysl" label="承包方成员数量" placeholder="承包方成员数量" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfdcy" label="承包方调查员" placeholder="承包方调查员" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfdcrq" label="承包方调查日期" placeholder="承包方调查日期" input-align="right" :border="false" />
+      <van-field readonly v-model="form.cbfdcjs" label="承包方调查记事" placeholder="承包方调查记事" input-align="right" :border="false" />
+      <van-cell title="承包方调查签字" style="color: #646566;">
+        <van-field style="padding: 0 0;" readonly input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.cbfdcqz" width="10%" alt="" v-if="form.cbfdcqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.gsjs" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsjsr" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />
+      <van-cell title="公示记事人签字" style="color: #646566;">
+        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.gsjsrq" label="公示记事日期" placeholder="公示记事日期" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsjgyj" label="公示结果意见" placeholder="公示结果意见" input-align="right" :border="false" />
+      <van-cell title="公示结果签字" style="color: #646566;">
+        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.gsjgqz" width="10%" alt="" v-if="form.gsjgqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.gsjgqzrq" label="公示结果签字日期" placeholder="公示结果签字日期" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsshr" label="公示审核人" placeholder="公示审核人" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsshrq" label="公示审核日期" placeholder="公示审核日期" input-align="right" :border="false" />
+      <van-field readonly v-model="form.gsshyj" label="公示审核意见" placeholder="公示审核意见" input-align="right" :border="false" />
+      <van-cell title="公示审核签字" style="color: #646566;">
+        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.gsjgqz" width="10%" alt="" v-if="form.gsjgqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.yzbm" label="邮政编码" placeholder="	邮政编码" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbfdcy" label="发包方调查员" placeholder="发包方调查员" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbfdcrq" label="发包方调查日期" placeholder="发包方调查日期" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbfdcjs" label="发包方调查记事" placeholder="发包方调查记事" input-align="right" :border="false" />
+      <van-cell title="发包方调查签字" style="color: #646566;">
+        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.fbfdcqz" width="10%" alt="" v-if="form.fbfdcqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
+      <van-field readonly v-model="form.shrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
+      <van-cell title="审核人签字" style="color: #646566;">
+        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.shrqz" width="10%" alt="" v-if="form.shrqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.hcgfsl	" label="户持股份(份额)数量" placeholder="户持股份(份额)数量	" input-align="right" :border="false" />
+      <van-field readonly v-model="form.hcgfzjtqqtdbl	" label="户持股份(份额)比例" placeholder="户持股份(份额)比例	" input-align="right" :border="false" />
+      <van-field readonly v-model="form.hcgfzjtqqtdmj	" label="户持股份(份额)面积" placeholder="户持股份(份额)面积" input-align="right" :border="false" />
+      <van-field readonly v-model="surveyStatusName" label="确权调查状态" placeholder="确权调查状态" input-align="right" :border="false" />
+      <van-field readonly v-model="form.surveyRemark" label="确权调查备注" placeholder="确权调查备注" input-align="right" :border="false" />
+      <van-field readonly v-model="isDepositName" label="是否纳入托管" placeholder="是否纳入托管" input-align="right" :border="false" />
+      <van-field readonly v-model="form.tgmj" label="托管面积(亩)" placeholder="托管面积(亩)" input-align="right" :border="false" />
+      <div style="margin: 30px auto 0;width: 50%;">
+        <van-button round block type="primary" native-type="submit" >
+          授权
+        </van-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getCbfList} from "@/api/sunVillage_info/sysCbf";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import Cookies from "js-cookie";
+  import $ from "jquery";
+  export default {
+    name: "certificateList",
+    components: {FieldSelect},
+    data() {
+      return {
+        form:{},
+        showForm2:false,
+        showesign:false,
+        sysFarmer:JSON.parse(Cookies.get('user')),
+        zjlxName:"",
+        cbfTypeName:"",
+        surveyStatusName:"",
+        isDepositName:"",
+        height:0,
+        options: {
+          cert_type: [],
+        },
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
+      };
+    },
+    created() {
+      this.getSysFfb();
+    },
+    methods: {
+      InitOptions() {
+        for(let k in this.options)
+        {
+          this.getDicts(k).then((resp) => this.options[k] = resp.data);
+        }
+      },
+      getSysFfb(){
+        getCbfList({deptId:this.sysFarmer.deptId,cbfzjhm:this.sysFarmer.idcard}).then(response => {
+          let _this = this;
+          if(response.rows.length > 0){
+            this.form = response.rows[0];
+            this.getDicts("zjlx").then(response => {
+              response.data.forEach(function (item) {
+                if (item.dictValue ===  _this.form.cbfzjlx) {
+                  _this.zjlxName = item.dictLabel;
+                }
+              })
+            });
+            this.getDicts("cbf_type").then(response => {
+              response.data.forEach(function (item) {
+                if (item.dictValue ===  _this.form.cbflx) {
+                  _this.cbfTypeName = item.dictLabel;
+                }
+              })
+            });
+            this.getDicts("confirmed_survey_status").then(response => {
+              response.data.forEach(function (item) {
+                if (item.dictValue ===  _this.form.surveyStatus) {
+                  _this.surveyStatusName = item.dictLabel;
+                }
+              })
+            });
+            this.getDicts("sys_yes_no").then(response => {
+              response.data.forEach(function (item) {
+                if (item.dictValue ===  _this.form.isDeposit) {
+                  _this.isDepositName = item.dictLabel;
+                }
+              })
+            });
+          }
+
+        });
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
+  .van-cell::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 0.426667rem;
+    bottom: 0;
+    left: 0.426667rem;
+    border:none;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+  }
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0px;
+
+  }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+  .header_main {
+    height: 116px;
+    background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+
+  .return_btn {
+    width: 24px;
+    height: 43.2px;
+    background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  }
+  .release_head{
+    height: 90px;
+    padding:0 23px;
+    display: flex;
+    align-items: center;
+    font-size: 26px;
+    color: #929292;
+  .people{
+    flex: 1;
+    display: flex;
+    align-items: center;
+  .icon{
+    width: 24px;
+    height: 21px;
+    background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+    background-size: 100% 100%;
+    display: block;
+    margin-right: 8px;
+  }
+  }
+  .time{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content:flex-end;
+  .icon{
+    width: 25px;
+    height: 25px;
+    background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+    background-size: 100% 100%;
+    display: block;
+    margin-right: 8px;
+  }
+  }
+  }
+  .release_conetnt{
+    padding:0 22px;
+    font-size: 32px;
+    color: #252525;
+    line-height: 44px;
+  img{
+    max-width: 100%;
+    margin-bottom: 16px;
+  }
+  p{
+    margin-bottom: 16px;
+  }
+  }
+  .list_main{
+    padding:25px;
+    background: #ffffff;
+    width: 94%;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .subForm{
+    padding:25px;
+    background-image: linear-gradient(#2884ec,#68b2ee);
+    width: 94%;
+    margin: 50PX auto 0;
+    border-radius: 15PX;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    position: relative;
+    padding-top: 10vw;
+  img{
+    position: absolute;
+    left: 50%;
+    width: 15vw;
+    transform: translate(-50%,calc(-50% - 10vw));
+    border: 5PX solid #e9e9e9;
+    border-radius: 100%;
+  }
+  /deep/ .van-field__label{
+    /*padding-left: 10PX;*/
+    width: auto;
+    display: flex;
+    align-items: start;
+    color: #ffffff;
+    margin-right: 6vw;
+  }
+  /deep/ .van-cell{
+    background-color: transparent;
+  }
+  .textarea{
+  /deep/ .van-field__value{
+    background-color: #ffffff;
+    border-radius: 10PX;
+  }
+  /deep/ .van-field__control{
+    padding: 12PX;
+    color: #666666;
+  }
+  }
+  /deep/ .van-field__value{
+    background-color: transparent;
+    border-radius: 10PX;
+  }
+  /deep/ .van-field__control{
+    padding: 0PX;
+    color: #ffffff;
+  }
+  /deep/ .van-cell--required::before{
+    left: 60PX;
+  }
+  }
+  .subForm2{
+    padding:25px;
+    background:#ffffff;
+    width: 94%;
+    margin: 50PX auto 0;
+    border-radius: 15PX;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    position: relative;
+    padding-top: 10vw;
+  .topImg{
+    position: absolute;
+    left: 50%;
+    width: 15vw;
+    transform: translate(-50%,calc(-50% - 10vw));
+    border: 5PX solid #e9e9e9;
+    border-radius: 100%;
+  }
+  .bottomImg{
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 25vw;
+    transform: translate(-50%,-50%);
+  }
+  }
+  .titBox{
+    display: flex;
+    align-items: center;
+  }
+  .tit{
+    font-size: 36px;
+    font-weight: bold;
+  }
+  /deep/ .van-cell{
+    padding-left: 0!important;
+    padding-right: 0!important;
+    padding-bottom: 0!important;
+  }
+  /deep/ .van-field__label{
+    /*padding-left: 10PX;*/
+    width: auto;
+    display: flex;
+    align-items: center;
+  }
+  /deep/ .van-cell--required::before{
+    left: 85PX;
+  }
+  }
+</style>
diff --git a/src/views/sunVillage_info/list_fbfsq.vue b/src/views/sunVillage_info/list_fbfsq.vue
new file mode 100644
index 00000000..57c7425a
--- /dev/null
+++ b/src/views/sunVillage_info/list_fbfsq.vue
@@ -0,0 +1,317 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main" >
+      发包方授权
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <div class="list_main">
+      <div class="titBox">
+        <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
+        <p class="tit">发包方授权</p>
+      </div>
+      <van-field readonly v-model="form.fbfbm" label="发包方代码" placeholder="发包方代码" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbfmc" label="发包方名称" placeholder="发包方名称" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbffzrxm" label="负责人名称" placeholder="负责人名称" input-align="right" :border="false" />
+      <field-select
+        v-model="form.fzrzjlx"
+        label="证件类型"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择证件类型"
+        :rules="[{ required: true }]"
+        readonly
+        remote-url="/open/zdzh/list/zjlx"
+        :on-remote-response="'data'"
+      />
+      <van-field readonly v-model="form.fzrzjhm" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
+      <van-field readonly v-model="form.lxdh" label="联系电话" placeholder="联系电话" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbfdz" label="发包方地址" placeholder="发包方地址" input-align="right" :border="false" />
+      <van-field readonly v-model="form.yzbm" label="邮政编码" placeholder="	邮政编码" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbfdcy" label="发包方调查员" placeholder="发包方调查员" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbfdcrq" label="发包方调查日期" placeholder="发包方调查日期" input-align="right" :border="false" />
+      <van-field readonly v-model="form.fbfdcjs" label="发包方调查记事" placeholder="发包方调查记事" input-align="right" :border="false" />
+      <van-cell title="发包方调查签字" style="color: #646566;">
+        <van-field style="padding: 0 0;" readonly label="发包方调查签字" input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.fbfdcqz" width="10%" alt="" v-if="form.fbfdcqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <van-field readonly v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
+      <van-field readonly v-model="form.shrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
+      <van-cell title="审核人签字" style="color: #646566;">
+        <van-field style="padding: 0 0;" readonly label="审核人签字" input-align="right" :border="false" >
+          <template #label>
+            <img :src="'/api'+form.shrqz" width="10%" alt="" v-if="form.shrqz" >
+          </template>
+        </van-field>
+      </van-cell>
+      <div style="margin: 30px auto 0;width: 50%;">
+        <van-button round block type="primary" native-type="submit" >
+          授权
+        </van-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getList} from "@/api/sunVillage_info/sysCbf";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import $ from "jquery";
+  export default {
+    name: "certificateList",
+    components: {FieldSelect},
+    data() {
+      return {
+        form:{},
+        showForm2:false,
+        showesign:false,
+        height:0,
+        options: {
+          cert_type: [],
+        },
+
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
+      };
+    },
+    created() {
+      this.InitOptions();
+      this.getSysCfb();
+    },
+    methods: {
+      InitOptions() {
+        for(let k in this.options)
+        {
+          this.getDicts(k).then((resp) => this.options[k] = resp.data);
+        }
+      },
+      getSysCfb(){
+        getList({}).then(response => {
+          if(response.data.length > 0){
+            this.form = response.data[0];
+
+          }
+
+        });
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
+  .van-cell::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 0.426667rem;
+    bottom: 0;
+    left: 0.426667rem;
+    border:none;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+  }
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0px;
+
+  }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+  .header_main {
+    height: 116px;
+    background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    position: relative;
+
+  .return_btn {
+    width: 24px;
+    height: 43.2px;
+    background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+    background-size: 20px 36px;
+    position: absolute;
+    left: 38px;
+    top: 36px;
+  }
+  }
+  .release_head{
+    height: 90px;
+    padding:0 23px;
+    display: flex;
+    align-items: center;
+    font-size: 26px;
+    color: #929292;
+  .people{
+    flex: 1;
+    display: flex;
+    align-items: center;
+  .icon{
+    width: 24px;
+    height: 21px;
+    background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+    background-size: 100% 100%;
+    display: block;
+    margin-right: 8px;
+  }
+  }
+  .time{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content:flex-end;
+  .icon{
+    width: 25px;
+    height: 25px;
+    background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+    background-size: 100% 100%;
+    display: block;
+    margin-right: 8px;
+  }
+  }
+  }
+  .release_conetnt{
+    padding:0 22px;
+    font-size: 32px;
+    color: #252525;
+    line-height: 44px;
+  img{
+    max-width: 100%;
+    margin-bottom: 16px;
+  }
+  p{
+    margin-bottom: 16px;
+  }
+  }
+  .list_main{
+    padding:25px;
+    background: #ffffff;
+    width: 94%;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .subForm{
+    padding:25px;
+    background-image: linear-gradient(#2884ec,#68b2ee);
+    width: 94%;
+    margin: 50PX auto 0;
+    border-radius: 15PX;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    position: relative;
+    padding-top: 10vw;
+  img{
+    position: absolute;
+    left: 50%;
+    width: 15vw;
+    transform: translate(-50%,calc(-50% - 10vw));
+    border: 5PX solid #e9e9e9;
+    border-radius: 100%;
+  }
+  /deep/ .van-field__label{
+    /*padding-left: 10PX;*/
+    width: auto;
+    display: flex;
+    align-items: start;
+    color: #ffffff;
+    margin-right: 6vw;
+  }
+  /deep/ .van-cell{
+    background-color: transparent;
+  }
+  .textarea{
+  /deep/ .van-field__value{
+    background-color: #ffffff;
+    border-radius: 10PX;
+  }
+  /deep/ .van-field__control{
+    padding: 12PX;
+    color: #666666;
+  }
+  }
+  /deep/ .van-field__value{
+    background-color: transparent;
+    border-radius: 10PX;
+  }
+  /deep/ .van-field__control{
+    padding: 0PX;
+    color: #ffffff;
+  }
+  /deep/ .van-cell--required::before{
+    left: 60PX;
+  }
+  }
+  .subForm2{
+    padding:25px;
+    background:#ffffff;
+    width: 94%;
+    margin: 50PX auto 0;
+    border-radius: 15PX;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    position: relative;
+    padding-top: 10vw;
+  .topImg{
+    position: absolute;
+    left: 50%;
+    width: 15vw;
+    transform: translate(-50%,calc(-50% - 10vw));
+    border: 5PX solid #e9e9e9;
+    border-radius: 100%;
+  }
+  .bottomImg{
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 25vw;
+    transform: translate(-50%,-50%);
+  }
+  }
+  .titBox{
+    display: flex;
+    align-items: center;
+  }
+  .tit{
+    font-size: 36px;
+    font-weight: bold;
+  }
+  /deep/ .van-cell{
+    padding-left: 0!important;
+    padding-right: 0!important;
+    padding-bottom: 0!important;
+  }
+  /deep/ .van-field__label{
+    /*padding-left: 10PX;*/
+    width: auto;
+    display: flex;
+    align-items: center;
+  }
+  /deep/ .van-cell--required::before{
+    left: 85PX;
+  }
+  }
+</style>

From 7c7fbcab50780b66d3ff0f256e9aba5d9902c5c0 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Fri, 25 Aug 2023 10:41:04 +0800
Subject: [PATCH 27/28] =?UTF-8?q?=E6=89=BF=E5=8C=85=E6=96=B9=E3=80=81?=
 =?UTF-8?q?=E5=8F=91=E5=8C=85=E6=96=B9=E6=8E=88=E6=9D=83=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/sunVillage_info/index_block_cbfsq.png | Bin 0 -> 4274 bytes
 .../images/sunVillage_info/index_block_fbfsq.png | Bin 0 -> 4309 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/assets/images/sunVillage_info/index_block_cbfsq.png
 create mode 100644 src/assets/images/sunVillage_info/index_block_fbfsq.png

diff --git a/src/assets/images/sunVillage_info/index_block_cbfsq.png b/src/assets/images/sunVillage_info/index_block_cbfsq.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3318ee2a4827ff13fe3998d9b190398f369823b
GIT binary patch
literal 4274
zcmaJ_dpy(o{~wckLt#s3rd-Fa%;q|C=`v!;ttFeyrLfuNUdsI*MRH5gRVw#f5{|pC
z5Gu;0l9EeqT}b4&&N-dm?~n8QejcCC`}%smUeDL<pHHHlt@U<s1#tiXu>HV(3krWG
z@;`#8Fn?U!fwksOyLgt)ydx}6UNDWr1P~c4Ium-pkLJasFlmg?fNrJ{008vyad752
z+mHz!EI(b^FB#nsKQ<o?02rBuuxTErm^>(*>E+{Z3|oBE1cUl8jA2fCHb@&biRtaL
zKa9gX5@ze*5q8Q0&w!blK#f8Od<A|?9t|4e=j+cUgc!sA)Jx#6e;p%W&_6|Zr;K5L
zk#e@NgOXSrCR9&XU&jN5MMH6TU6ei&kH*5GXe0`UK;jT6j1Ce-K<X1Pc<A2`jBky@
z@FY+ytp2ve-x<Tac|0}&fd~!`)(yt!vN&D{6dsR9AkhdkT8A&8!wvQ4(L!|mxvIZ4
zSTMOB93M8%hvg6brIAKw1@eqxe5QZ7;K#PH`A4xo_wPXQLxu>Uu@NX;B*M?{mtTKM
zb9ofz|I+wZX|6*kn~9(>xvW5r2R|R4s=vYf*!_1yzXbVg2!}a7{G`x)Em$6beoTMf
z0SjXo|3;VL!ytH~usA#hgVNE%qtH57J*=k=oq^#G`b-=hi8esd4Gezk`8Pbyl7ut2
zz+$jyO9K?j($XA*!Qu6=NDF;^EE;8n{f#}~&*jnlJ($03`|xf5jYa=gEP=#f(s(S6
z1B>PRy9(^QSv(fko5hBbNKg$YAAbfbn5+3KLw`AJ!Q}V^F&S1ImLK%b5EFd<%{<Z^
ziN)&UNtPrupSlIn60L{F5OG92ivMEy)c?XV{v~X<zp%vr7mMJNLHw$Z|5Go&kN8FS
zYxz(0^EdzW57VFDG#q|+NR&tI0stgmAFv=gguI$RwmpSvskGG}&I)ENetR%{s^_b?
zd5J(_RZ+FO#Qhg(kfcKCL{Y1qL}|E1YOZ&t=zw>M*fP)*Dtpg;U8clrpR><}!NU@T
zd*pLlTtKb|7ay=6PYh2ijE*nk79XE6#IPn7CXRdLb$#&knt0OiGG}XJt7)tA391jj
z*>n~jwo2-=5YgE8a3{*1-e%d?P%5ho=5%~`OOv0?wbv~gOI{&n))Z~(4O~vX+-|t`
z?jBWl_*CE@YcwSS<9z<v^+Y>0v-JLs;TpR}<z(+~qtOR?m`#f&UqS)zFYR{;r5Qmg
z%mFK6X5@qK>oMkv4F_ynq9W2Z_L0}Moh>l2RHBMNLib|Xq4dqZcarp;%-93TtF!-+
zkg6lja^u`v6yaewwV-eVZM8*5W`)*VykWR*g?f5KY-7+()_(X`B^PR+5Lshi@RQCq
zeLCg--b(h(4e^8F7wYY8i$H5;5@qKci@I7G&r?JOQ<Wo-fz$Ys1VQ!0-L~p7W`OeO
zv+7zqp<_zm_dierudi*~jRO{?Mf++F9>3EBpMsoC=~q#*u5V2M5^(u2SlRN381!7M
zm|uI8?l87h;KrPNn2UfO8rrZ%=c!kO58w)`c0K|Ho_+rMf*#2XdvYdh(Wf;g51H5_
z*V{ZIv3J&7&`wWLG&^cMzR^iFSWmH5su%?lF}ULCE(A8n9+7H2x^8$za$k9NhMfGR
zb~CGxi=V^>zDV78pKFW++SE`KK^jypp(;AvYtI1l`iDG?RrUcTg~UQYenpRV`p=o2
zSn4N^ay*cXqWoO7Xl{E@axVX}nBp47-k~X@D#Y@B4xCsNj-9Usq;WH^Tn>u5>S!1_
zKo=9S=+z?TIV+~ajgqn-i-VdoJxfnbuGqILKdpN!o7kG|z(7@3syzKV_@JWqXn@(O
z#El&5O~F@Dr8z1fWc_}1syAxA>tO7y>6`jfj&-G$V;3hX??FqeE^mTPrBI)qkIa^&
zXawgznIy2yCbQVhx({6Ay(~Wo+)C*We6IOkZ?3}&en|{kY0#7RgieuE0)jLet!sNo
zcTY4^&?EXvpX42<w?Vwr3T~@jC1+g{@90%Ajifr?mey92tZuLs&GG24777V(tFn}_
zv6@YTSPL`MqYFy2+ug>i(0L+F0hBM@ipDSEmcfPabLe6&r3~p@bWiL%zAF}w(6=_=
zjY0*_Sed89i)K?16*9E0{R_(?_6v7of#nORjByWr>u);-Rz*dZG&8}JH`JV$SIMvo
zvdfYSp(XPtx~{e_fDMvQW}#?N8Jh`ZE8n~qmMNF+YZl4D7Rm>eIV549#D*i?e-vtl
zIL9<TyeB^gi;-KXPp#KZe;w7(+a~r7m4`dIunaarpijzM2Nz6zOQ=14LE=b`d4mQ)
z^<{=u`g3Ru(_i90Ll<7BG^p-<TARAB!?9TFd~SM#Vj8eM8#4aR5x$}PGOJ8H*47bz
z-m&AlC~a;~G>dXsrp@YPp0xVjINeWe(8Jyfs0N~|ynQ^wF5Z3>GJo)_MffA5?`=<)
zKwrnjap~P9&wk7V%IW@btGqvBiK;$jiC$N3{Hz5k(}Q*#l?6lf;=5xcHbrhQIi@{<
zQiPWSs>>^T-nm^qJ9O6vQKhPrBQ3K7_*sfx_Ne-bjp~oxgZ+XJOXSq@=86&Y6BmCJ
z`s@v)zbUpms&&uLC6-6BZp457dHT?2-x^Kh%BhiJSC|YiTVma_>AC*GwWPJFW5KO#
zddZm=Nf7fz(SGSbsQ73yRuR78dqaC^BDJgZExmVkuSECHj5IZ?ium`jnUvzJu^S&O
z+Z|SbP>X}_^g;6<IaXZ5`GGN&Z6fYkJ)W51y0(g-n#W`11vXPcTDZ_OBvtvn8@79|
zFilCSHZnkdD6Pu|B>BKbGEMPfu<kHnru92{=u&n=tL9zt_g$Bc!W%Ln5Z5&I%hns)
z4s{9>_tNYqdep)sajza8o}WfoT$2T&b;zDZMu{=q3H1uL`D5<WoX4EekD1-c;~ihr
zCj-<DO2R*CBzza$cxB}CXi)|>>u^8MuFH7%p%lmFF#Q@UMhHTxHImL-#0Boz0y(>=
z02n{baXO;zWjKTWs2X8oCo6o9S)SjOPx`nM*P~V2A<kW1_;)*_AGheQ;e~6JfUbID
z9+vy)Z#TONNI%}WA%#OCkB(FL-P-(6sitlQBR(e~i;xAGQwyqB{7Y*p&yT0~GfW)F
zxYPMRay!DCvdg?G<Kk9dhOVXyW?OkAy}A<crrGGQ5;`bCZZ*VI{*hd)Q+mZuyr2@X
z>5TVcYD_nzx?A|d=*7Al43}LmXDU8_S1SG)nMxHjlxAV^*oI0w4PGSI-@Jz5LQdLV
zY?*b;z@aBj`c@UjN|2h2a|$Q~U0+x}=DY^Hb38G=RmT60vf82U4EPNSxLYVLfAt(7
zZ&Kdlkw0#UvD0AkF54~3IAc`*3EPAcEnQrXQW>tF_H0-NZ<x7~K1LXw$@_7;-_)G&
zWV;)^8ky5*_;eF9751h*xgf5XF8%W5z~gKZ@tbS1m{(YSq#S1#=eDij*ttHbNu@&)
z8OEt!n9r0-l7J~)5VaD3cOSPv>#nxW=(l@z^XK&v1o2>s5c;dfSh319@x~;)Hz|mY
zF98X{o3EwC2;C{0IgIMMB)h}x>kfQLpzkgCoixda2xqTWtEWM)Eo3*c?kDW_xEYdR
z$a}JWPr*?oU%@rLKum`m<h8yww&zCp^ino5C+PG8GTA=(k1}KN+icS!2etjE9HY`(
zHQ8*}vd<aXZ%xaO-26F<5=AVQpR~BRVBKF?t@KzzXwA=|QBzqY8&B26I~?b@$6QK^
zXCkVy4<2{q<nyX)1x_cmiwi)w_vyuXu$mJN{yUodj>-T7x;Xdc)s79ZPcIz)VyF;@
zbg@x<+QPoVv6GExcGHvW9IShhwHuJ_v(rF6R{@;4Bk}tVfo79-po!hZM(<Ekn^@Rw
z5BX^0;%3>bRtD1Oqa&~eBJZ|aWD3x|lrmG-QQ#&cD~BRR?cQ`X8Cp}Txx#H3=gxDj
zj~%-_>Q4iw+!}5-5!f6(R6J#Lr^SV8oTFXzTK>8)%+hGJX7OY<{=-L^GuxG3Uytqf
zkB3O^Dq3>*`o%zA1U6aGE0vT4O-?|7OogXsN<wU7Uv(6b%T>O2!=8xmqw6F`F6|MI
z^>QwL2G+YE*Cz)iKHT+AOgegR*lDL@BLr#pBV(8Lxqbd(kOZu+l?<+0-DXdFt;&-)
z)3?;6(2zdl-=UfOf_?6dBP+VDp;8{2^jZ-7B_~=d#UvSfoDy#i96P?b?z%A(AS;3m
zu-`o2J24ZqYd5EEI3t>*eQt$iMdl5b&XvJWCw02xO-LvRbl--s-}y8+Dkx6@%bfdT
zo5&=v^m#9R=su?JNqm*+(Cs>8#EW$zqzSaLrBD74pYI!_r=8^{Z^e5bmcAN>SohtZ
zlCm+#89!?+S+qYUH*R^tRhFtM^F}G?+OmhM!)l>|I=8%Le{B%9^c`S0ZKYji*kvdN
zz9sgRg#PiWZlffzurScg_ehJt2l=2PKQLlA&mm~r)wrb}^!diMbi?Z<@6*91ofiu3
z$_1uAwk!f%3vwbR9xMrnpRdyFY?hIdAgSFQzHVR_Pn=2w47N7LmbeL3S7Bmry4G%J
zI>)xpPD?-czW}kl?P7%MYWt6^-_A#0p$X;3p>^h>n^AXWB|ZW)s+xmX@HAjmG`-bj
z%DlIB#IBPVIIpuqx$fqUYUpze`Dk>CZ4SJlCAIr!B=`cNrIuSaVleZVj$WRj!^-zM
zQxi|8gzTs@D4gg&BiPVtGc5c?`}FlA-+J$5m%jCTmXm4>Zn94mj-KA^giuojGu~z;
zsd(P0ZOA=I27%PL8Lkzw(orR=cW*A4o}f)j1PiGTeK1g85A<a{Yl|#Tu13Bbtrj)I
zDl0y1WuGJuk^xP-gt~sbkj^l2BrT+6q~&(Maw#S%dioIK`w0DNb1edaQPm6hyUbo=
z-GtA3#vR{?D~)7*1G{!cc!}*abjn!7%_`pnDJCcnc7$fmE?D={mstXt>G~0R1y`je
z<b+;H>7Vt_2iJ@^*z~VH3yrpZWYYnAL7RG*E0~l!qTz|c+#yXWfQ-h=RV!DXQQvwz
zyC%?Oc4pE&C~dA&AR6MGe=SMK@Fo}^=uSTBJX8X??<7lJK*?aZ$ukF~%0GsSgVNz!
zH`$6;L%tue654p9|4F|4Ls)wx+2EQ8M$#z^7DR%Bkh|90D9=<r|GYXWd;9}qemD|B
zO^V#ZB80s?AGRwpO+bX9ceFGdo(u{dj{f-Y%@$mr=gT4>?O|oXTZonMt>iBzTXODz
Y@<XvUG&^b3ufGTfENv|wn7c>)4-CaofdBvi

literal 0
HcmV?d00001

diff --git a/src/assets/images/sunVillage_info/index_block_fbfsq.png b/src/assets/images/sunVillage_info/index_block_fbfsq.png
new file mode 100644
index 0000000000000000000000000000000000000000..68bfb8dbae11ca4b6f8b78efd90c86e3b475b5c1
GIT binary patch
literal 4309
zcmaJ_c|4SR`<`KBJBY;CGPWAqY#3%5GG=Iq>}5-)F&K=|%vh2wJ0V$$NLh+Vb&ync
zhp}c!WeX+Cp$?)%$!|L6bbjw2=Y5~g^L*F)y6@}W{&|vZjvo~fk`)2~03zljq8)d}
zb3d%W9`3jzp?j1&$*@hG*!B!Bb_khC1>ijyXQ&W!I@z0QM<sinJKIgg0RX%-nu8PD
z$;uK-VbEdZA2P5|dLS1K0N{><29ha$R5s)c)teSzsJ!yDSs6m}G*mvRXN9l|Bv5^5
zq%bDcKJ2&yCCrb4@l-xy1i^)3xeDl1HW?C1_YYuULk*Sx)Qjb=e;mV=A%BXn{S1}=
zBIRUd10gV&REQo7txZAdq9FPh7!r-Zpmen$C<Ia;j?jlAb+i#kECP+y!9f0gl)2WJ
zo?cixqS@cJxI05-A2vG>3x|h<gup^{U<{@=9ErhT;0P2Ph0^9qXtT}*u*sp?0W6iD
z8i-UDg-Hu!(-;Ae9~#ML7(r}9WiHddT%ZS9S^c9pfc1BvxFLgwk^|vL7y?eG|M2Ti
zX%^d#`u{ZkRhs2+E|3bhqp}!5ObRz2UMfGq+}QnZLq7z$Y_Qf$8aF9qe<FhtM5hL@
z&54G}+#8rD%@gZ|)YZr6=peQAFi4cPuAZ)!_8Ctd?trH1pFyAukY@}Ge(L!*Ji-Kx
z!V?X+nJ~p5k*2126ak4bH6bEU7(IfSzV1(~c>s$|4xmtf+NN=B|BXfbPb`+eq>|YT
zrUQfF|Fa5gd>Cv7%ZCvNArK(Yle7R&MhHv&M~41#m`G*Pf~lTnOa>kDXNa-1e=)C*
zFhS_*qA>(h0*XtWh&M&)VRZ2Ncnp&J>T;?7h4uWGu>Fn2|5q%WO9uX<KK`R#ejag)
z@W=9>>gR6$=^ttUw`rK%?&v5Utl@Snk2w+V5IX+eRXF2>qr#De$(2@02w7SZaiF&?
z1{HJrCb7K5Cs(f|Hp9WC2P$#F-o=U<>zwZOJo}(vYJAo#MR%WOY?qQEO_qp5@4Lc*
zjdv2<+<PgTUz^Tv@2nVZetl-RFv+-jK_-vZoVQ!R8dxq|Z{FS94R^EX{yrTQ6SVu}
z@?ctAfGS(1NKSAb9#kQ0IX<3vHe0C+P}$-AY=qU&INF()=&d+_@`tAp6l=yuShcX$
zVR6opFpC-UmSaiCZ5Ux<b}>rvQ?UO{g*j3A0Kp#NPmfLV<&^HljqZIW5IlIN#mx8@
zU%<d@{QZ($uk6@0%j}HKNo@8yV3#<J+W3_6avwJ5Z2q-p5Y?{HtLpUH(J8T2*_kkY
z>LS0&xBiaY93|yiUY3{2T%UOA8bMHB4##J3MA`dAup~T6nC@pAob5?MtO&IbV$^=k
z#@UZ4*^0WwUbTGHl?Qs$2puq+P|d!|v!|GmjF)-D1A8zRjf<u7SW9M}*4bVGgexXu
zZeQL8jx3aXI3(L$;tZ>uGcGVa&bf4>LK;K$%W17aCQr#xHOEm)egOwXj5TZ*V=hTM
zlC2%`Z3`9ZdK+WP<1iz)uC3QR`TSdB|K!X3bG~;Ie=Q8V!D-({-Ey}UQ!^MfrU#cN
z0K(kG$3epn)KUgGL(LW{UxDQ(ox0{uQTU6Lj!E7)_K8TLwOwf{t?PWNxe=5Rd|+_n
z)li~K3W-$5UtZPek=2NMgOI(mvi};u^n6qwtz>&X939(a>r>g`W|MTcaLOr9qzN`A
z?{>iWG5<jSmyc=S=i-ED+Yn`-Ks^Y4UJ71ir5l6TN~v<R_9&Wgmx-uXkpTi@K64yz
z%KKL0dLgpDkb6P)My|0<-C$vncGQz6BTa!RqnF-`rOH{$@~^^M<lMV5Q?xC*9)M=Q
zXh&$;eglrU_zmX~^dbaT30}+RM1ZZM2X6_Ld>#PWA%zi5W_qHbX>~8}S#9;Hl}GKD
zYZjoI?PgBm-*(*Zr}-oJS!0f&$7OcV5~Limz4y~n9E+Y?<Lbn--$zc>Vk;}51zY=C
zv8g>%@xb0q=#r!D*R$Or#RYe@dUJn4iuI@Q`ciO^-?N|$Q`fX9#;?5N{4xSgdqycX
zEkPIl5anF&=(~S^Y|~}p(ok?CRN-wtPB%}wi2hWTH%$qde(ILJdA?*-+gXE0I%<da
z#g$U$0fjLQqaP$w)8S7x`iBzHOa90pKSyo%FyO2ApH)FVr@gg%=Atpz<iFr7Vj`3`
z6e_GZNlURrvKbs!c|OoNYmPY+dAcFIWivP>_uZ>G6M10asrxOta<<=v27Tp@O<n<B
z!Rk8kWj>af3u}?k(&gK6tEYB_Z&VG<Mav#NL3!AVObJhxePdlY^F7}AAit<oeEw3y
zH^&3?_(SFqRsB|KsyGJZ-BZt)Igpxj;x(e;o_gp8U``XKo8ZM#3#pC0{PY_w^_=mG
z>*?Z=htkcPWP+y21dvU~j`>2;w+>Of&jb9}cc4d>I`wi(4rL^dv*^KVM;^%VHJR`i
zS5lcY7VQWDe)8EB?a>3*>{n}D;-PHnN)3xK;H4)UPLkl81pD!#2vuj-5A(oAP;A%p
zy)zx+`e$wJZ{OCEn9PP;&zGpnKYu_eHmh)6ifV(HI|^p0Ww2oL1s4}8r@Ot;!KBET
zmj<fmdh6W6)N9+lPFe!BnCBG#5DT=6ju=%%ui4yi+ap-5b=U_1=HJrlIobC(Wn@1}
z6&l-bx5lGsT#dQWt)ZduY=AZOE3d=ag_Xt@llHPMEbZV|v9*tnE@;C(6w8y&WUa6G
zS$Laz12dVVP}<04sq83_C2#6%(MW%ufT^6)EC$dadV36*8EuMMOG}h{y>MQnKYn8v
zN72R|@Y|?}j|z%%H@JV1*@CFx>GH5_gmPA3s*4GN7Y%Fn^p$~ING<Td!2-HO%^H~C
za)t`lgbFpiL09IW!%eDrGxqmhvRK=55<ezz)97o57&NDB5nUlql7(4{+;R1y&L-oA
zN+ZQC!i_OPtINfuuTtfPC4Hu&G1hyBd1&;-uz(B$K8lOb)V0Q@O%QQb{NdW?b~|07
zz^diTK{|*(hget<C}cP#czD%dxNkJtS4Hlv*GJM&QybYl)9UQL9_^Bb^ojGVF^&|o
zPvVIITW6HAme{n}7bSG(C^J)m8TIB~ce3%b!h&EZ)(kyokgCA9yQdGpb1+kb{hLUm
zkP_#TMbM<}!rbll81swDCa>)jQ%BF*q;%pi-rrO|@M#mvAex!&p2Om$Nr|m_RU&Tb
zw(Q*IEDcaN&vJwOC3Vmak1ylxqC)_zyjY`EhkamhIi_*%B~nKgMp@lN^@#_XBVYcT
z)6M<xP`OXmMMnEsQ@R{)(oXW^!|O^nAFWnaK0bZAeFteg75GJ}F%zU@?L_$1=X`}*
zT)F1>8&4fGmmNoOuaYjcL(*8e#^ywiAj8u4IalB3Hf;&{#K_u$#mbg&;cG^1PWw(Q
zd{(i$n@})1t)8FlX}a9q3u@0DUQhES*xNL<x35ag$=$o9)Ygxc_%!!)XXLsO<tUr@
zM)*=HdNQlG$K~=3q|-ZTfcQQ^Andt<*+|#-VuUp6Hq2a`8LLg)`;0}}x+i<A@49fk
z;3uSkr{U6R<DHJdBN^+Cx?{{#(e1aN4C6;?!u-VxDTYoe>qvOixvDO0kaFh|it~F_
z0_%BTwU@Wb*VaKq8@9|}g8EkQ*<w|s$Gj&nMb%lRWH7oIA|%F4r_G+45Ir{KFcZ$G
zMUx`?x*Yz1t$rPW%(qY^a}#e20cL40Y`agJL?~d7`+OzwCSS#j6cwR(mxJ@O6f!ff
zdzFs%n|;(DMQkm9m3Lr@E*%^E4C_!=fwSBy8V%d2DqRgGu8B@iiomHc*w(fo--=T1
zb9l>;i||u&MCHbbI;n;ZFjH&X{+bp(pn~xH#AT87#H|l^h<Po&0%pBV)hNz@dj5<n
z*(>?e3rFaZO4l{eq}3Z(?Tu*P2E3Y|mZPPbe~bcu#L9qiTT`a98&<w=xFkdKX`{!7
z8Qv5S9&9MR`Xxbzf-{HP$zG7sWQ7Y*7Bj>^S5(Tr6n?93#UiTa8gaLKXYXcvf7?+p
z+C3(x)d9Wu4)dN5>}+U{e~+4!-aD*ZfE;{#c<Or(qFFBiL>}ENwyZPvAz4^t`&Ji=
z<h!M2&hUsQEPDeJ1QLZ_h)(}v7gc5T(Q5#aWI3>RXB8@}Ggz25ztE!5?O<#U`COqn
z?r)l+-Rc7-_64Wry6%^{TrC(VJtGI!0Y>N;$XKP?R&x$LOexwO{c!$coFx6gRVwct
zhk<AwkHdYx;g>?Y-AA)2;bjLlhKyd?S|BdluvIS9!0LyGpB-I&r<xjQR$BU7!9$HE
z4-A=e3k(8<Ba=iq8xiur9Fz0}sV~12YL<jVi(EtQs<rc`O${Avdn!>inHT=1u7BD&
zl>Y3qdoPseCB&&$RPKdv6gcJ9b5Qt$f-dwQ(sAq6lPjz%3j-B#hI^HayDwa~$+zC8
zk7?*`)Yxct1-n;!99O?ls;tfNfi106EDq-c&pSPdNCx!`J>O7ike?G%BuwNxRT|SF
z6YL|lxx=Tw2z!vylH+H=QNnHO<|C{<pYXz@kG4KlCthtyJd7pjUMYy=xwQ&S9F5+#
zKATZ?PEwlvMI!m`8HjiN)iSLwz1mHW4tQ-`54;AwKg#hKE6Gr7Uh%j)v^Op;H35*E
z8nIY>Tv%}Xl!@M(t2K`{19UQPECjy=r}5#^w`0LI+0{<vE600|KNk0JzQ>!G^i9QJ
z#L_<27!Y7^u<^wx7ULp$$0%v*`~xYq7`by9!VlrGxhU(hIC|%8Sg>a*J9e=-x;c5(
zOjciB<q54iDRC=)0eIw4<NHirW#{NjOyJ@1KNdP)l|3*NH4>|9?P0u{mw?l7PmY1_
zHBIPixW9TF>1rwzi?#ue*PHBP8P)m>e50zQ!}FR;_)Yzq(~<f-m>ig&b@zp!@*`S2
zes=S2Oym5ctylSn(6C4ybTkK{sBuN%wl^48w(|BRV|jv9Y<J=d-@Sm)z<Jfv#nJI`
z(Gq-ok2~>8onuepa@#<X))j|^r)P_PzZ<2rJ^pAF!Sm1}el-X)B$@DeZc+ePw)}Zq
z{q&^EgOWs<Mzx#EkJqES;3bWTGO0sQkEa431@W2L@62De2D3RA0v^6jY??i2J{^fw
zf8!uEC|}~klH*gOVM>-UM`kRrhn@Ifbqyw<ErBaR@6b_YDEkl=KhLv*^Qn_E_DQ5~
zye)=4au)dgRP-Ss4ZTaXBNsI$BCel#l<N*(_&rkf<j%g>%ClrMY5l9vdPLu83yas6
zTkUUcPuo_{$ZV{<rE2v&-<f?KCHVgP!ZCe`;^|!w7yt+%L)}%6Km75d!QAvX@t%oC
G%>MyDf@~}R

literal 0
HcmV?d00001


From 78d08dc178ba66599a22bd484547b8066ccfd42c Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Mon, 28 Aug 2023 11:28:20 +0800
Subject: [PATCH 28/28] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../village/contractor/contractorFamily.vue   | 21 +++---
 .../village/contractor/contractorLand.vue     | 21 +++---
 .../contracted/village/massif/massif.vue      |  6 +-
 .../village/massif/massifDetail.vue           | 72 ++++++++++++-------
 4 files changed, 73 insertions(+), 47 deletions(-)

diff --git a/src/views/contracted/village/contractor/contractorFamily.vue b/src/views/contracted/village/contractor/contractorFamily.vue
index 4a1588a6..e2e5d7c5 100644
--- a/src/views/contracted/village/contractor/contractorFamily.vue
+++ b/src/views/contracted/village/contractor/contractorFamily.vue
@@ -63,10 +63,10 @@
       <p class="btn" @click="goDetail()" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">新增</p>
     </div>
     <van-popup v-model="showContractorPopup" position="bottom">
+      <van-search v-model="searchKeyword"  placeholder="请输入姓名搜索" />
       <van-picker
-        title="请选择新户主"
         show-toolbar
-        :columns="contractorList"
+        :columns="filteredContractors"
         @confirm="onConfirmContractorOptions"
         @cancel="showContractorPopup = false"
       >
@@ -98,6 +98,7 @@
         showContractorPopup: false,     // 控制承包方信息弹出层的显示和隐藏
         transferMemberId: null,         // 转出的成员ID
         taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
+        searchKeyword: '',              // 弹出框查询关键字
       };
     },
     created() {
@@ -105,6 +106,13 @@
       this.getList();
       this.getContractorList();
     },
+    computed: {
+      filteredContractors() {
+        return this.contractorList.filter(item => {
+          return item.cbfmc.indexOf(this.searchKeyword) !== -1;
+        })
+      }
+    },
     methods: {
       getList(){
         listJtcy({cbfbm: this.$route.params.cbfbm, translate_dict: 1}).then(response => {
@@ -185,6 +193,7 @@
           return false;
         }
         this.transferMemberId = item.id;
+        this.searchKeyword = '';
         this.showContractorPopup = true;
       },
       onConfirmContractorOptions(value) {
@@ -261,14 +270,6 @@
     border: none;
   }
 
-  /deep/ .van-search__content{
-    background: rgba(255,255,255,.5);
-  }
-  /deep/ .van-search{
-    padding: 0;
-    flex: 1;
-  }
-
   /deep/ .van-ellipsis{
     overflow: initial;
   }
diff --git a/src/views/contracted/village/contractor/contractorLand.vue b/src/views/contracted/village/contractor/contractorLand.vue
index 59efe841..def8b93e 100644
--- a/src/views/contracted/village/contractor/contractorLand.vue
+++ b/src/views/contracted/village/contractor/contractorLand.vue
@@ -62,9 +62,10 @@
         </template>
       </van-swipe-cell>
       <van-popup v-model="showContractorPopup" position="bottom">
+        <van-search v-model="searchKeyword"  placeholder="请输入姓名搜索" />
         <van-picker
           show-toolbar
-          :columns="contractorList"
+          :columns="filteredContractors"
           @confirm="onConfirmContractorOptions"
           @cancel="showContractorPopup = false"
         >
@@ -99,6 +100,7 @@
         showContractorPopup: false,     // 控制承包方信息弹出层的显示和隐藏
         transferLandId: null,           // 转出的承包地块ID
         taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
+        searchKeyword: '',              // 弹出框查询关键字
       };
     },
     created() {
@@ -106,6 +108,13 @@
       this.getList();
       this.getContractorList();
     },
+    computed: {
+      filteredContractors() {
+        return this.contractorList.filter(item => {
+          return item.cbfmc.indexOf(this.searchKeyword) !== -1;
+        })
+      }
+    },
     methods: {
       getList(){
         listCbdkxx({cbfbm: this.$route.params.cbfbm, translate_dict: 1}).then(response => {
@@ -166,6 +175,7 @@
       },
       transferLand(id) {
         this.transferLandId = id;
+        this.searchKeyword = '';
         this.showContractorPopup = true;
       },
       onConfirmContractorOptions(value) {
@@ -237,15 +247,6 @@
     border: none;
   }
 
-  /deep/ .van-search__content{
-    background: rgba(255,255,255,.5);
-  }
-
-  /deep/ .van-search{
-    padding: 0;
-    flex: 1;
-  }
-
   /deep/ .van-ellipsis{
     overflow: initial;
   }
diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue
index dac05e2d..303fc505 100644
--- a/src/views/contracted/village/massif/massif.vue
+++ b/src/views/contracted/village/massif/massif.vue
@@ -16,7 +16,7 @@
         v-model="value"
         shape="round"
         background="transparent"
-        placeholder="请输入地块代码搜索"
+        placeholder="请输入地块名称搜索"
         @search="onSearch"
       ></van-search>
 
@@ -78,7 +78,7 @@
         // 查询参数
         queryParams: {
           deptId: null,
-          dkbm: null,
+          dkmc: null,
           dklb: null,
           pageNum:1,
           pageSize:20,
@@ -132,7 +132,7 @@
         });
       },
       onSearch(){
-        this.queryParams.dkbm = this.value;
+        this.queryParams.dkmc = this.value;
         this.queryData();
       },
       landCategoryChange(dictValue, dictLabel) {
diff --git a/src/views/contracted/village/massif/massifDetail.vue b/src/views/contracted/village/massif/massifDetail.vue
index 1d602652..c4d4b558 100644
--- a/src/views/contracted/village/massif/massifDetail.vue
+++ b/src/views/contracted/village/massif/massifDetail.vue
@@ -53,7 +53,7 @@
                    right-icon="arrow-down"
                    readonly
                    clickable
-                   @click="showLandCategory = true"
+                   @click="openLandCategoryPopup"
         />
         <van-popup v-model="showLandCategory" position="bottom">
           <van-picker
@@ -213,13 +213,16 @@
     },
     created() {
       this.taskStatus = Cookies.get('taskStatus');
-      console.log(this.$route.query);
-      console.log(this.$route.params);
       this.getDicts("land_ownership").then(response => {
         this.syqxzOptions = response.data;
       });
       this.getDicts("land_type").then(response => {
         this.dklbOptions = response.data;
+        // 新增地块信息的时候，去除地块类别中的承包地块选项
+        if (!this.$route.query.id) {
+          let index = this.dklbOptions.findIndex(item => item.dictValue === '10');
+          this.dklbOptions.splice(index, 1);
+        }
       });
       this.getDicts("land_grade").then(response => {
         this.dldjOptions = response.data;
@@ -238,7 +241,9 @@
       if (this.$route.query.id) {
         this.titleName = '修改地块信息';
         this.isDisabled = true;
-        this.getDetail();
+        setTimeout(() => {
+          this.getDetail();
+        }, 500);
       } else {
         this.titleName = '新增地块信息';
         this.resetForm();
@@ -270,11 +275,11 @@
           deptId: null,
           dkbm: null,
           dkmc: null,
-          syqxz: null,
-          dklb: null,
-          tdlylx: null,
-          dldj: null,
-          tdyt: null,
+          syqxz: '30',
+          dklb: '99',
+          tdlylx: '01',
+          dldj: '01',
+          tdyt: '1',
           sfjbnt: '1',
           scmjm: null,
           zjrxm: null,
@@ -285,6 +290,11 @@
           dkbzxx: null,
           theGeom: null
         };
+        this.syqxzText = '集体土地所有权';
+        this.dklbText = '其他集体土地';
+        this.tdlylxText = '【1】耕地';
+        this.dldjText = '一等地';
+        this.tdytText = '种植业';
       },
       getCoordinates() {
         getDept(this.$route.query.deptId).then(response => {
@@ -303,6 +313,15 @@
         this.showOwnership = false;
       },
       onConfirmLandCategoryOptions(value){
+        /* if (this.$route.query.id && this.form.dklb === '10') {
+          this.$toast({
+            icon: 'fail',
+            message: '当前地块为承包地块，不能修改地块类别',
+            duration: '2000'
+          })
+          this.showLandCategory = false;
+          return ;
+        } */
         this.form.dklb = value.dictValue;
         this.dklbText = value.dictLabel;
         this.showLandCategory = false;
@@ -367,20 +386,6 @@
                 });
               }
             });
-            /* this.form.deptId = this.$route.params.deptId;
-            this.form.cbfbm = this.$route.params.cbfbm;
-            addCbdkxx(this.form).then(response => {
-              if (response.code == 200) {
-                this.$toast({
-                  icon: 'success',
-                  message: '保存成功',
-                  duration:"1000",
-                  onClose: () => {
-                    this.goBack();
-                  }
-                });
-              }
-            }); */
           }
         }).catch(() => {
           this.$notify({ type: 'danger', message: '请填写完整的表单项' });
@@ -399,7 +404,26 @@
         });
       },
       goBack() {
-        history.back(-1);
+        // history.back(-1);
+        this.$router.push({
+          path:'/contracted/village/massif',
+          query: {
+            deptId: this.$route.query.deptId,
+            deptName: this.$route.query.deptName,
+          }
+        });
+      },
+      openLandCategoryPopup() {
+        // 修改时 && 地块类别为承包地块  不允许打开地块类别弹出层
+        if (this.$route.query.id && this.form.dklb === '10') {
+          this.$toast({
+            icon: 'fail',
+            message: '当前地块为承包地块，不能修改地块类别',
+            duration: '2000'
+          })
+          return ;
+        }
+        this.showLandCategory = true;
       }
     },
   };