diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 805c97f38..294fb6096 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -200,7 +200,7 @@ const butttondata = (row,$index) => { // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainListPointBtn(null), // 标签打印 - // defaultButtons.mainListRecoveryBtn(null), // 制品回收 + defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } @@ -261,6 +261,8 @@ const labelRecovery = async (row) => { let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(params); message.success(t('ts.撤销报工成功')) + buttonBaseClick('refresh',null) + } catch { } finally { tableObject.loading = false diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 64c4af7c7..195e1dab4 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -237,7 +237,7 @@ const butttondata = (row,$index) => { defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 defaultButtons.mainListPointBtn(null), // 标签打印 - // defaultButtons.mainListRecoveryBtn(null), // 制品回收 + defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } @@ -281,6 +281,7 @@ const handleCreatePutawayRequest = async (number:string) => { const labelRecovery = async (row) => { try { await message.confirm(t('ts.确认撤销报工吗?')) + tableObject.loading = true const params = ref({ number: '', inventoryStatus: '', @@ -289,6 +290,7 @@ const labelRecovery = async (row) => { params.inventoryStatus= row.inventoryStatus; let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(params) message.success(t('ts.撤销报工成功')) + buttonBaseClick('refresh',null) } catch { } finally { tableObject.loading = false