shish hace 4 años
padre
commit
43ccca4911

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

@@ -190,6 +190,7 @@ export default {
 					}else{
 						//开单完成之后更新花材库存
 						this.$emit('rightItemRefresh')
+						uni.showToast({ title: '提交成功', duration: 1000 })
 					}
 					this.settleOpenStatus = 0
 					this.$refs.settlePopRef.close()

+ 3 - 3
hdPad/src/pages/home/components/settlePop.vue

@@ -2,14 +2,14 @@
     <view class="app-select_customer">
         <view class="select-left">
             <view class="select-item_box">
-                <view class="title">结账方式</view>
+                <view class="title">收款方式</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changeHasPay(item.id)" v-for="item in hasPayList" :class="[form.hasPay===item.id?'active':'']"> {{item.name}} </view>    
                 </view>
             </view>
             
             <view class="select-item_box" v-if="form.hasPay == 1">
-                <view class="title">收款方式</view>
+                <view class="title">选项</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changePayWay(item.id)" v-for="item in payWayList" :class="[form.payWay===item.id?'active':'']"> {{item.name}} </view>  
                 </view>
@@ -92,7 +92,7 @@ export default {
                 getStaffName:''
             },
             proceeds: '0',
-            hasPayList:[ { name:'待付款', id:0, }, { name:'已付款', id:1, }],
+            hasPayList:[ { name:'扫码', id:0, }, { name:'其它', id:1, }],
             payWayList:[ { name:'微信', id:0 }, { name:'支付宝', id:1 }, { name:'现金', id:4 }, { name:'银行卡', id:5 },{name:'其它',id:9} ],
             currentInputType:'proceeds',
             totalMoney: 0,

+ 3 - 3
hdPad/src/pages/home/components/workList.vue

@@ -40,8 +40,8 @@ export default {
 			default: 0
 		},
         mt: {
-			type: Number,
-			default: 0
+			type: String,
+			default: 'no'
 		}
     },
     data(){
@@ -113,7 +113,7 @@ export default {
         },
         getWorkInfo(){
             let params = {page: this.list.page,status:this.status}
-            if(this.mt == 1){
+            if(this.mt == 'yes'){
                 params = {...params,fromType:4}
             }
             return getWorkList(params).then(res=>{

+ 1 - 1
hdPad/src/pages/home/mt.vue

@@ -6,7 +6,7 @@
                 <casherNav navType="mt"></casherNav>
             </view>
             <view class="work-list">
-                <workList @getOrder="getOrder" mt="1"></workList>
+                <workList @getOrder="getOrder" mt="yes"></workList>
             </view>
             <view class="work-info">
                 <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn"></workInfo>