1、绿植租赁订单

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

@@ -7,7 +7,7 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'orderNo',
-    label: '订单编号',
+    label: '订单号',
   },
   {
     component: 'Input',
@@ -17,6 +17,7 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Select',
     componentProps: {
+      options:getDictOptions('wy_khlx')
     },
     fieldName: 'customerType',
     label: '客户类型',
@@ -42,76 +43,84 @@ export const querySchema: FormSchemaGetter = () => [
 
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '订单号',
-    field: 'id',
-  },
   {
     title: '订单号',
     field: 'orderNo',
+    width:100
   },
   {
     title: '客户名称',
     field: 'customerName',
+    width:100
   },
   {
     title: '客户类型',
     field: 'customerType',
+    slots: {default: 'customerType'},
+    width:100
   },
   {
     title: '租赁周期',
     field: 'rentalPeriod',
+    slots: {default: 'rentalPeriod'},
+    width:100
   },
   {
     title: '租赁开始时间',
     field: 'startTime',
+    width:120
   },
   {
     title: '租赁结束时间',
     field: 'endTime',
+    width:120
   },
   {
     title: '应付总额',
     field: 'totalAmount',
+    width:100
   },
   {
     title: '租赁方式',
     field: 'rentalType',
+    slots: {default: 'rentalType'},
+    width:100
   },
   {
-    title: '租赁方案id',
+    title: '租赁商品',
     field: 'planId',
-  },
-  {
-    title: '绿植产品id',
-    field: 'productId',
-  },
-  {
-    title: '租赁产品数量',
-    field: 'productNum',
+    slots: {default: 'planId'},
+    width:100
   },
   {
     title: '支付状态',
     field: 'paymentStatus',
+    slots: {default: 'paymentStatus'},
+    width:100
   },
   {
     title: '是否续租',
     field: 'isRelet',
+    slots: {default: 'isRelet'},
+    width:100
   },
   {
     title: '合同状态',
     field: 'contractStatus',
+    slots: {default: 'contractStatus'},
+    width:100
   },
   {
     title: '签署时间',
     field: 'signTime',
+    width:100
   },
   {
     field: 'action',
     fixed: 'right',
     slots: { default: 'action' },
     title: '操作',
-    width: 180,
+    minWidth: 180,
   },
 ];
 
@@ -142,6 +151,7 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'customerType',
     component: 'Select',
     componentProps: {
+      options:getDictOptions('wy_khlx')
     },
     rules: 'selectRequired',
   },
@@ -150,30 +160,20 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'rentalPeriod',
     component: 'Select',
     componentProps: {
+      options:getDictOptions('wy_time_unit')
     },
     rules: 'selectRequired',
   },
   {
-    label: '租赁开始时间',
-    fieldName: 'startTime',
-    component: 'DatePicker',
+    label: '租赁时间',
+    fieldName: 'rentalTime',
+    component: 'RangePicker',
     componentProps: {
       showTime: true,
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
-    rules: 'required',
-  },
-  {
-    label: '租赁结束时间',
-    fieldName: 'endTime',
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
-    rules: 'required',
+    rules: 'selectRequired',
   },
   {
     label: '应付总额',
@@ -186,6 +186,7 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'rentalType',
     component: 'Select',
     componentProps: {
+      options:getDictOptions('wy_sf')
     },
     rules: 'selectRequired',
   },
@@ -193,16 +194,34 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '租赁方案id',
     fieldName: 'planId',
     component: 'Input',
+    dependencies: {
+      // 仅当 租赁方式 为 2（套餐） 时显示
+      show: (formValues) => formValues.rentalType === '2',
+      triggerFields: ['rentalType'],
+    },
+    rules: 'required',
   },
   {
     label: '绿植产品id',
     fieldName: 'productId',
     component: 'Input',
+    dependencies: {
+      // 仅当 租赁方式 为 1（单点） 时显示
+      show: (formValues) => formValues.rentalType === '1',
+      triggerFields: ['rentalType'],
+    },
+    rules: 'required',
   },
   {
     label: '租赁产品数量',
     fieldName: 'productNum',
     component: 'Input',
+    dependencies: {
+      // 仅当 租赁方式 为 1（单点） 时显示
+      show: (formValues) => formValues.rentalType === '1',
+      triggerFields: ['rentalType'],
+    },
+    rules: 'required',
   },
   {
     label: '支付状态',
@@ -219,6 +238,7 @@ export const modalSchema: FormSchemaGetter = () => [
     componentProps: {
       buttonStyle: 'solid',
       optionType: 'button',
+      options: getDictOptions('wy_sf'),
     },
   },
   {

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

@@ -122,7 +122,7 @@ function handleDownloadExcel() {
 
 <template>
   <Page :auto-content-height="true">
-    <BasicTable table-title="绿植租赁-订单管理列表">
+    <BasicTable table-title="租赁订单列表">
       <template #toolbar-tools>
         <Space>
           <a-button

apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/rentalOrder-modal.vue

@@ -21,7 +21,7 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
     labelWidth: 80,
     // 通用配置项 会影响到所有表单项
@@ -43,7 +43,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[70%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,