Merge branches 'dev' and 'dev' of gitlab.33.cn:CassiniatSaturn/fns_backend into dev

src/components/UserManage/userTable.vue

@@ -20,6 +20,7 @@
       <span slot="status" slot-scope="text,record">
         {{ record.status | filterStatus }}
       </span>
+      <!-- 管理员类型 level + 1 -->
       <!-- 二级分行管理员 -->
       <span slot="secondaryManager" slot-scope="text,record"> <a @click="getSecondaryManageList(record, 1)">查看</a> </span>
       <!-- 一级支行管理员 -->
@@ -201,10 +202,10 @@ export default Vue.extend({
     },
     deploy(record:iStaffQueryResItem){
       const rankVal = (JSON.parse(this.$route.query.rankVal as string)) as {name: string, value: number}[];
-
+      const role = this.$route.query.role === eNewRoleRelatedToBackEnd.ACM ? eTypeOfOperatedObject.clientManager : eTypeOfOperatedObject.manager
       this.$store.commit('UserManagement/save', {
         modalMode: eAddManagerModalMode.edit,
-        typeOfOperatedObject: eTypeOfOperatedObject.manager, //!!!!需要调整 表示管理员还是客户经理
+        typeOfOperatedObject: role, //!!!!需要调整 表示管理员还是客户经理
         searchLevel: this.level, 
         branchDetailMsg: { // 
           fb: rankVal[0].name,
@@ -305,7 +306,7 @@ export default Vue.extend({
         page: 1
       })
       const v= JSON.stringify(this.getScanVal(item))
-      this.$router.push({name:'secondary',query:{level: item.level + 1, rankVal: v, uuid: item.uuid, role}})
+      this.$router.push({name:'secondary',query:{level: item.level + count, rankVal: v, uuid: item.uuid, role}})
     },
     // 一级支行管理员
     getfirstSubManageList(item:any, count: number){
@@ -314,7 +315,7 @@ export default Vue.extend({
         page: 1
       })
       const v= JSON.stringify(this.getScanVal(item))
-      this.$router.push({name:'firstSub',query:{level: item.level + 1, rankVal: v, uuid: item.uuid, role}})
+      this.$router.push({name:'firstSub',query:{level: item.level + count, rankVal: v, uuid: item.uuid, role}})
     },
     // 一级支行客户经理
     getFirstSubClientManagerList(item:any, count: number){
@@ -330,7 +331,7 @@ export default Vue.extend({
       this.platformSave({
         page: 1
       })
-      this.$router.push({name:'firstSubClient',query:{uuid: item.uuid,  rankVal: this.$route.query.rankVal}})
+      this.$router.push({name:'firstSubClient',query:{uuid: item.uuid, rankVal: this.$route.query.rankVal}})
     },
     // 二级支行管理员
     getSecondarySubManagerList(item:any, count: number){
@@ -339,7 +340,7 @@ export default Vue.extend({
         page: 1
       })
       const v= JSON.stringify(this.getScanVal(item))
-      this.$router.push({name:'secondarySub',query:{level: item.level + 1, rankVal: v, uuid: item.uuid, role}})
+      this.$router.push({name:'secondarySub',query:{level: item.level + count, rankVal: v, uuid: item.uuid, role}})
     },
     // 二级支行客户经理
     getSecondarySubClientManageList(item: any, count: number){

src/service/index.ts

@@ -15,7 +15,7 @@ baseAxios.interceptors.response.use(
   (value: AxiosResponse<iRet>) => {
     const ret = value.data
     if (ret.code !== undefined && ret.code !== 200) {
-      if (ret.code === 504) {
+      if ([504, 503].includes(ret.code)) {
         window.localStorage.clear()
         router.push('/login')
         // deleteUserMsg();

src/views/Root/User/index.vue

@@ -58,7 +58,7 @@ import { fooList } from "@/views/Root/OutletManagement/components/HeaderSelect/c
 import { PAGE_SIZE } from "@/const/config/page"
 import HeaderSelect from "@/views/Root/OutletManagement/components/HeaderSelect/index.vue";
 import { eNewRoleRelatedToBackEnd } from "@/types/role"
-import { mapActions, mapMutations, mapState } from 'vuex'
+import { mapMutations } from 'vuex'
 Vue.use(Cascader)
 Vue.prototype.$message = message
 
@@ -137,6 +137,8 @@ export default Vue.extend({
         if (!v[i].value) {
           this.type = i - 1 < 0 ? 0 : i - 1
           break
+        } else if (i === v.length - 1 && v[i].value) {
+          this.type = i
         }
       }
     },
@@ -172,34 +174,38 @@ export default Vue.extend({
       if( levelList.length==0 && this.search.length == 0 ){
           this.$message.info({content:"请通过选择或者输入详细地址搜索",icon:()=>{return this.$createElement('Icon',{style:{color:'#3E4FAF'},props:{type:'exclamation-circle'}})}})
       }else{
-        const search = levelList
-        this.selectTables(search)
+        this.selectTables(levelList)
       }
-      // this.$router.push({name:'firstLevel'})
     },
     selectTables(arr: Array<{value: number, name: string}>) {
       const count = arr.length
+      const query = {
+        rankVal: JSON.stringify(arr),
+        role: this.search,
+        level: this.type + 1 + '',
+        // ... permission
+      }
       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, level: this.type + 1 + '' }})
+            this.$router.push({path: '/backend/user/firstSubClientManager', query })
             break
           case 4:
-            this.$router.push({path: '/backend/user/secondarySubClientManager', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
+            this.$router.push({path: '/backend/user/secondarySubClientManager', query })
         }
       } else {
-          switch (count) {
+        switch (count) {
           case 1:
-            this.$router.push({path: '/backend/user/firstLevel', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
+            this.$router.push({path: '/backend/user/firstLevel', query })
             break
           case 2:
-            this.$router.push({path: '/backend/user/secondary', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
+            this.$router.push({path: '/backend/user/secondary', query })
             break
           case 3:
-            this.$router.push({path: '/backend/user/firstSub', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
+            this.$router.push({path: '/backend/user/firstSub', query })
             break
           case 4:
-            this.$router.push({path: '/backend/user/secondarySub', query: { rankVal: JSON.stringify(arr), role: this.search, level: this.type + 1 + '' }})
+            this.$router.push({path: '/backend/user/secondarySub', query })
         }
       }
     },