Commit 3c3141f631185839d44ac04ab09da57b7864a5ea

Authored by teemitop
1 parent cb8f319b

预定列表调整

@@ -619,7 +619,28 @@ class Seller extends Common @@ -619,7 +619,28 @@ class Seller extends Common
619 619
620 $new_array = array(); 620 $new_array = array();
621 foreach ($array['data']['list'] as $key => $value) { 621 foreach ($array['data']['list'] as $key => $value) {
622 - $array['data']['list'][$key]['ddate'] = date('Y-m-d H:i:s',$value['ddate']); 622 + switch ($value['ddate_solt']) {
  623 + //'未设置/早市/午市/晚市/夜宵 0/1/2/3/4',
  624 + case 0:
  625 + $value['ddate_solt'] = '未设置';
  626 + break;
  627 + case 1:
  628 + $value['ddate_solt'] = '早市';
  629 + break;
  630 + case 2:
  631 + $value['ddate_solt'] = '午市';
  632 + break;
  633 + case 3:
  634 + $value['ddate_solt'] = '晚市';
  635 + break;
  636 + case 4:
  637 + $value['ddate_solt'] = '夜宵';
  638 + break;
  639 + default:
  640 + # code...
  641 + break;
  642 + }
  643 + $array['data']['list'][$key]['ddate'] = date('Y-m-d H:i:s',$value['ddate']).'['.$value['ddate_solt'].']';
623 $array['data']['list'][$key]['cdate'] = date('Y-m-d H:i:s',$value['cdate']); 644 $array['data']['list'][$key]['cdate'] = date('Y-m-d H:i:s',$value['cdate']);
624 switch ($value['status']) { 645 switch ($value['status']) {
625 case 0: 646 case 0:
@@ -661,7 +682,29 @@ class Seller extends Common @@ -661,7 +682,29 @@ class Seller extends Common
661 # code... 682 # code...
662 break; 683 break;
663 } 684 }
  685 +
  686 + if($value['room_demand']){
  687 + $array['data']['list'][$key]['room_demand'] = implode(',',array_column(json_decode($value['room_demand'],true), 'name'));
  688 + }
  689 +
  690 + $array['data']['list'][$key]['sta'] = $value['is_tele']==1 ? $array['data']['list'][$key]['sta'] : $array['data']['list'][$key]['sta'].'无话机';
  691 +
  692 + //根据操作人识别操作终端
  693 + if(isset($template['operator_openid'])){
  694 + if(strstr($template['operator_openid'],'_',-4)=='tele'){ //话机操作
  695 + $array['data']['list'][$key]['operator_openid'] = '电话机';
  696 + }
  697 +
  698 + if(strstr($template['operator_openid'],'_',-4)=='wind'){ //PC操作
  699 + $array['data']['list'][$key]['operator_openid'] = 'PC';
  700 + }
  701 +
  702 + if(strstr($template['operator_openid'],'_',-4)=='chat'){ //PC操作
  703 + $array['data']['list'][$key]['operator_openid'] = '小程序';
  704 + }
  705 + }
664 } 706 }
  707 + //print_r($array['data']['list']);die;
665 return $result = [ 708 return $result = [
666 'code'=>0,'msg'=>'获取成功!', 709 'code'=>0,'msg'=>'获取成功!',
667 'data'=>$array['data']['list'], 710 'data'=>$array['data']['list'],
@@ -81,16 +81,16 @@ @@ -81,16 +81,16 @@
81 sort:true, 81 sort:true,
82 toolbar: '#toolbarDemo', 82 toolbar: '#toolbarDemo',
83 cols: [[ 83 cols: [[
84 - {field: 'id', title: '订单编号',width:100, fixed: true}, 84 + {field: 'id', title: '订单编号', fixed: true},
85 {field: 'sellername', title: '所属商家'}, 85 {field: 'sellername', title: '所属商家'},
86 {field: 'seller_tel', title: '商家电话'}, 86 {field: 'seller_tel', title: '商家电话'},
87 - {field: 'ddate', title: '到店时间'},  
88 - {field: 'pnum', title: '就餐人数'}, 87 + {field: 'ddate', title: '到店时间',width:200},
  88 + {field: 'room_demand', title: '包间需求'},
89 {field: 'rname', title: '客户信息'}, 89 {field: 'rname', title: '客户信息'},
90 {field: 'cusdem', title: '备注'}, 90 {field: 'cusdem', title: '备注'},
91 {field: 'cdate',title: '下单时间'}, 91 {field: 'cdate',title: '下单时间'},
92 {field: 'sta',title: '状态'}, 92 {field: 'sta',title: '状态'},
93 - {align: 'center', width:260,title: '操作', toolbar: '#action'} 93 + {align: 'center',title: '操作', toolbar: '#action'}
94 ]], 94 ]],
95 done: function(res, curr, count){ 95 done: function(res, curr, count){
96 $('#count').html(res.countReserve); 96 $('#count').html(res.countReserve);