diff --git a/apps/web-antd/src/views/property/customerService/activities/activities-modal.vue b/apps/web-antd/src/views/property/customerService/activities/activities-modal.vue index 356e6a59..d6a09e58 100644 --- a/apps/web-antd/src/views/property/customerService/activities/activities-modal.vue +++ b/apps/web-antd/src/views/property/customerService/activities/activities-modal.vue @@ -10,6 +10,7 @@ import { activitiesAdd, activitiesInfo, activitiesUpdate } from '#/api/property/ import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; import { modalSchema } from './data'; +import dayjs from "dayjs"; const emit = defineEmits<{ reload: [] }>(); @@ -59,6 +60,8 @@ const [BasicModal, modalApi] = useVbenModal({ if (isUpdate.value && 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 markInitialized(); @@ -76,6 +79,8 @@ async function handleConfirm() { } // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次 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)); resetInitialized(); emit('reload'); diff --git a/apps/web-antd/src/views/property/customerService/activities/data.ts b/apps/web-antd/src/views/property/customerService/activities/data.ts index e1944a95..92b3aae3 100644 --- a/apps/web-antd/src/views/property/customerService/activities/data.ts +++ b/apps/web-antd/src/views/property/customerService/activities/data.ts @@ -37,7 +37,7 @@ export const columns: VxeGridProps['columns'] = [ }, { title: '创建人', - field: 'title', + field: 'createName', }, { title: '开始时间', @@ -90,7 +90,7 @@ export const modalSchema: FormSchemaGetter = () => [ maxCount: 1, }, formItemClass: 'col-span-2', - rules: 'required', + // rules: 'required', }, { label: '开始时间', diff --git a/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue b/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue index 2926035d..77e73d5d 100644 --- a/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue +++ b/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue @@ -12,6 +12,7 @@ import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; import { modalSchema } from './data'; import {personList} from "#/api/property/resident/person"; import {renderDictValue} from "#/utils/render"; +import {userList} from "#/api/system/user"; const emit = defineEmits<{ reload: [] }>(); @@ -104,11 +105,11 @@ async function queryPersonData() { pageSize: 1000, pageNum: 1, } - const res = await personList(params); + const res = await userList(params); const options = res.rows.map((user) => ({ - label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') - + '-' + user.phone + '-' + user.unitName, - value: user.id, + label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex') + + '-' + user.phonenumber, + value: user.userId.toString(), })); formApi.updateSchema([{ componentProps: () => ({