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

src/api/homesteadSurvey/index.js

@@ -76,6 +76,14 @@ export function sysConfig(query) {
   })
 }
 
+// 查询全部乡镇数据
+export function getTownInfo(deptId) {
+  return request({
+    url: '/system/dept/getTownByCounty/'+deptId ,
+    method: 'get'
+  })
+}
+
 // 查询数据调查任务列表
 export function userList() {
   return request({

src/store/getters.js

@@ -8,6 +8,7 @@ const getters = {
   bookName: state => state.user.bookName,
   deptName:  state => state.user.deptName,
   nickName: state => state.user.nickName,
+  userId: state => state.user.userId,
   baseRoutingUrl: state => state.user.baseRoutingUrl,
   businessLevel: state => state.user.businessLevel,
 }

src/store/modules/user.js

@@ -16,6 +16,7 @@ const user = {
     nickName: '',
     baseRoutingUrl: '',
     businessLevel: '',
+    userId:null,
   },
 
   mutations: {
@@ -25,6 +26,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_USERID: (state, userId) => {
+      state.userId = userId
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -68,6 +72,30 @@ const user = {
         login(username, password, code, uuid).then(res => {
           setToken(res.token)
           commit('SET_TOKEN', res.token)
+          getInfo(res.token).then(response => {
+            const user = response.user
+            //   const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+            const avatar = "";
+            if (response.roles && response.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+              commit('SET_ROLES', response.roles)
+              commit('SET_PERMISSIONS', response.permissions)
+            } else {
+              commit('SET_ROLES', ['ROLE_DEFAULT'])
+            }
+            commit('SET_BOOKNAME', user.bookName)
+            commit('SET_NAME', user.userName)
+            commit('SET_USERID', user.userId)
+            commit('SET_LOGINDEPTID', user.loginDeptId)
+            commit('SET_LOGINBOOKID', user.loginBookId)
+            commit('SET_DEPTNAME', user.deptName)
+            commit('SET_AVATAR', avatar)
+            commit('SET_NICKNAME', user.nickName);
+            commit('SET_businessLevel', user.businessLevel);
+            //commit('SET_businessLevel', 'TEST');
+            getSystemAttachmentUrl().then((resp) => {
+              commit('SET_baseRoutingUrl', resp.msg);
+            });
+          })
           Cookies.set("_Login_url", window.location.href);
           resolve()
         }).catch(error => {
@@ -127,6 +155,7 @@ const user = {
           }
           commit('SET_BOOKNAME', user.bookName)
           commit('SET_NAME', user.userName)
+          commit('SET_USERID', user.userId)
           commit('SET_LOGINDEPTID', user.loginDeptId)
           commit('SET_LOGINBOOKID', user.loginBookId)
           commit('SET_DEPTNAME', user.deptName)
@@ -134,7 +163,7 @@ const user = {
           commit('SET_NICKNAME', user.nickName);
           commit('SET_businessLevel', user.businessLevel);
           //commit('SET_businessLevel', 'TEST');
-
+          console.info(user.businessLevel);
           getSystemAttachmentUrl().then((resp) => {
             commit('SET_baseRoutingUrl', resp.msg);
           });
@@ -150,6 +179,7 @@ const user = {
       return new Promise((resolve, reject) => {
         logout(state.token).then(() => {
           commit('SET_TOKEN', '')
+          commit('SET_businessLevel', '')
           commit('SET_ROLES', [])
           commit('SET_PERMISSIONS', [])
           removeToken()

src/views/homesteadLogin.vue

@@ -45,9 +45,6 @@
               :rules="[{ required: true, message:''  }]"
             />
             </div>
-            <div style="width: 90%;margin: 15px auto 20px;display:flex;justify-content: end;">
-              <van-checkbox v-model="formData.rememberMe">{{showMessage ? "记住手机号" : "记住密码"}}</van-checkbox>
-            </div>
             <div style="display: flex;align-items: center;justify-content: space-between;width: 90%;margin: 0 auto;">
               <div style="width: 60%;
                 max-widht:462px;
@@ -60,6 +57,7 @@
               >
                 <van-field
                   v-model="formData.code"
+                  left-icon="passed"
                   center
                   clearable
                   placeholder="图形验证码"
@@ -68,8 +66,11 @@
               </div>
               <img style="width: 35%;" :src="codeUrl" @click="getCode"  />
             </div>
+            <div style="width: 90%;margin: 15px auto 20px;display:flex;">
+              <van-checkbox v-model="formData.rememberMe">{{showMessage ? "记住手机号" : "记住密码"}}</van-checkbox>
+            </div>
             <div style="margin: 50px auto;font-weight: bold;width: 90%;">
-              <van-button block round size="large" :color="formData.username!=''&&formData.password!=''?'#7AC943':'#e2e2e2'" :disabled="formData.username==''||formData.password==''" native-type="submit" @click="handleLogin">登 入</van-button>
+              <van-button block round size="large" :color="formData.username!=''&&formData.password!=''?'#7AC943':'#e2e2e2'" :disabled="formData.username==''||formData.password==''" native-type="submit" @click="handleLogin">登 录</van-button>
             </div>
           </van-form>
     </div>

src/views/homesteadSurvey/add.vue

@@ -5,6 +5,8 @@
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
           @click-left="goBack()"
+          right-text ="首页"
+          @click-right="goRightBack()"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -54,15 +56,15 @@
           placeholder="行政区划名称"
           :rules="[{ required: true, message: '' }]"
         />-->
-        <van-field
-          autocomplete="off"
+
+        <field-select
           v-model="form.suyqrdm"
-          name="所有权人代码"
           label="所有权人代码"
-          placeholder="自动生成"
-          input-align="right"
-          disabled
-          v-show="false"
+          value-key="suyqrdm"
+          data-key="suyqrdm"
+          placeholder="选择所有权人代码"
+          :columns = "suyqrList"
+          :on-remote-response="'data'"
         />
         <van-field
           autocomplete="off"
@@ -151,6 +153,15 @@
           remote-url="/system/dict/data/type/rights_type"
           :on-remote-response="'data'"
         />
+        <field-select
+          v-model="form.qlxz"
+          label="权利性质"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择权利性质"
+          remote-url="/system/dict/data/type/rights_nature"
+          :on-remote-response="'data'"
+        />
         <field-select
           v-model="form.qlsdfs"
           label="权利设定方式"
@@ -174,16 +185,16 @@
           v-model="form.jzmd"
           name="建筑密度"
           label="建筑密度"
-          placeholder="建筑密度"
+          placeholder="填写0~1小数"
+          :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"
           type="number"
-          maxlength="15"
         />
         <van-field
           autocomplete="off"
           input-align="right"
           v-model="form.jzxg"
           name="建筑限高"
-          label="建筑限高"
+          label="建筑限高(米)"
           placeholder="建筑限高"
           type="number"
           maxlength="15"
@@ -246,7 +257,7 @@
           v-model="form.djh"
           name="地籍号"
           label="地籍号"
-          placeholder="图幅号"
+          placeholder="地籍号"
         />
         <van-field
           autocomplete="off"
@@ -304,6 +315,16 @@
                           :max-date="maxDate"
                         />
         </van-popup>
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zjdpzmj"
+          type="number"
+          name="批准面积(㎡)"
+          label="批准面积(㎡)"
+          placeholder="批准面积(㎡)"
+          maxlength="15"
+        />
         <FieldRadio
           v-model="form.isMore"
           label="是否一户多宅"
@@ -456,7 +477,6 @@
         </van-popup>
         <field-select
           v-model="form.landPhms"
-          v-if="showXzyy"
           label="盘活利用模式"
           value-key="dictLabel"
           data-key="dictValue"
@@ -742,7 +762,7 @@
         </common-map>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%"  @click="submitzjd">保存</van-button>
+        <van-button v-if="permission == 'true'" round color="#22B7F2" style="width:45%"  @click="submitzjd">保存</van-button>
       </div>
       <div style="height: 50px;"></div>
     </van-form>
@@ -773,15 +793,10 @@ export default {
     return {
       active:1,
       // 使用权人列表
-      syqrlist:[
-        {
-          shyqrdbxm :'测试测试',
-          shyqrdbzjhm :'12324648564',
-          nhdm :'777888999',
-        }
-      ],
+      suyqrList:[],
       // 地图绘制
       drawInsert: null,
+      permission:false,
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
@@ -799,7 +814,7 @@ export default {
   created(){
     let data = this.$route.query.res;
     this.form = JSON.parse(localStorage.getItem("zjdzdxxItem"));
-    console.info( this.form);
+    this.permission = localStorage.getItem("executePermission");
     if(this.form.sfcz === "1"){
       this.showCzmj = true;
     }
@@ -811,8 +826,10 @@ export default {
     if(this.form.zjdlyzk !== "1"){
       this.showXzyy = true;
     }
+    listSuyqr({}).then((response) => {
+      this.suyqrList = response.rows;
+    });
     this.$nextTick(() => {
-
       this.pointDarw(null);
       // this.pointDarwNature(null);
       this.$refs.pointDarwMap && this.$refs.pointDarwMap.update();
@@ -820,34 +837,60 @@ export default {
   },
   mounted(){
 
+  },
+  watch:{
+    "form.zjdpzmj":function (newVal,oldVal){
+        if(newVal < 0){
+          this.form.zjdpzmj = "";
+          return false;
+        }
+        if(newVal === "" && oldVal && oldVal.toString().indexOf(".") > 0){
+          this.form.zjdpzmj = oldVal;
+          return false;
+        }
+        if(newVal){
+          newVal = newVal.toString();
+          let pointIndex = newVal.indexOf(".");
+          if(pointIndex > 0 && newVal.length - pointIndex > 3){
+            this.form.zjdpzmj = oldVal;
+            return true;
+          }
+        }
+    }
   },
   methods: {
     submitzjd(){
       this.$refs.form.validate().then(() => {
         if(this.form.id == null){
+          let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
+          this.$set(this.form, 'surveyId', surveyItem.id);
           addZjdzd(this.form).then(response => {
             let _this =this;
-            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.form));
-            this.$toast({
-              icon: 'success', // 找到自己需要的图标
-              message: '保存成功',
-              duration:"1000",
-              onClose:function(){
-                _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
-              }
+            getZjdzd(response.data).then((res) => {
+              localStorage.setItem("zjdzdxxItem",JSON.stringify(res.data));
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '保存成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.$router.push({path:'/homesteadSurvey/add2'});
+                }
+              })
             })
           });
         }else{
           updateZjdzd(this.form).then(response => {
             let _this =this;
-            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.form));
-            this.$toast({
-              icon: 'success', // 找到自己需要的图标
-              message: '保存成功',
-              duration:"1000",
-              onClose:function(){
-                _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
-              }
+            getZjdzd(this.form.id).then((res) => {
+              localStorage.setItem("zjdzdxxItem",JSON.stringify(res.data));
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '保存成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.$router.push({path:'/homesteadSurvey/add2'});
+                }
+              })
             })
           });
         }
@@ -857,6 +900,13 @@ export default {
       });
 
     },
+    validator(val){
+      if(val>1||val<0||val.length>4){
+        return false
+      }else{
+        return true
+      }
+    },
     guidProduct(){
       return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         var r = Math.random() * 16 | 0,
@@ -933,6 +983,30 @@ export default {
       this.drawInsert = data;
       this.form.theGeomJson = JSON.stringify(this.drawInsert);
     },
+    // 获取登录人位置坐标
+    getLandCoord(func) {
+      if (func
+        && this.tGeoOrganizationLng !== null && this.tGeoOrganizationLng !== ''
+        && this.tGeoOrganizationLat !== null && this.tGeoOrganizationLat !== '') {
+        this.$nextTick(() => {
+          func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        })
+      }
+      else {
+        getQueryLand(this.deptId).then((response) => {
+          if (response.code == 200) {
+            let InsertCode = response.data;
+            this.form.orgCode = InsertCode.orgCode;
+            this.tGeoOrganizationLat = InsertCode.lat;
+            this.tGeoOrganizationLng = InsertCode.lng;
+            if(func)
+            {
+              func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+            }
+          }
+        });
+      }
+    },
     // 当申请地图被重置时
     onMapDrawReseted() {
       this.drawInsert = null;
@@ -957,6 +1031,9 @@ export default {
       this.$router.push({name: this.$router.back(-1)});
       // }
     },
+    goRightBack(){
+      this.$router.push({path:'/homesteadSurvey/list'});
+    }
   }
 }
 </script>
@@ -982,6 +1059,10 @@ export default {
   left:0;
   bottom:0;
 }
+
+/deep/ .van-nav-bar__text {
+  color: #fff;
+}
 >>> .delete-button {
   height: 100%;
 }

src/views/homesteadSurvey/add2.vue

@@ -5,6 +5,8 @@
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
           @click-left="goBack()"
+          right-text ="首页"
+          @click-right="goRightBack()"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -50,6 +52,13 @@
     <div style="margin:30px 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
+      v-model:loading="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      :immediate-check="false"
+      @load="onRefreshShyqr"
+    >
     <van-swipe-cell v-for="(item,index) in syqrlist" :key="'syqr'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
       <div style="padding:15px;">
         <p style="display: flex;align-items: center;">
@@ -80,11 +89,11 @@
         </div>
       </div>
       <template #right>
-        <van-button 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="deletesyqr(item.id,index)"/>
       </template>
     </van-swipe-cell>
-
-    <div style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
+    </van-list>
+    <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;">
         <p style="font-size: 16px;" @click="showPopupsyqr('')">+ 添加使用权人</p>
       </div>
@@ -116,6 +125,10 @@ export default {
   data() {
     return {
       active:2,
+      loading:false,
+      finished:false,
+      permission:false,
+      countyhc:1,
       // 使用权人列表
       zjdzdxx:{},
       syqrlist:[],
@@ -123,17 +136,57 @@ export default {
   },
   created(){
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
-    this.getList();
+    this.permission = localStorage.getItem("executePermission");
+    if(this.zjdzdxx.zjddm != null ){
+      this.getList();
+    }
   },
   mounted(){
 
   },
   methods: {
     getList(){
-      getShyqrs({zjddm:this.zjdzdxx.zjddm}).then(response => {
+      let params = {
+        zjddm:this.zjdzdxx.zjddm,
+        pageNum: 1,
+        pageSize:10,
+      }
+      getShyqrs(params).then(response => {
         this.syqrlist = response.rows;
+        if(response.rows.length>0&&response.rows.length<response.total){
+          this.countyhc++
+          this.loading = false
+        }else{
+          this.loading = false
+          this.finished = true
+        }
       });
     },
+    goRightBack(){
+      this.$router.push({path:'/homesteadSurvey/list'});
+    },
+    onRefreshShyqr(){
+      if(this.loading){
+        let params = {
+          zjddm:this.zjdzdxx.zjddm,
+          pageNum: this.countyhc+1,
+          pageSize:10,
+        }
+        getShyqrs(params).then(response => {
+          if(response.rows.length>0&&response.rows.length<response.total){
+            response.rows.map(res => {
+              this.syqrlist.push(res)
+            })
+            this.countyhc++
+            this.loading = false
+          }else{
+            this.loading = false
+            this.finished = true
+          }
+        });
+      }
+
+    },
     goBack(){
       if(this.ztMap && this.enterMap ==1){
         if(this.form.id == null){
@@ -194,4 +247,7 @@ export default {
 >>> .label-class .van-collapse-item__title--expanded{
   font-weight: bold;
 }
+/deep/ .van-nav-bar__text {
+  color: #fff;
+}
 </style>

src/views/homesteadSurvey/add3.vue

@@ -5,6 +5,8 @@
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
           @click-left="goBack()"
+          right-text ="首页"
+          @click-right="goRightBack()"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -50,6 +52,13 @@
     <div style="margin:30px 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
+      v-model:loading="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      :immediate-check="false"
+      @load="onRefreshZrz"
+    >
       <van-swipe-cell v-for="(item,index) in zrzlist" :key="'zrz'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
         <div style="padding:15px;">
           <p style="display: flex;align-items: center;">
@@ -76,10 +85,11 @@
           </div>
         </div>
         <template #right>
-          <van-button square text="删除" type="danger" class="delete-button" @click="deletezrz(item,index)"/>
+          <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletezrz(item,index)"/>
         </template>
       </van-swipe-cell>
-      <div style=" width:95%;margin:20px auto;display: flex;justify-content: center;">
+    </van-list>
+      <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>
@@ -108,21 +118,40 @@ export default {
   data() {
     return {
       active:3,
+      loading:false,
+      finished:false,
+      permission:false,
+      countyhc:1,
       zjdzdxx:{},
       zrzlist:[]
     };
   },
   created(){
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
-    this.getList();
+    this.permission = localStorage.getItem("executePermission");
+    if(this.zjdzdxx.zjddm != null ){
+      this.getList();
+    }
   },
   mounted(){
 
   },
   methods: {
     getList(){
-      listZrz({zjddm:this.zjdzdxx.zjddm}).then(response => {
+      let params = {
+        zjddm:this.zjdzdxx.zjddm,
+        pageNum: this.countyhc+1,
+        pageSize:10,
+      }
+      listZrz(params).then(response => {
         this.zrzlist = response.rows;
+        if(response.rows.length>0&&response.rows.length<response.total){
+          this.countyhc++
+          this.loading = false
+        }else{
+          this.loading = false
+          this.finished = true
+        }
       });
     },
     goBack(){
@@ -139,6 +168,30 @@ export default {
       this.$router.push({name: this.$router.back(-1)});
       // }
     },
+    onRefreshZrz(){
+      if(this.loading){
+        let params = {
+          zjddm:this.zjdzdxx.zjddm,
+          pageNum: this.countyhc+1,
+          pageSize:10,
+        }
+        listZrz(params).then(response => {
+          if(response.rows.length>0&&response.rows.length<response.total){
+            response.rows.map(res => {
+              this.zrzlist.push(res)
+            })
+            this.countyhc++
+            this.loading = false
+          }else{
+            this.loading = false
+            this.finished = true
+          }
+        });
+      }
+    },
+    goRightBack(){
+      this.$router.push({path:'/homesteadSurvey/list'});
+    },
     showPopupzrz(val){
       this.$router.push({name:'zrzAdd',query:val});
     },
@@ -183,4 +236,7 @@ export default {
 >>> .label-class .van-collapse-item__title--expanded{
   font-weight: bold;
 }
+/deep/ .van-nav-bar__text {
+  color: #fff;
+}
 </style>

src/views/homesteadSurvey/add4.vue

@@ -5,6 +5,8 @@
         <van-nav-bar
           style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
           @click-left="goBack()"
+          right-text ="首页"
+          @click-right="goRightBack()"
         >
           <template #left>
             <van-icon name="arrow-left" size="18" color="#fff" />
@@ -50,6 +52,13 @@
     <div style="margin:30px 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
+      v-model:loading="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      :immediate-check="false"
+      @load="onRefreshFsss"
+    >
     <van-swipe-cell v-for="(item,index) in fssslist" :key="'fsss'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
       <div style="padding:15px;">
         <p style="display: flex;align-items: center;">
@@ -72,15 +81,16 @@
         </div>
       </div>
       <template #right>
-        <van-button square text="删除" type="danger" class="delete-button" @click="deletefsss(item.id,index)"/>
+        <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletefsss(item.id,index)"/>
       </template>
     </van-swipe-cell>
-    <div style=" width:95%;margin:20px auto;display: flex;justify-content: center;">
+    </van-list>
+    <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>
+        <p style="font-size: 16px;"  @click="showPopupAddzrz()">+ 添加附属设施信息</p>
       </div>
     </div>
-    <div style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
+    <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;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="ycbj()">异常标记</span>
       </p>
@@ -123,33 +133,46 @@
         <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button></van-col>
       </van-row>
     </van-popup>
+    <van-dialog v-model="ycbzShow" title="异常标记" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="confirmn" >
+      <van-row>
+        <van-col span="24">
+          <van-field v-model="zjdzdxx.surveyBz" label="异常备注" placeholder="异常备注" input-align="right" />
+        </van-col>
+        <van-col span="12">
+        <p style="margin-left: 10%;color: #646566;    font-size: 0.373333rem;">备注图片</p>
+        </van-col>
+        <van-col span="12">
+          <MultiImageUploadComp :value="zjdzdxx.surveyBztp" :uploadDisabled="false"  @fileUpdate="fileUpdate"/>
+        </van-col>
+      </van-row>
+
+
+    </van-dialog>
   </div>
 </template>
 
 <script>
-import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
-import {listZjdzd,getZjdzd,updateZjdzd,zjddcSign,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
+import {attach} from "@/api/onlineHome/homestead/application";
+import {getZjdzd,updateZjdzd,zjddcSign} from "@/api/homesteadSurvey/zjdzd";
 import MapGisDrawing from "@/components/Map/MapGisDrawing";
-import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} 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,setNhInfo} from "@/api/homesteadSurvey/nh";
 import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
-import { listTown, getTown } from "@/api/homesteadSurvey/town";
-import { listVillage} from "@/api/homesteadSurvey/village";
-import { sysConfig} from "@/api/homesteadSurvey/index";
-import { Notify, Dialog, Toast } from 'vant';
-import axios from "axios";
+import MultiImageUploadComp from "@/components/house/MultiImageUploadComp"
 export default {
   name: "homesteadAdd",
-  components: { MapGisDrawing},
+  components: { MapGisDrawing,MultiImageUploadComp},
   data() {
     return {
       active:4,
       dcshShow:false,
       showesign:false,
       showDcsh:false,
+      loading:false,
+      finished:false,
+      countyhc:1,
+      ycbzShow:false,
+      permission:false,
+      bztp:"",
+      ycbz:"",
       examineData:[{dictLabel:"审批通过",dictValue:"5"},{dictLabel:"审批驳回",dictValue:"4"}],
       zjdzdxx:{surveyStatus:"5"},
       fssslist:[],
@@ -165,27 +188,52 @@ export default {
   },
   created(){
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    this.permission = localStorage.getItem("executePermission");
+    let businessLevel = this.$store.state.user.businessLevel;
     if(this.zjdzdxx.surveySign != null){
-      this.signature.resultImg = "http://localhost/api/"+this.zjdzdxx.surveySign;
+      this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign;
     }
-    getZjdzd(this.zjdzdxx.id).then((response) => {
-      if(response.data.surveyStatus !== "1"){
-        this.showDcsh =  true;
-      }
-    });
-    this.getList();
+    console.info(businessLevel);
+    if(this.zjdzdxx.id !== undefined){
+      getZjdzd(this.zjdzdxx.id).then((response) => {
+        if(response.data.surveyStatus !== "1" && businessLevel === "2"){
+          this.showDcsh =  true;
+        }
+      });
+      this.getList();
+    }
+
   },
   mounted(){
 
   },
   methods: {
     getList(){
-      listFsss({zjddm:this.zjdzdxx.zjddm}).then(response => {
+      let params = {
+        zjddm:this.zjdzdxx.zjddm,
+        pageNum: this.countyhc+1,
+        pageSize:10,
+      }
+      listFsss(params).then(response => {
         this.fssslist = response.rows;
+        if(response.rows.length>0&&response.rows.length<response.total){
+          this.countyhc++
+          this.loading = false
+        }else{
+          this.loading = false
+          this.finished = true
+        }
       });
     },
+    fileUpdate(val){
+      this.$set(this.zjdzdxx, 'surveyBztp',val.path);
+    },
     onSurveyStatusChanged(val){
       this.$set(this.zjdzdxx, 'surveyStatus', val.dictValue);
+      if(val.dictValue === "5"){
+        let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
+        this.$set(this.zjdzdxx, 'surveyId', surveyItem.id);
+      }
       updateZjdzd(this.zjdzdxx).then(response => {
         let _this =this
         _this.$toast({
@@ -194,11 +242,35 @@ export default {
           duration:"1000",
           onClose:function(){
             _this.dcshShow = false;
-            _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.zjdzdxx.zjddm}});
+            _this.goRightBack();
           }
         })
       });
     },
+    onRefreshFsss(){
+      if(this.loading){
+        let params = {
+          zjddm:this.zjdzdxx.zjddm,
+          pageNum: this.countyhc+1,
+          pageSize:10,
+        }
+        listFsss(params).then(response => {
+          if(response.rows.length>0&&response.rows.length<response.total){
+            response.rows.map(res => {
+              this.fssslist.push(res)
+            })
+            this.countyhc++
+            this.loading = false
+          }else{
+            this.loading = false
+            this.finished = true
+          }
+        });
+      }
+    },
+    goRightBack(){
+      this.$router.push({path:'/homesteadSurvey/list'});
+    },
     // 清空画板
     handleReset() {
       this.resultImg = null
@@ -273,14 +345,19 @@ export default {
       this.showesign = true;
     },
     ycbj(){
+      this.ycbzShow = true;
+    },
+    confirmn(){
       this.$set(this.zjdzdxx, 'surveyStatus', "2");
       updateZjdzd(this.zjdzdxx).then(response => {
+        localStorage.setItem("zjdzdxxItem",JSON.stringify(this.zjdzdxx));
         let _this =this
         this.$toast({
           icon: 'success', // 找到自己需要的图标
           message: '保存成功',
           duration:"1000",
           onClose:function(){
+            _this.getList();
             _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.zjdzdxx.zjddm}});
           }
         })
@@ -323,4 +400,7 @@ export default {
 >>> .label-class .van-collapse-item__title--expanded{
   font-weight: bold;
 }
+/deep/ .van-nav-bar__text {
+  color: #fff;
+}
 </style>

src/views/homesteadSurvey/addbf.vue

@@ -3270,7 +3270,7 @@ export default {
 
       }
     }else{
-      this.$set(this.item,"deptId",this.$cookies.get("item").deptId)
+      this.$set(this.item,"deptId",JSON.parse(localStorage.getItem("surveyItem")).deptId)
       if(this.item.houseDataConfirmStatus!="CONFIRMED"){
         this.isFinished = true
       }

src/views/homesteadSurvey/fsssAdd.vue

@@ -127,7 +127,7 @@
         </common-map>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button v-if="permission == 'true'" round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
         <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
       </div>
       <div style="height: 50px;"></div>
@@ -169,6 +169,7 @@ export default {
       ],
       // 地图绘制
       drawInsert: null,
+      permission:false,
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
@@ -181,6 +182,7 @@ export default {
   created(){
     let data = this.$route.query;
     this.form = data;
+    this.permission = localStorage.getItem("executePermission");
     if(this.form.id == null){
       this.$set(this.form, 'fssslx', "11");
       this.$set(this.form, 'sfzsy', "1");

src/views/homesteadSurvey/hncyDetails.vue

@@ -205,6 +205,75 @@
           remote-url="/system/dict/data/type/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>
+
+        <FieldRadio
+          v-model="form.sfwbh"
+          label="是否五保户"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfpkh"
+          label="是否贫困户"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.zqtczsfyzf"
+          label="在其他村庄有住房"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.jzhcssfyzf"
+          label="在集镇或城市有住房"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfbccm"
+          label="本村村民"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.occupation"
+          label="职业"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择职业"
+          remote-url="/system/dict/data/type/occupation"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.jzqk"
+          label="居住情况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择居住情况"
+          remote-url="/system/dict/data/type/living_condition"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.txdz"
+          name="通讯地址"
+          label="通讯地址"
+          placeholder="请输入通讯地址"
+          maxlength="50"
+          autocomplete="off"
+        />
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
         <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
@@ -426,18 +495,26 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
-        this.item = this.$cookies.get("item");
+        this.item = JSON.parse(localStorage.getItem("surveyItem"));
         let data = this.$route.query;
         this.form = data.item;
         if(this.form.id == null){
           this.$set(this.form, 'zjlx', "01");
           this.$set(this.form, 'xb', "1");
-          this.$set(this.form, 'yhzgx', "23");
+          this.$set(this.form, 'yhzgx', "22");
           this.$set(this.form, 'hklx', "01");
           this.$set(this.form, 'hyzk', "01");
+          this.$set(this.form, 'cybz', "9");
           this.$set(this.form, 'sjly', "01");
           this.$set(this.form, 'sfbjtjjzzcy', "1");
           this.$set(this.form, 'sfjbzgq', "1");
+          this.$set(this.form, 'sfwbh', "0");
+          this.$set(this.form, 'sfpkh', "0");
+          this.$set(this.form, 'zqtczsfyzf', "0");
+          this.$set(this.form, 'jzhcssfyzf', "0");
+          this.$set(this.form, 'sfbccm', "1");
+          this.$set(this.form, 'occupation', "1");
+          this.$set(this.form, 'jzqk', "1");
         }
           this.getDicts("family_status").then(response => {
             var arr = [];
@@ -5115,7 +5192,7 @@
         zjdTz(){
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
-            this.mapZjdTeAll.mapZjdAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
@@ -5129,7 +5206,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
             this.mapZjdTeAll.active =3;
             this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapZrzAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
@@ -5142,7 +5219,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
           this.mapZjdTeAll.active =4;
           this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapFsssAData.deptId =this.$cookies.get("item").deptId;
+            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","")
@@ -5164,6 +5241,17 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  .title:before
+  {
+    content:"";
+    width: 6px;
+    height: 20PX;
+    background: #7ac943;
+    border-radius: 3px;
+    position:absolute;
+    left:0;
+    bottom:0;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/hncyList2.vue

@@ -292,7 +292,7 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
-        this.item = this.$cookies.get("item");
+        this.item = JSON.parse(localStorage.getItem("surveyItem"));
         this.shyqrData = this.$route.query;
         this.getNh(this.shyqrData.nhdm);
           this.getDicts("family_status").then(response => {
@@ -4939,7 +4939,7 @@
         zjdTz(){
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
-            this.mapZjdTeAll.mapZjdAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
@@ -4953,7 +4953,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
             this.mapZjdTeAll.active =3;
             this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapZrzAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
@@ -4966,7 +4966,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
           this.mapZjdTeAll.active =4;
           this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapFsssAData.deptId =this.$cookies.get("item").deptId;
+            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","")

src/views/homesteadSurvey/index.vue

@@ -54,14 +54,26 @@
       </van-grid>
     </div>
     <div style="margin:20px;">
-      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;">任务列表</p>
+      <div style="float:left;font-size: 16px;">任务列表</div>
+      <div style="float:left;font-size: 16px;margin-left: 25%;">
+        <span @click="queryAllxz()">{{deptName}}</span>
+        <div id="dropList" v-if="showDropList"  style="width: 28vw; position: absolute; z-index: 99; left: 55%; margin-left: -16vw; border: 1px solid #E2E0E0;" >
+          <van-cell id="vanCell"  v-for="(item, index) in xzList" :key="index" @click="xzChange(item)" style="position: relative; z-index: 999;">
+            {{item.deptName}}
+          </van-cell>
+        </div>
+
+      </div>
+      <div style="float:right;font-size: 16px;">
+        <van-checkbox v-model="checked"   @change="checkChange">仅我</van-checkbox>
+      </div>
     </div>
-    <div v-if="active==1" style="height:calc( 100vh - 350px);overflow-y:auto;">
+    <div v-if="active==1" style="height:calc( 100vh - 350px);margin-top: 14%;overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask" :immediate-check="false">
       <van-cell  v-for="(item,index) in totalList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
-          <div>{{item.rwmc}}  <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdsl}}/{{zjdslSum}}</span></div>
+          <div>{{item.rwmc}}  <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdwcsl}}/{{item.zjdsl}}</span></div>
         </template>
         <template #default>
           <van-circle
@@ -72,7 +84,7 @@
             size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
-            :text="item.zjdsl!=0?(((item.zjdsl/zjdslSum)*100).toFixed())+'%':0+'%'"
+            :text="item.zjdwcsl!=0?(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%':0+'%'"
           />
         </template>
         <template #label>
@@ -82,12 +94,12 @@
       </van-cell>
       </van-pull-refresh>
     </div>
-    <div v-if="active==2" style="height:calc( 100vh - 350px);overflow-y:auto;">
+    <div v-if="active==2" style="height:calc( 100vh - 350px);margin-top: 14%;overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
       <van-cell  v-for="(item,index) in doneList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
-          <div>{{item.rwmc}}     <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdsl}}/{{zjdslSum}}</span></div>
+          <div>{{item.rwmc}}     <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdwcsl}}/{{item.zjdsl}}</span></div>
         </template>
         <template #default>
 
@@ -99,7 +111,7 @@
             size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
-            :text="item.zjdsl!=0?(((item.zjdsl/zjdslSum)*100).toFixed())+'%':0+'%'"
+            :text="item.zjdwcsl!=0?(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%':0+'%'"
           />
         </template>
         <template #label>
@@ -109,12 +121,12 @@
       </van-cell>
       </van-pull-refresh>
     </div>
-    <div v-if="active==3" style="height:calc( 100vh - 350px);overflow-y:auto;">
+    <div v-if="active==3" style="height:calc( 100vh - 350px);margin-top: 14%;overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
       <van-cell  v-for="(item,index) in todoList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
-          <div>{{item.rwmc}}   <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdsl}}/{{zjdslSum}}</span></div>
+          <div>{{item.rwmc}}   <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdwcsl}}/{{item.zjdsl}}</span></div>
         </template>
         <template #default>
           <van-circle
@@ -125,7 +137,7 @@
             size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
-            :text="item.zjdsl!=0?(((item.zjdsl/zjdslSum)*100).toFixed())+'%':0+'%'"
+            :text="item.zjdwcsl!=0?(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%':0+'%'"
           />
         </template>
         <template #label>
@@ -140,7 +152,7 @@
 </template>
 
 <script>
-  import {addTask, complete, delTask, exportTask, getTask, listTask, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
+  import {addTask, complete, delTask, exportTask, getTask, listTask,getTownInfo, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
   import {changeDept} from "@/api/homesteadSurvey/zjdzd";
   import {getInfo} from "../../api/login";
   import CircleProccess from "@/components/circleProccess.vue";
@@ -162,13 +174,16 @@
           show: false,
           loading: false,
           finished: false,
+          checked:true,
           height:200,
           phone:null,
           activeKey:0,
           currentRate: 0,
-          zjdslSum:0,
+          deptName:"全部乡镇",
+          showDropList:false,
           total:0,
           totalList:[],
+          xzList:[],
           done:0,
           doneList:[],
           todo:0,
@@ -201,12 +216,17 @@
         userList().then(response => {
           this.taskExecutortions = response.data
         })
-        getInfo().then(response => {
-          this.nickName = response.user.nickName
-          this.businessLevel = response.user.businessLevel
-          this.$cookies.set("businessLevel",this.businessLevel)
+        if(this.checked){
+          let userId = this.$store.getters.userId;
+          this.$set(this.queryParams, "rwzxr", userId);
+          this.getList();
+        }else{
+          this.$set(this.queryParams, "rwzxr", null);
           this.getList();
-        });
+        }
+        getTownInfo(100).then(response => {
+          this.xzList = response.data
+        })
         axios.get('../static/dictyType.json').then(res => {
           this.dictTypeList = res.data
         })
@@ -237,7 +257,9 @@
           })
         },
         qiehuan(deptId){
-          changeDept(deptId);
+          changeDept(deptId).then(response => {
+            this.$router.push({name:'homesteadList'})
+          });
         },
         chooseValue(item){
             let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
@@ -336,6 +358,16 @@
             });
           }
         },
+        checkChange(e){
+          if(e){
+            let userId = this.$store.getters.userId;
+            this.$set(this.queryParams, "rwzxr", userId);
+            this.getList();
+          }else{
+            this.$set(this.queryParams, "rwzxr", null);
+            this.getList();
+          }
+        },
         setCookies(item){
        /*   if(this.$cookies.get("upload")==null||this.$cookies.get("upload")==0){
             Dialog.confirm({
@@ -354,16 +386,35 @@
             this.$router.push({name:'homesteadList'})
             this.$cookies.set("item",JSON.stringify(item));
           }*/
-          this.$cookies.set("item","");
-          this.$cookies.set("item",JSON.stringify(item));
-          this.qiehuan(item.deptId);
-          this.$router.push({name:'homesteadList'})
+          let userId = this.$store.getters.userId;
+          let businessLevel = this.$store.getters.businessLevel;
+          if(businessLevel === "2" || item.rwzxrIds.includes(userId)){
+            localStorage.setItem("surveyItem",JSON.stringify(item));
+            this.qiehuan(item.deptId);
+          }else{
+            this.$dialog.alert({
+              message: "没有该任务的调查权限！",
+            });
+          }
+
+        },
+        queryAllxz(){
+          if (this.showDropList) {
+            this.showDropList = false;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
+          } else {
+            this.showDropList = true;
+          }
+        },
+        xzChange(val){
+          this.deptName = val.deptName;
+          this.showDropList = false;
+          this.$set(this.queryParams, "parentId", val.deptId);
+          this.getList();
         },
         getList() {
           this.totalList = []
           this.doneList = [];
           this.todoList = [];
-          this.zjdslSum = 0;
           if(this.active==1) {
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "rwwczt", null);
@@ -381,10 +432,9 @@
           listTask(this.queryParams).then(response => {
             this.done = 0;
             this.todo = 0;
+            this.total = response.total;
             response.rows.map(res => {
-              this.zjdslSum += res.zjdsl;
               if(this.active==1) {
-                this.total = response.total;
                 if(res.rwwczt == "FINISHED"){
                   this.done+=1
                   this.doneList.push(res);

src/views/homesteadSurvey/list.vue

@@ -41,7 +41,7 @@
           <img src="../../assets/images/housesteadSurvey/list01.png" alt="">
           <p style="margin-left: 10px;">
             <span style="color:#60B722;line-height:.8rem;">宅基地数：</span>
-            <span style="color:#60B722;line-height:.8rem;"><span style="font-size:16px;color: #448815;">{{totalH}}</span> 户</span>
+            <span style="color:#60B722;line-height:.8rem;"><span style="font-size:16px;color: #448815;">{{totalH}}</span> 宗</span>
           </p>
         </div>
         <div style="text-align:center;background: rgba(122,201,67,0.2);width: 49%;font-size: 14px;border-radius: 8px;display: flex;align-items: center;justify-content: center;padding: 2px 0;">
@@ -53,17 +53,24 @@
         </div>
       </div>
     </van-sticky>
-    <van-search v-model="zjdvalue" placeholder="请输入宅基地代码或农户姓名" show-action @search="onSearchzjd" style="padding-top: 0;padding-bottom: 0;">
+    <van-search v-model="zjdvalue" placeholder="请输入宅基地代码或农户姓名" show-action @search="onSearchzjd"  style="padding-top: 0;padding-bottom: 0;">
       <template #action>
         <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClickzjd" style="vertical-align:middle;"/>
       </template>
     </van-search>
     <van-tabs v-model="active" title-active-color="#7AC943" color="#7AC943" @click="getZjdList">
-      <van-tab>
+      <van-tab v-for="(item,index) in surveyStatusOptions" >
         <template #title>
+
+          <div style="display: flex;align-items: center;">
+            <van-badge v-if="item.dictValue == '1'" :content="whcNums"  :color="active==0?'#7AC943':'#878787'" />
+            <van-badge v-if="item.dictValue == '2'" :content="hcycNums" :color="active==1?'#7AC943':'#878787'" />
+            <van-badge v-if="item.dictValue == '3'" :content="hcwcNums"  :color="active==2?'#7AC943':'#878787'" />
+            <van-badge v-if="item.dictValue == '4'" :content="spbhNums"  :color="active==3?'#7AC943':'#878787'" />
+            <van-badge v-if="item.dictValue == '5'" :content="sptgNums"  :color="active==4?'#7AC943':'#878787'" />
+          </div>
           <div style="display: flex;align-items: center;">
-            <p>已核查</p>
-            <van-badge v-if="yhcNums>=0" :content="yhcNums" max="99" :color="active==0?'#7AC943':'#878787'" />
+            <p>{{item.dictLabel}}</p>
           </div>
         </template>
         <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
@@ -82,12 +89,12 @@
                   <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
                   <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</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="setCookies(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>
-                <!--<van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'" plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">开始调查</van-button>
-                <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>-->
+                <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.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>
+<!--                <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>-->
               </div>
             </template>
             <!--<template #default>
@@ -96,53 +103,12 @@
             </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;">宅基地代码:  {{item.zjddm}} </p>
-              <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;">检察员：{{item.surveyBy}}</span></p>
+              <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;" v-if="item.surveyStatus != '1'">调查员：{{item.surveyBy}}</span></p>
             </template>
           </van-cell>
         </van-list>
         <!--</van-pull-refresh>-->
       </van-tab>
-      <van-tab >
-        <template #title>
-          <div style="display: flex;align-items: center;">
-            <p>未核查</p>
-            <van-badge v-if="whcNums>=0" :content="whcNums" max="99" :color="active==1?'#7AC943':'#878787'" />
-          </div>
-        </template>
-        <!--<van-pull-refresh v-model="isLoadingzjd" @refresh="onRefreshzjd">-->
-        <van-list
-          v-model:loading="loading3"
-          :finished="finished3"
-          finished-text="没有更多了"
-          :immediate-check="false"
-          @load="onRefreshzjd"
-        >
-<!--            @load="onRefreshzjd"-->
-        <van-cell  v-for="(item,index) in list2" :key="index" size="small"  :clickable="true"  style="border-radius: 16px;
-        box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px 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;">{{limitWords(item.shyqrdbxm)}}</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="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
-              <p style="display: flex;align-items: center;color:#ee0a24;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #ee0a24;" @click="deleteZjd(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
-              <p v-if="item.zjdAudit=='2'" style="color:#ee0a24;font-size:12px;">已驳回</p>
-            </div>
-          </template>
-          <!--<template #default>
-            <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
-            <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
-          </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;">宅基地代码:  {{item.zjddm}} </p>
-            <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;">检察员：{{item.updateBy}}</span></p>
-          </template>
-        </van-cell>
-          </van-list>
-        <!--</van-pull-refresh>-->
-      </van-tab>
     </van-tabs>
   </div>
 </template>
@@ -179,6 +145,15 @@
           yhcNums:0,
           //未核查数量
           whcNums:0,
+          //核查异常数量
+          hcycNums:0,
+          //核查完成数量
+          hcwcNums:0,
+          //审批通过数量
+          sptgNums:0,
+          //审批驳回数量
+          spbhNums:0,
+
           // 总户数
           totalH:0,
           // 总人数
@@ -215,7 +190,7 @@
           zjdvalue:"",
           // 使用权人搜索框
           nhvalue:"",
-          active:2,
+          active:0,
           // 全部列表
           list:[],
           // 已核查列表
@@ -243,6 +218,7 @@
           showdbrzjlx:false,
           // 数据来源弹出框
           showsjly:false,
+          surveyStatusOptions:[],
           // 证件类型字典
           zjlxOptions: [],
           // 所有权性质字典
@@ -357,6 +333,18 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
+        this.getDicts("survey_status").then(response => {
+          var arr = [];
+          response.data.forEach(function (item) {
+            if (item.dictValue !== '1') {
+              item.dictLabel = item.dictLabel.substring(2,item.dictLabel.length);
+              arr.push(item);
+            }else{
+              arr.push(item);
+            }
+          });
+          this.surveyStatusOptions = arr;
+        });
         this.getList();
         this.getSyqr();
           // this.getDicts("family_status").then(response => {
@@ -419,23 +407,39 @@
       methods: {
         getList(){
           let params = {
-            "surveyStatus":"2,3,4,5",
+            "surveyStatus":"1",
             "pageNum": 1,
             "pageSize":10,
           }
           rhhcList(params).then(res => {
-            this.list1 = res.data.zjdzdxxList;
+            this.list1 =  res.data.zjdzdxxList;
+            if(res.data.zjdzdxxList.length>0&&res.data.zjdzdxxList.length<res.data.zjdzs){
+              this.countyhc++
+              this.loading2 = false
+              this.finished2 = false;
+            }else{
+              this.loading2 = false
+              this.finished2 = true
+            }
+
+          });
+          rhhcList({surveyStatus:"1,2,3,4,5"}).then(res => {
+            this.whcNums = res.data.wdcs;
+            this.hcycNums = res.data.dcycs;
+            this.hcwcNums = res.data.dcwcs;
+            this.sptgNums = res.data.dctgs;
+            this.spbhNums = res.data.dcbhs;
             this.totalH = res.data.zjdzs;
             this.totalR = res.data.shyqrs;
-            this.yhcNums = res.data.zjdzs;
-          });
-          rhhcList({surveyStatus:"1"}).then(res => {
-            this.whcNums = res.data.zjdzs;
           });
         },
         showUploadList(){
           this.showImageList = true;
         },
+        onCancel(){
+          console.info(2321)
+          this.zjdvalue = "";
+        },
         submitUploadList(){
           submitUploadImageList(this.uploadImgList1).then(res => {
             let _this = this
@@ -787,7 +791,7 @@
         onRefreshzjd(){
           this.isLoadingzjd = false;
           let _this = this
-          if(this.active==1&&this.loading3){
+          if(this.active==0&&this.loading2){
             let params = {
               "shyqrdbxm" : this.zjdvalue,
               "surveyStatus":"1",
@@ -797,20 +801,20 @@
              rhhcList(params).then((response) => {
                 if(response.data.zjdzdxxList.length>0&&this.list2.length<response.data.zjdzs){
                   response.data.zjdzdxxList.map(res => {
-                    this.list2.push(res)
+                    _this.list1.push(res)
                   })
                   this.countyhc++
-                  this.loading3 = false
+                  this.loading2 = false
                 }else{
-                  this.loading3 = false
-                  this.finished3 = true
+                  this.loading2 = false
+                  this.loading2 = true
                 }
               });
-          }else if(this.active==0&&this.loading2){
+          }else if(this.active==1&&this.loading2){
             let params = {
               "shyqrdbxm" : this.zjdvalue,
-              "surveyStatus":"2,3,4,5",
-              "pageNum": this.countqb+1,
+              "surveyStatus":"2",
+              "pageNum": this.countyhc+1,
               "pageSize":10,
             }
             rhhcList(params).then((response) => {
@@ -818,12 +822,66 @@
                   response.data.zjdzdxxList.map(res => {
                     _this.list1.push(res)
                   })
-                  this.countqb++
+                  this.countyhc++
                   this.loading2 = false
                 }else{
                   this.finished2 = true
                 }
             });
+          }else if(this.active==2&&this.loading2){
+            let params = {
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"3",
+              "pageNum": this.countyhc+1,
+              "pageSize":10,
+            }
+            rhhcList(params).then((response) => {
+              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
+                response.data.zjdzdxxList.map(res => {
+                  _this.list1.push(res)
+                })
+                this.countyhc++
+                this.loading2 = false
+              }else{
+                this.finished2 = true
+              }
+            });
+          }else if(this.active==3&&this.loading2){
+            let params = {
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"4",
+              "pageNum": this.countyhc+1,
+              "pageSize":10,
+            }
+            rhhcList(params).then((response) => {
+              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
+                response.data.zjdzdxxList.map(res => {
+                  _this.list1.push(res)
+                })
+                this.countyhc++
+                this.loading2 = false
+              }else{
+                this.finished2 = true
+              }
+            });
+          }else if(this.active==4&&this.loading2){
+            let params = {
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"5",
+              "pageNum": this.countyhc+1,
+              "pageSize":10,
+            }
+            rhhcList(params).then((response) => {
+              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
+                response.data.zjdzdxxList.map(res => {
+                  _this.list1.push(res)
+                })
+                this.countyhc++
+                this.loading2 = false
+              }else{
+                this.finished2 = true
+              }
+            });
           }
         },
         getTotalHR(){
@@ -860,6 +918,20 @@
             }
           });
         },
+        queryDetail(item){
+          //this.$cookies.set("search",JSON.stringify(item));
+          this.$cookies.set("search","");
+          // let _this = this
+          // setTimeout(function(){
+          //   _this.$router.push({name:'homesteadAdd'});
+          // },1000)
+
+          getZjdzd(item.id).then((response) => {
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data));
+            localStorage.setItem("executePermission",false);
+            this.$router.push({path:'/homesteadSurvey/add'});
+          });
+        },
         setCookies(item){
           //this.$cookies.set("search",JSON.stringify(item));
           this.$cookies.set("search","");
@@ -870,15 +942,16 @@
 
           getZjdzd(item.id).then((response) => {
             localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data));
+            localStorage.setItem("executePermission",true);
             this.$router.push({path:'/homesteadSurvey/add'});
           });
         },
         // 入户核查搜索框新增。
         onClickzjd(){
           this.$cookies.remove("search");
-          localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:this.qlrform.suyqrdm,zjdlyzk:"1",landStatus:"1"
+          localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:this.qlrform.suyqrdm,zjddm:null,zjdlyzk:"1",landStatus:"1"
                                                               ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
-                                                              ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",dj:"1",yt:"01"}));
+                                                              ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"01"}));
           this.$router.push({name:'homesteadAdd'});
         },
         // 农户信息搜索框新增。
@@ -918,7 +991,7 @@
         // 返回
         onClickLeft(){
           this.$cookies.set("search","")
-          this.$router.push({name: this.$router.back(-1)});
+          this.$router.push({path:'/homesteadSurvey/index'});
         },
         onConfirmhncysjly(value){
           this.form5.sjlyName = value.dictLabel
@@ -1200,8 +1273,14 @@
         },
         // 宅基地搜索框
         onSearchzjd(){
-          console.info(this.active);
-          if(this.active==1){
+          rhhcList({"shyqrdbxm" : this.zjdvalue,surveyStatus:"1,2,3,4,5"}).then(res => {
+            this.whcNums = res.data.wdcs;
+            this.hcycNums = res.data.dcycs;
+            this.hcwcNums = res.data.dcwcs;
+            this.sptgNums = res.data.dctgs;
+            this.spbhNums = res.data.dcbhs;
+          });
+          if(this.active==0){
             let params = {
               "shyqrdbxm" : this.zjdvalue,
               "surveyStatus":"1",
@@ -1211,32 +1290,91 @@
             rhhcList(params).then((response) => {
               console.info(this.list2.length);
               if (response.code == 200) {
+                this.list1 =  response.data.zjdzdxxList;
                 if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.list2 =  response.data.zjdzdxxList;
-                  this.totalH = response.data.zjdzs;
-                  this.totalR = response.data.shyqrs;
                   this.countyhc++
-                  this.loading3 = false
-                  this.finished3 = false;
+                  this.loading2 = false
+                  this.finished2 = false;
                 }else{
-                  this.loading3 = false
-                  this.finished3 = true
+                  this.loading2 = false
+                  this.finished2 = true
+                }
+              }
+            });
+          } else if(this.active==1){
+            let params = {
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"2",
+              "pageNum": 1,
+              "pageSize":10,
+            }
+            rhhcList(params).then((response) => {
+              console.info(this.list2.length);
+              if (response.code == 200) {
+                this.list1 =  response.data.zjdzdxxList;
+                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                  this.countyhc++
+                  this.loading2 = false
+                  this.finished2 = false;
+                }else{
+                  this.loading2 = false
+                  this.finished2 = true
+                }
+              }
+            });
+          } else if(this.active==2){
+            let params = {
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"3",
+              "pageNum": 1,
+              "pageSize":10,
+            }
+            rhhcList(params).then((response) => {
+              console.info(this.list2.length);
+              if (response.code == 200) {
+                this.list1 =  response.data.zjdzdxxList;
+                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                  this.countyhc++
+                  this.loading2 = false
+                  this.finished2 = false;
+                }else{
+                  this.loading2 = false
+                  this.finished2 = true
+                }
+              }
+            });
+          } else if(this.active==3){
+            let params = {
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"4",
+              "pageNum": 1,
+              "pageSize":10,
+            }
+            rhhcList(params).then((response) => {
+              console.info(this.list2.length);
+              if (response.code == 200) {
+                this.list1 =  response.data.zjdzdxxList;
+                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                  this.countyhc++
+                  this.loading2 = false
+                  this.finished2 = false;
+                }else{
+                  this.loading2 = false
+                  this.finished2 = true
                 }
               }
             });
           }else{
             let params = {
               "shyqrdbxm" : this.zjdvalue,
-              "surveyStatus":"2,3,4,5",
+              "surveyStatus":"5",
               "pageNum": 1,
               "pageSize":10,
             }
             rhhcList(params).then((response) => {
               if (response.code == 200) {
+                this.list1 =  response.data.zjdzdxxList;
                 if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.list1 =  response.data.zjdzdxxList;
-                  this.totalH = response.data.zjdzs;
-                  this.totalR = response.data.shyqrs;
                   this.countyhc++
                   this.loading2 = false
                   this.finished2 = false;
@@ -1419,36 +1557,105 @@
           })
         },
       getZjdList(){
-        this.totalH = 0;
-        this.totalR = 0;
+        this.countyhc = 0;
          if(this.active === 0){
            let params = {
              "shyqrdbxm" : this.zjdvalue,
-             "surveyStatus":"2,3,4,5",
+             "surveyStatus":"1",
              "pageNum": 1,
              "pageSize":10,
            }
            rhhcList(params).then((response) => {
              if (response.code == 200) {
-               this.yhcNums = response.data.zjdzs;
+               this.whcNums = response.data.zjdzs;
                this.list1 = response.data.zjdzdxxList;
-               this.totalH = response.data.zjdzs;
-               this.totalR = response.data.shyqrs;
+               this.loading2 = false
+               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                 this.countyhc++
+                 this.finished2 = false;
+               }else{
+                 this.finished2 = true
+               }
              }
            });
          }else if(this.active === 1){
            let params = {
              "shyqrdbxm" : this.zjdvalue,
-             "surveyStatus":"1",
+             "surveyStatus":"2",
              "pageNum": 1,
              "pageSize":10,
            }
            rhhcList(params).then((response) => {
              if (response.code == 200) {
-               this.whcNums = response.data.zjdzs;
-               this.list2 = response.data.zjdzdxxList;
-               this.totalH = response.data.zjdzs;
-               this.totalR = response.data.shyqrs;
+               this.hcycNums = response.data.zjdzs;
+               this.list1 = response.data.zjdzdxxList;
+               this.loading2 = false
+               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                 this.countyhc++
+                 this.finished2 = false;
+               }else{
+                 this.finished2 = true
+               }
+             }
+           });
+         }else if(this.active === 2){
+           let params = {
+             "shyqrdbxm" : this.zjdvalue,
+             "surveyStatus":"3",
+             "pageNum": 1,
+             "pageSize":10,
+           }
+           rhhcList(params).then((response) => {
+             if (response.code == 200) {
+               this.hcwcNums = response.data.zjdzs;
+               this.list1 = response.data.zjdzdxxList;
+               this.loading2 = false
+               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                 this.countyhc++
+                 this.finished2 = false;
+               }else{
+                 this.finished2 = true
+               }
+             }
+           });
+         }else if(this.active === 3){
+           let params = {
+             "shyqrdbxm" : this.zjdvalue,
+             "surveyStatus":"4",
+             "pageNum": 1,
+             "pageSize":10,
+           }
+           rhhcList(params).then((response) => {
+             if (response.code == 200) {
+               this.spbhNums = response.data.zjdzs;
+               this.list1 = response.data.zjdzdxxList;
+               this.loading2 = false
+               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                 this.countyhc++
+                 this.finished2 = false;
+               }else{
+                 this.finished2 = true
+               }
+             }
+           });
+         }else if(this.active === 4){
+           let params = {
+             "shyqrdbxm" : this.zjdvalue,
+             "surveyStatus":"5",
+             "pageNum": 1,
+             "pageSize":10,
+           }
+           rhhcList(params).then((response) => {
+             if (response.code == 200) {
+               this.sptgNums = response.data.zjdzs;
+               this.list1 = response.data.zjdzdxxList;
+               this.loading2 = false
+               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+                 this.countyhc++
+                 this.finished2 = false;
+               }else{
+                 this.finished2 = true
+               }
              }
            });
          }
@@ -5033,7 +5240,7 @@
         zjdTz(){
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
-            this.mapZjdTeAll.mapZjdAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
@@ -5047,7 +5254,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
             this.mapZjdTeAll.active =3;
             this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapZrzAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")

src/views/homesteadSurvey/list2.vue

@@ -13,9 +13,7 @@
           <template #right>
             <van-icon v-if="$cookies.get('upload')!=null&&$cookies.get('upload')==1" name="photo-o" size=".5rem" color="#fff"/>
           </template>
-          <template #title>
-            <p style="color:#fff">{{item.deptName}}</p>
-          </template>
+
         </van-nav-bar>
         <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
                    close-icon="close">
@@ -59,7 +57,14 @@
       </template>
     </van-search>
 <!--<van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">-->
-    <van-cell  v-for="(item,index) in nhlist" :key="index" size="small" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
+    <van-list
+      v-model:loading="loading2"
+      :finished="finished2"
+      finished-text="没有更多了"
+      :immediate-check="false"
+      @load="onRefreshShyqr"
+    >
+    <van-cell  v-for="(item,index) in nhlist" :key="index" size="small" :clickable="true" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
       <template #title>
         <div style="display: flex;align-items: center;">
           <p style="display: flex;align-items: center;">
@@ -76,6 +81,7 @@
         <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>
+    </van-list>
 <!--    </van-pull-refresh>-->
   </div>
 </template>
@@ -289,7 +295,7 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
-        this.item = this.$cookies.get("item");
+        this.item = JSON.parse(localStorage.getItem("surveyItem"));
         this.getNh();
           this.getDicts("family_status").then(response => {
             var arr = [];
@@ -320,29 +326,14 @@
                 this.mapShow();
                 this.getZjdList();
                 this.getTotalHR();
-                if(this.item.taskStatus=="FINISHED"){
-                    this.isFinished = true
-                }else{
-                  this.isFinished = false
-                }
               }
             }else {
               this.getZjdList();
               this.getTotalHR();
-              if(this.item.taskStatus=="FINISHED"){
-                this.isFinished = true
-              }else{
-                this.isFinished = false
-              }
             }
           }else {
             this.getZjdList();
             this.getTotalHR();
-            if(this.item.taskStatus=="FINISHED"){
-              this.isFinished = true
-            }else{
-              this.isFinished = false
-            }
           }
       },
       methods: {
@@ -697,63 +688,31 @@
           })
           return label
         },
-        onRefreshzjd(){
+        onRefreshShyqr(){
+          console.info(this.loading2);
           this.isLoadingzjd = false;
-          let _this = this
-          if(this.active==1&&this.loading2){
-              let params = {
-                "deptId" : this.item.deptId,
-                "houseDataConfirmStatus" : "CONFIRMED",
-                "pageNum": this.countyhc+1,
-                "pageSize":10,
-              }
-              listZjdzd(params).then((response) => {
-                if(response.rows.length>0&&this.list1.length<response.total){
-                  response.rows.map(res => {
-                    this.list1.push(res)
-                  })
-                  this.countyhc++
-                  this.loading2 = false
-                }else{
-                  this.loading2 = false
-                  this.finished2 = true
-                }
-              });
-          }else if(this.active==2&&this.loading3){
+          if(this.loading2){
             let params = {
-              "deptId" : this.item.deptId,
-              "houseDataConfirmStatus" : "UNCONFIRMED",
-              "pageNum": this.countwhc+1,
-              "pageSize":10,
+              deptId : this.item.deptId,
+              yhzgx : "02",
+              nhValue : this.nhvalue,
+              pageNum: this.countyhc+1,
+              pageSize:10,
             }
-            listZjdzd(params).then((response) => {
-                if(response.rows.length>0&&this.list2.length<response.total){
-                  response.rows.map(res => {
-                    this.list2.push(res)
-                  })
-                  this.countwhc++
-                  this.loading3 = false
-                }else{
-                  this.finished3 = true
-                }
-            });
-          }else if(this.active==0&&this.loading1){
-            let params = {
-              "deptId" : this.item.deptId,
-              "pageNum": this.countqb+1,
-              "pageSize":10,
-            }
-            listZjdzd(params).then((response) => {
-                if(response.rows.length>0&&this.list.length<response.total){
-                  response.rows.map(res => {
-                    _this.list.push(res)
-                  })
-                  this.countqb++
-                  this.loading1 = false
-                }else{
-                  this.finished1 = true
-                }
+            listNhhncy(params).then((response) => {
+              if(response.rows.length>0&&response.rows.length<response.total){
+                response.rows.map(res => {
+                  this.nhlist.push(res)
+                })
+                this.countyhc++
+                this.loading2 = false
+              }else{
+                this.loading2 = false
+                this.finished2 = true
+              }
+              console.info( this.loading2);
             });
+
           }
         },
         getTotalHR(){
@@ -1039,16 +998,23 @@
         getNh(){
           //删除地图选中状态
           $("#deleteHistoryMap").trigger("click");
-          console.info(this.item.deptId);
           let params = {
-            dept:this.item.deptId,
-            yhzgx : "02"
+            yhzgx : "02",
+            pageNum: 1,
+            pageSize:10,
           }
           listNhhncy(params).then((response) => {
-            this.nhlist = response.rows
-            this.totalN = response.total
+            this.nhlist = response.rows;
+            this.totalN = response.total;
+            if(response.rows.length>0&&response.rows.length<response.total){
+              this.countyhc++
+              this.loading2 = false
+              this.finished2 = false;
+            }else{
+              this.loading2 = false
+              this.finished2 = true
+            }
           });
-          console.info( this.nhlist);
           this.mapZjdData = "";
           this.mapZrzData = "";
           this.mapFsssData = "";
@@ -1088,12 +1054,21 @@
         // 农户信息搜索框
         onSearchnh(){
           let params = {
-            "deptId" : this.item.deptId,
-            "yhzgx" : "02",
-            "nhValue" : this.nhvalue
+            yhzgx : "02",
+            nhValue : this.nhvalue,
+            pageNum: 1,
+            pageSize:10,
           }
           listNhhncy(params).then((response) => {
             this.nhlist = response.rows
+            if(response.rows.length>0&&response.rows.length<response.total){
+              this.countyhc++
+              this.loading2 = false
+              this.finished2 = false;
+            }else{
+              this.loading2 = false
+              this.finished2 = true
+            }
           });
         },
         // 宅基地搜索框
@@ -1297,7 +1272,7 @@
               this.nhform.sjlyName = res.dictLabel
             }
           })
-          this.$router.push({name:'nhDetails',query:{nhdm:item.nhdm,zjhm:item.zjhm}});
+          this.$router.push({name:'nhDetails',query:item});
         },
       getZjdList(){
          // let params1 = {
@@ -4904,7 +4879,7 @@
         zjdTz(){
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
-            this.mapZjdTeAll.mapZjdAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
@@ -4918,7 +4893,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
             this.mapZjdTeAll.active =3;
             this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapZrzAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
@@ -4931,7 +4906,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
           this.mapZjdTeAll.active =4;
           this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapFsssAData.deptId =this.$cookies.get("item").deptId;
+            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","")

src/views/homesteadSurvey/list3.vue

@@ -13,9 +13,6 @@
           <template #right>
             <van-icon v-if="$cookies.get('upload')!=null&&$cookies.get('upload')==1" name="photo-o" size=".5rem" color="#fff"/>
           </template>
-          <template #title>
-            <p style="color:#fff">{{item.deptName}}</p>
-          </template>
         </van-nav-bar>
         <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
                    close-icon="close">
@@ -36,22 +33,7 @@
           <div :class="{activeBtn : activeBtn==4,disactiveBtn :activeBtn!=4 }" @click="$router.push({path:'/homesteadSurvey/list4'})">切换地图</div>
         </div>
       </div>
-      <div style="background:#fff;padding:10px 2.5%;display: flex;justify-content: space-between;">
-        <div style="text-align:center;background: rgba(122,201,67,0.2);width: 49%;font-size: 14px;border-radius: 8px;display: flex;align-items: center;justify-content: center;padding: 2px 0;">
-          <img src="../../assets/images/housesteadSurvey/list01.png" alt="">
-          <p style="margin-left: 10px;">
-            <span style="color:#60B722;line-height:.8rem;">总户数：</span>
-            <span style="color:#60B722;line-height:.8rem;"><span style="font-size:16px;color: #448815;">{{totalH}}</span> 户</span>
-          </p>
-        </div>
-        <div style="text-align:center;background: rgba(122,201,67,0.2);width: 49%;font-size: 14px;border-radius: 8px;display: flex;align-items: center;justify-content: center;padding: 2px 0;">
-          <img src="../../assets/images/housesteadSurvey/list02.png" alt="">
-          <p style="margin-left: 10px;">
-            <span style="color:#60B722;line-height:.8rem">总人数：</span>
-            <span style="color:#60B722;line-height:.8rem"><span style="font-size:16px;color: #448815;">{{totalR}}</span> 人</span>
-          </p>
-        </div>
-      </div>
+
     </van-sticky>
     <van-form ref="form">
       <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;padding:5px;background:#fff;">
@@ -562,7 +544,7 @@
                 //   location.reload();
                 // }
                 this.activeBtn = this.$cookies.get("search").activeBtn;
-                this.item = this.$cookies.get("item");
+                this.item = JSON.parse(localStorage.getItem("surveyItem"));
                 this.mapAddJump = this.$cookies.get("search").backMapZjdAData.deptId;
                 this.backTheGeom = this.$cookies.get("search").backMapZjdAData.theGeom;
                 this.mapZjdData = this.$cookies.get("search").backMapZjdAData;
@@ -581,26 +563,8 @@
                   this.isFinished = false
                 }
               }
-            }else {
-              this.item = this.$cookies.get("item");
-              // this.getZjdList();
-              this.getTotalHR();
-              if(this.item.taskStatus=="FINISHED"){
-                this.isFinished = true
-              }else{
-                this.isFinished = false
-              }
-            }
-          }else {
-            this.item = this.$cookies.get("item");
-            console.info(this.item );
-            // this.getZjdList();
-            this.getTotalHR();
-            if(this.item.taskStatus=="FINISHED"){
-              this.isFinished = true
-            }else{
-              this.isFinished = false
             }
+
           }
       },
       methods: {
@@ -5227,7 +5191,7 @@
         zjdTz(){
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
-            this.mapZjdTeAll.mapZjdAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
@@ -5241,7 +5205,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
             this.mapZjdTeAll.active =3;
             this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapZrzAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")

src/views/homesteadSurvey/list4.vue

@@ -13,9 +13,6 @@
           <template #right>
             <van-icon v-if="$cookies.get('upload')!=null&&$cookies.get('upload')==1" name="photo-o" size=".5rem" color="#fff"/>
           </template>
-          <template #title>
-            <p style="color:#fff">{{item.deptName}}</p>
-          </template>
         </van-nav-bar>
         <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
                    close-icon="close">
@@ -54,7 +51,7 @@
         <div style="border:1px solid rgb(122, 201, 67);width:90%;margin:0 auto;border-radius:15px;height:.8rem;display:flex;font-size:.3rem;">
           <div style="flex:1;text-align:center;">
             <span style="color:rgb(122, 201, 67);line-height:.8rem;">宅基地数：</span>
-            <span style="color:rgb(250, 83, 83);line-height:.8rem;">{{totalH}} <span style="font-size:12px;">户</span></span>
+            <span style="color:rgb(250, 83, 83);line-height:.8rem;">{{qbNums}} <span style="font-size:12px;">户</span></span>
           </div>
           <div style="flex:1;text-align:center;">
             <span style="color:rgb(122, 201, 67);line-height:.8rem">使用权人数：</span>
@@ -1211,7 +1208,7 @@
 </template>
 
 <script>
-    import {listZjdzd,getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+    import {listZjdzd,rhhcList,getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
@@ -1306,6 +1303,7 @@
           showdbrzjlx:false,
           // 数据来源弹出框
           showsjly:false,
+          surveyItem:{},
           // 证件类型字典
           zjlxOptions: [],
           // 所有权性质字典
@@ -1437,7 +1435,7 @@
                 //   location.reload();
                 // }
                 this.activeBtn = this.$cookies.get("search").activeBtn;
-                this.item = this.$cookies.get("item");
+                this.item = JSON.parse(localStorage.getItem("surveyItem"));
                 this.mapAddJump = this.$cookies.get("search").backMapZjdAData.deptId;
                 this.backTheGeom = this.$cookies.get("search").backMapZjdAData.theGeom;
                 this.mapZjdData = this.$cookies.get("search").backMapZjdAData;
@@ -1456,25 +1454,11 @@
                   this.isFinished = false
                 }
               }
-            }else {
-              this.item = this.$cookies.get("item");
-              this.getZjdList();
-              this.getTotalHR();
-              if(this.item.taskStatus=="FINISHED"){
-                this.isFinished = true
-              }else{
-                this.isFinished = false
-              }
             }
           }else {
-            this.item = this.$cookies.get("item");
+            this.item = JSON.parse(localStorage.getItem("surveyItem"));
             this.getZjdList();
             this.getTotalHR();
-            if(this.item.taskStatus=="FINISHED"){
-              this.isFinished = true
-            }else{
-              this.isFinished = false
-            }
           }
       },
       methods: {
@@ -1834,7 +1818,6 @@
           let _this = this
           if(this.active==1&&this.loading2){
               let params = {
-                "deptId" : this.item.deptId,
                 "houseDataConfirmStatus" : "CONFIRMED",
                 "pageNum": this.countyhc+1,
                 "pageSize":10,
@@ -1853,7 +1836,6 @@
               });
           }else if(this.active==2&&this.loading3){
             let params = {
-              "deptId" : this.item.deptId,
               "houseDataConfirmStatus" : "UNCONFIRMED",
               "pageNum": this.countwhc+1,
               "pageSize":10,
@@ -1890,7 +1872,7 @@
         },
         getTotalHR(){
           let params = {
-            "deptId" : this.item.deptId,
+            "deptId" : this.surveyItem.deptId,
             "pageNum": 1,
             "pageSize":10,
           }
@@ -2460,15 +2442,16 @@
           })
         },
       getZjdList(){
-         let params = {
-           "deptId" : this.item.deptId,
-           "pageNum": 1,
-           "pageSize":10,
-         }
-         listZjdzd(params).then((response) => {
+        let params = {
+          "surveyStatus":"1",
+          "pageNum": 1,
+          "pageSize":10,
+        }
+        rhhcList(params).then((response) => {
            if (response.code == 200) {
-             this.list = response.rows
-             this.qbNums = response.total
+             this.list = response.data.zjdzdxxList
+             this.qbNums = response.data.zjdzs;
+             this.totalR = response.data.shyqrs;
    /*          if(response.rows.length>=10){
                this.list = newList.slice(0,9)
              }else {
@@ -2495,7 +2478,6 @@
            }
          });
          let params1 = {
-           "deptId" : this.item.deptId,
            "houseDataConfirmStatus" : "CONFIRMED",
            "pageNum": 1,
            "pageSize":10,
@@ -2507,7 +2489,6 @@
            }
          });
          let params2 = {
-           "deptId" : this.item.deptId,
            "houseDataConfirmStatus" : "UNCONFIRMED",
            "pageNum": 1,
            "pageSize":10,
@@ -3106,7 +3087,8 @@
           // map.addLayer(zhenTc);
           //镇边界查询开始 ------------------------------end
           //村边界查询开始 ------------------------------start
-          var cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'";
+          that.surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
+          var cql_filter = "dept_id='" + that.surveyItem.deptId + "'";
           var cunTc = new ol.layer.Image({
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
@@ -3287,7 +3269,7 @@
           //村边界查询开始 ------------------------------end
           //国有数据加载-----------------------------------start
 
-          deptGetId(that.$cookies.get("item").deptId).then((res) => {
+          deptGetId(that.surveyItem.deptId).then((res) => {
             var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
             var guoyouTc = new ol.layer.Image({
               source: new ol.source.ImageWMS({
@@ -3349,7 +3331,7 @@
             .then((data) => {
               if (that.backTheGeom != "" && that.backTheGeom != undefined && that.backTheGeom.substring(0, 1) == "{") {
                 //自然幢图层查询开始 ------------------start
-                var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.mapZjdData.zjddm + "'";
+                var cql_filter_map = "dept_id='" + that.surveyItem.deptId + "'" + "and zjddm='" + that.mapZjdData.zjddm + "'";
                 zrzTc = new ol.layer.Image({
                   source: new ol.source.ImageWMS({
                     url: that.mapGeoServerUrl + "/wms",
@@ -4078,7 +4060,7 @@
                 }
               } else {
                 params = {
-                  "deptId" : that.$cookies.get("item").deptId,
+                  "deptId" : that.surveyItem.deptId,
                   "shyqrdbxm" : val
                 }
               }
@@ -5037,13 +5019,13 @@
 
                           var vector_drawing_map;
                           let params = {
-                            "deptId": that.$cookies.get("item").deptId,
+                            "deptId": that.surveyItem.deptId,
                             "zjddm": obj.zjddm,
                           }
                           that.mapClick = obj.zjddm;
                           //点击查看自然幢
                           //自然幢图层查询开始 ------------------start
-                          var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                          var cql_filter_map = "dept_id='" + that.surveyItem.deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                           zrzTc = new ol.layer.Image({
                             source: new ol.source.ImageWMS({
                               url: that.mapGeoServerUrl + "/wms",
@@ -5171,7 +5153,7 @@
                           obj.zjddm = trs.find("td").eq(6).text();//宅基地代码
                           obj.scjzmj = trs.find("td").eq(14).text();//实测建筑面积
                           let params = {
-                            "deptId": that.$cookies.get("item").deptId,
+                            "deptId": that.surveyItem.deptId,
                             "zjddm": obj.zjddm,
                           }
                           that.mapClick = obj.zjddm;
@@ -5232,7 +5214,7 @@
                             });
                           } else {
                             //自然幢图层查询开始 ------------------start
-                            var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                            var cql_filter_map = "dept_id='" + that.surveyItem.deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                             zrzTc = new ol.layer.Image({
                               source: new ol.source.ImageWMS({
                                 url: that.mapGeoServerUrl + "/wms",
@@ -5360,7 +5342,7 @@
                           obj.jzmj = trs.find("td").eq(6).text(); //建筑面积
 
                           let params = {
-                            "deptId": that.$cookies.get("item").deptId,
+                            "deptId": that.surveyItem.deptId,
                             "zjddm": obj.zjddm,
                             "pageSize": 20,
                           }
@@ -5419,7 +5401,7 @@
                           });
                         } else {
                             //自然幢图层查询开始 ------------------start
-                            var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                            var cql_filter_map = "dept_id='" + that.surveyItem.deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                             zrzTc = new ol.layer.Image({
                               source: new ol.source.ImageWMS({
                                 url: that.mapGeoServerUrl + "/wms",
@@ -5972,6 +5954,7 @@
         zjdHc(){
           console.info(this.mapZrzData)
           if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
+            localStorage.setItem("executePermission",true);
             if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
               this.mapZjdTeAll.active =1;
               //this.$cookies.set("search",this.mapZjdTeAll);
@@ -5984,7 +5967,6 @@
                 this.mapZjdTeAll.active = 1;
                 this.mapZjdTeAll.mapZjdAData = this.mapZjdData;
                 //this.$cookies.set("search",this.mapZjdTeAll);
-                console.info(this.mapZjdTeAll.mapZjdAData);
                 localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData));
                 setTimeout(() => {
                   this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
@@ -6027,6 +6009,7 @@
           this.mapZjdTeAll.mapZrzAData ={};
           this.mapZjdTeAll.mapFsssAData ={};
           //this.mapZjdTeAll.active =1;
+          localStorage.setItem("executePermission",true);
           if(item.typeTc =="宅基地"){
           getZjdzd(item.id).then((response) => {
             this.mapZjdData = response.data;
@@ -6121,7 +6104,7 @@
         zjdTz(){
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
-            this.mapZjdTeAll.mapZjdAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
@@ -6135,7 +6118,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
             this.mapZjdTeAll.active =3;
             this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapZrzAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
@@ -6148,7 +6131,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
           this.mapZjdTeAll.active =4;
           this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapFsssAData.deptId =this.$cookies.get("item").deptId;
+            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","")

src/views/homesteadSurvey/listbf.vue

@@ -1436,7 +1436,7 @@
                 //   location.reload();
                 // }
                 this.activeBtn = this.$cookies.get("search").activeBtn;
-                this.item = this.$cookies.get("item");
+                this.item = JSON.parse(localStorage.getItem("surveyItem"));
                 this.mapAddJump = this.$cookies.get("search").backMapZjdAData.deptId;
                 this.backTheGeom = this.$cookies.get("search").backMapZjdAData.theGeom;
                 this.mapZjdData = this.$cookies.get("search").backMapZjdAData;
@@ -1456,7 +1456,7 @@
                 }
               }
             }else {
-              this.item = this.$cookies.get("item");
+              this.item = JSON.parse(localStorage.getItem("surveyItem"));
               this.getZjdList();
               this.getTotalHR();
               if(this.item.taskStatus=="FINISHED"){
@@ -1466,7 +1466,7 @@
               }
             }
           }else {
-            this.item = this.$cookies.get("item");
+            this.item = JSON.parse(localStorage.getItem("surveyItem"));
             this.getZjdList();
             this.getTotalHR();
             if(this.item.taskStatus=="FINISHED"){
@@ -6098,7 +6098,7 @@
         zjdTz(){
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
-            this.mapZjdTeAll.mapZjdAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
@@ -6112,7 +6112,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
             this.mapZjdTeAll.active =3;
             this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapZrzAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")

src/views/homesteadSurvey/nhAdd.vue

@@ -54,24 +54,23 @@
           placeholder="行政区划名称"
           :rules="[{ required: true, message: '' }]"
         />-->
-
         <van-field
           input-align="right"
-          v-model="form.hzxm"
+          v-model="form.xm"
           name="姓名"
-          label="户主姓名"
-          placeholder="请输入户主姓名"
+          label="姓名"
+          placeholder="请输入姓名"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
           required
         />
         <field-select
-          v-model="form.hzzjlx"
+          v-model="form.zjlx"
           label="证件类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="请输入户主证件类型"
+          placeholder="请输入使用权人证件类型"
           remote-url="/system/dict/data/type/zjlx"
           :on-remote-response="'data'"
           :rules="[{ required: true }]"
@@ -79,7 +78,7 @@
         />
         <van-field
           input-align="right"
-          v-model="form.hzzjhm"
+          v-model="form.zjhm"
           name="证件号码"
           label="证件号码"
           placeholder="请输入使用权人证件号码"
@@ -88,15 +87,112 @@
           :rules="[{ required: true }]"
           required
         />
+        <field-select
+          v-model="form.yhzgx"
+          label="与户主关系"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择与户主关系"
+          remote-url="/system/dict/data/type/family_status"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.xb"
+          label="性别"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择性别"
+          remote-url="/system/dict/data/type/sys_user_sex"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.hklx"
+          label="户口类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择户口类型"
+          remote-url="/system/dict/data/type/account_type"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-field
+          input-align="right"
+          v-model="form.lxdh"
+          name="联系电话"
+          label="联系电话"
+          placeholder="请输入联系电话"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <field-select
+          v-model="form.hyzk"
+          label="婚姻状况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择性别"
+          remote-url="/system/dict/data/type/hyzk"
+          :on-remote-response="'data'"
+        />
         <van-field
           input-align="right"
-          v-model="form.hncysl"
-          name="成员数量"
-          label="成员数量"
-          placeholder="请输入成员数量"
+          v-model="form.hkszd"
+          name="户口所在地"
+          label="户口所在地"
+          placeholder="请输入户口所在地"
           maxlength="50"
           autocomplete="off"
         />
+
+        <field-select
+          v-model="form.cybz"
+          label="成员备注"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择成员备注"
+          remote-url="/system/dict/data/type/cybz"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.cybzsm"
+          name="备注说明"
+          label="备注说明"
+          placeholder="请输入备注说明"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <field-select
+          v-model="form.sjly"
+          label="数据来源"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择数据来源"
+          remote-url="/system/dict/data/type/sjly"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfbjtjjzzcy"
+          label="是否本集体经济组织成员"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfjbzgq"
+          label="具备资格权"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/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>
+
         <FieldRadio
           v-model="form.sfwbh"
           label="是否五保户"
@@ -114,48 +210,46 @@
           :on-remote-response="'data'"
         />
         <FieldRadio
-          v-model="form.sfwzjd"
-          label="是否无宅基地"
+          v-model="form.zqtczsfyzf"
+          label="在其他村庄有住房"
           value-key="dictLabel"
           data-key="dictValue"
           remote-url="/system/dict/data/type/house_yes_no"
           :on-remote-response="'data'"
         />
         <FieldRadio
-          v-model="form.sfjbzgq"
-          label="是否具备资格权"
+          v-model="form.jzhcssfyzf"
+          label="在集镇或城市有住房"
           value-key="dictLabel"
           data-key="dictValue"
           remote-url="/system/dict/data/type/house_yes_no"
           :on-remote-response="'data'"
         />
-        <van-field
-          autocomplete="off"
-          input-align="right"
-          v-model="form.zgqrzrq"
-          name="资格权认证日期"
-          label="资格权认证日期"
-          placeholder="资格权认证日期"
-          readonly
-          @click="showZgqrzrq = true"
+        <FieldRadio
+          v-model="form.sfbccm"
+          label="本村村民"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
         />
-        <van-popup v-model:show="showZgqrzrq" position="bottom">
-          <van-datetime-picker
-            type="date"
-            @confirm="onConfirmZgqrzrq"
-            @cancel="showZgqrzrq = false"
-            :min-date="minDate"
-            :max-date="maxDate"
-          />
-        </van-popup>
-        <van-field
-          input-align="right"
-          v-model="form.hkszd"
-          name="户口所在地"
-          label="户口所在地"
-          placeholder="请输入户口所在地"
-          maxlength="50"
-          autocomplete="off"
+        <field-select
+          v-model="form.occupation"
+          label="职业"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择职业"
+          remote-url="/system/dict/data/type/occupation"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.jzqk"
+          label="居住情况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择居住情况"
+          remote-url="/system/dict/data/type/living_condition"
+          :on-remote-response="'data'"
         />
         <van-field
           input-align="right"
@@ -166,19 +260,9 @@
           maxlength="50"
           autocomplete="off"
         />
-
-        <van-field
-          input-align="right"
-          v-model="form.bz"
-          name="备注"
-          label="备注"
-          placeholder="请输入备注"
-          maxlength="50"
-          autocomplete="off"
-        />
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button  v-if="permission == 'true'" round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
         <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
       </div>
       <div style="height: 50px;"></div>
@@ -187,20 +271,10 @@
 </template>
 
 <script>
-import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
-import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
 import FieldSelect from "@/components/form/FieldSelect";
 import FieldRadio from "@/components/form/FieldRadio";
-import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
-import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} 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 {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
-import { listTown, getTown } from "@/api/homesteadSurvey/town";
-import { listVillage} from "@/api/homesteadSurvey/village";
-import { sysConfig} from "@/api/homesteadSurvey/index";
 import { Notify, Dialog, Toast } from 'vant';
 import axios from "axios";
 export default {
@@ -209,6 +283,7 @@ export default {
   data() {
     return {
       active:2,
+      permission:false,
       // 使用权人列表
       syqrlist:[
         {
@@ -225,9 +300,26 @@ export default {
   },
   created(){
     let data = this.$route.query;
-    console.info(data)
+    this.permission = localStorage.getItem("executePermission");
     this.form = data;
-    if(this.form.shyqrdbzjhm != null){
+    if(this.form.nhdm == null){
+      this.$set(this.form, 'zjlx', "01");
+      this.$set(this.form, 'xb', "1");
+      this.$set(this.form, 'yhzgx', "22");
+      this.$set(this.form, 'hklx', "01");
+      this.$set(this.form, 'hyzk', "01");
+      this.$set(this.form, 'cybz', "9");
+      this.$set(this.form, 'sjly', "01");
+      this.$set(this.form, 'sfbjtjjzzcy', "1");
+      this.$set(this.form, 'sfjbzgq', "1");
+      this.$set(this.form, 'sfwbh', "0");
+      this.$set(this.form, 'sfpkh', "0");
+      this.$set(this.form, 'zqtczsfyzf', "0");
+      this.$set(this.form, 'jzhcssfyzf', "0");
+      this.$set(this.form, 'sfbccm', "1");
+      this.$set(this.form, 'occupation', "1");
+      this.$set(this.form, 'jzqk', "1");
+    }else{
       this.getList();
     }
 
@@ -237,13 +329,13 @@ export default {
   },
   methods: {
     getList(){
-      listNh({hzzjhm:this.form.shyqrdbzjhm}).then(response => {
+      listNhhncy({yhzgx:"02",nhdm:this.form.nhdm}).then(response => {
         this.form = response.rows[0];
       });
     },
     submitzjd(){
       this.$refs.form.validate().then(() => {
-      updateNh(this.form).then(response => {
+        updateNhhncy(this.form).then(response => {
         let _this =this
         this.$toast({
           icon: 'success', // 找到自己需要的图标
@@ -315,6 +407,7 @@ export default {
   left:0;
   bottom:0;
 }
+
 >>> .delete-button {
   height: 100%;
 }

src/views/homesteadSurvey/nhDetails.vue

@@ -67,24 +67,23 @@
           placeholder="行政区划名称"
           :rules="[{ required: true, message: '' }]"
         />-->
-
         <van-field
           input-align="right"
-          v-model="form.hzxm"
+          v-model="form.xm"
           name="姓名"
-          label="户主姓名"
-          placeholder="请输入户主姓名"
+          label="姓名"
+          placeholder="请输入姓名"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
           required
         />
         <field-select
-          v-model="form.hzzjlx"
+          v-model="form.zjlx"
           label="证件类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="请输入户主证件类型"
+          placeholder="请输入使用权人证件类型"
           remote-url="/system/dict/data/type/zjlx"
           :on-remote-response="'data'"
           :rules="[{ required: true }]"
@@ -92,7 +91,7 @@
         />
         <van-field
           input-align="right"
-          v-model="form.hzzjhm"
+          v-model="form.zjhm"
           name="证件号码"
           label="证件号码"
           placeholder="请输入使用权人证件号码"
@@ -101,15 +100,112 @@
           :rules="[{ required: true }]"
           required
         />
+        <field-select
+          v-model="form.yhzgx"
+          label="与户主关系"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择与户主关系"
+          remote-url="/system/dict/data/type/family_status"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.xb"
+          label="性别"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择性别"
+          remote-url="/system/dict/data/type/sys_user_sex"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
+        <field-select
+          v-model="form.hklx"
+          label="户口类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择户口类型"
+          remote-url="/system/dict/data/type/account_type"
+          :on-remote-response="'data'"
+          :rules="[{ required: true }]"
+          required
+        />
         <van-field
           input-align="right"
-          v-model="form.hncysl"
-          name="成员数量"
-          label="成员数量"
-          placeholder="请输入成员数量"
+          v-model="form.lxdh"
+          name="联系电话"
+          label="联系电话"
+          placeholder="请输入联系电话"
           maxlength="50"
           autocomplete="off"
         />
+        <field-select
+          v-model="form.hyzk"
+          label="婚姻状况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择性别"
+          remote-url="/system/dict/data/type/hyzk"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.hkszd"
+          name="户口所在地"
+          label="户口所在地"
+          placeholder="请输入户口所在地"
+          maxlength="50"
+          autocomplete="off"
+        />
+
+        <field-select
+          v-model="form.cybz"
+          label="成员备注"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择成员备注"
+          remote-url="/system/dict/data/type/cybz"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.cybzsm"
+          name="备注说明"
+          label="备注说明"
+          placeholder="请输入备注说明"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <field-select
+          v-model="form.sjly"
+          label="数据来源"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择数据来源"
+          remote-url="/system/dict/data/type/sjly"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfbjtjjzzcy"
+          label="是否本集体经济组织成员"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfjbzgq"
+          label="具备资格权"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/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>
+
         <FieldRadio
           v-model="form.sfwbh"
           label="是否五保户"
@@ -127,48 +223,46 @@
           :on-remote-response="'data'"
         />
         <FieldRadio
-          v-model="form.sfwzjd"
-          label="是否无宅基地"
+          v-model="form.zqtczsfyzf"
+          label="在其他村庄有住房"
           value-key="dictLabel"
           data-key="dictValue"
           remote-url="/system/dict/data/type/house_yes_no"
           :on-remote-response="'data'"
         />
         <FieldRadio
-          v-model="form.sfjbzgq"
-          label="是否具备资格权"
+          v-model="form.jzhcssfyzf"
+          label="在集镇或城市有住房"
           value-key="dictLabel"
           data-key="dictValue"
           remote-url="/system/dict/data/type/house_yes_no"
           :on-remote-response="'data'"
         />
-        <van-field
-          autocomplete="off"
-          input-align="right"
-          v-model="form.zgqrzrq"
-          name="资格权认证日期"
-          label="资格权认证日期"
-          placeholder="资格权认证日期"
-          readonly
-          @click="showZgqrzrq = true"
+        <FieldRadio
+          v-model="form.sfbccm"
+          label="本村村民"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
         />
-        <van-popup v-model:show="showZgqrzrq" position="bottom">
-          <van-datetime-picker
-            type="date"
-            @confirm="onConfirmZgqrzrq"
-            @cancel="showZgqrzrq = false"
-            :min-date="minDate"
-            :max-date="maxDate"
-          />
-        </van-popup>
-        <van-field
-          input-align="right"
-          v-model="form.hkszd"
-          name="户口所在地"
-          label="户口所在地"
-          placeholder="请输入户口所在地"
-          maxlength="50"
-          autocomplete="off"
+        <field-select
+          v-model="form.occupation"
+          label="职业"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择职业"
+          remote-url="/system/dict/data/type/occupation"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.jzqk"
+          label="居住情况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择居住情况"
+          remote-url="/system/dict/data/type/living_condition"
+          :on-remote-response="'data'"
         />
         <van-field
           input-align="right"
@@ -179,16 +273,6 @@
           maxlength="50"
           autocomplete="off"
         />
-
-        <van-field
-          input-align="right"
-          v-model="form.bz"
-          name="备注"
-          label="备注"
-          placeholder="请输入备注"
-          maxlength="50"
-          autocomplete="off"
-        />
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
         <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
@@ -413,12 +497,9 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
-        this.item = this.$cookies.get("item");
+        this.item = JSON.parse(localStorage.getItem("surveyItem"));
         let data = this.$route.query;
         this.form = data;
-        if(this.form.zjhm != null){
-          this.getList();
-        }
           this.getDicts("family_status").then(response => {
             var arr = [];
             response.data.forEach(function (item) {
@@ -476,8 +557,8 @@
           this.showImageList = true;
         },
         getList(){
-          listNh({hzzjhm:this.form.zjhm,nhdm:this.form.nhdm}).then(response => {
-            this.form = response.rows[0];
+          getNhhncy(this.form.id).then(response => {
+            this.form = response.data;
           });
         },
         submitUploadList(){
@@ -5104,7 +5185,7 @@
         zjdTz(){
           if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
             this.mapZjdTeAll.active =1;
-            this.mapZjdTeAll.mapZjdAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
             //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
@@ -5118,7 +5199,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
             this.mapZjdTeAll.active =3;
             this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapZrzAData.deptId =this.$cookies.get("item").deptId;
+            this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
             //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
             //this.$cookies.set("search",this.mapZjdTeAll);
             this.$cookies.set("search","")
@@ -5131,7 +5212,7 @@
           if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
           this.mapZjdTeAll.active =4;
           this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss;
-            this.mapZjdTeAll.mapFsssAData.deptId =this.$cookies.get("item").deptId;
+            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","")
@@ -5153,6 +5234,17 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  .title:before
+  {
+    content:"";
+    width: 6px;
+    height: 20PX;
+    background: #7ac943;
+    border-radius: 3px;
+    position:absolute;
+    left:0;
+    bottom:0;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/nhcyAdd.vue

@@ -192,9 +192,78 @@
           remote-url="/system/dict/data/type/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>
+
+        <FieldRadio
+          v-model="form.sfwbh"
+          label="是否五保户"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfpkh"
+          label="是否贫困户"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.zqtczsfyzf"
+          label="在其他村庄有住房"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.jzhcssfyzf"
+          label="在集镇或城市有住房"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfbccm"
+          label="本村村民"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.occupation"
+          label="职业"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择职业"
+          remote-url="/system/dict/data/type/occupation"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="form.jzqk"
+          label="居住情况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择居住情况"
+          remote-url="/system/dict/data/type/living_condition"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.txdz"
+          name="通讯地址"
+          label="通讯地址"
+          placeholder="请输入通讯地址"
+          maxlength="50"
+          autocomplete="off"
+        />
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button v-if="permission == 'true'"  round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
         <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
       </div>
       <div style="height: 50px;"></div>
@@ -224,6 +293,7 @@ export default {
   data() {
     return {
       active:2,
+      permission:false,
       // 使用权人列表
       syqrlist:[
         {
@@ -238,15 +308,24 @@ export default {
   created(){
     let data = this.$route.query;
     this.form = data;
+    this.permission = localStorage.getItem("executePermission");
     if(this.form.id == null){
       this.$set(this.form, 'zjlx', "01");
       this.$set(this.form, 'xb', "1");
-      this.$set(this.form, 'yhzgx', "23");
+      this.$set(this.form, 'yhzgx', "11");
       this.$set(this.form, 'hklx', "01");
       this.$set(this.form, 'hyzk', "01");
+      this.$set(this.form, 'cybz', "9");
       this.$set(this.form, 'sjly', "01");
       this.$set(this.form, 'sfbjtjjzzcy', "1");
       this.$set(this.form, 'sfjbzgq', "1");
+      this.$set(this.form, 'sfwbh', "0");
+      this.$set(this.form, 'sfpkh', "0");
+      this.$set(this.form, 'zqtczsfyzf', "0");
+      this.$set(this.form, 'jzhcssfyzf', "0");
+      this.$set(this.form, 'sfbccm', "1");
+      this.$set(this.form, 'occupation', "1");
+      this.$set(this.form, 'jzqk', "1");
     }
     console.info(data);
   },
@@ -269,7 +348,7 @@ export default {
             message: '保存成功',
             duration:"1000",
             onClose:function(){
-              _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+              _this.$router.push({path:'/homesteadSurvey/nhcyList',query: {zjddm: _this.form.zjddm}});
             }
           })
         });
@@ -281,7 +360,7 @@ export default {
             message: '保存成功',
             duration:"1000",
             onClose:function(){
-              _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+              _this.$router.push({path:'/homesteadSurvey/nhcyList',query: {zjddm: _this.form.zjddm}});
             }
           })
         });

src/views/homesteadSurvey/nhcyList.vue

@@ -65,17 +65,22 @@
           <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
         </div>
         <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
-
           <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopuphncy(item)">
             <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
             <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">详情</span>
           </p>
+
         </div>
       </div>
       <template #right>
-        <van-button 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="deletesyqr(item.id,index)"/>
       </template>
     </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;">
+        <p style="font-size: 16px;" @click="showPopupcy()">+ 添加农户信息</p>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -99,6 +104,7 @@ export default {
   data() {
     return {
       active:2,
+      permission:false,
       // 使用权人列表
       shyqrData:{},
       hnnylist:[],
@@ -106,6 +112,7 @@ export default {
   },
   created(){
     this.shyqrData = this.$route.query;
+    this.permission = localStorage.getItem("executePermission");
     this.getList();
   },
   mounted(){
@@ -134,9 +141,8 @@ export default {
     showPopupsyqr(val){
       this.$router.push({name:'shyqrAdd',query:val});
     },
-    showPopupnh(val){
-
-      this.$router.push({name:'nhcyAdd',query:{nhdm:this.hnnylist[0].nhdm}});
+    showPopupcy(){
+      this.$router.push({name:'nhcyAdd',query:{nhdm:this.hnnylist[0].nhdm,suyqrdm:this.hnnylist[0].suyqrdm}});
     },
     showPopuphncy(val){
       this.$router.push({name:'nhcyAdd',query:val});

src/views/homesteadSurvey/nmfwAdd.vue

@@ -225,6 +225,7 @@
           label="实际层"
           maxlength="50"
           autocomplete="off"
+          type="number"
         />
         <van-field
           input-align="right"
@@ -233,6 +234,7 @@
           label="名义层"
           maxlength="50"
           autocomplete="off"
+          type="number"
         />
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">证书信息</p>
         <FieldRadio
@@ -324,7 +326,7 @@
         />
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button v-if="permission == 'true'" round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
         <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
       </div>
       <div style="height: 50px;"></div>
@@ -349,6 +351,7 @@ export default {
     return {
       active:3,
       // 使用权人列表
+      permission:false,
       syqrlist:[
         {
           shyqrdbxm :'测试测试',
@@ -371,8 +374,8 @@ export default {
   },
   created(){
     let data = this.$route.query;
-    console.info(data)
     this.form = data;
+    this.permission = localStorage.getItem("executePermission");
     if(this.form.id == null){
       this.$set(this.form, 'hx', "01");
       this.$set(this.form, 'hxjg', "01");
@@ -383,7 +386,7 @@ export default {
       this.$set(this.form, 'sffz', "1");
       this.$set(this.form, 'sfjf', "0");
       this.$set(this.form, 'sfcf', "0");
-      this.$set(this.form, 'lyzk', "10");
+      this.$set(this.form, 'lyzk', "11");
       this.$set(this.form, 'sfdy', "0");
       this.$set(this.form, 'fwaqxjddj', "01");
       this.$set(this.form, 'fwzt', "01");
@@ -512,7 +515,7 @@ export default {
       }
     },
     cancel(){
-      this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: this.form.zjddm}});
+      this.$router.push({path:'/homesteadSurvey/nmfwList',query: {zjddm: this.form.zjddm}});
     },
     // 获取登录人位置坐标
     getLandCoord(func) {

src/views/homesteadSurvey/nmfwList.vue

@@ -72,11 +72,11 @@
         </div>
       </div>
       <template #right>
-        <van-button 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="deletesyqr(item.id,index)"/>
       </template>
     </van-swipe-cell>
 
-    <div style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
+    <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;">
         <p style="font-size: 16px;" @click="showPopupAddnmfw()">+ 添加农民房屋</p>
       </div>
@@ -106,12 +106,14 @@ export default {
     return {
       active:3,
       // 使用权人列表
+      permission:false,
       zrzData:{},
       nmfwlist:[],
     };
   },
   created(){
     this.zrzData = this.$route.query;
+    this.permission = localStorage.getItem("executePermission");
     this.getList();
   },
   mounted(){

src/views/homesteadSurvey/shyqrAdd.vue

@@ -64,6 +64,7 @@
         <van-field
           v-model="form.zjddm"
           label="宅基地代码"
+          placeholder="宅基地代码"
           input-align="right"
           :rules="[{ required: true }]"
           required
@@ -93,6 +94,7 @@
           v-model="form.bdcdyh"
           name="不动产单元号"
           label="不动产单元号"
+          placeholder="不动产单元号"
         />
         <van-field
           autocomplete="off"
@@ -116,6 +118,7 @@
           v-model="form.fzjg"
           name="发证机关"
           label="发证机关"
+          placeholder="发证机关"
         />
 
         <van-field
@@ -149,6 +152,7 @@
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
+          readonly
           required
         />
         <field-select
@@ -171,14 +175,14 @@
           maxlength="50"
           autocomplete="off"
         />
-        <van-cell title="是否本集体经济组织成员" >
-          <template #right-icon>
-            <van-radio-group v-model="form.sfbncjtjjzzcy" direction="horizontal" >
-              <van-radio name="1">是</van-radio>
-              <van-radio name="0">否</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
+        <FieldRadio
+          v-model="form.sfbncjtjjzzcy"
+          label="是否本集体经济组织成员"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
+        />
         <field-select
           v-model="form.hklx"
           label="户口类型"
@@ -237,12 +241,11 @@
           remote-url="/system/dict/data/type/province_code"
           :on-remote-response="'data'"
         />
-        <field-select
+        <FieldRadio
           v-model="form.sfsyqrzjgy"
           label="使用权人之间共有"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="请选择使用权人之间共有"
           remote-url="/system/dict/data/type/house_yes_no"
           :on-remote-response="'data'"
         />
@@ -255,25 +258,14 @@
           remote-url="/system/dict/data/type/common_mode"
           :on-remote-response="'data'"
         />
-        <van-field
-          autocomplete="off"
-          input-align="right"
-          v-model="form.ftzdmj"
-          name="分摊宗地面积(㎡)"
-          label="分摊宗地面积(㎡)"
-          placeholder="单位：平方米"
-          type="number"
-          maxlength="15"
+        <FieldRadio
+          v-model="form.sfczr"
+          label="持证人"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/system/dict/data/type/house_yes_no"
+          :on-remote-response="'data'"
         />
-
-        <van-cell title="持证人" >
-          <template #right-icon>
-            <van-radio-group v-model="form.sfczr" direction="horizontal" >
-              <van-radio name="1">是</van-radio>
-              <van-radio name="0">否</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
         <van-field
           input-align="right"
           v-model="form.qlbl"
@@ -297,7 +289,7 @@
         </van-dialog>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button v-if="permission == 'true'" round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
         <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
       </div>
       <div style="height: 50px;"></div>
@@ -336,12 +328,13 @@ export default {
           nhdm :'777888999',
         }
       ],
+      permission:false,
       shownhdm:false,
       showDropList:false,
       shownmfwdm:false,
       hzxm:null,
       landStatus:"1",
-      deptId:this.$cookies.get("item").deptId,
+      deptId:JSON.parse(localStorage.getItem("surveyItem")).deptId,
       nhdmDictionaries:[],
       nmfwDictionaries:[],
       mapShow: false,
@@ -352,6 +345,7 @@ export default {
     let data = this.$route.query;
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
     this.form = data;
+    this.permission = localStorage.getItem("executePermission");
     if(this.form.id == null){
       this.$set(this.form, 'shyqrdbzjlx', "01");
       this.$set(this.form, 'xb', "1");
@@ -427,6 +421,7 @@ export default {
     },
     shyqrdmxmChange(val){
       this.$set(this.form, "nhdm", val.nhdm);
+      this.$set(this.form, "shyqrdbzjhm", val.hzzjhm);
       this.showDropList = false;
     },
     submitzjd(){

src/views/homesteadSurvey/zrzAdd.vue

@@ -184,7 +184,7 @@
         </common-map>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
-        <van-button round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
+        <van-button  v-if="permission == 'true'" round color="#22B7F2" style="width:45%" @click="submitzjd">保存</van-button>
         <van-button plain color="#22B7F2" style="width:45%" round type="info" @click="cancel">取消</van-button>
       </div>
       <div style="height: 50px;"></div>
@@ -216,6 +216,7 @@ export default {
   data() {
     return {
       active:3,
+      permission:false,
       // 使用权人列表
       syqrlist:[
         {
@@ -239,6 +240,7 @@ export default {
     let data = this.$route.query;
     console.info(data)
     this.form = data;
+    this.permission = localStorage.getItem("executePermission");
     if(this.form.shyqrdbzjhm != null){
       this.getList();
     }

src/views/sunVillage_info/entityReport/reportLineSummary.vue

@@ -51,30 +51,29 @@
         <div class="main-table" v-if="!!editorData.templateId">
           <table>
             <thead>
-            <tr>
-              <td v-for="(header) in removePlaceholder(editorData.headers)" :colspan="header.colspan" :style="{
-                'background-color': calcColor(header.type),
-                'color': calcTextColor(header.type),
-              }">{{header.headerName}}</td>
-            </tr>
+              <tr v-for="(headerRow, rindex) in editorData.headerRows">
+                <th v-for="(header) in removePlaceholder(headerRow)" :__Col="header.headerSort" :__Row="header.headerRowSort" :colspan="header.colspan" :rowspan="header.rowspan">
+                  {{header.headerName}}
+                </th>
+              </tr>
             </thead>
 
             <tbody>
               <tr v-for="(row, rindex) in editorData.rows">
                 <td v-for="(col, cindex) in removePlaceholder(row)" :colspan="col.colspan" :rowspan="col.rowspan" :style="{
-                  'text-align': calcAlign(editorData.headers[col.colIndex].type),
-                  'background-color': calcColor(editorData.headers[col.colIndex].type),
+                  'text-align': calcAlign(col.type),
+                  'background-color': calcColor(col.type),
                 }">
                   <div class="full-height">
-                    <div class="full-height" v-if="editorData.headers[col.colIndex].type === '2'">
+                    <div class="full-height" v-if="col.type === '2'">
                       <input class="input-field align-right full-height" v-model="col.val" :readonly="disableEdit" type="number"></input>
                     </div>
-                    <div class="full-height" v-else-if="editorData.headers[col.colIndex].type === '4'">
+                    <div class="full-height" v-else-if="col.type === '4'">
                       <input class="input-field align-center full-height" v-model="col.name" :readonly="disableEdit"></input>
                     </div>
-                    <div class="full-height" v-else :style="{'text-align': calcAlign(editorData.headers[col.colIndex].type)}">{{col.name}}</div>
+                    <div v-else :style="{'text-align': calcAlign(col.type)}">{{col.name}}</div>
 
-                    <van-icon name="edit" v-if="cindex === editorData.headers.length - 1 && canEdit(col)" class="edit-icon" color="#1989fa" size="24" @click="edit(col)"/>
+                    <van-icon name="edit" v-if="cindex === editorData.headerTypes.length - 1 && canEdit(col)" class="edit-icon" color="#1989fa" size="24" @click="edit(col)"/>
                   </div>
                 </td>
               </tr>
@@ -136,6 +135,11 @@ export default {
         rows: [],
         cells: [],
         rules: [],
+        headerRows: [],
+        headerLength: 0,
+        headerDeep: 0,
+        headerTypes: [],
+        header: null,
       },
       templateList: [],
       loading: false,
@@ -247,6 +251,11 @@ export default {
         rows: [],
         cells: [],
         rules: [],
+        headerRows: [],
+        headerLength: 0,
+        headerDeep: 0,
+        headerTypes: [],
+        header: null,
       };
     },
     parseQuery() {
@@ -358,18 +367,19 @@ export default {
       border: 0.01rem solid #1989fa;
       table-layout: fixed;
     }
-    thead td {
+    th {
       text-align: center;
       border: 0.01rem solid #1989fa;
-      height: 1rem;
+      min-height: 1rem;
       font-size: 0.32rem;
-      padding: 0 0.4rem;
+      padding: 0.4rem 0.4rem;
       margin: 0;
       font-weight: bold;
+      min-width: 1rem;
+      /*max-width: 2rem;*/
       white-space: nowrap;
-      /*max-width: 1.2rem;*/
     }
-    tbody td {
+    td {
       font-size: 0.3rem;
       border: 0.01rem solid #1989fa;
       height: 1rem;
@@ -380,6 +390,7 @@ export default {
       margin: 0;
       /*max-width: 1.5rem;*/
       position: relative;
+      min-width: 1rem;
     }
 
     .input-field {

src/views/sunVillage_info/entityReport/reportLineView.vue

@@ -49,7 +49,7 @@
         </van-row>
 
         <div class="main-table" v-if="!!editorData.templateId">
-            <div v-for="(header, rindex) in editorData.headers">
+            <div v-for="(header, rindex) in editorData.detailHeaders">
               <van-field v-if="header.type === '2'" label-width="50%" :readonly="disableEdit" v-model="editorData.rows[0][rindex].val" :label="header.headerName" :placeholder="header.headerName" input-align="right" type="number"/>
               <van-field v-else-if="header.type === '4' || header.type === '3'" label-width="50%" :readonly="disableEdit" v-model="editorData.rows[0][rindex].name" :label="header.headerName" :placeholder="header.headerName" input-align="right"/>
               <van-field v-else label-width="50%" :readonly="true" :value="editorData.rows[0][rindex].name" :label="header.headerName" :placeholder="header.headerName" input-align="right"/>
@@ -128,6 +128,12 @@ export default {
         rows: [],
         cells: [],
         rules: [],
+        headerRows: [],
+        headerLength: 0,
+        headerDeep: 0,
+        headerTypes: [],
+        header: null,
+        detailHeaders: [],
       },
       templateList: [],
       loading: false,
@@ -159,9 +165,13 @@ export default {
       this.loading = true;
       if(this.editorData.id) // 修改
       {
-        getReport(this.editorData.id).then((resp) => {
+        getReport(this.editorData.id, {
+          genDetailHeaders: true
+        }).then((resp) => {
           let reportData = resp.data;
-          getReportTemplate(reportData.templateId).then((resp) => {
+          getReportTemplate(reportData.templateId, {
+            genDetailHeaders: true
+          }).then((resp) => {
             let templateData = resp.data;
             this.setTableData(templateData, reportData);
           }).finally(() => {
@@ -173,7 +183,9 @@ export default {
       }
       else
       {
-        getReportTemplate(this.editorData.templateId).then((resp) => {
+        getReportTemplate(this.editorData.templateId, {
+          genDetailHeaders: true
+        }).then((resp) => {
           let templateData = resp.data;
           this.setTableData(templateData);
         }).finally(() => {
@@ -197,6 +209,11 @@ export default {
         let cells = reportData.cells;
         data = reportData;
         data.headers = templateData.headers;
+        data.headerRows = templateData.headerRows;
+        data.headerTypes = templateData.headerTypes;
+        data.headerLength = templateData.headerLength;
+        data.headerDeep = templateData.headerDeep;
+        data.detailHeaders = templateData.detailHeaders;
         data.rows = templateData.rows;
         data.cells = templateData.cells;
         data.rules = templateData.rules;
@@ -208,7 +225,7 @@ export default {
           cols.forEach((x) => {
             if(group[rowIndex] && group[rowIndex][x.colIndex])
             {
-              if(templateData.headers[x.colIndex].type === '4')
+              if(templateData.headerTypes[x.colIndex] === '4')
                 x.name = group[rowIndex][x.colIndex].name;
               x.val = group[rowIndex][x.colIndex].val;
             }
@@ -297,6 +314,12 @@ export default {
         rows: [],
         cells: [],
         rules: [],
+        headerRows: [],
+        headerLength: 0,
+        headerDeep: 0,
+        headerTypes: [],
+        header: null,
+        detailHeaders: [],
       };
     },
     parseQuery() {

src/views/sunVillage_info/entityReport/reportView.vue

@@ -52,27 +52,26 @@
         <div class="main-table" v-if="!!editorData.templateId">
           <table>
             <thead>
-            <tr>
-              <td v-for="(header) in removePlaceholder(editorData.headers)" :colspan="header.colspan" :style="{
-                'background-color': calcColor(header.type),
-                'color': calcTextColor(header.type),
-              }">{{header.headerName}}</td>
-            </tr>
+              <tr v-for="(headerRow, rindex) in editorData.headerRows">
+                <th v-for="(header) in removePlaceholder(headerRow)" :__Col="header.headerSort" :__Row="header.headerRowSort" :colspan="header.colspan" :rowspan="header.rowspan">
+                  {{header.headerName}}
+                </th>
+              </tr>
             </thead>
 
             <tbody>
-            <tr v-for="(row, rindex) in editorData.rows">
+              <tr v-for="(row, rindex) in editorData.rows">
               <td v-for="(col) in removePlaceholder(row)" :colspan="col.colspan" :rowspan="col.rowspan" :style="{
-                'text-align': calcAlign(editorData.headers[col.colIndex].type),
-                'background-color': calcColor(editorData.headers[col.colIndex].type),
+                'text-align': calcAlign(col.type),
+                'background-color': calcColor(col.type),
               }">
-                <div class="absolute-full" v-if="editorData.headers[col.colIndex].type === '2'" :class="{'validate-error': col.error, 'validate-error-box': col.error,}">
+                <div class="absolute-full" v-if="col.type === '2'" :class="{'validate-error': col.error, 'validate-error-box': col.error,}">
                   <input class="input-field align-right full-height" v-model="col.val" :readonly="disableEdit" type="number"></input>
                 </div>
-                <div class="full-height" v-else-if="editorData.headers[col.colIndex].type === '4'">
+                <div class="full-height" v-else-if="col.type === '4'">
                   <input class="input-field align-center full-height" v-model="col.name" :readonly="disableEdit"></input>
                 </div>
-                <div class="full-height" v-else :style="{'text-align': calcAlign(editorData.headers[col.colIndex].type)}">{{col.name}}</div>
+                <div v-else :style="{'text-align': calcAlign(col.type)}">{{col.name}}</div>
               </td>
             </tr>
             </tbody>
@@ -155,6 +154,11 @@ export default {
         rows: [],
         cells: [],
         rules: [],
+        headerRows: [],
+        headerLength: 0,
+        headerDeep: 0,
+        headerTypes: [],
+        header: null,
       },
       templateList: [],
       loading: false,
@@ -223,6 +227,10 @@ export default {
         let cells = reportData.cells;
         data = reportData;
         data.headers = templateData.headers;
+        data.headerRows = templateData.headerRows;
+        data.headerTypes = templateData.headerTypes;
+        data.headerLength = templateData.headerLength;
+        data.headerDeep = templateData.headerDeep;
         data.rows = templateData.rows;
         data.cells = templateData.cells;
         data.rules = templateData.rules;
@@ -234,7 +242,7 @@ export default {
           cols.forEach((x) => {
             if(group[rowIndex] && group[rowIndex][x.colIndex])
             {
-              if(templateData.headers[x.colIndex].type === '4')
+              if(templateData.headerTypes[x.colIndex] === '4')
                 x.name = group[rowIndex][x.colIndex].name;
               x.val = group[rowIndex][x.colIndex].val;
             }
@@ -347,16 +355,21 @@ export default {
         rows: [],
         cells: [],
         rules: [],
+        headerRows: [],
+        headerLength: 0,
+        headerDeep: 0,
+        headerTypes: [],
+        header: null,
       };
     },
     validate(showMsg) {
       if(!this.editorData.rules || !this.editorData.rules.length)
         return true;
       let errors = [];
-      for(let i in this.editorData.headers)
+      for(let i in this.editorData.headerTypes)
       {
-        let header = this.editorData.headers[i];
-        if(header.type !== '2')
+        let type = this.editorData.headerTypes[i];
+        if(type !== '2')
           continue;
         let map = {};
         for(let m in this.editorData.rows)
@@ -502,18 +515,19 @@ export default {
       border: 0.01rem solid #1989fa;
       table-layout: fixed;
     }
-    thead td {
+    th {
       text-align: center;
       border: 0.01rem solid #1989fa;
-      height: 1rem;
+      min-height: 1rem;
       font-size: 0.32rem;
-      padding: 0 0.4rem;
+      padding: 0.4rem 0.4rem;
       margin: 0;
       font-weight: bold;
+      min-width: 1rem;
+      /*max-width: 2rem;*/
       white-space: nowrap;
-      /*max-width: 1.2rem;*/
     }
-    tbody td {
+    td {
       font-size: 0.3rem;
       border: 0.01rem solid #1989fa;
       height: 1rem;
@@ -524,6 +538,7 @@ export default {
       margin: 0;
       /*max-width: 1.5rem;*/
       position: relative;
+      min-width: 1rem;
     }
 
     .input-field {