Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

common/detail.js

@@ -9,7 +9,7 @@ export function getDataSource(subList) {
 			item.subList.push(newDetail);
 			items.push(item)
 		} else {
-			item.qty += detail.qty
+			item.qty +=Number(detail.qty)
 			let newDetail = createDetailInfo(detail); //
 			item.subList.push(newDetail);
 		}

pages/productionReturn/request/requestDetail.vue

@@ -27,6 +27,7 @@
 
 	import {
 		goHome,
+		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -57,7 +58,16 @@
 		},
 		onLoad(option) {
 			this.id = option.id;
+			var businessType = option.businessType;
+			var title="生产退料申请详情"
+			if (businessType == 'ReturnToStore') {
+				title = "生产合格退料申请详情"
+			} else if (this.businessType == 'ReturnToHold') {
+				title = "生产隔离退料申请详情"
+			}
 			this.getDetail();
+			updateTitle(title)
+			
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {

pages/putaway/job/putawayDetail.vue

@@ -288,6 +288,7 @@
 						if (itemDetail == undefined) {
 							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 								.fromLocationCode + "】不在列表中")
+						} else {
 							if (itemDetail.scaned) {
 								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 									.fromLocationCode + "】已经扫描")