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

apps/web-antd/src/views/property/clean/cleanOrders/data.ts

@@ -5,6 +5,10 @@ import { resident_unitList } from '#/api/property/resident/unit';
 import { useCleanStore } from '#/store';
 import type { FormSchema } from '../../../../../../../packages/@core/ui-kit/form-ui/src/types';
 import dayjs from 'dayjs';
+import {h} from "vue";
+import {Rate} from "ant-design-vue";
+import {getDictOptions} from "#/utils/dict";
+import {renderDict} from "#/utils/render";
 const cleanStore = useCleanStore();
 
 export const querySchema: (areaList: any[]) => FormSchema[] = (areaList) => [
@@ -111,7 +115,30 @@ export const columns: VxeGridProps['columns'] = [
     field: 'phone',
     width: '250',
   },
-    {
+  {
+    title: '保洁类型',
+    field: 'type',
+    width: 180,
+    slots: {
+      default: ({row}) => {
+        return renderDict(row.type, 'pro_cleaning_type');
+      },
+    },
+  },
+  {
+    title: '评价',
+    field: 'serviceEvalua',
+    width: 180,
+    slots: {
+      default: ({row}) => {
+        return h(Rate, {
+          value: row.serviceEvalua || 0,
+          disabled: true,
+        });
+      },
+    },
+  },
+  {
     title: '订单状态',
     field: 'state',
     width: 'auto',
@@ -222,4 +249,25 @@ export const modalSchema: (isReadonly: boolean) => FormSchema[] = (isReadonly) =
     },
     rules: 'required',
   },
+  {
+    label: '保洁类型',
+    fieldName: 'type',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_cleaning_type'),
+    },
+    rules: 'selectRequired',
+  },
+  {
+    label: '评价',
+    fieldName: 'serviceEvalua',
+    component: 'Rate',
+    componentProps: {
+      allowHalf: false,
+      count: 5,
+      tooltips: ['1星', '2星', '3星', '4星', '5星'],
+      defaultValue: 0
+    },
+    rules: 'required',
+  },
 ];