From 8b009c34d53e4ae37959a4e407cc698e108b62c2 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 20 Mar 2024 13:23:03 +0800 Subject: [PATCH] bug --- fuintAdmin/src/api/duty/duty.js | 35 ++ fuintAdmin/src/api/system/menu.js | 5 +- fuintAdmin/src/views/duty/index.vue | 361 +++++++++++++++++ fuintAdmin/src/views/staff/list.vue | 27 +- .../views/staffCommission/staffCommission.vue | 31 +- fuintAdmin/src/views/system/menu/index.vue | 7 + fuintAdmin_zt/src/api/duty/duty.js | 35 ++ fuintAdmin_zt/src/api/system/menu.js | 5 +- fuintAdmin_zt/src/views/Site/index.vue | 375 +++++++++++++++++- .../src/views/components/Service/staff.vue | 31 +- fuintAdmin_zt/src/views/system/menu/index.vue | 7 + .../impl/MerchantConfigServiceImpl.java | 12 +- .../impl/StaffCommissionServiceImpl.java | 2 +- .../member/controller/LjDutyController.java | 33 +- .../fuint/business/member/entity/LJStaff.java | 5 + .../business/member/mapper/LJDutyMapper.java | 9 + .../member/mapper/xml/LJDutyMapper.xml | 22 + .../member/mapper/xml/LJStaffMapper.xml | 13 +- .../member/service/ILJDutyService.java | 23 ++ .../service/impl/LJDutyServiceImpl.java | 52 +++ .../service/impl/AccountServiceImpl.java | 60 +-- .../service/impl/SourceServiceImpl.java | 7 +- .../controller/BackendLoginController.java | 23 +- .../controller/BackendSourceController.java | 7 +- .../system/dept/service/ISysDeptService.java | 7 + .../dept/service/impl/SysDeptServiceImpl.java | 14 +- .../controller/BackendDutyController.java | 20 +- .../com/fuint/system/role/entity/TDuty.java | 7 +- .../system/role/mapper/xml/TDutyMapper.xml | 2 +- .../role/service/impl/DutyServiceImpl.java | 22 +- .../fuint/repository/model/TDutySource.java | 4 - 31 files changed, 1150 insertions(+), 113 deletions(-) create mode 100644 fuintAdmin/src/api/duty/duty.js create mode 100644 fuintAdmin/src/views/duty/index.vue create mode 100644 fuintAdmin_zt/src/api/duty/duty.js create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJDutyMapper.xml diff --git a/fuintAdmin/src/api/duty/duty.js b/fuintAdmin/src/api/duty/duty.js new file mode 100644 index 000000000..a3ddc78e6 --- /dev/null +++ b/fuintAdmin/src/api/duty/duty.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 分页查询角色信息 +export function dutyList(query) { + return request({ + url: '/business/member/duty', + method: 'get', + params: query + }) +} +// 分页查询角色信息 +export function dutyLists(query) { + return request({ + url: '/business/member/duty/dutys', + method: 'get', + params: query + }) +} + +// 根据id删除角色信息 +export function dutyDelete(id) { + return request({ + url: '/business/member/duty/'+id, + method: 'delete', + }) +} + +// 根据id删除角色信息 +export function dutyEdit(data) { + return request({ + url: '/business/member/duty', + method: 'put', + data: data + }) +} diff --git a/fuintAdmin/src/api/system/menu.js b/fuintAdmin/src/api/system/menu.js index 0c5dd3384..343d6ba8d 100644 --- a/fuintAdmin/src/api/system/menu.js +++ b/fuintAdmin/src/api/system/menu.js @@ -18,10 +18,11 @@ export function getMenu(menuId) { } // 查询菜单下拉树结构 -export function treeselect() { +export function treeselect(params) { return request({ url: 'backendApi/source/treeselect', - method: 'get' + method: 'get', + params: params }) } diff --git a/fuintAdmin/src/views/duty/index.vue b/fuintAdmin/src/views/duty/index.vue new file mode 100644 index 000000000..95934656b --- /dev/null +++ b/fuintAdmin/src/views/duty/index.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue index 369e7a882..81abf9f1d 100644 --- a/fuintAdmin/src/views/staff/list.vue +++ b/fuintAdmin/src/views/staff/list.vue @@ -60,11 +60,9 @@ - + @@ -156,11 +154,6 @@ :label="item.dutyName" :value="item.dutyId+''" > - @@ -333,6 +326,7 @@ import {addStaff, createStaffQrCode, delStaff, getStaff, listStaff, queryStaff, import {getDuty, listDuty} from "@/api/staff/duty"; import html2canvas from "html2canvas"; import {getDicts} from "@/api/order/data"; +import {dutyList, dutyLists} from "@/api/duty/duty"; export default { name: "StaffList", @@ -488,7 +482,7 @@ export default { }, created() { this.getList(); - this.getDuty(); + // this.getDuty(); // this.getStoreList(); }, methods: { @@ -649,9 +643,21 @@ export default { async handleAdd() { this.reset(); await this.getAuditPrem() + this.getRoleList1() this.open = true; this.title = "新增员工"; }, + // 获取角色信息 + getRoleList1() { + let data = { + page:1, + pageSize:10000, + dutyType:3 + } + dutyList(data).then(res => { + this.roleList = res.data.records + }) + }, // 表单重置 reset() { this.posPrem = ''; @@ -757,6 +763,7 @@ export default { if (this.appletPrem != null && this.appletPrem != ""){ this.appletPrem = JSON.parse(this.form.appletPrem); } + this.getRoleList1(); }); }, // 删除按钮操作 diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue index 41ddac50c..24155ec0e 100644 --- a/fuintAdmin/src/views/staffCommission/staffCommission.vue +++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue @@ -239,15 +239,12 @@ multiple placeholder="请选择所属角色" @change="getCheckbox"> - - - - - - - - - + @@ -430,6 +427,7 @@ import { } from "@/api/staffCommission/staffcommission"; import {listDuty} from "@/api/staff/duty"; import {queryStaffs} from "@/api/order/staff"; +import {dutyList} from "@/api/duty/duty"; export default { dicts: ['source','role','zhzt','comissionType'], @@ -521,9 +519,20 @@ export default { created() { this.getList(); this.getStaffList(); - this.getDuty(); + // this.getDuty(); }, methods:{ + // 获取角色信息 + getRoleList1() { + let data = { + page:1, + pageSize:10000, + dutyType:3 + } + dutyList(data).then(res => { + this.roleList = res.data.records + }) + }, getStaffCommissionList(){ this.loading = true this.dateRange = [] @@ -657,6 +666,7 @@ export default { handleAdd() { this.reset(); this.open = true; + this.getRoleList1() this.title = "新增提成方案"; }, // 修改按钮操作 @@ -673,6 +683,7 @@ export default { if (response.data.staffRoleGroup){ this.staffRoleGroup = response.data.staffRoleGroup.split(","); } + this.getRoleList1() }); }, diff --git a/fuintAdmin/src/views/system/menu/index.vue b/fuintAdmin/src/views/system/menu/index.vue index abbe9fa15..e14660a68 100644 --- a/fuintAdmin/src/views/system/menu/index.vue +++ b/fuintAdmin/src/views/system/menu/index.vue @@ -98,6 +98,13 @@ 按钮 + + + 暂未设置 + 油站端菜单 + 中台端菜单 + + diff --git a/fuintAdmin_zt/src/api/duty/duty.js b/fuintAdmin_zt/src/api/duty/duty.js new file mode 100644 index 000000000..a3ddc78e6 --- /dev/null +++ b/fuintAdmin_zt/src/api/duty/duty.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 分页查询角色信息 +export function dutyList(query) { + return request({ + url: '/business/member/duty', + method: 'get', + params: query + }) +} +// 分页查询角色信息 +export function dutyLists(query) { + return request({ + url: '/business/member/duty/dutys', + method: 'get', + params: query + }) +} + +// 根据id删除角色信息 +export function dutyDelete(id) { + return request({ + url: '/business/member/duty/'+id, + method: 'delete', + }) +} + +// 根据id删除角色信息 +export function dutyEdit(data) { + return request({ + url: '/business/member/duty', + method: 'put', + data: data + }) +} diff --git a/fuintAdmin_zt/src/api/system/menu.js b/fuintAdmin_zt/src/api/system/menu.js index 0c5dd3384..343d6ba8d 100644 --- a/fuintAdmin_zt/src/api/system/menu.js +++ b/fuintAdmin_zt/src/api/system/menu.js @@ -18,10 +18,11 @@ export function getMenu(menuId) { } // 查询菜单下拉树结构 -export function treeselect() { +export function treeselect(params) { return request({ url: 'backendApi/source/treeselect', - method: 'get' + method: 'get', + params: params }) } diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index 82b52ca0f..a66f42d78 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -158,7 +158,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -449,6 +449,102 @@ + + + + + + + + + + + + + 查询 + + + + + + 新增 + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -512,7 +608,7 @@ - + +
请先为当前机构添加角色信息
 @@ -533,6 +630,57 @@ + + + + + + + + + + + + + + + + + + 启用 + 禁用 + + + + 展开/折叠 + 全选/全不选 + 父子联动 + + + + + + +
+ 确 定 + 取 消 +
+ + { + if (valid) { + if (this.form1.dutyId) { + this.form1.menuIds = this.getMenuAllCheckedKeys(); + updateRole(this.form1).then(response => { + this.$modal.msgSuccess("修改成功"); + this.openDuty = false; + this.getDutyList(); + }); + } else { + this.form1.storeId = this.queryParams1.storeId + this.form1.menuIds = this.getMenuAllCheckedKeys(); + addRole(this.form1).then(response => { + this.$modal.msgSuccess("新增成功"); + this.openDuty = false; + this.getDutyList(); + }); + } + } + }); + }, + // 所有菜单节点数据 + getMenuAllCheckedKeys() { + // 目前被选中的菜单节点 + let checkedKeys = this.$refs.menu.getCheckedKeys(); + // 半选中的菜单节点 + let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys(); + checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys); + return checkedKeys; + }, + // 树权限（展开/折叠） + handleCheckedTreeExpand(value, type) { + if (type == 'menu') { + let treeList = this.menuOptions; + for (let i = 0; i < treeList.length; i++) { + this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value; + } + } + }, + // 树权限（全选/全不选） + handleCheckedTreeNodeAll(value, type) { + console.log(this.menuOptions) + if (type == 'menu') { + this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []); + } + }, + // 树权限（父子联动） + handleCheckedTreeConnect(value, type) { + if (type == 'menu') { + this.form1.menuCheckStrictly = value ? true: false; + } + }, + handleAdd1(){ + this.reset1(); + this.getMenuTreeselect(2); + this.form1.storeId = this.Thetree[0].id + this.openDuty = true; + this.title = "添加角色"; + console.log(this.form1) + }, + // 查询菜单树结构 + getMenuTreeselect(merchantId) { + return menuTreeselect({merchantId:merchantId}).then(response => { + this.menuOptions = response.data; + return response + }); + }, + handleDelete1(row){ + const roleIds = row.dutyName; + this.$modal.confirm('是否确认删除角色名为"' + roleIds + '"的信息？').then(function() { + return dutyDelete(row.dutyId); + }).then(() => { + this.getDutyList(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => {}); + }, + handleUpdate1(data){ + this.reset1(); + let val = null; + if (data.dutyType == '3') val = 1; + if (data.dutyType == '4') val = 2; + const roleMenu = this.getMenuTreeselect(val); + const roleId = data.dutyId + getRole(roleId).then(response => { + this.form1.roleName = response.data.roleInfo.name; + this.form1.roleType = response.data.roleInfo.type; + this.form1.status = response.data.roleInfo.status; + this.form1.dutyId = response.data.roleInfo.id; + this.form1.description = response.data.roleInfo.description; + this.openDuty = true; + this.title = "修改角色"; + let checkedKeys = response.data.checkedKeys + + this.$nextTick(() => { + roleMenu.then(res => { + checkedKeys.forEach((v) => { + this.$nextTick(()=>{ + this.$refs.menu.setChecked(v, true ,false); + }) + }) + }); + }); + }); + }, + handleStatusChangeDuty(data){ + console.log(data) + dutyEdit(data).then(res => { + this.$message.success("修改成功") + this.getDutyList(); + }) + }, + // 搜索角色信息 + handleQuery1(){ + this.queryParams1.page = 1; + this.getDutyList(); + }, + getDutyList(){ + this.loading = true; + dutyList(this.queryParams1).then(res => { + this.dutyList = res.data.records; + this.total1 = res.data.total; + this.loading = false; + }) + }, // 更改计费规则 async changeTheBillingRule(event) { // 如果为修改时则进行提示 @@ -930,12 +1272,14 @@ export default { // 点击树之后 this.queryParams.deptId = data.id + this.queryParams1.storeId = data.id this.deptType = data.deptType // 新增节点 this.appedit(data.id,data.label) // 用户请求 // this.getList(); this.onlyGetUser() + this.getDutyList() }, // 清除信息 @@ -1036,7 +1380,13 @@ export default { // // this.$refs[formName].resetFields(); // }, handleClick(tab, event) { - + console.log(this.activeName) + if (this.activeName=="list"){ + this.onlyGetUser() + } + if (this.activeName=="duty"){ + this.getDutyList() + } }, //树形页操作 //新增树 @@ -1235,6 +1585,7 @@ export default { if(this.Thetree.length>0 && !this.queryParams.deptId) { this.queryParams.deptId = this.Thetree[0].id this.form.deptType = this.Thetree[0].deptType + this.queryParams1.storeId = this.Thetree[0].id console.log("this.Thetree",this.Thetree[0]) } @@ -1408,6 +1759,12 @@ export default { this.rolelist = res.data }) }, + // 获取角色信息 + getRoleList1(storeId) { + dutyLists({storeId:storeId}).then(res => { + this.rolelist = res.data + }) + }, /** 新增按钮操作 */ handleAdd() { @@ -1420,7 +1777,8 @@ export default { }else { permissionType = 'system' } - this.getRoleList(permissionType); + // this.getRoleList(permissionType); + this.getRoleList1(this.queryParams1.storeId); }, @@ -1452,7 +1810,8 @@ export default { }else { permissionType = 'system' } - this.getRoleList(permissionType); + // this.getRoleList(permissionType); + this.getRoleList1(row.deptId); }, diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue index 94cd76dd5..8f6d3043b 100644 --- a/fuintAdmin_zt/src/views/components/Service/staff.vue +++ b/fuintAdmin_zt/src/views/components/Service/staff.vue @@ -59,11 +59,9 @@ - + @@ -143,9 +141,12 @@ - - - + @@ -240,6 +241,7 @@