居民管理界面修改

src/views/modules/group/topic-list.vue

@@ -149,14 +149,22 @@ export default {
   },
   watch: {
     'ids': function (val) {
-      if (val.length === 1){
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
       }
-      if (val.length === 2){
+      if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = ''
       }
-      if (val.length === 3){
+      if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
         this.dataForm.gridId = this.ids[2]

src/views/modules/sys/deptmacode.vue

@@ -196,12 +196,20 @@ export default {
   },
   watch: {
     'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]

src/views/modules/user/fail-authentication.vue

@@ -4,7 +4,7 @@
               <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
                   <el-form-item label="所属机构">
                   <el-cascader
-                    v-model="dataForm.deptIdList"
+                    v-model="deptIdList"
                     :options="options"
                     :props="{ checkStrictly: true }"
                     clearable>
@@ -67,7 +67,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/user/query',
+        getDataListURL: 'app-user/user/page',
         getDataListIsPage: true,
         deleteURL: '/app-use/user',
         deleteIsBatch: true,
@@ -84,11 +84,9 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '2',
-        page: 1,
-        limit: 10,
-        deptIdList: []
+        state: '2'
       },
+      deptIdList: [],
       options: [],
       userDetailVisible: false,
       streetOptions: [],
@@ -112,6 +110,30 @@ export default {
       })
       .catch(() => {})
   },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
   methods: {
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@@ -171,10 +193,17 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
-      this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null
-      this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null
-      this.$http.post(
-        this.mixinViewModuleOptions.getDataListURL, this.dataForm
+      this.$http.get(
+        this.mixinViewModuleOptions.getDataListURL,
+        {
+          params: {
+            order: this.order,
+            orderField: this.orderField,
+            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+            ...this.dataForm
+          }
+        }
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {

src/views/modules/user/pass-authentication.vue

@@ -4,7 +4,7 @@
               <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
                 <el-form-item label="所属机构">
                   <el-cascader
-                    v-model="dataForm.deptIdList"
+                    v-model="deptIdList"
                     :options="options"
                     :props="{ checkStrictly: true }"
                     clearable>
@@ -76,7 +76,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/user/query',
+        getDataListURL: 'app-user/user/page',
         getDataListIsPage: true,
         deleteURL: '/app-use/user',
         deleteIsBatch: true,
@@ -93,11 +93,9 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '3',
-        page: 1,
-        limit: 10,
-        deptIdList: []
+        state: '3'
       },
+      deptIdList: [],
       options: [],
       userDetailVisible: false,
       userGridVisible: false,
@@ -122,6 +120,30 @@ export default {
       })
       .catch(() => {})
   },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
   methods: {
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@@ -181,10 +203,17 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
-      this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null
-      this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null
-      this.$http.post(
-        this.mixinViewModuleOptions.getDataListURL, this.dataForm
+      this.$http.get(
+        this.mixinViewModuleOptions.getDataListURL,
+        {
+          params: {
+            order: this.order,
+            orderField: this.orderField,
+            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+            ...this.dataForm
+          }
+        }
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {

src/views/modules/user/unauthorized.vue

@@ -4,7 +4,7 @@
               <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
                 <el-form-item label="所属机构">
                   <el-cascader
-                    v-model="dataForm.deptIdList"
+                    v-model="deptIdList"
                     :options="options"
                     :props="{ checkStrictly: true }"
                     clearable>
@@ -67,7 +67,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/user/query',
+        getDataListURL: 'app-user/user/page',
         getDataListIsPage: true,
         deleteURL: '/app-use/user',
         deleteIsBatch: true,
@@ -84,11 +84,9 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '0',
-        page: 1,
-        limit: 10,
-        deptIdList: []
+        state: '0'
       },
+      deptIdList: [],
       options: [],
       userDetailVisible: false,
       streetOptions: [],
@@ -112,6 +110,30 @@ export default {
       })
       .catch(() => {})
   },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
   methods: {
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@@ -171,11 +193,17 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
-      this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null
-      this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null
-      this.$http.post(
-        this.mixinViewModuleOptions.getDataListURL, this.dataForm
-      ).then(({ data: res }) => {
+      this.$http.get(
+        this.mixinViewModuleOptions.getDataListURL,
+        {
+          params: {
+            order: this.order,
+            orderField: this.orderField,
+            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+            ...this.dataForm
+          }
+        }).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {
           this.dataList = []

src/views/modules/user/user-add-or-update.vue

@@ -73,16 +73,22 @@
       <el-form-item label="扫码网格">
         <el-table :data="userGridList"
                   style="width: 100%">
-          <el-table-column prop="street"
+          <!-- <el-table-column prop="street"
                            label="街道"
-                           width="180">
+                           width="180"
+                           v-if="false">
           </el-table-column>
           <el-table-column prop="community"
                            label="社区"
-                           width="180">
+                           width="180"
+                           v-if="false">
           </el-table-column>
           <el-table-column prop="grid"
-                           label="网格">
+                           label="网格"
+                           v-if="false">
+          </el-table-column> -->
+          <el-table-column prop="allDeptNames"
+                           label="街道-社区-网格">
           </el-table-column>
         </el-table>
       </el-form-item>

src/views/modules/user/user-detail.vue

@@ -53,7 +53,7 @@
       <el-form-item label="扫码网格">
         <el-table :data="userGridList"
                   style="width: 100%">
-          <el-table-column prop="street"
+          <!-- <el-table-column prop="street"
                            label="街道">
           </el-table-column>
           <el-table-column prop="community"
@@ -61,6 +61,9 @@
           </el-table-column>
           <el-table-column prop="grid"
                            label="网格">
+          </el-table-column> -->
+          <el-table-column prop="allDeptNames"
+                           label="街道-社区-网格">
           </el-table-column>
           <el-table-column prop="leaderFlag"
                            label="是否为网格长"

src/views/modules/user/user-grid.vue

@@ -5,16 +5,17 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false">
     <el-table :data="userGridList" style="width: 100%">
-      <el-table-column prop="street" label="街道"> </el-table-column>
-      <el-table-column prop="community" label="社区"> </el-table-column>
-      <el-table-column prop="grid" label="网格"> </el-table-column>
+      <!-- <el-table-column prop="street" label="街道" v-if="false"> </el-table-column>
+      <el-table-column prop="community" label="社区" v-if="false"> </el-table-column>
+      <el-table-column prop="grid" label="网格" v-if="false"> </el-table-column>
       <el-table-column
         v-if="false"
         prop="leaderFlag"
         label="是否为网格长"
         :formatter="showLeaderFlagFormatter"
       >
-      </el-table-column>
+      </el-table-column> -->
+      <el-table-column prop="allDeptNames" label="街道-社区-网格"> </el-table-column>
       <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
         <template slot-scope="scope">
           <el-button  type="text" size="small" @click="unbindGridHandle(scope.row.id,scope.row.userId)">解除</el-button>

src/views/modules/user/wait-authentication.vue

@@ -4,7 +4,7 @@
               <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
                 <el-form-item label="所属机构">
                   <el-cascader
-                    v-model="dataForm.deptIdList"
+                    v-model="deptIdList"
                     :options="options"
                     :props="{ checkStrictly: true }"
                     clearable>
@@ -67,7 +67,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/user/query',
+        getDataListURL: 'app-user/user/page',
         getDataListIsPage: true,
         deleteURL: '/app-use/user',
         deleteIsBatch: true,
@@ -84,11 +84,9 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '1',
-        page: 1,
-        limit: 10,
-        deptIdList: []
+        state: '1'
       },
+      deptIdList: [],
       options: [],
       userDetailVisible: false,
       streetOptions: [],
@@ -112,6 +110,30 @@ export default {
       })
       .catch(() => {})
   },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
   methods: {
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@@ -171,10 +193,17 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
-      this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null
-      this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null
-      this.$http.post(
-        this.mixinViewModuleOptions.getDataListURL, this.dataForm
+      this.$http.get(
+        this.mixinViewModuleOptions.getDataListURL,
+        {
+          params: {
+            order: this.order,
+            orderField: this.orderField,
+            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+            ...this.dataForm
+          }
+        }
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {