diff --git a/apps/web-antd/src/views/property/building/building-modal.vue b/apps/web-antd/src/views/property/building/building-modal.vue index 0f56dc1a..366bd7c5 100644 --- a/apps/web-antd/src/views/property/building/building-modal.vue +++ b/apps/web-antd/src/views/property/building/building-modal.vue @@ -23,7 +23,7 @@ const [BasicForm, formApi] = useVbenForm({ // 默认占满两列 formItemClass: 'col-span-1', // 默认label宽度 px - labelWidth: 80, + labelWidth: 90, // 通用配置项 会影响到所有表单项 componentProps: { class: 'w-full', diff --git a/apps/web-antd/src/views/property/building/data.tsx b/apps/web-antd/src/views/property/building/data.tsx index 289e1d1b..cd610bad 100644 --- a/apps/web-antd/src/views/property/building/data.tsx +++ b/apps/web-antd/src/views/property/building/data.tsx @@ -49,6 +49,10 @@ export const columns: VxeGridProps['columns'] = [ title: '建筑名称', field: 'buildingName', }, + { + title: '社区', + field: 'communityText', + }, { title: '总层数', field: 'floorCount', @@ -73,6 +77,18 @@ export const columns: VxeGridProps['columns'] = [ title: '地址', field: 'addr', }, + { + title: '建筑面积(㎡)', + field: 'area', + }, + { + title: '套内面积(㎡)', + field: 'insideInArea', + }, + { + title: '公摊面积(㎡)', + field: 'sharedArea', + }, { field: 'action', fixed: 'right', @@ -153,4 +169,34 @@ export const modalSchema: FormSchemaGetter = () => [ component: 'Input', rules: 'required', }, + { + label: '建筑面积(㎡)', + fieldName: 'area', + component: 'InputNumber', + componentProps: { + min:0, + precision:2, + }, + rules: 'required', + }, + { + label: '套内面积(㎡)', + fieldName: 'insideInArea', + component: 'InputNumber', + componentProps: { + min:0, + precision:2, + }, + rules: 'required', + }, + { + label: '公摊面积(㎡)', + fieldName: 'sharedArea', + component: 'InputNumber', + componentProps: { + min:0, + precision:2, + }, + rules: 'required', + }, ]; diff --git a/apps/web-antd/src/views/property/floor/data.ts b/apps/web-antd/src/views/property/floor/data.ts index 59ba46b7..aa09282a 100644 --- a/apps/web-antd/src/views/property/floor/data.ts +++ b/apps/web-antd/src/views/property/floor/data.ts @@ -13,6 +13,14 @@ export const querySchema: FormSchemaGetter = () => [ // export const columns: () => VxeGridProps['columns'] = () => [ export const columns: VxeGridProps['columns'] = [ { type: 'checkbox', width: 60 }, + { + title: '社区', + field: 'communityText', + }, + { + title: '建筑', + field: 'buildingText', + }, { title: '楼层名称', field: 'floorName', @@ -33,6 +41,18 @@ export const columns: VxeGridProps['columns'] = [ title: '层高', field: 'floorHeight', }, + { + title: '建筑面积(㎡)', + field: 'area', + }, + { + title: '套内面积(㎡)', + field: 'insideInArea', + }, + { + title: '公摊面积(㎡)', + field: 'sharedArea', + }, { field: 'action', fixed: 'right', @@ -95,4 +115,34 @@ export const modalSchema: FormSchemaGetter = () => [ precision:0, }, }, + { + label: '建筑面积(㎡)', + fieldName: 'area', + component: 'InputNumber', + componentProps: { + min:0, + precision:2, + }, + rules: 'required', + }, + { + label: '套内面积(㎡)', + fieldName: 'insideInArea', + component: 'InputNumber', + componentProps: { + min:0, + precision:2, + }, + rules: 'required', + }, + { + label: '公摊面积(㎡)', + fieldName: 'sharedArea', + component: 'InputNumber', + componentProps: { + min:0, + precision:2, + }, + rules: 'required', + }, ]; diff --git a/apps/web-antd/src/views/property/floor/floor-modal.vue b/apps/web-antd/src/views/property/floor/floor-modal.vue index 5fc17d33..072bec45 100644 --- a/apps/web-antd/src/views/property/floor/floor-modal.vue +++ b/apps/web-antd/src/views/property/floor/floor-modal.vue @@ -22,9 +22,9 @@ const title = computed(() => { const [BasicForm, formApi] = useVbenForm({ commonConfig: { // 默认占满两列 - formItemClass: 'col-span-2', + formItemClass: 'col-span-1', // 默认label宽度 px - labelWidth: 80, + labelWidth: 90, // 通用配置项 会影响到所有表单项 componentProps: { class: 'w-full', @@ -44,7 +44,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff( const [BasicModal, modalApi] = useVbenModal({ // 在这里更改宽度 - class: 'w-[550px]', + class: 'w-[60%]', fullscreenButton: false, onBeforeClose, onClosed: handleClosed, diff --git a/apps/web-antd/src/views/property/room/floor-tree.vue b/apps/web-antd/src/views/property/room/floor-tree.vue index 5eca1902..75982f16 100644 --- a/apps/web-antd/src/views/property/room/floor-tree.vue +++ b/apps/web-antd/src/views/property/room/floor-tree.vue @@ -4,7 +4,7 @@ import type { DeptTree } from '#/api/system/user/model'; import { onMounted, ref } from 'vue'; import { SyncOutlined } from '@ant-design/icons-vue'; import { Empty, InputSearch, Skeleton, Tree } from 'ant-design-vue'; -import { getDeptTree } from '#/api/system/user'; +import { communityTree } from '#/api/property/community'; defineOptions({ inheritAttrs: false }); @@ -41,7 +41,7 @@ async function loadTree() { showTreeSkeleton.value = true; searchValue.value = ''; selectDeptId.value = []; - const ret = await getDeptTree(); + const ret = await communityTree(3); deptTreeArray.value = ret; showTreeSkeleton.value = false; } diff --git a/apps/web-antd/src/views/property/room/index.vue b/apps/web-antd/src/views/property/room/index.vue index 6cf9d254..6d62e994 100644 --- a/apps/web-antd/src/views/property/room/index.vue +++ b/apps/web-antd/src/views/property/room/index.vue @@ -120,65 +120,61 @@ function handleDownloadExcel() {