From cb0a15e5fbd02518127dacaac7e3e48294d96830 Mon Sep 17 00:00:00 2001 From: fyy <2717885210@qq.com> Date: Fri, 22 Aug 2025 15:37:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=85=A5=E9=A9=BB=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE=E6=8E=88=E6=9D=83=E6=9C=9F?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/property/resident/unit/model.d.ts | 3 +++ apps/web-antd/src/views/property/resident/unit/unit-modal.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web-antd/src/api/property/resident/unit/model.d.ts b/apps/web-antd/src/api/property/resident/unit/model.d.ts index 747ee0cc..8ae348bf 100644 --- a/apps/web-antd/src/api/property/resident/unit/model.d.ts +++ b/apps/web-antd/src/api/property/resident/unit/model.d.ts @@ -65,6 +65,9 @@ export interface Resident_unitVO { * 权限组名称 */ authGroupName?: string; + // 授权期限 + authBegDate?:string;//开始 + authEndDate?:string;//结束 } diff --git a/apps/web-antd/src/views/property/resident/unit/unit-modal.vue b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue index 4e19da48..3346c219 100644 --- a/apps/web-antd/src/views/property/resident/unit/unit-modal.vue +++ b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue @@ -64,7 +64,7 @@ const [BasicModal, modalApi] = useVbenModal({ await initLocationOptions(); if (isUpdate.value && id) { const record = await resident_unitInfo(id); - await formApi.setValues(record); + await formApi.setValues({...record,authTime:[record.authBegDate,record.authEndDate]}); } await markInitialized(); From 69d17e29ff41c24b127f5d26d21f1aa1b8d819d5 Mon Sep 17 00:00:00 2001 From: fyy <2717885210@qq.com> Date: Fri, 22 Aug 2025 15:47:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/property/attendanceManagement/attendanceArea/data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts b/apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts index fe433e70..c4925d08 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts +++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts @@ -62,11 +62,13 @@ export const modalSchema: FormSchemaGetter = () => [ label: '区域', fieldName: 'area', component: 'Input', + rules: 'required', }, { label: '摄像机', fieldName: 'deviceManageId', component: 'ApiSelect', + rules: 'required', componentProps: { api: async () => { const res = await deviceManageList({ From 91f5b33e68862ec5e23b64e504d44973c04957c9 Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Fri, 22 Aug 2025 17:01:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/property/costManagement/paymentReview/index.vue | 2 +- .../views/property/customerService/questionnaire/index.vue | 3 +-- .../greenPlantRentalManagement/orderManagement/data.ts | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/web-antd/src/views/property/costManagement/paymentReview/index.vue b/apps/web-antd/src/views/property/costManagement/paymentReview/index.vue index 54626057..0e551373 100644 --- a/apps/web-antd/src/views/property/costManagement/paymentReview/index.vue +++ b/apps/web-antd/src/views/property/costManagement/paymentReview/index.vue @@ -92,7 +92,7 @@ async function handleEdit(row: Required) { {{ '审核' }} diff --git a/apps/web-antd/src/views/property/customerService/questionnaire/index.vue b/apps/web-antd/src/views/property/customerService/questionnaire/index.vue index f9d8df1b..8892657c 100644 --- a/apps/web-antd/src/views/property/customerService/questionnaire/index.vue +++ b/apps/web-antd/src/views/property/customerService/questionnaire/index.vue @@ -175,8 +175,7 @@ async function handleDelete(row: Required) { 统计分析 diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts b/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts index 02d55171..f25fb8f6 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts @@ -47,7 +47,7 @@ export const columns: VxeGridProps['columns'] = [ { title: '订单号', field: 'orderNo', - width: 100 + minWidth: 180 }, { title: '客户名称', @@ -134,7 +134,7 @@ export const columns: VxeGridProps['columns'] = [ fixed: 'right', slots: {default: 'action'}, title: '操作', - minWidth: 180, + width: 180, }, ];