This commit is contained in:
YunaiV 2023-03-28 23:35:32 +08:00
commit c9e63c320e
8 changed files with 980 additions and 650 deletions

View File

@ -37,6 +37,6 @@ export const listUserRolesApi = async (userId: number) => {
}
// 赋予用户角色
export const aassignUserRoleApi = async (data: PermissionAssignUserRoleReqVO) => {
export const assignUserRoleApi = async (data: PermissionAssignUserRoleReqVO) => {
return await request.post({ url: '/system/permission/assign-user-role', data })
}

View File

@ -43,12 +43,12 @@ export const getUserApi = (id: number) => {
}
// 新增用户
export const createUserApi = (data: UserVO) => {
export const createUserApi = (data: UserVO | Recordable) => {
return request.post({ url: '/system/user/create', data })
}
// 修改用户
export const updateUserApi = (data: UserVO) => {
export const updateUserApi = (data: UserVO | Recordable) => {
return request.put({ url: '/system/user/update', data })
}

View File

@ -0,0 +1,223 @@
<template>
<!-- 添加或修改参数配置对话框 -->
<el-dialog
:title="title"
:modelValue="modelValue"
width="600px"
append-to-body
@close="closeDialog"
>
<el-form ref="formRef" :model="formData" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<el-tree-select
node-key="id"
v-model="formData.deptId"
:data="deptOptions"
:props="defaultProps"
check-strictly
placeholder="请选择归属部门"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="mobile">
<el-input v-model="formData.mobile" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="formData.email" placeholder="请输入邮箱" maxlength="50" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
<el-input v-model="formData.username" placeholder="请输入用户名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
<el-input
v-model="formData.password"
placeholder="请输入用户密码"
type="password"
show-password
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="formData.sex" placeholder="请选择">
<el-option
v-for="dict in sexDictDatas"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="formData.postIds" multiple placeholder="请选择">
<el-option
v-for="item in postOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { PostVO } from '@/api/system/post'
import { createUserApi, updateUserApi } from '@/api/system/user'
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
import { defaultProps } from '@/utils/tree'
import { ElForm, FormItemRule } from 'element-plus'
import { Arrayable } from 'element-plus/es/utils'
type Form = InstanceType<typeof ElForm>
interface Props {
deptOptions?: Tree[]
postOptions?: PostVO[] //
modelValue: boolean
formInitValue?: Recordable & Partial<typeof initParams>
}
const props = withDefaults(defineProps<Props>(), {
deptOptions: () => [],
postOptions: () => [],
modelValue: false,
formInitValue: () => ({})
})
const emits = defineEmits(['update:modelValue', 'success'])
const { t } = useI18n() //
const message = useMessage() //
//
const title = computed(() => {
return formData.value?.id ? '修改用户' : '添加用户'
})
//
const sexDictDatas = getDictOptions(DICT_TYPE.SYSTEM_USER_SEX)
//
const initParams = {
nickname: '',
deptId: '',
mobile: '',
email: '',
id: undefined,
username: '',
password: '',
sex: 1,
postIds: [],
remark: '',
status: '0',
roleIds: []
}
//
const rules = {
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
email: [
{
type: 'email',
message: "'请输入正确的邮箱地址",
trigger: ['blur', 'change']
}
],
mobile: [
{
pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
}
]
} as Partial<Record<string, Arrayable<FormItemRule>>>
const formRef = ref<Form | null>()
const formData = ref<Recordable>({ ...initParams })
watch(
() => props.formInitValue,
(val) => {
formData.value = { ...val }
},
{ deep: true }
)
const resetForm = () => {
let form = formRef?.value
if (!form) return
formData.value = { ...initParams }
form && (form as Form).resetFields()
}
const closeDialog = () => {
emits('update:modelValue', false)
}
//
const operateOk = () => {
emits('success', true)
closeDialog()
}
const submitForm = () => {
let form = formRef.value as Form
form.validate(async (valid) => {
let data = formData.value
if (valid) {
try {
if (data?.id !== undefined) {
await updateUserApi(data)
message.success(t('common.updateSuccess'))
operateOk()
} else {
await createUserApi(data)
message.success(t('common.createSuccess'))
operateOk()
}
} catch (err) {
console.error(err)
}
}
})
}
const cancel = () => {
closeDialog()
}
defineExpose({
resetForm
})
</script>

View File

@ -0,0 +1,153 @@
<template>
<el-dialog
:title="upload.title"
:modelValue="modelValue"
width="400px"
append-to-body
@close="closeDialog"
>
<el-upload
ref="uploadRef"
accept=".xlsx, .xls"
:limit="1"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:on-exceed="handleExceed"
:on-error="excelUploadError"
:auto-upload="false"
drag
>
<Icon icon="ep:upload" />
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<template #tip>
<div class="el-upload__tip text-center">
<div class="el-upload__tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
</div>
<span>仅允许导入xlsxlsx格式文件</span>
<el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div>
</template>
</el-upload>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFileForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { importUserTemplateApi } from '@/api/system/user'
import { getAccessToken, getTenantId } from '@/utils/auth'
import download from '@/utils/download'
interface Props {
modelValue: boolean
}
// const props =
withDefaults(defineProps<Props>(), {
modelValue: false
})
const emits = defineEmits(['update:modelValue', 'success'])
const message = useMessage() //
const uploadRef = ref()
//
const upload = reactive({
// //
// open: false,
//
title: '用户导入',
//
isUploading: false,
//
updateSupport: 0,
//
headers: {
Authorization: 'Bearer ' + getAccessToken(),
'tenant-id': getTenantId()
},
//
url: import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
})
//
const handleFileUploadProgress = () => {
upload.isUploading = true
}
//
const handleFileSuccess = (response: any) => {
if (response.code !== 0) {
message.error(response.msg)
return
}
upload.isUploading = false
uploadRef.value?.clearFiles()
//
const data = response.data
let text = '上传成功数量:' + data.createUsernames.length + ';'
for (let username of data.createUsernames) {
text += '< ' + username + ' >'
}
text += '更新成功数量:' + data.updateUsernames.length + ';'
for (const username of data.updateUsernames) {
text += '< ' + username + ' >'
}
text += '更新失败数量:' + Object.keys(data.failureUsernames).length + ';'
for (const username in data.failureUsernames) {
text += '< ' + username + ': ' + data.failureUsernames[username] + ' >'
}
message.alert(text)
emits('success')
closeDialog()
}
//
const handleExceed = (): void => {
message.error('最多只能上传一个文件!')
}
//
const excelUploadError = (): void => {
message.error('导入数据失败,请您重新上传!')
}
/** 下载模板操作 */
const importTemplate = async () => {
try {
const res = await importUserTemplateApi()
download.excel(res, '用户导入模版.xls')
} catch (error) {
console.error(error)
}
}
/* 弹框按钮操作 */
//
const cancel = () => {
closeDialog()
}
//
const closeDialog = () => {
emits('update:modelValue', false)
}
//
const submitFileForm = () => {
uploadRef.value?.submit()
}
</script>

View File

@ -0,0 +1,90 @@
<template>
<el-dialog title="分配角色" :modelValue="show" width="500px" append-to-body @close="closeDialog">
<el-form :model="formData" label-width="80px" ref="formRef">
<el-form-item label="用户名称">
<el-input v-model="formData.username" :disabled="true" />
</el-form-item>
<el-form-item label="用户昵称">
<el-input v-model="formData.nickname" :disabled="true" />
</el-form-item>
<el-form-item label="角色">
<el-select v-model="formData.roleIds" multiple placeholder="请选择">
<el-option
v-for="item in roleOptions"
:key="parseInt(item.id)"
:label="item.name"
:value="parseInt(item.id)"
/>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submit"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { assignUserRoleApi, PermissionAssignUserRoleReqVO } from '@/api/system/permission'
interface Props {
show: boolean
roleOptions: any[]
formInitValue?: Recordable & Partial<typeof initParams>
}
const props = withDefaults(defineProps<Props>(), {
show: false,
roleOptions: () => [],
formInitValue: () => ({})
})
const emits = defineEmits(['update:show', 'success'])
const { t } = useI18n() //
const message = useMessage() //
//
const initParams = {
nickname: '',
id: 0,
username: '',
roleIds: [] as number[]
}
const formData = ref<Recordable>({ ...initParams })
watch(
() => props.formInitValue,
(val) => {
formData.value = { ...val }
},
{ deep: true }
)
/* 弹框按钮操作 */
//
const cancel = () => {
closeDialog()
}
//
const closeDialog = () => {
emits('update:show', false)
}
//
const submit = async () => {
const data = ref<PermissionAssignUserRoleReqVO>({
userId: formData.value.id,
roleIds: formData.value.roleIds
})
try {
await assignUserRoleApi(data.value)
message.success(t('common.updateSuccess'))
emits('success', true)
closeDialog()
} catch (error) {
console.error(error)
}
}
</script>
<style></style>

View File

@ -1,307 +1,325 @@
<template>
<div class="flex">
<el-card class="w-1/5 user" :gutter="12" shadow="always">
<template #header>
<div class="card-header">
<span>部门列表</span>
<XTextButton title="修改部门" @click="handleDeptEdit()" />
</div>
<div class="app-container">
<content-wrap>
<!-- 搜索工作栏 -->
<el-row :gutter="20">
<!--部门数据-->
<el-col :span="4" :xs="24">
<div class="head-container">
<el-input
v-model="deptName"
placeholder="请输入部门名称"
clearable
style="margin-bottom: 20px"
>
<template #prefix>
<Icon icon="ep:search" />
</template>
<el-input v-model="filterText" placeholder="搜索部门" />
<el-scrollbar height="650">
</el-input>
</div>
<div class="head-container">
<el-tree
:data="deptOptions"
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="treeRef"
node-key="id"
default-expand-all
:data="deptOptions"
:props="defaultProps"
:highlight-current="true"
:filter-node-method="filterNode"
:expand-on-click-node="false"
highlight-current
@node-click="handleDeptNodeClick"
/>
</el-scrollbar>
</el-card>
<el-card class="w-4/5 user" style="margin-left: 10px" :gutter="12" shadow="hover">
<template #header>
<div class="card-header">
<span>{{ tableTitle }}</span>
</div>
</template>
<!-- 列表 -->
<XTable @register="registerTable">
<template #toolbar_buttons>
<!-- 操作新增 -->
<XButton
</el-col>
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-form
:model="queryParams"
ref="queryFormRef"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="用户名称" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="mobile">
<el-input
v-model="queryParams.mobile"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="用户状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in statusDictDatas"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
style="width: 240px"
value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery"
><Icon icon="ep:search" />搜索</el-button
>
<el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb-8px">
<el-col :span="1.5">
<el-button
type="primary"
preIcon="ep:zoom-in"
:title="t('action.add')"
plain
size="small"
@click="handleAdd"
v-hasPermi="['system:user:create']"
@click="handleCreate()"
/>
<!-- 操作导入用户 -->
<XButton
type="warning"
preIcon="ep:upload"
:title="t('action.import')"
><Icon icon="ep:plus" />新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
size="small"
@click="handleImport"
v-hasPermi="['system:user:import']"
@click="importDialogVisible = true"
/>
<!-- 操作导出用户 -->
<XButton
><Icon icon="ep:upload" />导入</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
preIcon="ep:download"
:title="t('action.export')"
size="small"
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['system:user:export']"
@click="exportList('用户数据.xls')"
><Icon icon="ep:download" />导出</el-button
>
</el-col>
</el-row>
<el-table v-loading="loading" :data="userList">
<el-table-column
label="用户编号"
align="center"
key="id"
prop="id"
v-if="columns[0].visible"
/>
</template>
<template #status_default="{ row }">
<el-table-column
label="用户名称"
align="center"
key="username"
prop="username"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="用户昵称"
align="center"
key="nickname"
prop="nickname"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="部门"
align="center"
key="deptName"
prop="dept.name"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="手机号码"
align="center"
key="mobile"
prop="mobile"
v-if="columns[4].visible"
width="120"
/>
<el-table-column label="状态" key="status" v-if="columns[5].visible" align="center">
<template #default="scope">
<el-switch
v-model="row.status"
v-model="scope.row.status"
:active-value="0"
:inactive-value="1"
@change="handleStatusChange(row)"
@change="handleStatusChange(scope.row)"
/>
</template>
<template #actionbtns_default="{ row }">
<!-- 操作编辑 -->
<XTextButton
preIcon="ep:edit"
:title="t('action.edit')"
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
v-if="columns[6].visible"
width="160"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template #default="scope">
<div class="flex justify-center items-center">
<el-button
type="primary"
link
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:update']"
@click="handleUpdate(row.id)"
/>
<!-- 操作详情 -->
<XTextButton
preIcon="ep:view"
:title="t('action.detail')"
v-hasPermi="['system:user:update']"
@click="handleDetail(row.id)"
/>
><Icon icon="ep:edit" />修改</el-button
>
<el-dropdown
class="p-0.5"
@command="(command) => handleCommand(command, scope.$index, scope.row)"
v-hasPermi="[
'system:user:delete',
'system:user:update-password',
'system:permission:assign-user-role',
'system:user:delete'
'system:permission:assign-user-role'
]"
>
<XTextButton :title="t('action.more')" postIcon="ep:arrow-down" />
<el-button type="primary" link><Icon icon="ep:d-arrow-right" />更多</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item>
<!-- 操作重置密码 -->
<XTextButton
preIcon="ep:key"
title="重置密码"
v-hasPermi="['system:user:update-password']"
@click="handleResetPwd(row)"
/>
</el-dropdown-item>
<el-dropdown-item>
<!-- 操作分配角色 -->
<XTextButton
preIcon="ep:key"
title="分配角色"
v-hasPermi="['system:permission:assign-user-role']"
@click="handleRole(row)"
/>
</el-dropdown-item>
<el-dropdown-item>
<!-- 操作删除 -->
<XTextButton
preIcon="ep:delete"
:title="t('action.del')"
v-hasPermi="['system:user:delete']"
@click="deleteData(row.id)"
/>
</el-dropdown-item>
<!-- div包住避免控制台报错Runtime directive used on component with non-element root node -->
<div v-if="scope.row.id !== 1" v-hasPermi="['system:user:delete']">
<el-dropdown-item command="handleDelete" type="text"
><Icon icon="ep:delete" />删除</el-dropdown-item
>
</div>
<div v-hasPermi="['system:user:update-password']">
<el-dropdown-item command="handleResetPwd" type="text"
><Icon icon="ep:key" />重置密码</el-dropdown-item
></div
>
<div v-hasPermi="['system:permission:assign-user-role']">
<el-dropdown-item command="handleRole" type="text"
><Icon icon="ep:circle-check" />分配角色</el-dropdown-item
></div
>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
</XTable>
</el-card>
</div>
<XModal v-model="dialogVisible" :title="dialogTitle">
<!-- 对话框(添加 / 修改) -->
<Form
v-if="['create', 'update'].includes(actionType)"
:rules="rules"
:schema="allSchemas.formSchema"
ref="formRef"
>
<template #deptId="form">
<el-tree-select
node-key="id"
v-model="form['deptId']"
:props="defaultProps"
:data="deptOptions"
check-strictly
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</template>
<template #postIds="form">
<el-select v-model="form['postIds']" multiple :placeholder="t('common.selectText')">
<el-option
v-for="item in postOptions"
:key="item.id"
:label="item.name"
:value="(item.id as unknown as number)"
</el-col>
</el-row>
</content-wrap>
<!-- 添加或修改用户对话框 -->
<AddForm
ref="addEditFormRef"
v-model="showAddDialog"
:dept-options="deptOptions"
:post-options="postOptions"
:form-init-value="addFormInitValue"
@success="getList"
/>
</el-select>
</template>
</Form>
<!-- 对话框(详情) -->
<Descriptions
v-if="actionType === 'detail'"
:schema="allSchemas.detailSchema"
:data="detailData"
>
<template #deptId="{ row }">
<el-tag>{{ dataFormater(row.deptId) }}</el-tag>
</template>
<template #postIds="{ row }">
<template v-if="row.postIds !== ''">
<el-tag v-for="(post, index) in row.postIds" :key="index" index="">
<template v-for="postObj in postOptions">
{{ post === postObj.id ? postObj.name : '' }}
</template>
</el-tag>
</template>
<template v-else> </template>
</template>
</Descriptions>
<!-- 操作按钮 -->
<template #footer>
<!-- 按钮保存 -->
<XButton
v-if="['create', 'update'].includes(actionType)"
type="primary"
:title="t('action.save')"
:loading="loading"
@click="submitForm()"
<!-- 用户导入对话框 -->
<ImportForm v-model="importDialogVisible" @success="getList" />
<!-- 分配角色 -->
<RoleForm
ref="roleFormRef"
v-model:show="roleDialogVisible"
:role-options="roleOptions"
:form-init-value="userRole"
@success="getList"
/>
<!-- 按钮关闭 -->
<XButton :loading="loading" :title="t('dialog.close')" @click="dialogVisible = false" />
</div>
</template>
</XModal>
<!-- 分配用户角色 -->
<XModal v-model="roleDialogVisible" title="分配角色">
<el-form :model="userRole" label-width="140px" :inline="true">
<el-form-item label="用户名称">
<el-tag>{{ userRole.username }}</el-tag>
</el-form-item>
<el-form-item label="用户昵称">
<el-tag>{{ userRole.nickname }}</el-tag>
</el-form-item>
<el-form-item label="角色">
<el-transfer
v-model="userRole.roleIds"
:titles="['角色列表', '已选择']"
:props="{
key: 'id',
label: 'name'
}"
:data="roleOptions"
/>
</el-form-item>
</el-form>
<!-- 操作按钮 -->
<template #footer>
<!-- 按钮保存 -->
<XButton type="primary" :title="t('action.save')" :loading="loading" @click="submitRole()" />
<!-- 按钮关闭 -->
<XButton :title="t('dialog.close')" @click="roleDialogVisible = false" />
</template>
</XModal>
<!-- 导入 -->
<XModal v-model="importDialogVisible" :title="importDialogTitle">
<el-form class="drawer-multiColumn-form" label-width="150px">
<el-form-item label="模板下载 :">
<XButton type="primary" prefix="ep:download" title="点击下载" @click="handleImportTemp()" />
</el-form-item>
<el-form-item label="文件上传 :">
<el-upload
ref="uploadRef"
:action="updateUrl + '?updateSupport=' + updateSupport"
:headers="uploadHeaders"
:drag="true"
:limit="1"
:multiple="true"
:show-file-list="true"
:disabled="uploadDisabled"
:before-upload="beforeExcelUpload"
:on-exceed="handleExceed"
:on-success="handleFileSuccess"
:on-error="excelUploadError"
:auto-upload="false"
accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
>
<Icon icon="ep:upload-filled" />
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<template #tip>
<div class="el-upload__tip">请上传 .xls , .xlsx 标准格式文件</div>
</template>
</el-upload>
</el-form-item>
<el-form-item label="是否更新已经存在的用户数据:">
<el-checkbox v-model="updateSupport" />
</el-form-item>
</el-form>
<template #footer>
<!-- 按钮保存 -->
<XButton
type="warning"
preIcon="ep:upload-filled"
:title="t('action.save')"
@click="submitFileForm()"
/>
<!-- 按钮关闭 -->
<XButton :title="t('dialog.close')" @click="importDialogVisible = false" />
</template>
</XModal>
</template>
<script setup lang="ts" name="User">
import type { ElTree, UploadRawFile, UploadInstance } from 'element-plus'
import { handleTree, defaultProps } from '@/utils/tree'
import download from '@/utils/download'
import { CommonStatusEnum } from '@/utils/constants'
import { getAccessToken, getTenantId } from '@/utils/auth'
import type { FormExpose } from '@/components/Form'
import { rules, allSchemas } from './user.data'
import * as UserApi from '@/api/system/user'
import { getSimpleDeptList } from '@/api/system/dept'
import { getSimpleRoleList } from '@/api/system/role'
import { getSimplePostList, PostVO } from '@/api/system/post'
import {
aassignUserRoleApi,
listUserRolesApi,
PermissionAssignUserRoleReqVO
} from '@/api/system/permission'
const { t } = useI18n() //
<script setup lang="ts" name="User">
import type { ElTree } from 'element-plus'
import { handleTree, defaultProps } from '@/utils/tree'
// vue3apiApi
import { getSimpleDeptList as getSimpleDeptListApi } from '@/api/system/dept'
import { getSimplePostList as getSimplePostListApi, PostVO } from '@/api/system/post'
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
import {
deleteUserApi,
exportUserApi,
resetUserPwdApi,
updateUserStatusApi,
UserVO
} from '@/api/system/user'
import { parseTime } from './utils'
import AddForm from './AddForm.vue'
import ImportForm from './ImportForm.vue'
import RoleForm from './RoleForm.vue'
import { getUserApi, getUserPageApi } from '@/api/system/user'
import { getSimpleRoleList as getSimpleRoleListApi } from '@/api/system/role'
import { listUserRolesApi } from '@/api/system/permission'
import { CommonStatusEnum } from '@/utils/constants'
import download from '@/utils/download'
const message = useMessage() //
const { t } = useI18n() //
const queryParams = reactive({
deptId: null
})
// ========== ==========
const tableTitle = ref('用户列表')
//
const [registerTable, { reload, deleteData, exportList }] = useXTable({
allSchemas: allSchemas,
params: queryParams,
getListApi: UserApi.getUserPageApi,
deleteApi: UserApi.deleteUserApi,
exportListApi: UserApi.exportUserApi
pageNo: 1,
pageSize: 10,
username: undefined,
mobile: undefined,
status: undefined,
deptId: undefined,
createTime: []
})
const showSearch = ref(true)
const showAddDialog = ref(false)
// -
const statusDictDatas = getDictOptions(DICT_TYPE.COMMON_STATUS)
// ========== ==========
const filterText = ref('')
const deptName = ref('')
watch(
() => deptName.value,
(val) => {
treeRef.value?.filter(val)
}
)
const deptOptions = ref<Tree[]>([]) //
const treeRef = ref<InstanceType<typeof ElTree>>()
const getTree = async () => {
const res = await getSimpleDeptList()
const res = await getSimpleDeptListApi()
deptOptions.value = []
deptOptions.value.push(...handleTree(res))
}
const filterNode = (value: string, data: Tree) => {
@ -310,154 +328,171 @@ const filterNode = (value: string, data: Tree) => {
}
const handleDeptNodeClick = async (row: { [key: string]: any }) => {
queryParams.deptId = row.id
await reload()
getList()
}
const { push } = useRouter()
const handleDeptEdit = () => {
push('/system/dept')
}
watch(filterText, (val) => {
treeRef.value!.filter(val)
})
// ========== CRUD ==========
const loading = ref(false) //
const actionType = ref('') //
const dialogVisible = ref(false) //
const dialogTitle = ref('edit') //
const formRef = ref<FormExpose>() // Ref
const postOptions = ref<PostVO[]>([]) //
//
const postOptions = ref<PostVO[]>([]) //
const getPostOptions = async () => {
const res = await getSimplePostList()
const res = await getSimplePostListApi()
postOptions.value.push(...res)
}
const dataFormater = computed(() => (deptId: number) => deptFormater(deptOptions.value, deptId))
//
const deptFormater = (arr: Tree[], deptId: number) => {
let deptName = ''
if (arr && deptId) {
for (const item of arr) {
if (item.id === deptId) {
deptName = item.name
break
}
if (item.children) {
deptName = deptFormater(item.children, deptId) ?? ''
break
}
}
}
return deptName
}
//
const setDialogTile = async (type: string) => {
dialogTitle.value = t('action.' + type)
actionType.value = type
dialogVisible.value = true
}
//
const handleCreate = async () => {
setDialogTile('create')
//
await nextTick()
if (allSchemas.formSchema[0].field !== 'username') {
unref(formRef)?.addSchema(
{
field: 'username',
label: '用户账号',
component: 'Input'
},
0
)
unref(formRef)?.addSchema(
{
field: 'password',
label: '用户密码',
component: 'InputPassword'
},
1
)
}
}
//
const handleUpdate = async (rowId: number) => {
setDialogTile('update')
await nextTick()
unref(formRef)?.delSchema('username')
unref(formRef)?.delSchema('password')
//
const res = await UserApi.getUserApi(rowId)
unref(formRef)?.setValues(res)
}
const detailData = ref()
//
const handleDetail = async (rowId: number) => {
//
const res = await UserApi.getUserApi(rowId)
detailData.value = res
await setDialogTile('detail')
}
//
const submitForm = async () => {
const elForm = unref(formRef)?.getElFormRef()
if (!elForm) return
elForm.validate(async (valid) => {
if (valid) {
//
try {
const data = unref(formRef)?.formModel as UserApi.UserVO
if (actionType.value === 'create') {
//
const userList = ref<UserVO[]>([])
const loading = ref(false)
const total = ref(0)
const columns = ref([
{ key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true },
{ key: 2, label: `用户昵称`, visible: true },
{ key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true }
])
/* 查询列表 */
const getList = () => {
loading.value = true
await UserApi.createUserApi(data)
message.success(t('common.createSuccess'))
} else {
loading.value = true
await UserApi.updateUserApi(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
} finally {
// unref(formRef)?.setSchema(allSchemas.formSchema)
//
await reload()
getUserPageApi(queryParams).then((response) => {
userList.value = response.list
total.value = response.total
loading.value = false
}
}
})
}
//
const handleStatusChange = async (row: UserApi.UserVO) => {
const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const queryFormRef = ref()
const resetQuery = () => {
queryFormRef.value?.resetFields()
handleQuery()
}
//
const addEditFormRef = ref()
//
const handleAdd = () => {
addEditFormRef?.value.resetForm()
//
getTree()
//
showAddDialog.value = true
}
//
const handleImport = () => {
importDialogVisible.value = true
}
//
const exportLoading = ref(false)
const handleExport = () => {
message
.confirm('是否确认导出所有用户数据项?')
.then(() => {
//
let params = { ...queryParams }
params.pageNo = 1
params.pageSize = 99999
exportLoading.value = true
return exportUserApi(params)
})
.then((response) => {
download.excel(response, '用户数据.xls')
})
.catch(() => {})
.finally(() => {
exportLoading.value = false
})
}
//
const handleCommand = (command: string, index: number, row: UserVO) => {
console.log(index)
switch (command) {
case 'handleUpdate':
handleUpdate(row) //
break
case 'handleDelete':
handleDelete(row) //
break
case 'handleResetPwd':
handleResetPwd(row)
break
case 'handleRole':
handleRole(row)
break
default:
break
}
}
//
const handleStatusChange = (row: UserVO) => {
let text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'
message
.confirm('确认要"' + text + '""' + row.username + '"用户吗?', t('common.reminder'))
.then(async () => {
.then(function () {
row.status =
row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.ENABLE : CommonStatusEnum.DISABLE
await UserApi.updateUserStatusApi(row.id, row.status)
return updateUserStatusApi(row.id, row.status)
})
.then(() => {
message.success(text + '成功')
//
await reload()
getList()
})
.catch(() => {
row.status =
row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE : CommonStatusEnum.ENABLE
})
}
//
const addFormInitValue = ref<Recordable>({})
/** 修改按钮操作 */
const handleUpdate = (row: UserVO) => {
addEditFormRef.value?.resetForm()
getTree()
const id = row.id
getUserApi(id).then((response) => {
addFormInitValue.value = response
showAddDialog.value = true
})
}
//
const handleDelete = (row: UserVO) => {
const ids = row.id
message
.confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
.then(() => {
return deleteUserApi(ids)
})
.then(() => {
getList()
message.success('删除成功')
})
.catch(() => {})
}
//
const handleResetPwd = (row: UserApi.UserVO) => {
const handleResetPwd = (row: UserVO) => {
message.prompt('请输入"' + row.username + '"的新密码', t('common.reminder')).then(({ value }) => {
UserApi.resetUserPwdApi(row.id, value).then(() => {
resetUserPwdApi(row.id, value)
.then(() => {
message.success('修改成功,新密码是:' + value)
})
.catch((e) => {
console.error(e)
})
})
}
//
const roleDialogVisible = ref(false)
const roleOptions = ref()
@ -467,108 +502,30 @@ const userRole = reactive({
nickname: '',
roleIds: []
})
const handleRole = async (row: UserApi.UserVO) => {
const handleRole = async (row: UserVO) => {
addEditFormRef.value?.resetForm()
userRole.id = row.id
userRole.username = row.username
userRole.nickname = row.nickname
//
//
const roleOpt = await getSimpleRoleListApi()
roleOptions.value = [...roleOpt]
//
const roles = await listUserRolesApi(row.id)
userRole.roleIds = roles
//
const roleOpt = await getSimpleRoleList()
roleOptions.value = roleOpt
roleDialogVisible.value = true
}
//
const submitRole = async () => {
const data = ref<PermissionAssignUserRoleReqVO>({
userId: userRole.id,
roleIds: userRole.roleIds
})
await aassignUserRoleApi(data.value)
message.success(t('common.updateSuccess'))
roleDialogVisible.value = false
}
// ========== ==========
// TODO @
/* 用户导入 */
const importDialogVisible = ref(false)
const uploadDisabled = ref(false)
const importDialogTitle = ref('用户导入')
const updateSupport = ref(0)
let updateUrl = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
const uploadHeaders = ref()
//
const handleImportTemp = async () => {
const res = await UserApi.importUserTemplateApi()
download.excel(res, '用户导入模版.xls')
}
//
const beforeExcelUpload = (file: UploadRawFile) => {
const isExcel =
file.type === 'application/vnd.ms-excel' ||
file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
const isLt5M = file.size / 1024 / 1024 < 5
if (!isExcel) message.error('上传文件只能是 xls / xlsx 格式!')
if (!isLt5M) message.error('上传文件大小不能超过 5MB!')
return isExcel && isLt5M
}
//
const uploadRef = ref<UploadInstance>()
const submitFileForm = () => {
uploadHeaders.value = {
Authorization: 'Bearer ' + getAccessToken(),
'tenant-id': getTenantId()
}
uploadDisabled.value = true
uploadRef.value!.submit()
}
//
const handleFileSuccess = async (response: any): Promise<void> => {
if (response.code !== 0) {
message.error(response.msg)
return
}
importDialogVisible.value = false
uploadDisabled.value = false
const data = response.data
let text = '上传成功数量:' + data.createUsernames.length + ';'
for (let username of data.createUsernames) {
text += '< ' + username + ' >'
}
text += '更新成功数量:' + data.updateUsernames.length + ';'
for (const username of data.updateUsernames) {
text += '< ' + username + ' >'
}
text += '更新失败数量:' + Object.keys(data.failureUsernames).length + ';'
for (const username in data.failureUsernames) {
text += '< ' + username + ': ' + data.failureUsernames[username] + ' >'
}
message.alert(text)
await reload()
}
//
const handleExceed = (): void => {
message.error('最多只能上传一个文件!')
}
//
const excelUploadError = (): void => {
message.error('导入数据失败,请您重新上传!')
}
// ========== ==========
onMounted(async () => {
getList()
await getPostOptions()
await getTree()
})
</script>
<style scoped>
.user {
height: 780px;
max-height: 800px;
}
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
}
</style>

View File

@ -1,137 +0,0 @@
import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
// 国际化
const { t } = useI18n()
const validateMobile = (rule: any, value: any, callback: any) => {
const reg = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
if (value === '') {
callback(new Error('请输入联系手机'))
} else {
if (!reg.test(value)) {
callback(new Error('请输入正确的手机号'))
} else {
callback()
}
}
}
// 表单校验
export const rules = reactive({
username: [required],
nickname: [required],
password: [required],
deptId: [required],
email: [
{ required: true, message: t('profile.rules.mail'), trigger: 'blur' },
{
type: 'email',
message: t('profile.rules.truemail'),
trigger: ['blur', 'change']
}
],
status: [required],
mobile: [
required,
{
len: 11,
trigger: 'blur',
message: '请输入正确的手机号码'
},
{ validator: validateMobile, trigger: 'blur' }
]
})
// crudSchemas
const crudSchemas = reactive<VxeCrudSchema>({
primaryKey: 'id',
primaryType: 'id',
primaryTitle: '用户编号',
action: true,
actionWidth: '200px',
columns: [
{
title: '用户账号',
field: 'username',
isSearch: true
},
{
title: '用户密码',
field: 'password',
isDetail: false,
isTable: false,
form: {
component: 'InputPassword'
}
},
{
title: '用户' + t('profile.user.sex'),
field: 'sex',
dictType: DICT_TYPE.SYSTEM_USER_SEX,
dictClass: 'number',
table: { show: false }
},
{
title: '用户昵称',
field: 'nickname'
},
{
title: '用户邮箱',
field: 'email'
},
{
title: '手机号码',
field: 'mobile',
isSearch: true
},
{
title: '部门',
field: 'deptId',
isTable: false
},
{
title: '岗位',
field: 'postIds',
isTable: false
},
{
title: t('common.status'),
field: 'status',
dictType: DICT_TYPE.COMMON_STATUS,
dictClass: 'number',
isSearch: true,
table: {
slots: {
default: 'status_default'
}
}
},
{
title: '最后登录时间',
field: 'loginDate',
formatter: 'formatDate',
isForm: false
},
{
title: '最后登录IP',
field: 'loginIp',
isTable: false,
isForm: false
},
{
title: t('form.remark'),
field: 'remark',
isTable: false
},
{
title: t('common.createTime'),
field: 'createTime',
formatter: 'formatDate',
isTable: false,
isForm: false,
search: {
show: true,
itemRender: {
name: 'XDataTimePicker'
}
}
}
]
})
export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

View File

@ -0,0 +1,44 @@
export const parseTime = (time) => {
if (!time) {
return null
}
const format = '{y}-{m}-{d} {h}:{i}:{s}'
let date
if (typeof time === 'object') {
date = time
} else {
if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
time = parseInt(time)
} else if (typeof time === 'string') {
time = time
.replace(new RegExp(/-/gm), '/')
.replace('T', ' ')
.replace(new RegExp(/\.[\d]{3}/gm), '')
}
if (typeof time === 'number' && time.toString().length === 10) {
time = time * 1000
}
date = new Date(time)
}
const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay()
}
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key]
// Note: getDay() returns 0 on Sunday
if (key === 'a') {
return ['日', '一', '二', '三', '四', '五', '六'][value]
}
if (result.length > 0 && value < 10) {
value = '0' + value
}
return value || 0
})
return time_str
}