diff --git a/src/gen/ApiTypes.d.ts b/src/gen/ApiTypes.d.ts index efbf20a..8897ba1 100644 --- a/src/gen/ApiTypes.d.ts +++ b/src/gen/ApiTypes.d.ts @@ -3939,6 +3939,12 @@ declare namespace ApiTypes { type Closed = { "id": number; // id }; + type SoftDelete = { + "id": number; // id + }; + type Restore = { + "id": number; // id + }; type Delete = { "id": number; // id }; diff --git a/src/gen/Apis.ts b/src/gen/Apis.ts index 2797f9e..a8c6304 100644 --- a/src/gen/Apis.ts +++ b/src/gen/Apis.ts @@ -2201,6 +2201,12 @@ export const Apis = { Closed(data: ApiTypes.WorkOrder.HouseWorkOrders.Closed): Promise { return request('company/work_order/house_work_orders/closed', { data }); }, + SoftDelete(data: ApiTypes.WorkOrder.HouseWorkOrders.SoftDelete): Promise { + return request('company/work_order/house_work_orders/soft_delete', { data }); + }, + Restore(data: ApiTypes.WorkOrder.HouseWorkOrders.Restore): Promise { + return request('company/work_order/house_work_orders/restore', { data }); + }, Delete(data: ApiTypes.WorkOrder.HouseWorkOrders.Delete): Promise { return request('company/work_order/house_work_orders/delete', { data }); }, diff --git a/src/pages/attendance/attendance_shifts/pages/create.tsx b/src/pages/attendance/attendance_shifts/pages/create.tsx index cde6d58..5b4f84a 100644 --- a/src/pages/attendance/attendance_shifts/pages/create.tsx +++ b/src/pages/attendance/attendance_shifts/pages/create.tsx @@ -127,7 +127,7 @@ export default function Index({ title = '新增班次' }) { valueType: 'time', fieldProps: { style: { width: '100%' }, - placeholder: '请输入班次开始时间', + placeholder: '请选择班次开始时间', format: 'HH:mm', }, colProps: { span: 8 }, @@ -138,7 +138,7 @@ export default function Index({ title = '新增班次' }) { valueType: 'time', fieldProps: { style: { width: '100%' }, - placeholder: '请输入班次开始时间', + placeholder: '请选择班次结束时间', format: 'HH:mm', }, colProps: { span: 8 }, diff --git a/src/pages/attendance/attendance_shifts/pages/update.tsx b/src/pages/attendance/attendance_shifts/pages/update.tsx index 8f27d1e..94ea01c 100644 --- a/src/pages/attendance/attendance_shifts/pages/update.tsx +++ b/src/pages/attendance/attendance_shifts/pages/update.tsx @@ -197,7 +197,7 @@ export default function Index({ title = '编辑班次' }) { valueType: 'time', fieldProps: { style: { width: '100%' }, - placeholder: '请输入班次开始时间', + placeholder: '请选择班次开始时间', format: 'HH:mm', }, colProps: { span: 8 }, @@ -207,7 +207,7 @@ export default function Index({ title = '编辑班次' }) { key: 'work_end_time', fieldProps: { style: { width: '100%' }, - placeholder: '请输入班次开始时间', + placeholder: '请选择班次结束时间', format: 'HH:mm', }, valueType: 'time', diff --git a/src/pages/work_order/complaint/index.tsx b/src/pages/work_order/complaint/index.tsx index 8634cb5..3f3b49e 100644 --- a/src/pages/work_order/complaint/index.tsx +++ b/src/pages/work_order/complaint/index.tsx @@ -3,7 +3,6 @@ import { MyColumns, MyPageContainer, MyProTableProps, - useCurrentPermissions, } from '@/common'; import { Apis } from '@/gen/Apis'; import { @@ -32,47 +31,6 @@ export const ComplaintOrdersStatusEnum = { }; export default function Index({ title = '客户投诉' }) { - const getCurrentPermissions = useCurrentPermissions(); - let toolBarRender = (action: any) => { - return getCurrentPermissions({ - create: , - }); - }; - let tableRender = (item: any, action: any) => { - return getCurrentPermissions({ - show: , - update: ( - <> - {item.status === 'Pending' && ( - - )} - - ), - assign: ( - <> - {item.assign_status === 'Unassigned' && ( - - )} - - ), - completed: ( - <> - {item.status === 'Completed' && item.is_visited === 0 && ( - - )} - - ), - delete: ( - - Apis.WorkOrder.HouseWorkOrders.SoftDelete({ - id: item.id, - }).then(() => action?.reload()) - } - /> - ), - }); - }; return ( - > {...MyProTableProps.props} - headerTitle="客户投诉" + headerTitle="工单列表" request={async (params, sort) => MyProTableProps.request( { @@ -93,7 +51,9 @@ export default function Index({ title = '客户投诉' }) { Apis.WorkOrder.HouseWorkOrders.List, ) } - toolBarRender={(action) => [toolBarRender(action)]} + toolBarRender={(action) => [ + , + ]} columns={[ MyColumns.ID({ search: false }), MyColumns.EnumTag({ @@ -157,7 +117,31 @@ export default function Index({ title = '客户投诉' }) { MyColumns.Option({ render: (_, item: any, index, action) => ( - <>{tableRender(item, action)} + + {item.status === 'Pending' && ( + + )} + {item.assign_status === 'Unassigned' && ( + + )} + {item.status === 'Completed' && item.is_visited === 0 && ( + + )} + + Apis.WorkOrder.HouseWorkOrders.SoftDelete({ + id: item.id, + }).then(() => action?.reload()) + } + /> ), }), diff --git a/src/pages/work_order/complaint/modals/Create.tsx b/src/pages/work_order/complaint/modals/Create.tsx index 1336b1e..9a94e21 100644 --- a/src/pages/work_order/complaint/modals/Create.tsx +++ b/src/pages/work_order/complaint/modals/Create.tsx @@ -20,11 +20,11 @@ export default function WorkOrderCreate(props: MyBetaModalFormProps) { {...MyModalFormProps.props} title={`创建工单`} - wrapperCol={{ span: 19 }} + labelCol={{ span: 4 }} + wrapperCol={{ span: 20 }} width="600px" layout="horizontal" - labelCol={{ span: 5 }} - trigger={} + trigger={} onOpenChange={(open: any) => { if (open) { form.resetFields(); // 清空表单数据 @@ -45,23 +45,6 @@ export default function WorkOrderCreate(props: MyBetaModalFormProps) { .catch(() => false) } columns={[ - // MyFormItems.EnumRadio({ - // key: 'type', - // title: '工单类型', - // colProps: { span: 24 }, - // // valueEnum: HouseWorkOrdersTypeEnum, - // valueEnum: () => { - // let obj: any = JSON.parse(JSON.stringify(HouseWorkOrdersTypeEnum)); - // delete obj.RenovationAcceptance; - // delete obj.EquipmentMaintenance; - // delete obj.RenovationInspection; - // delete obj.Emergency; - // delete obj.EmergEquipmentMaintenancency; - // delete obj.SecurityInspection; - // return obj; - // }, - // required: true, - // }), MyFormItems.EnumRadio({ key: 'complaint_type', title: '投诉类型', diff --git a/src/pages/work_order/list/modals/WorkOrderCreate.tsx b/src/pages/work_order/list/modals/WorkOrderCreate.tsx index 36f3aa9..12ebaa2 100644 --- a/src/pages/work_order/list/modals/WorkOrderCreate.tsx +++ b/src/pages/work_order/list/modals/WorkOrderCreate.tsx @@ -50,6 +50,14 @@ export default function WorkOrderCreate(props: MyBetaModalFormProps) { valueEnum: () => { let obj: any = JSON.parse(JSON.stringify(HouseWorkOrdersTypeEnum)); delete obj.Complaint; + delete obj.RenovationAcceptance; + delete obj.EquipmentMaintenance; + delete obj.RenovationInspection; + delete obj.Emergency; + delete obj.EmergEquipmentMaintenancency; + delete obj.SecurityInspection; + delete obj.Complaint; + delete obj.QualityCheck; return obj; }, required: true,