27152

project/sass/apps/AppResident/listTpl.vue

@@ -4,6 +4,8 @@
       <template #content>
         <ai-search-bar>
           <template #left>
+            <ai-area-get style="width: 180px;" placeholder="请选择地区" :instance="resident.instance" v-model="search.areaId"
+                         @select="onAreaChange"/>
             <ai-select placeholder="档案状态" v-model="search.fileStatus"
                        :selectList="resident.dict.getDict('fileStatus')"
                        @change="page.current=1,refreshTable()"/>
@@ -163,7 +165,6 @@ export default {
   name: "listTpl",
   inject: ['resident'],
   props: {
-    areaId: {default: ""},
     active: {default: ""},//人员类型
   },
   computed: {
@@ -176,14 +177,14 @@ export default {
       if (this.deleteIds.length) {
         params = {
           ...params,
-          areaId: this.areaId,
+          areaId: this.search.areaId,
           ids: this.deleteIds
         }
       } else {
         params = {
-          areaId: this.areaId,
+          areaId: this.search.areaId,
           ...params,
-          ...this.search
+          ...this.search.search
         }
       }
       return params
@@ -203,11 +204,7 @@ export default {
       ]
     }
   },
-  watch: {
-    areaId(v) {
-      v && this.refreshTable()
-    }
-  },
+
   data() {
     return {
       page: {current: 1, size: 10, total: 0},
@@ -221,6 +218,7 @@ export default {
         birthEnd: "",
         faithType: "",
         householdName: "",
+        areaId: '',
         con: "",
         maritalStatus: ""
       },
@@ -236,6 +234,15 @@ export default {
       this.multipleSelection = [];
       this.searchInit()
     },
+
+    onAreaChange (e) {
+      this.search.areaId = e
+      this.page.current = 1
+
+      this.$nextTick(() => {
+        this.refreshTable()
+      })
+    },
     searchInit() {
       let tempAreaId = this.search.areaId;
       this.search = {
@@ -305,7 +312,7 @@ export default {
     },
     refreshTable() {
       this.resident.instance.post(`/app/appresident/list`, null, {
-        params: {...this.search, ...this.page, areaId: this.areaId, residentType: this.active}
+        params: {...this.search, ...this.page, residentType: this.active}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data.records