From cea4f9969c3545e5f5beb1c33706546d2b631885 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Fri, 18 Feb 2022 19:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                |   3 +-
 src/views/homesteadSurvey/add.vue  | 705 ++++++++++++++---------------
 src/views/homesteadSurvey/list.vue |   5 +-
 3 files changed, 350 insertions(+), 363 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 32d57575..b0ea06f6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1676,8 +1676,7 @@ export const constantRoutes = [
     name: 'homesteadList',
     meta: {
       title: '宅基地调查',
-      hidden: true,
-      keepAlive: true
+      hidden: true
     },
     component: (resolve) => require(['@/views/homesteadSurvey/list'], resolve)
   },
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 7aa7a986..8d30c315 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -220,13 +220,13 @@
             label="被惩处备注"
             placeholder="被惩处备注"
           />
-<!--          <van-field
-            v-model="form.zjdqdfs"
-            name="宅基地取得方式"
-            label="宅基地取得方式"
-            placeholder="宅基地取得方式"
-            :rules="[{ required: true, message: '' }]"
-          />-->
+          <!--          <van-field
+                      v-model="form.zjdqdfs"
+                      name="宅基地取得方式"
+                      label="宅基地取得方式"
+                      placeholder="宅基地取得方式"
+                      :rules="[{ required: true, message: '' }]"
+                    />-->
           <van-field name="radio" label="宅基地取得方式">
             <template #input>
               <van-radio-group v-model="form.zjdqdfs" direction="horizontal">
@@ -339,7 +339,6 @@
             label="备注"
             placeholder="备注"
           />
-          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -350,7 +349,7 @@
       <div style="margin:20px;">
         <p class="title" style="position:relative;padding-left:20px;line-height:32px;">使用权人</p>
       </div>
-      <van-swipe-cell v-for="(item,index) in syqrlist" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
+      <van-swipe-cell v-for="(item,index) in syqrlist" :key="'syqr'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
         <div style="padding:20px;">
           <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="manager" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
           <div style="display:flex;line-height:20px">
@@ -380,11 +379,104 @@
         <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActive">下一项</van-button>
       </div>
     </div>
+    <div v-if="active==3">
+      <div style="margin:20px;">
+        <p class="title" style="position:relative;padding-left:20px;line-height:32px;">自然幢</p>
+      </div>
+      <van-swipe-cell v-for="(item,index) in zrzlist" :key="'zrz'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
+        <div style="padding:20px;">
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
+          <div style="display:flex;line-height:20px">
+            <p style="flex:1;text-align:left;">证件号码</p>
+            <p  style="flex:1;text-align:right;">4413215200216562255Z00026</p>
+          </div>
+          <div style="display:flex;line-height:20px">
+            <p style="flex:1;text-align:left;">权利人类型</p>
+            <p style="flex:1;text-align:right;">个人</p>
+          </div>
+          <div style="text-align:center;overflow:auto;">
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showzrz=true">查看自然幢信息</van-button>
+          </div>
+        </div>
+        <template #right>
+          <van-button square text="删除" type="danger" class="delete-button" />
+        </template>
+      </van-swipe-cell>
+      <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
+        <div style="text-align:center;" >
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupzrz"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加自然幢信息</p>
+        </div>
+      </div>
+      <div style="margin:20px;">
+        <p class="title" style="position:relative;padding-left:20px;line-height:32px;">房屋信息</p>
+      </div>
+      <van-swipe-cell v-for="(item,index) in fwlist" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
+        <div style="padding:20px;">
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
+          <div style="display:flex;line-height:20px">
+            <p style="flex:1;text-align:left;">证件号码</p>
+            <p  style="flex:1;text-align:right;">4413215200216562255Z00026</p>
+          </div>
+          <div style="display:flex;line-height:20px">
+            <p style="flex:1;text-align:left;">权利人类型</p>
+            <p style="flex:1;text-align:right;">个人</p>
+          </div>
+          <div style="text-align:center;overflow:auto;">
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showfw=true">查看房屋信息</van-button>
+          </div>
+        </div>
+        <template #right>
+          <van-button square text="删除" type="danger" class="delete-button" />
+        </template>
+      </van-swipe-cell>
+      <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
+        <div style="text-align:center;" >
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupfw"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加房屋信息信息</p>
+        </div>
+      </div>
+      <div style="position:fixed;bottom:50px;left:25%;width:50%;text-align:center;">
+        <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActiveBack">上一项</van-button>
+        <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActive">下一项</van-button>
+      </div>
+    </div>
+    <div v-if="active==4">
+      <div style="margin:20px;">
+        <p class="title" style="position:relative;padding-left:20px;line-height:32px;">附属设施</p>
+      </div>
+      <van-swipe-cell v-for="(item,index) in fssslist" :key="'fsss'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
+        <div style="padding:20px;">
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
+          <div style="display:flex;line-height:20px">
+            <p style="flex:1;text-align:left;">证件号码</p>
+            <p  style="flex:1;text-align:right;">4413215200216562255Z00026</p>
+          </div>
+          <div style="display:flex;line-height:20px">
+            <p style="flex:1;text-align:left;">权利人类型</p>
+            <p style="flex:1;text-align:right;">个人</p>
+          </div>
+          <div style="text-align:center;overflow:auto;">
+            <van-button plain round color="#7AC943" size="mini" @click="showfsss=true" style="margin:0 auto;">查看附属设施信息</van-button>
+          </div>
+        </div>
+        <template #right>
+          <van-button square text="删除" type="danger" class="delete-button" />
+        </template>
+      </van-swipe-cell>
+      <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
+        <div style="text-align:center;" >
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopup3"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加附属设施信息</p>
+        </div>
+      </div>
+      <div style="position:fixed;bottom:50px;left:25%;width:50%;text-align:center;">
+        <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActiveBack">上一项</van-button>
+        <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActive">完成</van-button>
+      </div>
+    </div>
     <van-popup v-model="showsyqr" style="height:100%;width:100%;">
       <div class="bannerBg">
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;"
-          @click-left="showsyqr=!showsyqr"
+          @click-left="showsyqr=false"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -420,19 +512,19 @@
           />
 
           <van-field
-          v-model="form1.nmfwdm"
-          name="农民房屋代码"
-          label="农民房屋代码"
-          placeholder="农民房屋代码"
-          :rules="[{ required: true, message: '' }]"
-        />
+            v-model="form1.nmfwdm"
+            name="农民房屋代码"
+            label="农民房屋代码"
+            placeholder="农民房屋代码"
+            :rules="[{ required: true, message: '' }]"
+          />
           <van-field
-          v-model="form1.shyqrdbxm"
-          name="使用权人代表姓名"
-          label="使用权人代表姓名"
-          placeholder="使用权人代表姓名"
-          :rules="[{ required: true, message: '' }]"
-        />
+            v-model="form1.shyqrdbxm"
+            name="使用权人代表姓名"
+            label="使用权人代表姓名"
+            placeholder="使用权人代表姓名"
+            :rules="[{ required: true, message: '' }]"
+          />
           <van-field
             v-model="form1.shyqrdbzjlx"
             name="使用权人代表证件类型"
@@ -588,7 +680,7 @@
       <div class="bannerBg">
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;"
-          @click-left="showzrz=!showzrz"
+          @click-left="showzrz=false"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -698,7 +790,6 @@
             placeholder="备注"
             :rules="[{ required: true, message: '' }]"
           />
-          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -709,7 +800,7 @@
       <div class="bannerBg">
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;"
-          @click-left="showfw=!showfw"
+          @click-left="showfw=false"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -819,7 +910,6 @@
             placeholder="备注"
             :rules="[{ required: true, message: '' }]"
           />
-          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -830,7 +920,7 @@
       <div class="bannerBg">
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;"
-          @click-left="showfsss=!showfsss"
+          @click-left="showfsss=false"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -933,7 +1023,6 @@
             placeholder="备注"
             :rules="[{ required: true, message: '' }]"
           />
-          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -944,7 +1033,7 @@
       <div class="bannerBg">
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;"
-          @click-left="showhncy=!showhncy"
+          @click-left="showhncy=false"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -1020,7 +1109,7 @@
             :rules="[{ required: true, message: '' }]"
           />
           <van-field
-            v-model="form4.jzwqk"
+            v-model="form5.jzwqk"
             name="建筑物情况"
             label="建筑物情况"
             placeholder="建筑物情况"
@@ -1057,7 +1146,7 @@
       <div class="bannerBg">
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;"
-          @click-left="showhncylist=!showhncylist"
+          @click-left="showhncylist=false"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -1067,7 +1156,7 @@
           </template>
         </van-nav-bar>
       </div>
-      <van-swipe-cell v-for="(item,index) in hncylist" :key="index" @click="showPopuphncy" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
+      <van-swipe-cell v-for="(item,index) in hncylist" :key="index" @click.native="showPopuphncy" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
         <div style="padding:20px;">
           <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
           <div style="display:flex;line-height:20px">
@@ -1180,266 +1269,170 @@
           <div style="text-align:center;overflow:auto;">
             <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;">查看户主信息</van-button>
           </div>
-          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
         </van-form>
       </div>
     </van-popup>
-    <div v-if="active==3">
-      <div style="margin:20px;">
-        <p class="title" style="position:relative;padding-left:20px;line-height:32px;">自然幢</p>
-      </div>
-      <van-swipe-cell v-for="(item,index) in zrzlist" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
-        <div style="padding:20px;">
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
-          <div style="display:flex;line-height:20px">
-            <p style="flex:1;text-align:left;">证件号码</p>
-            <p  style="flex:1;text-align:right;">4413215200216562255Z00026</p>
-          </div>
-          <div style="display:flex;line-height:20px">
-            <p style="flex:1;text-align:left;">权利人类型</p>
-            <p style="flex:1;text-align:right;">个人</p>
-          </div>
-          <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopupzrz">查看自然幢信息</van-button>
-          </div>
-        </div>
-        <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
-        </template>
-      </van-swipe-cell>
-      <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
-        <div style="text-align:center;" >
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupzrz"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加自然幢信息</p>
-        </div>
-      </div>
-      <div style="margin:20px;">
-        <p class="title" style="position:relative;padding-left:20px;line-height:32px;">房屋信息</p>
-      </div>
-      <van-swipe-cell v-for="(item,index) in fwlist" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
-        <div style="padding:20px;">
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
-          <div style="display:flex;line-height:20px">
-            <p style="flex:1;text-align:left;">证件号码</p>
-            <p  style="flex:1;text-align:right;">4413215200216562255Z00026</p>
-          </div>
-          <div style="display:flex;line-height:20px">
-            <p style="flex:1;text-align:left;">权利人类型</p>
-            <p style="flex:1;text-align:right;">个人</p>
-          </div>
-          <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showfw=true">查看房屋信息</van-button>
-          </div>
-        </div>
-        <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
-        </template>
-      </van-swipe-cell>
-      <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
-        <div style="text-align:center;" >
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupfw"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加房屋信息信息</p>
-        </div>
-      </div>
-      <div style="position:fixed;bottom:50px;left:25%;width:50%;text-align:center;">
-        <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActiveBack">上一项</van-button>
-        <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActive">下一项</van-button>
-      </div>
-    </div>
-    <div v-if="active==4">
-      <div style="margin:20px;">
-        <p class="title" style="position:relative;padding-left:20px;line-height:32px;">附属设施</p>
-      </div>
-      <van-swipe-cell v-for="(item,index) in fssslist" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
-        <div style="padding:20px;">
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>刘茂强</p>
-          <div style="display:flex;line-height:20px">
-            <p style="flex:1;text-align:left;">证件号码</p>
-            <p  style="flex:1;text-align:right;">4413215200216562255Z00026</p>
-          </div>
-          <div style="display:flex;line-height:20px">
-            <p style="flex:1;text-align:left;">权利人类型</p>
-            <p style="flex:1;text-align:right;">个人</p>
-          </div>
-          <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" @click="showPopupfsss" style="margin:0 auto;">查看附属设施信息</van-button>
-          </div>
-        </div>
-        <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" />
-        </template>
-      </van-swipe-cell>
-      <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
-        <div style="text-align:center;" >
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopup3"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加附属设施信息</p>
-        </div>
-      </div>
-      <div style="position:fixed;bottom:50px;left:25%;width:50%;text-align:center;">
-        <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActiveBack">上一项</van-button>
-        <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActive">完成</van-button>
-      </div>
-    </div>
   </div>
 </template>
 
 <script>
   import {listShyqr} from "@/api/homesteadSurvey/shyqr";
-  import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand} from "@/api/homesteadSurvey/zjdzd";
-  import MapGisDrawing from "@/components/Map/MapGisDrawing";
-  import {listZrz,getZrzZjdDmList} from "@/api/homesteadSurvey/zrz";
-  import {listFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss";
-  import { listTown, getTown } from "@/api/homesteadSurvey/town";
-  import { listVillage} from "@/api/homesteadSurvey/village";
+  import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile} from "@/api/homesteadSurvey/zjdzd";
+  export default {
+    name: "homesteadAdd",
+    data() {
+      return {
+        active:1,
+        showsjly:false,
+        showPickerxzkssj:false,
+        showlyzk:false,
+        showsyqr: false,
+        showhncylist:false,
+        showhncy:false,
+        show1: false,
+        showzrz: false,
+        showfw:false,
+        showfsss:false,
+        show3: false,
+        username: '',
+        password: '',
+        // 路由数据
+        item:{},
+        //宅基地表单
+        form:{},
+        //使用权人表单
+        form1:{},
+        //自然幢表单
+        form3:{},
+        //附属设施表单
+        form4:{},
+        //成员信息表单
+        form5:{},
+        // 使用权人列表
+        syqrlist:[],
+        // 户内成员列表
+        hncylist:[1,1,1],
+        // 自然幢列表
+        zrzlist:[1,1,1],
+        // 房屋列表
+        fwlist:[1,1],
+        // 附属设施列表
+        fssslist:[1,1,1,1,1],
+        // 当前利用状况字典
+        lyzkOptions: [],
+        // 数据来源字典
+        sjlyOptions:[],
+        // 宅基地取得方式字典
+        zjdqdfsOptions:[],
+        // 宅基地图片
+        fileListzjd:[],
+      };
+    },
+    created(){
+      if(this.$cookies.get("search")){
+        this.item = this.$cookies.get("search");
+      }else{
+        this.$set(this.item,"deptId",this.$cookies.get("item").deptId)
+      }
+      this.getDicts("zjdlyzk").then(response => {
+        this.lyzkOptions = response.data;
+      });
+      this.getDicts("acquisition_method").then(response => {
+        this.zjdqdfsOptions = response.data;
+      });
+      this.getDicts("sjly").then(response => {
+        this.sjlyOptions = response.data;
+      });
+      this.getZjd()
+    },
+    mounted(){
 
+    },
+    methods: {
+      // 图片上传前
+      beforeReadzjd(file){
+        // 创建Canvas对象(画布)
+        let canvas =  document.createElement('canvas')
+        // 获取对应的CanvasRenderingContext2D对象(画笔)
+        let context = canvas.getContext('2d')
+        // 创建新的图片对象
+        let img = new Image()
+        // 指定图片的DataURL(图片的base64编码数据)
+        img.src = file.content
+        // 监听浏览器加载图片完成，然后进行进行绘制
+        const height = 166
+        const width = 316
+        img.onload = () => {
+          const h = img.height
+          const w = img.width
+          let ch = img.height/2
+          let cw = img.width/2
+          let canvas = document.createElement('canvas')
+          let ctx = canvas.getContext('2d')
+          canvas.height = ch
+          canvas.width = cw
+          ctx.clearRect(0,0,cw,ch)
+          ctx.drawImage(img,0,0,cw,ch)
+          let base_img = canvas.toDataURL('image/jpeg')
+          const blobBin = atob(base_img.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);
+            if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""){
+              this.form.zjdxctp = this.form.zjdxctp + "," + res.fileName
+            }else{
+              this.form.zjdxctp =  res.fileName
+            }
+          })
+        }
 
-  export default {
-      name: "homesteadAdd",
-      components: { MapGisDrawing,},
-      data() {
-        return {
-          active:1,
-          showsjly:false,
-          showPickerxzkssj:false,
-          showlyzk:false,
-          showsyqr: false,
-          showhncylist:false,
-          showhncy:false,
-          show1: false,
-          showzrz: false,
-          showfw:false,
-          showfsss:false,
-          show3: false,
-          username: '',
-          password: '',
-          // 路由数据
-          item:{},
-          //宅基地表单
-          form:{},
-          //使用权人表单
-          form1:{},
-          //自然幢表单
-          form3:{},
-          //附属设施表单
-          form4:{},
-          //成员信息表单
-          form5:{},
-          // 使用权人列表
-          syqrlist:[],
-          // 户内成员列表
-          hncylist:[1,1,1],
-          // 自然幢列表
-          zrzlist:[1,1,1],
-          // 房屋列表
-          fwlist:[1,1],
-          // 附属设施列表
-          fssslist:[1,1,1,1,1],
-          // 当前利用状况字典
-          lyzkOptions: [],
-          // 数据来源字典
-          sjlyOptions:[],
-          // 宅基地取得方式字典
-          zjdqdfsOptions:[],
-          // 宅基地图片
-          fileListzjd:[],
-        };
       },
-      created(){
-        this.item = this.$cookies.get("search");
-        this.getDicts("zjdlyzk").then(response => {
-          this.lyzkOptions = response.data;
-        });
-        this.getDicts("acquisition_method").then(response => {
-          this.zjdqdfsOptions = response.data;
-        });
-        this.getDicts("sjly").then(response => {
-          this.sjlyOptions = response.data;
-        });
-        this.getZjd()
+      // 图片删除
+      deleteFilezjd(file){
+        console.log(this.form.zjdxctp,file.baseUrl)
+        let url = ","+file.baseUrl
+        let url1 = file.baseUrl+","
+        this.form.zjdxctp = this.form.zjdxctp.replaceAll(url,"")
+        this.form.zjdxctp = this.form.zjdxctp.replaceAll(url1,"")
       },
-      mounted(){
-        this.mapClickLoading();
+      // 当前利用状况弹出框
+      onConfirmlyzk(value){
+        this.form.lyzkName = value.dictLabel
+        this.form.lyzk = value.dictValue
+        this.showlyzk = false
       },
-      methods: {
-        // 图片上传前
-        beforeReadzjd(file){
-          // 创建Canvas对象(画布)
-          let canvas =  document.createElement('canvas')
-          // 获取对应的CanvasRenderingContext2D对象(画笔)
-          let context = canvas.getContext('2d')
-          // 创建新的图片对象
-          let img = new Image()
-          // 指定图片的DataURL(图片的base64编码数据)
-          img.src = file.content
-          // 监听浏览器加载图片完成，然后进行进行绘制
-          const height = 166
-          const width = 316
-          img.onload = () => {
-            const h = img.height
-            const w = img.width
-            let ch = img.height/2
-            let cw = img.width/2
-            let canvas = document.createElement('canvas')
-            let ctx = canvas.getContext('2d')
-            canvas.height = ch
-            canvas.width = cw
-            ctx.clearRect(0,0,cw,ch)
-            ctx.drawImage(img,0,0,cw,ch)
-            let base_img = canvas.toDataURL('image/jpeg')
-            const blobBin = atob(base_img.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);
-              if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""){
-                this.form.zjdxctp = this.form.zjdxctp + "," + res.fileName
-              }else{
-                this.form.zjdxctp =  res.fileName
-              }
-            })
-          }
-
-        },
-        // 图片删除
-        deleteFilezjd(file){
-          console.log(this.form.zjdxctp,file.baseUrl)
-          let url = ","+file.baseUrl
-          let url1 = file.baseUrl+","
-          this.form.zjdxctp = this.form.zjdxctp.replaceAll(url,"")
-          this.form.zjdxctp = this.form.zjdxctp.replaceAll(url1,"")
-        },
-        // 当前利用状况弹出框
-        onConfirmlyzk(value){
-          this.form.lyzkName = value.dictLabel
-          this.form.lyzk = value.dictValue
-          this.showlyzk = false
-        },
-        onConfirmsjly(value){
-          this.form.sjlyName = value.dictLabel
-          this.form.sjly = value.dictValue
-          this.showsjly = false
-        },
-        // 闲置开始时间弹出框
-        onConfirmxzkssj(val){
-          let year = val.getFullYear()
-          let month = val.getMonth() + 1
-          let day = val.getDate()
-          if (month >= 1 && month <= 9) { month = `0${month}` }
-          if (day >= 1 && day <= 9) { day = `0${day}` }
-          this.form.xzkssj = year+"-"+month+"-"+day
-          this.showPickerxzkssj= false
-        },
-        goBack(){
-          this.$router.push({name:'homesteadList',params:{item:this.item}});
-        },
-        getZjd() {
+      onConfirmsjly(value){
+        this.form.sjlyName = value.dictLabel
+        this.form.sjly = value.dictValue
+        this.showsjly = false
+      },
+      // 闲置开始时间弹出框
+      onConfirmxzkssj(val){
+        let year = val.getFullYear()
+        let month = val.getMonth() + 1
+        let day = val.getDate()
+        if (month >= 1 && month <= 9) { month = `0${month}` }
+        if (day >= 1 && day <= 9) { day = `0${day}` }
+        this.form.xzkssj = year+"-"+month+"-"+day
+        this.showPickerxzkssj= false
+      },
+      goBack(){
+        this.$router.push({name:'homesteadList'});
+      },
+      getZjd() {
+        if(this.item.zjddm){
           let params = {
             "zjddm":this.item.zjddm
           }
+          console.log(this.item.zjddm)
           listZjdzd(params).then(response => {
             this.form = response.rows[0];
             this.fileListzjd = []
@@ -1453,112 +1446,106 @@
               }
             })
           });
-        },
-        getSyqrList() {
+        }
+      },
+      getSyqrList() {
+        if(this.item.zjddm) {
           let params = {
             "zjddm":this.item.zjddm
           }
           listShyqr(params).then(response => {
             this.syqrlist = response.rows;
           });
-        },
-        getZrzList() {
+        }
+      },
+      getZrzList() {
+        if(this.item.zjddm){
           let params = {
             "zjddm":this.item.zjddm
           }
           listZrz(params).then(response => {
             this.zrzlist = response.rows;
           });
-        },
-        getFsssList() {
+        }
+
+      },
+      getFsssList() {
+        if(this.item.zjddm){
           let params = {
             "zjddm":this.item.zjddm
           }
           listFsss(params).then(response => {
             this.fssslist = response.rows;
           });
-        },
-        onSubmitzjd(){
-          if (this.form.id != null) {
-            updateZjdzd(this.form).then(response => {
-              let _this =this
-              this.$toast({
-                icon: 'success', // 找到自己需要的图标
-                message: '修改成功',
-                duration:"1000",
-                onClose:function(){
-                  _this.active = 2
-                }
-              })
-            });
-          } else {
-            addZjdzd(this.form).then(response => {
-              let _this =this
-              this.$toast({
-                icon: 'success', // 找到自己需要的图标
-                message: '保存成功',
-                duration:"1000",
-                onClose:function(){
-                  _this.active = 2
-                }
-              })
-            });
-          }
-        },
-        showPopupsyqr() {
-          this.showsyqr = true;
-        },
-        showPopuphncy(){
-          this.showhncy = true
-        },
-        showPopup1() {
-          this.show1 = true;
-        },
-        showPopupzrz() {
-          this.showzrz = true;
-          this.mapClickLoading();
-        },
-        showPopupfw() {
-          this.showfw = true;
-        },
-        showPopupfsss() {
-          this.showfsss = true;
-          this.mapClickLoading();
-        },
-        showPopup3() {
-          this.show3 = true;
-          this.mapClickLoading();
-        },
-        onSubmit(values) {
-          console.log('submit', values);
-        },
-        changeActive(){
-          if(this.active<4){
-            this.active+=1
-          }else{
-            this.active=1
-          }
-        },
-        changeActiveBack(){
-          if(this.active>1){
-            this.active-=1
-          }else{
-            this.active=1
-          }
-        },
-        //地图加载js------start
-        mapClickLoading(){
-          setTimeout(() => {
-            this.$refs.drewingClickLoading.drawingPaceCountryDarw();
-          }, 500);
-        },
-        /** 查找地图中定位点 */
-        MapTag: function (data) {
-          this.form.theGeom = data;
-        },
-        //地图加载js------end
+        }
+      },
+      onSubmitzjd(){
+        if (this.form.id != null) {
+          updateZjdzd(this.form).then(response => {
+            let _this =this
+            this.$toast({
+              icon: 'success', // 找到自己需要的图标
+              message: '修改成功',
+              duration:"1000",
+              onClose:function(){
+                _this.active = 2
+              }
+            })
+          });
+        } else {
+          addZjdzd(this.form).then(response => {
+            let _this =this
+            this.$toast({
+              icon: 'success', // 找到自己需要的图标
+              message: '保存成功',
+              duration:"1000",
+              onClose:function(){
+                _this.active = 2
+              }
+            })
+          });
+        }
+      },
+      showPopupsyqr() {
+        this.showsyqr = true;
+      },
+      showPopuphncy(){
+        this.showhncy = true
+      },
+      showPopup1() {
+        this.show1 = true;
+      },
+      showPopupzrz() {
+        this.showzrz = true;
+      },
+      showPopupfw() {
+        this.showfw = true;
+      },
+      showPopupfsss() {
+        this.showfsss = true;
+      },
+      showPopup3() {
+        this.show3 = true;
+      },
+      onSubmit(values) {
+        console.log('submit', values);
+      },
+      changeActive(){
+        if(this.active<4){
+          this.active+=1
+        }else{
+          this.active=1
+        }
+      },
+      changeActiveBack(){
+        if(this.active>1){
+          this.active-=1
+        }else{
+          this.active=1
+        }
       }
     }
+  }
 </script>
 
 <style scoped>
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 6e26e0fc..56728927 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -958,8 +958,9 @@
         },
         // 入户核查搜索框新增。
         onClickzjd(){
-          let params = {"deptId":this.item.deptId}
-          this.$router.push({name:'homesteadAdd',params:{item:params}});
+          this.$cookies.remove("search");
+          this.$router.push({name:'homesteadAdd'});
+
         },
         // 农户信息搜索框新增。
         onClicksyqr(){