From 09db75ae58e7f361b8e21cbe7bab5011bdc35369 Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Thu, 7 Aug 2025 11:16:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BF=9D=E6=B4=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=BE=E5=88=B0=E6=96=B9=E5=BC=8F=E3=80=81?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/property/visitorManagement/model.d.ts | 4 +++ .../clean/cleanOrders/clean-modal.vue | 26 ++++++++++++++++++- .../visitorTodo/visitorTodo-detail.vue | 8 +++++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/apps/web-antd/src/api/property/visitorManagement/model.d.ts b/apps/web-antd/src/api/property/visitorManagement/model.d.ts index eec10054..c687f880 100644 --- a/apps/web-antd/src/api/property/visitorManagement/model.d.ts +++ b/apps/web-antd/src/api/property/visitorManagement/model.d.ts @@ -70,6 +70,10 @@ export interface VisitorManagementVO { * 预约状态（0：待确认，1：已确认，2：已取消，3：已完成） */ serveStatus: number; + /** + * 身份证号 + */ + idCard: string; } export interface VisitorManagementForm extends BaseEntity { diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue index 34527570..d534c4d0 100644 --- a/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue +++ b/apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue @@ -188,7 +188,7 @@ const modalSchema = [ }, }, { - label: '联系电话', + label: '评价图片', fieldName: 'imgUrl', component: 'Input', dependencies: { @@ -196,6 +196,30 @@ const modalSchema = [ triggerFields: [''], }, }, + { + label: '签到方式', + fieldName: 'signType', + component: 'Select', + componentProps: { + options:getDictOptions('wy_bjqdfs') + }, + dependencies: { + show: () => (isReadonly.value ? true : false), + triggerFields: [''], + }, + }, + { + label: '签到图片', + fieldName: 'signImgUrl', + component: 'ImageUpload', + componentProps: { + helpMessage:false + }, + dependencies: { + show: (formValue) => (isReadonly.value&&formValue.signImgUrl ? true : false), + triggerFields: [''], + }, + }, ]; const [BasicForm, formApi] = useVbenForm({ commonConfig: { diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue index 828a3df9..16c92028 100644 --- a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue +++ b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue @@ -34,13 +34,19 @@ async function handleOpenChange(open: boolean) { - + diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue index 18f22086..284f9a52 100644 --- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue @@ -7,7 +7,6 @@ import { useVbenForm } from '#/adapter/form'; import { inspectionRouteAdd, inspectionRouteInfo, - inspectionRouteList, inspectionRouteUpdate } from '#/api/property/inspectionManagement/inspectionRoute'; import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; @@ -62,11 +61,14 @@ const [BasicModal, modalApi] = useVbenModal({ if (isUpdate.value && id) { const record = await inspectionRouteInfo(id); pointList.value = (record.inspectionRoutePointVoList || []).map(item => ({ + id: item.id, pointId: item.pointId ?? '', pointName: item.pointName ?? '', + startTime: item.startTime ?? '', + endTime: item.endTime ?? '', + sort: item.sort ?? '', })); await tableApi.reload(); - console.log(pointList.value,111) await formApi.setValues(record); } await markInitialized(); @@ -83,10 +85,10 @@ async function handleConfirm() { } let data = { ...cloneDeep(await formApi.getValues()), - inspectionRoutePointBoList:[pointData.value] + inspectionRoutePointBoList:[...pointList.value] } - console.log(data,333) await (isUpdate.value ? inspectionRouteUpdate(data) : inspectionRouteAdd(data)); + pointList.value = [] resetInitialized(); emit('reload'); modalApi.close(); @@ -99,9 +101,11 @@ async function handleConfirm() { async function handleClosed() { await formApi.resetForm(); + pointList.value = [] resetInitialized(); } +const pointItem = ref([]) async function queryWorkOrdersType() { let params = { pageSize: 1000, @@ -112,6 +116,10 @@ async function queryWorkOrdersType() { label: item.pointName, value: item.id, })); + pointItem.value = res.rows.map((item) => ({ + pointId: item.id, + pointName: item.pointName, + })); tableApi.formApi.updateSchema([{ componentProps: () => ({ options: options, @@ -166,7 +174,6 @@ const gridOptions: VxeGridProps = { }; const [BasicTable, tableApi] = useVbenVxeGrid({ - formOptions, gridOptions, }); @@ -180,15 +187,20 @@ function handleAdd() { } async function handleEdit(row: Required) { - pointModalApi.setData({ id: row.id }); + pointModalApi.setData({ row }); pointModalApi.open(); } -const pointData = ref({}) const handlePoint = (data) => { data.startTime = dayjs(data.startTime).format('YYYY-MM-DD HH:mm:ss') data.endTime = dayjs(data.endTime).format('YYYY-MM-DD HH:mm:ss') - pointData.value = data; + data.pointName = pointItem.value.find(item => item.pointId === data.pointId)?.pointName; + const existingIndex = pointList.value.findIndex(item => item.pointId === data.pointId); + if (existingIndex !== -1) { + pointList.value[existingIndex] = data; + } else { + pointList.value.push(data); + } }; @@ -196,7 +208,7 @@ const handlePoint = (data) => { - + - + diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue index c21b83c9..34623aed 100644 --- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue @@ -2,7 +2,7 @@ import { useVbenModal } from '@vben/common-ui'; import { cloneDeep } from '@vben/utils'; import { useVbenForm } from '#/adapter/form'; -import { inspectionRouteInfo } from '#/api/property/inspectionManagement/inspectionRoute'; +import dayjs from 'dayjs'; import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; import { inspectionPointList, @@ -34,6 +34,13 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff( }, ); +const props = defineProps({ + pointList: { + type: Array, + default: () => [], + }, +}); + const [BasicModal, modalApi] = useVbenModal({ class: 'w-[550px]', fullscreenButton: false, @@ -45,13 +52,14 @@ const [BasicModal, modalApi] = useVbenModal({ return null; } modalApi.modalLoading(true); + const { row } = modalApi.getData() as { row?: number | string }; + isUpdate.value = !!row; await queryWorkOrdersType() - const { id } = modalApi.getData() as { id?: number | string }; - isUpdate.value = !!id; - - if (isUpdate.value && id) { - const record = await inspectionRouteInfo(id); - await formApi.setValues(record); + if (isUpdate.value && row ){ + row.startTime = dayjs(row.startTime) + row.endTime = dayjs(row.endTime) + console.log(row,456) + await formApi.setValues(row); } await markInitialized(); @@ -89,15 +97,26 @@ async function queryWorkOrdersType() { pageNum: 1 } const res = await inspectionPointList(params) - const options = res.rows.map((item) => ({ - label: item.pointName, - value: item.id, - })); + let options = [] + if(isUpdate.value){ + options = res.rows.map((item) => ({ + label: item.pointName, + value: item.id, + })); + }else{ + const existingIds = props.pointList.map(item => item.pointId); + const filteredRows = res.rows.filter(item => !existingIds.includes(item.id)); + options = filteredRows.map((item) => ({ + label: item.pointName, + value: item.id, + })); + } formApi.updateSchema([{ componentProps: () => ({ options: options, showSearch: true, filterOption: filterOption, + disabled: isUpdate.value, }), fieldName: 'pointId', }]) From 1e4c74230f6a6b642e5ed6bbb891759369836f54 Mon Sep 17 00:00:00 2001 From: fyy <2717885210@qq.com> Date: Thu, 7 Aug 2025 17:44:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=8E=92=E7=8F=AD=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendanceManagement/arrangement/index.ts | 34 +- .../arrangement/model.d.ts | 20 +- .../workforceManagement/arrangement-modal.vue | 78 +--- .../workforceManagement/calendarView.vue | 161 ++++---- .../workforceManagement/data.ts | 66 ++++ .../workforce-day-detail.vue | 107 ++++++ .../workforceManagement/workforce-detail.vue | 346 ++++++++++++++++++ 7 files changed, 647 insertions(+), 165 deletions(-) create mode 100644 apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-day-detail.vue create mode 100644 apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue diff --git a/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts b/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts index 0ffab03b..fdd93873 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts @@ -1,18 +1,25 @@ -import type { ArrangementVO, ArrangementForm, ArrangementQuery } from './model'; +import type { + ArrangementVO, + ArrangementForm, + ArrangementQuery, + arrangmentListQuery, +} from './model'; import type { ID, IDS } from '#/api/common'; import type { PageResult } from '#/api/common'; -import { commonExport } from '#/api/helper'; import { requestClient } from '#/api/request'; /** -* 分页查询排班列表 -* @param params -* @returns 排班列表 -*/ + * 分页查询排班列表 + * @param params + * @returns 排班列表 + */ export function arrangementList(params?: ArrangementQuery) { - return requestClient.get>('/property/arrangement/list', { params }); + return requestClient.get>( + '/property/arrangement/list', + { params }, + ); } /** * 根据月份查询排班列表 @@ -58,3 +65,16 @@ export function arrangementUpdate(data: ArrangementForm) { export function arrangementRemove(id: ID | IDS) { return requestClient.deleteWithMsg(`/property/arrangement/${id}`); } + +/** + * 查询某天排班详情列表 + * @param params + * @returns 排班列表 + */ + +export function arrangmentList(params?: arrangmentListQuery) { + return requestClient.get>( + '/property/arrangement/list', + { params }, + ); +} diff --git a/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts index 83f93190..e0ecbb4a 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts @@ -9,37 +9,40 @@ export interface ArrangementVO { /** * 排班名称 */ - scheduleName: string; + scheduleName?: string; /** * 考勤组ID */ - groupId: string | number; + groupId?: string | number; /** * 排班类型：1-固定班制，2-排班制 */ - scheduleType: number; + scheduleType?: number; /** * 日期类型：1-单个日期，2-长期有效，3-期间有效 */ - dateType: number; + dateType?: number; /** * 开始日期 */ - startDate: string; + startDate?: string; /** * 结束日期(仅date_type=3时有效) */ - endDate: string; + endDate?: string; /** * 状态：0-未生效，1-已生效 */ - status: number; + status?: number; + userGroupList?:any[]; + attendanceGroup?:any; + dateType?:number } export interface ArrangementForm extends BaseEntity { @@ -134,3 +137,6 @@ export interface ArrangementQuery extends PageQuery { */ month?: string; } +export interface arrangmentListQuery extends PageQuery { + currentDate:string//某天的日期 +} diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue index d4e5ccd3..1a941699 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue @@ -1,18 +1,9 @@ + + + + + diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue new file mode 100644 index 00000000..900d0d29 --- /dev/null +++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue @@ -0,0 +1,346 @@ + + + +