对接扫码

App.vue

@@ -70,7 +70,7 @@ export default {
 					plus.android.importClass(intent);
 					let data = intent.getStringExtra("pdapengyuescannerdata"); // 换你的广播标签  
 					// console.log("条码信息：" + data)
-					uni.$emit('scanFinish',data)
+					uni.$emit('scanFinish',uni.$u.trim(data))
 					// uni.showModal({
 					// 	title: '收到条码信息',
 					// 	content: '' + data,

common/index.js

@@ -11,6 +11,7 @@ import {
 } from '../env.js';
 import store from '@/common/store';
 import tools from '@/common/utils/tools'
+import scan from '@/common/utils/scan'
 // mixin混入
 import mixin from '@/common/mixins';
 
@@ -27,6 +28,7 @@ const install = Vue => {
 	Vue.prototype.$LAWYER_URL_FG = LAWYER_URL_FG;
 	// 挂载工具函数
 	Vue.prototype.$tools = tools;
+	Vue.prototype.$scan = scan;
 	Vue.mixin(mixin);
 }
 

common/utils/scan.js

@@ -0,0 +1,9 @@
+
+export default {
+	scanCode() {
+		var main2 = plus.android.runtimeMainActivity(); //获取acitivity
+		var Intent = plus.android.importClass("android.content.Intent");
+		var intent2 = new Intent("com.scan.onStartScan");
+		main2.sendBroadcast(intent2);
+	}
+}

components/scaned-pop/scaned-pop.vue

@@ -33,6 +33,10 @@
 			value:{
 				type:Boolean,
 				default:false
+			},
+			scanNum:{
+				type:[Number,String],
+				default:1
 			}
 		},
 		watch:{
@@ -41,7 +45,14 @@
 					this.scanedShow = val
 				},
 				immediate:true
-			}
+			},
+			scanNum: {
+				handler(val) {
+					console.log(val,'val')
+					this.numberVal = val
+				},
+				immediate:true
+			},
 		},
 		data() {
 			return {
@@ -54,7 +65,7 @@
 				this.$emit('close')
 			},
 			confirmClick() {
-				this.$emit('confirm')
+				this.$emit('confirm',this.numberVal)
 			}
 		}
 	}

env.js

@@ -1,7 +1,7 @@
 /**
  *  全局配置文件
  */
-export const BASE_URL = process.env.NODE_ENV === "development" ? 'http://192.168.2.112:8080' : 'http://192.168.168.38:8080'
+export const BASE_URL = process.env.NODE_ENV === "development" ? 'http://192.168.2.112:8080' : 'https://erp.xianglitech.com.cn/prod-api'
 // https://erp.xianglitech.com.cn/prod-api
 
 // 上传路径

pages/picking-task/delivery.vue

@@ -70,11 +70,11 @@
 			</view>
 
 			<view class="scan-box">
-				<view class="scan-box-l">
+				<view class="scan-box-l" @click="scanCode">
 					<u-image width="120rpx" height="120rpx" src="@/static/image/zidong-saoma-img.png"></u-image>
 					<view class="tips-text">扫描快速识别货物</view>
 					<view class="tips-text2">
-						<view class="radio-box"></view>
+						<u-icon name="checkmark-circle-fill" color="#0256FF"></u-icon>
 						<text>连续扫描</text>
 					</view>
 				</view>
@@ -110,8 +110,8 @@
 		
 		<view class="footer-box">
 			<view class="footer-box-l">
-				<view>货物种类:5种</view>
-				<view>货物种数:25件</view>
+				<view>货物种类:{{speciesNum}}种</view>
+				<view>货物种数:{{goodsNum}}件</view>
 			</view>
 			<button class="submitBtn" @tap="submitClick">
 			  提交
@@ -120,7 +120,7 @@
 		<error-pop v-model="errorShow" @close="errorShow = false" @confirm="confirm" :content="popText.errorText"></error-pop>
 		<success-pop v-model="successShow" @close="successShow = false" @backClick="backClick" :content="popText.successText"></success-pop>
 		<!-- 扫码之后弹窗 -->
-		<scaned-pop v-model="scanedShow" @close="scanedShow = false" @confirm="scanConfirm"></scaned-pop>
+		<scaned-pop v-if="scanedShow" v-model="scanedShow" :scanNum="scanNum" @close="scanedShow = false" @confirm="scanConfirm"></scaned-pop>
 		
 		<goods-pop v-model="goodsShow" @close="goodsShow = false"></goods-pop>
 	</view>
@@ -164,7 +164,9 @@
 				value1: '',
 				maxDate:Number(new Date()),
 				chooseGoodsInfo:{},
-				voucherPicture:''
+				voucherPicture:'',
+				scanIndex:-1,
+				scanNum:1,
 			}
 		},
 		onLoad(e) {
@@ -207,7 +209,26 @@
 				return num
 			}
 		},
+		onShow() {
+			uni.$on('scanFinish',(data)=>{
+				if(this.goodsList.length == 0)return
+				let index = this.goodsList.findIndex(item=>item.barCode == data)
+				if(index == -1) return
+				this.scanIndex = index
+				this.scanNum = 1
+				this.scanedShow = true
+			})
+		},
+		onHide() {
+			uni.$off('scanFinish')
+		},
+		onUnload() {
+			uni.$off('scanFinish')
+		},
 		methods:{
+			scanCode() {
+				this.$scan.scanCode()
+			},
 			calendarConfirm(val) {
 				this.goodsList.forEach(item=>{
 					if(item.id == this.chooseGoodsInfo.id) {
@@ -288,7 +309,8 @@
 			},
 			// 扫码确认
 			scanConfirm() {
-				
+				this.goodsList[this.scanIndex].materialNumber += Number(val)
+				this.scanedShow = false
 			},
 			manualClick() {
 				this.goodsShow = true

pages/picking-task/index.vue

@@ -10,7 +10,7 @@
 			<u-sticky :offsetTop="offsetTop" bgColor="#F0F6FB">
 				<view class="search-box">
 					<u-search placeholder="请输入单据编号" bgColor="#fff" shape="square" v-model="params.number" :showAction="false" @search="searchClick" @clear="searchClick"></u-search>
-					<view class="flex_box" @click="ScanCode">
+					<view class="flex_box" @click="scanCode">
 						<view class="scan-text">扫描单据二维码</view>
 						<view class="scan-icon">
 							<image src="@/static/image/scan-icon.png" mode=""></image>
@@ -104,14 +104,6 @@
 			let statusBarHeight = systemInfo.statusBarHeight;
 			this.offsetTop = statusBarHeight + 40
 			this.init()
-			// uni.$on('scanFinish',(val)=>{
-			// 	console.log("条码信息：" + val)
-			// })
-			uni.$on('scanFinish',(data)=>{
-				this.params.number = data
-				this.init()
-				console.log('监听到事件来自 update ，携带参数 msg 为：' + data);
-			})
 		},
 		onHide() {
 			uni.$off('scanFinish')
@@ -120,17 +112,18 @@
 			uni.$off('scanFinish')
 		},
 		onShow() {
+			uni.$on('scanFinish',(data)=>{
+				this.params.number = data
+				this.init()
+			})
 			if(uni.getStorageSync('orderRefresh')) {
 				this.init()
 				uni.removeStorageSync('orderRefresh')
 			}
 		},
 		methods:{
-			ScanCode() {
-				var main2 = plus.android.runtimeMainActivity(); //获取acitivity
-				var Intent = plus.android.importClass("android.content.Intent");
-				var intent2 = new Intent("com.scan.onStartScan");
-				main2.sendBroadcast(intent2);
+			scanCode() {
+				this.$scan.scanCode()
 			},
 			init() {
 				uni.showLoading()

pages/purchase/index.vue

@@ -10,7 +10,7 @@
 			<u-sticky :offsetTop="offsetTop" bgColor="#F0F6FB">
 				<view class="search-box">
 					<u-search placeholder="请输入单据编号" bgColor="#fff" shape="square" v-model="params.number" :showAction="false" @search="searchClick" @clear="searchClick"></u-search>
-					<view class="flex_box">
+					<view class="flex_box" @click="scanCode">
 						<view class="scan-text">扫描单据二维码</view>
 						<view class="scan-icon">
 							<image src="@/static/image/scan-icon.png" mode=""></image>
@@ -105,12 +105,25 @@
 			this.init()
 		},
 		onShow() {
+			uni.$on('scanFinish',(data)=>{
+				this.params.number = data
+				this.init()
+			})
 			if(uni.getStorageSync('orderRefresh')) {
 				this.init()
 				uni.removeStorageSync('orderRefresh')
 			}
 		},
+		onHide() {
+			uni.$off('scanFinish')
+		},
+		onUnload() {
+			uni.$off('scanFinish')
+		},
 		methods:{
+			scanCode() {
+				this.$scan.scanCode()
+			},
 			init() {
 				uni.showLoading()
 				this.params.pageNum = 1

pages/purchase/put-storage.vue

@@ -62,11 +62,11 @@
 			</view>
 
 			<view class="scan-box">
-				<view class="scan-box-l">
+				<view class="scan-box-l" @click="scanCode">
 					<u-image width="120rpx" height="120rpx" src="@/static/image/zidong-saoma-img.png"></u-image>
 					<view class="tips-text">扫描快速识别货物</view>
 					<view class="tips-text2">
-						<view class="radio-box"></view>
+						<u-icon name="checkmark-circle-fill" color="#0256FF"></u-icon>
 						<text>连续扫描</text>
 					</view>
 				</view>
@@ -112,7 +112,7 @@
 		<error-pop v-model="errorShow" @close="errorShow = false" @confirm="confirm" :content="popText.errorText"></error-pop>
 		<success-pop v-model="successShow" @close="successShow = false" @backClick="backClick" :content="popText.successText"></success-pop>
 		<!-- 扫码之后弹窗 -->
-		<scaned-pop v-model="scanedShow" @close="scanedShow = false" @confirm="scanConfirm"></scaned-pop>
+		<scaned-pop v-if="scanedShow" v-model="scanedShow" :scanNum="scanNum" @close="scanedShow = false" @confirm="scanConfirm"></scaned-pop>
 		
 		<goods-pop v-model="goodsShow" @close="goodsShow = false" type="caigou"></goods-pop>
 		
@@ -165,17 +165,28 @@
 				calendarShow:false,
 				value1: '',
 				maxDate:Number(new Date()),
-				chooseGoodsInfo:{}
+				chooseGoodsInfo:{},
+				voucherPicture:'',
+				scanIndex:-1,
+				scanNum:1,
 			}
 		},
 		onLoad(e) {
-			uni.$on('scanFinish',(data)=>{
-				console.log('监听到事件来自 update ，携带参数 msg 为：' + data);
-			})
+			
 			this.id = e.id
 			this.getOrderDetail(e.id)
 			this.getOrderInfo(e.id)
 		},
+		onShow() {
+			uni.$on('scanFinish',(data)=>{
+				if(this.goodsList.length == 0)return
+				let index = this.goodsList.findIndex(item=>item.barCode == data)
+				if(index == -1) return
+				this.scanIndex = index
+				this.scanNum = 1
+				this.scanedShow = true
+			})
+		},
 		onHide() {
 			uni.$off('scanFinish')
 		},
@@ -218,6 +229,9 @@
 			}
 		},
 		methods:{
+			scanCode() {
+				this.$scan.scanCode()
+			},
 			calendarConfirm(val) {
 				this.goodsList.forEach(item=>{
 					if(item.id == this.chooseGoodsInfo.id) {
@@ -297,8 +311,9 @@
 				uni.navigateBack()
 			},
 			// 扫码确认
-			scanConfirm() {
-				
+			scanConfirm(val) {
+				this.goodsList[this.scanIndex].materialNumber += Number(val)
+				this.scanedShow = false
 			},
 			manualClick() {
 				// this.goodsShow = true