From ee9b7017f4801e6011148c67a56eb70e450f6887 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Thu, 21 Aug 2025 16:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/property/maintenance/knowledge/data.ts |  1 +
 .../visitorManagement/visitorInvitation/data.ts  | 16 +++++++++++++++-
 .../visitorInvitation/index.vue                  |  1 +
 .../visitorInvitation-modal.vue                  |  3 ++-
 .../visitorManagement/visitorTodo/index.vue      |  1 +
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/apps/web-antd/src/views/property/maintenance/knowledge/data.ts b/apps/web-antd/src/views/property/maintenance/knowledge/data.ts
index cbe3afcc..ec43ac71 100644
--- a/apps/web-antd/src/views/property/maintenance/knowledge/data.ts
+++ b/apps/web-antd/src/views/property/maintenance/knowledge/data.ts
@@ -143,5 +143,6 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '描述',
     fieldName: 'depict',
     component: 'Textarea',
+    rules: 'required',
   },
 ];
diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts
index 1e9c4c2f..bd41b8cc 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts
@@ -2,6 +2,7 @@ import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import {getDictOptions} from "#/utils/dict";
 import {renderDict} from "#/utils/render";
+import {personList} from '#/api/property/resident/person'
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -148,10 +149,23 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  // {
+  //   label: '邀约单位',
+  //   fieldName: 'interviewedUnit',
+  //   component: 'Input',
+  //   rules: 'required',
+  // },
   {
     label: '邀约单位',
     fieldName: 'interviewedUnit',
-    component: 'Input',
+    component: 'ApiSelect',
+    componentProps: {
+    api: personList,
+      resultField: 'rows',
+      labelField: 'unitName',
+      valueField: 'unitName',
+      placeholder: '请选择邀约单位',
+    },
     rules: 'required',
   },
   {
diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue
index 4d769369..9aa0cae9 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue
@@ -39,6 +39,7 @@ const gridOptions: VxeGridProps = {
         return await visitorManagementList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
+          type:1,
           ...formValues,
           // visitingBeginTime: new Date(formValues.visitingTimeRange[0]).getTime(),
           // visitingEndTime: new Date(formValues.visitingTimeRange[1]).getTime(),
diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-modal.vue b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-modal.vue
index 8e5dadef..626b5acf 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-modal.vue
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-modal.vue
@@ -78,7 +78,8 @@ async function handleConfirm() {
       ...cloneDeep(formValues),
       visitingBeginTime: formValues.visitingTimeRange?.[0],
       visitingEndTime: formValues.visitingTimeRange?.[1],
-      visitingTimeRange: undefined
+      visitingTimeRange: undefined,
+      type:1
   };
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     // const data = cloneDeep(await formApi.getValues());
diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue
index 411c737f..846c98f1 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue
@@ -45,6 +45,7 @@ const gridOptions: VxeGridProps = {
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,
+          type:0,
           visitingBeginTime: formValues.visitingTimeRange?.[0],
           visitingEndTime: formValues.visitingTimeRange?.[1],
           visitingTimeRange: undefined