diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 00485155..6fdf49bf 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -1925,7 +1925,17 @@ @cancel="showfwzt = false" /> + + + { this.lyzkOptions = response.data; @@ -2831,11 +2851,6 @@ this.getDicts("Industry").then(response => { this.industryOptions = response.data; }); - this.getnhdmlist(); - this.getZjd(); - this.getBaseUrl(); - - }, mounted(){ if(this.active ==1){ @@ -2871,10 +2886,10 @@ // 所有权人农户代码列表 getnhdmlist(){ let params = { - "deptId" : this.item.deptId + "deptId" : this.item.deptId, + "nhValue":this.nhdmValue } listNh(params).then((response) => { - console.log(response) this.syqrnhdmlist = response.rows }); }, diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 98db4075..ae7fee88 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -56,7 +56,13 @@ - + + - + + - + + - + + - + + - + + @@ -1157,6 +1178,12 @@ name: "homesteadList", data() { return { + loading1:false, + finished1:false, + loading2:false, + finished2:false, + loading3:false, + finished3:false, //全部 qbNums:0, //已调查数量 @@ -1347,7 +1374,6 @@ this.item = this.$cookies.get("item"); this.getZjdList(); this.getTotalHR(); - console.log(this.mapZjdTeAll.mapZrzAData.length) }, methods: { //删除户内成员 @@ -1398,9 +1424,12 @@ listZjdzd(params).then((response) => { if(response.rows.length>0&&this.list1.length { - this.list1.unshift(res) + this.list1.push(res) }) this.countyhc++ + this.loading2 = false + }else{ + this.finished2 = true } }); }else if(this.active==2){ @@ -1413,9 +1442,12 @@ listZjdzd(params).then((response) => { if(response.rows.length>0&&this.list2.length { - this.list2.unshift(res) + this.list2.push(res) }) this.countwhc++ + this.loading3 = false + }else{ + this.finished3 = true } }); }else{ @@ -1427,9 +1459,12 @@ listZjdzd(params).then((response) => { if(response.rows.length>0&&this.list.length { - _this.list.unshift(res) + _this.list.push(res) }) this.countqb++ + this.loading1 = false + }else{ + this.finished1 = true } }); } @@ -2024,6 +2059,8 @@ message: '保存成功', duration:"1000", onClose:function(){ + _this.totalR+=1 + _this.totalH+=1 _this.showhncy = false let params = { "nhdm":_this.form5.nhdm,