From ccaeb44f137eb008b9f87275339d5a58646247b5 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Tue, 1 Jul 2025 11:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visitorInvitation/data.ts                 |  19 ++--
 .../visitorInvitation/index.vue               |   6 +
 .../visitorInvitation-detail.vue              |  37 +++---
 .../visitorInvitation-modal.vue               |  13 ++-
 .../visitorManagement/visitorTodo/data.ts     |  13 ++-
 .../visitorManagement/visitorTodo/index.vue   | 106 ++++++++++++++++++
 .../visitorTodo/visitorTodo-detail.vue        |  37 +++---
 7 files changed, 184 insertions(+), 47 deletions(-)
 create mode 100644 apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue

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 03c07098..32fbba23 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts
@@ -28,13 +28,16 @@ export const querySchema: FormSchemaGetter = () => [
     label: '预约状态',
   },
   {
-    component: 'DatePicker',
+    component: 'RangePicker',
     componentProps: {
-      showTime: true,
+      showTime: {
+        format: 'HH:mm:ss'
+      },
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: ['开始时间', '结束时间']
     },
-    fieldName: 'visitingBeginTime',
+    fieldName: 'visitingTimeRange',
     label: '拜访时间',
   },
   {
@@ -178,12 +181,15 @@ export const modalSchema: FormSchemaGetter = () => [
   },
   {
     label: '拜访时间',
-    fieldName: 'visitingBeginTime',
-    component: 'DatePicker',
+    fieldName: 'visitingTimeRange',
+    component: 'RangePicker',
     componentProps: {
-      showTime: true,
+      showTime: {
+        format: 'HH:mm:ss'
+      },
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: ['开始时间', '结束时间']
     },
     rules: 'required',
   },
@@ -203,7 +209,6 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '车牌号',
     fieldName: 'licensePlate',
     component: 'Input',
-    rules: 'required',
   },
   // {
   //   label: '人脸图片',
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 fc08c046..4d769369 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue
@@ -40,6 +40,12 @@ const gridOptions: VxeGridProps = {
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,
+          // visitingBeginTime: new Date(formValues.visitingTimeRange[0]).getTime(),
+          // visitingEndTime: new Date(formValues.visitingTimeRange[1]).getTime(),
+          // visitingTimeRange: undefined,
+          visitingBeginTime: formValues.visitingTimeRange?.[0],
+          visitingEndTime: formValues.visitingTimeRange?.[1],
+          visitingTimeRange: undefined
         });
       },
     },
diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue
index 1cc49f0a..f0b00ecf 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue
@@ -14,11 +14,11 @@ dayjs.extend(relativeTime);
 const [BasicModal, modalApi] = useVbenModal({
   onOpenChange: handleOpenChange,
   onClosed() {
-    unitDetail.value = null;
+    visitorInvitationDetail.value = null;
   },
 });
 
-const unitDetail = shallowRef<null | VisitorManagementDetail>(null);
+const visitorInvitationDetail = shallowRef<null | VisitorManagementDetail>(null);
 
 async function handleOpenChange(open: boolean) {
   if (!open) {
@@ -27,50 +27,53 @@ async function handleOpenChange(open: boolean) {
   modalApi.modalLoading(true);
   const {id} = modalApi.getData() as { id: number | string };
   const response = await visitorManagementInfo(id);
-  unitDetail.value = response;
+  visitorInvitationDetail.value = response;
   modalApi.modalLoading(false);
 }
 </script>
 
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="访客管理信息" class="w-[70%]">
-    <Descriptions v-if="unitDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
+    <Descriptions v-if="visitorInvitationDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
       <DescriptionsItem label="访客姓名">
-        {{ unitDetail.visitorName }}
+        {{ visitorInvitationDetail.visitorName }}
       </DescriptionsItem>
       <DescriptionsItem label="访客电话">
-        {{ unitDetail.visitorPhone }}
+        {{ visitorInvitationDetail.visitorPhone }}
       </DescriptionsItem>
       <DescriptionsItem label="所属公司">
-        {{ unitDetail.visitorUnit}}
+        {{ visitorInvitationDetail.visitorUnit}}
       </DescriptionsItem>
       <DescriptionsItem label="被访人">
-        {{ unitDetail.interviewedPerson }}
+        {{ visitorInvitationDetail.interviewedPerson }}
       </DescriptionsItem>
       <DescriptionsItem label="联系电话">
-        {{ unitDetail.interviewedPhone }}
+        {{ visitorInvitationDetail.interviewedPhone }}
       </DescriptionsItem>
       <DescriptionsItem label="被访单位">
-        {{ unitDetail.interviewedUnit }}
+        {{ visitorInvitationDetail.interviewedUnit }}
       </DescriptionsItem>
       <DescriptionsItem label="拜访事由">
-        {{ unitDetail.visitingReason }}
+        {{ visitorInvitationDetail.visitingReason }}
       </DescriptionsItem>
       <DescriptionsItem label="拜访时间">
-        {{ unitDetail.visitingBeginTime+' - '+unitDetail.visitingBeginTime }}
+        {{ visitorInvitationDetail.visitingBeginTime+' - '+visitorInvitationDetail.visitingBeginTime }}
       </DescriptionsItem>
-      <DescriptionsItem label="是否预约车位" v-if="unitDetail.bookingParkingSpace!=null">
+      <DescriptionsItem label="是否预约车位" v-if="visitorInvitationDetail.bookingParkingSpace!=null">
         <component
-          :is="renderDict(unitDetail.bookingParkingSpace,'wy_parking_spot')"
+          :is="renderDict(visitorInvitationDetail.bookingParkingSpace,'wy_parking_spot')"
         />
       </DescriptionsItem>
-      <DescriptionsItem label="预约状态" v-if="unitDetail.serveStatus!=null">
+      <DescriptionsItem label="车牌号">
+        {{ visitorInvitationDetail.licensePlate }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预约状态" v-if="visitorInvitationDetail.serveStatus!=null">
         <component
-          :is="renderDict(unitDetail.serveStatus,'wy_appointment_tatus')"
+          :is="renderDict(visitorInvitationDetail.serveStatus,'wy_appointment_tatus')"
         />
       </DescriptionsItem>
       <DescriptionsItem label="提交时间">
-        {{ unitDetail.createTime }}
+        {{ visitorInvitationDetail.createTime }}
       </DescriptionsItem>
     </Descriptions>
   </BasicModal>
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 03cf553b..830da443 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
@@ -70,8 +70,19 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
+    // 获取原始表单值
+    const formValues = await formApi.getValues();
+
+    // 自定义深拷贝
+    const data = {
+      ...cloneDeep(formValues),
+      facePictures: 1,
+      visitingBeginTime: formValues.visitingTimeRange?.[0],
+      visitingEndTime: formValues.visitingTimeRange?.[1],
+      visitingTimeRange: undefined
+  };
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
+    // const data = cloneDeep(await formApi.getValues());
     await (isUpdate.value ? visitorManagementUpdate(data) : visitorManagementAdd(data));
     resetInitialized();
     emit('reload');
diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/data.ts b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/data.ts
index 0afe6203..0e04655a 100644
--- a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/data.ts
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/data.ts
@@ -28,13 +28,16 @@ export const querySchema: FormSchemaGetter = () => [
     label: '预约状态',
   },
   {
-    component: 'DatePicker',
+    component: 'RangePicker',
     componentProps: {
-      showTime: true,
+      showTime: {
+        format: 'HH:mm:ss'
+      },
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: ['开始时间', '结束时间']
     },
-    fieldName: 'visitingBeginTime',
+    fieldName: 'visitingTimeRange',
     label: '拜访时间',
   },
   {
@@ -44,7 +47,7 @@ export const querySchema: FormSchemaGetter = () => [
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
-    fieldName: 'createTime',
+    fieldName: 'updateTime',
     label: '提交时间',
   },
 ];
@@ -119,7 +122,7 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '提交时间',
-    field: 'createTime',
+    field: 'updateTime',
   },
   {
     field: 'action',
diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue
new file mode 100644
index 00000000..9b54642b
--- /dev/null
+++ b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { getVxePopupContainer } from '@vben/utils';
+import { Popconfirm, Space } from 'ant-design-vue';
+import {
+  useVbenVxeGrid,
+  type VxeGridProps
+} from '#/adapter/vxe-table';
+import {
+  visitorManagementList,
+  visitorManagementUpdate,
+} from '#/api/property/visitorManagement';
+import type { VisitorManagementForm } from '#/api/property/visitorManagement/model';
+import visitorTodoDetail from './visitorTodo-detail.vue';
+import { columns, querySchema } from './data';
+
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    highlight: true,
+    reserve: true,
+  },
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        return await visitorManagementList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+          visitingBeginTime: formValues.visitingTimeRange?.[0],
+          visitingEndTime: formValues.visitingTimeRange?.[1],
+          visitingTimeRange: undefined
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  id: 'property-visitorManagement-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [visitorTodoDetailModal, visitorTodoApi] = useVbenModal({
+  connectedComponent: visitorTodoDetail,
+});
+
+async function handleInfo(row: Required<VisitorManagementForm>) {
+  visitorTodoApi.setData({ id: row.id });
+  visitorTodoApi.open();
+}
+
+async function handleDelete(row: Required<VisitorManagementForm>) {
+  row.serveStatus=1
+  await visitorManagementUpdate(row);
+  await tableApi.query();
+}
+
+</script>
+
+<template>
+  <Page :auto-content-height="true">
+    <BasicTable table-title="访客待办列表">
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            @click.stop="handleInfo(row)"
+          >
+            {{ $t('pages.common.info') }}
+          </ghost-button>
+          <Popconfirm
+            :get-popup-container="getVxePopupContainer"
+            placement="left"
+            title="确认审核状态？"
+            @confirm="handleDelete(row)"
+          >
+            <ghost-button
+              @click.stop=""
+            >
+              {{ '审核' }}
+            </ghost-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <visitorTodoDetailModal/>
+  </Page>
+</template>
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 1cc49f0a..7f25c50a 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
@@ -14,11 +14,11 @@ dayjs.extend(relativeTime);
 const [BasicModal, modalApi] = useVbenModal({
   onOpenChange: handleOpenChange,
   onClosed() {
-    unitDetail.value = null;
+    visitorTodoDetail.value = null;
   },
 });
 
-const unitDetail = shallowRef<null | VisitorManagementDetail>(null);
+const visitorTodoDetail = shallowRef<null | VisitorManagementDetail>(null);
 
 async function handleOpenChange(open: boolean) {
   if (!open) {
@@ -27,50 +27,53 @@ async function handleOpenChange(open: boolean) {
   modalApi.modalLoading(true);
   const {id} = modalApi.getData() as { id: number | string };
   const response = await visitorManagementInfo(id);
-  unitDetail.value = response;
+  visitorTodoDetail.value = response;
   modalApi.modalLoading(false);
 }
 </script>
 
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="访客管理信息" class="w-[70%]">
-    <Descriptions v-if="unitDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
+    <Descriptions v-if="visitorTodoDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
       <DescriptionsItem label="访客姓名">
-        {{ unitDetail.visitorName }}
+        {{ visitorTodoDetail.visitorName }}
       </DescriptionsItem>
       <DescriptionsItem label="访客电话">
-        {{ unitDetail.visitorPhone }}
+        {{ visitorTodoDetail.visitorPhone }}
       </DescriptionsItem>
       <DescriptionsItem label="所属公司">
-        {{ unitDetail.visitorUnit}}
+        {{ visitorTodoDetail.visitorUnit}}
       </DescriptionsItem>
       <DescriptionsItem label="被访人">
-        {{ unitDetail.interviewedPerson }}
+        {{ visitorTodoDetail.interviewedPerson }}
       </DescriptionsItem>
       <DescriptionsItem label="联系电话">
-        {{ unitDetail.interviewedPhone }}
+        {{ visitorTodoDetail.interviewedPhone }}
       </DescriptionsItem>
       <DescriptionsItem label="被访单位">
-        {{ unitDetail.interviewedUnit }}
+        {{ visitorTodoDetail.interviewedUnit }}
       </DescriptionsItem>
       <DescriptionsItem label="拜访事由">
-        {{ unitDetail.visitingReason }}
+        {{ visitorTodoDetail.visitingReason }}
       </DescriptionsItem>
       <DescriptionsItem label="拜访时间">
-        {{ unitDetail.visitingBeginTime+' - '+unitDetail.visitingBeginTime }}
+        {{ visitorTodoDetail.visitingBeginTime+' - '+visitorTodoDetail.visitingBeginTime }}
       </DescriptionsItem>
-      <DescriptionsItem label="是否预约车位" v-if="unitDetail.bookingParkingSpace!=null">
+      <DescriptionsItem label="是否预约车位" v-if="visitorTodoDetail.bookingParkingSpace!=null">
         <component
-          :is="renderDict(unitDetail.bookingParkingSpace,'wy_parking_spot')"
+          :is="renderDict(visitorTodoDetail.bookingParkingSpace,'wy_parking_spot')"
         />
       </DescriptionsItem>
-      <DescriptionsItem label="预约状态" v-if="unitDetail.serveStatus!=null">
+      <DescriptionsItem label="车牌号">
+        {{ visitorTodoDetail.licensePlate }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预约状态" v-if="visitorTodoDetail.serveStatus!=null">
         <component
-          :is="renderDict(unitDetail.serveStatus,'wy_appointment_tatus')"
+          :is="renderDict(visitorTodoDetail.serveStatus,'wy_appointment_tatus')"
         />
       </DescriptionsItem>
       <DescriptionsItem label="提交时间">
-        {{ unitDetail.createTime }}
+        {{ visitorTodoDetail.createTime }}
       </DescriptionsItem>
     </Descriptions>
   </BasicModal>