增加包装资材费

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

@@ -46,7 +46,10 @@
                 <text style="color:green;">运费</text>
                 <text>￥<text :class="{selected:checkType == 1}">{{form.sendCost}}</text></text>
             </view>
-
+            <view class="input-list" @click.stop="changeCheck(2)">
+                <text style="color:green;">包装资材费</text>
+                <text>￥<text :class="{selected:checkType == 2}">{{form.labourCost}}</text></text>
+            </view>
             <view class="input-list">
                 <text>总金额</text>
                 <text>￥<text>{{totalPrice}}</text></text>
@@ -55,7 +58,6 @@
             <view class="input-list input-bottom" @click.stop="changeCheck(0)">
                 <text style="color:green;">实收金额</text>
                 <text style="font-size: 10upx;color:green;" v-if="diffPrice > 0">优惠￥<text>{{diffPrice}}</text></text>
-                <text style="font-size: 10upx;color:green;" v-if="diffPrice < 0">人工包装费￥<text>{{Math.abs(diffPrice)}}</text></text>
                 <text>￥<text :class="{selected:checkType == 0}">{{form.modifyPrice}}</text></text>
             </view>
 
@@ -85,6 +87,7 @@ export default {
                 groupName:'',
                 remark:'',
                 sendCost:0,
+                labourCost:0,
                 modifyPrice:0,
                 getStaffName:''
             },
@@ -119,7 +122,7 @@ export default {
             if(!this.$util.isEmpty(this.groupInfo)){
                 price = this.groupInfo.price ? parseFloat(this.groupInfo.price) : 0
             }else{
-                price = Number(this.allPrice)+Number(this.form.sendCost)
+                price = Number(this.allPrice)+Number(this.form.sendCost)+Number(this.form.labourCost)
                 price = parseFloat(price.toFixed(2))
             }
             this.form.modifyPrice = price
@@ -141,6 +144,7 @@ export default {
                     this.form.groupName = ''
                     this.form.remark = ''
                     this.form.sendCost = 0
+                    this.form.labourCost = 0
                 }
             },
             immediate:true
@@ -177,7 +181,7 @@ export default {
                             this.form.modifyPrice = this.form.modifyPrice.substring(0, this.form.modifyPrice.length - 1)   
                         }
                     }
-                }else{
+                }else if(this.fillType == 1){
                     if(this.checkType == 1){
                         this.form.sendCost = ''
                     }else{
@@ -185,6 +189,16 @@ export default {
                             this.form.sendCost = this.form.sendCost.substring(0, this.form.sendCost.length - 1)   
                         }
                     }
+                }else if(this.fillType == 2){
+                    if(this.checkType == 2){
+                        this.form.labourCost = ''
+                    }else{
+                        if (this.form.labourCost.length > 0) {
+                            this.form.labourCost = this.form.labourCost.substring(0, this.form.labourCost.length - 1)   
+                        }
+                    }
+                }else{
+
                 }
             }else {
                 if(this.fillType == 0){
@@ -193,15 +207,23 @@ export default {
                     }else {
                         this.form.modifyPrice += e.char;
                     }
-                }else{
+                }else if(this.fillType == 1){
                     if(this.$util.isEmpty(this.form.sendCost) || this.checkType == 1) {
                         this.form.sendCost = e.char
                     }else {
                         this.form.sendCost += e.char
                     }
+                }else if(this.fillType == 2){
+                    if(this.$util.isEmpty(this.form.labourCost) || this.checkType == 2) {
+                        this.form.labourCost = e.char
+                    }else {
+                        this.form.labourCost += e.char
+                    }
+                }else{
+
                 }
             }
-            this.checkType = 2
+            //this.checkType = 2
         },
         activeKeyboard() {
             this.$refs.keyboard.activate();