diff --git a/apps/web-antd/src/api/ops/order-center/index.ts b/apps/web-antd/src/api/ops/order-center/index.ts index 835514ccf..45081825c 100644 --- a/apps/web-antd/src/api/ops/order-center/index.ts +++ b/apps/web-antd/src/api/ops/order-center/index.ts @@ -156,7 +156,6 @@ export namespace OpsOrderCenterApi { orderId: number; // 工单ID userId: number; // 操作人ID } - } // ==================== 工单查询接口 ==================== diff --git a/apps/web-antd/src/api/ops/security/index.ts b/apps/web-antd/src/api/ops/security/index.ts index a63961a6f..c2683a5bb 100644 --- a/apps/web-antd/src/api/ops/security/index.ts +++ b/apps/web-antd/src/api/ops/security/index.ts @@ -52,10 +52,7 @@ export namespace OpsSecurityOrderApi { export function manualCreateSecurityOrder( data: OpsSecurityOrderApi.ManualCreateReq, ) { - return requestClient.post( - '/ops/security/order/manual-create', - data, - ); + return requestClient.post('/ops/security/order/manual-create', data); } /** 手动派单(安保) */ diff --git a/apps/web-antd/src/views/ops/work-order/detail/index.vue b/apps/web-antd/src/views/ops/work-order/detail/index.vue index 542711ea1..b18d9dd63 100644 --- a/apps/web-antd/src/views/ops/work-order/detail/index.vue +++ b/apps/web-antd/src/views/ops/work-order/detail/index.vue @@ -40,10 +40,10 @@ import { } from '#/api/ops/cleaning'; import { getOrderDetail } from '#/api/ops/order-center'; +import SecurityDetailExt from '../../security/work-order/components/security-detail-ext.vue'; import CleaningActions from '../components/cleaning-actions.vue'; import CleaningDetailExt from '../components/cleaning-detail-ext.vue'; import CleaningWorkProgress from '../components/cleaning-work-progress.vue'; -import SecurityDetailExt from '../../security/work-order/components/security-detail-ext.vue'; import { ORDER_TYPE_COLOR_MAP, ORDER_TYPE_TEXT_MAP, diff --git a/apps/web-antd/src/views/ops/work-order/modules/cancel-form.vue b/apps/web-antd/src/views/ops/work-order/modules/cancel-form.vue index a44eef2de..0b1a047ee 100644 --- a/apps/web-antd/src/views/ops/work-order/modules/cancel-form.vue +++ b/apps/web-antd/src/views/ops/work-order/modules/cancel-form.vue @@ -6,8 +6,8 @@ import { IconifyIcon } from '@vben/icons'; import { Alert, Input, message } from 'ant-design-vue'; -import { manualCancelSecurityOrder } from '#/api/ops/security'; import { manualCancelOrder } from '#/api/ops/cleaning'; +import { manualCancelSecurityOrder } from '#/api/ops/security'; defineOptions({ name: 'CancelOrderForm' }); @@ -62,17 +62,15 @@ async function handleSubmit() { loading.value = true; modalApi.setState({ confirmLoading: true }); try { - if (modalData.value.orderType === 'SECURITY') { - await manualCancelSecurityOrder({ - orderId: modalData.value.orderId, - reason: val, - }); - } else { - await manualCancelOrder({ - orderId: modalData.value.orderId, - reason: val, - }); - } + await (modalData.value.orderType === 'SECURITY' + ? manualCancelSecurityOrder({ + orderId: modalData.value.orderId, + reason: val, + }) + : manualCancelOrder({ + orderId: modalData.value.orderId, + reason: val, + })); message.success('工单已取消'); modalApi.close(); emit('success'); diff --git a/apps/web-antd/src/views/ops/work-order/modules/card-view.vue b/apps/web-antd/src/views/ops/work-order/modules/card-view.vue index ce6ff3438..f4368c4ff 100644 --- a/apps/web-antd/src/views/ops/work-order/modules/card-view.vue +++ b/apps/web-antd/src/views/ops/work-order/modules/card-view.vue @@ -1,4 +1,6 @@