From 814e3968df05d8803c12091491003c80de955bc6 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Wed, 2 Mar 2022 17:36:16 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 15a54ee0..4e799471 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1384,7 +1384,6 @@
               this.mapAddJump = this.$cookies.get("item").backMapZjdAData.deptId;
               this.mapAddJumpNum =1;
               this.mapShow();
-              this.onSubmitnh();
             }
           }else {
             this.item = this.$cookies.get("item");
@@ -2813,9 +2812,17 @@
                   width: 6,
                 }),
               });
-              let params = {
-                "deptId" : that.$cookies.get("item").deptId,
-                "syqr" : val
+              let params;
+              if(that.mapAddJumpNum == 1){
+                params = {
+                  "deptId" : that.mapAddJump,
+                  "syqr" : val
+                }
+              } else {
+                params = {
+                  "deptId" : that.$cookies.get("item").deptId,
+                  "syqr" : val
+                }
               }
               listZjdzd(params).then((response) => {
                 console.log(response);

From 589da5e28d86bc694d02061286cd4e92120800dc Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Wed, 2 Mar 2022 17:48:38 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue  | 15 +++++++--------
 src/views/homesteadSurvey/list.vue |  2 ++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 9dc35cf9..088218ab 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -484,11 +484,10 @@
           <van-button plain round color="#22B7F2" size="mini" style="margin:0 auto;padding:20px;" @click="showPopupnh('')">+添加农户信息</van-button>
         </div>
       </div>
-
-      <div style="position:fixed;bottom:50px;left:25%;width:50%;text-align:center;">
+    <!--  <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>
     <div v-if="active==3">
       <div style="margin:20px;">
@@ -547,10 +546,10 @@
           <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;">
+      <!--<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>
     <div v-if="active==4">
       <div style="margin:20px;">
@@ -580,9 +579,9 @@
           <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupfsss('')"><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="searchCommit">签名确认</van-button>
+      <div style="position:fixed;bottom:0;left:5%;width:90%;text-align:center;">
+ <!--       <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActiveBack">上一项</van-button>-->
+        <van-button round color="#7AC943" style="width:100%" @click="searchCommit">签名确认</van-button>
       </div>
     </div>
     <van-popup v-model="showsyqr" style="height:100%;width:100%;">
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 4e799471..b0ff0fb6 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1384,6 +1384,8 @@
               this.mapAddJump = this.$cookies.get("item").backMapZjdAData.deptId;
               this.mapAddJumpNum =1;
               this.mapShow();
+              this.getZjdList();
+              this.getTotalHR();
             }
           }else {
             this.item = this.$cookies.get("item");

From 30fd57b8a5fc881264f282721df7c9ffc04f884b Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 3 Mar 2022 10:00:33 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue  | 2 +-
 src/views/homesteadSurvey/list.vue | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 088218ab..c834846d 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -293,7 +293,7 @@
           </van-field>
           <van-field name="uploader" label="宅基地现场照片" autocomplete="off">
             <template #input>
-              <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="4"></van-uploader>
+              <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="8"></van-uploader>
             </template>
           </van-field>
           <van-field
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index b0ff0fb6..f5290418 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1211,9 +1211,9 @@
           isLoadingnh:false,
           countnh:0,
           isLoadingzjd:false,
-          countqb:0,
-          countyhc:0,
-          countwhc:0,
+          countqb:1,
+          countyhc:1,
+          countwhc:1,
           // 使用权人表单弹出
           shownh:false,
           showhzht:false,
@@ -1463,6 +1463,7 @@
               "pageSize":10,
             }
             listZjdzd(params).then((response) => {
+
                 if(response.rows.length>0&&this.list2.length<response.total){
                   response.rows.map(res => {
                     this.list2.push(res)

From b27d975f1bdc80cc130740cb289d9e29b4de781c Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 3 Mar 2022 10:39:57 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 56 ++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index f5290418..6777b23d 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -66,13 +66,19 @@
           <van-cell  v-for="(item,index) in list" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
-              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}</p>
-              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无</p>
-            </template>
-            <template #default>
-              <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
-              <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
+                  <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                  <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+              </p>
+              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+              </p>
+
             </template>
+            <!--<template #default>
+
+            </template>-->
             <template #label>
               <p>宅基地代码:  {{item.zjddm}} </p>
               <p>宗地面积: {{item.zdmj}}㎡ </p>
@@ -96,13 +102,19 @@
           <van-cell  v-for="(item,index) in list1" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
-              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}</p>
-              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无</p>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+              </p>
+              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+              </p>
             </template>
-            <template #default>
+            <!--<template #default>
               <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
               <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
-            </template>
+            </template>-->
             <template #label>
               <p>宅基地代码:  {{item.zjddm}} </p>
               <p>宗地面积: {{item.zdmj}}㎡ </p>
@@ -126,13 +138,19 @@
           <van-cell  v-for="(item,index) in list2" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
-              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}</p>
-              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无</p>
+              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+              </p>
+              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+              </p>
             </template>
-            <template #default>
+            <!--<template #default>
               <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
               <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
-            </template>
+            </template>-->
             <template #label>
               <p>宅基地代码:  {{item.zjddm}} </p>
               <p>宗地面积: {{item.zdmj}}㎡ </p>
@@ -155,11 +173,13 @@
       <van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">
       <van-cell  v-for="(item,index) in nhlist" :key="index" size="small"  style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
         <template #title>
-          <p style="color:#22B7F2">{{item.hzxm}}</p>
-        </template>
-        <template #default>
-          <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;" @click="showPopupnh(item)">查看详情</van-button>
+          <p style="color:#22B7F2">{{item.hzxm}}
+            <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="showPopupnh(item)">查看详情</van-button>
+          </p>
         </template>
+<!--        <template #default>
+
+        </template>-->
         <template #label>
           <p>证件号码:{{item.hzzjhm}}</p>
           <p>农户代码:{{item.nhdm}}</p>

From b4a2bfc725044a12f60fa8a4decdc588eb7fa5f1 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 3 Mar 2022 10:53:59 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 6777b23d..7fe9d818 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -174,7 +174,9 @@
       <van-cell  v-for="(item,index) in nhlist" :key="index" size="small"  style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
         <template #title>
           <p style="color:#22B7F2">{{item.hzxm}}
-            <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="showPopupnh(item)">查看详情</van-button>
+
+            <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="showPopuphncylist(item)">查看成员</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="showPopupnh(item)">查看户主</van-button>
           </p>
         </template>
 <!--        <template #default>
@@ -4909,7 +4911,9 @@
 </script>
 
 <style scoped lang="scss">
-
+  /deep/ .van-swipe-cell__wrapper{
+    margin-right:-1px;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

From d1db02f1ffbdf25bc078968251e7c8268faaf169 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 3 Mar 2022 11:00:02 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 7fe9d818..91c309d7 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -175,7 +175,7 @@
         <template #title>
           <p style="color:#22B7F2">{{item.hzxm}}
 
-            <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="showPopuphncylist(item)">查看成员</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;margin-left:10px;" @click="showPopuphncylist(item)">查看成员</van-button>
             <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="showPopupnh(item)">查看户主</van-button>
           </p>
         </template>

From 597f156ba7b9d62861eff02d38c8569be11abb5c Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 3 Mar 2022 16:32:35 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/homesteadSurvey/index.js    |   9 ++
 src/components/circleProccess.vue   |  25 +++--
 src/views/homesteadSurvey/add.vue   | 155 ++++++++++++++++++++++------
 src/views/homesteadSurvey/index.vue |  88 +++++++++++++---
 src/views/homesteadSurvey/list.vue  |  26 ++---
 5 files changed, 234 insertions(+), 69 deletions(-)

diff --git a/src/api/homesteadSurvey/index.js b/src/api/homesteadSurvey/index.js
index 1e2a1812..743fd338 100644
--- a/src/api/homesteadSurvey/index.js
+++ b/src/api/homesteadSurvey/index.js
@@ -75,3 +75,12 @@ export function sysConfig(query) {
     params: query
   })
 }
+
+// 查询数据调查任务列表
+export function userList() {
+  return request({
+    url: '/houseSurvey/task/userList',
+    method: 'get'
+  })
+}
+
diff --git a/src/components/circleProccess.vue b/src/components/circleProccess.vue
index f620ec77..be0de655 100644
--- a/src/components/circleProccess.vue
+++ b/src/components/circleProccess.vue
@@ -35,11 +35,17 @@ export default {
     let cc = this.counts
      if(this.counts>0&&this.counts<99){
        cc+=1
-    }
+      }
     let time_canvas = document.getElementById(this.ids);
     time_canvas.width = document.documentElement.clientWidth/6;
     time_canvas.height = document.documentElement.clientWidth/6;
-    this.drawMain(time_canvas, cc, "#85d824", "#eef7e4");
+    if(this.counts<50){
+      this.drawMain(time_canvas, cc, "#FA5353", "#eef7e4");
+    }else if(this.counts<100){
+      this.drawMain(time_canvas, cc, "#22B7F2", "#eef7e4");
+    }else{
+      this.drawMain(time_canvas, cc, "#85d824", "#eef7e4");
+    }
   },
   methods: {
     drawMain(drawing_elem, percent, forecolor, bgcolor){
@@ -96,10 +102,17 @@ export default {
     text(n,forecolor) {
       this.context.save(); //save和restore可以保证样式属性只运用于该段canvas元素
       this.context.fillStyle = forecolor;
-      var font_size = document.documentElement.clientWidth/35;
-      this.context.font = font_size + "px arial";
-      var text_width = this.context.measureText(n.toFixed(0) + "%").width;
-      this.context.fillText(n.toFixed(0) + "%", this.center_x - text_width / 2, this.center_y + font_size / 2.5);
+      if(this.counts==100){
+        var font_size = document.documentElement.clientWidth/15;
+        this.context.font = font_size + "px arial";
+        var text_width = this.context.measureText(n.toFixed(0) + "%").width;
+        this.context.fillText("✔", this.center_x - text_width / 6, this.center_y + font_size / 2.5);
+      }else{
+        var font_size = document.documentElement.clientWidth/35;
+        this.context.font = font_size + "px arial";
+        var text_width = this.context.measureText(n.toFixed(0) + "%").width;
+        this.context.fillText(n.toFixed(0) + "%", this.center_x - text_width / 2, this.center_y + font_size / 2.5);
+      }
       this.context.restore();
     }
   }
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index c834846d..b01c5547 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -468,9 +468,9 @@
             <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
           </div>
           <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopupsyqr(item)">查看使用权人信息</van-button>
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopuphncylist(item)">查看户内成员信息</van-button>
-
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopupsyqr(item)">查看使用权人</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopupnh(item)">查看户主信息</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopuphncylist(item)">查看成员信息</van-button>
           </div>
         </div>
         <template #right>
@@ -1357,8 +1357,6 @@
             name="房屋编码"
             label="房屋编码"
             placeholder="房屋编码"
-            required
-            :rules="[{ required: true, message: '房屋编码不能为空' }]"
           />
           <van-field
             autocomplete="off"
@@ -3871,37 +3869,109 @@
           this.$router.push({name:'homesteadList'});
         }
       },
-      showPopupnh(){
+      showPopupnh(item){
         this.shownh = true;
-        let params = {
-          "deptId" : this.item.deptId
-        }
-        this.nhform={
-          "suyqrdm":null,
-          "deptId":this.item.deptId,
-          "hzzjlx":'01',
-          "hzzjlxName":"身份证",
-          "hyzk":'02',
-          "occupation":'1',
-          "occupationName":'务农',
-          "jzqk":'3',
-          "jzqkName":'常年居住',
-          "jzhcssfyzf":'1',
-          "jzhcssfyzfName":'无住房',
-          "zqtczsfyzf":'Y',
-          "sfbccm":'Y',
-          "sfpkh":'N',
-          "sfwbh":'N',
-          "sjly":'07',
-          "sjlyName":'农村集体产权制度改革',
-        }
-        listSuyqr(params).then((response) => {
-          if(response.rows.length>0){
-            this.nhform.suyqrdm = response.rows[0].suyqrdm
-          }else{
-            this.nhform.suyqrdm = this.form.suyqrdm
+        if(item==""){
+          let params = {
+            "deptId" : this.item.deptId
           }
-        });
+          this.nhform={
+            "suyqrdm":null,
+            "deptId":this.item.deptId,
+            "hzzjlx":'01',
+            "hzzjlxName":"身份证",
+            "hyzk":'02',
+            "occupation":'1',
+            "occupationName":'务农',
+            "jzqk":'3',
+            "jzqkName":'常年居住',
+            "jzhcssfyzf":'1',
+            "jzhcssfyzfName":'无住房',
+            "zqtczsfyzf":'Y',
+            "sfbccm":'Y',
+            "sfpkh":'N',
+            "sfwbh":'N',
+            "sjly":'07',
+            "sjlyName":'农村集体产权制度改革',
+          }
+          listSuyqr(params).then((response) => {
+            if(response.rows.length>0){
+              this.nhform.suyqrdm = response.rows[0].suyqrdm
+            }else{
+              this.nhform.suyqrdm = this.form.suyqrdm
+            }
+          });
+        }else{
+          let params = {
+            "deptId" : this.item.deptId,
+            nhdm:item.nhdm
+          }
+          listNh(params).then((response) => {
+            this.nhform = response.rows[0]
+            if(this.nhform.hzzjlx==null||this.nhform.hzzjlx==''){
+              this.nhform.hzzjlx = '01'
+              this.nhform.hzzjlxName = '身份证'
+            }
+            if(this.nhform.hyzk==null||this.nhform.hyzk==''){
+              this.nhform.hyzk = '02'
+            }
+            if(this.nhform.occupation==null||this.nhform.occupation==''){
+              this.nhform.occupation = '1'
+              this.nhform.occupationName = '务农'
+            }
+            if(this.nhform.jzqk==null||this.nhform.jzqk==''){
+              this.nhform.jzqk = '3'
+              this.nhform.jzqkName = '常年居住'
+            }
+            if(this.nhform.jzhcssfyzf==null||this.nhform.jzhcssfyzf==''){
+              this.nhform.jzhcssfyzf = '1'
+              this.nhform.jzhcssfyzfName = '无住房'
+            }
+            if(this.nhform.zqtczsfyzf==null||this.nhform.zqtczsfyzf==''){
+              this.nhform.zqtczsfyzf = 'Y'
+            }
+            if(this.nhform.sfbccm==null||this.nhform.sfbccm==''){
+              this.nhform.sfbccm = 'Y'
+            }
+            if(this.nhform.sfpkh==null||this.nhform.sfpkh==''){
+              this.nhform.sfpkh = 'N'
+            }
+            if(this.nhform.sfwbh==null||this.nhform.sfwbh==''){
+              this.nhform.sfwbh = 'N'
+            }
+            if(this.nhform.sjly==null||this.nhform.sjly==''){
+              this.nhform.sjly = '07'
+              this.nhform.sjlyName = '农村集体产权制度改革'
+            }
+
+            this.jzhcssfyzfOptions.map(res => {
+              if(res.dictValue == this.nhform.jzhcssfyzf){
+                this.nhform.jzhcssfyzfName = res.dictLabel
+              }
+            })
+            this.zjlxOptions.map(res => {
+              if(res.dictValue == this.nhform.hzzjlx){
+                this.nhform.hzzjlxName = res.dictLabel
+              }
+            })
+            this.occupationOptions.map(res => {
+              if(res.dictValue == this.nhform.occupation){
+                this.nhform.occupationName = res.dictLabel
+              }
+            })
+            this.jzqkOptions.map(res => {
+              if(res.dictValue == this.nhform.jzqk){
+                this.nhform.jzqkName = res.dictLabel
+              }
+            })
+            this.sjlyOptions.map(res => {
+              if(res.dictValue == this.nhform.sjly){
+                this.nhform.sjlyName = res.dictLabel
+              }
+            })
+          });
+        }
+
       },
       getZjd() {
         let _this = this
@@ -4180,6 +4250,22 @@
       },
       // 户主保存
       onSubmitnh(){
+        if(this.nhform.id!=null){
+          updateNh(this.nhform).then(
+            response => {
+              let _this =this
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '修改成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.shownh = false
+                  _this.getNh()
+                }
+              })
+            }
+          );
+        }else{
           this.nhform.deptId = this.item.deptId
           addNh(this.nhform).then(
             response => {
@@ -4194,6 +4280,7 @@
               })
             }
           );
+        }
       },
       // 自然幢保存
       onSubmitzrz(){
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index 4755a8b2..690575e0 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -64,14 +64,23 @@
       </div>
 
     <div v-if="active==1" style="height:calc( 100vh - 350px);overflow-y:auto;">
-      <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
-      <van-cell  v-for="(item,index) in totalList" :key="item.id" :title="item.deptName" size="small" @click.native="setCookies(item)" :to="{name:'homesteadList'}"style="border-radius: 16px;
+      <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask" :immediate-check="false">
+      <van-cell  v-for="(item,index) in totalList" :key="item.id" size="small" @click.native="setCookies(item)" :to="{name:'homesteadList'}"style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
+        <template #title>
+          <div>{{item.deptName}}
+            <p style="float:right">
+              {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
+            </p>
+          </div>
+        </template>
         <template #default>
           <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
         </template>
         <template #label>
-          开始时间:{{item.planBeginTime}}<br/> 结束时间:{{item.planEndTime}}
+          {{item.planBeginTime}}~{{item.planEndTime}}
+          <br/>
+          {{taskExecutorChange(item)}}
         </template>
         <template #icon>
           <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
@@ -81,13 +90,20 @@
     </div>
     <div v-if="active==2" style="height:calc( 100vh - 350px);overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
-      <van-cell  v-for=" (item,index) in doneList" :key="item.id" :title="item.deptName" size="small" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
+      <van-cell  v-for=" (item,index) in doneList" :key="item.id" size="small" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
+        <template #title>
+          <p>{{item.deptName}}
+            {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
+          </p>
+        </template>
         <template #default>
           <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
         </template>
         <template #label>
-          开始时间:{{item.planBeginTime}}<br/> 结束时间:{{item.planEndTime}}
+          {{item.planBeginTime}}~{{item.planEndTime}}
+          <br/>
+          {{taskExecutorChange(item)}}
         </template>
         <template #icon>
           <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
@@ -97,13 +113,20 @@
     </div>
     <div v-if="active==3" style="height:calc( 100vh - 350px);overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
-      <van-cell  v-for=" (item,index) in todoList" :key="item.id" :title="item.deptName" size="small" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
+      <van-cell  v-for=" (item,index) in todoList" :key="item.id" size="small" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
+        <template #title>
+          <p>{{item.deptName}}
+            {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
+          </p>
+        </template>
         <template #default>
           <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
           </template>
         <template #label>
-          开始时间:{{item.planBeginTime}}<br/> 结束时间:{{item.planEndTime}}
+          {{item.planBeginTime}}~{{item.planEndTime}}
+          <br/>
+          {{taskExecutorChange(item)}}
         </template>
         <template #icon>
           <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
@@ -116,7 +139,7 @@
 </template>
 
 <script>
-  import {addTask, complete, delTask, exportTask, getTask, listTask, publish, updateTask} from "@/api/homesteadSurvey/index";
+  import {addTask, complete, delTask, exportTask, getTask, listTask, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
   import {getInfo} from "../../api/login";
    import CircleProccess from "@/components/circleProccess.vue";
   import {updateUserPwd} from "../../api/onlineHome/my";
@@ -127,7 +150,6 @@
       },
       data() {
         return {
-
           active: 1,
           show: false,
           loading: false,
@@ -154,8 +176,21 @@
           countqb:0,
           countyhc:0,
           countwhc:0,
+
+          //宅调人员列表
+          taskExecutortions:[],
         };
       },
+      created(){
+        userList().then(response => {
+          this.taskExecutortions = response.data
+        })
+        getInfo().then(response => {
+          this.nickName = response.user.nickName
+          this.queryParams.taskExecutor = response.user.userName
+          this.getList();
+        });
+     },
       mounted(){
         // 监听屏幕方向
         let self = this;
@@ -168,15 +203,30 @@
           },
           false
         );
-        getInfo().then(response => {
-          this.nickName = response.user.nickName
-          this.queryParams.taskExecutor = response.user.userName
-          this.getList();
-        });
-
       },
       methods: {
-
+        taskExecutorChange(row){
+          if(row.taskExecutor!=null&&row.taskExecutor!=""&&row.taskExecutor.length>1){
+            var actions = [];
+            row.taskExecutor.map(res => {
+              for(let i = 0;i<this.taskExecutortions.length;i++){
+                if(res == this.taskExecutortions[i].userName){
+                  actions.push(this.taskExecutortions[i].nickName)
+                }
+              }
+            })
+            return actions.join(',');
+          }else{
+            var actions = [];
+            Object.keys(this.taskExecutortions).some((key) => {
+              if (this.taskExecutortions[key].userName == ('' + row.taskExecutor)) {
+                actions.push(this.taskExecutortions[key].nickName);
+                return true;
+              }
+            })
+            return actions.join(',');
+          }
+        },
         onRefreshtask(){
           this.isLoadingtask = false;
           let _this = this
@@ -245,6 +295,9 @@
                 this.todo+=1
                 this.todoList.push(res);
               }
+              if(res.taskExecutor!=null&&res.taskExecutor!=''){
+                res.taskExecutor = res.taskExecutor.split(',')
+              }
             })
           });
         },
@@ -259,6 +312,9 @@
 </script>
 
 <style  scoped>
+  >>> .van-cell__title{
+    flex:3
+  }
   >>> .sss {
     display: flex;
   }
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 91c309d7..47137966 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1459,14 +1459,14 @@
         onRefreshzjd(){
           this.isLoadingzjd = false;
           let _this = this
-          if(this.active==1){
-            let params = {
-              "deptId" : this.item.deptId,
-              "houseDataConfirmStatus" : "CONFIRMED",
-              "pageNum": this.countyhc+1,
-              "pageSize":10,
-            }
-            listZjdzd(params).then((response) => {
+          if(this.active==1&&this.loading2){
+              let params = {
+                "deptId" : this.item.deptId,
+                "houseDataConfirmStatus" : "CONFIRMED",
+                "pageNum": this.countyhc+1,
+                "pageSize":10,
+              }
+              listZjdzd(params).then((response) => {
                 if(response.rows.length>0&&this.list1.length<response.total){
                   response.rows.map(res => {
                     this.list1.push(res)
@@ -1474,10 +1474,11 @@
                   this.countyhc++
                   this.loading2 = false
                 }else{
+                  this.loading2 = false
                   this.finished2 = true
                 }
-            });
-          }else if(this.active==2){
+              });
+          }else if(this.active==2&&this.loading3){
             let params = {
               "deptId" : this.item.deptId,
               "houseDataConfirmStatus" : "UNCONFIRMED",
@@ -1485,7 +1486,6 @@
               "pageSize":10,
             }
             listZjdzd(params).then((response) => {
-
                 if(response.rows.length>0&&this.list2.length<response.total){
                   response.rows.map(res => {
                     this.list2.push(res)
@@ -1496,7 +1496,7 @@
                   this.finished3 = true
                 }
             });
-          }else{
+          }else if(this.active==0&&this.loading1){
             let params = {
               "deptId" : this.item.deptId,
               "pageNum": this.countqb+1,
@@ -1968,7 +1968,7 @@
             this.showhncylist =  true
             let params = {
               "nhdm":item.nhdm,
-              "deptId":this.item.deptId
+              "deptId":this.item.deptIdget
             }
             listNhhncy(params).then((response) => {
               if (response.code == 200) {

From 1732fb479b1c8683b88b1f23450fa1f2289f4db4 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 3 Mar 2022 16:46:41 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 8af01cc0..f10a2b07 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -77,7 +77,10 @@ service.interceptors.response.use(res => {
           } else if (window.location.href.indexOf('homesteadSurvey')!= -1) {
             window.location.href = '/homesteadLogin';
           } else {
-            window.location.href = '/index';
+            // 农村宅基地调查
+            window.location.href = '/homesteadLogin';
+
+            /*window.location.href = '/index';*/
           }
         })
       })

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

---
 src/views/homesteadSurvey/add.vue  | 4 ++--
 src/views/homesteadSurvey/list.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index b01c5547..12aeb614 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -469,8 +469,8 @@
           </div>
           <div style="text-align:center;overflow:auto;">
             <van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopupsyqr(item)">查看使用权人</van-button>
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopupnh(item)">查看户主信息</van-button>
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopuphncylist(item)">查看成员信息</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopupnh(item)">查看户主</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopuphncylist(item)">查看成员</van-button>
           </div>
         </div>
         <template #right>
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 47137966..4869367d 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1968,7 +1968,7 @@
             this.showhncylist =  true
             let params = {
               "nhdm":item.nhdm,
-              "deptId":this.item.deptIdget
+              "deptId":this.item.deptId
             }
             listNhhncy(params).then((response) => {
               if (response.code == 200) {

From e800eb37d94c1390886eac76ea73aa4be0c78f48 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Fri, 4 Mar 2022 09:20:44 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E8=87=AA=E7=84=B6=E5=B9=A2=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 12aeb614..3a4e1083 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -3084,6 +3084,8 @@
         },
         //记录是否从地图进入
         enterMap: "",
+        //记录从地图进入宅基地代码
+        enterMapZjddm:"",
       };
     },
     created(){
@@ -3200,6 +3202,7 @@
           this.backMap.activeBtn = 4;
           this.enterMap =1;
           this.backMap.backMapZjdAData =this.$cookies.get("search").mapZjdAData;
+          this.enterMapZjddm = this.$cookies.get("search").mapZjdAData.zjddm;
           //返回地图值记录----end
           this.active = this.$cookies.get("search").active
           this.item = this.$cookies.get("search").mapZjdAData
@@ -5024,9 +5027,16 @@
           .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
           .then((res) => {
             this.resultImg = res;
-            if(this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){
-              updateZrzZt(this.$cookies.get("search").zjddm).then(response => {});
-              updateFsssZt(this.$cookies.get("search").zjddm).then(response => {});
+            if(this.enterMap ==1){
+              if(this.enterMapZjddm !="" && this.enterMapZjddm !=undefined && this.enterMapZjddm !=null){
+                updateZrzZt(this.enterMapZjddm).then(response => {});
+                updateFsssZt(this.enterMapZjddm).then(response => {});
+              }
+            }else {
+              if(this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){
+                updateZrzZt(this.$cookies.get("search").zjddm).then(response => {});
+                updateFsssZt(this.$cookies.get("search").zjddm).then(response => {});
+              }
             }
           })
           .catch((err) => {

From 54586bb789c50b6e79c787377097e539fa0c9c35 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Fri, 4 Mar 2022 10:28:18 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E8=87=AA=E7=84=B6=E5=B9=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue  | 11 +++++++----
 src/views/homesteadSurvey/list.vue |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 3a4e1083..fe6e94ec 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -3081,6 +3081,7 @@
         backMap:{
           activeBtn:"",
           backMapZjdAData:"",
+          deptId:"",
         },
         //记录是否从地图进入
         enterMap: "",
@@ -3202,12 +3203,14 @@
           this.backMap.activeBtn = 4;
           this.enterMap =1;
           this.backMap.backMapZjdAData =this.$cookies.get("search").mapZjdAData;
+          this.backMap.deptId = this.$cookies.get("search").mapZjdAData.deptId;
           this.enterMapZjddm = this.$cookies.get("search").mapZjdAData.zjddm;
           //返回地图值记录----end
-          this.active = this.$cookies.get("search").active
-          this.item = this.$cookies.get("search").mapZjdAData
-          let zrz = this.$cookies.get("search").mapZrzAData
-          let fsss = this.$cookies.get("search").mapFsssAData
+          this.active = this.$cookies.get("search").active;
+          this.item = this.$cookies.get("search").mapZjdAData;
+          this.form = this.$cookies.get("search").mapZjdAData;
+          let zrz = this.$cookies.get("search").mapZrzAData;
+          let fsss = this.$cookies.get("search").mapFsssAData;
           this.getnhdmlist();
           this.getBaseUrl();
           this.getZjd();
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 4869367d..38235565 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -4006,6 +4006,7 @@
                         //that.mapZjdData = cloneObj;
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){
                         //that.mapZjdTeAll.mapZjdAData ={};
+                        that.mapZjdDataTure="";
                         that.mapZjdTeAll.mapFsssAData ={};
                         map.removeLayer(hc_land_on);
                         let obj = {};
@@ -4111,6 +4112,7 @@
                         }
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss"){
                         that.mapZjdTeAll.mapZrzAData ={};
+                        that.mapZjdDataTure="";
                         //that.mapZjdTeAll.mapZjdAData ={};
                         map.removeLayer(hc_land_on);
                         let obj = {};

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

---
 src/views/homesteadSurvey/add.vue | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index fe6e94ec..47b9b381 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -1326,7 +1326,7 @@
             name="农户代码"
             label="农户代码"
             placeholder="选择农户代码"
-            @click="shownmfwnhdm = true"
+            @click="shownmfwnhdm = true,getSyqrList()"
             readonly
             required
             :rules="[{ required: true, message: '农户代码不能为空' }]"
@@ -2791,11 +2791,11 @@
     </van-popup>
     <!--农民房屋农户代码列表-->
     <van-popup v-model="shownmfwnhdm" position="bottom">
-      <van-search v-model="nhdmValue" placeholder="请输入搜索关键词" @input="getnhdmlist"/>
+      <!--<van-search v-model="nhdmValue" placeholder="请输入搜索关键词" @input="getnhdmlist"/>-->
       <van-picker
         show-toolbar
-        :columns="syqrnhdmlist"
-        value-key="hzxm"
+        :columns="syqrlist"
+        value-key="shyqrdbxm"
         @confirm="onConfirmnmfwnhdm"
         @cancel="shownmfwnhdm = false"
       />
@@ -3875,6 +3875,24 @@
           this.$router.push({name:'homesteadList'});
         }
       },
+      // 删除房屋
+      deletefw(id,index){
+        Dialog.confirm({
+          title: '警告',
+          message: '删除后无法恢复，确认删除么？',
+        })
+          .then(() => {
+            // on confirm
+            delNmfw(id).then(response => {
+              if(response.code=='200'){
+                this.fwlist.splice(index,1)
+              }
+            })
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
       showPopupnh(item){
         this.shownh = true;
         if(item==""){

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

---
 src/api/homesteadSurvey/nh.js      |   8 ++
 src/api/homesteadSurvey/shyqr.js   |   9 ++
 src/api/homesteadSurvey/zjdzd.js   |   9 ++
 src/views/homesteadSurvey/add.vue  | 105 +++++++++++++----
 src/views/homesteadSurvey/list.vue | 174 ++++++++++++++++++++++++-----
 5 files changed, 258 insertions(+), 47 deletions(-)

diff --git a/src/api/homesteadSurvey/nh.js b/src/api/homesteadSurvey/nh.js
index 7eca92ee..a8fc6bad 100644
--- a/src/api/homesteadSurvey/nh.js
+++ b/src/api/homesteadSurvey/nh.js
@@ -69,3 +69,11 @@ export function delNh(id) {
   })
 }
 
+// 设为户主-户主信息
+export function setNhInfo(data) {
+  return request({
+    url: '/houseSurvey/nh/setNhInfo',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/homesteadSurvey/shyqr.js b/src/api/homesteadSurvey/shyqr.js
index 49dfeec7..7123c92a 100644
--- a/src/api/homesteadSurvey/shyqr.js
+++ b/src/api/homesteadSurvey/shyqr.js
@@ -61,3 +61,12 @@ export function delShyqr(id) {
   })
 }
 
+// 设为户主-使用权人
+export function setSyqrInfo(data) {
+  return request({
+    url: '/houseSurvey/shyqr/setSyqrInfo',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/src/api/homesteadSurvey/zjdzd.js b/src/api/homesteadSurvey/zjdzd.js
index f62148f9..14160033 100644
--- a/src/api/homesteadSurvey/zjdzd.js
+++ b/src/api/homesteadSurvey/zjdzd.js
@@ -77,3 +77,12 @@ export function getQueryLand() {
     method: 'get'
   })
 }
+
+// 查询数据调查-宅基地宗地列表
+export function delZjdzdInfo(query) {
+  return request({
+    url: '/houseSurvey/zjdzd/delZjdzdInfo',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 47b9b381..b9632fbb 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -511,7 +511,7 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" @click="deletezrz(item.id,index)"/>
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletezrz(item,index)"/>
         </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;">
@@ -2654,6 +2654,7 @@
           </div>
         </div>
         <template #right>
+          <van-button square text="设为户主" type="primary" style="height:100%" @click="setNh(item,index)"/>
           <van-button square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)" />
         </template>
       </van-swipe-cell>
@@ -2864,14 +2865,14 @@
 </template>
 
 <script>
-  import {listShyqr,addShyqr,updateShyqr,delShyqr} from "@/api/homesteadSurvey/shyqr";
+  import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
   import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand} from "@/api/homesteadSurvey/zjdzd";
   import MapGisDrawing from "@/components/Map/MapGisDrawing";
   import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzZt} from "@/api/homesteadSurvey/zrz";
   import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
   import {listSuyqr,addSuyqr,updateSuyqr} from "@/api/homesteadSurvey/suyqr";
   import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
-  import {addNh, delNh, exportNh, getNh, listNh, updateNh} from "@/api/homesteadSurvey/nh";
+  import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
   import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssZt} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
@@ -3335,22 +3336,43 @@
             // on cancel
           });
       },// 删除自然幢
-      deletezrz(id,index){
-        Dialog.confirm({
-          title: '警告',
-          message: '删除后无法恢复，确认删除么？',
-        })
-          .then(() => {
-            // on confirm
-            delZrz(id).then(res => {
-              if(res.code=="200"){
-                this.zrzlist.splice(index,1);
-              }
-            })
+      deletezrz(item,index){
+        this.zrzh = item.zrzh
+        if(this.item.zjddm!=null||this.form.zjddm!=null) {
+          let params = {
+            "zjddm":this.item.zjddm?this.item.zjddm:this.form.zjddm,
+            deptId:this.item.deptId,
+            zrzh:this.zrzh
+          }
+          listNmfw(params).then(r => {
+            if(r.rows.length>0){
+              this.$toast({
+                icon: 'erroe', // 找到自己需要的图标
+                message: '无法删除，此自然幢下有房屋信息！',
+                duration:"1000",
+                onClose:function(){
+                }
+              })
+            }else{
+              Dialog.confirm({
+                title: '警告',
+                message: '删除后无法恢复，确认删除么？',
+              })
+                .then(() => {
+                  // on confirm
+                  delZrz(item.id).then(res => {
+                    if(res.code=="200"){
+                      this.zrzlist.splice(index,1);
+                    }
+                  })
+                })
+                .catch(() => {
+                  // on cancel
+                });
+            }
           })
-          .catch(() => {
-            // on cancel
-          });
+        }
+
       },
       // 删除使用权人
       deletesyqr(id,index){
@@ -3875,6 +3897,45 @@
           this.$router.push({name:'homesteadList'});
         }
       },
+      // 设为户主
+      setNh(item,index){
+        Dialog.confirm({
+          title: '警告',
+          message: '此操作将删除原户主，并将此成员设为新户主，是否确认操作？',
+        })
+          .then(() => {
+            // on confirm
+            delNhhncy(item.id).then(res => {
+              if(res.code=="200"){
+                this.hncylist.splice(index,1);
+              }
+            })
+            // 更新户主信息
+            let pnh = {
+              deptId : item.deptId,
+              nhdm : item.nhdm,
+              hzxm:item.xm,
+              hzzjlx :item.zjlx,
+              hzzjhm :item.zjhm
+            }
+            setNhInfo(pnh).then(res => {
+            })
+            // 更新使用权人
+            let psyqr = {
+              deptId : item.deptId,
+              nhdm : item.nhdm,
+              shyqrdbxm : item.xm,
+              shyqrdbzjlx : item.zjlx,
+              shyqrdbzjhm : item.zjhm,
+              xb : item.xb
+            }
+            setSyqrInfo(psyqr).then(res => {
+            })
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
       // 删除房屋
       deletefw(id,index){
         Dialog.confirm({
@@ -4412,7 +4473,7 @@
               hklx:'1',
               xb:'1',
               sfbncjtjjzzcy:'Y',
-              sfsyqrzjgy:'Y',
+              sfsyqrzjgy:'N',
               qlrlx:'10',
               qlrlxName:'个人',
               gyfs:'1',
@@ -4436,7 +4497,7 @@
               this.form1.sfbncjtjjzzcy = 'Y'
             }
             if(this.form1.sfsyqrzjgy==null||this.form1.sfsyqrzjgy==""){
-              this.form1.sfsyqrzjgy = 'Y'
+              this.form1.sfsyqrzjgy = 'N'
             }
             if(this.form1.qlrlx==null||this.form1.qlrlx==""){
               this.form1.qlrlx = 'Y'
@@ -4679,7 +4740,7 @@
             isCommon:'N',
             fwzt:'01',
             fwztName:'正常',
-            isMortgage:'Y',
+            isMortgage:'N',
             sjly:'04',
             sjlyName:'农村宅基地使用权确权登记发证',
             fwlx:'01',
@@ -4721,7 +4782,7 @@
             this.nmfwform.sjlyName = "农村宅基地使用权确权登记发证"
           }
           if(this.nmfwform.isMortgage==null||this.nmfwform.isMortgage==""){
-            this.nmfwform.isMortgage = "Y"
+            this.nmfwform.isMortgage = "N"
           }
           if(this.nmfwform.fwzt==null||this.nmfwform.fwzt==""){
             this.nmfwform.fwzt = "01"
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 38235565..296f02bb 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -53,7 +53,7 @@
           <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClickzjd" style="vertical-align:middle;"/>
         </template>
       </van-search>
-      <van-tabs v-model="active" title-active-color="#7AC943" color="#7AC943" swipeable animated @click="getZjdList">
+      <van-tabs v-model="active" title-active-color="#7AC943" color="#7AC943" @click="getZjdList">
         <van-tab >
           <template #title>全部<van-badge v-if="qbNums>=0" :content="qbNums" /></template>
           <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
@@ -63,18 +63,19 @@
               finished-text="没有更多了"
               @load="onRefreshzjd"
             >
-          <van-cell  v-for="(item,index) in list" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
+          <van-cell  v-for="(item,index) in list" :key="index" size="small" @click.native="setCookies(item)" :clickable="true"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
               <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
-                  <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
-                  <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+                  <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >查看详情</van-button>
+                  <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >开始调查</van-button>
+                  <van-button plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
               <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >开始调查</van-button>
+                <van-button plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
-
             </template>
             <!--<template #default>
 
@@ -99,16 +100,18 @@
             finished-text="没有更多了"
             @load="onRefreshzjd"
           >
-          <van-cell  v-for="(item,index) in list1" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
+          <van-cell  v-for="(item,index) in list1" :key="index" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
               <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
+                <van-button plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
               <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
+                <van-button plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
             </template>
             <!--<template #default>
@@ -135,16 +138,18 @@
             finished-text="没有更多了"
             @load="onRefreshzjd"
           >
-          <van-cell  v-for="(item,index) in list2" :key="index" size="small" @click.native="setCookies(item)" :to="{name:'homesteadAdd'}"  style="border-radius: 16px;
+          <van-cell  v-for="(item,index) in list2" :key="index" size="small" @click.native="setCookies(item)"   style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
               <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
+                <van-button plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
               <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
+                <van-button plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
             </template>
             <!--<template #default>
@@ -174,9 +179,9 @@
       <van-cell  v-for="(item,index) in nhlist" :key="index" size="small"  style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
         <template #title>
           <p style="color:#22B7F2">{{item.hzxm}}
-
             <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;margin-left:10px;" @click="showPopuphncylist(item)">查看成员</van-button>
-            <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="showPopupnh(item)">查看户主</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;margin-left:10px;" @click="showPopupnh(item)">查看户主</van-button>
+            <van-button plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" @click="deletenh(item,index)">删除</van-button>
           </p>
         </template>
 <!--        <template #default>
@@ -931,7 +936,8 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" style="height:100%" class="delete-button" @click="deletehncy(item.id,index)" />
+          <van-button square text="设为户主" type="primary" style="height:100%" @click="setNh(item,index)"/>
+          <van-button square text="删除" type="danger" style="height:100%" @click="deletehncy(item.id,index)" />
         </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;">
@@ -1184,10 +1190,10 @@
 </template>
 
 <script>
-    import {listZjdzd,getQueryLand,getZjdzd} from "@/api/homesteadSurvey/zjdzd";
-    import {addNh, delNh, exportNh, getNh, listNh, updateNh} from "@/api/homesteadSurvey/nh";
+    import {listZjdzd,getQueryLand,getZjdzd,delZjdzdInfo} 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 {listShyqr} from "@/api/homesteadSurvey/shyqr";
+    import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
     import {listSuyqr,updateSuyqr,addSuyqr} from "@/api/homesteadSurvey/suyqr";
     import {listZrz,getZrzZjdDmList,getZrz} from "@/api/homesteadSurvey/zrz";
     import {listFsss,getFsssZjdDmList,getFsss} from "@/api/homesteadSurvey/fsss";
@@ -1357,6 +1363,7 @@
           //地图跳转存之
           mapAddJump:"",
           mapAddJumpNum:"",
+          nhdm:""
         };
       },
       mounted(){
@@ -1421,6 +1428,122 @@
         }
       },
       methods: {
+        deleteZjd(item,index){
+          Dialog.confirm({
+            title: '警告',
+            message: '将删除与此宅基地关联的使用权人，自然幢，房屋，附属设施等所有信息，同时删除后无法恢复，确认删除么？',
+          })
+            .then(() => {
+              // on confirm
+              delZjdzdInfo(item).then(res => {
+                if(res.code=="200"){
+                  if(this.active==1){
+                    this.list1.splice(index,1);
+                  }else if(this.active==2){
+                    this.list2.splice(index,1);
+                  }else{
+                    this.list.splice(index,1);
+                  }
+
+                }
+              })
+            })
+            .catch(() => {
+              // on cancel
+            });
+        },
+        //删除户主
+        deletenh(item,index){
+          let yes = true
+          let params={
+            nhdm : item.nhdm,
+            deptId: item.deptId
+          }
+          listNhhncy(params).then((res) => {
+            console.log(res.rows.length)
+            if(res.rows.length>0){
+              yes = false
+              this.$toast({
+                icon: 'error', // 找到自己需要的图标
+                message: '无法删除，此户主存在户内成员！',
+                duration:"1000",
+                onClose:function(){
+                }
+              })
+            }else{
+              listShyqr(params).then((res) => {
+                if(res.rows.length>0){
+                  yes = false
+                  this.$toast({
+                    icon: 'error', // 找到自己需要的图标
+                    message: '无法删除，此户主已经成为使用权人！',
+                    duration:"1000",
+                    onClose:function(){
+                    }
+                  })
+                }else{
+                  if(yes){
+                    Dialog.confirm({
+                      title: '警告',
+                      message: '删除后无法恢复，确认删除么？',
+                    })
+                      .then(() => {
+                        // on confirm
+                        delNh(item.id).then(res => {
+                          if(res.code=="200"){
+                            this.nhlist.splice(index,1);
+                          }
+                        })
+                      })
+                      .catch(() => {
+                        // on cancel
+                      });
+                  }
+                }
+              });
+            }
+          });
+
+        },
+        // 设为户主
+        setNh(item,index){
+          Dialog.confirm({
+            title: '警告',
+            message: '此操作将删除原户主，并将此成员设为新户主，是否确认操作？',
+          })
+            .then(() => {
+              // on confirm
+              delNhhncy(item.id).then(res => {
+                if(res.code=="200"){
+                  this.hncylist.splice(index,1);
+                }
+              })
+              // 更新户主信息
+              let pnh = {
+                deptId : item.deptId,
+                nhdm : item.nhdm,
+                hzxm:item.xm,
+                hzzjlx :item.zjlx,
+                hzzjhm :item.zjhm
+              }
+              setNhInfo(pnh).then(res => {
+              })
+              // 更新使用权人
+              let psyqr = {
+                deptId : item.deptId,
+                nhdm : item.nhdm,
+                shyqrdbxm : item.xm,
+                shyqrdbzjlx : item.zjlx,
+                shyqrdbzjhm : item.zjhm,
+                xb : item.xb
+              }
+              setSyqrInfo(psyqr).then(res => {
+              })
+            })
+            .catch(() => {
+              // on cancel
+            });
+        },
         //删除户内成员
         deletehncy(id,index){
           Dialog.confirm({
@@ -1849,8 +1972,8 @@
           this.showhncy = true
           if(item.id==null||item.id==""){
             this.form5 = {
-              "nhdm":this.nhform.nhdm,
-              "deptId":this.nhform.deptId,
+              "nhdm":this.nhdm,
+              "deptId":this.item.deptId,
               "zjlx":'01',
               "zjlxName":"身份证",
               "yhzgx":"14",
@@ -1965,6 +2088,7 @@
               duration:"1000"
             })
           }else{
+            this.nhdm = item.nhdm
             this.showhncylist =  true
             let params = {
               "nhdm":item.nhdm,