扫码功能基本成型

ghsApp/src/admin/billing/affirm.vue

@@ -187,8 +187,9 @@ const formUtil = require("@/utils/formValidation.js");
 import { createOrder, updateOrder } from "@/api/order/index";
 import { getAllStaff } from "@/api/shop-admin"
 import { mapActions, mapGetters } from "vuex";
-import { getUserDet} from "@/api/member";
-import ModalModule from "@/components/plugin/modal";
+import { getUserDet} from "@/api/member"
+import { allProduct } from '@/api/product'
+import ModalModule from "@/components/plugin/modal"
 export default {
   name: "BillingAffirm",
   components: {
@@ -240,7 +241,8 @@ export default {
 			xjData:{},
 			xjDataInfo:{},
       modifyPrice:'',
-      isScanEnv:false
+      isScanEnv:false,
+      calc:'add'
     };
   },
   onLoad (option) {
@@ -282,6 +284,8 @@ export default {
     }
     // #endif
 
+    this.listenScanItem()
+
   },
 	onShow(){
 		if(!this.$util.isEmpty(uni.getStorageSync("newClient"))){
@@ -319,6 +323,22 @@ export default {
   },
   methods: {
     ...mapActions(["initMerchantInfo"]),
+    listenScanItem(){
+			// #ifdef APP-PLUS
+			//避免重复，每次进来先移除全局自定义事件监听器
+			uni.$off('listenGetScanCode')
+			let that = this
+			uni.$on('listenGetScanCode',function(data){
+				that.takeItem(data.code)
+			})
+			allProduct().then(res=>{
+				if(res.code == 1){
+					that.globalAllProduct = res.data.list
+					console.log('载入最新花材...')
+				}
+			})
+			// #endif
+    },
 		reduceItemFn(item) {
       this.kdType = 'HIT';
 			this.replaceItemFn(item,0,'sub')

ghsApp/src/mixins/globalMixins.js

@@ -152,8 +152,9 @@ export default {
       //通过intent实例引入intent类，方便以后的'.'操作
       plus.android.importClass(intent)
       var productIdCode = intent.getStringExtra("SCAN_BARCODE1")
-      this.$msg(productIdCode)
-      console.log(productIdCode)
+
+      uni.$emit('listenGetScanCode',{code:productIdCode})
+
     },
     //付款码付款
     requestCodePay(authCode){

ghsApp/src/mixins/product.js

@@ -25,7 +25,9 @@ export default {
 			customData: { bigCount: 0, smallCount: 0, userPrice: 0 },
 			globalItemList:[],
 			//当前页面默认使用的单位 0大单位 1小单位
-			globalUnitType:0
+			globalUnitType:0,
+			globalAllProduct:[],
+			calc:'add'
 		};
 	},
 	onLoad(options) {
@@ -360,7 +362,7 @@ export default {
 		//添加删除和修改花材
 		//multiple 0一个一个加减 1弹框方式，多个加减
 		//calc 当multiple=0时，add表示加，sub表示减
-		replaceItemFn(product,multiple=0,calc='add') {
+		replaceItemFn(product,multiple=0,calc='add',scan=0) {
 			let item = copyObject(product)
 			if(multiple == 0){
 				if(Number(item.smallCount)>0){
@@ -379,7 +381,22 @@ export default {
 					}					
 				}
 			}
+
 			const list = this.selectList
+
+			let index = list.findIndex(element => element.id == item.id)
+
+			//扫码数量累加
+			if(index != -1 && scan == 1){
+				item.bigCount = parseInt(Number(item.bigCount)+Number(list[index].bigCount))
+				item.smallCount = parseInt(Number(item.smallCount)+Number(list[index].smallCount))
+			}
+
+			//扫码会出现负数
+			if(Number(item.bigCount)<0 || Number(item.smallCount)<0){
+				return false
+			}
+
 			if(this.checkStock){
 				if ((Number(item.bigCount) * item.ratio + Number(item.smallCount)) > (Number(item.bigNum) * item.ratio + Number(item.smallNum))) {
 					this.$util.noStockRemind()
@@ -387,7 +404,7 @@ export default {
 					return
 				}
 			}
-			let index = list.findIndex(element => element.id == item.id)
+
 			if(index == -1){
 				if(this.$util.isEmpty(item.userPrice) || Number(item.userPrice) == 0){
 					item.userPrice = item.bigPrice
@@ -414,6 +431,31 @@ export default {
 			this.itemNumPriceRefresh()
 
 
+		},
+		takeItem(code){
+			if(this.$util.isEmpty(code)){
+				return false
+			}
+			let current = null
+			let unitPrice = 0
+			let unitName = ''
+			//花材
+			current = this.globalAllProduct.find(function(val){
+				return Number(val.itemId) == Number(code)
+			})
+			if(current == undefined){
+				return false
+			}
+			if(this.$util.isEmpty(current)){
+				return false
+			}
+			unitName = current.bigUnit
+			unitPrice = current.bigPrice
+			//this.$util.hitVoice()
+			let num = this.calc == 'add' ? 1 : -1
+			let params = {...current,unitName:unitName,userPrice:unitPrice,bigCount:num}
+			console.log(params)
+			this.replaceItemFn(params,1,'add',1)
 		},
 		//大小单位切换
 		switchGlobalUnitType(){