From c8777c5b05c2c7a36d4eccb82ba7d8476cbcc88a Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Mon, 14 Jul 2025 10:33:05 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../property/inspectionManagement/inspectionPlan/data.ts | 9 +--------
.../inspectionPlan/inspectionPlan-modal.vue | 1 -
.../inspectionManagement/inspectionPlan/plan-detail.vue | 4 ++--
apps/web-antd/src/views/system/user/data.tsx | 5 +----
4 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
index 98fa9fe7..d9665527 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
@@ -220,6 +220,7 @@ export const modalSchema: FormSchemaGetter = () => [
buttonStyle: 'solid',
},
rules: 'selectRequired',
+ defaultValue:'0'
},
{
label: '巡检人员',
@@ -238,11 +239,3 @@ export const modalSchema: FormSchemaGetter = () => [
formItemClass: 'col-span-2'
},
];
-
-const weekOptions = (): any[] => {
- let arr: any[] = []
- for (let i = 1; i <= 7; i++) {
- arr.push({label: '星期' + '', value: i})
- }
- return arr;
-}
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
index 77604475..c0218032 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
@@ -65,7 +65,6 @@ const [BasicModal, modalApi] = useVbenModal({
await queryPersonData()
const {id} = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
-
if (isUpdate.value && id) {
const record = await inspectionPlanInfo(id);
record.planDate = [record.startDate, record.endDate]
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/plan-detail.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/plan-detail.vue
index 0a46807f..8838b2a0 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/plan-detail.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/plan-detail.vue
@@ -73,7 +73,7 @@ const monthArr=Array.from({ length: 12 }, (_, i) => ({
:options="getDictOptions('wy_xq')"/>
-
@@ -88,7 +88,7 @@ const monthArr=Array.from({ length: 12 }, (_, i) => ({
:is="renderDict(inspectionPlanDetail.signType,'wy_xjqdfs')"
/>
-
+
diff --git a/apps/web-antd/src/views/system/user/data.tsx b/apps/web-antd/src/views/system/user/data.tsx
index a84e0792..e13c13a5 100644
--- a/apps/web-antd/src/views/system/user/data.tsx
+++ b/apps/web-antd/src/views/system/user/data.tsx
@@ -130,12 +130,9 @@ export const drawerSchema: FormSchemaGetter = () => [
component: 'Input',
fieldName: 'phonenumber',
label: '手机号码',
- defaultValue: undefined,
rules: z
.string()
- .regex(/^1[3-9]\d{9}$/, '请输入正确的手机号码')
- .optional()
- .or(z.literal('')),
+ .regex(/^1[3-9]\d{9}$/, { message: '请输入正确的手机号' }),
},
{
component: 'Input',