diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 9b56f998..641d1547 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -2643,13 +2643,15 @@ }, created(){ if(this.$cookies.get("search")){ + console.log(this.$cookies.get("search")); this.item = this.$cookies.get("search").mapZjdAData - if(this.item.active=="2"){ + console.log(this.$cookies.get("search").active); + if(this.$cookies.get("search").active=="3"){ this.active = "3" this.getZrzList() this.showzrz=true this.form3 = this.$cookies.get("search").mapZrzData - }else if(this.item.active=="3"){ + }else if(this.$cookies.get("search").active=="4"){ this.active = "4" this.getFsssList() this.showfsss=true diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index baa228bd..984c2289 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -451,7 +451,7 @@
查看详情
+查看详情
宅基地代码 {{item.zjddm}}
@@ -1258,6 +1258,7 @@ mapFsssData:{}, mapZjdDataTure:"", mapZjdTeAll:{ + active:"", mapZjdAData:{}, mapZrzAData:{}, mapFsssAData:{}, @@ -2665,6 +2666,7 @@ $("#query").on("click", function () { //数据库查询数据------------------------------------------------------start var val = that.seachText; + that.mapDataAll =""; if (val == "") { that.$toast('请填写查询条件再查询'); } else { @@ -4300,14 +4302,17 @@ console.log(this.zjdHcDy); if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ + this.mapZjdTeAll.active =1; this.$cookies.set("search",this.mapZjdTeAll); this.$router.push({path:'/homesteadSurvey/add'}); } if(this.mapZrzData !=undefined && this.mapZrzData !=""){ + this.mapZjdTeAll.active =3; this.$cookies.set("search",this.mapZjdTeAll); this.$router.push({path:'/homesteadSurvey/add'}); } if(this.mapFsssData !=undefined && this.mapFsssData !=""){ + this.mapZjdTeAll.active =4; this.$cookies.set("search",this.mapZjdTeAll); this.$router.push({path:'/homesteadSurvey/add'}); } @@ -4321,6 +4326,10 @@ }); } }, + //搜索详情跳转 + zjdSs(item){ + console.log(item); + }, //全选 checkAll(val) { console.log(val);