zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:审批

Browse Source
This commit is contained in:
dzc committed 2025-01-12 20:49:49 +08:00
1 parent f5c3e0b0ea
commit cd86ae5521
18 files changed
+2025 -1658
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/admin/system/user/form.vue
+136 -121
View File
@@ -1,19 +1,25 @@
<template>
<div class="system-user-dialog-container">
<el-dialog :close-on-click-modal="false" :title="dataForm.userId ? $t('common.editBtn') : $t('common.addBtn')"
draggable v-model="visible">
<el-dialog
:close-on-click-modal="false"
:title="dataForm.userId ? $t('common.editBtn') : $t('common.addBtn')"
draggable
v-model="visible"
>
<el-form :model="dataForm" :rules="dataRules" label-width="90px" ref="dataFormRef" v-loading="loading">
<el-row :gutter="20">
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.username')" prop="username">
<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名"
v-model="dataForm.username"></el-input>
<el-input
:disabled="dataForm.userId !== ''"
placeholder="请输入用户名"
v-model="dataForm.username"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.password')" prop="password">
<el-input clearable placeholder="请输入密码" type="password"
v-model="dataForm.password"></el-input>
<el-input clearable placeholder="请输入密码" type="password" v-model="dataForm.password"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
@@ -29,24 +35,28 @@
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.role')" prop="role">
<el-select clearable multiple placeholder="请选择角色" v-model="dataForm.role">
<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId"
v-for="item in roleData" />
<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId" v-for="item in roleData" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.post')" prop="post">
<el-select clearable multiple placeholder="请选择岗位" v-model="dataForm.post">
<el-option :key="item.postId" :label="item.postName" :value="item.postId"
v-for="item in postData" />
<el-option :key="item.postId" :label="item.postName" :value="item.postId" v-for="item in postData" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.dept')" prop="deptId">
<el-tree-select :data="deptData"
:props="{ value: 'id', label: 'name', children: 'children' }" check-strictly
class="w100" clearable placeholder="请选择所属部门" v-model="dataForm.deptId">
<el-tree-select
:data="deptData"
:props="{ value: 'id', label: 'name', children: 'children' }"
check-strictly
class="w100"
clearable
placeholder="请选择所属部门"
v-model="dataForm.deptId"
>
</el-tree-select>
</el-form-item>
</el-col>
@@ -64,8 +74,9 @@
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.lockFlag')" prop="lockFlag">
<el-radio-group v-model="dataForm.lockFlag">
<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag">{{
item.label }} </el-radio>
<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag"
>{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -73,9 +84,10 @@
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">{{ $t('common.cancelButtonText') }}</el-button>
<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t('common.confirmButtonText')
}}</el-button>
<el-button @click="visible = false">{{ $t("common.cancelButtonText") }}</el-button>
<el-button @click="onSubmit" type="primary" :disabled="loading">{{
$t("common.confirmButtonText")
}}</el-button>
</span>
</template>
</el-dialog>
@@ -83,155 +95,158 @@
</template>
<script lang="ts" name="systemUserDialog" setup>
import { addObj, getObj, putObj, validatePhone, validateUsername } from '/@/api/admin/user';
import { list as roleList } from '/@/api/admin/role';
import { list as postList } from '/@/api/admin/post';
import { deptTree } from '/@/api/admin/dept';
import { useDict } from '/@/hooks/dict';
import { useI18n } from 'vue-i18n';
import { useMessage } from '/@/hooks/message';
import { rule } from '/@/utils/validate';
import { addObj, getObj, putObj, validatePhone, validateUsername } from "/@/api/admin/user"
import { list as roleList } from "/@/api/admin/role"
import { list as postList } from "/@/api/admin/post"
import { deptTree } from "/@/api/admin/dept"
import { useDict } from "/@/hooks/dict"
import { useI18n } from "vue-i18n"
import { useMessage } from "/@/hooks/message"
import { rule } from "/@/utils/validate"
const { t } = useI18n();
const { t } = useI18n()
// 定义刷新表格emit
const emit = defineEmits(['refresh']);
const emit = defineEmits(["refresh"])
// @ts-ignore
const { lock_flag } = useDict('lock_flag');
const { lock_flag } = useDict("lock_flag")
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false);
const deptData = ref<any[]>([]);
const roleData = ref<any[]>([]);
const postData = ref<any[]>([]);
const loading = ref(false);
const dataFormRef = ref()
const visible = ref(false)
const deptData = ref<any[]>([])
const roleData = ref<any[]>([])
const postData = ref<any[]>([])
const loading = ref(false)
const props = defineProps({
deptId: {
type: String,
default: '',
}
});
default: "",
},
})
const dataForm = reactive({
userId: '',
username: '',
password: '' as String | undefined,
salt: '',
wxOpenid: '',
qqOpenid: '',
lockFlag: '0',
phone: '' as String | undefined,
deptId: '',
userId: "",
username: "",
password: "" as String | undefined,
salt: "",
wxOpenid: "",
qqOpenid: "",
lockFlag: "0",
phone: "" as String | undefined,
deptId: "",
roleList: [],
postList: [],
nickname: '',
name: '',
email: '',
nickname: "",
name: "",
email: "",
post: [] as string[],
role: [] as string[],
});
})
const dataRules = ref({
// 用户名校验，不能为空 、长度 5-20、不能和已有数据重复
username: [
{ required: true, message: '用户名不能为空', trigger: 'blur' },
{ min: 5, max: 20, message: '用户名称长度必须介于 5 和 20 之间', trigger: 'blur' },
{ required: true, message: "用户名不能为空", trigger: "blur" },
{ min: 5, max: 20, message: "用户名称长度必须介于 5 和 20 之间", trigger: "blur" },
{
validator: (rule: any, value: any, callback: any) => {
validateUsername(rule, value, callback, dataForm.userId !== '');
validateUsername(rule, value, callback, dataForm.userId !== "")
},
trigger: 'blur',
trigger: "blur",
},
],
password: [
{ required: true, message: '密码不能为空', trigger: 'blur' },
{ required: true, message: "密码不能为空", trigger: "blur" },
{
min: 6,
max: 20,
message: '用户密码长度必须介于 5 和 20 之间',
trigger: 'blur',
message: "用户密码长度必须介于 5 和 20 之间",
trigger: "blur",
},
],
// 姓名校验，不能为空、只能是中文
name: [
{ validator: rule.overLength, trigger: 'blur' },
{ required: true, message: '姓名不能为空', trigger: 'blur' },
{ validator: rule.chinese, trigger: 'blur' },
{ validator: rule.overLength, trigger: "blur" },
{ required: true, message: "姓名不能为空", trigger: "blur" },
{ validator: rule.chinese, trigger: "blur" },
],
deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
role: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
post: [{ required: true, message: '岗位不能为空', trigger: 'blur' }],
deptId: [{ required: true, message: "部门不能为空", trigger: "blur" }],
role: [{ required: true, message: "角色不能为空", trigger: "blur" }],
// post: [{ required: true, message: '岗位不能为空', trigger: 'blur' }],
// 手机号校验，不能为空、新增的时不能重复校验
phone: [
{ required: true, message: '手机号不能为空', trigger: 'blur' },
{ validator: rule.validatePhone, trigger: 'blur' },
{ required: true, message: "手机号不能为空", trigger: "blur" },
{ validator: rule.validatePhone, trigger: "blur" },
{
validator: (rule: any, value: any, callback: any) => {
validatePhone(rule, value, callback, dataForm.userId !== '');
validatePhone(rule, value, callback, dataForm.userId !== "")
},
trigger: 'blur',
trigger: "blur",
},
],
email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }, { validator: rule.overLength, trigger: 'blur' }],
lockFlag: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
});
email: [
{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] },
{ validator: rule.overLength, trigger: "blur" },
],
lockFlag: [{ required: true, message: "状态不能为空", trigger: "blur" }],
})
// 打开弹窗
const openDialog = async (id: string) => {
visible.value = true;
dataForm.userId = '';
visible.value = true
dataForm.userId = ""
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
dataFormRef.value?.resetFields()
})
// 修改获取用户信息
if (id) {
dataForm.userId = id;
await getUserData(id);
dataForm.password = '******';
dataForm.userId = id
await getUserData(id)
dataForm.password = "******"
}
// 加载使用的数据
getDeptData();
getPostData();
getRoleData();
};
getDeptData()
getPostData()
getRoleData()
}
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
try {
const { userId, phone, password } = dataForm;
const { userId, phone, password } = dataForm
if (userId) {
// 清除占位符，避免提交错误的数据
if (phone?.includes('*')) dataForm.phone = undefined;
if (password?.includes('******')) dataForm.password = undefined;
if (phone?.includes("*")) dataForm.phone = undefined
if (password?.includes("******")) dataForm.password = undefined
loading.value = true;
await putObj(dataForm);
useMessage().success(t('common.editSuccessText'));
visible.value = false; // 关闭弹窗
emit('refresh');
loading.value = true
await putObj(dataForm)
useMessage().success(t("common.editSuccessText"))
visible.value = false // 关闭弹窗
emit("refresh")
} else {
loading.value = true;
await addObj(dataForm);
useMessage().success(t('common.addSuccessText'));
visible.value = false; // 关闭弹窗
emit('refresh');
loading.value = true
await addObj(dataForm)
useMessage().success(t("common.addSuccessText"))
visible.value = false // 关闭弹窗
emit("refresh")
}
} catch (error: any) {
useMessage().error(error.msg);
useMessage().error(error.msg)
} finally {
loading.value = false;
loading.value = false
}
};
}
/**
* 从服务器获取用户数据
@@ -242,57 +257,57 @@ const onSubmit = async () => {
*/
const getUserData = async (id: string) => {
try {
loading.value = true;
const { data } = await getObj(id);
Object.assign(dataForm, data);
loading.value = true
const { data } = await getObj(id)
Object.assign(dataForm, data)
if (data.roleList) {
dataForm.role = data.roleList.map((item) => item.roleId);
dataForm.role = data.roleList.map((item) => item.roleId)
}
if (data.postList) {
dataForm.post = data.postList.map((item) => item.postId);
dataForm.post = data.postList.map((item) => item.postId)
}
} catch (err: any) {
useMessage().error(err.msg);
useMessage().error(err.msg)
} finally {
loading.value = false;
loading.value = false
}
};
}
// 初始化部门数据
const getDeptData = () => {
// 获取部门数据
deptTree().then((res) => {
deptData.value = res.data;
deptData.value = res.data
// 默认选择在树中选中的部门
if (!dataForm.userId) {
dataForm.deptId = props.deptId;
dataForm.deptId = props.deptId
}
});
};
})
}
// 岗位数据
const getPostData = () => {
postList().then((res) => {
postData.value = res.data;
postData.value = res.data
// 默认选择第一个
if (!dataForm.userId) {
dataForm.post = [res.data[0].postId];
dataForm.post = [res.data[0].postId]
}
});
};
})
}
// 角色数据
const getRoleData = () => {
roleList().then((res) => {
roleData.value = res.data;
roleData.value = res.data
// 默认选择第一个
if (!dataForm.userId) {
dataForm.role = [res.data[0].roleId];
dataForm.role = [res.data[0].roleId]
}
});
};
})
}
// 暴露变量
defineExpose({
openDialog,
});
})
</script>