From 6fe9a69971836323fd58ce359e703e9ee1512df3 Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Tue, 22 Jul 2025 17:29:12 +0800 Subject: [PATCH] merge success --- src/views/permissions/permission.vue | 136 ++++++++++++----------------------- 1 file changed, 47 insertions(+), 89 deletions(-) diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue index ca906aa..5edad62 100644 --- a/src/views/permissions/permission.vue +++ b/src/views/permissions/permission.vue @@ -8,7 +8,7 @@ import { InfoFilled, UserFilled } from '@element-plus/icons-vue' import _ from 'lodash' import request from '@/util/http' import API from '@/util/http' -import { } from 'vue'; +import { } from 'vue'; // 客户明细表格 什么表格？？？？？？？ const tableData = ref([]) const roleData = ref([]) @@ -288,85 +288,55 @@ const permissionAddInit = function () { } //新增用户 const permissionAdd = async function () { - try { - await new Promise((resolve, reject) => { - Ref.value.validate((valid) => { - if (valid) { - resolve(); // 验证通过，继续执行后续代码 + Ref.value.validate(async (valid) => { + console.log('addRole', addRole.value) + console.log('valid', valid) + if (valid) { + try { + addAdmin.value.adminFlag = 1 + addAdmin.value.status1 = 1 + if (addAdmin.value.postiton == '管理员') { + addAdmin.value.postiton == 1 + } + const params = { + "account": addAdmin.value.account,//OA号 + "adminName": addAdmin.value.name,//姓名 + "market": addAdmin.value.market,//地区 + "roleId": addAdmin.value.permission,//权限ID + "postiton": addAdmin.value.postiton,//职位 + "machineId": addAdmin.value.machineIds[0],//机器码 + "remark": addAdmin.value.remark//备注 + } + const result = await request({ + url: '/permission/addPermission', + data: params + }) + console.log(addAdmin.value) + + if (result.code == 200) { + ElMessage.success('添加成功') } else { - reject(new Error('请检查并完善表单信息')); // 验证失败，抛出错误 + ElMessage.error(result.msg) } - }); - }); - addAdmin.value.adminFlag = 1 - addAdmin.value.status1 = 1 - if (addAdmin.value.postiton == '管理员') { - addAdmin.value.postiton == 1 - } - const params = { - "account": addAdmin.value.account,//OA号 - "adminName": addAdmin.value.name,//姓名 - "market": addAdmin.value.market,//地区 - "roleId": addAdmin.value.permission,//权限ID - "postiton": addAdmin.value.postiton,//职位 - "machineId": addAdmin.value.machineIds[0],//机器码 - "remark": addAdmin.value.remark//备注 - } - const result = await request({ - url: '/permission/addPermission', - data: params - }) - console.log(addAdmin.value) - if (result.code == 200) { - ElMessage.success('添加成功') - } else { - ElMessage.error(result.msg) - } + addAdmin.value = {} + get() - addAdmin.value = {} - get() + closeUserAddVisible() + } catch (error) { + console.log('新增用户权限失败', error) - closeUserAddVisible() - } catch (error) { - console.log('新增用户权限失败', error) - - ElMessage.error('新增用户权限失败') - } -} -const addUserRules = { - account: [ - { required: true, message: '请输入OA号', trigger: 'blur' } - ], - name: [ - { required: true, message: '请输入用户名', trigger: 'blur' } - ], - market: [ - { required: true, message: '请选择所属地区', trigger: 'change' } - ], - permission: [ - { required: true, message: '请选择角色名称', trigger: 'change' } - ], - postiton: [ - { required: true, message: '请输入职位', trigger: 'blur' } - ], - machineIds: [ - { - required: true, - message: '请至少输入一个机器码', - trigger: 'change', - validator: (rule, value, callback) => { - // 检查是否有非空的机器码 - const hasValid = value.some(item => item.trim() !== ''); - if (!hasValid) { - callback(new Error('请至少输入一个机器码')); - } else { - callback(); - } + ElMessage.error('新增用户权限失败') + closeUserAddVisible() } + } else { + ElMessage({ + type: 'error', + message: '请检查输入内容' + }) } - ] -}; + }) +} // 表单验证ref const Ref = ref(null) // 使用 _.throttle 并设置 trailing 为 false 实现严格节流，只执行一次 @@ -778,22 +748,17 @@ const EdithandleMarketChange = (values) => { // 如果选择了总部，只保留总部 permissionEditObj.value.market = ['总部']; } -<<<<<<< HEAD - console.log('看看现在的地区', permissionEditObj.value.market); -======= console.log('看看现在的地区',permissionEditObj.value.market); }; -const handleCheckChange = (checkedNodes, { checkedKeys }) => { - addRole.value.checkedKeys = checkedKeys; -} +// const handleCheckChange = (checkedNodes, { checkedKeys }) => { +// addRole.value.checkedKeys = checkedKeys; +// } // 处理编辑角色权限时的勾选事件 const handleEditRolePermissionCheck = (checkedNodes, { checkedKeys }) => { permissionEditRoleObj.value.checkedKeys = checkedKeys; }; ->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期 -}; const handleCheckChange = async (checkedNodes, checkedInfo) => { const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo; @@ -921,12 +886,10 @@ const confirmResetPassword = async function () { } } -<<<<<<< HEAD // 取消重置密码 const cancelResetPassword = function () { resetConfirmVisible.value = false } -======= // 编辑角色对象 const permissionEditRoleObj = ref({ @@ -1014,7 +977,6 @@ onMounted(async function () { await getAdminData() }) ->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期 const Rolerules = reactive({ roleName: [ { required: true, message: '请输入角色名称', trigger: 'blur' }, @@ -1258,8 +1220,7 @@ onMounted(async function () { -<<<<<<< HEAD @@ -1436,7 +1396,6 @@ onMounted(async function () { -======= @@ -1481,7 +1440,6 @@ onMounted(async function () { ->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期