绿植管理

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

@@ -2,18 +2,14 @@ import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
+import {orderChargeList} from "#/api/property/chargeManagement";
 
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Input',
+    component: 'Select',
     fieldName: 'orderId',
     label: '订单号',
   },
-  {
-    component: 'Input',
-    fieldName: 'userId',
-    label: '租赁人id',
-  },
   {
     component: 'Select',
     componentProps: {
@@ -27,16 +23,19 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'userName',
     label: '租赁人',
   },
-  {
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-    fieldName: 'chargeDate',
-    label: '收费日期',
-  },
+  // {
+  //   component: 'RangePicker',
+  //   componentProps: {
+  //     showTime: {
+  //       format: 'HH:mm:ss'
+  //     },
+  //     format: 'YYYY-MM-DD HH:mm:ss',
+  //     valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //     placeholder: ['开始时间', '结束时间']
+  //   },
+  //   fieldName: 'chargeDate',
+  //   label: '收费日期',
+  // },
   {
     component: 'Select',
     componentProps: {
@@ -71,7 +70,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'orderId',
   },
   {
-    title: '租赁人id',
+    title: '租赁合同编号',
     field: 'userId',
   },
   {
@@ -129,6 +128,10 @@ export const columns: VxeGridProps['columns'] = [
       },
     },
   },
+  {
+    title: '创建时间',
+    field: 'createTime',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -148,16 +151,21 @@ export const modalSchema: FormSchemaGetter = () => [
       triggerFields: [''],
     },
   },
+  // {
+  //   label: '订单号',
+  //   fieldName: 'orderId',
+  //   component: 'Input',
+  //   rules: 'required',
+  // },
   {
     label: '订单号',
     fieldName: 'orderId',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '租赁人id',
-    fieldName: 'userId',
-    component: 'Input',
+    component: 'ApiSelect',
+    componentProps: {
+      api: orderChargeList,
+      resultField: 'rows',
+      valueField: 'orderId',
+    },
     rules: 'required',
   },
   {