宅基地调查优化

src/views/homesteadSurvey/add4.vue

@@ -104,9 +104,8 @@
       <p v-if="zjdzdxx.surveyStatus == '4'" style="width:32%;border: 1px solid transparent;background: #FFA500;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="bhyyLook()">驳回原因</span>
       </p>
-      <p style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
-        <span v-if="permission == 'true'" style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名确认</span>
-        <span v-if="permission == 'false'" style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名图片</span>
+      <p  v-if="showSh" style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
+        <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">{{qzqr}}</span>
       </p>
       <p v-if = "showDcsh" style="width:32%;border: 1px solid #22B7F2;background: #ffffff;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;"  @click="dcsh()">调查审核</span>
@@ -210,6 +209,8 @@ export default {
       dcshShow:false,
       showesign:false,
       showDcsh:false,
+      qzqr:"签名确认",
+      showSh:false,
       loading:false,
       finished:false,
       countyhc:1,
@@ -254,6 +255,12 @@ export default {
         if(response.data.surveyStatus === "3"  && businessLevel === "2"){
           this.showDcsh =  true;
         }
+        if(response.data.surveyStatus === '5' || response.data.surveyStatus === '3'){
+          this.qzqr = "签名图片";
+        }else{
+          this.qzqr = "签名确认";
+        }
+        this.showSh =  true;
       });
       this.getList();
     }
@@ -361,7 +368,6 @@ export default {
             getZjdzd(this.zjdzdxx.id).then((response) => {
               localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
               location.reload();
-              this.showesign = false;
             });
           });
 

src/views/homesteadSurvey/index.vue

@@ -330,13 +330,13 @@
             }
             listTask(params).then((response) => {
               if(response.rows.length>0&&this.totalList.length<response.total){
-                this.totalList = response.rows.map(function(item) {
+                response.rows.map(function(item) {
                   if(item.zjdwcsl === 0){
                     item.zjdslz = 0;
                   }else{
                     item.zjdslz = 100;
                   }
-                  return item;
+                  _this.totalList.push(item)
                 })
                 this.countyhc++
                 this.loading = false;
@@ -358,13 +358,14 @@
             }
             listTask(params).then((response) => {
               if(response.rows.lenght>0&&this.doneList.length<response.total){
-                this.doneList = response.rows.map(function(item){
+               response.rows.map(function(item){
                   if(item.zjdwcsl === 0){
                     item.zjdslz = 0;
                   }else{
                     item.zjdslz = 100;
                   }
-                  return item;
+                 _this.doneList.push(item)
+
                 })
                 this.countwhc++
                 this.loading = false;
@@ -386,13 +387,13 @@
             }
             listTask(params).then((response) => {
               if(response.rows.length>0&&this.todoList.length<response.total){
-               this.todoList = response.rows.map(function(item){
+                response.rows.map(function(item){
                   if(item.zjdwcsl === 0){
                     item.zjdslz = 0;
                   }else{
                     item.zjdslz = 100;
                   }
-                  return item;
+                 _this.todoList.push(item);
                 })
                 this.countqb++
                 this.loading = false;

src/views/homesteadSurvey/nhAdd.vue

@@ -304,6 +304,7 @@ export default {
     let data = this.$route.query;
     this.permission = localStorage.getItem("executePermission");
     this.form = data;
+    console.info(this.form);
     if(this.form.nhdm == null){
       this.$set(this.form, 'zjlx', "01");
       this.$set(this.form, 'xb', "1");

src/views/homesteadSurvey/shyqrAdd.vue

@@ -91,7 +91,7 @@
           label="农民房屋代码"
           placeholder="请选择"
           v-model="form.nmfwdm"
-          @click="checkNmfwQx"
+          @click="shownmfwdm = true"
           input-align="right"
           right-icon="arrow-down"
         />
@@ -411,13 +411,6 @@ export default {
         this.shownhdm = true;
       }
     },
-    checkNmfwQx(){
-      if(this.form.id != null){
-        this.shownmfwdm = false;
-      }else{
-        this.shownmfwdm = true;
-      }
-    },
     /** 模糊查询人员信息 */
     remoteTransfereeMethod(query) {
       if (query !== "") {