shish 4 éve
szülő
commit
1697d521c5

+ 8 - 20
hdPad/src/mixins/product.js

@@ -127,35 +127,23 @@ export default {
 			return price;
 		},
 		//添加删除和修改花材
-		//multiple 0单个加减 1弹框方式多个加减
 		//calc 当multiple=0时,add表示加,sub表示减
 		//scan 0不是扫码 1扫码
-		replaceItemFn(product,multiple=0,calc='add',scan=0) {
+		replaceItemFn(product,scan=0) {
 			let item = copyObject(product)
-			if(multiple == 0){
-				if(calc == 'add'){
-					item.buyNum++
-				}
-				if(calc == 'sub'){
-					if(Number(item.buyNum) <= 0){
-						if(Number(item.buyNum) > 0){
-							item.buyNum = 0
-						}else{
-							this.$msg('不能再小了')
-						}
-					}else{
-						item.buyNum--
-					}
-				}
-			}
 			const list = this.selectList
 			let index = list.findIndex(element => element.id == item.id)
 
-			//扫码数量累加
+			//扫码数量累加
 			if(index != -1 && scan == 1){
 				item.buyNum = parseInt(Number(item.buyNum)+Number(list[index].buyNum))
 			}
 
+			//扫码会出现负数
+			if(Number(item.buyNum)<0){
+				return false
+			}
+
 			if(this.checkStock){
 				if(item.unitType == 0){
 					if(Number(item.buyNum)>Number(item.stock)){
@@ -235,7 +223,7 @@ export default {
 					return;
 				}
 			}
-			this.replaceItemFn(item,1)
+			this.replaceItemFn(item)
 			this.addItemModelHidden()			
 		},
 		addItemModelHidden() {

+ 1 - 1
hdPad/src/pages/home/components/console.vue

@@ -140,7 +140,7 @@ export default {
 			this.$util.hitRemind()
 			let num = this.calc == 'add' ? 1 : -1
 			let params = {...current,unitName:current.bigUnit,unitPrice:current.bigPrice,buyNum:num}
-			this.replaceItemFn(params,1,'',1)
+			this.replaceItemFn(params,1)
 		},
 		changeProperty(){
 			this.property = this.property == 1 ? 0 : 1

+ 1 - 1
hdPad/src/pages/home/components/leftArea.vue

@@ -71,7 +71,7 @@ export default {
         delItem(item){
             this.$util.hitRemind()
             item.buyNum = 0
-            this.replaceItemFn(item,1,'sub')
+            this.replaceItemFn(item)
         }
     }
 }