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

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

@@ -49,6 +49,22 @@ const detailSchema = [
       },
     },
     rules: 'required',
+  },
+      {
+    label: '保洁面积',
+    fieldName: 'area',
+    component: 'InputNumber',
+    rules: 'required',
+    componentProps: {
+      onChange: async (value: number) => {
+        const formValues = await formApi.getValues();
+        if (formValues.peices && value) {
+          await formApi.setValues({
+            sumPeices: Number((formValues.peices * value).toFixed(2)),
+          });
+        }
+      },
+    },
   },
   {
     label: '计量单位',
@@ -116,22 +132,7 @@ const detailSchema = [
     },
     rules: 'required',
   },
-  {
-    label: '保洁面积',
-    fieldName: 'area',
-    component: 'InputNumber',
-    rules: 'required',
-    componentProps: {
-      onChange: async (value: number) => {
-        const formValues = await formApi.getValues();
-        if (formValues.peices && value) {
-          await formApi.setValues({
-            sumPeices: Number((formValues.peices * value).toFixed(2)),
-          });
-        }
-      },
-    },
-  },
+
   {
     label: '合计费用',
     fieldName: 'sumPeices',
@@ -180,7 +181,6 @@ const [BasicModal, modalApi] = useVbenModal({
 });
 
 async function handleConfirm() {
-  console.log('handleConfirm');
   try {
     modalApi.lock(true);
     const { valid } = await formApi.validate();
@@ -206,7 +206,6 @@ async function handleConfirm() {
 }
 
 async function handleClosed() {
-  console.log('handleClosed');
   await formApi.resetForm();
   resetInitialized();
 }

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

@@ -154,6 +154,7 @@ console.log(data);
 }
 
 async function handleClosed() {
+  detailTable.value = []
   await formApi.resetForm();
   resetInitialized();
 }

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

@@ -0,0 +1,5 @@
+<template>
+    <div>
+       收费管理
+    </div>
+</template>

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

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        养护管理
+    </div>
+</template>

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

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        租赁方案管理
+    </div>
+</template>

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

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        订单管理
+    </div>
+</template>

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

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        产品管理
+    </div>
+</template>

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

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        报表统计
+    </div>
+</template>