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 e25fafe2..5ecf2907 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts @@ -24,6 +24,14 @@ export const querySchema: FormSchemaGetter = () => [ fieldName: 'status', label: '状态', }, + { + component: 'Select', + componentProps: { + options: getDictOptions('pro_processing_weight'), + }, + fieldName: 'processingWeight', + label: '处理权重', + }, ]; export const columns: VxeGridProps['columns'] = [ @@ -148,6 +156,15 @@ export const modalSchema: FormSchemaGetter = () => [ componentProps: {}, rules: 'selectRequired', }, + { + label: '处理权重', + fieldName: 'processingWeight', + component: 'Select', + componentProps: { + options: getDictOptions('pro_processing_weight'), + }, + rules: 'selectRequired', + }, // { // label: '状态', // fieldName: 'status', @@ -216,9 +233,8 @@ export const modalSchema: FormSchemaGetter = () => [ // }, { label: '备注', - fieldName: 'remarkremark', + fieldName: 'remark', component: 'Textarea', - rules: 'required', }, // { // label: '是否超时', @@ -230,6 +246,15 @@ export const modalSchema: FormSchemaGetter = () => [ // }, // rules: 'selectRequired', // }, + { + label: '工单图片', + fieldName: 'orderImgUrl', + component: 'ImageUpload', + componentProps: { + maxCount: 1, + }, + formItemClass: 'col-span-2', + }, ]; export const ordersModalSchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue index bcd5349b..95c8420c 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue @@ -77,6 +77,11 @@ async function handleOpenChange(open: boolean) { {{ orderDetail.compleTime }} + + + {{ orderDetail.imgUrl }} + + {{ orderDetail.orderImgUrl }} + 处理记录 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 b7af6349..a641283f 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 @@ -62,7 +62,7 @@ const [BasicModal, modalApi] = useVbenModal({ } modalApi.modalLoading(true); await queryPersonData() - await queryWorkOrdersType() + const {id} = modalApi.getData() as { id?: number | string }; isUpdate.value = !!id; @@ -134,30 +134,6 @@ async function queryPersonData() { }]) } -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; -}; -