Browse Source

承接--关闭按钮

master_hella_20240701
wangyufei 5 months ago
parent
commit
5b21cf5960
  1. 4
      src/api/wms/issueJobMain/index.ts
  2. 6
      src/api/wms/productionreceiptJobMain/index.ts
  3. 12
      src/api/wms/productredressJobMain/index.ts
  4. 10
      src/api/wms/putawayJobMain/index.ts
  5. 6
      src/api/wms/transferissueJobMain/index.ts
  6. 12
      src/api/wms/transferreceiptJobMain/index.ts
  7. 12
      src/api/wms/unplannedissueJobMain/index.ts
  8. 38
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
  9. 2
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
  10. 15
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
  11. 15
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
  12. 6
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
  13. 14
      src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
  14. 12
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
  15. 9
      src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
  16. 20
      src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
  17. 11
      src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
  18. 20
      src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
  19. 10
      src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
  20. 11
      src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
  21. 20
      src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
  22. 11
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
  23. 20
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
  24. 10
      src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
  25. 11
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
  26. 4
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
  27. 12
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
  28. 20
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
  29. 25
      src/views/wms/productionManage/productredress/productredressJobMain/index.vue
  30. 11
      src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
  31. 8
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

4
src/api/wms/issueJobMain/index.ts

@ -89,12 +89,12 @@ export const importTemplate = () => {
// 承接发料任务
export const acceptIssueMain = async (id) => {
return await request.get({ url: `/wms/issue-job-main/accept?id=` + id })
return await request.put({ url: `/wms/issue-job-main/accept?id=` + id })
}
// 放弃发料任务
export const abandonIssueMain = async (id) => {
return await request.get({ url: `/wms/issue-job-main/abandon?id=` + id })
return await request.put({ url: `/wms/issue-job-main/abandon?id=` + id })
}
// 关闭发料任务

6
src/api/wms/productionreceiptJobMain/index.ts

@ -89,17 +89,17 @@ export const importTemplate = () => {
// 承接发料任务
export const acceptIssueMain = async (id) => {
return await request.get({ url: `/wms/productionreceipt-job-main/accept?id=` + id })
return await request.put({ url: `/wms/productionreceipt-job-main/accept?id=` + id })
}
// 放弃发料任务
export const abandonIssueMain = async (id) => {
return await request.get({ url: `/wms/productionreceipt-job-main/abandon?id=` + id })
return await request.put({ url: `/wms/productionreceipt-job-main/abandon?id=` + id })
}
// 关闭发料任务
export const closeIssueMain = async (id) => {
return await request.get({ url: `/wms/productionreceipt-job-main/close?id=` + id })
return await request.put({ url: `/wms/productionreceipt-job-main/close?id=` + id })
}
// 执行发料任务

12
src/api/wms/productredressJobMain/index.ts

@ -75,6 +75,18 @@ export const updateProductredressJobMain = async (data: ProductredressJobMainVO)
export const deleteProductredressJobMain = async (id: number) => {
return await request.delete({ url: `/wms/productredress-job-main/delete?id=` + id })
}
// 承接制品回收任务主
export const acceptProductredressJobMain = async (id: number) => {
return await request.put({ url: `/wms/productredress-job-main/accept?id=` + id })
}
// 关闭制品回收任务主
export const closeProductredressJobMain = async (id: number) => {
return await request.put({ url: `/wms/productredress-job-main/close?id=` + id })
}
// 取消承接制品回收任务主
export const abandonProductredressJobMain = async (id: number) => {
return await request.put({ url: `/wms/productredress-job-main/abandon?id=` + id })
}
// 导出制品回收任务主 Excel
export const exportProductredressJobMain = async (params) => {

10
src/api/wms/putawayJobMain/index.ts

@ -91,3 +91,13 @@ export const importTemplate = () => {
export const closePutawayJobMain = (id: number) => {
return request.put({ url: '/wms/putaway-job-main/close?id=' + id })
}
// 承接上架任务主
export const acceptPutawayJobMain = (id: number) => {
return request.put({ url: '/wms/putaway-job-main/accept?id=' + id })
}
// 取消承接上架任务主
export const abandonPutawayJobMain = (id: number) => {
return request.put({ url: '/wms/putaway-job-main/abandon?id=' + id })
}

6
src/api/wms/transferissueJobMain/index.ts

@ -93,15 +93,15 @@ export const importTemplate = () => {
// 关闭-调拨出库任务主
export const closeTransferissueJobMain = (id: number) => {
return request.download({ url: '/wms/transferissue-job-main/close?id=' + id })
return request.put({ url: '/wms/transferissue-job-main/close?id=' + id })
}
// 承接-调拨出库任务主
export const acceptTransferissueJobMain = (id: number) => {
return request.download({ url: '/wms/transferissue-job-main/accept?id=' + id })
return request.put({ url: '/wms/transferissue-job-main/accept?id=' + id })
}
// 放弃-调拨出库任务主
export const abandonTransferissueJobMain = (id: number) => {
return request.download({ url: '/wms/transferissue-job-main/abandon?id=' + id })
return request.put({ url: '/wms/transferissue-job-main/abandon?id=' + id })
}

12
src/api/wms/transferreceiptJobMain/index.ts

@ -73,6 +73,18 @@ export const updateTransferreceiptJobMain = async (data: TransferreceiptJobMainV
export const deleteTransferreceiptJobMain = async (id: number) => {
return await request.delete({ url: `/wms/transferreceipt-job-main/delete?id=` + id })
}
// 承接调拨入库任务主
export const acceptTransferreceiptJobMain = async (id: number) => {
return await request.put({ url: `/wms/transferreceipt-job-main/accept?id=` + id })
}
// 取消承接调拨入库任务主
export const abandonTransferreceiptJobMain = async (id: number) => {
return await request.put({ url: `/wms/transferreceipt-job-main/abandon?id=` + id })
}
// 关闭调拨入库任务主
export const closeTransferreceiptJobMain = async (id: number) => {
return await request.put({ url: `/wms/transferreceipt-job-main/close?id=` + id })
}
// 导出调拨入库任务主 Excel
export const exportTransferreceiptJobMain = async (params) => {

12
src/api/wms/unplannedissueJobMain/index.ts

@ -67,6 +67,18 @@ export const updateUnplannedissueJobMain = async (data: UnplannedissueJobMainVO)
export const deleteUnplannedissueJobMain = async (id: number) => {
return await request.delete({ url: `/wms/unplannedissue-job-main/delete?id=` + id })
}
// 承接计划外出库任务主
export const acceptUnplannedissueJobMain = async (id: number) => {
return await request.delete({ 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 })
}
// 关闭计划外出库任务主
export const closeUnplannedissueJobMain = async (id: number) => {
return await request.delete({ url: `/wms/unplannedissue-job-main/close?id=` + id })
}
// 导出计划外出库任务主 Excel
export const exportUnplannedissueJobMain = async (params) => {

38
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/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'])}), //
]
}
@ -304,14 +304,16 @@ const buttonTableClick = async (val, row) => {
}
handleHandle(aaa)
} else if (val == 'mainJobAba') { //
await message.confirm('确认要放弃吗?')
console.log('列表-操作按钮事件-放弃')
CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
await CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId)
getList()
}).catch(err => {
console.log(err)
})
// await message.confirm('')
// console.log('--')
// CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => {
// message.success(t('common.updateSuccess'))
// getList()
// }).catch(err => {
// console.log(err)
// })
} else if (val == 'mainJobClo') { //
await message.confirm('确认要关闭吗?')
console.log('列表-操作按钮事件-关闭')
@ -322,14 +324,16 @@ const buttonTableClick = async (val, row) => {
console.log(err)
})
} else if (val == 'mainJobAcc') { //
await message.confirm('确认要承接吗?')
console.log('列表-操作按钮事件-承接')
CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
await CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId)
getList()
}).catch(err => {
console.log(err)
})
// await message.confirm('')
// console.log('--')
// CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => {
// message.success(t('common.updateSuccess'))
// getList()
// }).catch(err => {
// console.log(err)
// })
}
}
//

2
src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

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

15
src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@ -206,9 +206,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'])}), //
]
}
@ -312,11 +312,14 @@ const buttonTableClick = async (val, row) => {
handleHandle(aaa)
console.log('列表-操作按钮事件-执行')
} else if (val == 'mainJobAba') { //
DeliverJobMainApi.abandonDeliverJobMain(row.masterId)
await DeliverJobMainApi.abandonDeliverJobMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
DeliverJobMainApi.closeDeliverJobMain(row.masterId)
await DeliverJobMainApi.closeDeliverJobMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
DeliverJobMainApi.acceptDeliverJobMain(row.masterId)
await DeliverJobMainApi.acceptDeliverJobMain(row.masterId)
getList()
}
}
//

15
src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@ -186,9 +186,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,11 +198,14 @@ const buttonTableClick = async (val, row) => {
 if (val == 'mainJobExe') { //
handleHandle
} else if (val == 'mainJobAba') { //
StockupJobMainApi.abandonStockupMainJob(row.masterId)
await StockupJobMainApi.abandonStockupMainJob(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
StockupJobMainApi.closeStockupMainJob(row.masterId)
await StockupJobMainApi.closeStockupMainJob(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
StockupJobMainApi.acceptStockupMainJob(row.masterId)
await StockupJobMainApi.acceptStockupMainJob(row.masterId)
getList()
}
}
//

6
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue

@ -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()
}
}
//

14
src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue

@ -188,9 +188,9 @@ const butttondata = (row,$index) => {
return []
}
return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
// defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), //
// defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -201,13 +201,17 @@ const buttonTableClick = async (val, row) => {
console.log('列表-操作按钮事件-执行')
} else if (val == 'mainJobAba') { //
console.log('列表-操作按钮事件-放弃')
handleAbandon(row.masterId)
// handleAbandon(row.masterId)
await TransferissueJobMainApi.abandonTransferissueJobMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
console.log('列表-操作按钮事件-关闭')
handleClose(row.masterId)
} else if (val == 'mainJobAcc') { //
console.log('列表-操作按钮事件-承接')
handleAccept(row.masterId)
// handleAccept(row.masterId)
await TransferissueJobMainApi.acceptTransferissueJobMain(row.masterId)
getList()
}
}

12
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/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 TransferreceiptJobMainApi.abandonTransferreceiptJobMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
console.log('列表-操作按钮事件-关闭')
await TransferreceiptJobMainApi.closeTransferreceiptJobMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
console.log('列表-操作按钮事件-承接')
await TransferreceiptJobMainApi.acceptTransferreceiptJobMain(row.masterId)
getList()
}
}
//

9
src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue

@ -271,11 +271,14 @@ const buttonTableClick = async (val, row) => {
}
ProductionreceiptJobMainApi.executeIssueMain(aaa)
} else if (val == 'mainJobAba') { //
ProductionreceiptJobMainApi.abandonIssueMain(row.masterId)
await ProductionreceiptJobMainApi.abandonIssueMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
ProductionreceiptJobMainApi.closeIssueMain(row.masterId)
await ProductionreceiptJobMainApi.closeIssueMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
ProductionreceiptJobMainApi.acceptIssueMain(row.masterId)
await ProductionreceiptJobMainApi.acceptIssueMain(row.masterId)
getList()
}
}
//

20
src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts

@ -551,16 +551,16 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// isForm: false,
// table: {
// width: 120,
// fixed: 'right'
// },
// }
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
table: {
width: 150,
fixed: 'right'
},
}
]))
//表单校验

11
src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue

@ -165,7 +165,7 @@ const butttondata = (row,$index) => {
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -243,11 +243,14 @@ const buttonTableClick = async (val, row) => {
}
ProductionreturnJobMainApi.executeProductionreturnMain(aaa)
} else if (val == 'mainJobAba') { //
ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId)
await ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId)
await ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId)
await ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId)
getList()
}
}
//

20
src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts

@ -535,16 +535,16 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// isForm: false,
// table: {
// width: 120,
// fixed: 'right'
// },
// }
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
table: {
width: 150,
fixed: 'right'
},
}
]))
//表单校验

10
src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue

@ -171,9 +171,9 @@ const butttondata = (row,$index) => {
return []
}
return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
// defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -302,12 +302,14 @@ const buttonTableClick = async (val, row) => {
}
RepleinshJobMainApi.executeRepleinshMain(aaa)
} else if (val == 'mainJobAba') { //
RepleinshJobMainApi.abandonRepleinshMain(row.masterId)
await RepleinshJobMainApi.abandonRepleinshMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
await RepleinshJobMainApi.closeRepleinshMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
RepleinshJobMainApi.acceptRepleinshMain(row.masterId)
await RepleinshJobMainApi.acceptRepleinshMain(row.masterId)
getList()
}
}

11
src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@ -159,7 +159,7 @@ const butttondata = (row,$index) => {
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -236,11 +236,14 @@ const buttonTableClick = async (val, row) => {
}
ProductputawayJobMainApi.executeProductputawayMain(aaa)
} else if (val == 'mainJobAba') { //
ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
await ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
getList()
}
}
//

20
src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@ -537,16 +537,16 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// isForm: false,
// table: {
// width: 120,
// fixed: 'right'
// },
// }
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
table: {
width: 150,
fixed: 'right'
},
}
]))
//表单校验

11
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue

@ -73,7 +73,7 @@ import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
//
//
defineOptions({ name: 'ProductputawayJobMain' })
const message = useMessage() //
@ -236,11 +236,14 @@ const buttonTableClick = async (val, row) => {
}
ProductputawayJobMainApi.executeProductputawayMain(aaa)
} else if (val == 'mainJobAba') { //
ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
await ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
getList()
}
}
//

20
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts

@ -539,16 +539,16 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// isForm: false,
// table: {
// width: 120,
// fixed: 'right'
// },
// }
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
table: {
width: 150,
fixed: 'right'
},
}
]))
//表单校验

10
src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@ -225,9 +225,9 @@ const butttondata = (row,$index) => {
return []
}
return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
// defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -321,12 +321,14 @@ const buttonTableClick = async (val, row) => {
}
ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
} else if (val == 'mainJobAba') { //
ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
getList()
}
}
//

11
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue

@ -168,7 +168,7 @@ const butttondata = (row,$index) => {
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -261,11 +261,14 @@ const buttonTableClick = async (val, row) => {
}
ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
} else if (val == 'mainJobAba') { //
ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
getList()
}
}
//

4
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts

@ -555,9 +555,9 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'action',
isDetail: false,
isForm: false,
isTable:false,
isTable:true,
table: {
width: 120,
width: 150,
fixed: 'right'
},
}

12
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@ -67,6 +67,7 @@
</template>
<script setup lang="ts">
//
import download from '@/utils/download'
import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptscrapJobMain.data'
import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
@ -167,7 +168,7 @@ const butttondata = (row,$index) => {
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -257,11 +258,14 @@ const buttonTableClick = async (val, row) => {
}
ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
} else if (val == 'mainJobAba') { //
ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
getList()
}
}
//

20
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts

@ -543,16 +543,16 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// isForm: false,
// table: {
// width: 120,
// fixed: 'right'
// },
// }
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
table: {
width: 150,
fixed: 'right'
},
}
]))
//表单校验

25
src/views/wms/productionManage/productredress/productredressJobMain/index.vue

@ -102,7 +102,14 @@ const buttonBaseClick = (val, item) => {
console.log('其他按钮', item)
}
}
//
const isShowMainButton = (row,val) => {
if (val.indexOf(row.status) > -1) {
return false
} else {
return true
}
}
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@ -110,8 +117,11 @@ const butttondata = (row,$index) => {
return []
}
return[
defaultButtons.mainListEditBtn({hasPermi:'wms:productredress-job-main:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredress-job-main:delete'}), //
// defaultButtons.mainListEditBtn({hasPermi:'wms:productredress-job-main:update'}), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredress-job-main:delete'}), //
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -121,6 +131,15 @@ const buttonTableClick = async (val, row) => {
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.masterId)
} else if (val == 'mainJobAba') { //
await ProductredressJobMainApi.abandonProductredressJobMain(row.masterId)
getList()
} else if (val == 'mainJobClo') { //
await ProductredressJobMainApi.closeProductredressJobMain(row.masterId)
getList()
} else if (val == 'mainJobAcc') { //
await ProductredressJobMainApi.acceptProductredressJobMain(row.masterId)
getList()
}
}

11
src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts

@ -435,6 +435,17 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isForm: false
},
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
isTable:true,
table: {
width: 150,
fixed: 'right'
},
}
]))
// 表单校验

8
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@ -256,9 +256,9 @@ const butttondata = (row,$index) => {
}
return [
defaultButtons.mainListDocumentPrintBtn(null), //
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), //
// defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
]
}
@ -268,11 +268,15 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { //
console.log('列表-操作按钮事件-执行')
} else if (val == 'mainJobAba') { //
await PutawayJobMainApi.abandonPutawayJobMain(row.masterId)
await getList()
console.log('列表-操作按钮事件-放弃')
} else if (val == 'mainJobClo') { //
handleClose(row.masterId)
} else if (val == 'mainJobAcc') { //
console.log('列表-操作按钮事件-承接')
await PutawayJobMainApi.acceptPutawayJobMain(row.masterId)
await getList()
} else if (val == 'documentPrint') {
//
handleDocumentPrint(row)

Loading…
Cancel
Save