访客修改

apps/web-antd/src/views/property/inspectionManagement/inspectionRoute/inspectionRoute-modal.vue

@@ -1,10 +1,15 @@
 <script setup lang="ts">
-import { computed, ref, nextTick}  from 'vue';
+import { computed, ref }  from 'vue';
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 import { useVbenForm } from '#/adapter/form';
-import { inspectionRouteAdd, inspectionRouteInfo, inspectionRouteUpdate } from '#/api/property/inspectionManagement/inspectionRoute';
+import {
+  inspectionRouteAdd,
+  inspectionRouteInfo,
+  inspectionRouteList,
+  inspectionRouteUpdate
+} from '#/api/property/inspectionManagement/inspectionRoute';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 import {
   inspectionPointList,
@@ -56,20 +61,15 @@ const [BasicModal, modalApi] = useVbenModal({
 
     if (isUpdate.value && id) {
       const record = await inspectionRouteInfo(id);
-
-      pointList.value = record.inspectionRoutePointVoList || [];
-      await nextTick();
+      pointList.value = (record.inspectionRoutePointVoList || []).map(item => ({
+        pointId: item.pointId ?? '',
+        pointName: item.pointName ?? '',
+      }));
+      await tableApi.reload();
       console.log(pointList.value,111)
-
       await formApi.setValues(record);
-      if (gridRef.value) {
-        gridRef.value.reloadData(pointList.value);
-        // 或者使用 proxy 方式
-        // gridRef.value.commitProxy('reload');
-      }
     }
     await markInitialized();
-
     modalApi.modalLoading(false);
   },
 });
@@ -156,14 +156,13 @@ const gridOptions: VxeGridProps = {
     reserve: true,
   },
   columns: columnsPoint,
-  data: [],
   height: 'auto',
   keepSource: true,
   pagerConfig: {},
   rowConfig: {
     keyField: 'id',
   },
-  id: 'property-inspectionRoute-index'
+  id: 'property-inspectionRoutePoint-index'
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
@@ -190,7 +189,6 @@ const handlePoint = (data) => {
   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;
-
 };
 </script>
 
@@ -198,7 +196,7 @@ const handlePoint = (data) => {
   <BasicModal :title="title">
     <BasicForm />
     <Page :auto-content-height="true" style="background-color: #F1F3F6">
-      <BasicTable table-title="巡检点">
+      <BasicTable table-title="巡检点" :grid-options="gridOptions">
         <template #toolbar-tools>
           <Space>
             <a-button