宅基地调查优化

src/api/homesteadSurvey/nh.js

@@ -8,7 +8,13 @@ export function listNh(query) {
     params: query
   })
 }
-
+export function queryList(query) {
+  return request({
+    url: '/home/homesteadnh/queryList',
+    method: 'get',
+    params: query
+  })
+}
 // 导出数据调查-户主信息
 export function exportNh(query) {
   return request({

src/views/homesteadSurvey/add3.vue

@@ -315,7 +315,14 @@ export default {
           f.push(i.content)
         }
       }
-      console.info(this.uploadImgList);
+      if(f.length === 0){
+        return this.$toast.fail("请上传照片");
+      }
+      this.$toast.loading({
+        message: "数据处理中",
+        forbidClick: true,
+        duration: 10000000000,
+      });
       let _this = this;
       let file = {
         tableId:val,

src/views/homesteadSurvey/add4.vue

@@ -98,7 +98,7 @@
       </div>
     </div>
     <div  style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
-      <p v-if="permission == 'true'" style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
+      <p v-if="permission == 'true' && zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5'" style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="ycbj()">异常标记</span>
       </p>
       <p v-if="zjdzdxx.surveyStatus == '4'" style="width:32%;border: 1px solid transparent;background: #FFA500;padding: 5px 0;border-radius: 50px;">
@@ -127,13 +127,13 @@
           :lineWidth="signature.lineWidth"
           :lineColor="signature.lineColor"
           :bgColor.sync="signature.bgColor"
-          v-if="!signature.resultImg"
+          v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg"
         />
       </div>
-        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' ||!signature.resultImg"
              style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
-        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
-      <div class="signature-footer"  v-if="!signature.resultImg && permission == 'true'">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg && zjdzdxx.surveyStatus != '4' && zjdzdxx.surveyStatus != '2'"/>
+      <div class="signature-footer"  v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg && permission == 'true'">
           <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
           <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
       </div>
@@ -242,10 +242,10 @@ export default {
     this.houseGetDicts("fsss_type").then((response) => {
       this.fssslxList = response.data;
     });
+
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
     this.permission = localStorage.getItem("executePermission");
     let businessLevel = this.$store.state.user.businessLevel;
-    console.info(this.zjdzdxx.surveySign);
     if(this.zjdzdxx.surveySign != null){
       this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign;
     }
@@ -363,8 +363,6 @@ export default {
               location.reload();
               this.showesign = false;
             });
-
-
           });
 
         })
@@ -574,6 +572,14 @@ export default {
           f.push(i.content)
         }
       }
+      if(f.length === 0){
+        return this.$toast.fail("请上传照片");
+      }
+      this.$toast.loading({
+        message: "数据处理中",
+        forbidClick: true,
+        duration: 10000000000,
+      });
       let _this = this;
       let file = {
         tableId:val,

src/views/homesteadSurvey/list.vue

@@ -104,7 +104,7 @@
                   <van-button square  type="info" class="delete-button" @click="showUploadList(item.id)"><van-icon  name="photo-o" size=".4rem" style="bottom: -3px;" color="#000000" @click="showUploadList(item.id)"/> 附件</van-button>
                 </van-col>
                 <van-col>
-                  <van-button square  type="danger" class="delete-button" @click="deleteZjd(item.id)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">  删除</van-button>
+                  <van-button square  type="danger" class="delete-button" @click="deleteZjd(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">  删除</van-button>
                 </van-col>
               </van-row>
             </template>
@@ -414,6 +414,7 @@
               this.loading2 = false
               this.finished2 = true
             }
+            console.info(this.list1);
           });
         },
         showUploadList(id){
@@ -428,7 +429,14 @@
              f.push(i.content)
            }
           }
-          console.info(this.uploadImgList);
+          if(f.length === 0){
+            return this.$toast.fail("请上传照片");
+          }
+          this.$toast.loading({
+            message: "数据处理中",
+            forbidClick: true,
+            duration: 10000000000,
+          });
           let _this = this;
           let file = {
             tableId:val,
@@ -1583,6 +1591,7 @@
                }else{
                  this.finished2 = true
                }
+               console.info(this.list1);
              }
            });
          }else if(this.active === 2){

src/views/homesteadSurvey/nhcyList.vue

@@ -55,7 +55,7 @@
         <p style="display: flex;align-items: center;">
           <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
           <span style="line-height: 1;font-size: 16px;">{{item.xm}}</span>
-          <span style="line-height: 1;font-size: 16px;margin-left: 68%;">{{formatDict(yhzgxList,item.yhzgx)}}</span>
+          <span style="line-height: 1;font-size: 16px;margin-left: 66%;">{{formatDict(yhzgxList,item.yhzgx)}}</span>
         </p>
         <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
           <p style="flex:1;text-align:left;">证件号码:</p>

src/views/homesteadSurvey/nmfwList.vue

@@ -278,7 +278,14 @@ export default {
           f.push(i.content)
         }
       }
-      console.info(this.uploadImgList);
+      if(f.length === 0){
+        return this.$toast.fail("请上传照片");
+      }
+      this.$toast.loading({
+        message: "数据处理中",
+        forbidClick: true,
+        duration: 10000000000,
+      });
       let _this = this;
       let file = {
         tableId:val,

src/views/homesteadSurvey/shyqrAdd.vue

@@ -63,7 +63,7 @@
           label="农户代码"
           placeholder="请选择"
           v-model="form.nhdm"
-          @click="shownhdm = true"
+          @click="checkNhdmQx"
           input-align="right"
           right-icon="arrow-down"
         />
@@ -91,7 +91,7 @@
           label="农民房屋代码"
           placeholder="请选择"
           v-model="form.nmfwdm"
-          @click="shownmfwdm = true"
+          @click="checkNmfwQx"
           input-align="right"
           right-icon="arrow-down"
         />
@@ -316,7 +316,7 @@ import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@
 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 {queryList, 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";
@@ -392,26 +392,32 @@ export default {
   },
   methods: {
     getList(){
-      listNhhncy({yhzgx:"02"}).then(response => {
+      queryList({yhzgx:"02",searchValue:"NHDM,HZXM"}).then(response => {
         this.nhdmDictionaries = response.rows.map(function(item){
-          item.nhValue = item.xm + item.nhdm;
+          item.nhValue = item.hzxm + item.nhdm;
           return {
             nhValue:item.nhValue,
-            hzxm:item.xm,
-            sqrxb:item.xb,
-            hzzjhm:item.zjhm,
+            hzxm:item.hzxm,
             nhdm:item.nhdm,
-            hzzjlx:item.zjlx,
-            lxdh:item.lxdh,
-            hklx:item.hklx,
-            sfbjtjjzzcy:item.sfbjtjjzzcy,
-            deptId:item.deptId,
-            deptName:item.deptName,
           };
         });
         this.newList = this.nhdmDictionaries;
       });
     },
+    checkNhdmQx(){
+      if(this.form.id != null){
+        this.shownhdm = false;
+      }else{
+        this.shownhdm = true;
+      }
+    },
+    checkNmfwQx(){
+      if(this.form.id != null){
+        this.shownmfwdm = false;
+      }else{
+        this.shownmfwdm = true;
+      }
+    },
     /** 模糊查询人员信息 */
     remoteTransfereeMethod(query) {
       if (query !== "") {