From 53a52d40e2a4348858b17823753f32959eb347a3 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 18 Oct 2024 14:30:40 +0800 Subject: [PATCH] =?UTF-8?q?YT-431=E6=92=A4=E9=94=80=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=94=9F=E6=88=90=E5=88=B6=E5=93=81=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E7=94=B3=E8=AF=B7=E6=8C=89=E9=92=AE=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=92=A4=E9=94=80=E4=B8=8D=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRecordMain/index.vue | 2 +- .../purchaseBarterRecord/purchaseBarterRecordMain.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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,