From 5990974b973646ca20ee74d24000c4f673288df4 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Wed, 30 Mar 2022 14:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue  | 19 ++++++-----
 src/views/homesteadSurvey/list.vue | 51 +++++++++++++-----------------
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 679db70c..c566678e 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -3199,8 +3199,8 @@
         this.industryOptions = this.dictTypeList.Industry;
       })
       this.baseUrl = this.$cookies.get("url")
-      console.log(this.$route.query.res);
-      console.log(this.$cookies.get("search"));
+      //console.log(this.$route.query.res);
+      //console.log(this.$cookies.get("search"));
       //this.itemBc = this.$cookies.get("map");
       //this.$cookies.set("item","");
       if(this.$cookies.get("search") !=null &&this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){
@@ -3208,9 +3208,13 @@
         //this.$cookies.set("map",this.$cookies.get("search"));
         this.numerical =this.$cookies.get("search");
       }else {
-        if(this.$route.query.res !=null && this.$route.query.res !="" && this.$route.query.res !=undefined){
-          this.ztMap =true;
-          this.numerical =this.$route.query.res;
+        if(this.$route.query.res !=null && this.$route.query.res !="" && this.$route.query.res != undefined){
+          this.numerical = this.$route.query.res;
+          if(this.numerical.active!=null){
+            this.ztMap =true;
+          }else{
+            this.ztMap =false;
+          }
         }
       }
       if(this.numerical){
@@ -3260,14 +3264,13 @@
             }, 500);
           }
         }else{
-          this.cookiesInfo = this.$cookies.get("search")
-          this.$cookies.set("search","")
+          this.cookiesInfo = this.$cookies.get("search")?this.$cookies.get("search"):this.$route.query.res
+/*          this.$cookies.set("search","")*/
           this.item = this.cookiesInfo
           this.$cookies.set("search",this.cookiesInfo);
           if(this.item.houseDataConfirmStatus!="CONFIRMED"){
             this.isFinished = true
           }
-          /*this.getBaseUrl();*/
           this.getnhdmlist();
           this.getZjd();
 
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 81de1dbe..f4b13f13 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -88,11 +88,6 @@
                   <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>
-              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看详情</van-button>
-                <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>
             </template>
             <!--<template #default>
 
@@ -122,19 +117,13 @@
             @load="onRefreshzjd"
             :immediate-check="false"
           >
-          <van-cell  v-for="(item,index) in list1" :key="index" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
+          <van-cell  v-for="(item,index) in list1" :key="index" size="small" :clickable="true"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
-              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
-
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看详情</van-button>
-                <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>
-              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'" plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</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 style="color:#22B7F2">{{limitWords(item.syqr)}}
+                <van-button  plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看详情</van-button>
+                <!--<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>
             </template>
             <!--<template #default>
@@ -166,15 +155,10 @@
             @load="onRefreshzjd"
             :immediate-check="false"
           >
-          <van-cell  v-for="(item,index) in list2" :key="index" size="small"    style="border-radius: 16px;
+          <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:calc( 100% - 40px);margin:20px">
             <template #title>
-              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看详情</van-button>
-                <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>
-              <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
+              <p style="color:#22B7F2">{{limitWords(item.syqr)}}
                 <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看详情</van-button>
                 <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>
@@ -1429,7 +1413,6 @@
         })
 
           this.getDicts("family_status").then(response => {
-            console.log(response)
             var arr = [];
             response.data.forEach(function (item) {
               if (item.dictLabel !== '户主') {
@@ -1817,10 +1800,14 @@
         },
         // 字数限制
         limitWords(val){
-          if(val.length>11){
-            val = val.slice(0,10) +"..."
+          if(val==null||val==""){
+            return "无"
+          }else{
+            if(val.length>11){
+              val = val.slice(0,10) +"..."
+            }
+            return val
           }
-          return val
         },
         // 与户主关系翻译
         yhzgxfy(value){
@@ -1926,8 +1913,14 @@
           });
         },
         setCookies(item){
-          this.$cookies.set("search",JSON.stringify(item));
-          this.$router.push({path:'/homesteadSurvey/add'});
+          //this.$cookies.set("search",JSON.stringify(item));
+          this.$cookies.set("search","");
+          // let _this = this
+          // setTimeout(function(){
+          //   _this.$router.push({name:'homesteadAdd'});
+          // },1000)
+
+          this.$router.push({path:'/homesteadSurvey/add',query: {res: item}});
         },
         // 入户核查搜索框新增。
         onClickzjd(){