From f3e476ebf102ee500c0bb4d918155e0945d0cefe Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 14 Nov 2024 13:33:10 +0800 Subject: [PATCH] =?UTF-8?q?YT-759:=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue | 2 +- .../bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue | 2 +- .../developPurchasereceiptRecordMain/index.vue | 2 +- .../jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue | 2 +- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 2 +- .../toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue index 7bb9ebeb1..b2aab24a8 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue @@ -239,7 +239,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true + hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue index 263095103..c1c43e19e 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue @@ -239,7 +239,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true + hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue index 81df8c479..727a096df 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue @@ -243,7 +243,7 @@ const butttondata = (row, $index) => { hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ - hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true + hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }), // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue index 54b48dd02..e6dd1d9cd 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue @@ -239,7 +239,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true + hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 1fc6cbe04..bd83a87c3 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -248,7 +248,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true + hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue index 2ff8e1048..b78298e9a 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue @@ -240,7 +240,7 @@ const butttondata = (row, $index) => { }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ // hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest', - hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true + hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: true,