Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue

@@ -310,10 +310,12 @@ async function handleConfirm() {
       : isUpdate.value
         ? editCleanId.value
         : '';
-    // data.sumPeices = totalSumPeices;
+
+        data.sumPeices = parseInt(totalSumPeices.value, 10);
+
     // 组装 cleanIds
-    data.cleanIds = detailTable.value.map((item: any) => item.id);
-    data.details = detailTable.value;
+    // data.cleanIds = detailTable.value.map((item: any) => item.id);
+    data.cleanList = detailTable.value;
     console.log(data);
 console.log(12037847120120);
 await clean_orderAdd(data)

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

@@ -51,7 +51,7 @@ const gridOptions: VxeGridProps = {
   rowConfig: {
     keyField: 'id',
   },
-  id: 'system-orderCharge-index'
+  id: 'property-orderCharge-index'
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
@@ -105,7 +105,7 @@ function handleDownloadExcel() {
       <template #toolbar-tools>
         <Space>
           <a-button
-            v-access:code="['system:orderCharge:export']"
+            v-access:code="['property:orderCharge:export']"
             @click="handleDownloadExcel"
           >
             {{ $t('pages.common.export') }}
@@ -114,13 +114,13 @@ function handleDownloadExcel() {
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
             type="primary"
-            v-access:code="['system:orderCharge:remove']"
+            v-access:code="['property:orderCharge:remove']"
             @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>
           <a-button
             type="primary"
-            v-access:code="['system:orderCharge:add']"
+            v-access:code="['property:orderCharge:add']"
             @click="handleAdd"
           >
             {{ $t('pages.common.add') }}
@@ -130,7 +130,7 @@ function handleDownloadExcel() {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['system:orderCharge:edit']"
+            v-access:code="['property:orderCharge:edit']"
             @click.stop="handleEdit(row)"
           >
             {{ $t('pages.common.edit') }}
@@ -143,7 +143,7 @@ function handleDownloadExcel() {
           >
             <ghost-button
               danger
-              v-access:code="['system:orderCharge:remove']"
+              v-access:code="['property:orderCharge:remove']"
               @click.stop=""
             >
               {{ $t('pages.common.delete') }}

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'),
     },
   },
   {

apps/web-antd/src/views/property/resident/person/data.ts

@@ -153,16 +153,6 @@ export const modalSchema: FormSchemaGetter = () => [
   //   rules:'required',
   //   formItemClass: 'col-span-2',
   // },
-  {
-    label: '人脸图片',
-    fieldName: 'img',
-    component: 'ImageUpload',
-    componentProps: {
-      // accept: 'image/*', // 可选拓展名或者mime类型 ,拼接
-      maxCount: 1, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型
-    },
-    formItemClass: 'col-span-2',
-  },
   {
     label: '入驻时间',
     fieldName: 'time',
@@ -179,6 +169,16 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'carNumber',
     component: 'Input',
   },
+  {
+    label: '人脸图片',
+    fieldName: 'img',
+    component: 'ImageUpload',
+    componentProps: {
+      // accept: 'image/*', // 可选拓展名或者mime类型 ,拼接
+      maxCount: 1, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型
+    },
+    formItemClass: 'col-span-2',
+  },
   {
     label: '人员状态',
     fieldName: 'state',