1、绿植租赁订单

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

@@ -134,12 +134,12 @@ export const modalSchema: FormSchemaGetter = () => [
       triggerFields: [''],
     },
   },
-  {
-    label: '订单号',
-    fieldName: 'orderNo',
-    component: 'Input',
-    rules: 'required',
-  },
+  // {
+  //   label: '订单号',
+  //   fieldName: 'orderNo',
+  //   component: 'Input',
+  //   rules: 'required',
+  // },
   {
     label: '客户名称',
     fieldName: 'customerName',
@@ -170,25 +170,20 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'RangePicker',
     componentProps: {
       showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      format: 'YYYY-MM-DD',
+      valueFormat: 'YYYY-MM-DD',
     },
     rules: 'selectRequired',
   },
-  {
-    label: '应付总额',
-    fieldName: 'totalAmount',
-    component: 'Input',
-    rules: 'required',
-  },
   {
     label: '租赁方式',
     fieldName: 'rentalType',
     component: 'Select',
     componentProps: {
-      options:getDictOptions('wy_sf')
+      options:getDictOptions('wy_zlfs')
     },
     rules: 'selectRequired',
+    formItemClass:'col-span-2'
   },
   {
     label: '租赁方案id',
@@ -200,6 +195,7 @@ export const modalSchema: FormSchemaGetter = () => [
       triggerFields: ['rentalType'],
     },
     rules: 'required',
+    formItemClass:'col-span-2'
   },
   {
     label: '绿植产品id',
@@ -213,9 +209,14 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '租赁产品数量',
+    label: '租赁数量',
     fieldName: 'productNum',
-    component: 'Input',
+    component: 'InputNumber',
+    componentProps: {
+      min: 1,
+      precision: 0,
+      step: 1
+    },
     dependencies: {
       // 仅当 租赁方式 为 1（单点） 时显示
       show: (formValues) => formValues.rentalType === '1',
@@ -223,6 +224,12 @@ export const modalSchema: FormSchemaGetter = () => [
     },
     rules: 'required',
   },
+  {
+    label: '应付总额',
+    fieldName: 'totalAmount',
+    component: 'Input',
+    rules: 'required',
+  },
   {
     label: '支付状态',
     fieldName: 'paymentStatus',
@@ -231,21 +238,22 @@ export const modalSchema: FormSchemaGetter = () => [
     },
     rules: 'selectRequired',
   },
-  {
-    label: '是否续租',
-    fieldName: 'isRelet',
-    component: 'RadioGroup',
-    componentProps: {
-      buttonStyle: 'solid',
-      optionType: 'button',
-      options: getDictOptions('wy_sf'),
-    },
-  },
+  // {
+  //   label: '是否续租',
+  //   fieldName: 'isRelet',
+  //   component: 'RadioGroup',
+  //   componentProps: {
+  //     buttonStyle: 'solid',
+  //     optionType: 'button',
+  //     options: getDictOptions('wy_sf'),
+  //   },
+  // },
   {
     label: '合同状态',
     fieldName: 'contractStatus',
     component: 'Select',
     componentProps: {
+      options: getDictOptions('wy_htzt'),
     },
   },
   {