现金付款

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

@@ -8,14 +8,6 @@
                 </view>
             </view>
 
-            <view class="select-item_box" style="margin-bottom:10upx;" v-if="form.hasPay == 3">
-                <view class="title" style="padding-left:60upx;" @click.stop="changeCheck(3)">
-                    金额：<text :class="{selected:checkType == 3}">{{form.cash}}</text> 
-                    <text style="margin-left:20upx;color:green;" v-if="Number(zl)>0">找零 {{zl}}</text>
-                    <text style="margin-left:20upx;color:red;" v-if="Number(zl)<0">还差 {{-zl}}</text>
-                </view>
-            </view>
-
             <view class="select-item_box" v-if="form.hasPay == 1">
                 <view class="title">请选择</view>
                 <view class="item-list_box">
@@ -23,6 +15,14 @@
                 </view>
             </view>
 
+            <view class="select-item_box" style="margin-bottom:10upx;" v-if="form.hasPay == 1 && form.payWay == 4">
+                <view class="title" style="padding-left:60upx;" @click.stop="changeCheck(3)">
+                    金额：<text :class="{selected:checkType == 3}">{{form.cash}}</text> 
+                    <text style="margin-left:20upx;color:green;" v-if="Number(zl)>0">找零 {{zl}}</text>
+                    <text style="margin-left:20upx;color:red;" v-if="Number(zl)<0">还差 {{-zl}}</text>
+                </view>
+            </view>
+
             <view class="select-item_box">
                 <view class="title">开单人</view>
                 <view class="item-list_box">
@@ -30,7 +30,7 @@
                 </view>
             </view>
 
-            <view class="select-item_box" v-if="form.hasPay == 1 && form.payWay == 0">
+            <view class="select-item_box" v-if="form.hasPay == 1 && (form.payWay == 0 || form.payWay == 1 || form.payWay == 5)">
                 <view class="title">收款账号</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changeGetStaff(item)" v-for="item in getStaffList" :class="[form.getStaffId===item.id?'active':'']"> {{item.name}} </view>  
@@ -123,8 +123,8 @@ export default {
                 cash:0
             },
             proceeds: '0',
-            hasPayList:[ { name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'现金', id:3, }, { name:'线下', id:1, }],
-            payWayList:[ { name:'员工微信', id:0 }, { name:'员工支付宝', id:1 },{name:'银行卡',id:5} ],
+            hasPayList:[ { name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'线下', id:1, }],
+            payWayList:[ { name:'员工微信', id:0 }, { name:'员工支付宝', id:1 },{name:'现金',id:4},{name:'银行卡',id:5} ],
             currentInputType:'proceeds',
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
@@ -225,12 +225,17 @@ export default {
         changePayWay(val){
             this.$util.hitVoice()
             this.form.payWay = val
+            if(this.form.payWay == 4){
+                this.changeCheck(3)
+            }else{
+                this.form.cash = 0
+            }
         },
         changeHasPay(val){
             this.$util.hitVoice()
             this.form.hasPay = val
             if(val == 3){
-                this.changeCheck(3)
+                //this.changeCheck(3)
             }else{
                 this.form.cash = 0
             }