访客管理

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

@@ -7,37 +7,25 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'orderId',
-    label: '订单id',
+    label: '订单号',
   },
   {
     component: 'Input',
     fieldName: 'userId',
     label: '租赁人id',
   },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_invoice_status'),
+    },
+    fieldName: 'invoiceStatus',
+    label: '开票状态',
+  },
   {
     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: '总金额',
+    label: '租赁人',
   },
   {
     component: 'DatePicker',
@@ -57,19 +45,6 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'paymentMethod',
     label: '支付方式',
   },
-  {
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions('pro_invoice_status'),
-    },
-    fieldName: 'invoiceStatus',
-    label: '开票状态',
-  },
-  {
-    component: 'Input',
-    fieldName: 'invoiceType',
-    label: '发票类型',
-  },
   {
     component: 'Select',
     componentProps: {
@@ -83,11 +58,16 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '主键',
+    title: '序号',
     field: 'id',
+    slots: {
+      default: ({ rowIndex }) => {
+        return (rowIndex + 1).toString();
+      },
+    },
   },
   {
-    title: '订单id',
+    title: '订单号',
     field: 'orderId',
   },
   {
@@ -95,7 +75,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'userId',
   },
   {
-    title: '租赁人名称',
+    title: '租赁人',
     field: 'userName',
   },
   {
@@ -169,7 +149,7 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '订单id',
+    label: '订单号',
     fieldName: 'orderId',
     component: 'Input',
     rules: 'required',
@@ -181,7 +161,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '租赁人名称',
+    label: '租赁人',
     fieldName: 'userName',
     component: 'Input',
     rules: 'required',
@@ -204,32 +184,6 @@ export const modalSchema: FormSchemaGetter = () => [
     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',

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

@@ -12,12 +12,12 @@ const emit = defineEmits<{ reload: [] }>();
 const isUpdate = ref(false);
 
 const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
+  return isUpdate.value ? $t('pages.common.edit') : '添加收费';
 });
 
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     labelWidth: 80,
     componentProps: {
       class: 'w-full',
@@ -36,7 +36,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );
 
 const [BasicModal, modalApi] = useVbenModal({
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,