Bläddra i källkod

Merge branch 'develop_szhj07' of http://git.chelingzhu.com/jianguan-web/qpls-md-app into develop_szhj07

lilei 2 år sedan
förälder
incheckning
6fb1fef269

+ 33 - 7
pages/shuntBackManage/addBackOrder.vue

@@ -314,15 +314,36 @@ export default {
 			this.keyword = '';
 			this.reset();
 		},
-		//扫码
+		// 扫描
 		handleScanCode(){
-			uni.scanCode({
-				success: (res)=> {
-					console.log('条码类型:' + res.scanType);
-					console.log('条码内容:' + res.result);
-					this.queryParam.queryWord = res.result;
+			this.mpaasScanModule = uni.requireNativePlugin("wss-scan")
+			this.mpaasScanModule.scan(
+			{
+				"scanMode":"Customized",
+				"scanStyle":{
+					"scanFrameSizePlus":{"width":250,"height":250},
+					"scanFrameSize":200,
+					"scanLight":"visible",
+					"scanText":"对准条形码/二维码进行识别",
+					"scanTitle":"扫码搜索货位产品",
 				}
-			});
+			},
+			(result) => {
+				if(result.scanStatus == 1){
+					this.scanResult(result)
+				}
+			})
+		},
+		// 扫描结果
+		scanResult(data){
+			// 二维码
+			console.log('111111',data)
+			if(data.scanType == 'QRCODE'){
+				const ret = data.scanValue.split("&")
+				this.queryParam.queryWord = ret[1] // 产品编码
+			}else{
+				this.queryParam.queryWord = data.scanValue;
+			}
 			this.loadData(this.queryParam);
 		},
 		addBackOrder(){
@@ -370,6 +391,11 @@ export default {
 					uni.showToast({
 						title:res.message
 					})
+					setTimeout(()=>{
+						uni.navigateTo({
+							url:'/pages/shuntBackManage/cancellingStocks?sn='+res.data.sn
+						})
+					},800)
 				}
 				
 			});

+ 2 - 2
pages/shuntBackManage/cancellingStocks.vue

@@ -159,9 +159,9 @@
 					}
 				})
 				const params = {
-					shelfSn: result[0].shelfSn,
+					shelfSn: this.partList[0].shelfSn,
 					recallBillSn: this.recallBillSn,
-					recallBillNo: result[0].recallBillNo,
+					recallBillNo: this.partList[0].recallBillNo,
 					detailList: arr
 				}
 				shelfRecallConfirm(params).then(res => {

+ 1 - 1
pages/shuntBackManage/detailModal.vue

@@ -52,7 +52,7 @@
 					</view>
 					<view class="pcurnums flex align_center">
 						<text>调回数量</text>
-						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="con.confirmQty" :min="0" :max="10" @minus="minus" @plus="plus" @change="change"></u-number-box></view>
+						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="con.confirmQty" :min="0" :max="con.qty" @minus="minus" @plus="plus" @change="change"></u-number-box></view>
 					</view>
 				</view>
 			</view>