Compare commits

...

2 Commits

Author SHA1 Message Date
FLL
fc08c5525c Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
/ Explore-Gitea-Actions (push) Has been cancelled
2025-08-20 14:25:59 +08:00
FLL
5c7080a3da 热门活动 2025-08-20 14:25:51 +08:00
3 changed files with 12 additions and 6 deletions

View File

@ -10,6 +10,7 @@ import { activitiesAdd, activitiesInfo, activitiesUpdate } from '#/api/property/
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { modalSchema } from './data'; import { modalSchema } from './data';
import dayjs from "dayjs";
const emit = defineEmits<{ reload: [] }>(); const emit = defineEmits<{ reload: [] }>();
@ -59,6 +60,8 @@ const [BasicModal, modalApi] = useVbenModal({
if (isUpdate.value && id) { if (isUpdate.value && id) {
const record = await activitiesInfo(id); const record = await activitiesInfo(id);
dayjs(record.startTime, 'YYYY-MM-DD HH:mm:ss')
dayjs(record.endTime, 'YYYY-MM-DD HH:mm:ss')
await formApi.setValues(record); await formApi.setValues(record);
} }
await markInitialized(); await markInitialized();
@ -76,6 +79,8 @@ async function handleConfirm() {
} }
// getValuesreadonly // getValuesreadonly
const data = cloneDeep(await formApi.getValues()); const data = cloneDeep(await formApi.getValues());
data.startTime = dayjs(data.startTime).format('YYYY-MM-DD HH:mm:ss');
data.endTime = dayjs(data.endTime).format('YYYY-MM-DD HH:mm:ss');
await (isUpdate.value ? activitiesUpdate(data) : activitiesAdd(data)); await (isUpdate.value ? activitiesUpdate(data) : activitiesAdd(data));
resetInitialized(); resetInitialized();
emit('reload'); emit('reload');

View File

@ -37,7 +37,7 @@ export const columns: VxeGridProps['columns'] = [
}, },
{ {
title: '创建人', title: '创建人',
field: 'title', field: 'createName',
}, },
{ {
title: '开始时间', title: '开始时间',
@ -90,7 +90,7 @@ export const modalSchema: FormSchemaGetter = () => [
maxCount: 1, maxCount: 1,
}, },
formItemClass: 'col-span-2', formItemClass: 'col-span-2',
rules: 'required', // rules: 'required',
}, },
{ {
label: '开始时间', label: '开始时间',

View File

@ -12,6 +12,7 @@ import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { modalSchema } from './data'; import { modalSchema } from './data';
import {personList} from "#/api/property/resident/person"; import {personList} from "#/api/property/resident/person";
import {renderDictValue} from "#/utils/render"; import {renderDictValue} from "#/utils/render";
import {userList} from "#/api/system/user";
const emit = defineEmits<{ reload: [] }>(); const emit = defineEmits<{ reload: [] }>();
@ -104,11 +105,11 @@ async function queryPersonData() {
pageSize: 1000, pageSize: 1000,
pageNum: 1, pageNum: 1,
} }
const res = await personList(params); const res = await userList(params);
const options = res.rows.map((user) => ({ const options = res.rows.map((user) => ({
label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex')
+ '-' + user.phone + '-' + user.unitName, + '-' + user.phonenumber,
value: user.id, value: user.userId.toString(),
})); }));
formApi.updateSchema([{ formApi.updateSchema([{
componentProps: () => ({ componentProps: () => ({