承接，关闭

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) => {

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

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) {

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()
   }
 }
 // 获取部门 用于详情 部门回显

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()
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts

@@ -691,7 +691,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 120,
+      width: 150,
       fixed: 'right'
     },
   }

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()
   }
 }
 // 获取部门 用于详情 部门回显