Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/api/homesteadSurvey/fsss.js

@@ -59,3 +59,11 @@ export function getFsssZjdDmList(zjddm) {
     method: 'get'
   })
 }
+
+// 通过宅基地编码修改附属设施状态
+export function updateFsssZt(zjddm) {
+  return request({
+    url: '/houseSurvey/fsss/updateFsssZt/' + zjddm,
+    method: 'get'
+  })
+}

src/api/homesteadSurvey/zrz.js

@@ -69,3 +69,11 @@ export function getZrzZjdDmList(zjddm) {
   })
 }
 
+// 通过宅基地修改自然幢核查状态
+export function updateZrzZt(zjddm) {
+  return request({
+    url: '/houseSurvey/zrz/updateZrzZt/' + zjddm,
+    method: 'get'
+  })
+}
+

src/components/Map/MapGisDrawing.vue

@@ -114,6 +114,21 @@ export default {
           }),
         });
         that.mapData= that.message;
+        //宅基地图层查询开始 ------------------start
+        var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
+        var zjdTc= new ol.layer.Tile({
+          source: new ol.source.TileWMS({
+            url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
+            params: {
+              LAYERS: 'zjd_dc:t_house_survey_zjdzd',
+              TILED: true,
+              cql_filter: cql_filter_all,
+              SRID: 3857,
+            },
+          }),
+        });
+        map.addLayer(zjdTc);
+        //宅基地图层查询开始 ------------------start
         //图层查询定位开始 ---------start
         if(this.message.substring(0,1) =="{"){
           //that.newHt ="1";
@@ -539,6 +554,21 @@ export default {
           });
         map.addLayer(cunTc);
         //村边界查询开始 ------------------------------end
+        //宅基地图层查询开始 ------------------start
+        var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
+        var zjdTc= new ol.layer.Tile({
+          source: new ol.source.TileWMS({
+            url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
+            params: {
+              LAYERS: 'zjd_dc:t_house_survey_zjdzd',
+              TILED: true,
+              cql_filter: cql_filter_all,
+              SRID: 3857,
+            },
+          }),
+        });
+        map.addLayer(zjdTc);
+        //宅基地图层查询开始 ------------------start
         // getQueryLand().then((response) => {
         //   if (response.code == 200) {
         //     let InsertCode = response.data;

src/views/homesteadSurvey/add.vue

@@ -84,6 +84,15 @@
             input-align="right"
             disabled
           />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="form.zddm"
+            name="宗地代码"
+            label="宗地代码"
+            placeholder="自动生成"
+            disabled
+          />
           <van-field name="radio" label="是否发证" input-align="right" autocomplete="off">
             <template #input>
               <van-radio-group v-model="form.sffz" direction="horizontal">
@@ -95,7 +104,7 @@
           <van-field
             autocomplete="off"
             input-align="right"
-            v-model="form.ytName"
+            v-model="form.ytmc"
             name="用途"
             label="用途"
             placeholder="用途"
@@ -104,14 +113,6 @@
             required
             :rules="[{ required: true, message: '用途不能为空' }]"
           />
-          <van-field
-            input-align="right"
-            v-model="form.ytmc"
-            name="用途名称"
-            label="用途名称"
-            placeholder="用途名称"
-            autocomplete="off"
-          />
           <van-field
             v-model="form.yt"
             style="display:none"
@@ -143,14 +144,7 @@
             label="宗地面积(㎡)"
             placeholder="宗地面积(㎡)"
           />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.zdbh"
-            name="宗地代码"
-            label="宗地代码"
-            placeholder="宗地代码"
-          />
+
           <van-field
             autocomplete="off"
             input-align="right"
@@ -166,10 +160,9 @@
             v-model="form.zldwdm"
             name="坐落单位代码"
             label="坐落单位代码"
-            placeholder="坐落单位代码"
+            placeholder="自动生成"
             input-align="right"
-            required
-            :rules="[{ required: true, message: '坐落单位代码不能为空' }]"
+            disabled
           />
           <van-field
             autocomplete="off"
@@ -309,6 +302,7 @@
             style="display:none"
           />
           <van-field
+            autocomplete="off"
             input-align="right"
             v-model="form.jg"
             name="价格（万元）"
@@ -410,7 +404,8 @@
             v-model="form.djh"
             name="地籍号"
             label="地籍号"
-            placeholder="地籍号"
+            placeholder="自动生成"
+            disabled
           />
           <van-field
             autocomplete="off"
@@ -470,11 +465,13 @@
         </template>
       </van-swipe-cell>
 
-      <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
-        <div style="text-align:center;" >
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupsyqr('')"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加使用权人代表</p>
+      <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:10px;">
+        <div style="text-align:center;overflow:auto;">
+          <van-button plain round color="#22B7F2" size="mini" style="margin:0 auto;padding:20px;" @click="showPopupsyqr('')">+添加使用权人</van-button>
+          <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;">
         <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>
@@ -498,6 +495,7 @@
           </div>
           <div style="text-align:center;overflow:auto;">
             <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopupzrz(item)">查看自然幢信息</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="shownmfwlist(item)">查看房屋列表</van-button>
           </div>
         </div>
         <template #right>
@@ -509,7 +507,7 @@
           <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupzrz('')"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加自然幢信息</p>
         </div>
       </div>
-      <div style="margin:20px;">
+      <!--<div style="margin:20px;">
         <p class="title" style="position:relative;padding-left:20px;line-height:32px;">房屋信息</p>
       </div>
       <van-swipe-cell v-for="(item,index) in fwlist" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
@@ -535,7 +533,7 @@
         <div style="text-align:center;" >
           <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupfw('')"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加房屋信息</p>
         </div>
-      </div>
+      </div>-->
       <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>
@@ -721,6 +719,7 @@
             name="权利比例"
             label="权利比例"
             placeholder="单独为1，共有时2位小数"
+            type="number"
           />
           <van-field
             autocomplete="off"
@@ -772,6 +771,7 @@
             name="分摊宗地面积(㎡)"
             label="分摊宗地面积(㎡)"
             placeholder="单位：平方米"
+            type="number"
           />
           <van-field
             autocomplete="off"
@@ -888,9 +888,8 @@
             v-model="form3.zrzh"
             name="自然幢号"
             label="自然幢号"
-            placeholder="自然幢号"
-            required
-            :rules="[{ required: true, message: '自然幢号不能为空' }]"
+            placeholder="自动生成"
+            disabled
           />
           <van-field
             autocomplete="off"
@@ -909,6 +908,7 @@
             name="建筑物高度"
             label="建筑物高度"
             placeholder="建筑物高度"
+            type="number"
           />
           <van-field
             autocomplete="off"
@@ -917,6 +917,7 @@
             name="幢占地面积(㎡)"
             label="幢占地面积(㎡)"
             placeholder="幢占地面积(㎡)"
+            type="number"
             required
             :rules="[{ required: true, message: '幢占地面积(㎡)不能为空' }]"
           />
@@ -927,6 +928,7 @@
             name="幢用地面积(㎡)"
             label="幢用地面积(㎡)"
             placeholder="幢用地面积(㎡)"
+            type="number"
             required
             :rules="[{ required: true, message: '幢用地面积(㎡)不能为空' }]"
           />
@@ -937,6 +939,7 @@
             name="实测建筑面积(㎡)"
             label="实测建筑面积(㎡)"
             placeholder="实测建筑面积(㎡)"
+            type="number"
           />
           <van-field
             autocomplete="off"
@@ -945,6 +948,7 @@
             name="总层数"
             label="总层数"
             placeholder="总层数"
+            type="number"
             required
             :rules="[{ required: true, message: '总层数不能为空' }]"
           />
@@ -955,6 +959,7 @@
             name="地上层数"
             label="地上层数"
             placeholder="地上层数"
+            type="number"
           />
           <van-field
             autocomplete="off"
@@ -963,6 +968,7 @@
             name="地下层数"
             label="地下层数"
             placeholder="地下层数"
+            type="number"
           />
           <van-field
             autocomplete="off"
@@ -1013,6 +1019,228 @@
         </van-form>
       </div>
     </van-popup>
+    <van-popup v-model="shownh" style="height:100%;width:100%;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;"
+          @click-left="shownh=false"
+        >
+          <template #left>
+            <van-icon name="arrow-left" size="18" color="#fff" />
+          </template>
+          <template #title>
+            <p style="color:#fff">{{nhform.id?"":"新增"}}户主信息</p>
+          </template>
+        </van-nav-bar>
+      </div>
+      <div style="margin:20px;">
+        <van-form @submit="onSubmitnh">
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.suyqrdm"
+            name="所有权人代码"
+            label="所有权人代码"
+            placeholder="所有权人代码"
+            required
+            disabled
+            :rules="[{ required: true, message: '所有权人代码不能为空' }]"
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.nhdm"
+            name="农户代码"
+            label="农户代码"
+            placeholder="自动生成"
+            disabled
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.hzxm"
+            name="户主姓名"
+            label="户主姓名"
+            placeholder="户主姓名"
+            required
+            :rules="[{ required: true, message: '户主姓名不能为空' }]"
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.hzzjlxName"
+            name="户主证件类型"
+            label="户主证件类型"
+            placeholder="户主证件类型"
+            required
+            readonly
+            :rules="[{ required: true, message: '户主证件类型不能为空' }]"
+            @click="showhzzjlx = true"
+          />
+          <van-field
+            autocomplete="off"
+            v-model="nhform.hzzjlx"
+            style="display:none"
+          />
+          <van-field
+            autocomplete="off"
+            v-model="nhform.hzzjhm"
+            input-align="right"
+            name="户主证件号码"
+            label="户主证件号码"
+            placeholder="户主证件号码"
+            required
+            :rules="[{ required: true, message: '户主证件号码不能为空' }]"
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.txdz"
+            name="通讯地址"
+            label="通讯地址"
+            placeholder="通讯地址"
+            required
+            :rules="[{ required: true, message: '通讯地址不能为空' }]"
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.hncysl"
+            name="户内成员数量"
+            label="户内成员数量"
+            placeholder="户内成员数量"
+            required
+            :rules="[{ required: true, message: '户内成员数量不能为空' }]"
+          />
+          <van-field name="radio" label="婚姻状况" input-align="right" autocomplete="off">
+            <template #input>
+              <van-radio-group v-model="nhform.hyzk" direction="horizontal">
+                <van-radio v-for="dict in hyzkOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.phone"
+            name="电话号码"
+            label="电话号码"
+            placeholder="电话号码"
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.occupationName"
+            name="职业"
+            label="职业"
+            placeholder="职业"
+            required
+            readonly
+            :rules="[{ required: true, message: '职业不能为空' }]"
+            @click="showhzoccupation = true"
+          />
+          <van-field
+            autocomplete="off"
+            v-model="nhform.occupation"
+            style="display:none"
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.jzqkName"
+            name="居住情况"
+            label="居住情况"
+            placeholder="居住情况"
+            required
+            readonly
+            :rules="[{ required: true, message: '居住情况不能为空' }]"
+            @click="showhzjzqk = true"
+          />
+          <van-field
+            autocomplete="off"
+            v-model="nhform.jzqk"
+            style="display:none"
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.jzhcssfyzfName"
+            name="在集镇或城市是否有住房"
+            label="在集镇或城市是否有住房"
+            placeholder="在集镇或城市是否有住房"
+            required
+            readonly
+            :rules="[{ required: true, message: '在集镇或城市是否有住房不能为空' }]"
+            @click="showhzjzhcssfyzf = true"
+          />
+          <van-field
+            autocomplete="off"
+            v-model="nhform.jzhcssfyzf"
+            style="display:none"
+          />
+          <van-field name="radio" label="在其他村庄是否有住房" input-align="right" autocomplete="off">
+            <template #input>
+              <van-radio-group v-model="nhform.zqtczsfyzf" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否本村村民" input-align="right" autocomplete="off">
+            <template #input>
+              <van-radio-group v-model="nhform.sfbccm" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否贫困户" input-align="right" autocomplete="off">
+            <template #input>
+              <van-radio-group v-model="nhform.sfpkh" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field name="radio" label="是否五保户" input-align="right" autocomplete="off">
+            <template #input>
+              <van-radio-group v-model="nhform.sfwbh" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.sjlyName"
+            name="数据来源"
+            label="数据来源"
+            placeholder="数据来源"
+            required
+            readonly
+            :rules="[{ required: true, message: '能为空' }]"
+            @click="showhzsjly = true"
+          />
+          <van-field
+            autocomplete="off"
+            v-model="nhform.sjly"
+            style="display:none"
+          />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nhform.bz"
+            name="备注"
+            label="备注"
+            placeholder="备注"
+          />
+          <div style="margin: 16px;">
+            <van-button round block color="#7AC943" native-type="submit">保存</van-button>
+          </div>
+        </van-form>
+      </div>
+    </van-popup>
     <van-popup v-model="showfw" style="height:100%;width:100%;">
       <div class="bannerBg">
         <van-nav-bar
@@ -1092,6 +1320,7 @@
             name="农民房屋面积(㎡)"
             label="农民房屋面积(㎡)"
             placeholder="农民房屋面积(㎡)"
+            type="number"
             required
             :rules="[{ required: true, message: '农民房屋面积(㎡)不能为空' }]"
           />
@@ -1247,6 +1476,7 @@
             name="建筑面积(㎡)"
             label="建筑面积(㎡)"
             placeholder="建筑面积(㎡)"
+            type="number"
           />
           <van-field
             autocomplete="off"
@@ -1868,6 +2098,8 @@
           type="date"
           @confirm="onConfirmzrzjgrq"
           @cancel="showPickerjgrq = false"
+          :min-date="minDate"
+          :max-date="maxDate"
         />
       </van-popup>
       <van-popup v-model="showPickerpzsj" position="bottom">
@@ -1925,7 +2157,17 @@
         @cancel="showfwzt = false"
       />
     </van-popup>
+    <!--<van-popup v-model="showsyqrnhdmlist" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="syqrnhdmlist"
+        value-key="hzxm"
+        @confirm="onConfirmsyqrnhdmlist"
+        @cancel="showsyqrnhdmlist = false"
+      />
+    </van-popup>-->
     <van-popup v-model="showsyqrnhdmlist" position="bottom">
+      <van-search v-model="nhdmValue" placeholder="请输入搜索关键词" @input="getnhdmlist"/>
       <van-picker
         show-toolbar
         :columns="syqrnhdmlist"
@@ -2015,6 +2257,7 @@
             name="建筑面积(㎡)"
             label="建筑面积(㎡)"
             placeholder="建筑面积(㎡)"
+            type="number"
             required
             :rules="[{ required: true, message: '建筑面积(㎡)不能为空' }]"
           />
@@ -2396,6 +2639,48 @@
         </div>
       </div>
     </van-popup>
+    <van-popup v-model="shownmfw" style="height:100%;width:100%;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;"
+          @click-left="shownmfw=false"
+        >
+          <template #left>
+            <van-icon name="arrow-left" size="18" color="#fff" />
+          </template>
+          <template #title>
+            <p style="color:#fff">房屋信息列表</p>
+          </template>
+        </van-nav-bar>
+      </div>
+      <div style="margin:20px;">
+        <p class="title" style="position:relative;padding-left:20px;line-height:32px;">房屋信息</p>
+      </div>
+      <van-swipe-cell v-for="(item,index) in fwlist" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
+        <div style="padding:20px;">
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>第{{index+1}}号</p>
+          <div style="display:flex;line-height:20px">
+            <p style="flex:1;text-align:left;">农民房屋幢号</p>
+            <p  style="flex:1;text-align:right;">{{item.nmfwzh}}</p>
+          </div>
+          <div style="display:flex;line-height:20px">
+            <p style="flex:1;text-align:left;">农民房屋面积(㎡)</p>
+            <p style="flex:1;text-align:right;">{{item.nmfwmj}}</p>
+          </div>
+          <div style="text-align:center;overflow:auto;">
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopupfw(item)">查看房屋信息</van-button>
+          </div>
+        </div>
+        <template #right>
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletefw(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;margin-bottom:50px">
+        <div style="text-align:center;" >
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupfw('')"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加房屋信息</p>
+        </div>
+      </div>
+    </van-popup>
     <van-popup v-model="showesign" position="bottom" closeable
                close-icon="close">
       <van-row style="margin:0 10%">
@@ -2482,6 +2767,7 @@
     </van-popup>
     <!--农民房屋农户代码列表-->
     <van-popup v-model="shownmfwnhdm" position="bottom">
+      <van-search v-model="nhdmValue" placeholder="请输入搜索关键词" @input="getnhdmlist"/>
       <van-picker
         show-toolbar
         :columns="syqrnhdmlist"
@@ -2500,6 +2786,56 @@
         @cancel="showsyqrsshy = false"
       />
     </van-popup>
+    <!--户主证件类型-->
+    <van-popup v-model="showhzzjlx" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="zjlxOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzzjlx"
+        @cancel="showhzzjlx = false"
+      />
+    </van-popup>
+    <!--户主数据来源-->
+    <van-popup v-model="showhzsjly" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="sjlyOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzsjly"
+        @cancel="showhzsjly = false"
+      />
+    </van-popup>
+    <!--户主职业-->
+    <van-popup v-model="showhzoccupation" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="occupationOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzoccupation"
+        @cancel="showhzoccupation = false"
+      />
+    </van-popup>
+    <!--户主居住情况-->
+    <van-popup v-model="showhzjzqk" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="jzqkOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzjzqk"
+        @cancel="showhzjzqk = false"
+      />
+    </van-popup>
+    <!--集市或城市是否有住房-->
+    <van-popup v-model="showhzjzhcssfyzf" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="jzhcssfyzfOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzjzhcssfyzf"
+        @cancel="showhzjzhcssfyzf = false"
+      />
+    </van-popup>
   </div>
 </template>
 
@@ -2507,12 +2843,12 @@
   import {listShyqr,addShyqr,updateShyqr,delShyqr} 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} from "@/api/homesteadSurvey/zrz";
+  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 {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss";
+  import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssZt} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
   import { sysConfig} from "@/api/homesteadSurvey/index";
@@ -2522,6 +2858,15 @@
     components: { MapGisDrawing,},
     data() {
       return {
+        shownh:false,
+        showhzzjlx:false,
+        showhzoccupation:false,
+        showhzjzqk:false,
+        showhzjzhcssfyzf:false,
+        showhzsjly:false,
+        minDate:new Date(1950,1,1),
+        maxDate:new Date(2030,1,1),
+        nhdmValue:null,
         active:1,
         // 电子签名
         lineWidth: 6, // 画笔的线条粗细
@@ -2530,6 +2875,7 @@
         resultImg: "", // 最终画布生成的base64图片
         isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         showdj:false,
+        shownmfw:false,
         showsyqrsshy:false,
         shownmfwnhdm:false,
         showsyqrnmfwdm:false,
@@ -2607,6 +2953,8 @@
         form4:{},
         //成员信息表单
         form5:{},
+        // 农户信息表单
+        nhform:{},
         // 使用权人列表
         syqrlist:[],
         // 使用权人农户代码列表
@@ -2698,36 +3046,13 @@
 
         // 图片上传路径
         baseUrl:"",
+
+        // 自然幢号
+        zrzh:null,
       };
     },
     created(){
-      if(this.$cookies.get("search")){
-        if(this.$cookies.get("search").active!=null){
-          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
-          if(this.$cookies.get("search").active=="3"){
-            this.showzrz= true
-            this.getZrzList()
-            setTimeout(() => {
-              this.showPopupzrz(zrz)
-            }, 500);
 
-          }else if(this.$cookies.get("search").active=="4"){
-            this.showfsss= true
-            this.getFsssList()
-            setTimeout(() => {
-              this.showPopupfsss(fsss)
-            }, 500);
-          }
-        }else{
-          this.item = this.$cookies.get("search")
-        }
-
-      }else{
-        this.$set(this.item,"deptId",this.$cookies.get("item").deptId)
-      }
       this.getDicts("zjdlyzk").then(response => {
         this.lyzkOptions = response.data;
       });
@@ -2831,11 +3156,41 @@
       this.getDicts("Industry").then(response => {
         this.industryOptions = response.data;
       });
-      this.getnhdmlist();
-      this.getZjd();
-      this.getBaseUrl();
-
+      if(this.$cookies.get("search")){
+        if(this.$cookies.get("search").active!=null){
+          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.getnhdmlist();
+          this.getZjd();
+          this.getBaseUrl();
+          if(this.$cookies.get("search").active=="3"){
+            this.showzrz= true
+            this.getZrzList()
+            setTimeout(() => {
+              this.showPopupzrz(zrz)
+            }, 500);
 
+          }else if(this.$cookies.get("search").active=="4"){
+            this.showfsss= true
+            this.getFsssList()
+            setTimeout(() => {
+              this.showPopupfsss(fsss)
+            }, 500);
+          }
+        }else{
+          this.item = this.$cookies.get("search")
+          this.getnhdmlist();
+          this.getZjd();
+          this.getBaseUrl();
+        }
+      }else{
+        this.$set(this.item,"deptId",this.$cookies.get("item").deptId)
+        this.getnhdmlist();
+        this.getZjd();
+        this.getBaseUrl();
+      }
     },
     mounted(){
         if(this.active ==1){
@@ -2844,6 +3199,21 @@
         }
     },
     methods: {
+      shownmfwlist(item){
+        this.zrzh = item.zrzh
+        this.shownmfw = true
+        this.fwlist=[]
+        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 => {
+            this.fwlist = r.rows
+          })
+        }
+      },
       getBaseUrl(){
         let params={
           configKey: "system.attachment.url"}
@@ -2871,10 +3241,10 @@
       // 所有权人农户代码列表
       getnhdmlist(){
         let params = {
-          "deptId" : this.item.deptId
+          "deptId" : this.item.deptId,
+          "nhValue":this.nhdmValue
         }
         listNh(params).then((response) => {
-          console.log(response)
           this.syqrnhdmlist = response.rows
         });
       },
@@ -3079,6 +3449,31 @@
         this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url,"")
         this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url1,"")
       },
+      onConfirmhzsjly(value){
+        this.nhform.sjlyName = value.dictLabel
+        this.nhform.sjly = value.dictValue
+        this.showhzsjly= false
+      },
+      onConfirmhzjzqk(value){
+        this.nhform.jzqkName = value.dictLabel
+        this.nhform.jzqk = value.dictValue
+        this.showhzjzqk = false
+      },
+      onConfirmhzoccupation(value){
+        this.nhform.occupationName = value.dictLabel
+        this.nhform.occupation = value.dictValue
+        this.showhzoccupation = false
+      },
+      onConfirmhzzjlx(value){
+        this.nhform.hzzjlxName = value.dictLabel
+        this.nhform.hzzjlx = value.dictValue
+        this.showhzzjlx = false
+      },
+      onConfirmhzjzhcssfyzf(value){
+        this.nhform.jzhcssfyzfName = value.dictLabel
+        this.nhform.jzhcssfyzf = value.dictValue
+        this.showhzjzhcssfyzf= false
+      },
       // 使用权人农民房屋代码弹出框
       onConfirmsyqrnmfwdm(value){
         this.form1.nmfwdm = value.nmfwdm
@@ -3163,7 +3558,7 @@
       },
       // 宅基地用途弹出框
       onConfirmyt(value){
-        this.form.ytName = value.dictLabel
+        this.form.ytmc = value.dictLabel
         this.form.yt = value.dictValue
         this.showyt = false
       },
@@ -3416,7 +3811,40 @@
       goBack(){
         this.$router.push({name:'homesteadList'});
       },
+      showPopupnh(){
+        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
+          }
+        });
+      },
       getZjd() {
+        let _this = this
         if(this.item.zjddm){
           let params = {
             "zjddm":this.item.zjddm,
@@ -3424,12 +3852,13 @@
           }
           listZjdzd(params).then(response => {
             this.form = response.rows[0];
+            console.log(this.form)
             if(this.form.sffz==null||this.form.sffz==""){
               this.form.sffz = "Y"
             }
             if(this.form.yt==null||this.form.yt==""){
               this.form.yt = "072"
-              this.form.ytName="农村宅基地"
+              this.form.ytmc="农村宅基地"
             }
             if(this.form.lyzk==null||this.form.lyzk==""){
               this.form.lyzk = "1"
@@ -3466,6 +3895,13 @@
             if(this.form.sjly==null||this.form.sjly==""){
               this.form.sjly = "04"
               this.form.sjlyName = "农村宅基地使用权确权登记发证"
+            }else{
+              console.log(this.form.sjly)
+              this.sjlyOptions.map(res => {
+                if(res.dictValue == this.form.sjly){
+                  this.form.sjlyName = res.dictLabel
+                }
+              })
             }
             this.fileListzjd = []
             if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""&&this.form.zjdxctp.length>0){
@@ -3475,11 +3911,7 @@
               })
             }
 
-            this.sjlyOptions.map(res => {
-              if(res.dictValue == this.form.sjly){
-                this.form.sjlyName = res.dictLabel
-              }
-            })
+
             this.lyzkOptions.map(res => {
               if(res.dictValue == this.form.lyzk){
                 this.form.lyzkName = res.dictLabel
@@ -3502,7 +3934,7 @@
             })
             this.ytOptions.map(res => {
               if(res.dictValue == this.form.yt){
-                this.form.ytName = res.dictLabel
+                this.form.ytmc = res.dictLabel
               }
             })
             this.tddjOptions.map(res => {
@@ -3565,9 +3997,9 @@
           listZrz(params).then(response => {
             this.zrzlist = response.rows;
           });
-          listNmfw(params).then(r => {
+          /*listNmfw(params).then(r => {
             this.fwlist = r.rows
-          })
+          })*/
         }
       },
       getFsssList() {
@@ -3667,13 +4099,12 @@
               duration:"1000",
               onClose:function(){
                 _this.showfw = false
-                _this.active = 3
-                _this.getZrzList()
               }
             })
           });
         } else {
           addNmfw(this.nmfwform).then(response => {
+            console.log(this.nmfwform)
             let _this =this
             this.$toast({
               icon: 'success', // 找到自己需要的图标
@@ -3681,13 +4112,29 @@
               duration:"1000",
               onClose:function(){
                 _this.showfw = false
-                _this.active = 3
-                _this.getZrzList()
+                _this.shownmfwlist(_this.nmfwform);
               }
             })
           });
         }
       },
+      // 户主保存
+      onSubmitnh(){
+          this.nhform.deptId = this.item.deptId
+          addNh(this.nhform).then(
+            response => {
+              let _this =this
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '保存成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.shownh = false
+                }
+              })
+            }
+          );
+      },
       // 自然幢保存
       onSubmitzrz(){
         if (this.form3.id != null) {
@@ -3754,6 +4201,7 @@
       onSubmitzjd(){
         if (this.form.id != null) {
           updateZjdzd(this.form).then(response => {
+            this.$cookies.set("search",this.form);
             let _this =this
             this.$toast({
               icon: 'success', // 找到自己需要的图标
@@ -3766,6 +4214,7 @@
           });
         } else {
           addZjdzd(this.form).then(response => {
+            this.$cookies.set("search",this.form);
             this.form = response.data
             let _this =this
             this.$toast({
@@ -4031,7 +4480,7 @@
         this.showfw = true;
         if(item==""){
           this.nmfwform={
-            zrzh: null,
+            zrzh: this.zrzh,
             deptId : this.item.deptId?this.item.deptId:this.form.deptId,
             zjddm : this.item.zjddm?this.item.zjddm:this.form.zjddm,
             nmfwzh : null,
@@ -4422,6 +4871,10 @@
           .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 => {});
+            }
           })
           .catch((err) => {
             // 画布没有签字时会执行这里提示一下

src/views/homesteadSurvey/index.vue

@@ -33,7 +33,7 @@
               @click="active=1"
             />
           </van-badge>
-          <p id="basetext">全部任务</p>
+          <p id="basetext" :style="{color:(active==1?'#7AC943':'#000')}">全部任务</p>
         </van-col>
         <van-col span="8">
           <van-badge :content="done">
@@ -44,7 +44,7 @@
               @click="active=2"
             />
           </van-badge>
-          <p>已完成</p>
+          <p :style="{color:(active==2?'#7AC943':'#000')}">已完成</p>
         </van-col>
         <van-col span="8" >
           <van-badge :content="todo">
@@ -55,7 +55,7 @@
               @click="active=3"
             />
           </van-badge>
-          <p>待调查</p>
+          <p :style="{color:(active==3?'#7AC943':'#000')}">待调查</p>
         </van-col>
       </van-row>
       <div style="margin:20px;">

src/views/homesteadSurvey/list.vue

@@ -56,7 +56,13 @@
       <van-tabs v-model="active" title-active-color="#7AC943" color="#7AC943" swipeable animated @click="getZjdList">
         <van-tab >
           <template #title>全部<van-badge v-if="qbNums>=0" :content="qbNums" /></template>
-          <van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">
+          <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
+            <van-list
+              v-model:loading="loading1"
+              :finished="finished1"
+              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;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
@@ -75,11 +81,18 @@
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
-          </van-pull-refresh>
+            </van-list>
+          <!--</van-pull-refresh>-->
         </van-tab>
         <van-tab >
           <template #title>已核查<van-badge v-if="yhcNums>=0" :content="yhcNums" /></template>
-          <van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">
+          <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
+          <van-list
+            v-model:loading="loading2"
+            :finished="finished2"
+            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;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
@@ -98,11 +111,18 @@
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
-          </van-pull-refresh>
+          </van-list>
+          <!--</van-pull-refresh>-->
         </van-tab>
         <van-tab >
           <template #title>未核查<van-badge v-if="whcNums>=0" :content="whcNums" /></template>
-          <van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">
+          <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
+          <van-list
+            v-model:loading="loading3"
+            :finished="finished3"
+            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;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
@@ -121,7 +141,8 @@
               <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
             </template>
           </van-cell>
-          </van-pull-refresh>
+            </van-list>
+          <!--</van-pull-refresh>-->
         </van-tab>
       </van-tabs>
     </div>
@@ -447,7 +468,7 @@
           </template>
         </van-search>
         <div class="searchBox" style="display: none;">
-          <van-cell center v-for="(item,index) in mapDataAll">
+          <van-cell center v-for="(item,index) in mapDataAll" :key="index">
             <template #title>
               <p><van-icon name="manager" /><span>{{item.syqr}}</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.paceType}}</span>
                 <span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.typeTc}}</span></p>
@@ -1147,7 +1168,7 @@
     import {listShyqr} 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";
+    import {listFsss,getFsssZjdDmList,getFsss} from "@/api/homesteadSurvey/fsss";
     import { listTown, getTown } from "@/api/homesteadSurvey/town";
     import { listVillage} from "@/api/homesteadSurvey/village";
     import $ from "jquery";
@@ -1157,6 +1178,12 @@
       name: "homesteadList",
       data() {
         return {
+          loading1:false,
+          finished1:false,
+          loading2:false,
+          finished2:false,
+          loading3:false,
+          finished3:false,
           //全部
           qbNums:0,
           //已调查数量
@@ -1347,7 +1374,6 @@
         this.item = this.$cookies.get("item");
         this.getZjdList();
         this.getTotalHR();
-        console.log(this.mapZjdTeAll.mapZrzAData.length)
       },
       methods: {
         //删除户内成员
@@ -1398,9 +1424,12 @@
             listZjdzd(params).then((response) => {
                 if(response.rows.length>0&&this.list1.length<response.total){
                   response.rows.map(res => {
-                    this.list1.unshift(res)
+                    this.list1.push(res)
                   })
                   this.countyhc++
+                  this.loading2 = false
+                }else{
+                  this.finished2 = true
                 }
             });
           }else if(this.active==2){
@@ -1413,9 +1442,12 @@
             listZjdzd(params).then((response) => {
                 if(response.rows.length>0&&this.list2.length<response.total){
                   response.rows.map(res => {
-                    this.list2.unshift(res)
+                    this.list2.push(res)
                   })
                   this.countwhc++
+                  this.loading3 = false
+                }else{
+                  this.finished3 = true
                 }
             });
           }else{
@@ -1427,9 +1459,12 @@
             listZjdzd(params).then((response) => {
                 if(response.rows.length>0&&this.list.length<response.total){
                   response.rows.map(res => {
-                    _this.list.unshift(res)
+                    _this.list.push(res)
                   })
                   this.countqb++
+                  this.loading1 = false
+                }else{
+                  this.finished1 = true
                 }
             });
           }
@@ -2024,6 +2059,8 @@
                 message: '保存成功',
                 duration:"1000",
                 onClose:function(){
+                  _this.totalR+=1
+                  _this.totalH+=1
                   _this.showhncy = false
                   let params = {
                     "nhdm":_this.form5.nhdm,
@@ -3747,9 +3784,14 @@
                         //   }
                         // });
                         console.log(obj.id);
-                        getZjdzd(obj.id).then((response) => {
+                        var vector_drawing_map;
+                        let params = {
+                          "deptId" : that.$cookies.get("item").deptId,
+                          "zjddm" : obj.zjddm,
+                        }
+                        listZjdzd(params).then((response) => {
                           console.log(response);
-                          that.mapZjdData = response.data;
+                          that.mapZjdData = response.rows[0];
                           that.mapZjdData.active = 1;
                           that.mapZjdTeAll.mapZjdAData =that.mapZjdData;
                           that.mapZjdDataTure = 1;
@@ -3769,6 +3811,7 @@
                                 "    \"type\": \"Feature\",\n" +
                                 "    \"geometry\":" + that.mapZjdData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
                             }),
+
                             style: styleZjd
                           });
                           map.addLayer(hc_land_on);
@@ -3785,6 +3828,35 @@
                             rotation: undefined, // 缩放完成view视图旋转弧度
                             duration: 1000, // 缩放持续时间，默认不需要设置
                           });
+                          function createLabelStyleMap() {
+                            return new ol.style.Style({
+                              text: new ol.style.Text({
+                                text: that.mapZjdData.syqr,
+                                textAlign: "center", //位置
+                                textBaseline: "middle", //基准线
+                                font: "normal 16px 微软雅黑", //文字样式
+                                //text: "标注点", //文本内容
+                                fill: new ol.style.Fill({
+                                  //文本填充样式（即文字颜色)
+                                  color: "#0099FF",
+                                  width: 10,
+                                }),
+                                overflow: false //超出面的部分不显示
+                              }),
+                              zIndex: 9999,
+                            });
+                          }
+                          var newcenterFeatureMap = new ol.Feature({
+                            geometry: new ol.geom.Point(center), //几何信息
+                            //name: "标注点",
+                          });
+                          var sourceMapLookMap = new ol.source.Vector({wrapX: false});
+                          vector_drawing_map = new ol.layer.Vector({
+                            source: sourceMapLookMap,
+                          });
+                          map.addLayer(vector_drawing_map);
+                          newcenterFeatureMap.setStyle(createLabelStyleMap()); //设置要素样式
+                          sourceMapLookMap.addFeature(newcenterFeatureMap);
                         });
                         //let cloneObj = JSON.parse(JSON.stringify(obj));
                         if(obj.zdmj != ""){
@@ -4060,7 +4132,7 @@
                           that.mapZjdData = response.rows[0];
                           that.mapZjdData.active = 1;
                           that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
-                          getfsss(obj.id).then((response) => {
+                          getFsss(obj.id).then((response) => {
                             //that.mapfsssData.active = 4;
                             that.mapfsssData = response.data;
                             that.mapZjdTeAll.mapFsssAData = that.mapfsssData;
@@ -4609,7 +4681,7 @@
               }, 500);
             });
           }else if(item.typeTc =="附属设施"){
-            getfsss(item.id).then((response) => {
+            getFsss(item.id).then((response) => {
               this.mapFsssData = response.data;
               console.log(this.mapZjdData);
               this.mapZjdTeAll.active = 4;