From f5c058f79b7c33f39329775f9ffea261f49c188d Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Tue, 21 Nov 2023 14:27:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 113 ++++++++++++-----------------
 1 file changed, 46 insertions(+), 67 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 245656c8..807da3b7 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -112,7 +112,7 @@
 </template>
 
 <script>
-    import {rhhcList,getQueryLand,getZjdzd,delZjdzd,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+    import {rhhcList,getQueryLand,listZjdzd,getZjdzd,delZjdzd,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
@@ -321,18 +321,6 @@
       mounted(){
       },
       created(){
-
-        axios.get('../static/dictyType.json').then(res => {
-          this.dictTypeList = res.data
-          this.zjlxOptions = this.dictTypeList.zjlx;
-          this.suyqxzOptions = this.dictTypeList.qsxz;
-          this.sjlyOptions = this.dictTypeList.sjly;
-          this.hyzkOptions = this.dictTypeList.hyzk;
-          this.occupationOptions = this.dictTypeList.occupation;
-          this.jzqkOptions = this.dictTypeList.living_condition;
-          this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
-          this.cybzOptions = this.dictTypeList.member_remark;
-        })
         this.getDicts("survey_status").then(response => {
           var arr = [];
           response.data.forEach(function (item) {
@@ -346,7 +334,6 @@
           this.surveyStatusOptions = arr;
         });
         this.getList();
-        this.getSyqr();
           // this.getDicts("family_status").then(response => {
           //   var arr = [];
           //   response.data.forEach(function (item) {
@@ -406,23 +393,8 @@
       },
       methods: {
         getList(){
-          let params = {
-            "surveyStatus":"1",
-            "pageNum": 1,
-            "pageSize":10,
-          }
-          rhhcList(params).then(res => {
+          rhhcList({}).then(res => {
             this.list1 =  res.data.zjdzdxxList;
-            if(res.data.zjdzdxxList.length>0&&res.data.zjdzdxxList.length<res.data.zjdzs){
-              this.loading2 = false
-              this.finished2 = false;
-            }else{
-              this.loading2 = false
-              this.finished2 = true
-            }
-
-          });
-          rhhcList({surveyStatus:"1,2,3,4,5"}).then(res => {
             this.whcNums = res.data.wdcs;
             this.hcycNums = res.data.dcycs;
             this.hcwcNums = res.data.dcwcs;
@@ -430,6 +402,13 @@
             this.spbhNums = res.data.dcbhs;
             this.totalH = res.data.zjdzs;
             this.totalR = res.data.shyqrs;
+            if(res.data.zjdzdxxList.length>0&&res.data.zjdzdxxList.length<res.data.zjdzs){
+              this.loading2 = false
+              this.finished2 = false;
+            }else{
+              this.loading2 = false
+              this.finished2 = true
+            }
           });
         },
         showUploadList(id){
@@ -790,9 +769,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-             rhhcList(params).then((response) => {
-                if(response.data.zjdzdxxList.length>0&&this.list2.length<response.data.zjdzs){
-                  response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+                if(response.rows.length>0&&this.list2.length<response.total){
+                  response.rows.map(res => {
                     _this.list1.push(res)
                   })
                   this.countyhc++
@@ -809,9 +788,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-                if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                  response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+                if(response.rows.length>0&&this.list1.length<response.total){
+                  response.rows.map(res => {
                     _this.list1.push(res)
                   })
                   this.countyhc++
@@ -827,9 +806,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -845,9 +824,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -863,9 +842,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -880,7 +859,7 @@
           let params = {
             "deptId" : this.item.deptId,
             "pageNum": 1,
-            "pageSize":10,
+            "pageSize":6,
           }
           listNh(params).then((response) => {
             if(response.rows.length>=0){
@@ -899,7 +878,7 @@
           let params = {
             "deptId" : this.item.deptId,
             "pageNum": this.countnh+1,
-            "pageSize":10,
+            "pageSize":6,
           }
           listNh(params).then((response) => {
             if(response.rows.length>0&&this.nhlist.length<response.total){
@@ -1570,12 +1549,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.whcNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.whcNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1590,12 +1569,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.hcycNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.hcycNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1610,12 +1589,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.hcwcNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.hcwcNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1630,12 +1609,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.spbhNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.spbhNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1650,12 +1629,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.sptgNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.sptgNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{