综合模块完成

apps/web-antd/src/views/property/floor/data.ts

@@ -1,12 +1,11 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
-
 export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
-    fieldName: 'communityName',
-    label: '社区',
+    fieldName: 'floorName',
+    label: '楼层名称',
   },
 ];
 
@@ -15,21 +14,17 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '单元编码',
-    field: 'unitId',
-  },
-  {
-    title: '楼层数名称',
+    title: '楼层名称',
     field: 'floorName',
   },
   {
     title: '楼层号',
     field: 'floorNumber',
   },
-  {
+ /* {
     title: '楼层类型',
     field: 'floorType',
-  },
+  },*/
   {
     title: '房间数量',
     field: 'roomCount',
@@ -58,10 +53,11 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '单元编码',
+    component: 'TreeSelect',
     fieldName: 'unitId',
-    component: 'Input',
-    rules: 'required',
+    defaultValue: undefined,
+    label: '社区建筑',
+    rules: 'selectRequired',
   },
   {
     label: '楼层数名称',
@@ -75,13 +71,12 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
-  {
+  /*{
     label: '楼层类型',
     fieldName: 'floorType',
     component: 'Select',
-    componentProps: {
-    },
-  },
+    componentProps: {},
+  },*/
   {
     label: '房间数量',
     fieldName: 'roomCount',

apps/web-antd/src/views/property/floor/floor-modal.vue

@@ -3,13 +3,14 @@ import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
-import { cloneDeep } from '@vben/utils';
+import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
 import { floorAdd, floorInfo, floorUpdate } from '#/api/property/floor';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
+import { communityTree } from '#/api/property/community';
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -53,16 +54,14 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
-
+    setupCommunitySelect()
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
-
     if (isUpdate.value && id) {
       const record = await floorInfo(id);
       await formApi.setValues(record);
     }
     await markInitialized();
-
     modalApi.modalLoading(false);
   },
 });
@@ -87,6 +86,45 @@ async function handleConfirm() {
   }
 }
 
+/**
+ * 初始化城市
+ */
+async function setupCommunitySelect() {
+  const areaList = await communityTree(3);
+  // 选中后显示在输入框的值 即父节点 / 子节点
+  // addFullName(areaList, 'areaName', ' / ');
+  const splitStr = '/';
+  handleNode(areaList, 'label', splitStr, function (node: any) {
+    if (node.level != 3) {
+      node.disabled = true;
+    }
+  });
+  formApi.updateSchema([
+    {
+      componentProps: () => ({
+        class: 'w-full',
+        fieldNames: {
+          key: 'id',
+          label: 'label',
+          value: 'code',
+          children: 'children',
+        },
+        getPopupContainer,
+        placeholder: '请选择建筑',
+        showSearch: true,
+        treeData: areaList,
+        treeDefaultExpandAll: true,
+        treeLine: { showLeafIcon: false },
+        // 筛选的字段
+        treeNodeFilterProp: 'label',
+        // 选中后显示在输入框的值
+        treeNodeLabelProp: 'fullName',
+      }),
+      fieldName: 'unitId',
+    },
+  ]);
+}
+
 async function handleClosed() {
   await formApi.resetForm();
   resetInitialized();