1

2025-06-28 02:41:09 +08:00
parent 81a89bb4dc
commit acd63bc96e
23 changed files with 670 additions and 1046 deletions
--- a/apps/web-antd/src/views/property/room/data.ts
+++ b/apps/web-antd/src/views/property/room/data.ts
@@ -1,74 +1,37 @@
-import type {FormSchemaGetter} from '#/adapter/form';
-import type {VxeGridProps} from '#/adapter/vxe-table';
-import {getDictOptions} from "#/utils/dict";
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';

 export const querySchema: FormSchemaGetter = () => [
  {
-    component: 'Select',
-    fieldName: 'floorCode',
-    label: '所属社区',
-  },
-  {
-    component: 'Select',
-    fieldName: 'floorCode1',
-    label: '所属建筑',
-  },
-  {
-    component: 'Select',
-    fieldName: 'floorCode2',
-    label: '所属单元',
-  },
-  {
-    component: 'Select',
-    fieldName: 'floorCode3',
-    label: '所属楼层',
+    component: 'Input',
+    fieldName: 'communityName',
+    label: '社区',
  },
  {
    component: 'Input',
-    fieldName: 'roomNumber',
-    label: '房间号',
+    fieldName: 'orientation',
+    label: '朝向',
  },
  {
    component: 'Input',
-    fieldName: 'roomCode',
-    label: '房间编码',
+    fieldName: 'isForSale',
+    label: '是否可售',
  },
  {
    component: 'Select',
-    componentProps: {
-      options: getDictOptions('room_type'),
-    },
-    fieldName: 'roomType',
-    label: '房间类型',
-  },
-  {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions('wy_fjzt'),
-    },
+    componentProps: {},
    fieldName: 'status',
-    label: '房间状态',
+    label: '状态',
  },
 ];

+// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
  { type: 'checkbox', width: 60 },
  {
-    title: '序号',
-    field: 'id',
-    slots: {
-      default: ({ rowIndex }) => {
-        return (rowIndex + 1).toString();
-      },
-    },
-  },
-  {
-    title: '所属楼层',
-    field: 'floorCode',
-  },
-  {
-    title: '房间编码',
-    field: 'roomCode',
+    title: '所属楼层ID',
+    field: 'floorId',
  },
  {
    title: '房间号',
@@ -79,7 +42,7 @@ export const columns: VxeGridProps['columns'] = [
    field: 'roomType',
  },
  {
-    title: '面积(㎡)',
+    title: '面积(平方米)',
    field: 'area',
  },
  {
@@ -95,7 +58,7 @@ export const columns: VxeGridProps['columns'] = [
    field: 'isForSale',
  },
  {
-    title: '房间状态',
+    title: '状态',
    field: 'status',
  },
  {
@@ -109,7 +72,7 @@ export const columns: VxeGridProps['columns'] = [

 export const modalSchema: FormSchemaGetter = () => [
  {
-    label: '主键',
+    label: '',
    fieldName: 'id',
    component: 'Input',
    dependencies: {
@@ -118,51 +81,25 @@ export const modalSchema: FormSchemaGetter = () => [
    },
  },
  {
-    label: '所属社区',
-    fieldName: 'floorCode',
+    label: '所属楼层ID',
+    fieldName: 'floorId',
    component: 'Input',
    rules: 'required',
  },
  {
-    label: '所属建筑',
-    fieldName: 'floorCode',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '所属单元',
-    fieldName: 'floorCode',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '所属楼层',
-    fieldName: 'floorCode',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '房间号',
+    label: '房间号(如101,202)',
    fieldName: 'roomNumber',
    component: 'Input',
    rules: 'required',
  },
-  {
-    label: '房间编码',
-    fieldName: 'roomCode',
-    component: 'Input',
-    rules: 'required',
-  },
  {
    label: '房间类型',
    fieldName: 'roomType',
    component: 'Select',
-    componentProps: {
-      options: getDictOptions('room_type'),
-    },
+    componentProps: {},
  },
  {
-    label: '面积(㎡)',
+    label: '面积(平方米)',
    fieldName: 'area',
    component: 'Input',
  },
@@ -174,22 +111,17 @@ export const modalSchema: FormSchemaGetter = () => [
  {
    label: '朝向',
    fieldName: 'orientation',
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions('direction_towards'),
-    },
+    component: 'Input',
  },
  {
    label: '是否可售',
    fieldName: 'isForSale',
-    component: 'Select',
+    component: 'Input',
  },
  {
-    label: '房间状态',
+    label: '状态',
    fieldName: 'status',
    component: 'Select',
-    componentProps: {
-      options: getDictOptions('wy_fjzt'),
-    },
+    componentProps: {},
  },
 ];
--- a/apps/web-antd/src/views/property/room/index.vue
+++ b/apps/web-antd/src/views/property/room/index.vue
@@ -1,12 +1,20 @@
 <script setup lang="ts">
+import type { Recordable } from '@vben/types';
+
+import { ref } from 'vue';
+
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
+
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-import {
+import dayjs from 'dayjs';
+
+import {   
  useVbenVxeGrid,
  vxeCheckboxChecked,
-  type VxeGridProps
+  type VxeGridProps 
 } from '#/adapter/vxe-table';
+
 import {
  roomExport,
  roomList,
@@ -14,6 +22,7 @@ import {
 } from '#/api/property/room';
 import type { RoomForm } from '#/api/property/room/model';
 import { commonDownloadExcel } from '#/utils/file/download';
+
 import roomModal from './room-modal.vue';
 import { columns, querySchema } from './data';

@@ -26,13 +35,28 @@ const formOptions: VbenFormProps = {
  },
  schema: querySchema(),
  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
+  // 不需要直接删除
+  // fieldMappingTime: [
+  //  [
+  //    'createTime',
+  //    ['params[beginTime]', 'params[endTime]'],
+  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
+  //  ],
+  // ],
 };

 const gridOptions: VxeGridProps = {
  checkboxConfig: {
+    // 高亮
    highlight: true,
+    // 翻页时保留选中状态
    reserve: true,
+    // 点击行选中
+    // trigger: 'row',
  },
+  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+  // columns: columns(),
  columns,
  height: 'auto',
  keepSource: true,
@@ -51,6 +75,7 @@ const gridOptions: VxeGridProps = {
  rowConfig: {
    keyField: 'id',
  },
+  // 表格全局唯一表示 保存列配置需要用到
  id: 'property-room-index'
 };

@@ -113,8 +138,8 @@ function handleDownloadExcel() {
          <a-button
            :disabled="!vxeCheckboxChecked(tableApi)"
            danger
-            type="primary"
-            v-access:code="['property:room:remove']"
+            type="primary" 
+            v-access:code="['property:room:remove']" 
            @click="handleMultiDelete">
            {{ $t('pages.common.delete') }}
          </a-button>
--- a/apps/web-antd/src/views/property/room/room-modal.vue
+++ b/apps/web-antd/src/views/property/room/room-modal.vue
@@ -1,24 +1,30 @@
 <script setup lang="ts">
 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 { roomAdd, roomInfo, roomUpdate } from '#/api/property/room';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+
 import { modalSchema } from './data';

 const emit = defineEmits<{ reload: [] }>();
-const isUpdate = ref(false);

+const isUpdate = ref(false);
 const title = computed(() => {
  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
 });

 const [BasicForm, formApi] = useVbenForm({
  commonConfig: {
+    // 默认占满两列
    formItemClass: 'col-span-2',
+    // 默认label宽度 px
    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
    componentProps: {
      class: 'w-full',
    }
@@ -36,6 +42,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );

 const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
  class: 'w-[550px]',
  fullscreenButton: false,
  onBeforeClose,
@@ -46,13 +53,16 @@ const [BasicModal, modalApi] = useVbenModal({
      return null;
    }
    modalApi.modalLoading(true);
+
    const { id } = modalApi.getData() as { id?: number | string };
    isUpdate.value = !!id;
+
    if (isUpdate.value && id) {
      const record = await roomInfo(id);
      await formApi.setValues(record);
    }
    await markInitialized();
+
    modalApi.modalLoading(false);
  },
 });
@@ -64,6 +74,7 @@ async function handleConfirm() {
    if (!valid) {
      return;
    }
+    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
    const data = cloneDeep(await formApi.getValues());
    await (isUpdate.value ? roomUpdate(data) : roomAdd(data));
    resetInitialized();