用户管理

src/components/UserManage/topBar.vue

@@ -148,6 +148,7 @@ export default Vue.extend({
       this.$nextTick(() => {
         if (this.type === addUser.superManager) {
         this.platformSave({
+          ...this.searchPageReqParams,
           page: 1,
         })
         this.query()

src/components/UserManage/userTable.vue

@@ -21,19 +21,19 @@
         {{ record.status | filterStatus }}
       </span>
       <!-- 二级分行管理员 -->
-      <span slot="secondaryManager" slot-scope="text,record"> <a @click="getSecondaryManageList(record.level, record.uuid, 1)">查看</a> </span>
+      <span slot="secondaryManager" slot-scope="text,record"> <a @click="getSecondaryManageList(record, 1)">查看</a> </span>
       <!-- 一级支行管理员 -->
-      <span slot="firstSubManager" slot-scope="text,record"> <a @click="getfirstSubManageList(record.level, record.uuid, 1)">查看</a> </span>
+      <span slot="firstSubManager" slot-scope="text,record"> <a @click="getfirstSubManageList(record, 1)">查看</a> </span>
       <!-- 一级支行客户经理(无) -->
-      <span slot="firstSubClientManager" slot-scope="text,record"> <a @click="getFirstSubClientManagerList(record.level, record.uuid)">查看</a> </span>
+      <span slot="firstSubClientManager" slot-scope="text,record"> <a @click="getFirstSubClientManagerList(record)">查看</a> </span>
       <!-- 一级支行客户 -->
-      <span slot="firstSubClient" slot-scope="text,record"> <a @click="getFirstSubClientList(record.uuid)">查看</a> </span>
+      <span slot="firstSubClient" slot-scope="text,record"> <a @click="getFirstSubClientList(record)">查看</a> </span>
       <!-- 二级支行管理员 -->
-      <span slot="secondarySubManager" slot-scope="text,record"> <a @click="getSecondarySubManagerList(record.level, record.uuid, 1)">查看</a> </span>
+      <span slot="secondarySubManager" slot-scope="text,record"> <a @click="getSecondarySubManagerList(record, 1)">查看</a> </span>
       <!-- 二级支行客户经理 -->
-      <span slot="secondarySubClientManager" slot-scope="text,record"> <a @click="getSecondarySubClientManageList(record.level, record.uuid)">查看</a> </span>
+      <span slot="secondarySubClientManager" slot-scope="text,record"> <a @click="getSecondarySubClientManageList(record)">查看</a> </span>
       <!-- 二级支行客户 -->
-      <span slot="secondarySubClient" slot-scope="text,record"> <a @click="getSecondarySubClientList(record.uuid)">查看</a> </span>
+      <span slot="secondarySubClient" slot-scope="text,record"> <a @click="getSecondarySubClientList(record)">查看</a> </span>
         <!-- 操作 -->
       <p slot="action" slot-scope="text,record" >
         <a @click="deploy(record)">调配</a>
@@ -152,6 +152,14 @@ export default Vue.extend({
       platformQuery: 'queryUser',
       platform: 'queryNext'
     }),
+    clearSearch() {
+      this.platformSave({
+        start: undefined,
+        end: undefined,
+        userName: '',
+        phone: ''
+      })
+    },
     getRouteQuery() {
       if (this.$route.query.rankVal) {
         const keys = JSON.parse(this.$route.query.rankVal as string)
@@ -278,65 +286,83 @@ export default Vue.extend({
       }
       this.show = false
     },
+    getScanVal(item: any, c?: number) {
+      const val = JSON.parse(this.$route.query.rankVal as string)
+      if (item.level === 1) {
+        val.push({ name: item.second_branch, value: item.sbid })
+      } else if (item.level === 2) {
+        val.push({ name: item.first_sub_branch, value: item.fsbid })
+      } else if (item.level === 3) {
+        val.push({ name: item.second_sub_branch, value: item.ssbid })
+      }
+      console.log(val)
+      return val
+    },
     // 二级分行管理员
-    getSecondaryManageList(key:string, uuid: string, count: number){
+    getSecondaryManageList(item: any, count: number){
       const role = count === 1 ? eNewRoleRelatedToBackEnd.Management : eNewRoleRelatedToBackEnd.ACM
       this.platformSave({
         page: 1
       })
-      this.$router.push({name:'secondary',query:{level: key, rankVal: this.$route.query.rankVal, uuid, role}})
+      const v= JSON.stringify(this.getScanVal(item))
+      this.$router.push({name:'secondary',query:{level: item.level + 1, rankVal: v, uuid: item.uuid, role}})
     },
     // 一级支行管理员
-    getfirstSubManageList(key:string, uuid: string, count: number){
+    getfirstSubManageList(item:any, count: number){
       const role = count === 1 ? eNewRoleRelatedToBackEnd.Management : eNewRoleRelatedToBackEnd.ACM
       this.platformSave({
         page: 1
       })
-      this.$router.push({name:'firstSub',query:{level: key, rankVal: this.$route.query.rankVal, uuid, role}})
+      const v= JSON.stringify(this.getScanVal(item))
+      this.$router.push({name:'firstSub',query:{level: item.level + 1, rankVal: v, uuid: item.uuid, role}})
     },
     // 一级支行客户经理
-    getFirstSubClientManagerList(key:string,uuid: string, count: number){
+    getFirstSubClientManagerList(item:any, count: number){
       const role = count === 1 ? eNewRoleRelatedToBackEnd.Management : eNewRoleRelatedToBackEnd.ACM
       this.platformSave({
         page: 1
       })
-      this.$router.push({name:'firstSubClientManager',query:{level: key, rankVal: this.$route.query.rankVal, uuid, role}})
+      const v= JSON.stringify(this.getScanVal(item))
+      this.$router.push({name:'firstSubClientManager',query:{level: item.level, rankVal: v, uuid: item.uuid, role}})
     },
     // 一级支行客户
-    getFirstSubClientList(uuid:string){
+    getFirstSubClientList(item:any){
       this.platformSave({
         page: 1
       })
-      this.$router.push({name:'firstSubClient',query:{uuid}})
+      this.$router.push({name:'firstSubClient',query:{uuid: item.uuid,  rankVal: this.$route.query.rankVal}})
     },
     // 二级支行管理员
-    getSecondarySubManagerList(key:string, uuid: string, count: number){
+    getSecondarySubManagerList(item:any, count: number){
       const role = count === 1 ? eNewRoleRelatedToBackEnd.Management : eNewRoleRelatedToBackEnd.ACM
       this.platformSave({
         page: 1
       })
-      this.$router.push({name:'secondarySub',query:{level: key, rankVal: this.$route.query.rankVal, uuid, role}})
+      const v= JSON.stringify(this.getScanVal(item))
+      this.$router.push({name:'secondarySub',query:{level: item.level + 1, rankVal: v, uuid: item.uuid, role}})
     },
     // 二级支行客户经理
-    getSecondarySubClientManageList(key:string, uuid:string, count: number){
+    getSecondarySubClientManageList(item: any, count: number){
       const role = count === 1 ? eNewRoleRelatedToBackEnd.Management : eNewRoleRelatedToBackEnd.ACM
       this.platformSave({
         page: 1
       })
-      this.$router.push({name:'secondarySubClientManager',query:{level: key, rankVal: this.$route.query.rankVal, uuid, role}})
+      const v= JSON.stringify(this.getScanVal(item))
+      this.$router.push({name:'secondarySubClientManager',query:{level: item.level, rankVal: v, uuid: item.uuid, role}})
     },
     // 二级支行客户
-    getSecondarySubClientList(uuid:string){
+    getSecondarySubClientList(item: any){
       this.platformSave({
         page: 1
       })
-      this.$router.push({name:'secondarySubClient',query:{uuid}})
+      this.$router.push({name:'secondarySubClient',query:{uuid: item.uuid, rankVal: this.$route.query.rankVal}})
     },
   },
   created() {
+    this.clearSearch()
     this.getRouteQuery()
     this.getLists()
-  }
+  },
 })
 </script>
 

src/const/columns/userColumns.ts

@@ -25,6 +25,7 @@ const columns:Array<column> =
     title: '所属网点',
     align:'center',
     dataIndex: 'location',
+    scopedSlots: { customRender: 'location' },
   },
   {
     title: '备注',

src/service/StaffService/index.ts

@@ -140,7 +140,7 @@ export default class StaffService {
     return baseAxios({
       url: '/staff/remark/user',
       method: 'put',
-      params: data
+      data
     })
   }
 
@@ -178,6 +178,20 @@ export default class StaffService {
     })
   }
 
+  getAcmList(data: {
+    end?: number,
+    phone?: string,
+    user_name?: string,
+    start?: number,
+    uuid: string
+  }) {
+    return baseAxios({
+      url: '/staff/query/acm/users',
+      method: 'get',
+      params: data
+    })
+  }
+
   deleteStaff(uuid: string) {
     return baseAxios({
       url: '/staff/' + uuid,

src/views/Root/User/client.vue

@@ -51,6 +51,9 @@
         bordered
         :pagination="pagination"
         @change="changePage">
+        <div slot="location">
+          {{ location }}
+        </div>
         <div slot="note" slot-scope="text"> 
           <a @click="check(text)">查看</a>
         </div>
@@ -106,10 +109,14 @@ export default Vue.extend({
         defaultPageSize: 10,
         total: 0
       },
-      uuid: ''
+      uuid: '',
+      location: ''
     }
   },
   created() {
+    const keys = JSON.parse(this.$route.query.rankVal as string)
+    this.location = keys[keys.length - 1].name
+    console.log(this.location)
     this.getList()
   },
   methods:{
@@ -144,8 +151,9 @@ export default Vue.extend({
     },
     query(){
       console.log(this.queryParam)
-      staff.queryStaff({
-        ...this.queryParam
+      staff.getAcmList({
+        ...this.queryParam,
+        uuid: this.$route.query.uuid as string
       }).then(res => {
         console.log(res)
         this.userList = res.data.item
@@ -165,6 +173,7 @@ export default Vue.extend({
     edit(text:any){
       this.note = text
       this.uuid = text.uuid
+      this.form.notes = text.remark
       this.show = true
     },
     onSubmit(){

src/views/Root/User/index.vue

@@ -24,6 +24,11 @@
         v-model="search"
         style="width: 20%; margin-right: 15px"
       /> -->
+      <a-select style="width: 120px" v-model="type" :disabled="true">
+        <a-select-option v-for="item in options1" :key="item.value" :value="item.value">
+          {{ item.label }}
+        </a-select-option>
+      </a-select>
       <a-select style="width: 120px" v-model="search">
         <a-select-option v-for="item in option" :key="item.value" :value="item.value">
           {{ item.label }}
@@ -48,6 +53,7 @@ import { message } from 'ant-design-vue'
 import StaffService from "@/service/StaffService";
 import { getUserMsg } from "@/utils/userMsg/userMsg"
 import { eLevel } from '@/types/level';
+import { bank } from '@/types/staff';
 import { fooList } from "@/views/Root/OutletManagement/components/HeaderSelect/const";
 import { PAGE_SIZE } from "@/const/config/page"
 import HeaderSelect from "@/views/Root/OutletManagement/components/HeaderSelect/index.vue";
@@ -75,8 +81,27 @@ export default Vue.extend({
   data(){
     return{
       search: eNewRoleRelatedToBackEnd.Management,
+      type: bank['一级分行'],
       value:[],
       fooList,
+      options1: [
+        {
+          label: '一级分行',
+          value: bank['一级分行']
+        },
+        {
+          label: '二级分行',
+          value: bank['二级分行']
+        },
+        {
+          label: '一级支行',
+          value: bank['一级支行']
+        },
+        {
+          label: '二级支行',
+          value: bank['二级支行']
+        }
+      ],
       option: [
         {
           label: eNewRoleRelatedToBackEnd.Management,
@@ -108,6 +133,12 @@ export default Vue.extend({
     },
     setFooList(v: any[]) {
       this.fooList = [...v];
+      for (let i = 0; i < v.length; i++) {
+        if (!v[i].value) {
+          this.type = i - 1 < 0 ? 0 : i - 1
+          break
+        }
+      }
     },
     async getBranchList(){
       const userLevel = getUserMsg()?.level
@@ -151,24 +182,24 @@ export default Vue.extend({
       if (this.search === eNewRoleRelatedToBackEnd.ACM && count >= 3) {
         switch (count) {
           case 3:
-            this.$router.push({path: '/backend/user/firstSubClientManager', query: { rankVal: JSON.stringify(arr), role: this.search }})
+            this.$router.push({path: '/backend/user/firstSubClientManager', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
             break
           case 4:
-            this.$router.push({path: '/backend/user/secondarySubClientManager', query: { rankVal: JSON.stringify(arr), role: this.search }})
+            this.$router.push({path: '/backend/user/secondarySubClientManager', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
         }
       } else {
           switch (count) {
           case 1:
-            this.$router.push({path: '/backend/user/firstLevel', query: { rankVal: JSON.stringify(arr), role: this.search }})
+            this.$router.push({path: '/backend/user/firstLevel', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
             break
           case 2:
-            this.$router.push({path: '/backend/user/secondary', query: { rankVal: JSON.stringify(arr), role: this.search }})
+            this.$router.push({path: '/backend/user/secondary', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
             break
           case 3:
-            this.$router.push({path: '/backend/user/firstSub', query: { rankVal: JSON.stringify(arr), role: this.search }})
+            this.$router.push({path: '/backend/user/firstSub', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
             break
           case 4:
-            this.$router.push({path: '/backend/user/secondarySub', query: { rankVal: JSON.stringify(arr), role: this.search }})
+            this.$router.push({path: '/backend/user/secondarySub', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
         }
       }
     },