YT-759:采购收货上架按钮

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',

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',

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) }), // 查看质检报告

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',

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',

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,