From beb4bf470d52847c89d762f2219cf954ee79469d Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Wed, 23 Jul 2025 15:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workOrderPending/data.ts                  |  42 -----
 .../workOrderPending/orders-modal.vue         | 138 ---------------
 .../workOrderPending/work-orders-detail.vue   |   4 +-
 .../workOrderPending/workOrders-modal.vue     | 163 ------------------
 .../workOrderProcessed/data.ts                |  42 -----
 .../workOrderProcessed/orders-modal.vue       | 138 ---------------
 .../workOrderProcessed/work-orders-detail.vue |   2 +-
 .../workOrderProcessed/workOrders-modal.vue   | 163 ------------------
 .../businessManagement/workOrders/data.ts     |   6 -
 .../customerService/centerConsole/index.vue   |   7 +-
 10 files changed, 9 insertions(+), 696 deletions(-)
 delete mode 100644 apps/web-antd/src/views/property/businessManagement/workOrderPending/orders-modal.vue
 delete mode 100644 apps/web-antd/src/views/property/businessManagement/workOrderPending/workOrders-modal.vue
 delete mode 100644 apps/web-antd/src/views/property/businessManagement/workOrderProcessed/orders-modal.vue
 delete mode 100644 apps/web-antd/src/views/property/businessManagement/workOrderProcessed/workOrders-modal.vue

diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts
index ab9a9656..adc44a39 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts
+++ b/apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts
@@ -1,7 +1,6 @@
 import type {FormSchemaGetter} from '#/adapter/form';
 import type {VxeGridProps} from '#/adapter/vxe-table';
 import {renderDict} from "#/utils/render";
-import {getDictOptions} from "#/utils/dict";
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -14,14 +13,6 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'orderName',
     label: '工单名称',
   },
-  // {
-  //   component: 'Select',
-  //   componentProps: {
-  //     options: getDictOptions('wy_gdclzt'),
-  //   },
-  //   fieldName: 'status',
-  //   label: '状态',
-  // },
 ];
 
 export const columns: VxeGridProps['columns'] = [
@@ -63,37 +54,4 @@ export const columns: VxeGridProps['columns'] = [
   },
 ];
 
-export const ordersModalSchema: FormSchemaGetter = () => [
-  {
-    label: 'id',
-    fieldName: 'id',
-    component: 'Input',
-    dependencies: {
-      show: () => false,
-      triggerFields: [''],
-    },
-  },
-  {
-    label: '状态',
-    fieldName: 'status',
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions('wy_gdclzt'),
-    },
-    rules: 'selectRequired',
-    disabled: true
-  },
-  {
-    label: '处理人',
-    fieldName: 'handler',
-    component: 'ApiSelect',
-    formItemClass: 'col-span-2',
-    rules: 'selectRequired',
-    dependencies: {
-      disabled: (formValue) =>formValue.status === '2' ,
-      triggerFields: ['status'],
-    },
-  },
-]
-
 
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderPending/orders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrderPending/orders-modal.vue
deleted file mode 100644
index d6697747..00000000
--- a/apps/web-antd/src/views/property/businessManagement/workOrderPending/orders-modal.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<script setup lang="ts">
-import {useVbenModal} from '@vben/common-ui';
-import {cloneDeep} from '@vben/utils';
-import {useVbenForm} from '#/adapter/form';
-import {
-  workOrdersInfo,
-  workOrdersUpdate
-} from '#/api/property/businessManagement/workOrders';
-import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
-import {ordersModalSchema} from './data';
-import {personList} from "#/api/property/resident/person";
-import {renderDictValue} from "#/utils/render";
-import {ref} from "vue";
-import { useUserStore } from '@vben/stores';
-
-const userStore = useUserStore();
-const emit = defineEmits<{ reload: [] }>();
-
-const [BasicForm, formApi] = useVbenForm({
-  commonConfig: {
-    // 默认占满两列
-    formItemClass: 'col-span-1',
-    // 默认label宽度 px
-    labelWidth: 80,
-    // 通用配置项 会影响到所有表单项
-    componentProps: {
-      class: 'w-full',
-    }
-  },
-  schema: ordersModalSchema(),
-  showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
-});
-
-const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
-  {
-    initializedGetter: defaultFormValueGetter(formApi),
-    currentGetter: defaultFormValueGetter(formApi),
-  },
-);
-
-const record = ref({})
-const title = ref('派单')
-const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
-  class: 'w-[550px]',
-  fullscreenButton: false,
-  onBeforeClose,
-  onClosed: handleClosed,
-  onConfirm: handleConfirm,
-  onOpenChange: async (isOpen) => {
-    if (!isOpen) {
-      return null;
-    }
-    modalApi.modalLoading(true);
-    await queryPersonData()
-    const {id} = modalApi.getData() as { id?: number | string };
-    const {mean} = modalApi.getData() as { rob?: number | string };
-    if (id) {
-      record.value = await workOrdersInfo(id);
-      if(mean === 'rob'){
-        title.value = '抢单'
-        record.value.status = '2';
-        record.value.handler = record.value.initiatorPeople;
-      }else{
-        title.value = '派单'
-        record.value.status = '1';
-        record.value.handler = null;
-      }
-      await formApi.setValues(record.value);
-    }
-    await markInitialized();
-
-    modalApi.modalLoading(false);
-  },
-});
-
-async function handleConfirm() {
-  try {
-    modalApi.lock(true);
-    const {valid} = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-    const data = cloneDeep(await formApi.getValues());
-    if(title.value === '派单'){
-      record.value.handler = data.handler
-    }else{
-      record.value.handler = userStore.userInfo.userId
-    }
-    await  workOrdersUpdate(record.value)
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
-  } catch (error) {
-    console.error(error);
-  } finally {
-    modalApi.lock(false);
-  }
-}
-
-async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
-}
-
-async function queryPersonData() {
-  let params = {
-    pageSize: 1000,
-    pageNum: 1,
-  }
-  const res = await personList(params);
-  const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
-    value: user.id,
-  }));
-  formApi.updateSchema([
-    {
-      componentProps: () => ({
-        options: options,
-        showSearch:true,
-        filterOption: filterOption
-      }),
-      fieldName: 'handler',
-    }])
-}
-
-const filterOption = (input: string, option: any) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-};
-</script>
-
-<template>
-  <BasicModal :title="title">
-    <BasicForm/>
-  </BasicModal>
-</template>
-
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue
index 2a95bdf1..d8c90fc9 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import {computed, ref, shallowRef} from 'vue';
+import {ref, shallowRef} from 'vue';
 import {useVbenModal} from '@vben/common-ui';
-import {Descriptions, DescriptionsItem, Timeline, TimelineItem, Rate,Divider} from 'ant-design-vue';
+import {Descriptions, DescriptionsItem, Timeline, TimelineItem, Divider} from 'ant-design-vue';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import relativeTime from 'dayjs/plugin/relativeTime';
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderPending/workOrders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrderPending/workOrders-modal.vue
deleted file mode 100644
index 8de52792..00000000
--- a/apps/web-antd/src/views/property/businessManagement/workOrderPending/workOrders-modal.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script setup lang="ts">
-import {computed, ref} from 'vue';
-
-import {useVbenModal} from '@vben/common-ui';
-import {$t} from '@vben/locales';
-import {cloneDeep} from '@vben/utils';
-
-import {useVbenForm} from '#/adapter/form';
-import {
-  workOrdersAdd,
-  workOrdersInfo,
-  workOrdersUpdate
-} from '#/api/property/businessManagement/workOrders';
-import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
-
-import {modalSchema} from './data';
-import {personList} from "#/api/property/resident/person";
-import {renderDictValue} from "#/utils/render";
-import {workOrdersTypeList} from "#/api/property/businessManagement/workOrdersType";
-
-const emit = defineEmits<{ reload: [] }>();
-
-const isUpdate = ref(false);
-const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
-
-const [BasicForm, formApi] = useVbenForm({
-  commonConfig: {
-    // 默认占满两列
-    formItemClass: 'col-span-1',
-    // 默认label宽度 px
-    labelWidth: 80,
-    // 通用配置项 会影响到所有表单项
-    componentProps: {
-      class: 'w-full',
-    }
-  },
-  schema: modalSchema(),
-  showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
-});
-
-const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
-  {
-    initializedGetter: defaultFormValueGetter(formApi),
-    currentGetter: defaultFormValueGetter(formApi),
-  },
-);
-
-const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
-  class: 'w-[70%]',
-  fullscreenButton: false,
-  onBeforeClose,
-  onClosed: handleClosed,
-  onConfirm: handleConfirm,
-  onOpenChange: async (isOpen) => {
-    if (!isOpen) {
-      return null;
-    }
-    modalApi.modalLoading(true);
-    await queryPersonData()
-    await queryWorkOrdersType()
-    const {id} = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
-
-    if (isUpdate.value && id) {
-      const record = await workOrdersInfo(id);
-      record.isTimeOut = record.isTimeOut?.toString()
-      await formApi.setValues(record);
-    }
-    await markInitialized();
-
-    modalApi.modalLoading(false);
-  },
-});
-
-async function handleConfirm() {
-  try {
-    modalApi.lock(true);
-    const {valid} = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? workOrdersUpdate(data) : workOrdersAdd(data));
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
-  } catch (error) {
-    console.error(error);
-  } finally {
-    modalApi.lock(false);
-  }
-}
-
-async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
-}
-
-async function queryPersonData() {
-  let params = {
-    pageSize: 1000,
-    pageNum: 1,
-  }
-  const res = await personList(params);
-  const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
-    value: user.id,
-  }));
-  formApi.updateSchema([{
-    componentProps: () => ({
-      options: options,
-      showSearch:true,
-      filterOption: filterOption
-    }),
-    fieldName: 'initiatorName',
-  },
-    {
-      componentProps: () => ({
-        options: options,
-        showSearch:true,
-        filterOption: filterOption
-      }),
-      fieldName: 'handler',
-    }])
-}
-
-async function queryWorkOrdersType() {
-  let params = {
-    pageSize: 1000,
-    pageNum: 1
-  }
-  const res = await workOrdersTypeList(params)
-  const options = res.rows.map((item) => ({
-    label: item.orderTypeName,
-    value: item.id,
-  }));
-  formApi.updateSchema([{
-    componentProps: () => ({
-      options: options,
-      filterOption: filterOption,
-      showSearch:true,
-    }),
-    fieldName: 'type',
-  }])
-}
-
-const filterOption = (input: string, option: any) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-};
-
-</script>
-
-<template>
-  <BasicModal :title="title">
-    <BasicForm/>
-  </BasicModal>
-</template>
-
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts
index 48c0982a..58cdb57b 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts
+++ b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts
@@ -3,7 +3,6 @@ import type {VxeGridProps} from '#/adapter/vxe-table';
 import {renderDict} from "#/utils/render";
 import {h} from "vue";
 import {Rate} from "ant-design-vue";
-import {getDictOptions} from "#/utils/dict";
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -16,14 +15,6 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'orderName',
     label: '工单名称',
   },
-  // {
-  //   component: 'Select',
-  //   componentProps: {
-  //     options: getDictOptions('wy_gdclzt'),
-  //   },
-  //   fieldName: 'status',
-  //   label: '状态',
-  // },
 ];
 
 export const columns: VxeGridProps['columns'] = [
@@ -104,36 +95,3 @@ export const columns: VxeGridProps['columns'] = [
     width: 120,
   },
 ];
-
-export const ordersModalSchema: FormSchemaGetter = () => [
-  {
-    label: 'id',
-    fieldName: 'id',
-    component: 'Input',
-    dependencies: {
-      show: () => false,
-      triggerFields: [''],
-    },
-  },
-  {
-    label: '状态',
-    fieldName: 'status',
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions('wy_gdclzt'),
-    },
-    rules: 'selectRequired',
-    disabled: true
-  },
-  {
-    label: '处理人',
-    fieldName: 'handler',
-    component: 'ApiSelect',
-    formItemClass: 'col-span-2',
-    rules: 'selectRequired',
-    dependencies: {
-      disabled: (formValue) =>formValue.status === '2' ,
-      triggerFields: ['status'],
-    },
-  },
-]
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/orders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/orders-modal.vue
deleted file mode 100644
index d6697747..00000000
--- a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/orders-modal.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<script setup lang="ts">
-import {useVbenModal} from '@vben/common-ui';
-import {cloneDeep} from '@vben/utils';
-import {useVbenForm} from '#/adapter/form';
-import {
-  workOrdersInfo,
-  workOrdersUpdate
-} from '#/api/property/businessManagement/workOrders';
-import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
-import {ordersModalSchema} from './data';
-import {personList} from "#/api/property/resident/person";
-import {renderDictValue} from "#/utils/render";
-import {ref} from "vue";
-import { useUserStore } from '@vben/stores';
-
-const userStore = useUserStore();
-const emit = defineEmits<{ reload: [] }>();
-
-const [BasicForm, formApi] = useVbenForm({
-  commonConfig: {
-    // 默认占满两列
-    formItemClass: 'col-span-1',
-    // 默认label宽度 px
-    labelWidth: 80,
-    // 通用配置项 会影响到所有表单项
-    componentProps: {
-      class: 'w-full',
-    }
-  },
-  schema: ordersModalSchema(),
-  showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
-});
-
-const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
-  {
-    initializedGetter: defaultFormValueGetter(formApi),
-    currentGetter: defaultFormValueGetter(formApi),
-  },
-);
-
-const record = ref({})
-const title = ref('派单')
-const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
-  class: 'w-[550px]',
-  fullscreenButton: false,
-  onBeforeClose,
-  onClosed: handleClosed,
-  onConfirm: handleConfirm,
-  onOpenChange: async (isOpen) => {
-    if (!isOpen) {
-      return null;
-    }
-    modalApi.modalLoading(true);
-    await queryPersonData()
-    const {id} = modalApi.getData() as { id?: number | string };
-    const {mean} = modalApi.getData() as { rob?: number | string };
-    if (id) {
-      record.value = await workOrdersInfo(id);
-      if(mean === 'rob'){
-        title.value = '抢单'
-        record.value.status = '2';
-        record.value.handler = record.value.initiatorPeople;
-      }else{
-        title.value = '派单'
-        record.value.status = '1';
-        record.value.handler = null;
-      }
-      await formApi.setValues(record.value);
-    }
-    await markInitialized();
-
-    modalApi.modalLoading(false);
-  },
-});
-
-async function handleConfirm() {
-  try {
-    modalApi.lock(true);
-    const {valid} = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-    const data = cloneDeep(await formApi.getValues());
-    if(title.value === '派单'){
-      record.value.handler = data.handler
-    }else{
-      record.value.handler = userStore.userInfo.userId
-    }
-    await  workOrdersUpdate(record.value)
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
-  } catch (error) {
-    console.error(error);
-  } finally {
-    modalApi.lock(false);
-  }
-}
-
-async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
-}
-
-async function queryPersonData() {
-  let params = {
-    pageSize: 1000,
-    pageNum: 1,
-  }
-  const res = await personList(params);
-  const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
-    value: user.id,
-  }));
-  formApi.updateSchema([
-    {
-      componentProps: () => ({
-        options: options,
-        showSearch:true,
-        filterOption: filterOption
-      }),
-      fieldName: 'handler',
-    }])
-}
-
-const filterOption = (input: string, option: any) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-};
-</script>
-
-<template>
-  <BasicModal :title="title">
-    <BasicForm/>
-  </BasicModal>
-</template>
-
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue
index abdd4c3e..96151986 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {computed, ref, shallowRef} from 'vue';
+import {ref, shallowRef} from 'vue';
 import {useVbenModal} from '@vben/common-ui';
 import {Descriptions, DescriptionsItem, Timeline, TimelineItem, Rate,Divider} from 'ant-design-vue';
 import dayjs from 'dayjs';
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/workOrders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/workOrders-modal.vue
deleted file mode 100644
index 8de52792..00000000
--- a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/workOrders-modal.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script setup lang="ts">
-import {computed, ref} from 'vue';
-
-import {useVbenModal} from '@vben/common-ui';
-import {$t} from '@vben/locales';
-import {cloneDeep} from '@vben/utils';
-
-import {useVbenForm} from '#/adapter/form';
-import {
-  workOrdersAdd,
-  workOrdersInfo,
-  workOrdersUpdate
-} from '#/api/property/businessManagement/workOrders';
-import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
-
-import {modalSchema} from './data';
-import {personList} from "#/api/property/resident/person";
-import {renderDictValue} from "#/utils/render";
-import {workOrdersTypeList} from "#/api/property/businessManagement/workOrdersType";
-
-const emit = defineEmits<{ reload: [] }>();
-
-const isUpdate = ref(false);
-const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
-
-const [BasicForm, formApi] = useVbenForm({
-  commonConfig: {
-    // 默认占满两列
-    formItemClass: 'col-span-1',
-    // 默认label宽度 px
-    labelWidth: 80,
-    // 通用配置项 会影响到所有表单项
-    componentProps: {
-      class: 'w-full',
-    }
-  },
-  schema: modalSchema(),
-  showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
-});
-
-const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
-  {
-    initializedGetter: defaultFormValueGetter(formApi),
-    currentGetter: defaultFormValueGetter(formApi),
-  },
-);
-
-const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
-  class: 'w-[70%]',
-  fullscreenButton: false,
-  onBeforeClose,
-  onClosed: handleClosed,
-  onConfirm: handleConfirm,
-  onOpenChange: async (isOpen) => {
-    if (!isOpen) {
-      return null;
-    }
-    modalApi.modalLoading(true);
-    await queryPersonData()
-    await queryWorkOrdersType()
-    const {id} = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
-
-    if (isUpdate.value && id) {
-      const record = await workOrdersInfo(id);
-      record.isTimeOut = record.isTimeOut?.toString()
-      await formApi.setValues(record);
-    }
-    await markInitialized();
-
-    modalApi.modalLoading(false);
-  },
-});
-
-async function handleConfirm() {
-  try {
-    modalApi.lock(true);
-    const {valid} = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? workOrdersUpdate(data) : workOrdersAdd(data));
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
-  } catch (error) {
-    console.error(error);
-  } finally {
-    modalApi.lock(false);
-  }
-}
-
-async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
-}
-
-async function queryPersonData() {
-  let params = {
-    pageSize: 1000,
-    pageNum: 1,
-  }
-  const res = await personList(params);
-  const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
-    value: user.id,
-  }));
-  formApi.updateSchema([{
-    componentProps: () => ({
-      options: options,
-      showSearch:true,
-      filterOption: filterOption
-    }),
-    fieldName: 'initiatorName',
-  },
-    {
-      componentProps: () => ({
-        options: options,
-        showSearch:true,
-        filterOption: filterOption
-      }),
-      fieldName: 'handler',
-    }])
-}
-
-async function queryWorkOrdersType() {
-  let params = {
-    pageSize: 1000,
-    pageNum: 1
-  }
-  const res = await workOrdersTypeList(params)
-  const options = res.rows.map((item) => ({
-    label: item.orderTypeName,
-    value: item.id,
-  }));
-  formApi.updateSchema([{
-    componentProps: () => ({
-      options: options,
-      filterOption: filterOption,
-      showSearch:true,
-    }),
-    fieldName: 'type',
-  }])
-}
-
-const filterOption = (input: string, option: any) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-};
-
-</script>
-
-<template>
-  <BasicModal :title="title">
-    <BasicForm/>
-  </BasicModal>
-</template>
-
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts
index c53bb545..c5185488 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts
+++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts
@@ -4,9 +4,6 @@ import {renderDict} from "#/utils/render";
 import {getDictOptions} from "#/utils/dict";
 import {h} from "vue";
 import {Rate} from "ant-design-vue";
-import type {Dayjs} from "dayjs";
-import dayjs from "dayjs";
-
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -216,9 +213,6 @@ export const modalSchema: FormSchemaGetter = () => [
   //   rules: 'selectRequired',
   // },
 ];
-const disabledDate = (current: Dayjs) => {
-  return current && current < dayjs().endOf('day');
-};
 export const ordersModalSchema: FormSchemaGetter = () => [
   {
     label: 'id',
diff --git a/apps/web-antd/src/views/property/customerService/centerConsole/index.vue b/apps/web-antd/src/views/property/customerService/centerConsole/index.vue
index c9d1dc82..147acde9 100644
--- a/apps/web-antd/src/views/property/customerService/centerConsole/index.vue
+++ b/apps/web-antd/src/views/property/customerService/centerConsole/index.vue
@@ -16,7 +16,12 @@ const workOrderCount = ref<EchartsUIType>();
 const { renderEcharts: renderWorkOrderCount } = useEcharts(workOrderCount);
 async function fetchWorkOrderCount() {
   xAxisData.value = board.value.recentWeekWorkOrders
-  console.log(xAxisData.value)
+  const result = xAxisData.value.map(item => {
+    const [year, month, day] = item.date.split('-');
+    const monthDay = `${month}-${day}`;
+    return `${monthDay}${item.dayOfWeek}`;
+  });
+  console.log(result)
   renderWorkOrderCount({
     tooltip: { trigger: 'axis' },
     xAxis: {