gxwebsoft/gxtyzx-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整理管理员列表

Browse Source
This commit is contained in:
赵忠林
2025-01-08 10:58:21 +08:00
parent 714eff50b2
commit a140df1d13
14 changed files with 2053 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/think/thinkAdmin/components/search.vue
+123 -16
View File
@@ -1,19 +1,29 @@
<!-- 搜索表单 -->
<template>
<a-space :size="10" style="flex-wrap: wrap">
<a-button type="primary" class="ele-btn-icon" @click="add">
<template #icon>
<PlusOutlined />
</template>
<span>添加</span>
</a-button>
</a-space>
<div class="search">
<a-space :size="10" style="flex-wrap: wrap">
<a-input-search
allow-clear
placeholder="搜索关键词"
v-model:value="where.keywords"
@pressEnter="search"
@search="search"
style="width: 360px"
/>
</a-space>
</div>
</template>
<script lang="ts" setup>
import { PlusOutlined } from '@ant-design/icons-vue';
import type { GradeParam } from '@/api/user/grade/model';
import { watch } from 'vue';
import useSearch from '@/utils/use-search';
import { ref, watch } from 'vue';
import { OrderGoods, OrderGoodsParam } from '@/api/order/goods/model';
import { message } from 'ant-design-vue';
import { Organization } from '@/api/system/organization/model';
import { utils, writeFile } from 'xlsx';
import dayjs from 'dayjs';
import { Grade } from '@/api/user/grade/model';
import { BookingUserParam } from '@/api/booking/bookingUser/model';
const props = withDefaults(
defineProps<{
@@ -24,15 +34,112 @@
);
const emit = defineEmits<{
(e: 'search', where?: GradeParam): void;
(e: 'search', where?: OrderGoodsParam): void;
(e: 'add'): void;
(e: 'remove'): void;
(e: 'batchMove'): void;
(e: 'advanced'): void;
}>();
// 新增
const add = () => {
emit('add');
// 表单数据
const { where, resetFields } = useSearch<BookingUserParam>({
id: undefined,
keywords: undefined,
timeStart: undefined,
timeEnd: undefined
});
// 下来选项
// const categoryId = ref<number>(0);
const post = ref<number>(0);
const sign = ref<number>(0);
const noSign = ref<number>(0);
// 日期范围选择
const dateRange = ref<[string, string]>(['', '']);
/* 搜索 */
const search = () => {
const [d1, d2] = dateRange.value ?? [];
where.timeStart = d1 ? dayjs(d1).valueOf() / 1000 : undefined;
where.timeEnd = d2 ? dayjs(d2).valueOf() / 1000 : undefined;
// where.createTimeStart = d1 ? d1 + ' 00:00:00' : undefined;
// where.createTimeEnd = d2 ? d2 + ' 00:00:00' : undefined;
emit('search', {
...where
});
};
const chooseOrganization = (e: Organization) => {
// where.organizationId = e.organizationId;
// where.organizationName = e.organizationName;
search();
};
const chooseGradeId = (e: Grade) => {
where.gradeId = e.gradeId;
where.gradeName = e.name;
search();
};
/* 重置 */
const reset = () => {
dateRange.value = ['', ''];
resetFields();
post.value = 0;
sign.value = 0;
noSign.value = 0;
search();
};
// 导出
const handleExport = () => {
if (!props.selection?.length) {
message.error('请至少选择一条数据');
return;
}
const array: (string | number)[][] = [
[
'部门',
'编号',
'姓名',
'早餐报餐次数',
'早餐签到次数',
'午餐报餐次数',
'午餐签到次数',
'晚餐报餐次数',
'晚餐签到次数',
'消费金额'
]
];
props.selection?.forEach((d: OrderGoods) => {
array.push([
`${d.organizationName}`,
`${d.userId}`,
`${d.nickname}`,
`${d.breakfastPostUsers}`,
`${d.breakfastSignUsers}`,
`${d.lunchPostUsers}`,
`${d.lunchSignUsers}`,
`${d.dinnerPostUsers}`,
`${d.dinnerSignUsers}`
]);
});
const sheetName = '报餐统计导出';
const workbook = {
SheetNames: [sheetName],
Sheets: {}
};
const sheet = utils.aoa_to_sheet(array);
workbook.Sheets[sheetName] = sheet;
// 设置列宽
sheet['!cols'] = [
{ wch: 10 },
{ wch: 10 },
{ wch: 10 },
{ wch: 10 },
{ wch: 20 },
{ wch: 40 },
{ wch: 10 }
];
writeFile(workbook, '报餐统计导出.xlsx');
};
watch(
src/views/think/thinkAdmin/components/thinkAdminEdit.vue → src/views/think/thinkAdmin/components/thinkUsersEdit.vue
+80 -79
View File
@@ -19,6 +19,20 @@
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
"
>
<a-form-item label="用户唯一小程序id" name="openId">
<a-input
allow-clear
placeholder="请输入用户唯一小程序id"
v-model:value="form.openId"
/>
</a-form-item>
<a-form-item label="小程序用户秘钥" name="sessionKey">
<a-input
allow-clear
placeholder="请输入小程序用户秘钥"
v-model:value="form.sessionKey"
/>
</a-form-item>
<a-form-item label="用户名" name="username">
<a-input
allow-clear
@@ -26,18 +40,39 @@
v-model:value="form.username"
/>
</a-form-item>
<a-form-item label="密码" name="password">
<a-form-item label="头像地址" name="avatarUrl">
<a-input
allow-clear
placeholder="请输入密码"
v-model:value="form.password"
placeholder="请输入头像地址"
v-model:value="form.avatarUrl"
/>
</a-form-item>
<a-form-item label="头像" name="portrait">
<a-form-item label="1男，2女" name="gender">
<a-input
allow-clear
placeholder="请输入头像"
v-model:value="form.portrait"
placeholder="请输入1男，2女"
v-model:value="form.gender"
/>
</a-form-item>
<a-form-item label="国家" name="country">
<a-input
allow-clear
placeholder="请输入国家"
v-model:value="form.country"
/>
</a-form-item>
<a-form-item label="省份" name="province">
<a-input
allow-clear
placeholder="请输入省份"
v-model:value="form.province"
/>
</a-form-item>
<a-form-item label="城市" name="city">
<a-input
allow-clear
placeholder="请输入城市"
v-model:value="form.city"
/>
</a-form-item>
<a-form-item label="手机号码" name="phone">
@@ -47,73 +82,35 @@
v-model:value="form.phone"
/>
</a-form-item>
<a-form-item label="登陆次数" name="loginnum">
<a-form-item label="积分" name="integral">
<a-input
allow-clear
placeholder="请输入登陆次数"
v-model:value="form.loginnum"
placeholder="请输入积分"
v-model:value="form.integral"
/>
</a-form-item>
<a-form-item label="最后登录IP" name="lastLoginIp">
<a-form-item label="余额" name="money">
<a-input
allow-clear
placeholder="请输入最后登录IP"
v-model:value="form.lastLoginIp"
placeholder="请输入余额"
v-model:value="form.money"
/>
</a-form-item>
<a-form-item label="最后登录时间" name="lastLoginTime">
<a-input
allow-clear
placeholder="请输入最后登录时间"
v-model:value="form.lastLoginTime"
/>
<a-form-item label="" name="idcard">
<a-input allow-clear placeholder="请输入" v-model:value="form.idcard" />
</a-form-item>
<a-form-item label="真实姓名" name="realName">
<a-input
allow-clear
placeholder="请输入真实姓名"
v-model:value="form.realName"
/>
</a-form-item>
<a-form-item label="状态" name="status">
<a-radio-group v-model:value="form.status">
<a-radio :value="0">显示</a-radio>
<a-radio :value="1">隐藏</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="场馆id集合，用于区分管理可管理的场馆" name="sid">
<a-input
allow-clear
placeholder="请输入场馆id集合，用于区分管理可管理的场馆"
v-model:value="form.sid"
/>
</a-form-item>
<a-form-item label="用户角色id" name="groupid">
<a-input
allow-clear
placeholder="请输入用户角色id"
v-model:value="form.groupid"
/>
</a-form-item>
<a-form-item label="" name="token">
<a-form-item label="" name="truename">
<a-input
allow-clear
placeholder="请输入"
v-model:value="form.token"
v-model:value="form.truename"
/>
</a-form-item>
<a-form-item label="过期时间" name="expireTime">
<a-form-item label="是否管理员：1是；2否" name="isAdmin">
<a-input
allow-clear
placeholder="请输入过期时间"
v-model:value="form.expireTime"
/>
</a-form-item>
<a-form-item label="员工卡号" name="cardCode">
<a-input
allow-clear
placeholder="请输入员工卡号"
v-model:value="form.cardCode"
placeholder="请输入是否管理员：1是；2否"
v-model:value="form.isAdmin"
/>
</a-form-item>
</a-form>
@@ -124,8 +121,8 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addThinkAdmin, updateThinkAdmin } from '@/api/think/thinkAdmin';
import { ThinkAdmin } from '@/api/think/thinkAdmin/model';
import { addBookingUser, updateBookingUser } from '@/api/booking/bookingUser';
import { BookingUser } from '@/api/booking/bookingUser/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
@@ -143,7 +140,7 @@
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: ThinkAdmin | null;
data?: BookingUser | null;
}>();
const emit = defineEmits<{
@@ -160,24 +157,26 @@
const images = ref<ItemType[]>([]);
// 用户信息
const form = reactive<ThinkAdmin>({
const form = reactive<BookingUser>({
id: undefined,
openId: undefined,
sessionKey: undefined,
username: undefined,
password: undefined,
portrait: undefined,
avatarUrl: undefined,
gender: undefined,
country: undefined,
province: undefined,
city: undefined,
phone: undefined,
loginnum: undefined,
lastLoginIp: undefined,
lastLoginTime: undefined,
realName: undefined,
status: undefined,
sid: undefined,
groupid: undefined,
token: undefined,
expireTime: undefined,
cardCode: undefined,
thinkAdminId: undefined,
thinkAdminName: '',
integral: undefined,
money: undefined,
createTime: undefined,
idcard: undefined,
truename: undefined,
isAdmin: undefined,
tenantId: undefined,
bookingUserId: undefined,
bookingUserName: '',
status: 0,
comments: '',
sortNumber: 100
@@ -190,7 +189,7 @@
// 表单验证规则
const rules = reactive({
thinkAdminName: [
bookingUserName: [
{
required: true,
type: 'string',
@@ -228,7 +227,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateThinkAdmin : addThinkAdmin;
const saveOrUpdate = isUpdate.value
? updateBookingUser
: addBookingUser;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -251,12 +252,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/think/thinkAdmin/index.vue
+82 -101
View File
@@ -4,10 +4,9 @@
<a-card :bordered="false" :body-style="{ padding: '16px' }">
<ele-pro-table
ref="tableRef"
row-key="thinkAdminId"
row-key="usersId"
:columns="columns"
:datasource="datasource"
:customRow="customRow"
tool-class="ele-toolbar-form"
class="sys-org-table"
>
@@ -21,8 +20,27 @@
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'image'">
<a-image :src="record.image" :width="50" />
<template v-if="column.key === 'avatarUrl'">
<a-avatar
:size="30"
:src="`${record.avatarUrl}`"
style="margin-right: 4px"
>
<template #icon>
<UserOutlined />
</template>
</a-avatar>
</template>
<template v-if="column.key === 'gender'">
<a-tag v-if="record.gender == 1">男</a-tag>
<a-tag v-if="record.gender == 2">女</a-tag>
<span v-if="record.gender == 0"></span>
</template>
<template v-if="column.key === 'isAdmin'">
<a-switch
:checked="record.isAdmin == 1"
@change="updateIsAdmin(record)"
/>
</template>
<template v-if="column.key === 'status'">
<a-tag v-if="record.status === 0" color="green">显示</a-tag>
@@ -30,14 +48,15 @@
</template>
<template v-if="column.key === 'action'">
<a-space>
<a @click="openEdit(record)">修改</a>
<a-divider type="vertical" />
<a-popconfirm
title="确定要删除此记录吗？"
@confirm="remove(record)"
>
<a class="ele-text-danger">删除</a>
</a-popconfirm>
<!-- <a>积分充值</a>-->
<!-- <a @click="openEdit(record)">修改</a>-->
<!-- <a-divider type="vertical" />-->
<!-- <a-popconfirm-->
<!-- title="确定要删除此记录吗？"-->
<!-- @confirm="remove(record)"-->
<!-- >-->
<!-- <a class="ele-text-danger">删除</a>-->
<!-- </a-popconfirm>-->
</a-space>
</template>
</template>
@@ -45,12 +64,13 @@
</a-card>
<!-- 编辑弹窗 -->
<ThinkAdminEdit v-model:visible="showEdit" :data="current" @done="reload" />
<Edit v-model:visible="showEdit" :data="current" @done="reload" />
</div>
</div>
</template>
<script lang="ts" setup>
import { UserOutlined } from '@ant-design/icons-vue';
import { createVNode, ref } from 'vue';
import { message, Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
@@ -61,17 +81,25 @@
ColumnItem
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import ThinkAdminEdit from './components/thinkAdminEdit.vue';
import { pageThinkAdmin, removeThinkAdmin, removeBatchThinkAdmin } from '@/api/think/thinkAdmin';
import type { ThinkAdmin, ThinkAdminParam } from '@/api/think/thinkAdmin/model';
import Edit from './components/thinkUsersEdit.vue';
import {
pageThinkUsers,
removeThinkUsers,
removeBatchThinkUsers,
updateThinkUsers
} from '@/api/think/thinkUsers';
import type {
ThinkUsers,
ThinkUsersParam
} from '@/api/think/thinkUsers/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格选中数据
const selection = ref<ThinkAdmin[]>([]);
const selection = ref<ThinkUsers[]>([]);
// 当前编辑数据
const current = ref<ThinkAdmin | null>(null);
const current = ref<ThinkUsers | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示批量移动弹窗
@@ -90,7 +118,8 @@
if (filters) {
where.status = filters.status;
}
return pageThinkAdmin({
where.isAdmin = 1;
return pageThinkUsers({
...where,
...orders,
page,
@@ -101,95 +130,35 @@
// 表格列配置
const columns = ref<ColumnItem[]>([
{
title: '',
title: '用户ID',
dataIndex: 'id',
key: 'id',
align: 'center',
width: 90,
width: 90
},
{
title: '用户名',
dataIndex: 'username',
key: 'username',
align: 'center',
},
{
title: '密码',
dataIndex: 'password',
key: 'password',
align: 'center',
},
{
title: '头像',
dataIndex: 'portrait',
key: 'portrait',
align: 'center',
title: '真实姓名',
dataIndex: 'truename',
key: 'truename',
align: 'center'
},
{
title: '手机号码',
dataIndex: 'phone',
key: 'phone',
align: 'center',
sorter: true
},
{
title: '登陆次数',
dataIndex: 'loginnum',
key: 'loginnum',
align: 'center',
title: '性别',
dataIndex: 'gender',
key: 'gender',
align: 'center'
},
{
title: '最后登录IP',
dataIndex: 'lastLoginIp',
key: 'lastLoginIp',
align: 'center',
},
{
title: '最后登录时间',
dataIndex: 'lastLoginTime',
key: 'lastLoginTime',
align: 'center',
},
{
title: '真实姓名',
dataIndex: 'realName',
key: 'realName',
align: 'center',
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
align: 'center',
},
{
title: '场馆id集合，用于区分管理可管理的场馆',
dataIndex: 'sid',
key: 'sid',
align: 'center',
},
{
title: '用户角色id',
dataIndex: 'groupid',
key: 'groupid',
align: 'center',
},
{
title: '',
dataIndex: 'token',
key: 'token',
align: 'center',
},
{
title: '过期时间',
dataIndex: 'expireTime',
key: 'expireTime',
align: 'center',
},
{
title: '员工卡号',
dataIndex: 'cardCode',
key: 'cardCode',
align: 'center',
title: '角色',
dataIndex: 'roles',
key: 'roles',
align: 'center'
},
{
title: '操作',
@@ -202,13 +171,13 @@
]);
/* 搜索 */
const reload = (where?: ThinkAdminParam) => {
const reload = (where?: ThinkUsersParam) => {
selection.value = [];
tableRef?.value?.reload({ where: where });
};
/* 打开编辑弹窗 */
const openEdit = (row?: ThinkAdmin) => {
const openEdit = (row?: ThinkUsers) => {
current.value = row ?? null;
showEdit.value = true;
};
@@ -219,9 +188,9 @@
};
/* 删除单个 */
const remove = (row: ThinkAdmin) => {
const remove = (row: ThinkUsers) => {
const hide = message.loading('请求中..', 0);
removeThinkAdmin(row.thinkAdminId)
removeThinkUsers(row.id)
.then((msg) => {
hide();
message.success(msg);
@@ -246,7 +215,7 @@
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchThinkAdmin(selection.value.map((d) => d.thinkAdminId))
removeBatchThinkUsers(selection.value.map((d) => d.id))
.then((msg) => {
hide();
message.success(msg);
@@ -260,13 +229,25 @@
});
};
/* 修改用户状态 */
const updateIsAdmin = (row: ThinkUsers) => {
row.isAdmin = row.isAdmin == 1 ? 2 : 1;
updateThinkUsers(row)
.then((msg) => {
message.success(msg);
})
.catch((e) => {
message.error(e.message);
});
};
/* 查询 */
const query = () => {
loading.value = true;
};
/* 自定义行属性 */
const customRow = (record: ThinkAdmin) => {
const customRow = (record: ThinkUsers) => {
return {
// 行点击事件
onClick: () => {
@@ -283,7 +264,7 @@
<script lang="ts">
export default {
name: 'ThinkAdmin'
name: 'ThinkUsers'
};
</script>