收银

ghsApp/src/admin/billing/affirm.vue

@@ -116,11 +116,11 @@
             <view class="tui-title">结账方式</view>
             <button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">欠款</button>
             <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码付</button>
-            <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">更多</button>
+            <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
-            <div class="tui-title">更多方式</div>
+            <div class="tui-title">线下方式</div>
             <picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
               <input v-model="form.payWay" name="payWay" type="text" hidden />
               <div style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</div>
@@ -250,7 +250,7 @@ export default {
       autoLoad: false,
       isBilling: true,
       staffList:[],
-			payWayList:[{name:"员工微信",id:0},{name:"现金",id:4},{name:"员工支付宝",id:1},{name:"银行卡",id:5}],
+			payWayList:[{name:"员工微信",id:0},{name:"员工支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
 			payWayindex:0,
       form: {
         shopId: "",

ghsPad/src/pages/home/cash.vue

@@ -11,7 +11,7 @@
 
         <view class="custom-app-casher-area">
             <view class="nav-left">
-                <casherNav navType="casher"></casherNav>
+                <navComponent navType="casher"></navComponent>
             </view>
 			<view class="select-custom">
 				<customerList @selectCustomer="selectCustomer" @cancelChooseCustomer="cancelSelect"> </customerList>

ghsPad/src/pages/home/components/nav.vue

@@ -28,7 +28,7 @@ export default {
   data() {
     return {
       nav: [
-        { name: "选客", page: "/pages/home/selectCustom",flag:'selectCustom' },
+        { name: "收银", page: "/pages/home/selectCustom",flag:'casher' },
         //{ name: "损耗", page: "/pages/home/waste",flag:'waste' },
         //{ name: "订单", page: "/pages/home/order",flag:'order' }
       ],

ghsPad/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,7 +15,15 @@
                 </view>
             </view>
 
-            <view class="select-item_box" v-if="form.hasPay == 1 && form.payWay == 0">
+            <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" 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>  
@@ -103,9 +103,9 @@ export default {
             //输入类型 0 实收金额 1 运费
             fillType:0,
             form:{
-                hasPay: 0,
+                hasPay: 2,
                 payWay:0,
-                needPrint:2,
+                needPrint:1,
                 freight: '',
                 groupName:'',
                 remark:'',
@@ -119,11 +119,11 @@ 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:2, },{ name:'扫码', id:0, },{ 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 } ],
+            needPrintList:[ { name:'需要', id:1 },{ name:'不需要', id:2 } ],
             getStaffList:[],
             shopAdminIdList:[]
         };
@@ -174,9 +174,9 @@ export default {
         settleOpenStatus:{
             handler(val){
                 if(Number(val) == 1){
-                    this.form.hasPay = 0
+                    this.form.hasPay = 2
                     this.form.payWay = 0
-                    this.form.needPrint = 2
+                    this.form.needPrint = 1
                     this.form.groupName = ''
                     this.form.remark = ''
                     this.form.sendCost = 0

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

@@ -123,7 +123,7 @@ export default {
                 cash:0
             },
             proceeds: '0',
-            hasPayList:[ { name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'现金', id:3, }, { name:'更多', id:1, }],
+            hasPayList:[ { name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'现金', id:3, }, { name:'线下', id:1, }],
             payWayList:[ { name:'员工微信', id:0 }, { name:'员工支付宝', id:1 },{name:'银行卡',id:5} ],
             currentInputType:'proceeds',
             totalMoney: 0,