收费管理

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/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/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>
-       收费管理
-    </div>
-</template>
+  <Page :auto-content-height="true">
+    <BasicTable table-title="绿植租赁-订单收费列表">
+      <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();