diff --git a/src/api/workorder/index.js b/src/api/workorder/index.js index 1050e7b..599c987 100644 --- a/src/api/workorder/index.js +++ b/src/api/workorder/index.js @@ -27,7 +27,7 @@ export function startWorkOrder(params) { // 获取未完成工单 export function finishWorkOrder(data) { return request({ - url: 'kanban/loginOrsetting/finish_workorder', + url: 'kanban/loginOrsetting/finish_workorder2', method: 'post', data }) diff --git a/src/views/menu/productwork/index.vue b/src/views/menu/productwork/index.vue index 3949b2b..bfb3f01 100644 --- a/src/views/menu/productwork/index.vue +++ b/src/views/menu/productwork/index.vue @@ -105,6 +105,8 @@ import { useRouter } from 'vue-router' const { proxy } = getCurrentInstance() const router = useRouter() const store = proxy.$useMapState([ + 'teamId', + 'lineId', 'teamCode', 'lineCode', 'persionName', @@ -181,11 +183,11 @@ const handlerFinishOrder = () => { const reportWorkDto = { id: workOrderInfo.value.id, fkWorkorder: workOrderInfo.value.workorder, - dispatchNum: workOrderInfo.value.deliveryNum, finishedNum: value, groupCode: workOrderInfo.value.groupId, lineCode: workOrderInfo.value.routeId, - groupLeader: store.persionName.value, + group_Schedule_Id: store.teamId.value, + fk_route_id: store.lineId.value, } const titleStr = proxy.$dayjs().format('MM-DD HH:mm:ss') WorkOrderApi.finishWorkOrder(reportWorkDto).then((res) => {