diff --git a/src/api/types/centerControl.ts b/src/api/types/centerControl.ts index 417dff1..2397a32 100644 --- a/src/api/types/centerControl.ts +++ b/src/api/types/centerControl.ts @@ -3,5 +3,5 @@ export interface IExecuteCommand { ecuSn: string bikeCode: string - commandCode: 'FIND_BIKE' | 'GPS' | 'OPEN_BATTERY_LOCK' + commandCode: 'FIND_BIKE' | 'GPS' | 'OPEN_BATTERY_LOCK' | 'OPEN_HELMET' | 'UNLOCK' | 'LOCK' } diff --git a/src/api/types/work.ts b/src/api/types/work.ts index 3c2c920..fa509c5 100644 --- a/src/api/types/work.ts +++ b/src/api/types/work.ts @@ -5,3 +5,10 @@ export interface WorkOrdersListType { orderType?: string bikeCode?: string } + +export interface createMaintainOrderType { + bikeCode: string + parts?: number[] + fileUrls?: string[] + remarks?: string +} diff --git a/src/api/upload.ts b/src/api/upload.ts index abeb5dd..cc8ad11 100644 --- a/src/api/upload.ts +++ b/src/api/upload.ts @@ -3,6 +3,8 @@ const { VITE_SERVER_BASEURL } = import.meta.env // 上传远程升级文件 export const remoteUpgradeUrl = `${VITE_SERVER_BASEURL}/operations/ebikeEcuInfo/upload` +// 上传远程故障图片 +export const faultUrl = `${VITE_SERVER_BASEURL}/operations/ebikeBikeOrder/upload` /** * 从图片URL数组下载并上传图片(严格模式:任一失败则整体失败) diff --git a/src/api/work.ts b/src/api/work.ts index 9a8639e..78b55e2 100644 --- a/src/api/work.ts +++ b/src/api/work.ts @@ -1,7 +1,27 @@ -import type { WorkOrdersListType } from './types/work' +import type { createMaintainOrderType, WorkOrdersListType } from './types/work' import { http } from '@/http/http' // 分页查询工单信息 export function queryhWorkOrders(query: WorkOrdersListType) { return http.get('/operations/ebikeBikeOrder/page', query) } + +// 工单详情 +export function queryWorkOrderDetailAPI(orderId: string) { + return http.get(`/operations/ebikeBikeOrder/getInfo`, { orderId }) +} + +// 接取工单 +export function acceptWorkOrderAPI(orderId: string) { + return http.get(`/operations/ebikeBikeOrder/acceptOrder`, { orderId }) +} + +// 分页查询当前员工接取的工单信息 +export function queryMyWorkOrders(query: WorkOrdersListType) { + return http.get('/operations/ebikeBikeOrder/pageByStaff', query) +} + +// 生成维修工单。 +export function createMaintainOrderAPI(data: createMaintainOrderType) { + return http.post('/operations/ebikeBikeOrder/faultOrder', data) +} diff --git a/src/components/instructTools/instructTools.vue b/src/components/instructTools/instructTools.vue new file mode 100644 index 0000000..0c9ca41 --- /dev/null +++ b/src/components/instructTools/instructTools.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/components/mapOrientation/mapOrientation.vue b/src/components/mapOrientation/mapOrientation.vue new file mode 100644 index 0000000..2eb08ab --- /dev/null +++ b/src/components/mapOrientation/mapOrientation.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/pages-sub/changebatteries/changebatteries.vue b/src/pages-sub/changebatteries/changebatteries.vue index 6ae9c96..96b5022 100644 --- a/src/pages-sub/changebatteries/changebatteries.vue +++ b/src/pages-sub/changebatteries/changebatteries.vue @@ -1,10 +1,12 @@ diff --git a/src/pages-sub/warehouse/faultReporting/faultReporting.vue b/src/pages-sub/warehouse/faultReporting/faultReporting.vue new file mode 100644 index 0000000..edddf2e --- /dev/null +++ b/src/pages-sub/warehouse/faultReporting/faultReporting.vue @@ -0,0 +1,344 @@ + + + + + diff --git a/src/pages-sub/warehouse/materialRequisition/materialRequisition.vue b/src/pages-sub/warehouse/materialRequisition/materialRequisition.vue new file mode 100644 index 0000000..a81d164 --- /dev/null +++ b/src/pages-sub/warehouse/materialRequisition/materialRequisition.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/pages-sub/work/inspectionWorkOrder/inspectionWorkOrder.vue b/src/pages-sub/work/inspectionWorkOrder/inspectionWorkOrder.vue new file mode 100644 index 0000000..9b6cff7 --- /dev/null +++ b/src/pages-sub/work/inspectionWorkOrder/inspectionWorkOrder.vue @@ -0,0 +1,253 @@ + + + + + diff --git a/src/pages-sub/work/workOrderDetail/workOrderDetail.vue b/src/pages-sub/work/workOrderDetail/workOrderDetail.vue index 4bb5b77..0333540 100644 --- a/src/pages-sub/work/workOrderDetail/workOrderDetail.vue +++ b/src/pages-sub/work/workOrderDetail/workOrderDetail.vue @@ -1,4 +1,7 @@ + + diff --git a/src/pages/me/me.vue b/src/pages/me/me.vue index 79822e3..9287f94 100644 --- a/src/pages/me/me.vue +++ b/src/pages/me/me.vue @@ -32,7 +32,7 @@ const btnList = ref([ { key: 'picking', name: '领料', - path: '/pages-sub/warehouse/addCenterControl/addCenterControl', + path: '/pages-sub/warehouse/materialRequisition/materialRequisition', customsrc: 'dianchi1', }, { @@ -44,7 +44,7 @@ const btnList = ref([ { key: 'faultreport', name: '故障上报', - path: '/pages/devops/faultreport/faultreport', + path: '/pages-sub/warehouse/faultReporting/faultReporting', customsrc: 'guzhangshangbao', }, { diff --git a/src/pages/myWorkOrder/components/workLIstItem.vue b/src/pages/myWorkOrder/components/workLIstItem.vue new file mode 100644 index 0000000..0d0ef5a --- /dev/null +++ b/src/pages/myWorkOrder/components/workLIstItem.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/pages/myWorkOrder/myWorkOrder.vue b/src/pages/myWorkOrder/myWorkOrder.vue new file mode 100644 index 0000000..0858073 --- /dev/null +++ b/src/pages/myWorkOrder/myWorkOrder.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/src/pages/workOrderList/components/workLIstItem.vue b/src/pages/workOrderList/components/workLIstItem.vue index 614dd1e..068618e 100644 --- a/src/pages/workOrderList/components/workLIstItem.vue +++ b/src/pages/workOrderList/components/workLIstItem.vue @@ -33,15 +33,15 @@ function getIcon(value: string | number) { return icon } -function goDetail() { +function goDetail(orderId: string) { uni.navigateTo({ - url: `/pages-sub/work/workOrderDetail/workOrderDetail`, + url: `/pages-sub/work/workOrderDetail/workOrderDetail?orderId=${orderId}`, }) }