From 65e371d16e554263feba8d3d4aa658ef545d136d Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Wed, 6 Aug 2025 14:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workOrders/workOrders-modal.vue           | 32 ++++---
 .../inspectionRoute/data.ts                   | 14 +---
 .../inspectionRoute/inspectionRoute-modal.vue | 60 ++++++-------
 .../inspectionRoute/point-modal.vue           |  8 +-
 .../inspectionRoute/pointSetting-modal.vue    | 84 -------------------
 5 files changed, 46 insertions(+), 152 deletions(-)
 delete mode 100644 apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/pointSetting-modal.vue

diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
index a641283f..5ccdda93 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue
@@ -61,7 +61,7 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
-    await queryPersonData()
+    await queryWorkOrdersType()
 
     const {id} = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
@@ -106,34 +106,30 @@ async function handleClosed() {
   resetInitialized();
 }
 
-async function queryPersonData() {
+async function queryWorkOrdersType() {
   let params = {
     pageSize: 1000,
-    pageNum: 1,
+    pageNum: 1
   }
-  const res = await personList(params);
-  const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
-    value: user.id,
+  const res = await tree(params)
+  const options = res.rows.map((item) => ({
+    label: item.orderTypeName,
+    value: item.id,
   }));
   formApi.updateSchema([{
     componentProps: () => ({
       options: options,
+      filterOption: filterOption,
       showSearch:true,
-      filterOption: filterOption
     }),
-    fieldName: 'initiatorName',
-  },
-    {
-      componentProps: () => ({
-        options: options,
-        showSearch:true,
-        filterOption: filterOption
-      }),
-      fieldName: 'handler',
-    }])
+    fieldName: 'type',
+  }])
 }
 
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+
 </script>
 
 <template>
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts
index d23729f4..74b8202d 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/data.ts
@@ -83,7 +83,7 @@ export const columnsPoint: VxeGridProps['columns'] = [
   },
   {
     title: '巡检点名称',
-    field: 'createTime',
+    field: 'pointName',
   },
   {
     field: 'action',
@@ -111,18 +111,6 @@ export const modalSchemaPoint: FormSchemaGetter = () => [
     component: 'ApiSelect',
     componentProps: {},
   },
-];
-
-export const modalSchemaPointSetting: FormSchemaGetter = () => [
-  {
-    label: '主键id',
-    fieldName: 'id',
-    component: 'Input',
-    dependencies: {
-      show: () => false,
-      triggerFields: [''],
-    },
-  },
   {
     label: '开始时间',
     fieldName: 'startTime',
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue
index 44ec3c5d..8774d670 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, ref, nextTick}  from 'vue';
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
@@ -38,6 +38,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   },
 );
 
+const pointList = ref<any[]>([]);
 const [BasicModal, modalApi] = useVbenModal({
   class: 'w-[60%]',
   fullscreenButton: false,
@@ -55,7 +56,17 @@ const [BasicModal, modalApi] = useVbenModal({
 
     if (isUpdate.value && id) {
       const record = await inspectionRouteInfo(id);
+
+      pointList.value = record.inspectionRoutePointVoList || [];
+      await nextTick();
+      console.log(pointList.value,111)
+
       await formApi.setValues(record);
+      if (gridRef.value) {
+        gridRef.value.reloadData(pointList.value);
+        // 或者使用 proxy 方式
+        // gridRef.value.commitProxy('reload');
+      }
     }
     await markInitialized();
 
@@ -70,7 +81,11 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
-    const data = cloneDeep(await formApi.getValues());
+    let data = {
+      ...cloneDeep(await formApi.getValues()),
+      inspectionRoutePointBoList:[pointData.value]
+    }
+    console.log(data,333)
     await (isUpdate.value ? inspectionRouteUpdate(data) : inspectionRouteAdd(data));
     resetInitialized();
     emit('reload');
@@ -119,12 +134,9 @@ import {
   useVbenVxeGrid,
   type VxeGridProps
 } from '#/adapter/vxe-table';
-import {
-  inspectionRouteList,
-} from '#/api/property/inspectionManagement/inspectionRoute';
+import dayjs from 'dayjs';
 import type { InspectionRouteForm } from '#/api/property/inspectionManagement/inspectionRoute/model';
 import pointModal from './point-modal.vue';
-import pointModalSetting from './pointSetting-modal.vue';
 import { columnsPoint, querySchemaPoint } from './data';
 
 const formOptions: VbenFormProps = {
@@ -144,20 +156,10 @@ const gridOptions: VxeGridProps = {
     reserve: true,
   },
   columns: columnsPoint,
+  data: [],
   height: 'auto',
   keepSource: true,
   pagerConfig: {},
-  proxyConfig: {
-    ajax: {
-      query: async ({ page }, formValues = {}) => {
-        return await inspectionRouteList({
-          pageNum: page.currentPage,
-          pageSize: page.pageSize,
-          ...formValues,
-        });
-      },
-    },
-  },
   rowConfig: {
     keyField: 'id',
   },
@@ -173,34 +175,23 @@ const [PointModal, pointModalApi] = useVbenModal({
   connectedComponent: pointModal,
 });
 
-const [PointModalSetting, pointModalSettingApi] = useVbenModal({
-  connectedComponent: pointModalSetting,
-});
-
 function handleAdd() {
   pointModalApi.setData({});
   pointModalApi.open();
 }
 
 async function handleEdit(row: Required<InspectionRouteForm>) {
-  pointModalSettingApi.setData({ id: row.id });
-  pointModalSettingApi.open();
+  pointModalApi.setData({ id: row.id });
+  pointModalApi.open();
 }
 
-const setData = ref({})
-const handleSet = (data) => {
-  setData.value = data; // 更新父组件的数据源
-  console.log(setData.value,111);
-};
 const pointData = ref({})
 const handlePoint = (data) => {
-  pointData.value = data; // 更新父组件的数据源
-  console.log(pointData.value,222);
+  data.startTime = dayjs(data.startTime).format('YYYY-MM-DD HH:mm:ss')
+  data.endTime = dayjs(data.endTime).format('YYYY-MM-DD HH:mm:ss')
+  pointData.value = data;
+
 };
-// const allDate = {
-//   ...pointData,
-//   ...setData
-// }
 </script>
 
 <template>
@@ -229,7 +220,6 @@ const handlePoint = (data) => {
         </template>
       </BasicTable>
       <PointModal @reload="tableApi.query()"  @update-data="handlePoint"/>
-      <PointModalSetting @reload="tableApi.query()" @update-data="handleSet"/>
     </Page>
   </BasicModal>
 </template>
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue
index 2766caba..c21b83c9 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/point-modal.vue
@@ -2,15 +2,18 @@
 import { useVbenModal } from '@vben/common-ui';
 import { cloneDeep } from '@vben/utils';
 import { useVbenForm } from '#/adapter/form';
-import { inspectionRouteAdd, inspectionRouteInfo } from '#/api/property/inspectionManagement/inspectionRoute';
+import { inspectionRouteInfo } from '#/api/property/inspectionManagement/inspectionRoute';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 import {
   inspectionPointList,
 } from '#/api/property/inspectionManagement/inspectionPoint';
 import { modalSchemaPoint } from './data';
+import {ref} from "vue";
 
 const emit = defineEmits<{ reload: [] }>();
 
+const isUpdate = ref(false);
+
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     formItemClass: 'col-span-2',
@@ -44,8 +47,9 @@ const [BasicModal, modalApi] = useVbenModal({
     modalApi.modalLoading(true);
     await queryWorkOrdersType()
     const { id } = modalApi.getData() as { id?: number | string };
+    isUpdate.value = !!id;
 
-    if (id) {
+    if (isUpdate.value && id) {
       const record = await inspectionRouteInfo(id);
       await formApi.setValues(record);
     }
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/pointSetting-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/pointSetting-modal.vue
deleted file mode 100644
index f7ed3180..00000000
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/pointSetting-modal.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup lang="ts">
-import { useVbenModal } from '@vben/common-ui';
-import { cloneDeep } from '@vben/utils';
-import { useVbenForm } from '#/adapter/form';
-import { inspectionRouteInfo, inspectionRouteUpdate } from '#/api/property/inspectionManagement/inspectionRoute';
-import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-import { modalSchemaPointSetting } from './data';
-
-const emit = defineEmits<{ reload: [] }>();
-
-const [BasicForm, formApi] = useVbenForm({
-  commonConfig: {
-    formItemClass: 'col-span-2',
-    labelWidth: 100,
-    componentProps: {
-      class: 'w-full',
-    }
-  },
-  schema: modalSchemaPointSetting(),
-  showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
-});
-
-const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
-  {
-    initializedGetter: defaultFormValueGetter(formApi),
-    currentGetter: defaultFormValueGetter(formApi),
-  },
-);
-
-const [BasicModal, modalApi] = useVbenModal({
-  class: 'w-[550px]',
-  fullscreenButton: false,
-  onBeforeClose,
-  onClosed: handleClosed,
-  onConfirm: handleConfirm,
-  onOpenChange: async (isOpen) => {
-    if (!isOpen) {
-      return null;
-    }
-    modalApi.modalLoading(true);
-    const { id } = modalApi.getData() as { id?: number | string };
-
-    if (id) {
-      const record = await inspectionRouteInfo(id);
-      await formApi.setValues(record);
-    }
-    await markInitialized();
-
-    modalApi.modalLoading(false);
-  },
-});
-
-async function handleConfirm() {
-  try {
-    modalApi.lock(true);
-    const { valid } = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-    const data = cloneDeep(await formApi.getValues());
-    emit('update-data', data);
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
-  } catch (error) {
-    console.error(error);
-  } finally {
-    modalApi.lock(false);
-  }
-}
-
-async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
-}
-</script>
-
-<template>
-  <BasicModal title="修改巡检点">
-    <BasicForm />
-  </BasicModal>
-</template>
-