扫码问题

ghsPad/src/mixins/product.js

@@ -321,9 +321,33 @@ export default {
 					this.customData.property = 0
 					this.$refs.selectNumPriceRef.open('center')
 				}
+			}else if(code.indexOf('a') == 0){
+				//花材
+				code = code.replace('a', '')
+				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
+				let num = this.calc == 'add' ? 1 : -1
+				//必须保留。扫码之后列表显示花材，点修改才能显示正常。
+				current.unitType = 0
+				//百合扫一下5支的情况
+				if(current.scanNum && Number(current.scanNum)>0){
+					num = this.calc == 'add' ? Number(current.scanNum) : -Number(current.scanNum)
+					unitName = current.smallUnit
+					unitPrice = current.smallPrice
+					current.unitType = 1
+				}
+				let params = {...current,unitName:unitName,unitPrice:unitPrice,currentNum:num}
+				this.replaceItemFn(params,1)
 			}else{
-				console.log('---000---')
-				console.log(this.globalAllProduct)
 				//花材
 				current = this.globalAllProduct.find(function(val){
 					return Number(val.itemId) == Number(code)

hdPad/src/mixins/product.js

@@ -321,6 +321,33 @@ export default {
 					this.customData.property = 0
 					this.$refs.selectNumPriceRef.open('center')
 				}
+			}else if(code.indexOf('a') == 0){
+				//花材
+				code = code.replace('a', '')
+				//花材
+				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
+				let num = this.calc == 'add' ? 1 : -1
+				//必须保留。扫码之后列表显示花材，点修改才能显示正常。
+				current.unitType = 0
+				//百合扫一下5支的情况
+				if(current.scanNum && Number(current.scanNum)>0){
+					num = this.calc == 'add' ? Number(current.scanNum) : -Number(current.scanNum)
+					unitName = current.smallUnit
+					unitPrice = current.smallPrice
+					current.unitType = 1
+				}
+				let params = {...current,unitName:unitName,unitPrice:unitPrice,currentNum:num}
+				this.replaceItemFn(params,1)
 			}else{
 				//花材
 				current = this.globalAllProduct.find(function(val){