diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index ec8684dc6..7e37b9daa 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -234,7 +234,7 @@ const butttondata = (row, $index) => { // defaultButtons.mainInspectRequestBtn({ hide: row.inspectRequestFlag == 'FALSE' }), // 生成到货检验申请 defaultButtons.mainPutawayRequestCpBtn({ hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest', - hide: row.putawayRequestFlag == 'FALSE' + hide: row.putawayRequestFlag == 'FALSE' || row.recoveryRequestFlag == 'TRUE' }), // 生成采购上架申请 defaultButtons.mainListPointBtn(null), // 标签打印 defaultButtons.mainListRecoveryBtn({ hide: row.recoveryRequestFlag == 'TRUE' }) // 制品回收 //recoveryRequestFlag==TRUE不展示 diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts index 7a0f30cca..a824305b3 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts @@ -14,7 +14,7 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive([ }, { label: '申请单号', - field: 'number', + field: 'requestNumber', sort: 'custom', isSearch: true, isForm: false,