居民详情

src/views/modules/base/resi.vue

@@ -174,20 +174,18 @@
               {{ scope.row.gender == 1 ? "男" : "女" }}
             </div>
             <div v-else-if="item.columnName == 'birthday'">
-              {{ scope.row.birthday.substr(0, 10) }}
+              {{scope.row.birthday?scope.row.birthday.substr(0, 10):'' }}
             </div>
             <div v-else-if="item.columnName == 'idNum'">
-              {{
-                `${scope.row.idNum.substr(0, 11)}` +
+              {{ scope.row.idNum?`${scope.row.idNum.substr(0, 11)}` +
                 "******" +
-                `${scope.row.idNum.substr(16, 2)}`
-              }}
+                `${scope.row.idNum.substr(16, 2)}`:''}}
             </div>
             <div v-else-if="item.columnName == 'mobile'">
               {{
-                `${scope.row.mobile.substr(0, 3)}` +
+                scope.row.mobile?`${scope.row.mobile.substr(0, 3)}` +
                 "******" +
-                `${scope.row.mobile.substr(7, 4)}`
+                `${scope.row.mobile.substr(7, 4)}`:''
               }}
             </div>
             <div v-else-if="item.columnName == 'categoryInfo'">
@@ -566,7 +564,7 @@ export default {
         { columnName: "gridName", label: "所属网格" },
         { columnName: "homeName", label: "所属房屋" },
         { columnName: "idNum", label: "证件号", width: 200 },
-        { columnName: "categoryInfo", label: "居民类别", width: 200 },
+        { columnName: "categoryInfo", label: "居民分类", width: 200 },
         { columnName: "mobile", label: "联系电话", width: 150 },
       ],
       tabsList: [],
@@ -692,7 +690,6 @@ export default {
     },
     handleSearchFrom() {
       let obj = this.$refs.myResiSearch.form
-      console.log(obj,'1');
       if (typeof obj.categoryKey == 'object'&&obj.categoryKey .length != 0) {
         obj.categoryKey = obj.categoryKey.join(',')
       } else  {
@@ -832,12 +829,23 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
-      this.getTableData();
+      this.getTableData()
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
+      let obj = this.$refs.myResiSearch.form
+      if (typeof obj.categoryKey == 'object'&&obj.categoryKey .length != 0) {
+        obj.categoryKey = obj.categoryKey.join(',')
+      } else  {
+        obj.categoryKey = "";
+      }
+      if (typeof obj.agencyId == 'object'&&obj.agencyId .length != 0) {
+        obj.agencyId = obj.agencyId.join(',')
+      } else  {
+        obj.agencyId = "";
+      } 
       this.currentPage = val;
-      this.getTableData();
+      this.getTableData(obj);
     },
     handleFilterSpan(row, item) {
       let _val = "";