shish 4 лет назад
Родитель
Сommit
d0aded3ce9

+ 0 - 21
hdPad/src/pages/home/components/settlePop.vue

@@ -15,13 +15,6 @@
                 </view>
             </view>
           
-            <view class="select-item_box">
-                <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>  
-                </view>
-            </view>
-
             <view class="select-item_box">
                 <view class="title">打印小票</view>
                 <view class="item-list_box">
@@ -93,7 +86,6 @@ export default {
                 remark:'',
                 sendCost:0,
                 modifyPrice:0,
-                getStaffId:0,
                 getStaffName:''
             },
             proceeds: '0',
@@ -156,21 +148,8 @@ export default {
     },
     mounted() {
         this.activeKeyboard()
-        getAllStaff().then(res=>{
-            if(res.code == 1){
-                this.getStaffList = res.data.list
-                if(!this.$util.isEmpty(this.getStaffList)){
-                    this.form.getStaffId = this.getStaffList[0].id
-                    this.form.getStaffName = this.getStaffList[0].name
-                }
-            }
-        })
     },
     methods: {
-        changeGetStaff(item){
-            this.form.getStaffId = item.id
-            this.form.getStaffName = item.name
-        },
         changeNeedPrint(val){
             this.form.needPrint = val
         },

+ 5 - 2
hdPad/src/pages/home/components/workList.vue

@@ -16,7 +16,8 @@
                         <text style="position:absolute;top:2upx;left:90upx;font-size:11upx;">{{item.sn}}</text>
                     </view>
                     <view class="item-price-num">
-                        <view>{{item.addTime ?item.addTime.substr(5,11):''}}</view>
+                        <view v-if="item.hasReachTime == 1">{{item.reachDate == today ? '今天' : item.reachDate}} {{item.reachPeriod == 0 ? '上午':item.reachPeriod==1?'下午':item.reachPeriod==2?'晚上':'其它'}}</view>
+                        <view v-else></view>
                         <view>{{item.status == 0 ? '待完成':item.status==1?'已完成':item.status==2?'已取消':'待完成'}}</view>
                     </view>
                 </view>
@@ -47,7 +48,8 @@ export default {
             status:'',
             selectOrderId:0,
             triggered:false,
-            _freshing: false
+            _freshing: false,
+            today:''
         }
     },
     watch:{
@@ -110,6 +112,7 @@ export default {
                     if(this.list.data && this.list.data[0]){
                         this.getOrder(this.list.data[0])
                     }
+                    this.today = res.data.today
                 }
             })
         }