Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@@ -232,10 +232,10 @@ const butttondata = (row, $index) => {
   return [
     // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
     // defaultButtons.mainInspectRequestBtn({ hide: row.inspectRequestFlag == 'FALSE' }), // 生成到货检验申请
-    defaultButtons.mainPutawayRequestCpBtn({
+    // defaultButtons.mainPutawayRequestCpBtn({
-      hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest',
+    //   hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE' || row.recoveryRequestFlag == 'TRUE'
+    //   hide: row.putawayRequestFlag == 'FALSE' || row.recoveryRequestFlag == 'TRUE'
-    }), // 生成采购上架申请
+    // }), // 生成采购上架申请
     defaultButtons.mainListPointBtn(null), // 标签打印
     defaultButtons.mainListRecoveryBtn({ hide: row.recoveryRequestFlag == 'TRUE' }) // 制品回收 //recoveryRequestFlag==TRUE不展示
   ]