diff --git a/apps/web-antd/src/api/property/businessManagement/workOrders/index.ts b/apps/web-antd/src/api/property/businessManagement/workOrders/index.ts index d1148daa..5295f0b6 100644 --- a/apps/web-antd/src/api/property/businessManagement/workOrders/index.ts +++ b/apps/web-antd/src/api/property/businessManagement/workOrders/index.ts @@ -59,3 +59,19 @@ export function workOrdersUpdate(data: WorkOrdersForm) { export function workOrdersRemove(id: ID | IDS) { return requestClient.deleteWithMsg(`/property/workOrders/${id}`); } + +/** + * 派单 + * @param data + */ +export function workOrdersDispatch(data: WorkOrdersForm) { + return requestClient.putWithMsg('/property/workOrders/dispatch', data); +} + +/** + * 抢单 + * @param data + */ +export function workOrdersGrab(data: WorkOrdersForm) { + return requestClient.putWithMsg('/property/workOrders/grab', data); +} diff --git a/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts b/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts index 3513eafd..215848fd 100644 --- a/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts +++ b/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts @@ -83,7 +83,7 @@ export interface WorkOrdersVO { */ imgUrl: string; - evaluateImgPath: string | undefined; + evaluateImgPath: string[]; /** * 评价内容 */ @@ -101,7 +101,7 @@ export interface WorkOrdersVO { */ orderImgUrl: string; - orderImgPath: string|undefined; + orderImgPath: string[]; reportingType: string; diff --git a/apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts b/apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts index ce780780..65b12b3b 100644 --- a/apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts +++ b/apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts @@ -37,6 +37,11 @@ export interface WorkOrdersTypeVO { isTransfers: string; excludeId: string; + /** + * 处理优先级 + */ + processingWeight: string; + } export interface WorkOrdersTypeForm extends BaseEntity { @@ -79,6 +84,11 @@ export interface WorkOrdersTypeForm extends BaseEntity { * 上级类型id */ parentId?: string; + + /** + * 处理优先级 + */ + processingWeight: string; } export interface WorkOrdersTypeQuery extends PageQuery { diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/index.vue b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/index.vue index d0bba103..fc02d5c5 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/index.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/index.vue @@ -8,7 +8,7 @@ import { import { workOrdersList, } from '#/api/property/businessManagement/workOrders'; -import workOrdersDetail from './work-orders-detail.vue'; +import workOrdersDetail from '../workOrders/work-orders-detail.vue'; import {columns, querySchema} from './data'; const formOptions: VbenFormProps = { 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 cfb2ebd4..f2428646 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts @@ -56,7 +56,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'reportingType', slots: { default: ({row}) => { - return renderDict(row.reportingType, 'wy_gdsblx'); + return row.reportingType!=null?renderDict(row.reportingType, 'wy_gdsblx'):''; }, }, width: 100, @@ -86,7 +86,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'processingWeight', slots: { default: ({row}) => { - return renderDict(row.processingWeight, 'pro_processing_weight'); + return row.processingWeight!=null?renderDict(row.processingWeight, 'pro_processing_weight'):''; }, }, width: 100, diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/index.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/index.vue index d3b158a7..b95d4316 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/index.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/index.vue @@ -184,14 +184,16 @@ onMounted(async () => { + diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue index 7712c344..f766a4ef 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue @@ -15,6 +15,7 @@ import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup'; import {modalSchema} from './data'; import {workOrdersTypeTree} from "#/api/property/businessManagement/workOrdersType"; +import type {WorkOrdersTypeVO} from "#/api/property/businessManagement/workOrdersType/model"; const emit = defineEmits<{ reload: [] }>(); @@ -108,7 +109,7 @@ async function queryWorkOrdersType() { const options = await workOrdersTypeTree() formApi.updateSchema([ { - componentProps: () => ({ + componentProps: (formModel) => ({ class: 'w-full', fieldNames: { key: 'id', @@ -123,16 +124,15 @@ async function queryWorkOrdersType() { treeLine: { showLeafIcon: false }, treeNodeFilterProp: 'orderTypeName', treeNodeLabelProp: 'orderTypeName', + async onSelect(type:string,node:WorkOrdersTypeVO) { + formModel.processingWeight = node.processingWeight; + }, }), fieldName: 'type', }, ]); } -const filterOption = (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0; -}; -