From fac52009502e628476dcc9200504f528b459c750 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Wed, 13 Nov 2024 14:00:33 +0800 Subject: [PATCH] =?UTF-8?q?YT-759:=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=85=AD=E4=B8=AA=E6=A8=A1=E5=9D=97=E6=B7=BB=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../amvPurchasereceiptRecordMain/index.vue | 3 +-- .../bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue | 3 +-- .../developPurchasereceiptRecordMain/index.vue | 3 +-- .../jisPurchasereceiptRecordMain/index.vue | 3 +-- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 3 +-- .../toolPurchasereceiptRecordMain/index.vue | 6 +++--- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue index 2f3801adb..44d599c83 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue @@ -239,8 +239,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:amv-purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:amv-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 9c07d4d43..fd6e52071 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue @@ -239,8 +239,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:bs-purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:bs-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 8dcc305fe..27f4348ea 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue @@ -243,8 +243,7 @@ const butttondata = (row, $index) => { hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ - hasPermi: 'wms:develop-purchasereceipt-record-main:createPurchasereturnRecord', - hide: row.purchasereturnRecordFlag == 'FALSE' + 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 52ef2b6f8..56f26ac18 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue @@ -239,8 +239,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:jis-purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:jis-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 3dba46e9e..1fc6cbe04 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -248,8 +248,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == '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 a15a8fc31..260bac461 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue @@ -239,11 +239,11 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + // hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest', + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ - hasPermi: 'wms:tool-purchasereceipt-record-main:createPurchasereturnRecord', + hasPermi: true, hide: row.purchasereturnRecordFlag == 'FALSE' }), // 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告