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

src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue

@@ -135,6 +135,7 @@ const buttonOperationClick = async (row, label, index)=> {
     return
   }
   detatableDataBom.params.itemCode = row.itemCode
+  detatableDataBom.params.masterId = row.id
   DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
   bomModelVisible.value = true
   await getDetailListBom()
@@ -181,7 +182,7 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.masterId
+      masterId: row.id
     }
     await getDetailListBom()
   }