From 2587bfabfed947dae3e89f54a35dfec20c3d228f Mon Sep 17 00:00:00 2001 From: andy <1042025947@qq.com> Date: Tue, 9 Jun 2026 16:48:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/orderItem.ts | 6 ++++-- src/views/biz/kingdee/index.vue | 10 +++++++--- src/views/biz/orderItem/index.vue | 22 ++++++++++++++++++++-- src/views/biz/orderProject/index.vue | 7 ++++++- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/api/orderItem.ts b/src/api/orderItem.ts index ec046c5..7c48db9 100644 --- a/src/api/orderItem.ts +++ b/src/api/orderItem.ts @@ -130,7 +130,6 @@ export const orderItemApi = { }, //根据生产编号查询预生产订单 preCreationInfo(id: number, params:any) { - debugger; return request({ url: `/biz/orderItem/preCreation/${id}`, method: 'get', params}) }, @@ -147,7 +146,10 @@ export const orderItemApi = { holdTemporarilySave(id: number, data: KingdeePrdMo[]){ return request({ url: `/biz/orderItem/kingdee/temporarily/save/${id}`, method: 'post', data }) }, - + // 同步订单和计划表 + synchronizationSave(id: number, data: KingdeePrdMo[]) { + return request({ url: `/biz/orderItem/kingdee/order/create/${id}`, method: 'post', data }) + }, // 导出 export(params?: { ids?: string[] diff --git a/src/views/biz/kingdee/index.vue b/src/views/biz/kingdee/index.vue index 386b7fd..46e0cf2 100644 --- a/src/views/biz/kingdee/index.vue +++ b/src/views/biz/kingdee/index.vue @@ -59,7 +59,7 @@ import { useRouter } from 'vue-router' import { CalendarOutline } from '@vicons/ionicons5' -const emit = defineEmits(['holdTemporarilyCallback', "synchronizationCallback","reCrawlCallback"]) +const emit = defineEmits(['close-modal','holdTemporarilyCallback', "synchronizationCallback","reCrawlCallback"]) const dialog = useDialog() const message = useMessage() const router = useRouter() @@ -310,8 +310,12 @@ async function handleSyncOrderAndPlan() { return { ...rest, children: processRoutes } as KingdeePrdMo }) - emit('synchronizationCallback', props.selectedId, draftData) - message.success('同步订单计划成功') + emit('synchronizationCallback', props.selectedId, draftData, (res) => { + if("success" === res){ + message.success('同步订单计划成功') + emit('close-modal') + } + }) kingdeeModalVisible.value = false } catch (error) { // 错误拦截器已处理 diff --git a/src/views/biz/orderItem/index.vue b/src/views/biz/orderItem/index.vue index 1bb5803..d6af573 100644 --- a/src/views/biz/orderItem/index.vue +++ b/src/views/biz/orderItem/index.vue @@ -823,11 +823,29 @@ async function holdTemporarilySave(id: number, data: KingdeePrdMo[]) { } } +// const synchronizationSave = async (id: number, data: KingdeePrdMo[], callback:Function) => { +// try { +// await orderItemApi.synchronizationSave(id, data) .then((rps:any) =>{ + +// }).catch((res) => { +// callback(res) +// }) +// // 接口拿到数据,调用子的回调,回传结果 +// } catch (err) { +// callback(err) +// } +// } + // 同步订单和计划表 -async function synchronizationSave(id: number, data: KingdeePrdMo[]) { +async function synchronizationSave(id: number, data: KingdeePrdMo[], callback:Function) { try { // 恢复数据结构,将 processRoutes 转换为 children - await orderItemApi.synchronizationSave(id, data) + await orderItemApi.synchronizationSave(id, data) + .then((rps:any) =>{ + callback(rps) + }).catch((res) => { + callback(res) + }) } catch (error) { // 错误拦截器已处理 } diff --git a/src/views/biz/orderProject/index.vue b/src/views/biz/orderProject/index.vue index 2597a08..af151b3 100644 --- a/src/views/biz/orderProject/index.vue +++ b/src/views/biz/orderProject/index.vue @@ -731,10 +731,15 @@ async function handleSaveDraft(id: number, data: KingdeePrdMo[]) { } // 同步订单和计划表 -async function handleSyncOrderAndPlan(id: number, data: KingdeePrdMo[]) { +async function handleSyncOrderAndPlan(id: number, data: KingdeePrdMo[], callback:Function) { try { // 恢复数据结构,将 processRoutes 转换为 children await orderProjectApi.saveKingdeeOrderAndPlan(id, data) + .then((rps:any) =>{ + callback(rps) + }).catch((res) => { + callback(res) + }) } catch (error) { // 错误拦截器已处理 }