From dca0266032a740126ac90449f5bdae310d0961cf Mon Sep 17 00:00:00 2001 From: lihuilin Date: Wed, 16 Jul 2025 16:25:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/permissions/permission.vue | 265 ++++++++++++++++++++--------------- src/views/workspace/index.vue | 4 +- 3 files changed, 158 insertions(+), 113 deletions(-) diff --git a/.env.development b/.env.development index 1888bc9..6e3132b 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ # VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload -VITE_API_BASE='http://192.168.8.246:8081/' +VITE_API_BASE='http://192.168.9.21:8081/' diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue index 7434ffb..4338871 100644 --- a/src/views/permissions/permission.vue +++ b/src/views/permissions/permission.vue @@ -7,7 +7,7 @@ import moment from 'moment' import { UserFilled } from '@element-plus/icons-vue' import _ from 'lodash' import request from '@/util/http' - +import API from '@/util/http' // 客户明细表格 什么表格？？？？？？？ const tableData = ref([]) const total = ref(100) @@ -40,8 +40,8 @@ const permissionAddVisible = ref(false) const addAdmin = ref({ account: '', name: '', - market: '', - permission: [], + market: [], + permission: '', postiton: '', machineId: '', // 初始机器码输入框 machineIds: [], // 动态添加的机器码输入框 @@ -51,7 +51,8 @@ const addAdmin = ref({ const addRole = ref({ roleName: '', parentName: '', - permissionSelect: [] + checkedKeys: [], + grade: '' }) // 新增角色的权限列表 const permissionSelect = ref() @@ -69,36 +70,13 @@ const permissionEditObj = ref({}) const delObj = ref({}) // 各角色权限列表 const lists = [ - {name: '管理员', value: '1', permissions: ['2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20']}, - {name: '总部财务', value: '2', permissions: ['2','3','4','5','6','7','8','9']}, - {name: '总部客服', value: '3', permissions: ['2','3','4','5','6','7','8']}, - {name: '地区负责人', value: '4', permissions: ['2','3','4','5','6']}, - {name: '地区财务', value: '5', permissions: ['2','3','4','5']}, - {name: '客服专员', value: '6', permissions: ['2','3']} + { name: '管理员', value: '1', permissions: ['2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20'] }, + { name: '总部财务', value: '2', permissions: ['2', '3', '4', '5', '6', '7', '8', '9'] }, + { name: '总部客服', value: '3', permissions: ['2', '3', '4', '5', '6', '7', '8'] }, + { name: '地区负责人', value: '4', permissions: ['2', '3', '4', '5', '6'] }, + { name: '地区财务', value: '5', permissions: ['2', '3', '4', '5'] }, + { name: '客服专员', value: '6', permissions: ['2', '3'] } ] -const filteredData = ref([]) - -watch(() => addRole.value.parentName, (newValue) => { - const selectedRole = lists.find(role => role.value === newValue) - if (selectedRole) { - const allowedPermissions = selectedRole.permissions - filteredData.value = filterPermissions(data, allowedPermissions) - } else { - filteredData.value = data - } -}) - -const filterPermissions = (permissions, allowedPermissions) => { - return permissions.filter(permission => { - if (allowedPermissions.includes(permission.value)) { - if (permission.children) { - permission.children = filterPermissions(permission.children, allowedPermissions) - } - return true - } - return false - }) -} const get = async function (val) { try { @@ -164,6 +142,17 @@ const getStore = async function () { // 打开新增用户权限弹窗 const openUserAddVisible = function () { userAddVisible.value = true + addAdmin.value = { + account: '', + name: '', + market: '', + permission: '', + postiton: '', + machineId: '', + machineIds: [], + remark: '' + }; + } // 新增角色弹窗 const openPermissionAddVisible = function () { @@ -187,7 +176,6 @@ const closeUserAddVisible = function () { } const closePermissionAddVisible = function () { permissionAddVisible.value = false - addRole.value = {} Ref.value.resetFields(); } // 新增用户权限初始化 @@ -203,6 +191,7 @@ const permissionAddInit = function () { const permissionAdd = async function () { Ref.value.validate(async (valid) => { + console.log('addRole', addRole.value) console.log('valid', valid) if (valid) { try { @@ -350,6 +339,22 @@ const delConfirm = async function () { ElMessage.error('删除权限失败') } } +const handleAddRole = async function () { + try { + const res = await API({ + url: '/role/add', + data: { + "roleName": addRole.value.roleName, + "menuIds": addRole.value.checkedKeys, + "priority": addRole.value.grade, + "fatherId": addRole.value.parentName + } + }) + console.log('成功了，看看addRole', addRole.value) + } catch (error) { + console.log('请求失败', error) + } +} // 禁用启用用户权限 const editStatus = async function (row) { try { @@ -399,109 +404,143 @@ const data = [ { value: '3', label: '财务审核', - children:[ + children: [ { - value:'11', - label:'充值审核' + value: '11', + label: '充值审核' }, { - value:'13', - label:'退款审核' - },{ - value:'12',//14 - label:'审核操作' + value: '13', + label: '退款审核' + }, { + value: '12',//14 + label: '审核操作' } ] }, { value: '4', label: '汇率管理' - },{ + }, { value: '5', label: '充值管理', - children:[ + children: [ { - value:'17', - label:'新增充值' + value: '17', + label: '新增充值' }, { - value:'18', - label:'金币充值明细' + value: '18', + label: '金币充值明细' } ] - },{ + }, { value: '6', label: '消耗管理', - children:[ + children: [ { - value:'19', - label:'新增消耗' + value: '19', + label: '新增消耗' }, { - value:'20', - label:'金币消耗明细' + value: '20', + label: '金币消耗明细' } ] - },{ + }, { value: '7', label: '退款管理', - children:[ + children: [ { - value:'21', - label:'新增退款' + value: '21', + label: '新增退款' }, { - value:'22', - label:'金币退款明细' + value: '22', + label: '金币退款明细' } ] - },{ + }, { value: '8', label: '客户账户明细', - children:[ + children: [ { - value:'23', - label:'客户金币明细' + value: '23', + label: '客户金币明细' }, { - value:'24', - label:'客户金币余额' + value: '24', + label: '客户金币余额' } ] - },{ + }, { value: '9', label: '权限管理' - },{ + }, { value: '100', label: '地区数据', - children:[ - { - value:'101', - label:'总部' + children: [ + { + value: '101', + label: '总部' }, { - value:'102', - label:'香港' + value: '102', + label: '香港' }, { - value:'103', - label:'新加坡' + value: '103', + label: '新加坡' }, { - value:'104', - label:'马来西亚' + value: '104', + label: '马来西亚' }, { - value:'105', - label:'越南' + value: '105', + label: '越南' }, { - value:'106', - label:'韩国' + value: '106', + label: '韩国' } ] } ] +const filteredData = ref([...data]) + +watch(() => addRole.value.parentName, (newValue) => { + if (newValue) { + const selectedRole = lists.find(role => role.value === newValue) + if (selectedRole) { + const allowedPermissions = selectedRole.permissions + filteredData.value = filterPermissions(data, allowedPermissions) + } else { + filteredData.value = data + } + } else { + filteredData.value = data + } +}) + +const filterPermissions = (permissions, allowedPermissions) => { + return permissions.filter(permission => { + if (allowedPermissions.includes(permission.value)) { + if (permission.children) { + permission.children = filterPermissions(permission.children, allowedPermissions) + } + return true + } + return false + }) +} +const includeHq = computed(() => { + const i = addAdmin.value.market.includes('总部') + return (item) => i && item != '总部' +}) +const handleCheckChange = (checkedNodes, { checkedKeys }) => { + addRole.value.checkedKeys = checkedKeys; +};