Skip to content

F
fns_backend
Commit 2f9344ca authored by chenqikuai's avatar chenqikuai
Browse files
Options

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

parents 1638abf7 31a9b788
Show whitespace changes
Inline Side-by-side
Showing with 133 additions and 83 deletions
src/components/UserManage/userTable.vue
View file @ 2f9344ca
<template>
<div :columns="columns" :role="role" :dataSource="dataSource">
<div :columns="columns" :role="role">
<!-- 调配弹窗 -->
<deplot-modal ref="deployModal" :level="level"/>
<!-- 信息列表 -->
......@@ -11,23 +11,29 @@
:pagination="pagination"
@change="changeHandle"
>
<span slot="created_at" slot-scope="text,record">
{{ record.created_at | formatTime }}
</span>
<span slot="level" slot-scope="text,record">
{{ record.level | filterLevel }}
</span>
<span slot="status" slot-scope="text,record">
{{ record.status | filterStatus }}
</span>
<!-- 二级分行管理员 -->
<span slot="secondaryManager" slot-scope="text,record"> <a @click="getSecondaryManageList(record.key)">查看</a> </span>
<span slot="secondaryManager" slot-scope="text,record"> <a @click="getSecondaryManageList(record.level)">查看</a> </span>
<!-- 一级支行管理员 -->
<span slot="firstSubManager" slot-scope="text,record"> <a @click="getfirstSubManageList(record.key)">查看</a> </span>
<span slot="firstSubManager" slot-scope="text,record"> <a @click="getfirstSubManageList(record.level)">查看</a> </span>
<!-- 一级支行客户经理 -->
<span slot="firstSubClientManager" slot-scope="text,record"> <a @click="getFirstSubClientManagerList(record.key)">查看</a> </span>
<span slot="firstSubClientManager" slot-scope="text,record"> <a @click="getFirstSubClientManagerList(record.level)">查看</a> </span>
<!-- 一级支行客户 -->
<span slot="firstSubClient" slot-scope="text,record"> <a @click="getFirstSubClientList(record.key)">查看</a> </span>
<span slot="firstSubClient" slot-scope="text,record"> <a @click="getFirstSubClientList(record.level)">查看</a> </span>
<!-- 二级支行管理员 -->
<span slot="secondarySubManager" slot-scope="text,record"> <a @click="getSecondarySubManagerList(record.key)">查看</a> </span>
<span slot="secondarySubManager" slot-scope="text,record"> <a @click="getSecondarySubManagerList(record.level)">查看</a> </span>
<!-- 二级支行客户经理 -->
<span slot="secondarySubClientManager" slot-scope="text,record"> <a @click="getSecondarySubClientManageList(record.key)">查看</a> </span>
<span slot="secondarySubClientManager" slot-scope="text,record"> <a @click="getSecondarySubClientManageList(record.level)">查看</a> </span>
<!-- 二级支行客户 -->
<span slot="secondarySubClient" slot-scope="text,record"> <a @click="getSecondarySubClientList(record.key)">查看</a> </span>
<span slot="secondarySubClient" slot-scope="text,record"> <a @click="getSecondarySubClientList(record.level)">查看</a> </span>
<!-- 操作 -->
<p slot="action" slot-scope="text,record" >
<span v-if="record.state!='已禁用'">
......@@ -72,12 +78,21 @@ import { getColumns } from '@/const/columns/userManagerCol'
import { userModal } from './const'
import deplotModal from "@/components/UserManage/deployModal.vue"
import Filter from '@/filter/index'
import { mapActions, mapMutations, mapState } from 'vuex'
import Mixin from "@/views/Root/User/Mixin/index"
export default Vue.extend({
mixins: [Mixin],
components:{ deplotModal },
filters: {
filterStatus(val: number) {
return Filter.filterUserStatus(val)
},
formatTime(val: number) {
return Filter.formatDate(val)
},
filterLevel(val: number) {
return Filter.filterLevel(val)
}
},
props:{
......@@ -89,24 +104,14 @@ export default Vue.extend({
type: Number as PropType<eRole>,
default:0
},
dataSource:{
type: Array as PropType<staff[]>,
},
pagination: {
type: Object,
default: {
current: 1,
defaultPageSize: 10,
total: 0
}
}
},
data(){
return{
show:false,
title:'',
text:'',
type:userModal.enable
type:userModal.enable,
}
},
computed:{
......@@ -115,12 +120,31 @@ export default Vue.extend({
},
columns(){
return getColumns(this.role)
},
pagination() {
return {
current: this.$store.state.platformUserManagement.page,
defaultPageSize: this.$store.state.platformUserManagement.page_size,
total: this.$store.state.platformUserManagement.total
}
},
dataSource() {
return this.$store.state.platformUserManagement.list
}
},
methods:{
...mapMutations('platformUserManagement', {
platformSave: 'save',
}),
...mapActions('platformUserManagement', {
platformQuery: 'queryUser',
}),
changeHandle(e: any) {
// console.log(e)
this.$emit('pageChange', e.current)
this.platformSave({
page: e.current,
})
this.platformQuery()
},
deploy(record:staff){
(this.$refs.deployModal as any).showModal()
......@@ -163,34 +187,54 @@ export default Vue.extend({
},
// 二级分行管理员
getSecondaryManageList(key:string){
this.$router.push({name:'secondary',query:{key}})
this.platformSave({
page: 1
})
this.$router.push({name:'secondary',query:{level: key, rankVal: this.$route.query.rankVal}})
},
// 一级支行管理员
getfirstSubManageList(key:string){
this.$router.push({name:'firstSub',query:{key}})
console.log(key)
this.platformSave({
page: 1
})
this.$router.push({name:'firstSub',query:{level: key, rankVal: this.$route.query.rankVal}})
},
// 一级支行客户经理
getFirstSubClientManagerList(key:string){
this.$router.push({name:'firstSubClientManager',query:{key}})
this.platformSave({
page: 1
})
this.$router.push({name:'firstSubClientManager',query:{level: key, rankVal: this.$route.query.rankVal}})
},
// 一级支行客户
getFirstSubClientList(key:string){
this.$router.push({name:'firstSubClient',query:{key}})
this.platformSave({
page: 1
})
this.$router.push({name:'firstSubClient',query:{level: key, rankVal: this.$route.query.rankVal}})
},
// 二级支行管理员
getSecondarySubManagerList(key:string){
this.$router.push({name:'secondarySub',query:{key}})
this.platformSave({
page: 1
})
this.$router.push({name:'secondarySub',query:{level: key, rankVal: this.$route.query.rankVal}})
},
// 二级支行客户经理
getSecondarySubClientManageList(key:string){
this.$router.push({name:'secondarySubClientManager',query:{key}})
this.platformSave({
page: 1
})
this.$router.push({name:'secondarySubClientManager',query:{level: key, rankVal: this.$route.query.rankVal}})
},
// 二级支行客户
getSecondarySubClientList(key:string){
this.$router.push({name:'secondarySubClient',query:{key}})
this.platformSave({
page: 1
})
this.$router.push({name:'secondarySubClient',query:{level: key, rankVal: this.$route.query.rankVal}})
},
},
}
})
</script>
......
src/const/columns/userManagerCol.ts
View file @ 2f9344ca
......@@ -6,6 +6,7 @@ const columns:Array<column> =
title: '创建日期',
align:'center',
dataIndex: 'created_at',
scopedSlots: { customRender: 'created_at' },
role:[
eRole.superManager,
eRole.firstLevel_branch,
......@@ -76,6 +77,7 @@ const columns:Array<column> =
title: '所在机构层级',
align:'center',
dataIndex: 'level',
scopedSlots: { customRender: 'level' },
role:[
eRole.superManager,
eRole.firstLevel_branch,
......@@ -89,7 +91,7 @@ const columns:Array<column> =
{
title: '所属二级支行',
align:'center',
dataIndex: 'secondary_sub_branch',
dataIndex: 'second_sub_branch',
role:[
eRole.secondary_sub_branch,
eRole.secondary_sub_clientManager,
......@@ -98,7 +100,7 @@ const columns:Array<column> =
{
title: '所属一级支行',
align:'center',
dataIndex: 'firstLevel_sub_branch',
dataIndex: 'first_sub_branch',
role:[
eRole.firstLevel_sub_branch,
eRole.secondary_sub_branch,
......@@ -109,7 +111,7 @@ const columns:Array<column> =
{
title: '所属二级分行',
align:'center',
dataIndex: 'secondary_branch',
dataIndex: 'second_branch',
role:[
eRole.secondary_branch,
eRole.firstLevel_sub_branch,
......@@ -121,7 +123,7 @@ const columns:Array<column> =
{
title: '所属一级分行',
align:'center',
dataIndex: 'firstLevel_branch',
dataIndex: 'first_branch',
role:[
eRole.firstLevel_branch,
eRole.secondary_branch,
......
src/filter/index.ts
View file @ 2f9344ca
......@@ -96,6 +96,20 @@ export default {
return '已发布'
}
},
filterLevel(level: eLevel) {
switch(level) {
case eLevel.firstLevel_branch:
return '一级分行'
case eLevel.firstLevel_sub_branch:
return '一级支行'
case eLevel.secondary_branch:
return '二级分行'
case eLevel.secondary_sub_branch:
return '二级支行'
default:
return false
}
},
filterWorkDay(weekend_status: number){
const silly = '周一至周五'
if(weekend_status === 0){
......
src/service/StaffService/index.ts
View file @ 2f9344ca
......@@ -128,6 +128,7 @@ export default class StaffService {
return baseAxios({
url: '/staff/query',
method: 'get',
params: data
})
}
......
src/store/platformUserManagement/index.ts
View file @ 2f9344ca
......@@ -49,6 +49,7 @@ export default <Module<iPlatformModuleState, {}>>{
},
async queryUser({ state, commit }, payload) {
state.loading = true
console.log(state)
StaffService.getInstance().queryStaff({
end: state.end,
first_branch: state.firstBranch,
......@@ -60,7 +61,8 @@ export default <Module<iPlatformModuleState, {}>>{
second_branch: state.secondBranch,
second_sub_branch: state.secondSubBranch,
start: state.start,
user_name: state.userName
user_name: state.userName,
level: state.level
}).then(res => {
if (res.code === 200) {
commit('save', {
......
src/views/Root/User/Mixin/index.ts
View file @ 2f9344ca
import Vue, { PropType } from "vue"
import { staff } from '@/types/staff'
import StaffService from '@/service/StaffService/index'
import { eLevel } from "@/types/level"
import { mapActions, mapMutations, mapState } from 'vuex'
......@@ -9,12 +8,6 @@ const staff = new StaffService()
export default Vue.extend({
data() {
return {
// dataSource: [] as PropType<staff[]>,
// pagination: {
// current: 1,
// defaultPageSize: 10,
// total: 0
// }
}
},
methods: {
......@@ -24,34 +17,38 @@ export default Vue.extend({
...mapActions('platformUserManagement', {
platformQuery: 'queryUser',
}),
getLevel(s: string) {
switch(s) {
case '1':
return eLevel.firstLevel_branch
case '2':
return eLevel.secondary_branch
case '3':
return eLevel.firstLevel_sub_branch
default:
return eLevel.secondary_sub_branch
}
},
// getLevel(s: string) {
// switch(s) {
// case '1':
// return eLevel.firstLevel_branch
// case '2':
// return eLevel.secondary_branch
// case '3':
// return eLevel.firstLevel_sub_branch
// default:
// return eLevel.secondary_sub_branch
// }
// },
getLists(params: any) {
const level = this.$route.query.level as string
const _level = this.getLevel(level)
// const keys = JSON.parse(this.$route.query.rankVal as string)
// const level = keys.length + ''
// const _level = this.getLevel(level)
this.platformSave({
page: 1,
...params
})
this.platformQuery()
}
},
created() {
const keys = JSON.parse(this.$route.query.level as string)
const keys = JSON.parse(this.$route.query.rankVal as string)
const level = this.$route.query.level
const params = {
first_branch: +keys[0] || undefined,
first_sub_branch: +keys[1] || undefined,
second_branch: +keys[2] || undefined,
second_sub_branch: +keys[3] || undefined,
firstBranch: +keys[0] || undefined,
firstSubBranch: +keys[1] || undefined,
secondBranch: +keys[2] || undefined,
secondSubBranch: +keys[3] || undefined,
level
}
this.getLists(params)
}
......
src/views/Root/User/firstLevel.vue
View file @ 2f9344ca
......@@ -2,7 +2,7 @@
<div>
<p class=" text-2xl font-bold mb-5">浙江省分行信息</p>
<top-bar :level="level"/>
<user-table :level="level" :role="role" :dataSource="dataSource" :pagination="pagination" @pageChange="pageChange" />
<user-table :level="level" :role="role" />
</div>
</template>
<script lang="ts">
......@@ -13,11 +13,9 @@ import userTable from "@/components/UserManage/userTable.vue"
import { staff } from '@/types/staff'
import { eRole } from "@/types/role"
import { firstLevelManager } from "@/mock/index"
import mixin from './Mixin/index'
export default Vue.extend({
components:{TopBar,userTable},
mixins: [mixin],
data() {
return {
// dataSource: [] as PropType<staff[]>
......@@ -32,17 +30,6 @@ export default Vue.extend({
type: Number as PropType<eRole>,
default: eRole.firstLevel_branch
},
// dataSource:{
// type: Array as PropType<staff[]>,
// default(){
// return firstLevelManager
// }
// }
},
methods: {
pageChange(v: number) {
this.pagination.current = v
}
}
});
</script>
\ No newline at end of file
src/views/Root/User/index.vue
View file @ 2f9344ca
......@@ -111,20 +111,24 @@ export default Vue.extend({
}
// this.$router.push({name:'firstLevel'})
},
selectTables(arr: Array<string>) {
selectTables(arr: Array<string>|string) {
if (typeof arr === 'string') {
this.$router.push({path: '/backend/user/secondarySub', query: { rankVal: arr }})
} else {
const count = arr.length
switch (count) {
case 1:
this.$router.push({path: '/backend/user/firstLevel', query: { level: JSON.stringify(arr) }})
this.$router.push({path: '/backend/user/firstLevel', query: { rankVal: JSON.stringify(arr) }})
break
case 2:
this.$router.push({path: '/backend/user/secondary', query: { level: JSON.stringify(arr) }})
this.$router.push({path: '/backend/user/secondary', query: { rankVal: JSON.stringify(arr) }})
break
case 3:
this.$router.push({path: '/backend/user/firstSub', query: { level: JSON.stringify(arr) }})
this.$router.push({path: '/backend/user/firstSub', query: { rankVal: JSON.stringify(arr) }})
break
case 4:
this.$router.push({path: '/backend/user/secondarySub', query: { level: JSON.stringify(arr) }})
this.$router.push({path: '/backend/user/secondarySub', query: { rankVal: JSON.stringify(arr) }})
}
}
},
reset(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment