From b912ca5aa51b3db838a4f8ee65663fb3de5b9fcd Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Tue, 29 Jul 2025 14:43:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=83=BD=E8=80=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/businessManagement/workOrdersType/data.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts index 56133e2b..3c5f97ab 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts @@ -26,10 +26,10 @@ export const querySchema: FormSchemaGetter = () => [ export const columns: VxeGridProps['columns'] = [ { type: 'checkbox', width: 60 }, - { - title: '工单类型编号', - field: 'orderTypeNo', - }, + // { + // title: '工单类型编号', + // field: 'orderTypeNo', + // }, { title: '类型名称', field: 'orderTypeName', From 9cb6d99e9079feb0d6d97780865071b84328bf22 Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Tue, 29 Jul 2025 14:56:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=83=BD=E8=80=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessManagement/workOrders/orders-modal.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue index df252f63..1cac71f2 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue @@ -8,10 +8,10 @@ import { } from '#/api/property/businessManagement/workOrders'; import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup'; import {ordersModalSchema} from './data'; -import {personList} from "#/api/property/resident/person"; import {renderDictValue} from "#/utils/render"; -import {onMounted, ref} from "vue"; -import { useUserStore } from '@vben/stores'; +import {ref} from "vue"; +import {useUserStore} from '@vben/stores'; +import {userList} from "#/api/system/user"; const userStore = useUserStore(); const emit = defineEmits<{ reload: [] }>(); @@ -109,10 +109,10 @@ 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, - value: user.id, + label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex') + '-' + user.phonenumber, + value: user.userId, })); formApi.updateSchema([ { From 84cade81df5fc27d62e7f4f3738d0603039a21ff Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Tue, 29 Jul 2025 15:26:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A1=E6=A3=80=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91=E3=80=81=E4=BF=9D=E5=85=BB=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendanceGroupSettings/model.d.ts | 10 ++++++++-- .../equipmentManagement/maintainPlan/model.d.ts | 2 ++ .../inspectionManagement/inspectionPlan/model.d.ts | 2 +- .../attendance-group-detail.vue | 6 +++--- .../attendanceGroupSettings/group-modal.vue | 2 +- .../equipmentManagement/maintainPlan/data.ts | 2 +- .../maintainPlan/maintainPlan-modal.vue | 14 +++++++------- .../maintainPlan/plan-detail.vue | 8 ++++++-- .../inspectionPlan/inspectionPlan-modal.vue | 12 ++++++------ 9 files changed, 35 insertions(+), 23 deletions(-) diff --git a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts index 0bc06bd2..21ade3dc 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts @@ -19,9 +19,15 @@ export interface GroupVO { /** * 考勤类型(0:固定班制,1:排班制) */ - attendanceType: number; + attendanceType: number| string; - isAutomatic: number; + isAutomatic: boolean; + + clockDateList: any[]; + + weekList: any[]; + + attendanceList:any[]; } diff --git a/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts b/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts index 6350b7c2..4f89a0b2 100644 --- a/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts +++ b/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts @@ -61,6 +61,8 @@ export interface MaintainPlanVO { userId: string[]; machineMaintainPlanStaffBoList:any[]; + + machineMaintainPlanStaffVos:any[]; } export interface MaintainPlanForm extends BaseEntity { diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts index 56008843..7467c144 100644 --- a/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts +++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts @@ -19,7 +19,7 @@ export interface InspectionPlanVO { /** * 巡检周期 */ - inspectionPlanPeriod: number; + inspectionPlanPeriod: string; /** * 任务提前分组 diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue index def438ed..95c1db8e 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue @@ -45,7 +45,7 @@ async function handleOpenChange(open: boolean) { } modalApi.modalLoading(true); const {id,attendanceType} = modalApi.getData() as { id?: number | string,attendanceType?:string }; - const res = await groupInfo(id,attendanceType); + const res = await groupInfo(id as string,attendanceType as string); groupDetail.value=res; if(res.attendanceType==0){ unCheckInData.value=res.clockDateList.filter(item=>item.mustNoCheck==0) @@ -65,7 +65,7 @@ async function handleOpenChange(open: boolean) { }) groupDetail.value.isAutomatic=true }else { - cycleData.value=res; + cycleData.value=[]; } modalApi.modalLoading(false); } @@ -115,7 +115,7 @@ async function showHoliday() { size="small" :pagination="false" > -