宅基地调查优化

src/api/homesteadSurvey/shyqr.js

@@ -67,7 +67,7 @@ export function updateShyqr(data) {
 // 删除数据调查-使用权人
 export function delShyqr(id) {
   return request({
-    url: '/houseSurvey/shyqr/remove/' + id,
+    url: '/home/homesteadshyqr/remove/' + id,
     method: 'get'
   })
 }

src/views/homesteadSurvey/add.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
           right-text ="首页"
           @click-right="goRightBack()"
@@ -46,7 +46,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <van-form  ref="form">
+    <van-form  ref="form" style="margin-top: 1.4rem;">
       <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">空间信息</p>
         <!--<van-field
@@ -308,11 +308,10 @@
                       />
         <van-popup v-model:show="showZjdqdsj" position="bottom">
                         <van-datetime-picker
+                          :value="new Date"
                           type="date"
                           @confirm="onConfirmzjdqdsj"
                           @cancel="showZjdqdsj = false"
-                          :min-date="minDate"
-                          :max-date="maxDate"
                         />
         </van-popup>
         <van-field
@@ -797,6 +796,7 @@ export default {
       // 地图绘制
       drawInsert: null,
       permission:false,
+
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
@@ -806,7 +806,7 @@ export default {
       showWbzyy:false,
       showXzyy:false,
       showXzqssj:false,
-      minDate: new Date(),
+      minDate: new Date(1900,0,1),
       maxDate: new Date(2025, 10, 1),
       form:{}
     };
@@ -964,9 +964,9 @@ export default {
     pointDarw(data) {
       this.$nextTick(() => {
         let map = this.$refs.pointDarwMap;
+        console.info(this.form.theGeomJson);
         if(data == null)
           data = this.form.theGeomJson;
-        console.info(data);
         this.setMapData(map, data);
 
       });

src/views/homesteadSurvey/add2.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
           right-text ="首页"
           @click-right="goRightBack()"
@@ -49,7 +49,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <div style="margin:30px auto 0;width: 95%;">
+    <div style="margin:1.6rem auto 0;width: 95%;">
       <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">使用权人</p>
     </div>
     <van-list
@@ -89,7 +89,7 @@
         </div>
       </div>
       <template #right>
-        <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletesyqr(item.id,index)"/>
+        <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deleteshyqr(item)"/>
       </template>
     </van-swipe-cell>
     </van-list>
@@ -201,6 +201,21 @@ export default {
       this.$router.push({name: this.$router.back(-1)});
       // }
     },
+    deleteshyqr(val){
+      const ids = val.id || this.ids;
+      Dialog.confirm({
+        title: '系统提示',
+        message: '是否确认删除使用权人标识为"' + val.id + '"的数据项?',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+        .then(function() {
+          return delShyqr(ids);
+        }).then(() => {
+        this.$notify({ type: 'success' , message: "删除成功" });
+        location.reload(true);
+      }).catch(() => {});
+  },
     showPopupsyqr(val){
       this.$router.push({name:'shyqrAdd',query:val});
     },

src/views/homesteadSurvey/add3.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
           right-text ="首页"
           @click-right="goRightBack()"
@@ -49,7 +49,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <div style="margin:30px auto 0;width: 95%;">
+    <div style="margin:1.6rem auto 0;width: 95%;">
       <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">自然幢</p>
     </div>
     <van-list

src/views/homesteadSurvey/add4.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
           right-text ="首页"
           @click-right="goRightBack()"
@@ -49,7 +49,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <div style="margin:30px auto 0;width: 95%;">
+    <div style="margin:1.6rem auto 0;width: 95%;">
       <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">附属设施</p>
     </div>
     <van-list
@@ -81,20 +81,20 @@
         </div>
       </div>
       <template #right>
-        <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletefsss(item)"/>
+        <van-button v-show="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletefsss(item)"/>
       </template>
     </van-swipe-cell>
     </van-list>
-    <div v-if="permission == 'true'" style=" width:95%;margin:20px auto;display: flex;justify-content: center;">
+    <div v-if="permission == 'true' " style=" width:95%;margin:20px auto;display: flex;justify-content: center;">
       <div style="width:100%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
         <p style="font-size: 16px;"  @click="showPopupAddzrz()">+ 添加附属设施信息</p>
       </div>
     </div>
-    <div v-if="permission == 'true'" style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
-      <p style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
+    <div  style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
+      <p v-if="permission == 'true'" style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="ycbj()">异常标记</span>
       </p>
-      <p style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
+      <p v-if="permission == 'true'" style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名确认</span>
       </p>
       <p v-if = "showDcsh" style="width:32%;border: 1px solid #22B7F2;background: #ffffff;padding: 5px 0;border-radius: 50px;">
@@ -110,28 +110,32 @@
         @cancel="dcshShow = false"
       />
     </van-popup>
-    <van-popup v-model="showesign" position="bottom" closeable
+    <van-popup v-model="showesign" closeable position="right" :style="{ height: '100%' }"
                close-icon="close">
       <van-row style="margin:0 10%">
         <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
       </van-row>
-      <van-row style="margin: 0 5% 5% 5%;border:1px solid #BFBFBF;">
+      <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
         <vue-esign
           ref="esign"
           class="mySign"
-          :height="200"
+          :width="500"
+          :height="height"
           :isCrop="signature.isCrop"
           :lineWidth="signature.lineWidth"
           :lineColor="signature.lineColor"
           :bgColor.sync="signature.bgColor"
           v-if="!signature.resultImg"
         />
-        <img :src="signature.resultImg" alt="" width="100%" height="100%;" v-if="signature.resultImg"/>
-      </van-row>
-      <van-row type="flex" justify="center" v-if="!signature.resultImg" style="margin-bottom:20px;">   <!--v-if="!formEnabled.acceptingForm.townFormEnabled"-->
-        <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleReset">清空画板</van-button></van-col>
-        <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button></van-col>
-      </van-row>
+      </div>
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
+             style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
+      <div class="signature-footer"  v-if="!signature.resultImg">
+          <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
+          <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
+        </van-row>
+      </div>
     </van-popup>
     <van-dialog v-model="ycbzShow" title="异常标记" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="confirmn" >
       <van-row>
@@ -157,6 +161,8 @@ import {getZjdzd,updateZjdzd,zjddcSign} from "@/api/homesteadSurvey/zjdzd";
 import MapGisDrawing from "@/components/Map/MapGisDrawing";
 import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
 import MultiImageUploadComp from "@/components/house/MultiImageUploadComp"
+import {Dialog} from "vant";
+import $ from "jquery";
 export default {
   name: "homesteadAdd",
   components: { MapGisDrawing,MultiImageUploadComp},
@@ -204,13 +210,13 @@ export default {
     }
     if(this.zjdzdxx.id !== undefined){
       getZjdzd(this.zjdzdxx.id).then((response) => {
-        if(response.data.surveyStatus !== "1" && businessLevel === "2"){
+        if(response.data.surveyStatus === "3"  && businessLevel === "2"){
           this.showDcsh =  true;
         }
       });
       this.getList();
     }
-
+    this.height = window.screen.height * 1.28 - 20;
   },
   mounted(){
 
@@ -236,6 +242,9 @@ export default {
     fileUpdate(val){
       this.$set(this.zjdzdxx, 'surveyBztp',val.path);
     },
+    canvasTTdown() {
+      $('#canvasTT').css('display', 'none');
+    },
     onSurveyStatusChanged(val){
       this.$set(this.zjdzdxx, 'surveyStatus', val.dictValue);
       if(val.dictValue === "5"){
@@ -285,6 +294,7 @@ export default {
       if(this.$refs.esign){
         this.$refs.esign.reset();
       }
+      $('#canvasTT').css('display', 'block')
     },
     // 生成签字图
     handleGenerate() {
@@ -427,4 +437,15 @@ export default {
 /deep/ .van-nav-bar__text {
   color: #fff;
 }
+.signature-footer {
+  transform: rotate(90deg);
+  width: auto;
+  position: absolute;
+  top: 50%;
+  left: 0px;
+
+}
+.clearBtn {
+  margin-left: 15px;
+}
 </style>

src/views/homesteadSurvey/fsssAdd.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
         >
           <template #left>
@@ -45,7 +45,7 @@
       </div>
     </van-sticky>
     <van-form ref = "form">
-      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+      <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">附属设施信息</p>
         <!--<van-field
           v-model="form.deptId"
@@ -158,7 +158,7 @@ export default {
   name: "zrzAdd",
   data() {
     return {
-      active:3,
+      active:4,
       // 使用权人列表
       syqrlist:[
         {

src/views/homesteadSurvey/hncyDetails.vue

@@ -54,11 +54,11 @@
       </div>
     </van-sticky>
 <!--<van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">-->
-    <div style="margin:30px auto 0;width: 95%;">
+    <div style="margin:10px auto 0;width: 95%;">
       <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">成员信息</p>
     </div>
     <van-form ref="form">
-      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+      <div style="margin:10px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">农户成员信息</p>
         <!--<van-field
           v-model="form.deptId"
@@ -67,7 +67,30 @@
           placeholder="行政区划名称"
           :rules="[{ required: true, message: '' }]"
         />-->
-
+        <field-select
+          v-model="form.yhzgx"
+          label="与户主关系"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择与户主关系"
+          :columns = "yhzgxOptions"
+          @confirm="onyhzgxChanged"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-if="!showHzxx"
+          v-model="form.nhdm"
+          label="农户代码"
+          value-key="xm"
+          placeholder="选择农户代码"
+          :columns = "nhdmOptions"
+          @confirm="onnhdmChanged"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
         <van-field
           input-align="right"
           v-model="form.xm"
@@ -101,17 +124,7 @@
           :rules="[{ required: true }]"
           required
         />
-        <field-select
-          v-model="form.yhzgx"
-          label="与户主关系"
-          value-key="dictLabel"
-          data-key="dictValue"
-          placeholder="选择与户主关系"
-          remote-url="/open/zdzh/list/family_status"
-          :on-remote-response="'data'"
-          :rules="[{ required: true }]"
-          required
-        />
+
         <field-select
           v-model="form.xb"
           label="性别"
@@ -205,75 +218,79 @@
           remote-url="/open/zdzh/list/house_yes_no"
           :on-remote-response="'data'"
         />
-        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">户主专用信息</p>
+        <div v-if="showHzxx">
+          <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">户主专用信息</p>
 
-        <FieldRadio
-          v-model="form.sfwbh"
-          label="是否五保户"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <FieldRadio
-          v-model="form.sfpkh"
-          label="是否贫困户"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <FieldRadio
-          v-model="form.zqtczsfyzf"
-          label="在其他村庄有住房"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <FieldRadio
-          v-model="form.jzhcssfyzf"
-          label="在集镇或城市有住房"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <FieldRadio
-          v-model="form.sfbccm"
-          label="本村村民"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <field-select
-          v-model="form.occupation"
-          label="职业"
-          value-key="dictLabel"
-          data-key="dictValue"
-          placeholder="选择职业"
-          remote-url="/open/zdzh/list/occupation"
-          :on-remote-response="'data'"
-        />
-        <field-select
-          v-model="form.jzqk"
-          label="居住情况"
-          value-key="dictLabel"
-          data-key="dictValue"
-          placeholder="选择居住情况"
-          remote-url="/open/zdzh/list/living_condition"
-          :on-remote-response="'data'"
-        />
-        <van-field
-          input-align="right"
-          v-model="form.txdz"
-          name="通讯地址"
-          label="通讯地址"
-          placeholder="请输入通讯地址"
-          maxlength="50"
-          autocomplete="off"
-        />
+          <FieldRadio
+            v-model="form.sfwbh"
+            label="是否五保户"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <FieldRadio
+            v-model="form.sfpkh"
+            label="是否贫困户"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <FieldRadio
+            v-model="form.zqtczsfyzf"
+            label="在其他村庄有住房"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <FieldRadio
+            v-model="form.jzhcssfyzf"
+            label="在集镇或城市有住房"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <FieldRadio
+            v-model="form.sfbccm"
+            label="本村村民"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <field-select
+            v-model="form.occupation"
+            label="职业"
+            value-key="dictLabel"
+            data-key="dictValue"
+            placeholder="选择职业"
+            remote-url="/open/zdzh/list/occupation"
+            :on-remote-response="'data'"
+          />
+          <field-select
+            v-model="form.jzqk"
+            label="居住情况"
+            value-key="dictLabel"
+            data-key="dictValue"
+            placeholder="选择居住情况"
+            remote-url="/open/zdzh/list/living_condition"
+            :on-remote-response="'data'"
+          />
+          <van-field
+            input-align="right"
+            v-model="form.txdz"
+            name="通讯地址"
+            label="通讯地址"
+            placeholder="请输入通讯地址"
+            maxlength="50"
+            autocomplete="off"
+            :rules="[{ required: true }]"
+            required
+          />
+        </div>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
         <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
@@ -335,6 +352,8 @@
           showhncyjzqk:false,
           showhzoccupation:false,
           showhzjzqk:false,
+          nhdmOptions:null,
+          showHzxx:false,
           // 下拉刷新
           isLoadingnh:false,
           countnh:0,
@@ -495,6 +514,7 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
+        this.getList();
         this.item = JSON.parse(localStorage.getItem("surveyItem"));
         let data = this.$route.query;
         this.form = data.item;
@@ -515,6 +535,11 @@
           this.$set(this.form, 'sfbccm', "1");
           this.$set(this.form, 'occupation', "1");
           this.$set(this.form, 'jzqk', "1");
+        }
+        if(this.form.yhzgx !== "02"){
+          this.showHzxx = false;
+        }else{
+          this.showHzxx = true;
         }
           this.getDicts("family_status").then(response => {
             var arr = [];
@@ -569,6 +594,15 @@
           }
       },
       methods: {
+        getList(){
+          listNhhncy({yhzgx:"02"}).then(response => {
+            this.nhdmOptions = response.rows;
+            this.nhdmOptions = this.nhdmOptions.map(function(item){
+              item.xm = item.xm +"-"+ item.nhdm;
+              return {xm:item.xm,nhdm:item.nhdm}
+            });
+          });
+        },
         showUploadList(){
           this.showImageList = true;
         },
@@ -785,6 +819,16 @@
               // on cancel
             });
         },
+        onnhdmChanged(val){
+          this.$set(this.form, 'nhdm', val.nhdm);
+        },
+        onyhzgxChanged(val){
+          if(val === "02" ){
+            this.showHzxx = true;
+          }else{
+            this.showHzxx = false;
+          }
+        },
         //删除户主
         deletenh(item,index){
           let yes = true
@@ -920,6 +964,7 @@
           })
           return label
         },
+
         onRefreshzjd(){
           this.isLoadingzjd = false;
           let _this = this

src/views/homesteadSurvey/hncyList2.vue

@@ -57,27 +57,31 @@
     <div style="margin:10px auto 0;width: 95%;">
       <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">户内成员</p>
     </div>
-    <van-cell  v-for="(item,index) in hncylist" :key="index" size="small" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:10px auto 0;">
-      <template #title>
-        <div style="display: flex;align-items: center;">
-          <p style="display: flex;align-items: center;">
-            <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-            <span style="line-height: 1;">{{item.xm}}</span>
-          </p>
-          <p v-if="item.yhzgx != '02'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</p>
-          <p v-if="item.yhzgx != '02'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</p>
-          <p v-if="item.yhzgx != '02'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 3px;">设为户主</p>
-          <p  style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/add02.png" alt="" style="margin-right: 3px;">成员详情</p>
-          <p  style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+    <van-swipe-cell  v-for="(item,index) in hncylist" :key="index" size="small" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:10px auto 0;">
+        <van-cell>
+          <template #title>
+            <div style="display: flex;align-items: center;">
+              <p style="display: flex;align-items: center;">
+                <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
+                <span style="line-height: 1;">{{item.xm}}</span>
+              </p>
+              <p  style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/add02.png" alt="" style="margin-right: 3px;">成员详情</p>
+              <p  style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
 
-        </div>
-      </template>
-      <template #label>
-        <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">与户主关系:<span style="margin-left: auto;">{{yhzgxfy(item.yhzgx)}}</span> </p>
-        <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
-        <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
-      </template>
-    </van-cell>
+            </div>
+          </template>
+          <template #label>
+            <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">与户主关系:<span style="margin-left: auto;">{{yhzgxfy(item.yhzgx)}}</span> </p>
+            <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
+            <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
+          </template>
+        </van-cell>
+        <template #right>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</van-button>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</van-button>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 3px;">设为户主</van-button>
+        </template>
+    </van-swipe-cell>
     <van-dialog v-model="guohuData.visible"  title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">
       <van-form ref="guohu_form"  style="height: 200px;"  label-width="180px">
         <field-select
@@ -96,7 +100,7 @@
     </van-dialog>
 <!--    </van-pull-refresh>-->
     <div style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
-      <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
+      <div style="width:100%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
         <p style="font-size: 16px;" @click="addPopupnhcy()">+ 添加成员信息</p>
       </div>
     </div>
@@ -131,6 +135,7 @@
           finished2:false,
           loading3:false,
           finished3:false,
+          finished:true,
           //全部
           qbNums:0,
           //已调查数量

src/views/homesteadSurvey/index.vue

@@ -24,7 +24,7 @@
               width="50"
               height="50"
               :src="require('../../assets/images/housesteadSurvey/task1.png')"
-              @click="active=1,getList()"
+              @click="active=1,checkBadge()"
             />
           </van-badge>
           <p id="basetext" :style="{color:(active==1?'#7AC943':'#000'),fontSize:'14px',marginTop:'5px'}">全部任务</p>
@@ -35,7 +35,7 @@
               width="50"
               height="50"
               :src="require('../../assets/images/housesteadSurvey/task2.png')"
-              @click="active=2,getList()"
+              @click="active=2,checkBadge()"
             />
           </van-badge>
           <p :style="{color:(active==2?'#7AC943':'#000'),fontSize:'14px',marginTop:'5px'}">已完成</p>
@@ -46,7 +46,7 @@
               width="50"
               height="50"
               :src="require('../../assets/images/housesteadSurvey/task3.png')"
-              @click="active=3,getList()"
+              @click="active=3,checkBadge()"
             />
           </van-badge>
           <p :style="{color:(active==3?'#7AC943':'#000'),fontSize:'14px',marginTop:'5px'}">待调查</p>
@@ -197,6 +197,12 @@
             rwfbzt:"PUBLISHED",
             rwzxr:null
           },
+          // 切换查询参数
+          switchParams: {
+            rwwczt: null,
+            rwfbzt:"PUBLISHED",
+            rwzxr:null
+          },
           nickName:"",
           text:0,
           isLoadingtask:false,
@@ -367,6 +373,7 @@
             this.$set(this.queryParams, "rwzxr", null);
             this.getList();
           }
+          this.queryNum();
         },
         setCookies(item){
        /*   if(this.$cookies.get("upload")==null||this.$cookies.get("upload")==0){
@@ -410,6 +417,47 @@
           this.showDropList = false;
           this.$set(this.queryParams, "parentId", val.deptId);
           this.getList();
+          this.$set(this.switchParams, "parentId", val.deptId);
+          this.queryNum();
+        },
+        checkBadge(){
+          this.getList();
+          this.queryNum();
+        },
+        queryNum(){
+          if(this.checked){
+            let userId = this.$store.getters.userId;
+            this.$set(this.switchParams, "rwzxr", userId);
+            listTask(this.switchParams).then(response => {
+              this.done = 0;
+              this.todo = 0;
+              this.total = response.total;
+              response.rows.map(res => {
+                if(res.rwwczt == "FINISHED"){
+                  this.done+=1
+                }else{
+                  this.todo+=1
+                }
+                // if(res.rwzxr!=null&&res.rwzxr!=''){
+                //   res.rwzxr = res.rwzxr.split(',')
+              })
+
+            });
+          }else{
+            this.$set(this.switchParams, "rwzxr", null);
+            listTask(this.switchParams).then(response => {
+              this.done = 0;
+              this.todo = 0;
+              this.total = response.total;
+              response.rows.map(res => {
+                if(res.rwwczt == "FINISHED"){
+                  this.done+=1
+                }else{
+                  this.todo+=1
+                }
+              })
+            });
+          }
         },
         getList() {
           this.totalList = []
@@ -430,10 +478,13 @@
             this.$set(this.queryParams, "pageNum",  this.countqb + 1);
           }
           listTask(this.queryParams).then(response => {
-            this.done = 0;
-            this.todo = 0;
-            this.total = response.total;
+            if(this.active==1) {
+              this.done = 0;
+              this.todo = 0;
+              this.total = response.total;
+            }
             response.rows.map(res => {
+              console.info(this.active);
               if(this.active==1) {
                 if(res.rwwczt == "FINISHED"){
                   this.done+=1
@@ -447,10 +498,8 @@
                 // }
                 this.totalList = response.rows;
               }else if(this.active==2) {
-                this.done+=1
                 this.doneList.push(res);
               }else{
-                this.todo+=1
                 this.todoList.push(res);
               }
             })

src/views/homesteadSurvey/list.vue

@@ -89,11 +89,11 @@
                   <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
                   <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
                 </p>
-                <p v-if="item.surveyStatus == '5'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="queryDetail(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
+                <p v-if="item.surveyStatus == '5' || item.surveyStatus  == '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="queryDetail(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
 <!--                <p v-if="item.zjdAudit=='0'" style="color:#ff976a;background:rgba(255,151,106,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">待审核</p>-->
 <!--                <p v-if="item.zjdAudit=='1'" style="color:#7AC943;background:rgba(122,201,67,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">已审核</p>-->
 <!--                <p v-if="item.zjdAudit=='2'" style="color:#ee0a24;font-size:12px;">已驳回</p>-->
-                <p v-if="item.surveyStatus != '5'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
+                <p v-if="item.surveyStatus != '5' && item.surveyStatus != '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
                 <p style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;"  @click="deleteZjd(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
               </div>
             </template>

src/views/homesteadSurvey/list2.vue

@@ -28,7 +28,7 @@
           </van-row>
         </van-popup>
         <div style="display:flex;width:95%;margin:0 auto;justify-content:space-between;padding: 0px 0 15px">
-          <div :class="{activeBtn : activeBtn==1,disactiveBtn :activeBtn!=1 }" @click="$router.push({path:'/homesteadSurvey/list'})">入户核查</div>
+          <div :class="{activeBtn : activeBtn==1,disactiveBtn :activeBtn!=1 }" @click="$router.push({path:'/homesteadSurvey/list'})">入户</div>
           <div :class="{activeBtn : activeBtn==2,disactiveBtn :activeBtn!=2 }" @click="$router.push({path:'/homesteadSurvey/list2'})">农户信息</div>
           <div :class="{activeBtn : activeBtn==3,disactiveBtn :activeBtn!=3 }" @click="$router.push({path:'/homesteadSurvey/list3'})">所有权人</div>
           <div :class="{activeBtn : activeBtn==4,disactiveBtn :activeBtn!=4 }" @click="$router.push({path:'/homesteadSurvey/list4'})">切换地图</div>
@@ -116,7 +116,7 @@
           qbNums:0,
           //已调查数量
           yhcNums:0,
-          //未核查数量
+          //未数量
           whcNums:0,
           // 总户数
           totalH:0,
@@ -157,9 +157,9 @@
           active:2,
           // 全部列表
           list:[],
-          // 已核查列表
+          // 已列表
           list1:[],
-          // 未核查列表
+          // 未列表
           list2:[],
           // 户主列表
           nhlist:[],

src/views/homesteadSurvey/list4.vue

@@ -567,22 +567,44 @@
           <div style="padding: 10px 15px;">
             <van-checkbox name="all" shape="square" id="checkAll" v-model="checkAllFlag" @click="checkAllArray">全选</van-checkbox>
             <div style="height: 15px;"></div>
-            <van-checkbox-group v-model="checked" @change="handleChecked" ref="checkboxGroup">
+            <van-checkbox-group v-model="checked"  ref="checkboxGroup">
+              <van-checkbox name="zjdDdc" shape="square" style="margin-bottom: 5px;" id="zjdDdc">
+                <template #default>
+                  待<i style="margin-right: 0.5em;"></i>调<i style="margin-right: 0.5em;"></i>查<span style="display: inline-block;background: #F9F900;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                </template>
+              </van-checkbox>
+              <van-checkbox name="zjdDcyc" shape="square" style="margin-bottom: 5px;" id="zjdDcyc">
+                <template #default>
+                  调查异常<span style="display: inline-block;background: #FF8000;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                </template>
+              </van-checkbox>
+              <van-checkbox name="zjdDcwc" shape="square" style="margin-bottom: 5px;" id="zjdDcwc">
+                <template #default>
+                  调查完成<span style="display: inline-block;background: #82D900;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                </template>
+              </van-checkbox>
+              <van-checkbox name="zjdDcbh" shape="square" style="margin-bottom: 5px;" id="zjdDcbh">
+                <template #default>
+                  调查驳回<span style="display: inline-block;background: #F75000;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                </template>
+              </van-checkbox>
+              <van-checkbox name="zjdSptg" shape="square" style="margin-bottom: 5px;" id="zjdSptg">
+                <template #default>
+                  审批通过<span style="display: inline-block;background: #9F4D95;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                </template>
+              </van-checkbox>
               <van-checkbox name="fsssSx" shape="square" style="margin-bottom: 5px;" id="fsssSx">
                 <template #default>
                   附属设施<span style="display: inline-block;background: #FF8C00;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
+
               <van-checkbox name="zrzSx" shape="square" style="margin-bottom: 5px;" id="zrzSx">
                 <template #default>
                   自<i style="margin-right: 0.5em;"></i>然<i style="margin-right: 0.5em;"></i>幢<span style="display: inline-block;background: #00FA9A;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
-              <van-checkbox name="zjdSx" shape="square" style="margin-bottom: 5px;" id="zjdSx">
-                <template #default>
-                  宅<i style="margin-right: 0.5em;"></i>基<i style="margin-right: 0.5em;"></i>地<span style="display: inline-block;background: #7CFC00;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
-                </template>
-              </van-checkbox>
+
             </van-checkbox-group>
           </div>
         </div>
@@ -1198,8 +1220,8 @@
 
         <div style="text-align: center;margin-top: 3%;">
           <p class="hzlxBtn" :style="{background: mapZjdData ? '#CCC':'#7ac943'}" @click="zjdTz">宅基地</p>
-<!--          <p class="hzlxBtn" :style="{background: mapZjdData ? '#b026ff':'#CCC'}" @click="zrzTz">自然幢</p>-->
-<!--          <p class="hzlxBtn" :style="{background: mapZjdData ? '#3ac2db':'#CCC'}" @click="fsssTz">附属设施</p>-->
+          <p class="hzlxBtn" :style="{background: mapZjdData ? '#b026ff':'#CCC'}" @click="zrzTz">自然幢</p>
+          <p class="hzlxBtn" :style="{background: mapZjdData ? '#3ac2db':'#CCC'}" @click="fsssTz">附属设施</p>
         </div>
       </div>
     </van-popup>
@@ -1243,9 +1265,13 @@
           totalH:0,
           // 总人数
           totalR:0,
-          zjdSx:true,
-          zrzSx :true,
-          fsssSx:true,
+          zjdDdc:true,
+          zjdDcyc:false,
+          zjdDcwc:false,
+          zjdDcbh:false,
+          zjdSptg:false,
+          zrzSx :false,
+          fsssSx:false,
           showhncysjly:false,
           showhzsjly:false,
           showhncycybz:false,
@@ -1337,6 +1363,7 @@
           mapZrzData:"",
           mapFsssData:"",
           mapZjdDataTure:"",
+          height: null,
           mapZjdTeAll:{
             active:"",
             mapZjdAData:{},
@@ -1354,7 +1381,7 @@
           mapTownList: null,
           mapVillageList: null,
           coordinate:"",
-          checked:['zjdSx', 'zrzSx', 'fsssSx'],
+          checked:['zjdDdc'],
           checkAllMap: false,
           sx:"",
           drawingClick:true,
@@ -1375,12 +1402,12 @@
           //绘图
           htZjdZrzFsss:"",
           //筛选
-          checkAllFlag: true,
+          checkAllFlag: false,
           CheckedAllArr: [],//全选数组
           dataForm: {
             imageUrl: []
           },
-          dataList: [["fsssSx"],["zjdSx"],["zrzSx"]],          //地图使用 --end
+          dataList: [["zjdDdc"],["zjdDcyc"],["zjdDcwc"],["zjdDcbh"],["zjdSptg"], ["fsssSx"],["zrzSx"]],          //地图使用 --end
           checkBoxAll:[],
           //地图跳转存之
           mapAddJump:"",
@@ -1400,7 +1427,7 @@
           uploadImgList:[],
           uploadImgList1:[],
           // 字典列表json
-          dictTypeList:null,
+          dictTypeList:null
         };
       },
       mounted(){
@@ -1447,7 +1474,6 @@
                 this.mapAddJumpNum =1;
                 this.mapShow();
                 this.getZjdList();
-                this.getTotalHR();
                 if(this.item.taskStatus=="FINISHED"){
                     this.isFinished = true
                 }else{
@@ -1458,7 +1484,6 @@
           }else {
             this.item = JSON.parse(localStorage.getItem("surveyItem"));
             this.getZjdList();
-            this.getTotalHR();
           }
       },
       methods: {
@@ -3288,13 +3313,61 @@
           //国有数据加载----------------------------------end
           //宅基地图层查询开始 ------------------start
           //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
-          var zjdTc = new ol.layer.Image({
+          let zjdDdc = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/wms",
+              params: {
+                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                TILED: true,
+                cql_filter: cql_filter+" and survey_status = '1'",
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          let zjdDcyc = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/wms",
+              params: {
+                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                TILED: true,
+                cql_filter: cql_filter+" and survey_status = '2'",
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          let zjdDcwc = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/wms",
+              params: {
+                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                TILED: true,
+                cql_filter: cql_filter+" and survey_status = '3'",
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          let zjdDcbh = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/wms",
+              params: {
+                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                TILED: true,
+                cql_filter: cql_filter+" and survey_status = '4'",
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          let zjdSptg = new ol.layer.Image({
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx',
+                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
                 TILED: true,
-                cql_filter: cql_filter+"and survey_status = '1'",
+                cql_filter: cql_filter+" and survey_status = '5'",
                 SRID: 3857,
                 TIMESTAMP: new Date().getTime(),
               },
@@ -3306,9 +3379,9 @@
             service: "WFS",
             version: "1.0.0",
             request: "GetFeature",
-            typename: "nsgk_wulanhaote:t_homestead_zjdzdxx",
+            typename: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
             //featureNS: 'nsgk_hc',//命名空间 URI
-            cql_filter: cql_filter+" and survey_status = '1'",
+            cql_filter: cql_filter,
             //featurePrefix: 'nationalwater',//工作区名称
             //featureTypes: ['nationalwater:01fir'],//查询图层，可以是同一个工作区下多个图层，逗号隔开
             outputFormat: "application/json",
@@ -3477,7 +3550,6 @@
               },
             }),
           });
-          map.addLayer(zrzTc);
           //自然幢图层查询开始 ------------------start
 
           var fsssTc;
@@ -3494,8 +3566,7 @@
               },
             }),
           });
-          map.addLayer(fsssTc);
-          map.addLayer(zjdTc);
+          map.addLayer(zjdDdc);
           var Zb;
           var latitude;
           var longitude;
@@ -4092,37 +4163,135 @@
           //按照查询  定位地图-----------------end
 
           //筛选附属设施-----------------------------------start
-          $("#fsssSx").click(function () {
-            if(!that.fsssSx){
+          $("#fsssSx").click(function (e) {
+            if(e.delegateTarget.ariaChecked === "false"){
               map.addLayer(fsssTc);
-            }else {
+              that.fsssSx = true;
+            }else{
               map.removeLayer(fsssTc);
+              that.fsssSx = false;
             }
           });
-          $("#zrzSx").click(function () {
-            if(!that.zrzSx){
+          $("#zrzSx").click(function (e) {
+            if(e.delegateTarget.ariaChecked === "false"){
               map.addLayer(zrzTc);
-            }else {
+              that.zrzSx = true;
+            }else{
               map.removeLayer(zrzTc);
+              that.zrzSx = false;
+            }
+          });
+          $("#zjdDdc").click(function (e) {
+            if(e.delegateTarget.ariaChecked === "false"){
+              map.addLayer(zjdDdc);
+              that.zjdDdc = true;
+            }else{
+              map.removeLayer(zjdDdc);
+              that.zjdDdc = false;
             }
           });
-          $("#zjdSx").click(function () {
-            if(!that.zjdSx){
-              map.addLayer(zjdTc);
+          $("#zjdDcyc").click(function (e) {
+            if(e.delegateTarget.ariaChecked === "false"){
+              map.addLayer(zjdDcyc);
+              that.zjdDcyc = true;
+            }else{
+              map.removeLayer(zjdDcyc);
+              that.zjdDcyc = false;
+            }
+          });
+          $("#zjdDcwc").click(function (e) {
+            if(e.delegateTarget.ariaChecked === "false"){
+              map.addLayer(zjdDcwc);
+              that.zjdDcwc = true;
+            }else{
+              map.removeLayer(zjdDcwc);
+              that.zjdDcwc = false;
+            }
+          });
+          $("#zjdDcbh").click(function (e) {
+            if(e.delegateTarget.ariaChecked === "false"){
+              map.addLayer(zjdDcbh);
+              that.zjdDcbh = true;
+            }else{
+              map.removeLayer(zjdDcbh);
+              that.zjdDcbh = false;
+            }
+          });
+          $("#zjdSptg").click(function (e) {
+            if(e.delegateTarget.ariaChecked === "false"){
+              map.addLayer(zjdSptg);
+              that.zjdSptg = true;
             }else {
-              map.removeLayer(zjdTc);
+              map.removeLayer(zjdSptg);
+              that.zjdSptg = false;
             }
           });
           $("#checkAll").click(function () {
-            if(!that.fsssSx && !that.zjdSx && !that.zrzSx){
-              map.addLayer(zjdTc);
-              map.addLayer(zrzTc);
-              map.addLayer(fsssTc);
-            }else {
+            if(!that.checkAllFlag){
+
+              if(!that.fsssSx){
+                map.addLayer(fsssTc);
+              }
+              if(!that.zrzSx){
+                map.addLayer(zrzTc);
+              }
+              if(!that.zjdDdc){
+                map.addLayer(zjdDdc);
+              }
+              if(!that.zjdDcyc){
+                map.addLayer(zjdDcyc);
+              }
+              if(!that.zjdDcwc){
+                map.addLayer(zjdDcwc);
+              }
+              if(!that.zjdDcbh){
+                map.addLayer(zjdDcbh);
+              }
+              if(!that.zjdSptg){
+                map.addLayer(zjdSptg);
+              }
+            }else{
+              that.zjdDdc = false;
               map.removeLayer(zrzTc);
-              map.removeLayer(zjdTc);
+              map.removeLayer(zjdDdc);
+              map.removeLayer(zjdDcyc);
+              map.removeLayer(zjdDcwc);
+              map.removeLayer(zjdDcbh);
+              map.removeLayer(zjdSptg);
               map.removeLayer(fsssTc);
             }
+            // console.info(that.fsssSx);
+            // if(!that.fsssSx && !that.zjdDdc && !that.zjdDcyc && !that.zjdDcwc && !that.zjdDcbh && !that.zjdSptg && !that.zrzSx){
+            //   map.addLayer(zjdDdc);
+            //   map.addLayer(zjdDcyc);
+            //   map.addLayer(zjdDcwc);
+            //   map.addLayer(zjdDcbh);
+            //   map.addLayer(zjdSptg);
+            //   map.addLayer(zrzTc);
+            //   map.addLayer(fsssTc);
+            //   that.fsssSx = true;
+            //   that.zjdDdc = true;
+            //   that.zjdDcyc = true;
+            //   that.zjdDcwc = true;
+            //   that.zjdDcbh = true;
+            //   that.zjdSptg = true;
+            //   that.zrzSx = true;
+            // }else {
+            //   map.removeLayer(zrzTc);
+            //   map.removeLayer(zjdDdc);
+            //   map.removeLayer(zjdDcyc);
+            //   map.removeLayer(zjdDcwc);
+            //   map.removeLayer(zjdDcbh);
+            //   map.removeLayer(zjdSptg);
+            //   map.removeLayer(fsssTc);
+            //   that.fsssSx = false;
+            //   that.zjdDdc = false;
+            //   that.zjdDcyc = false;
+            //   that.zjdDcwc = false;
+            //   that.zjdDcbh = false;
+            //   that.zjdSptg = false;
+            //   that.zrzSx = false;
+            // }
           });
           //筛选附属设施-----------------------------------end
           // //获取类型开始  侧面-----------------------------------------------------------------start
@@ -4495,7 +4664,7 @@
           var wmsSource = new ol.source.TileWMS({
             url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx",
+              LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4508,7 +4677,7 @@
           var ZjdwmsSource = new ol.source.TileWMS({
             url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx",
+              LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4689,14 +4858,14 @@
                       that.mapZjdTeAll.mapFsssAData = {};
                       that.mapZjdDataTure = "";
                       setTimeout(() => {
-                        if ($("#info .featureInfo .featureInfo").text() == "t_homestead_zjdzdxx") {
+                        if ($("#info .featureInfo .featureInfo").text() == "t_homestead_zjdzdxx_mobile_survey") {
                           map.removeLayer(hc_land_on);
                           that.mapHasDateStatus = 2;
                           that.mapXs = true;
                           let obj = {};
                           let trs = $("#info .featureInfo").find("tr:eq(1)");
                           let zjdXq = trs.find("td").eq(0).text();
-                          let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", "");
+                          let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx_mobile_survey.", "");
                           obj.id = zjdIdNum; //	主键id
                           obj.deptName = trs.find("td").eq(3).text();//行政区划名称
 
@@ -4731,19 +4900,19 @@
                           //自然幢图层查询开始 ------------------start
                           //附属设施图层查询开始 ------------------start
                           //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
-                          fsssTc = new ol.layer.Image({
-                            source: new ol.source.ImageWMS({
-                              url: that.mapGeoServerUrl + "/wms",
-                              params: {
-                                LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
-                                TILED: true,
-                                cql_filter: cql_filter_map,
-                                SRID: 3857,
-                                TIMESTAMP: new Date().getTime(),
-                              },
-                            }),
-                          });
-                          map.addLayer(fsssTc);
+                          // fsssTc = new ol.layer.Image({
+                          //   source: new ol.source.ImageWMS({
+                          //     url: that.mapGeoServerUrl + "/wms",
+                          //     params: {
+                          //       LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
+                          //       TILED: true,
+                          //       cql_filter: cql_filter_map,
+                          //       SRID: 3857,
+                          //       TIMESTAMP: new Date().getTime(),
+                          //     },
+                          //   }),
+                          // });
+                          // map.addLayer(fsssTc);
                           //附属设施图层查询开始 ------------------end
                           that.$cookies.set("search", "")
                           //that.$cookies.set("map", "")
@@ -5650,7 +5819,7 @@
               this.$cookies.set("search","")
               let trs = $("#info .featureInfo").find("tr:eq(1)");
               let zjdXq = trs.find("td").eq(0).text();
-              let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", "");
+              let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx_mobile_survey.", "");
               getZjdzd(zjdIdNum).then((response) => {
                 this.mapZjdData = response.data;
                 this.mapZjdTeAll.active = 1;
@@ -5744,7 +5913,7 @@
         },
         //
         checkAllArray(value){
-          if(this.checked.length<3){
+          if(this.checked.length<7){
             this.$refs.checkboxGroup.toggleAll(true);
           }else{
             this.$refs.checkboxGroup.toggleAll(false);
@@ -5769,12 +5938,17 @@
         //单选
         handleChecked(value) {
           // this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length;
-          if (value.length<3){
+          if (value.length<7){
             this.checkAllFlag = false;
           }else{
             this.checkAllFlag = true;
           }
-          value.indexOf('zjdSx') == -1 ? this.zjdSx = false : this.zjdSx = true;
+          console.info(value);
+          value.indexOf('zjdDdc') == -1 ? this.zjdDdc = false : this.zjdDdc = true;
+          value.indexOf('zjdDcyc') == -1 ? this.zjdDcyc = false : this.zjdDcyc = true;
+          value.indexOf('zjdDcwc') == -1 ? this.zjdDcwc = false : this.zjdDcwc = true;
+          value.indexOf('zjdDcbh') == -1 ? this.zjdDcbh = false : this.zjdDcbh = true;
+          value.indexOf('zjdSptg') == -1 ? this.zjdSptg = false : this.zjdSptg = true;
           value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true;
           value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true;
         },
@@ -5795,6 +5969,25 @@
             this.mapZjdTeAll.active =1;
             this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeomJson =this.htZjdZrzFsss;
+            console.info(this.mapZjdTeAll.mapZjdAData.theGeomJson);
+            listSuyqr({deptId: this.item.deptId}).then((response) => {
+              this.$set(this.mapZjdTeAll.mapZjdAData, "suyqrdm",response.rows[0]);
+              });
+            this.$set(this.mapZjdTeAll.mapZjdAData, "zjdlyzk","1");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "landStatus","1");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "houseOwnership","2");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "landPhms","10");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "isMore","0");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "sffz","0");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "sfcz","0");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "zjdqdfs","01");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "sjly","01");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "qlsdfs","1");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "qllx","1");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "qlxz","203");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "yt","01");
+            this.$set(this.mapZjdTeAll.mapZjdAData, "dj","1");
+
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
@@ -5807,28 +6000,33 @@
         },
         zrzTz(){
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
+            console.info(this.mapZjdData);
             this.mapZjdTeAll.active =3;
-            this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
+            this.mapZjdTeAll.mapZrzAData.theGeomJson =this.htZjdZrzFsss;
+            console.info(this.htZjdZrzFsss);
             this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
+            this.mapZjdTeAll.mapZrzAData.zjddm = this.mapZjdData.zjddm;
+            this.mapZjdTeAll.mapZrzAData.fwjg = "01";
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
-            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZrzAData));
-            this.$router.push({path:'/homesteadSurvey/add3'});
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdData));
+            this.$router.push({name:'zrzAdd',query:this.mapZjdTeAll.mapZrzAData});
           }else {
             this.$toast("请先在地图上选择宅基地后，再选择自然幢按钮");
           }
         },
         fsssTz(){
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
-          this.mapZjdTeAll.active =4;
-          this.mapZjdTeAll.mapFsssAData.theGeomJson =this.htZjdZrzFsss;
+            this.mapZjdTeAll.active =4;
+            this.mapZjdTeAll.mapFsssAData.theGeomJson =this.htZjdZrzFsss;
+            this.mapZjdTeAll.mapFsssAData.zjddm = this.mapZjdData.zjddm;
             this.mapZjdTeAll.mapFsssAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
           //this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId;
           //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
-            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapFsssAData));
-            this.$router.push({path:'/homesteadSurvey/add4'});
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdData));
+            this.$router.push({name:'fsssAdd',query:this.mapZjdTeAll.mapFsssAData});
           }else {
             this.$toast("请先在地图上选择宅基地后，再选择附属设施按钮");
           }

src/views/homesteadSurvey/nhAdd.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;;margin-bottom:.5rem;"
           @click-left="goBack()"
         >
           <template #left>
@@ -45,7 +45,7 @@
       </div>
     </van-sticky>
     <van-form  ref="form">
-      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+      <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">农户信息</p>
         <!--<van-field
           v-model="form.deptId"
@@ -259,6 +259,8 @@
           placeholder="请输入通讯地址"
           maxlength="50"
           autocomplete="off"
+          :rules="[{ required: true }]"
+          required
         />
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">

src/views/homesteadSurvey/nhcyAdd.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
         >
           <template #left>
@@ -45,7 +45,7 @@
       </div>
     </van-sticky>
     <van-form ref = "form">
-      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+      <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">农户成员信息</p>
         <!--<van-field
           v-model="form.deptId"
@@ -54,7 +54,31 @@
           placeholder="行政区划名称"
           :rules="[{ required: true, message: '' }]"
         />-->
-
+        <field-select
+          v-model="form.yhzgx"
+          label="与户主关系"
+          value-key="dictLabel"
+          :readonly="yhzgxOperate"
+          data-key="dictValue"
+          @confirm="onyhzgxChanged"
+          placeholder="选择与户主关系"
+          remote-url="/open/zdzh/list/family_status"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-if="!showHzxx"
+          v-model="form.nhdm"
+          label="农户代码"
+          value-key="xm"
+          placeholder="选择农户代码"
+          :columns = "nhdmOptions"
+          @confirm="onnhdmChanged"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
         <van-field
           input-align="right"
           v-model="form.xm"
@@ -66,6 +90,7 @@
           :rules="[{ required: true }]"
           required
         />
+
         <field-select
           v-model="form.zjlx"
           label="证件类型"
@@ -88,18 +113,6 @@
           :rules="[{ required: true }]"
           required
         />
-        <field-select
-          v-model="form.yhzgx"
-          label="与户主关系"
-          value-key="dictLabel"
-          :readonly="yhzgxOperate"
-          data-key="dictValue"
-          placeholder="选择与户主关系"
-          remote-url="/open/zdzh/list/family_status"
-          :on-remote-response="'data'"
-          :rules="[{ required: true }]"
-          required
-        />
         <field-select
           v-model="form.xb"
           label="性别"
@@ -193,75 +206,79 @@
           remote-url="/open/zdzh/list/house_yes_no"
           :on-remote-response="'data'"
         />
-        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">户主专用信息</p>
+        <div v-if="showHzxx">
+          <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">户主专用信息</p>
 
-        <FieldRadio
-          v-model="form.sfwbh"
-          label="是否五保户"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <FieldRadio
-          v-model="form.sfpkh"
-          label="是否贫困户"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <FieldRadio
-          v-model="form.zqtczsfyzf"
-          label="在其他村庄有住房"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <FieldRadio
-          v-model="form.jzhcssfyzf"
-          label="在集镇或城市有住房"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <FieldRadio
-          v-model="form.sfbccm"
-          label="本村村民"
-          value-key="dictLabel"
-          data-key="dictValue"
-          remote-url="/open/zdzh/list/house_yes_no"
-          :on-remote-response="'data'"
-        />
-        <field-select
-          v-model="form.occupation"
-          label="职业"
-          value-key="dictLabel"
-          data-key="dictValue"
-          placeholder="选择职业"
-          remote-url="/open/zdzh/list/occupation"
-          :on-remote-response="'data'"
-        />
-        <field-select
-          v-model="form.jzqk"
-          label="居住情况"
-          value-key="dictLabel"
-          data-key="dictValue"
-          placeholder="选择居住情况"
-          remote-url="/open/zdzh/list/living_condition"
-          :on-remote-response="'data'"
-        />
-        <van-field
-          input-align="right"
-          v-model="form.txdz"
-          name="通讯地址"
-          label="通讯地址"
-          placeholder="请输入通讯地址"
-          maxlength="50"
-          autocomplete="off"
-        />
+          <FieldRadio
+            v-model="form.sfwbh"
+            label="是否五保户"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <FieldRadio
+            v-model="form.sfpkh"
+            label="是否贫困户"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <FieldRadio
+            v-model="form.zqtczsfyzf"
+            label="在其他村庄有住房"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <FieldRadio
+            v-model="form.jzhcssfyzf"
+            label="在集镇或城市有住房"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <FieldRadio
+            v-model="form.sfbccm"
+            label="本村村民"
+            value-key="dictLabel"
+            data-key="dictValue"
+            remote-url="/open/zdzh/list/house_yes_no"
+            :on-remote-response="'data'"
+          />
+          <field-select
+            v-model="form.occupation"
+            label="职业"
+            value-key="dictLabel"
+            data-key="dictValue"
+            placeholder="选择职业"
+            remote-url="/open/zdzh/list/occupation"
+            :on-remote-response="'data'"
+          />
+          <field-select
+            v-model="form.jzqk"
+            label="居住情况"
+            value-key="dictLabel"
+            data-key="dictValue"
+            placeholder="选择居住情况"
+            remote-url="/open/zdzh/list/living_condition"
+            :on-remote-response="'data'"
+          />
+          <van-field
+            input-align="right"
+            v-model="form.txdz"
+            name="通讯地址"
+            label="通讯地址"
+            placeholder="请输入通讯地址"
+            maxlength="50"
+            autocomplete="off"
+            :rules="[{ required: true }]"
+            required
+          />
+        </div>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
         <van-button v-if="permission == 'true'"  round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
@@ -296,6 +313,8 @@ export default {
       active:2,
       permission:false,
       yhzgxOperate:false,
+      nhdmOptions:null,
+      showHzxx:false,
       // 使用权人列表
       syqrlist:[
         {
@@ -318,6 +337,7 @@ export default {
       }else{
         this.$set(this.form, 'yhzgx', "11");
       }
+
       this.$set(this.form, 'zjlx', "01");
       this.$set(this.form, 'xb', "1");
       this.$set(this.form, 'hklx', "01");
@@ -334,15 +354,24 @@ export default {
       this.$set(this.form, 'occupation', "1");
       this.$set(this.form, 'jzqk', "1");
     }
-    console.info(data);
+    if(this.form.yhzgx !== "02"){
+      this.showHzxx = false;
+    }else{
+      this.showHzxx = true;
+    }
+    this.getList();
   },
   mounted(){
 
   },
   methods: {
     getList(){
-      listNhhncy(this.form).then(response => {
-
+      listNhhncy({yhzgx:"02"}).then(response => {
+        this.nhdmOptions = response.rows;
+        this.nhdmOptions = this.nhdmOptions.map(function(item){
+          item.xm = item.xm +"-"+ item.nhdm;
+          return {xm:item.xm,nhdm:item.nhdm}
+        });
       });
     },
     submitzjd(){
@@ -398,6 +427,16 @@ export default {
     MapTag: function (data) {
       this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
     },
+    onnhdmChanged(val){
+      this.$set(this.form, 'nhdm', val.nhdm);
+    },
+    onyhzgxChanged(val){
+      if(val === "02" ){
+        this.showHzxx = true;
+      }else{
+        this.showHzxx = false;
+      }
+    },
     goBack(){
       if(this.ztMap && this.enterMap ==1){
         if(this.form.id == null){

src/views/homesteadSurvey/nhcyList.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
         >
           <template #left>
@@ -47,7 +47,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <div style="margin:30px auto 0;width: 95%;">
+    <div style="margin:1.6rem auto 0;width: 95%;">
       <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">户内成员</p>
     </div>
     <van-swipe-cell v-for="(item,index) in hnnylist" :key="'syqr'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
@@ -104,7 +104,7 @@
       </van-form>
     </van-dialog>
     <div v-if="permission == 'true'"  style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
-      <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
+      <div style="width:100%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
         <p style="font-size: 16px;" @click="showPopupcy()">+ 添加成员信息</p>
       </div>
     </div>

src/views/homesteadSurvey/nmfwAdd.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
         >
           <template #left>
@@ -45,7 +45,7 @@
       </div>
     </van-sticky>
     <van-form ref = "form">
-      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+      <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">农民房屋信息</p>
         <!--<van-field
           v-model="form.deptId"
@@ -65,12 +65,28 @@
           :rules="[{ required: true }]"
           required
         />
-        <van-field v-model="form.nhdm" label="农户姓名" placeholder="农户" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
-        <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
-          <van-cell id="vanCell"  v-for="(item, index) in nhdmDictionaries" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-            {{item.hzxm}}-{{item.nhdm}}
-          </van-cell>
-        </div>
+        <van-field
+          readonly
+          clickable
+          :rules="[{ required: true }]"
+          required
+          label="农户代码"
+          placeholder="请选择"
+          v-model="form.nhdm"
+          @click="shownhdm = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="shownhdm" position="bottom">
+          <van-search v-model="nhdmSearch" placeholder="请输入搜索关键词" @input="onSearch"/>
+          <van-picker
+            show-toolbar
+            :columns="newList"
+            value-key="shyqrdbxm"
+            @confirm="shyqrdmxmChange"
+            @cancel="shownhdm = false"
+          />
+        </van-popup>
         <van-field
           input-align="right"
           v-model="form.sjcs"
@@ -340,6 +356,7 @@ import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOn
 import FieldSelect from "@/components/form/FieldSelect";
 import FieldRadio from "@/components/form/FieldRadio";
 import CommonMap from "@/components/house/CommonMap";
+import {getShyqrs} from "@/api/homesteadSurvey/shyqr";
 import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
 import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
 
@@ -353,6 +370,7 @@ export default {
       active:3,
       // 使用权人列表
       permission:false,
+      shownhdm:false,
       syqrlist:[
         {
           shyqrdbxm :'测试测试',
@@ -362,8 +380,10 @@ export default {
       ],
       // 地图绘制
       drawInsert: null,
+      nhdmSearch:null,
       showDropList:false,
       nhdmDictionaries:[],
+      newList:[],
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
@@ -398,11 +418,24 @@ export default {
         this.form.jznd = this.form.jznd.substr(0,10);
       }
     }
+    this.getList();
   },
   mounted(){
 
   },
   methods: {
+    getList(){
+       getShyqrs({zjddm:this.form.zjddm}).then(response => {
+        this.nhdmDictionaries = response.rows.map(function(item){
+          item.shyqrdbxm = item.shyqrdbxm + item.nhdm;
+          return {
+            shyqrdbxm:item.shyqrdbxm,
+            nhdm:item.nhdm,
+          };
+        });
+        this.newList = this.nhdmDictionaries;
+      });
+    },
     submitzjd(){
       this.$refs.form.validate().then(() => {
       if(this.form.id == null){
@@ -413,7 +446,7 @@ export default {
               message: '保存成功',
               duration:"1000",
               onClose:function(){
-                _this.$router.push({path:'/homesteadSurvey/add3',query: {zjddm: _this.form.zjddm}});
+                _this.$router.push({path:'/homesteadSurvey/nmfwList',query: {nmfwzh:_this.form.nmfwzh}});
               }
             })
         })
@@ -425,7 +458,7 @@ export default {
             message: '保存成功',
             duration:"1000",
             onClose:function(){
-              _this.$router.push({path:'/homesteadSurvey/add3',query: {zjddm: _this.form.zjddm}});
+              _this.$router.push({path:'/homesteadSurvey/nmfwList',query: {nmfwzh:_this.form.nmfwzh}});
             }
           })
         });
@@ -434,21 +467,33 @@ export default {
         Dialog({ type: 'danger', message: '请填写完整的表单项' });
       });
     },
+    onSearch(val) {
+      console.info(val);
+      if(this.nhdmDictionaries.length>0){
+        this.newList = []
+        for(let j = 0 ;j<this.nhdmDictionaries.length;j++){
+          if(this.nhdmDictionaries[j].shyqrdbxm.indexOf(val)>-1){
+            this.newList.push(this.nhdmDictionaries[j]);
+          }
+        }
+      }
+      if(val==""){
+        this.getList()
+      }
+    },
     /** 模糊查询人员信息 */
     remoteTransfereeMethod(query) {
       if (query !== "") {
-        listNh({hzxm:query}).then((response) => {
+        console.info(this.form.zjddm);
+        getShyqrs({zjddm:this.form.zjddm,shyqrdbxm:query,}).then((response) => {
           if (response.code == 200) {
+            if(response.rows.length === 0){
+              this.form.nhdm = null;
+            }
             this.nhdmDictionaries = response.rows.map(function (item) {
               return {
-                hzxm:item.hzxm,
-                sqrxb:item.xb,
-                hzzjhm:item.hzzjhm,
-                nhdm:item.nhdm,
-                hzzjlx:item.hzzjlx,
-                lxdh:item.lxdh,
-                deptId:item.deptId,
-                deptName:item.deptName,
+                shyqrdbxm:item.shyqrdbxm,
+                nhdm:item.nhdm
               }
             })
             //设置模糊查询的下拉框和滚动条
@@ -477,7 +522,7 @@ export default {
     },
     shyqrdmxmChange(val){
       this.$set(this.form, "nhdm", val.nhdm);
-      this.showDropList = false;
+      this.shownhdm = false;
     },
     // 绘制申请地图
     pointDarw(data) {

src/views/homesteadSurvey/nmfwList.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
         >
           <template #left>
@@ -47,14 +47,14 @@
         </van-row>
       </div>
     </van-sticky>
-    <div style="margin:30px auto 0;width: 95%;">
+    <div style="margin:1.6rem auto 0;width: 95%;">
       <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">农民房屋</p>
     </div>
-    <van-swipe-cell v-for="(item,index) in nmfwlist" :key="'nmfw'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
+    <van-swipe-cell v-for="(item,index) in nmfwlist"  :key="'nmfw'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
       <div style="padding:15px;">
         <p style="display: flex;align-items: center;">
           <img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 5px;">
-          <span style="line-height: 1;font-size: 16px;">{{item.xm}}</span>
+          <span style="line-height: 1;font-size: 16px;">{{item.nmfwdm}}</span>
         </p>
         <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
           <p style="flex:1;text-align:left;">农民房屋面积:</p>
@@ -77,7 +77,7 @@
     </van-swipe-cell>
 
     <div v-if="permission == 'true'" style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
-      <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
+      <div style="width:100%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
         <p style="font-size: 16px;" @click="showPopupAddnmfw()">+ 添加农民房屋</p>
       </div>
 
@@ -143,7 +143,7 @@ export default {
       this.$router.push({name:'nmfwAdd',query:val});
     },
     showPopupAddnmfw(){
-      this.$router.push({name:'nmfwAdd',query:{nmfwzh:this.zrzData.nmfwzh}});
+      this.$router.push({name:'nmfwAdd',query:{nmfwzh:this.zrzData.nmfwzh,zjddm:this.zrzData.zjddm}});
     },
     showPopuphncy(val){
       this.$router.push({name:'nhcyAdd',query:val});

src/views/homesteadSurvey/shyqrAdd.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
         >
           <template #left>
@@ -45,7 +45,7 @@
       </div>
     </van-sticky>
     <van-form ref = "form">
-      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+      <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">使用权人信息</p>
         <!--<van-field
           v-model="form.deptId"
@@ -55,12 +55,28 @@
           :rules="[{ required: true, message: '' }]"
         />-->
 
-        <van-field v-model="form.nhdm" label="农户代码" placeholder="农户代码" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
-        <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
-          <van-cell id="vanCell"  v-for="(item, index) in nhdmDictionaries" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-            {{item.hzxm}}-{{item.nhdm}}
-          </van-cell>
-        </div>
+        <van-field
+          readonly
+          clickable
+          :rules="[{ required: true }]"
+          required
+          label="农户代码"
+          placeholder="请选择"
+          v-model="form.nhdm"
+          @click="shownhdm = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="shownhdm" position="bottom">
+          <van-search v-model="nhdmSearch"  placeholder="请输入搜索关键词" @input="onSearch"/>
+          <van-picker
+            show-toolbar
+            :columns="newList"
+            value-key="nhValue"
+            @confirm="shyqrdmxmChange"
+            @cancel="shownhdm = false"
+          />
+        </van-popup>
         <van-field
           v-model="form.zjddm"
           label="宅基地代码"
@@ -332,10 +348,12 @@ export default {
       shownhdm:false,
       showDropList:false,
       shownmfwdm:false,
+      nhdmSearch:null,
       hzxm:null,
       landStatus:"1",
       deptId:JSON.parse(localStorage.getItem("surveyItem")).deptId,
       nhdmDictionaries:[],
+      newList:[],
       nmfwDictionaries:[],
       mapShow: false,
       form:{}
@@ -359,38 +377,57 @@ export default {
       this.$set(this.form, 'gyfs', "1");
       this.$set(this.form, 'sfczr', "1");
 
+    }else{
+      listNmfw({zjddm:this.zjdzdxx.zjddm,nhdm:this.form.nhdm}).then(response => {
+        this.nmfwDictionaries = response.rows;
+      });
     }
     this.$set(this.form, 'zjddm', this.zjdzdxx.zjddm);
     listZjdzd({zjddm:this.zjdzdxx.zjddm}).then(response => {
       this.form.bdcdyh = response.rows[0].bdcdyh;
     });
-    listNmfw({zjddm:this.zjdzdxx.zjddm}).then(response => {
-      this.nmfwDictionaries = response.rows;
-    });
-    // this.getList();
+    this.getList();
   },
   mounted(){
 
   },
   methods: {
     getList(){
-      listNh({}).then(response => {
-        this.nhdmDictionaries = response.rows;
+      listNhhncy({yhzgx:"02"}).then(response => {
+        this.nhdmDictionaries = response.rows.map(function(item){
+          item.nhValue = item.xm + item.nhdm;
+          return {
+            nhValue:item.nhValue,
+            hzxm:item.xm,
+            sqrxb:item.xb,
+            hzzjhm:item.zjhm,
+            nhdm:item.nhdm,
+            hzzjlx:item.zjlx,
+            lxdh:item.lxdh,
+            hklx:item.hklx,
+            sfbjtjjzzcy:item.sfbjtjjzzcy,
+            deptId:item.deptId,
+            deptName:item.deptName,
+          };
+        });
+        this.newList = this.nhdmDictionaries;
       });
     },
     /** 模糊查询人员信息 */
     remoteTransfereeMethod(query) {
       if (query !== "") {
-        listNh({hzxm:query}).then((response) => {
+        listNhhncy({xm:query,yhzgx:"02"}).then((response) => {
           if (response.code == 200) {
             this.nhdmDictionaries = response.rows.map(function (item) {
               return {
-                hzxm:item.hzxm,
+                hzxm:item.xm,
                 sqrxb:item.xb,
-                hzzjhm:item.hzzjhm,
+                hzzjhm:item.zjhm,
                 nhdm:item.nhdm,
-                hzzjlx:item.hzzjlx,
+                hzzjlx:item.zjlx,
                 lxdh:item.lxdh,
+                hklx:item.hklx,
+                sfbjtjjzzcy:item.sfbjtjjzzcy,
                 deptId:item.deptId,
                 deptName:item.deptName,
               }
@@ -422,7 +459,15 @@ export default {
     shyqrdmxmChange(val){
       this.$set(this.form, "nhdm", val.nhdm);
       this.$set(this.form, "shyqrdbzjhm", val.hzzjhm);
-      this.showDropList = false;
+      this.$set(this.form, "shyqrdbxm", val.hzxm);
+      this.$set(this.form, "dh", val.lxdh);
+      this.$set(this.form, "xb", val.sqrxb);
+      this.$set(this.form, "hklx", val.hklx);
+      this.$set(this.form, "sfbncjtjjzzcy", val.sfbjtjjzzcy);
+      listNmfw({zjddm:this.zjdzdxx.zjddm,nhdm:val.nhdm}).then(response => {
+        this.nmfwDictionaries = response.rows;
+      });
+      this.shownhdm = false;
     },
     submitzjd(){
       this.$refs.form.validate().then(() => {
@@ -461,6 +506,20 @@ export default {
         this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
       },1000);
     },
+    onSearch(val) {
+      console.info(val);
+      if(this.nhdmDictionaries.length>0){
+         this.newList = []
+        for(let j = 0 ;j<this.nhdmDictionaries.length;j++){
+          if(this.nhdmDictionaries[j].hzxm.indexOf(val)>-1){
+            this.newList.push(this.nhdmDictionaries[j]);
+          }
+        }
+      }
+      if(val==""){
+        this.getList()
+      }
+    },
     /** 查找地图中宅基地 */
     closeMoule: function (data) {
       this.form.zjddm = data;

src/views/homesteadSurvey/zrzAdd.vue

@@ -3,7 +3,7 @@
     <van-sticky style="position:relative;">
       <div class="bannerBg">
         <van-nav-bar
-          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          style="background:transparent;border-bottom-width:0;margin-bottom:.5rem;"
           @click-left="goBack()"
         >
           <template #left>
@@ -45,7 +45,7 @@
       </div>
     </van-sticky>
     <van-form  ref = "form">
-      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+      <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">自然幢信息</p>
         <!--<van-field
           v-model="form.deptId"
@@ -95,10 +95,9 @@
         <van-popup v-model:show="showZgqrzrq" position="bottom">
           <van-datetime-picker
             type="date"
+            :value="new Date"
             @confirm="onConfirmZgqrzrq"
             @cancel="showZgqrzrq = false"
-            :min-date="minDate"
-            :max-date="maxDate"
           />
         </van-popup>
         <van-field