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 @@ - - - - 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 @@ - - - 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 @@ - - - - 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 @@ - - - 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(); 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: {