buyNum 变更为 currentNum

hdPad/src/mixins/product.js

@@ -15,7 +15,7 @@ export default {
 			globalClassItemList:'',
 			kdType:'HIT',//点击和扫码开单，HIT SCAN
 			checkStock:true,// 考虑库存，盘点不需要考虑库存
-			customData: { buyNum: 0, unitPrice: 0,unitType:0, unitName:'扎'},
+			customData: { currentNum: 0, unitPrice: 0,unitType:0, unitName:'扎'},
 			globalItemList:[]
 		};
 	},
@@ -41,7 +41,7 @@ export default {
 
 				}else{
 					for (const item of this.selectList) {
-						let currentPrice = this.$util.mul(item.unitPrice,item.buyNum)
+						let currentPrice = this.$util.mul(item.unitPrice,item.currentNum)
 						price = this.$util.add(currentPrice,price)
 					}
 				}
@@ -59,9 +59,9 @@ export default {
 				}else{
 					for (const item of this.selectList) {
 						if(item.unitType == 0){
-							bigNum = this.$util.add(bigNum,item.buyNum)
+							bigNum = this.$util.add(bigNum,item.currentNum)
 						}else{
-							smallNum = this.$util.add(smallNum,item.buyNum)
+							smallNum = this.$util.add(smallNum,item.currentNum)
 						}
 					}
 				}
@@ -136,25 +136,25 @@ export default {
 
 			//扫码数量累加
 			if(index != -1 && scan == 1){
-				item.buyNum = parseInt(Number(item.buyNum)+Number(list[index].buyNum))
+				item.currentNum = parseInt(Number(item.currentNum)+Number(list[index].currentNum))
 			}
 
 			//扫码会出现负数
-			if(Number(item.buyNum)<0){
+			if(Number(item.currentNum)<0){
 				return false
 			}
 
 			if(this.checkStock){
 				if(item.unitType == 0){
-					if(Number(item.buyNum)>Number(item.stock)){
+					if(Number(item.currentNum)>Number(item.stock)){
 						this.$util.noStockRemind()
 						this.$msg("库存不足")
 						return
 					}
 				}else{
-					let currentNum = item.buyNum/item.ratio
-					currentNum = currentNum.toFixed(2)
-					if(Number(currentNum)>Number(item.stock)){
+					let thatNum = item.currentNum/item.ratio
+					thatNum = thatNum.toFixed(2)
+					if(Number(thatNum)>Number(item.stock)){
 						this.$util.noStockRemind()
 						this.$msg("库存不足哦")
 						return
@@ -168,10 +168,10 @@ export default {
 				}
 				list.push(item)			
 			}else{
-				if(item.buyNum <= 0){
+				if(item.currentNum <= 0){
 					list.splice(index,1)
 				}else{
-					list[index].buyNum = item.buyNum
+					list[index].currentNum = item.currentNum
 					list[index].unitPrice = item.unitPrice
 					list[index].unitType = item.unitType
 				}
@@ -202,11 +202,11 @@ export default {
 				this.addItemModelHidden();
 				return false
 			}
-			if(/(^[1-9]\d*$)/.test(item.buyNum) == false){
+			if(/(^[1-9]\d*$)/.test(item.currentNum) == false){
 				uni.showToast({title:"请填写数值",icon:"none"})
 				return;
 			}
-			if(/(^[1-9]\d*$)/.test(item.buyNum)){
+			if(/(^[1-9]\d*$)/.test(item.currentNum)){
 				if(item.bigCount<=0){
 					uni.showToast({title:"数量要大于0",icon:"none"})
 					return;

hdPad/src/pages/home/components/console.vue

@@ -139,7 +139,7 @@ export default {
 			}
 			this.$util.hitRemind()
 			let num = this.calc == 'add' ? 1 : -1
-			let params = {...current,unitName:current.bigUnit,unitPrice:current.bigPrice,buyNum:num}
+			let params = {...current,unitName:current.bigUnit,unitPrice:current.bigPrice,currentNum:num}
 			this.replaceItemFn(params,1)
 		},
 		changeProperty(){
@@ -156,7 +156,7 @@ export default {
 				return false
 			}
 			uni.showLoading({mask:true})
-			let product = this.selectList.map(i=>({ productId:i.id, unitType: i.unitType, num: i.buyNum, property: i.property, unitPrice: i.unitPrice }))
+			let product = this.selectList.map(i=>({ productId:i.id, unitType: i.unitType, num: i.currentNum, property: i.property, unitPrice: i.unitPrice }))
 			createCreateOrder({...params,product:JSON.stringify(product)}).then(res=>{
 				uni.hideLoading()
 				if(res.code == 1){
@@ -196,7 +196,7 @@ export default {
 					let arr = this.itemList.map(i=>({
 						productId:i.id,
 						unitType: i.unitType,
-						num: i.currentNum
+						num: i.thatNum
 					}))
 					wastageCreateOrder({
 						product: JSON.stringify(arr)

hdPad/src/pages/home/components/leftArea.vue

@@ -10,13 +10,13 @@
                     <view class="item-price-num">
                         <template v-if="item.property && item.property == 1">
                             <view>{{parseFloat(item.unitPrice)}}元/{{item.unitName}}</view>
-                            <view>{{item.buyNum}}{{item.unitName}}</view>
+                            <view>{{item.currentNum}}{{item.unitName}}</view>
                         </template>
                         <template v-else>
                             <view>{{parseFloat(item.unitPrice)}}元/份</view>
-                            <view>{{item.buyNum}}份</view>
+                            <view>{{item.currentNum}}份</view>
                         </template>
-                        <view>￥{{parseFloat((item.buyNum * item.unitPrice).toFixed(2))}}</view>
+                        <view>￥{{parseFloat((item.currentNum * item.unitPrice).toFixed(2))}}</view>
                     </view>
                 </view>
             </view>
@@ -70,7 +70,7 @@ export default {
     methods:{
         delItem(item){
             this.$util.hitRemind()
-            item.buyNum = 0
+            item.currentNum = 0
             this.replaceItemFn(item)
         }
     }

hdPad/src/pages/home/components/rightGoods.vue

@@ -124,7 +124,7 @@ export default {
         },
 		popAddModelFn(info) {
             this.$util.hitRemind()
-			this.showAddModelFn({ ...info, buyNum: 1, unitPrice: info.price,unitType:0})
+			this.showAddModelFn({ ...info, currentNum: 1, unitPrice: info.price,unitType:0})
 		},
         init(){
             getClass({flower:this.flower}).then(res=>{

hdPad/src/pages/home/components/rightItem.vue

@@ -86,7 +86,7 @@ export default {
     methods:{
 		popAddModelFn(info) {
             this.$util.hitRemind()
-			this.showAddModelFn({ ...info, buyNum: 1, unitPrice: info.price,unitType:0})
+			this.showAddModelFn({ ...info, currentNum: 1, unitPrice: info.price,unitType:0})
 		},
         async init(){
             let { data } =  await showClass()

hdPad/src/pages/home/components/selectNum.vue

@@ -9,7 +9,7 @@
                     <view class="desc" v-if="customData.property && customData.property==1">{{Number(unitType) == 0 ? customData.bigUnit : customData.smallUnit}}数</view>
                     <view class="desc" v-else>数量</view>
                     <div class="flower-unit_box">
-                        <text :class="{selected:checkType == 0}">{{buyNum}}</text>
+                        <text :class="{selected:checkType == 0}">{{currentNum}}</text>
                     </div>
                 </view>
             </view>
@@ -43,7 +43,7 @@ export default {
         return {
             //输入类型 0 数值 1价格
             fillType:0,
-            buyNum:'',
+            currentNum:'',
             unitPrice:'',
             unitType:0,
             unitName:'',
@@ -59,7 +59,7 @@ export default {
 	watch:{
 		customData:{
 			handler(newData){
-				this.buyNum = newData.buyNum ? parseFloat(newData.buyNum) : 1
+				this.currentNum = newData.currentNum ? parseFloat(newData.currentNum) : 1
                 if(newData.property && newData.property == 1){
                     this.bigStockNum = Math.floor(newData.stock)
                     let smallCount = newData.stock - this.bigStockNum
@@ -97,10 +97,10 @@ export default {
             if (e.backspace) {
                 if(this.fillType == 0){
                     if(this.checkType == 0){
-                        this.buyNum = ''
+                        this.currentNum = ''
                      }else{
-                        if (this.buyNum.length > 0) {
-                            this.buyNum = this.buyNum.substring(0, this.buyNum.length - 1)   
+                        if (this.currentNum.length > 0) {
+                            this.currentNum = this.currentNum.substring(0, this.currentNum.length - 1)   
                         }
                     }
                 }else{
@@ -114,10 +114,10 @@ export default {
                 }
             }else {
                 if(this.fillType == 0){
-                    if(this.$util.isEmpty(this.buyNum) || this.checkType == 0) {
-                        this.buyNum = e.char
+                    if(this.$util.isEmpty(this.currentNum) || this.checkType == 0) {
+                        this.currentNum = e.char
                     }else {
-                        this.buyNum += e.char;
+                        this.currentNum += e.char;
                     }
                 }else{
                     if(this.$util.isEmpty(this.unitPrice) || this.checkType == 1) {
@@ -130,7 +130,7 @@ export default {
             this.checkType = 2
         },
         enter() {
-            if(Number(this.buyNum)  <= 0) {
+            if(Number(this.currentNum)  <= 0) {
                 this.$msg('请填写数量')
                 return
             }
@@ -138,7 +138,7 @@ export default {
                 this.$msg('请填写价格')
                 return
             }
-            this.customData.buyNum = this.buyNum
+            this.customData.currentNum = this.currentNum
             this.customData.unitPrice = this.unitPrice
             this.customData.unitType = this.unitType
             this.customData.unitName = this.unitName

hdPad/src/pages/home/components/selectNumPrice.vue

@@ -9,7 +9,7 @@
                     <view class="desc" v-if="customData.property && customData.property==1">{{Number(unitType) == 0 ? customData.bigUnit : customData.smallUnit}}数</view>
                     <view class="desc" v-else>数量</view>
                     <div class="flower-unit_box">
-                        <text :class="{selected:checkType == 0}">{{buyNum}}</text>
+                        <text :class="{selected:checkType == 0}">{{currentNum}}</text>
                     </div>
                 </view>
                 <view @tap="checkCurrent(1)">
@@ -49,7 +49,7 @@ export default {
         return {
             //输入类型 0 数值 1价格
             fillType:0,
-            buyNum:'',
+            currentNum:'',
             unitPrice:'',
             unitType:0,
             unitName:'',
@@ -65,7 +65,7 @@ export default {
 	watch:{
 		customData:{
 			handler(newData){
-				this.buyNum = newData.buyNum ? parseFloat(newData.buyNum) : 1
+				this.currentNum = newData.currentNum ? parseFloat(newData.currentNum) : 1
                 if(newData.property && newData.property == 1){
                     this.bigStockNum = Math.floor(newData.stock)
                     let smallCount = newData.stock - this.bigStockNum
@@ -103,10 +103,10 @@ export default {
             if (e.backspace) {
                 if(this.fillType == 0){
                     if(this.checkType == 0){
-                        this.buyNum = ''
+                        this.currentNum = ''
                      }else{
-                        if (this.buyNum.length > 0) {
-                            this.buyNum = this.buyNum.substring(0, this.buyNum.length - 1)   
+                        if (this.currentNum.length > 0) {
+                            this.currentNum = this.currentNum.substring(0, this.currentNum.length - 1)   
                         }
                     }
                 }else{
@@ -120,10 +120,10 @@ export default {
                 }
             }else {
                 if(this.fillType == 0){
-                    if(this.$util.isEmpty(this.buyNum) || this.checkType == 0) {
-                        this.buyNum = e.char
+                    if(this.$util.isEmpty(this.currentNum) || this.checkType == 0) {
+                        this.currentNum = e.char
                     }else {
-                        this.buyNum += e.char;
+                        this.currentNum += e.char;
                     }
                 }else{
                     if(this.$util.isEmpty(this.unitPrice) || this.checkType == 1) {
@@ -136,7 +136,7 @@ export default {
             this.checkType = 2
         },
         enter() {
-            if(Number(this.buyNum)  <= 0) {
+            if(Number(this.currentNum)  <= 0) {
                 this.$msg('请填写数量')
                 return
             }
@@ -144,7 +144,7 @@ export default {
                 this.$msg('请填写价格')
                 return
             }
-            this.customData.buyNum = this.buyNum
+            this.customData.currentNum = this.currentNum
             this.customData.unitPrice = this.unitPrice
             this.customData.unitType = this.unitType
             this.customData.unitName = this.unitName

hdPad/src/pages/home/modify.vue

@@ -62,7 +62,7 @@ export default {
 				if(res.code == 1){
 					if(res.data.item && !this.$util.isEmpty(res.data.item)){
 						const newItem = res.data.item.map(ele=>{
-							return {property:1,name:ele.name,unitType:ele.unitType,unitPrice:ele.unitPrice,unitName:ele.unitName,buyNum:ele.num,id:ele.id}
+							return {property:1,name:ele.name,unitType:ele.unitType,unitPrice:ele.unitPrice,unitName:ele.unitName,currentNum:ele.num,id:ele.id}
 						})
 						this.setSelectInfo({ currentJobType: this.currentJobType, info: newItem,currentJobId:this.currentJobId })
 					}