修改任务格式化数据方法

Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex
修改物料隔离
2 changed files with 2 additions and 2 deletions
--- a/src/common/detail.js
+++ b/src/common/detail.js
@ -91,7 +91,7 @@ export function getDataSource(subList) {
 	let items = [];
 	subList.forEach(detail => {
 		var item = items.find(r =>
-			r.itemCode == detail.itemCode && r.batch == detail.batch )
+			r.itemCode == detail.itemCode)
 		if (item == undefined) {
 			item = createItemInfo(detail);
 			let newDetail = createDetailInfo(detail); //
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@ -506,7 +506,7 @@
 					newDetail.managementTypeParams = managementTypeParams;
 					newDetail.fromLocationCode = result.fromLocationCode
 					newDetail.handleQty = Number(result.label.qty)
-					newDetail.batch = result.label.batch
+					newDetail.batch = result.balance.batch
 					newDetail.packQty = balance.packQty;
 					newDetail.packUnit = balance.packUnit;
 					itemp.subList.push(newDetail);
Author	SHA1	Message	Date
lijuncheng	963d52b421	修改任务格式化数据方法	1 day ago
lijuncheng	b9745a72a5	Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex	1 day ago
lijuncheng	9bb6401ba2	修改物料隔离	1 day ago