From d9dd9448940d41283cd6aecda9d3611e9dcbb594 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 22 Jun 2024 10:03:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E6=8E=A5=EF=BC=8C=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/scrapJobMain/index.ts | 12 ++++++++++++ src/api/wms/unplannedissueJobMain/index.ts | 6 +++--- src/api/wms/unplannedreceiptJobMain/index.ts | 13 +++++++++++++ .../inventoryjobManage/scrap/scrapJobMain/index.vue | 12 +++++++++--- .../unplannedissue/unplannedissueJobMain/index.vue | 12 +++++++++--- .../unplannedissueJobMain.data.ts | 2 +- .../unplannedreceiptJobMain/index.vue | 12 +++++++++--- 7 files changed, 56 insertions(+), 13 deletions(-) diff --git a/src/api/wms/scrapJobMain/index.ts b/src/api/wms/scrapJobMain/index.ts index e4b0dfa1e..19a217d2a 100644 --- a/src/api/wms/scrapJobMain/index.ts +++ b/src/api/wms/scrapJobMain/index.ts @@ -67,6 +67,18 @@ export const updateScrapJobMain = async (data: ScrapJobMainVO) => { export const deleteScrapJobMain = async (id: number) => { return await request.delete({ url: `/wms/scrap-job-main/delete?id=` + id }) } +// 承接报废出库任务主 +export const acceptScrapJobMain = async (id: number) => { + return await request.delete({ url: `/wms/scrap-job-main/accept?id=` + id }) +} +// 取消承接报废出库任务主 +export const abandonScrapJobMain = async (id: number) => { + return await request.delete({ url: `/wms/scrap-job-main/abandon?id=` + id }) +} +// 关闭报废出库任务主 +export const closeScrapJobMain = async (id: number) => { + return await request.delete({ url: `/wms/scrap-job-main/close?id=` + id }) +} // 导出报废出库任务主 Excel export const exportScrapJobMain = async (params) => { diff --git a/src/api/wms/unplannedissueJobMain/index.ts b/src/api/wms/unplannedissueJobMain/index.ts index f02206f8e..041520357 100644 --- a/src/api/wms/unplannedissueJobMain/index.ts +++ b/src/api/wms/unplannedissueJobMain/index.ts @@ -69,15 +69,15 @@ export const deleteUnplannedissueJobMain = async (id: number) => { } // 承接计划外出库任务主 export const acceptUnplannedissueJobMain = async (id: number) => { - return await request.delete({ url: `/wms/unplannedissue-job-main/accept?id=` + id }) + return await request.put({ url: `/wms/unplannedissue-job-main/accept?id=` + id }) } // 取消承接计划外出库任务主 export const abandonUnplannedissueJobMain = async (id: number) => { - return await request.delete({ url: `/wms/unplannedissue-job-main/abandon?id=` + id }) + return await request.put({ url: `/wms/unplannedissue-job-main/abandon?id=` + id }) } // 关闭计划外出库任务主 export const closeUnplannedissueJobMain = async (id: number) => { - return await request.delete({ url: `/wms/unplannedissue-job-main/close?id=` + id }) + return await request.put({ url: `/wms/unplannedissue-job-main/close?id=` + id }) } // 导出计划外出库任务主 Excel diff --git a/src/api/wms/unplannedreceiptJobMain/index.ts b/src/api/wms/unplannedreceiptJobMain/index.ts index 0868c7db4..fd2c91743 100644 --- a/src/api/wms/unplannedreceiptJobMain/index.ts +++ b/src/api/wms/unplannedreceiptJobMain/index.ts @@ -68,6 +68,19 @@ export const deleteUnplannedreceiptJobMain = async (id: number) => { return await request.delete({ url: `/wms/unplannedreceipt-job-main/delete?id=` + id }) } +// 承接计划外入库任务主 +export const acceptUnplannedreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedreceipt-job-main/accept?id=` + id }) +} +// 取消承接计划外入库任务主 +export const abandonUnplannedreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedreceipt-job-main/abandon?id=` + id }) +} +// 关闭计划外入库任务主 +export const closeUnplannedreceiptJobMain = async (id: number) => { + return await request.put({ url: `/wms/unplannedreceipt-job-main/close?id=` + id }) +} + // 导出计划外入库任务主 Excel export const exportUnplannedreceiptJobMain = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue index c8d272de6..61b0b715c 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue @@ -185,9 +185,9 @@ const butttondata = (row,$index) => { return [] } return [ - // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 - // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 + defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 + defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } @@ -198,10 +198,16 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') + await ScrapJobMainApi.abandonScrapJobMain(tableObject.params) + getList() } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') + await ScrapJobMainApi.closeScrapJobMain(tableObject.params) + getList() } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') + await ScrapJobMainApi.acceptScrapJobMain(tableObject.params) + getList() } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue index 29c0d5fcd..19d7c0bb8 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue @@ -185,9 +185,9 @@ const butttondata = (row,$index) => { return [] } return [ - // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 - // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 + defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 + defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } @@ -198,10 +198,16 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') + await UnplannedissueJobMainApi.abandonUnplannedissueJobMain(row.masterId) + getList() } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') + await UnplannedissueJobMainApi.closeUnplannedissueJobMain(row.masterId) + getList() } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') + await UnplannedissueJobMainApi.acceptUnplannedissueJobMain(row.masterId) + getList() } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 791637252..1f0e70ef0 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -691,7 +691,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 120, + width: 150, fixed: 'right' }, } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue index be963327d..173434adf 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue @@ -185,9 +185,9 @@ const butttondata = (row,$index) => { return [] } return [ - // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 - // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 + defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 + defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } @@ -198,10 +198,16 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') + await UnplannedreceiptJobMainApi.abandonUnplannedreceiptJobMain(row.masterId) + getList() } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') + await UnplannedreceiptJobMainApi.closeUnplannedreceiptJobMain(row.masterId) + getList() } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') + await UnplannedreceiptJobMainApi.acceptUnplannedreceiptJobMain(row.masterId) + getList() } } // 获取部门 用于详情 部门回显