diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index f9db6f08e..d74160dc8 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -908,7 +908,7 @@ export function mainListJobCloBtn(option:any) { // 主列表-任务流程-放弃按钮 export function mainListJobAbaBtn(option:any) { return __defaultBtnOption(option,{ - label: t(`ts.放弃`).replace('ts.', ''), + label: t(`ts.取消承接`).replace('ts.', ''), name: 'mainJobAba', hide: false, type: 'danger', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 3019c6e03..a0b3851d6 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -212,9 +212,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']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭 - // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 { label: '拒收', @@ -236,15 +236,20 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') + await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(row.masterId) + getList() } else if (val == 'mainJobClo') { // 拒收 handleClose(row.masterId) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') + await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId) + getList() } else if(val == 'mainPlanCheckQualityReport'){ // 查看质检报告 checkQualityReport(row) } else if(val == 'mainJobRefusal'){ handleRefusal(row.masterId) + getList() } } // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 76c37a9c7..275882287 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -610,7 +610,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 200, + width: 250, fixed: 'right' }, }, diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index 33851cb6d..73aee42a4 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -74,7 +74,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain"; -// 采购收货任务主 +// 备件收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) const message = useMessage() // 消息弹窗 @@ -178,9 +178,9 @@ const butttondata = (row,$index) => { return [] } return [ - // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接 - // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭 - // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃 + defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接 + defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭 + defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃 defaultButtons.mainListJobRecBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:execute'}), // 收货 ] } @@ -214,7 +214,7 @@ const handleExecuteSpare = async (id: number) => { /** 放弃按钮操作 */ const handleAbandon = async (id: number) => { try { - await message.confirm("是否确认放弃任务!") + await message.confirm("是否确认取消承接!") await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(id) message.success("放弃成功") await getList()