Browse Source

Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期

zhangrenyuan/feature-20250714163943-金币前端二期
zry 2 weeks ago
parent
commit
97f3085ebe
  1. 55
      src/views/permissions/permission.vue

55
src/views/permissions/permission.vue

@ -288,11 +288,16 @@ const permissionAddInit = function () {
}
//
const permissionAdd = async function () {
Ref.value.validate(async (valid) => {
console.log('addRole', addRole.value)
console.log('valid', valid)
if (valid) {
try {
await new Promise((resolve, reject) => {
Ref.value.validate((valid) => {
if (valid) {
resolve(); //
} else {
reject(new Error('请检查并完善表单信息')); //
}
});
});
addAdmin.value.adminFlag = 1
addAdmin.value.status1 = 1
if (addAdmin.value.postiton == '管理员') {
@ -327,16 +332,41 @@ const permissionAdd = async function () {
console.log('新增用户权限失败', error)
ElMessage.error('新增用户权限失败')
closeUserAddVisible()
}
}
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 {
ElMessage({
type: 'error',
message: '请检查输入内容'
})
callback();
}
})
}
}
}
]
};
// ref
const Ref = ref(null)
// 使 _.throttle trailing false
@ -1228,7 +1258,8 @@ onMounted(async function () {
<template #footer>
<!-- 居中显示 -->
<el-form ref="Ref" :model="addAdmin" label-width="auto" style="max-width: 600px; align-items: center">
<el-form ref="Ref" :rules="addUserRules" :model="addAdmin" label-width="auto"
style="max-width: 600px; align-items: center">
<el-form-item prop="account" label="OA号:" required clearable>
<el-input v-model="addAdmin.account" placeholder="请输入OA号" style="width: 220px" />
</el-form-item>

Loading…
Cancel
Save