收费管理

apps/web-antd/src/api/property/building/index.ts

@@ -1,8 +1,6 @@
 import type { BuildingVO, BuildingForm, BuildingQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 

apps/web-antd/src/api/property/building/types.ts

@@ -296,10 +296,10 @@ export interface BuildingQuery extends PageQuery {
    */
   cqbh?: string;
 
-    /**
+  /**
-     * 日期范围参数
+   * 日期范围参数
-     */
+   */
-    params?: any;
+  params?: any;
 }
 
 

apps/web-antd/src/api/property/chargeManagement/index.ts

@@ -0,0 +1,59 @@
+import type { OrderChargeVO, OrderChargeForm, OrderChargeQuery } from './model';
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询绿植租赁-订单收费列表
+* @param params
+* @returns 绿植租赁-订单收费列表
+*/
+export function orderChargeList(params?: OrderChargeQuery) {
+  return requestClient.get<PageResult<OrderChargeVO>>('/system/orderCharge/list', { params });
+}
+
+/**
+ * 导出绿植租赁-订单收费列表
+ * @param params
+ * @returns 绿植租赁-订单收费列表
+ */
+export function orderChargeExport(params?: OrderChargeQuery) {
+  return commonExport('/system/orderCharge/export', params ?? {});
+}
+
+/**
+ * 查询绿植租赁-订单收费详情
+ * @param id id
+ * @returns 绿植租赁-订单收费详情
+ */
+export function orderChargeInfo(id: ID) {
+  return requestClient.get<OrderChargeVO>(`/system/orderCharge/${id}`);
+}
+
+/**
+ * 新增绿植租赁-订单收费
+ * @param data
+ * @returns void
+ */
+export function orderChargeAdd(data: OrderChargeForm) {
+  return requestClient.postWithMsg<void>('/system/orderCharge', data);
+}
+
+/**
+ * 更新绿植租赁-订单收费
+ * @param data
+ * @returns void
+ */
+export function orderChargeUpdate(data: OrderChargeForm) {
+  return requestClient.putWithMsg<void>('/system/orderCharge', data);
+}
+
+/**
+ * 删除绿植租赁-订单收费
+ * @param id id
+ * @returns void
+ */
+export function orderChargeRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/system/orderCharge/${id}`);
+}

apps/web-antd/src/api/property/chargeManagement/model.d.ts

@@ -0,0 +1,204 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface OrderChargeVO {
+  /**
+   * 主键
+   */
+  id: string | number;
+
+  /**
+   * 订单id
+   */
+  orderId: string | number;
+
+  /**
+   * 租赁人id（系统用户）
+   */
+  userId: string | number;
+
+  /**
+   * 租赁人名称
+   */
+  userName: string;
+
+  /**
+   * 租金
+   */
+  rent: number;
+
+  /**
+   * 押金
+   */
+  deposit: number;
+
+  /**
+   * 违约金
+   */
+  penalty: number;
+
+  /**
+   * 总金额
+   */
+  totalAmount: number;
+
+  /**
+   * 收费日期
+   */
+  chargeDate: string;
+
+  /**
+   * 支付方式
+   */
+  paymentMethod: number;
+
+  /**
+   * 开票状态
+   */
+  invoiceStatus: number;
+
+  /**
+   * 发票类型
+   */
+  invoiceType: number;
+
+  /**
+   * 收费状态
+   */
+  chargeStatus: number;
+
+}
+
+export interface OrderChargeForm extends BaseEntity {
+  /**
+   * 主键
+   */
+  id?: string | number;
+
+  /**
+   * 订单id
+   */
+  orderId?: string | number;
+
+  /**
+   * 租赁人id（系统用户）
+   */
+  userId?: string | number;
+
+  /**
+   * 租赁人名称
+   */
+  userName?: string;
+
+  /**
+   * 租金
+   */
+  rent?: number;
+
+  /**
+   * 押金
+   */
+  deposit?: number;
+
+  /**
+   * 违约金
+   */
+  penalty?: number;
+
+  /**
+   * 总金额
+   */
+  totalAmount?: number;
+
+  /**
+   * 收费日期
+   */
+  chargeDate?: string;
+
+  /**
+   * 支付方式
+   */
+  paymentMethod?: number;
+
+  /**
+   * 开票状态
+   */
+  invoiceStatus?: number;
+
+  /**
+   * 发票类型
+   */
+  invoiceType?: number;
+
+  /**
+   * 收费状态
+   */
+  chargeStatus?: number;
+
+}
+
+export interface OrderChargeQuery extends PageQuery {
+  /**
+   * 订单id
+   */
+  orderId?: string | number;
+
+  /**
+   * 租赁人id（系统用户）
+   */
+  userId?: string | number;
+
+  /**
+   * 租赁人名称
+   */
+  userName?: string;
+
+  /**
+   * 租金
+   */
+  rent?: number;
+
+  /**
+   * 押金
+   */
+  deposit?: number;
+
+  /**
+   * 违约金
+   */
+  penalty?: number;
+
+  /**
+   * 总金额
+   */
+  totalAmount?: number;
+
+  /**
+   * 收费日期
+   */
+  chargeDate?: string;
+
+  /**
+   * 支付方式
+   */
+  paymentMethod?: number;
+
+  /**
+   * 开票状态
+   */
+  invoiceStatus?: number;
+
+  /**
+   * 发票类型
+   */
+  invoiceType?: number;
+
+  /**
+   * 收费状态
+   */
+  chargeStatus?: number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

apps/web-antd/src/api/property/community/index.ts

@@ -1,8 +1,6 @@
 import type { CommunityVO, CommunityForm, CommunityQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 

apps/web-antd/src/api/property/community/model.d.ts

@@ -217,6 +217,7 @@ export interface CommunityQuery extends PageQuery {
     */
   params?: any;
 }
+
 export interface Community extends BaseEntity {
   /**
    * 社区名称

apps/web-antd/src/api/property/floor/index.ts

@@ -1,8 +1,6 @@
 import type { FloorVO, FloorForm, FloorQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 

apps/web-antd/src/api/property/productManagement/index.ts

@@ -1,8 +1,6 @@
 import type { PropertyVO, PropertyForm, PropertyQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 

apps/web-antd/src/api/property/room/index.ts

@@ -1,8 +1,6 @@
 import type { RoomVO, RoomForm, RoomQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 

apps/web-antd/src/views/property/building/building-detail.vue

@@ -14,7 +14,6 @@ const [BasicModal, modalApi] = useVbenModal({
 });
 
 const buildingDetail = shallowRef<null | Building>(null);
-
 async function handleOpenChange(open: boolean) {
   if (!open) {
     return null;
@@ -22,7 +21,6 @@ async function handleOpenChange(open: boolean) {
   modalApi.modalLoading(true);
   const {id} = modalApi.getData() as { id: number | string };
   const response = await buildingInfo(id);
-  // 赋值
   buildingDetail.value = response;
   modalApi.modalLoading(false);
 }
@@ -31,15 +29,15 @@ async function handleOpenChange(open: boolean) {
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="建筑管理信息" class="w-[70%]">
     <Descriptions v-if="buildingDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
-      <DescriptionsItem label="园区编码">
+      <DescriptionsItem label="小区/园区">
         {{ buildingDetail.communityCode }}
       </DescriptionsItem>
-      <DescriptionsItem label="建筑编码">
-        {{ buildingDetail.buildingCode }}
-      </DescriptionsItem>
       <DescriptionsItem label="建筑名称">
         {{ buildingDetail.buildingName }}
       </DescriptionsItem>
+      <DescriptionsItem label="建筑编码">
+        {{ buildingDetail.buildingCode }}
+      </DescriptionsItem>
       <DescriptionsItem label="省">
         {{ buildingDetail.province }}
       </DescriptionsItem>
@@ -96,11 +94,6 @@ async function handleOpenChange(open: boolean) {
       <DescriptionsItem label="组织编码">
         {{ buildingDetail.orgCode }}
       </DescriptionsItem>
-      <DescriptionsItem label="数据状态" v-if="buildingDetail.dataState!=null">
-        <component
-          :is="renderDict(buildingDetail.dataState,'wy_qylx')"
-        />
-      </DescriptionsItem>
       <DescriptionsItem label="修改时间">
         {{ buildingDetail.modifyTime }}
       </DescriptionsItem>

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

@@ -1,30 +1,24 @@
 <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 { buildingAdd, buildingInfo, buildingUpdate } from '#/api/property/building';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
 import { modalSchema } from './data';
 
 const emit = defineEmits<{ reload: [] }>();
-
 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',
     }
@@ -42,7 +36,6 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );
 
 const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
   class: 'w-[550px]',
   fullscreenButton: false,
   onBeforeClose,
@@ -53,16 +46,13 @@ 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 buildingInfo(id);
       await formApi.setValues(record);
     }
     await markInitialized();
-
     modalApi.modalLoading(false);
   },
 });
@@ -74,7 +64,6 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
     await (isUpdate.value ? buildingUpdate(data) : buildingAdd(data));
     resetInitialized();

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

@@ -1,6 +1,5 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 
@@ -8,46 +7,42 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'communityCode',
-    label: '园区编码',
+    label: '小区/园区',
-  },
-  {
-    component: 'Input',
-    fieldName: 'buildingCode',
-    label: '建筑编码',
   },
   {
     component: 'Input',
     fieldName: 'buildingName',
     label: '建筑名称',
   },
+  {
+    component: 'Input',
+    fieldName: 'buildingCode',
+    label: '建筑编码',
+  },
   {
     component: 'Select',
     componentProps: {
-      // 可选从DictEnum中获取 DictEnum.WY_CQXZ 便于维护
       options: getDictOptions('wy_cqxz'),
     },
     fieldName: 'cqxz',
     label: '产权性质',
   },
-  {
-    component: 'Input',
-    fieldName: 'dataState',
-    label: '数据状态',
-  }
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '园区编码',
+    title: '序号',
-    field: 'communityCode',
+    field: 'id',
-    width: 'auto'
+    slots: {
+      default: ({ rowIndex }) => {
+        return (rowIndex + 1).toString();
+      },
+    },
   },
   {
-    title: '建筑编码',
+    title: '小区/园区',
-    field: 'buildingCode',
+    field: 'communityCode',
     width: 'auto'
   },
   {
@@ -55,6 +50,11 @@ export const columns: VxeGridProps['columns'] = [
     field: 'buildingName',
     width: 'auto'
   },
+  {
+    title: '建筑编码',
+    field: 'buildingCode',
+    width: 'auto'
+  },
   {
     title: '地址',
     field: 'addr',
@@ -66,7 +66,6 @@ export const columns: VxeGridProps['columns'] = [
     width: 'auto',
     slots: {
       default: ({ row }) => {
-        // 可选从DictEnum中获取 DictEnum.WY_CQXZ 便于维护
         return renderDict(row.cqxz, 'wy_cqxz');
       },
     },
@@ -121,11 +120,6 @@ export const columns: VxeGridProps['columns'] = [
     field: 'bzcg',
     width: 'auto'
   },
-  {
-    title: '数据状态',
-    field: 'dataState',
-    width: 'auto'
-  },
   {
     title: '修改时间',
     field: 'modifyTime',
@@ -151,17 +145,11 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '园区编码',
+    label: '小区/园区',
     fieldName: 'communityCode',
     component: 'Input',
     rules: 'required',
   },
-  {
-    label: '建筑编码',
-    fieldName: 'buildingCode',
-    component: 'Input',
-    rules: 'required',
-  },
   {
     label: '建筑名称',
     fieldName: 'buildingName',
@@ -169,8 +157,8 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '组织编码',
+    label: '建筑编码',
-    fieldName: 'orgCode',
+    fieldName: 'buildingCode',
     component: 'Input',
     rules: 'required',
   },
@@ -215,7 +203,6 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'cqxz',
     component: 'Select',
     componentProps: {
-      // 可选从DictEnum中获取 DictEnum.WY_CQXZ 便于维护
       options: getDictOptions('wy_cqxz'),
     },
     rules: 'selectRequired',
@@ -233,7 +220,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '图地编号',
+    label: '土地编号',
     fieldName: 'tdbh',
     component: 'Input',
     rules: 'required',
@@ -284,20 +271,5 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '排序字段',
     fieldName: 'sort',
     component: 'Input',
-  },
-  {
-    label: '数据状态',
-    fieldName: 'dataState',
-    component: 'Input',
-  },
-  {
-    label: '修改时间',
-    fieldName: 'modifyTime',
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
   }
 ];

apps/web-antd/src/views/property/building/index.vue

@@ -2,13 +2,11 @@
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
   type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
   buildingExport,
   buildingList,
@@ -16,12 +14,9 @@ import {
 } from '#/api/property/building';
 import type { BuildingForm } from '#/api/property/building/model';
 import { commonDownloadExcel } from '#/utils/file/download';
-
 import buildingModal from './building-modal.vue';
 import buildingDetail from './building-detail.vue';
 import { columns, querySchema } from './data';
-import unitInfoModal from "#/views/property/resident/unit/unit-detail.vue";
-import type {Resident_unitForm} from "#/api/property/resident/unit/model";
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -32,28 +27,13 @@ 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,
@@ -72,7 +52,6 @@ const gridOptions: VxeGridProps = {
   rowConfig: {
     keyField: 'id',
   },
-  // 表格全局唯一表示 保存列配置需要用到
   id: 'property-building-index'
 };
 
@@ -84,13 +63,16 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
 const [BuildingModal, modalApi] = useVbenModal({
   connectedComponent: buildingModal,
 });
+
 const [buildingDetailModal, buildingDetailApi] = useVbenModal({
   connectedComponent: buildingDetail,
 });
+
 async function handleInfo(row: Required<BuildingForm>) {
-  // buildingDetailApi.setData({ id: row.id });
+  buildingDetailApi.setData({ id: row.id });
   buildingDetailApi.open();
 }
+
 function handleAdd() {
   modalApi.setData({});
   modalApi.open();
@@ -153,12 +135,6 @@ function handleDownloadExcel() {
           >
             {{ $t('pages.common.add') }}
           </a-button>
-          <a-button
-            type="primary"
-            @click="handleInfo"
-          >
-            {{ $t('pages.common.info') }}
-          </a-button>
         </Space>
       </template>
       <template #action="{ row }">

apps/web-antd/src/views/property/community/community-detail.vue

@@ -22,7 +22,6 @@ async function handleOpenChange(open: boolean) {
   modalApi.modalLoading(true);
   const {id} = modalApi.getData() as { id: number | string };
   const response = await communityInfo(id);
-  // 赋值
   communityDetail.value = response;
   modalApi.modalLoading(false);
 }
@@ -31,13 +30,13 @@ async function handleOpenChange(open: boolean) {
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="小区管理信息" class="w-[70%]">
     <Descriptions v-if="communityDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
-      <DescriptionsItem label="社区名称">
+      <DescriptionsItem label="小区名称">
         {{ communityDetail.communityName }}
       </DescriptionsItem>
-      <DescriptionsItem label="社区编码">
+      <DescriptionsItem label="小区编码">
         {{ communityDetail.communityCode }}
       </DescriptionsItem>
-      <DescriptionsItem label="社区类型" v-if="communityDetail.communityType!=null">
+      <DescriptionsItem label="小区类型" v-if="communityDetail.communityType!=null">
         <component
           :is="renderDict(communityDetail.communityType,'wy_sqlx')"
         />
@@ -66,11 +65,6 @@ async function handleOpenChange(open: boolean) {
       <DescriptionsItem label="组织编码">
         {{ communityDetail.orgCode }}
       </DescriptionsItem>
-      <DescriptionsItem label="数据状态" v-if="communityDetail.dataState!=null">
-        <component
-          :is="renderDict(communityDetail.dataState,'wy_cqxz')"
-        />
-      </DescriptionsItem>
       <DescriptionsItem label="修改时间">
         {{ communityDetail.modifyTime }}
       </DescriptionsItem>

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

@@ -1,30 +1,24 @@
 <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 { communityAdd, communityInfo, communityUpdate } from '#/api/property/community';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
 import { modalSchema } from './data';
 
 const emit = defineEmits<{ reload: [] }>();
-
 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',
     }
@@ -42,7 +36,6 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );
 
 const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
   class: 'w-[550px]',
   fullscreenButton: false,
   onBeforeClose,
@@ -53,16 +46,13 @@ 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 communityInfo(id);
       await formApi.setValues(record);
     }
     await markInitialized();
-
     modalApi.modalLoading(false);
   },
 });
@@ -74,7 +64,6 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
     await (isUpdate.value ? communityUpdate(data) : communityAdd(data));
     resetInitialized();

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

@@ -1,6 +1,5 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 
@@ -8,51 +7,47 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'communityName',
-    label: '社区名称',
+    label: '小区名称',
   },
   {
     component: 'Input',
     fieldName: 'communityCode',
-    label: '社区编码',
+    label: '小区编码',
   },
   {
     component: 'Select',
     componentProps: {
-      // 可选从DictEnum中获取 DictEnum.WY_SQLX 便于维护
       options: getDictOptions('wy_sqlx'),
     },
     fieldName: 'communityType',
-    label: '社区类型',
+    label: '小区类型',
-  },
-  {
-    component: 'Input',
-    fieldName: 'dataState',
-    label: '数据状态',
   }
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '主键',
+    title: '序号',
     field: 'id',
+    slots: {
+      default: ({ rowIndex }) => {
+        return (rowIndex + 1).toString();
+      },
+    },
   },
   {
-    title: '社区名称',
+    title: '小区名称',
     field: 'communityName',
   },
   {
-    title: '社区编码',
+    title: '小区编码',
     field: 'communityCode',
   },
   {
-    title: '社区类型',
+    title: '小区类型',
     field: 'communityType',
     slots: {
       default: ({ row }) => {
-        // 可选从DictEnum中获取 DictEnum.WY_SQLX 便于维护
         return renderDict(row.communityType, 'wy_sqlx');
       },
     },
@@ -85,10 +80,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '小图图片',
     field: 'img',
   },
-  {
-    title: '数据状态',
-    field: 'dataState',
-  },
   {
     title: '修改时间',
     field: 'modifyTime',
@@ -113,23 +104,22 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '社区名称',
+    label: '小区名称',
     fieldName: 'communityName',
     component: 'Input',
     rules: 'required',
   },
   {
-    label: '社区编码',
+    label: '小区编码',
     fieldName: 'communityCode',
     component: 'Input',
     rules: 'required',
   },
   {
-    label: '社区类型',
+    label: '小区类型',
     fieldName: 'communityType',
     component: 'Select',
     componentProps: {
-      // 可选从DictEnum中获取 DictEnum.WY_SQLX 便于维护
       options: getDictOptions('wy_sqlx'),
     },
     rules: 'selectRequired',
@@ -175,24 +165,6 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'img',
     component: 'ImageUpload',
     componentProps: {
-      // accept: 'image/*', // 可选拓展名或者mime类型 ,拼接
-      // maxCount: 1, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型
     },
-  },
+  }
-  {
-    label: '数据状态',
-    fieldName: 'dataState',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '修改时间',
-    fieldName: 'modifyTime',
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-  },
 ];

apps/web-antd/src/views/property/community/index.vue

@@ -2,13 +2,11 @@
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
   type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
   communityExport,
   communityList,
@@ -16,7 +14,6 @@ import {
 } from '#/api/property/community';
 import type { CommunityForm } from '#/api/property/community/model';
 import { commonDownloadExcel } from '#/utils/file/download';
-
 import communityModal from './community-modal.vue';
 import { columns, querySchema } from './data';
 import communityDetail from "#/views/property/community/community-detail.vue";
@@ -31,28 +28,13 @@ 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,
@@ -71,7 +53,6 @@ const gridOptions: VxeGridProps = {
   rowConfig: {
     keyField: 'id',
   },
-  // 表格全局唯一表示 保存列配置需要用到
   id: 'property-community-index'
 };
 
@@ -83,11 +64,13 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
 const [CommunityModal, modalApi] = useVbenModal({
   connectedComponent: communityModal,
 });
+
 const [communityDetailModal, communityDetailApi] = useVbenModal({
   connectedComponent: communityDetail,
 });
-async function handleInfo(row: Required<BuildingForm>) {
+
-  // communityDetailApi.setData({ id: row.id });
+async function handleInfo(row: Required<CommunityForm>) {
+  communityDetailApi.setData({ id: row.id });
   communityDetailApi.open();
 }
 
@@ -153,12 +136,6 @@ function handleDownloadExcel() {
           >
             {{ $t('pages.common.add') }}
           </a-button>
-          <a-button
-            type="primary"
-            @click="handleInfo"
-          >
-            {{ $t('pages.common.info') }}
-          </a-button>
         </Space>
       </template>
       <template #action="{ row }">

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: 'communityCode',
-    label: '社区编码',
+    label: '小区/园区',
   },
   {
     component: 'Input',
@@ -15,32 +14,34 @@ export const querySchema: FormSchemaGetter = () => [
   },
   {
     component: 'Input',
-    fieldName: 'floorCode',
+    fieldName: 'floorName',
-    label: '楼层编码',
+    label: '楼层名称',
   },
   {
     component: 'Input',
-    fieldName: 'floorName',
+    fieldName: 'floorCode',
-    label: '楼层数名称',
+    label: '楼层编码',
   },
   {
     component: 'Input',
     fieldName: 'orgCode',
     label: '组织编码',
   },
-  {
-    component: 'Input',
-    fieldName: 'dataState',
-    label: '数据状态',
-  },
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '社区编码',
+    title: '序号',
+    field: 'id',
+    slots: {
+      default: ({ rowIndex }) => {
+        return (rowIndex + 1).toString();
+      },
+    },
+  },
+  {
+    title: '小区/园区',
     field: 'communityCode',
   },
   {
@@ -48,12 +49,12 @@ export const columns: VxeGridProps['columns'] = [
     field: 'buildingCode',
   },
   {
-    title: '楼层编码',
+    title: '楼层名称',
-    field: 'floorCode',
+    field: 'floorName',
   },
   {
-    title: '楼层数名称',
+    title: '楼层编码',
-    field: 'floorName',
+    field: 'floorCode',
   },
   {
     title: '组织编码',
@@ -79,7 +80,7 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '社区编码',
+    label: '小区/园区',
     fieldName: 'communityCode',
     component: 'Input',
     rules: 'required',
@@ -91,17 +92,23 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '楼层编码',
+    label: '单元名称',
-    fieldName: 'floorCode',
+    fieldName: 'buildingCode',
     component: 'Input',
     rules: 'required',
   },
   {
-    label: '楼层数名称',
+    label: '楼层名称',
     fieldName: 'floorName',
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '楼层编码',
+    fieldName: 'floorCode',
+    component: 'Input',
+    rules: 'required',
+  },
   {
     label: '组织编码',
     fieldName: 'orgCode',

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

@@ -1,30 +1,24 @@
 <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 { floorAdd, floorInfo, floorUpdate } from '#/api/property/floor';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
 import { modalSchema } from './data';
 
 const emit = defineEmits<{ reload: [] }>();
-
 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',
     }
@@ -42,7 +36,6 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );
 
 const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
   class: 'w-[550px]',
   fullscreenButton: false,
   onBeforeClose,
@@ -53,16 +46,13 @@ 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 floorInfo(id);
       await formApi.setValues(record);
     }
     await markInitialized();
-
     modalApi.modalLoading(false);
   },
 });
@@ -74,7 +64,6 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
     await (isUpdate.value ? floorUpdate(data) : floorAdd(data));
     resetInitialized();

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

@@ -7,7 +7,6 @@ import {
   vxeCheckboxChecked,
   type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
   floorExport,
   floorList,
@@ -15,7 +14,6 @@ import {
 } from '#/api/property/floor';
 import type { FloorForm } from '#/api/property/floor/model';
 import { commonDownloadExcel } from '#/utils/file/download';
-
 import floorModal from './floor-modal.vue';
 import { columns, querySchema } from './data';
 
@@ -28,28 +26,13 @@ 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,
@@ -68,7 +51,6 @@ const gridOptions: VxeGridProps = {
   rowConfig: {
     keyField: 'id',
   },
-  // 表格全局唯一表示 保存列配置需要用到
   id: 'property-floor-index'
 };
 

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts

@@ -0,0 +1,257 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    fieldName: 'orderId',
+    label: '订单id',
+  },
+  {
+    component: 'Input',
+    fieldName: 'userId',
+    label: '租赁人id',
+  },
+  {
+    component: 'Input',
+    fieldName: 'userName',
+    label: '租赁人名称',
+  },
+  {
+    component: 'Input',
+    fieldName: 'rent',
+    label: '租金',
+  },
+  {
+    component: 'Input',
+    fieldName: 'deposit',
+    label: '押金',
+  },
+  {
+    component: 'Input',
+    fieldName: 'penalty',
+    label: '违约金',
+  },
+  {
+    component: 'Input',
+    fieldName: 'totalAmount',
+    label: '总金额',
+  },
+  {
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+    fieldName: 'chargeDate',
+    label: '收费日期',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_payment_method'),
+    },
+    fieldName: 'paymentMethod',
+    label: '支付方式',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_invoice_status'),
+    },
+    fieldName: 'invoiceStatus',
+    label: '开票状态',
+  },
+  {
+    component: 'Input',
+    fieldName: 'invoiceType',
+    label: '发票类型',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_charging_status'),
+    },
+    fieldName: 'chargeStatus',
+    label: '收费状态',
+  },
+];
+
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
+  {
+    title: '主键',
+    field: 'id',
+  },
+  {
+    title: '订单id',
+    field: 'orderId',
+  },
+  {
+    title: '租赁人id',
+    field: 'userId',
+  },
+  {
+    title: '租赁人名称',
+    field: 'userName',
+  },
+  {
+    title: '租金',
+    field: 'rent',
+  },
+  {
+    title: '押金',
+    field: 'deposit',
+  },
+  {
+    title: '违约金',
+    field: 'penalty',
+  },
+  {
+    title: '总金额',
+    field: 'totalAmount',
+  },
+  {
+    title: '收费日期',
+    field: 'chargeDate',
+  },
+  {
+    title: '支付方式',
+    field: 'paymentMethod',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.paymentMethod, 'pro_payment_method');
+      },
+    },
+  },
+  {
+    title: '开票状态',
+    field: 'invoiceStatus',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.invoiceStatus, 'pro_invoice_status');
+      },
+    },
+  },
+  {
+    title: '发票类型',
+    field: 'invoiceType',
+  },
+  {
+    title: '收费状态',
+    field: 'chargeStatus',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.chargeStatus, 'pro_charging_status');
+      },
+    },
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
+export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '订单id',
+    fieldName: 'orderId',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '租赁人id',
+    fieldName: 'userId',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '租赁人名称',
+    fieldName: 'userName',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '租金',
+    fieldName: 'rent',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '押金',
+    fieldName: 'deposit',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '违约金',
+    fieldName: 'penalty',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '总金额',
+    fieldName: 'totalAmount',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '收费日期',
+    fieldName: 'chargeDate',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    },
+    rules: 'required',
+  },
+  {
+    label: '支付方式',
+    fieldName: 'paymentMethod',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_payment_method'),
+    },
+    rules: 'selectRequired',
+  },
+  {
+    label: '开票状态',
+    fieldName: 'invoiceStatus',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_invoice_status'),
+    },
+    rules: 'selectRequired',
+  },
+  {
+    label: '发票类型',
+    fieldName: 'invoiceType',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '收费状态',
+    fieldName: 'chargeStatus',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_charging_status'),
+    },
+    rules: 'selectRequired',
+  },
+];

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue

@@ -1,5 +1,157 @@
+<script setup lang="ts">
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { getVxePopupContainer } from '@vben/utils';
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import {
+  useVbenVxeGrid,
+  vxeCheckboxChecked,
+  type VxeGridProps
+} from '#/adapter/vxe-table';
+import {
+  orderChargeExport,
+  orderChargeList,
+  orderChargeRemove,
+} from '#/api/property/chargeManagement';
+import type { OrderChargeForm } from '#/api/property/chargeManagement/model';
+import { commonDownloadExcel } from '#/utils/file/download';
+import orderChargeModal from './orderCharge-modal.vue';
+import { columns, querySchema } from './data';
+
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    highlight: true,
+    reserve: true,
+  },
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        return await orderChargeList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  id: 'system-orderCharge-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [OrderChargeModal, modalApi] = useVbenModal({
+  connectedComponent: orderChargeModal,
+});
+
+function handleAdd() {
+  modalApi.setData({});
+  modalApi.open();
+}
+
+async function handleEdit(row: Required<OrderChargeForm>) {
+  modalApi.setData({ id: row.id });
+  modalApi.open();
+}
+
+async function handleDelete(row: Required<OrderChargeForm>) {
+  await orderChargeRemove(row.id);
+  await tableApi.query();
+}
+
+function handleMultiDelete() {
+  const rows = tableApi.grid.getCheckboxRecords();
+  const ids = rows.map((row: Required<OrderChargeForm>) => row.id);
+  Modal.confirm({
+    title: '提示',
+    okType: 'danger',
+    content: `确认删除选中的${ids.length}条记录吗？`,
+    onOk: async () => {
+      await orderChargeRemove(ids);
+      await tableApi.query();
+    },
+  });
+}
+
+function handleDownloadExcel() {
+  commonDownloadExcel(orderChargeExport, '绿植租赁-订单收费数据', tableApi.formApi.form.values, {
+    fieldMappingTime: formOptions.fieldMappingTime,
+  });
+}
+</script>
+
 <template>
-    <div>
+  <Page :auto-content-height="true">
-       收费管理
+    <BasicTable table-title="绿植租赁-订单收费列表">
-    </div>
+      <template #toolbar-tools>
+        <Space>
+          <a-button
+            v-access:code="['system:orderCharge:export']"
+            @click="handleDownloadExcel"
+          >
+            {{ $t('pages.common.export') }}
+          </a-button>
+          <a-button
+            :disabled="!vxeCheckboxChecked(tableApi)"
+            danger
+            type="primary"
+            v-access:code="['system:orderCharge:remove']"
+            @click="handleMultiDelete">
+            {{ $t('pages.common.delete') }}
+          </a-button>
+          <a-button
+            type="primary"
+            v-access:code="['system:orderCharge:add']"
+            @click="handleAdd"
+          >
+            {{ $t('pages.common.add') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            v-access:code="['system:orderCharge:edit']"
+            @click.stop="handleEdit(row)"
+          >
+            {{ $t('pages.common.edit') }}
+          </ghost-button>
+          <Popconfirm
+            :get-popup-container="getVxePopupContainer"
+            placement="left"
+            title="确认删除？"
+            @confirm="handleDelete(row)"
+          >
+            <ghost-button
+              danger
+              v-access:code="['system:orderCharge:remove']"
+              @click.stop=""
+            >
+              {{ $t('pages.common.delete') }}
+            </ghost-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <OrderChargeModal @reload="tableApi.query()" />
+  </Page>
 </template>

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-modal.vue

@@ -0,0 +1,90 @@
+<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 { orderChargeAdd, orderChargeInfo, orderChargeUpdate } from '#/api/property/chargeManagement';
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+import { modalSchema } from './data';
+
+const emit = defineEmits<{ reload: [] }>();
+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',
+    labelWidth: 80,
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: modalSchema(),
+  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 };
+    isUpdate.value = !!id;
+    if (isUpdate.value && id) {
+      const record = await orderChargeInfo(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());
+    await (isUpdate.value ? orderChargeUpdate(data) : orderChargeAdd(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="title">
+    <BasicForm />
+  </BasicModal>
+</template>
+

apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/data.ts

@@ -1,6 +1,5 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 
@@ -8,26 +7,23 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'plantName',
-    label: '产品名称:',
+    label: '产品名称',
   },
   {
     component: 'Input',
     fieldName: 'specification',
-    label: '规格:',
+    label: '规格',
   },
   {
     component: 'Select',
     componentProps: {
-      // 可选从DictEnum中获取 DictEnum.PRODUCT_MANAGEMENT_STATUS 便于维护
       options: getDictOptions('product_management_status'),
     },
     fieldName: 'state',
-    label: '状态:',
+    label: '状态',
   },
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
@@ -72,7 +68,6 @@ export const columns: VxeGridProps['columns'] = [
     field: 'state',
     slots: {
       default: ({ row }) => {
-        // 可选从DictEnum中获取 DictEnum.PRODUCT_MANAGEMENT_STATUS 便于维护
         return renderDict(row.state, 'product_management_status');
       },
     },
@@ -153,7 +148,6 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'state',
     component: 'Select',
     componentProps: {
-      // 可选从DictEnum中获取 DictEnum.PRODUCT_MANAGEMENT_STATUS 便于维护
       options: getDictOptions('product_management_status'),
     },
     rules: 'selectRequired',
@@ -163,9 +157,4 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'remark',
     component: 'Input',
   },
-  // {
-  //   label: '创建时间',
-  //   fieldName: 'creatTime',
-  //   component: 'Input',
-  // },
 ];

apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue

@@ -2,13 +2,11 @@
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
   type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
   plantsProductExport,
   plantsProductList,
@@ -16,12 +14,9 @@ import {
 } from '#/api/property/productManagement';
 import type { PropertyForm } from '#/api/property/productManagement/model';
 import { commonDownloadExcel } from '#/utils/file/download';
-
 import PlantsProductModal from './plantsProduct-modal.vue';
 import PlantsProductDetail from './plantsProduct-detail.vue';
 import { columns, querySchema } from './data';
-import unitInfoModal from "#/views/property/resident/unit/unit-detail.vue";
-import type {Resident_unitForm} from "#/api/property/resident/unit/model";
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -32,28 +27,13 @@ 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,
@@ -72,7 +52,6 @@ const gridOptions: VxeGridProps = {
   rowConfig: {
     keyField: 'id',
   },
-  // 表格全局唯一表示 保存列配置需要用到
   id: 'property-property-index'
 };
 
@@ -88,6 +67,7 @@ const [PlantsProduct, modalApi] = useVbenModal({
 const [PlantsProductDetailModal, PlantsProductDetailApi] = useVbenModal({
   connectedComponent: PlantsProductDetail,
 });
+
 async function handleInfo(row: Required<PropertyForm>) {
   PlantsProductDetailApi.setData({ id: row.id });
   PlantsProductDetailApi.open();

apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/plantsProduct-detail.vue

@@ -22,7 +22,6 @@ async function handleOpenChange(open: boolean) {
   modalApi.modalLoading(true);
   const {id} = modalApi.getData() as { id: number | string };
   const response = await visitorManagementInfo(id);
-  // 赋值
   plantsProductDetail.value = response;
   modalApi.modalLoading(false);
 }

apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/plantsProduct-modal.vue

@@ -1,30 +1,24 @@
 <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 { plantsProductAdd, plantsProductInfo, plantsProductUpdate } from '#/api/property/productManagement';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
 import { modalSchema } from './data';
 
 const emit = defineEmits<{ reload: [] }>();
-
 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',
     }
@@ -42,7 +36,6 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );
 
 const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
   class: 'w-[550px]',
   fullscreenButton: false,
   onBeforeClose,
@@ -53,16 +46,13 @@ 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 plantsProductInfo(id);
       await formApi.setValues(record);
     }
     await markInitialized();
-
     modalApi.modalLoading(false);
   },
 });
@@ -74,7 +64,6 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
     await (isUpdate.value ? plantsProductUpdate(data) : plantsProductAdd(data));
     resetInitialized();

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

@@ -1,13 +1,12 @@
-import type { FormSchemaGetter } from '#/adapter/form';
+import type {FormSchemaGetter} from '#/adapter/form';
-import type { VxeGridProps } from '#/adapter/vxe-table';
+import type {VxeGridProps} from '#/adapter/vxe-table';
 import {getDictOptions} from "#/utils/dict";
 
-
 export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Select',
     fieldName: 'floorCode',
-    label: '所属小区',
+    label: '所属社区',
   },
   {
     component: 'Select',
@@ -26,13 +25,13 @@ export const querySchema: FormSchemaGetter = () => [
   },
   {
     component: 'Input',
-    fieldName: 'roomCode',
+    fieldName: 'roomNumber',
-    label: '房间编码',
+    label: '房间号',
   },
   {
     component: 'Input',
-    fieldName: 'roomNumber',
+    fieldName: 'roomCode',
-    label: '房间号',
+    label: '房间编码',
   },
   {
     component: 'Select',
@@ -52,12 +51,19 @@ export const querySchema: FormSchemaGetter = () => [
   },
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '所属楼层ID',
+    title: '序号',
+    field: 'id',
+    slots: {
+      default: ({ rowIndex }) => {
+        return (rowIndex + 1).toString();
+      },
+    },
+  },
+  {
+    title: '所属楼层',
     field: 'floorCode',
   },
   {
@@ -89,7 +95,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'isForSale',
   },
   {
-    title: '状态',
+    title: '房间状态',
     field: 'status',
   },
   {
@@ -112,23 +118,41 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '所属楼层ID',
+    label: '所属社区',
     fieldName: 'floorCode',
     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: '房间号',
+    fieldName: 'roomNumber',
+    component: 'Input',
+    rules: 'required',
+  },
   {
     label: '房间编码',
     fieldName: 'roomCode',
     component: 'Input',
     rules: 'required',
   },
-  {
-    label: '房间号(如101,202)',
-    fieldName: 'roomNumber',
-    component: 'Input',
-    rules: 'required',
-  },
   {
     label: '房间类型',
     fieldName: 'roomType',
@@ -138,12 +162,12 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '面积(平方米)',
+    label: '面积(㎡)',
     fieldName: 'area',
     component: 'Input',
   },
   {
-    label: '户型(如2室1厅1卫)',
+    label: '户型',
     fieldName: 'layout',
     component: 'Input',
   },
@@ -158,7 +182,7 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '是否可售',
     fieldName: 'isForSale',
-    component: 'Input',
+    component: 'Select',
   },
   {
     label: '房间状态',

apps/web-antd/src/views/property/room/index.vue

@@ -1,20 +1,12 @@
 <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 dayjs from 'dayjs';
-
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
   type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
   roomExport,
   roomList,
@@ -22,7 +14,6 @@ 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';
 
@@ -35,28 +26,13 @@ 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,
@@ -75,7 +51,6 @@ const gridOptions: VxeGridProps = {
   rowConfig: {
     keyField: 'id',
   },
-  // 表格全局唯一表示 保存列配置需要用到
   id: 'property-room-index'
 };
 

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

@@ -1,30 +1,24 @@
 <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 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',
     }
@@ -42,7 +36,6 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );
 
 const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
   class: 'w-[550px]',
   fullscreenButton: false,
   onBeforeClose,
@@ -53,16 +46,13 @@ 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);
   },
 });
@@ -74,7 +64,6 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
     await (isUpdate.value ? roomUpdate(data) : roomAdd(data));
     resetInitialized();