更换居民分类统计列表接口

src/views/dataBoard/renfang/resi/class.vue

@@ -1,16 +1,17 @@
 <template>
   <div class="g-pgi">
     <!-- 组织路由 -->
-		<cpt-bread :separator="'/'" @tap="handleClickBreadItem" :breadList="breadList"></cpt-bread>
+    <cpt-bread :breadList="breadList" :separator="'/'" @tap="handleClickBreadItem"></cpt-bread>
 
     <div class="m-title">
-			<img class="title_img" src="@/assets/images/index/list-logo.png" alt />
+      <img alt class="title_img" src="@/assets/images/index/list-logo.png"/>
       <div class="tip_title">{{ tableTitle }}</div>
       <div class="title_line"></div>
 
-			<div class="second-select" v-if="type_id == 'special_popu'">
+      <div v-if="type_id == 'special_popu'" class="second-select">
         <el-select v-model="subclassId" :popper-append-to-body="false" placeholder="请选择">
-					<el-option v-for="item in subclassList" :key="item.value" :label="item.label" :value="item.value" @click.native="handleChangeDate(item.value)"></el-option>
+          <el-option v-for="item in subclassList" :key="item.value" :label="item.label" :value="item.value"
+                     @click.native="handleChangeDate(item.value)"></el-option>
         </el-select>
       </div>
     </div>
@@ -18,17 +19,18 @@
     <div class="g-listbox">
       <cpt-tb
           :col-list="colList"
-				:loading="loading"
           :header="header"
           :list="list"
+          :loading="loading"
           :total="total"
-				@handleSizeChange="handleSizeChange"
           @handlePageNoChange="handlePageNoChange"
+          @handleSizeChange="handleSizeChange"
           @operate="showInfo"
       ></cpt-tb>
     </div>
 
-		<resi-details @close="displayedResiId = ''" :resi-id="displayedResiId" :popupShow="popupShow" v-if="displayedResiId" />
+    <resi-details v-if="displayedResiId" :popupShow="popupShow" :resi-id="displayedResiId"
+                  @close="displayedResiId = ''"/>
   </div>
 </template>
 
@@ -36,8 +38,9 @@
 import cptTb from '@/views/dataBoard/cpts/tb';
 import cptBread from '@/views/dataBoard/renfang/cpts/bread';
 import resiDetails from '@/views/dataBoard/cpts/resi-details';
-import { requestPostBi } from '@/js/dai/request-bipass';
+// import { requestPostBi } from '@/js/dai/request-bipass';
 import getQueryPara from 'dai-js/modules/getQueryPara';
+import {requestPost} from "@/js/dai/request";
 
 export default {
   name: 'resi-list',
@@ -124,7 +127,7 @@ export default {
       subclassList: [],
       subclassId: '',
 
-			popupShow:false
+      popupShow: false
     };
   },
 
@@ -138,7 +141,7 @@ export default {
     this.tableTitle = type_name + '居民列表';
     this.pageNo = 1;
     this.getList();
-		this.getCount();
+    // this.getCount();
     if (this.type_id == 'special_popu') {
       this.getSubclass();
     }
@@ -160,17 +163,18 @@ export default {
   },
 
   methods: {
-		handleClickBreadItem({ item }) {
+    handleClickBreadItem({item}) {
       if (item.type == 'back') {
         this.$router.back();
       }
     },
 
-		handleSearch() {},
+    handleSearch() {
+    },
 
     showInfo(index) {
       let item = this.srcTableData[index];
-			this.displayedResiId = item.user_id;
+      this.displayedResiId = item.resiId;
       this.popupShow = true;
     },
 
@@ -187,12 +191,12 @@ export default {
 
     async getSubclass() {
       console.log('=================getSubclass');
-			const { org_id, type_id } = this;
+      const {org_id, type_id} = this;
       this.loading = true;
 
       const url = 'special_type_list';
 
-			const { data, code, msg } = await requestPostBi(
+      const {data, code, msg} = await requestPostBi(
           url,
           {
             queryParam: {
@@ -220,11 +224,16 @@ export default {
     },
 
     async getList() {
-			const { org_id, type_id, subclassId, pageNo, pageSize } = this;
+      const {org_id, type_id, subclassId, pageNo, pageSize} = this;
       this.loading = true;
-			let url = '';
+      let url = '/actual/base/residentBaseInfo/page';
-			let queryParam = {};
+      let queryParam = {
-			if (this.pageType == 'normal') {
+        org_id,
+        categoryKey: subclassId || type_id,
+        pageNo,
+        pageSize
+      };
+      /*	if (this.pageType == 'normal') {
           url = 'resident_class_list';
           queryParam = {
             org_id,
@@ -240,61 +249,38 @@ export default {
             page_num: pageNo,
             page_size: pageSize
           };
-			}
+        }*/
 
-			const { data, code, msg } = await requestPostBi(
+      const {data, code, msg} = await requestPost(
           url,
-				{
           queryParam
-				},
-				{
-					// mockId: 60069169,
-				}
       );
 
       this.loading = false;
 
       if (code === 0) {
-				this.srcTableData = data;
+        this.srcTableData = data.list;
-				// this.total = data.total;
+        this.total = data.total;
-				if (this.pageType == 'normal') {
+        this.list = data.list.map((item, index) => {
-					this.list = data.map((item, index) => {
-						return [
-							index + 1,
-							item.user_name ? item.user_name : '--',
-							item.grid ? item.grid : '--',
-							item.house ? item.house : '--',
-							item.telephone ? item.telephone : '--',
-							item.idcard ? item.idcard : '--',
-							item.gender ? item.gender : '--',
-							item.birthday ? item.birthday : '--',
-
-							{ type: 'operate', list: ['查看'] }
-						];
-					});
-				} else {
-					this.list = data.map((item, index) => {
           return [
             index + 1,
             item.name ? item.name : '--',
-							item.grid ? item.grid : '--',
+            item.gridName ? item.gridName : '--',
-							item.room ? item.room : '--',
+            item.homeName ? item.homeName : '--',
-							item.telephone ? item.telephone : '--',
+            item.mobile ? item.mobile : '--',
-							item.idcard ? item.idcard : '--',
+            item.idNum ? item.idNum : '--',
-							item.gender ? item.gender : '--',
+            item.gender == 1 ? '男' : item.gender == '2' ? '女' : '--',
             item.birthday ? item.birthday : '--',
-
+            {type: 'operate', list: ['查看']}
-							{ type: 'operate', list: ['查看'] }
           ];
         });
-				}
       } else {
         this.$message.error(msg);
       }
     },
 
     async getCount() {
-			const { org_id, type_id, subclassId, pageNo, pageSize } = this;
+      const {org_id, type_id, subclassId, pageNo, pageSize} = this;
 
       let url = '';
       let queryParam = {};
@@ -317,7 +303,7 @@ export default {
         };
       }
 
-			const { data, code, msg } = await requestPostBi(
+      const {data, code, msg} = await requestPostBi(
           url,
           {
             queryParam
@@ -341,4 +327,4 @@ export default {
 };
 </script>
 
-<style lang="scss" src="@/assets/scss/dataBoard/listBox.scss" scoped></style>
+<style lang="scss" scoped src="@/assets/scss/dataBoard/listBox.scss"></style>