najixian / xt_dc_admin · Commits

Go to a project

Commit 52436bf603fc6c7e2280134e5a49623e4a927289

Authored by teemitop
1 parent 8c02f37b
build: skipped

表格修复

Inline Side-by-side
Showing 2 changed files with 15 additions and 8 deletions
@@ -77,8 +77,10 @@ class Seller extends Common @@ -77,8 +77,10 @@ class Seller extends Common
77 $new_array[$key]['id'] = $value['id']; 77 $new_array[$key]['id'] = $value['id'];
78 $new_array[$key]['sellername'] = $value['sellername']; 78 $new_array[$key]['sellername'] = $value['sellername'];
79 $new_array[$key]['inviting'] = $value['inviting']; 79 $new_array[$key]['inviting'] = $value['inviting'];
80 - $new_array[$key]['reserve_count'] = $value['appReserveCount'] + $value['AndroidReserveCount'].'('.$value['appReserveCount'] .'/'. $value['AndroidReserveCount'].')';  
81 - $new_array[$key]['sms_send_count'] = $value['appSmsCount'] + $value['AndroidSmsCount'].'('.$value['appSmsCount'] .'/'. $value['AndroidSmsCount'].')'; 80 + $new_array[$key]['reserve_count'] = $value['appReserveCount'] .'/'. $value['AndroidReserveCount'];
  81 + $new_array[$key]['reserve_count_sort'] = $value['appReserveCount'] + $value['AndroidReserveCount'];
  82 + $new_array[$key]['sms_send_count'] = $value['appSmsCount'] .'/'. $value['AndroidSmsCount'];
  83 + $new_array[$key]['sms_send_count_sort'] = $value['appSmsCount'] + $value['AndroidSmsCount'];
82 } 84 }
83 } 85 }
84 return $result = [ 86 return $result = [
@@ -42,7 +42,8 @@ @@ -42,7 +42,8 @@
42 </div>--> 42 </div>-->
43 <button class="layui-btn" id="search" data-type="reload">查询统计</button> 43 <button class="layui-btn" id="search" data-type="reload">查询统计</button>
44 </div> 44 </div>
45 - <table class="layui-table" id="list" lay-filter="list"></table> 45 + <table class="layui-table" id="list" lay-filter="list">
  46 + </table>
46 </div> 47 </div>
47 <script type="text/html" id="toolbarDemo"> 48 <script type="text/html" id="toolbarDemo">
48 <span>订单总数：<i id="count">X</i>条 【小程序 <i id="appReserveCount">X</i> / 座机 <i id="AndroidReserveCount">D</i>】</span> 49 <span>订单总数：<i id="count">X</i>条 【小程序 <i id="appReserveCount">X</i> / 座机 <i id="AndroidReserveCount">D</i>】</span>
@@ -60,14 +61,18 @@ @@ -60,14 +61,18 @@
60 method: 'post', 61 method: 'post',
61 title: '预定订单统计', 62 title: '预定订单统计',
62 page:true, 63 page:true,
  64 + sort:true,
  65 + cellMinWidth: 30,
63 toolbar: '#toolbarDemo', 66 toolbar: '#toolbarDemo',
64 cols: [[ 67 cols: [[
65 {checkbox:true,fixed: true}, 68 {checkbox:true,fixed: true},
66 - {field: 'id', title: '{:lang("id")}', width:60, fixed: true},  
67 - {field: 'sellername', title: '商家名称', width: 350},  
68 - {field: 'reserve_count', align: 'center', title: '产生预定订单量（小程序/座机）', sort: true, width: 250},  
69 - {field: 'sms_send_count', align: 'center',title: '短信发送量（小程序/座机）', sort: true, width: 250},  
70 - {field: 'inviting', align: 'center',title: '当前商户通过邀请函拉到的顾客', width: 360, sort: true}, 69 + {field: 'id', title: '{:lang("id")}',width:60, fixed: true},
  70 + {field: 'sellername', title: '商家名称'},
  71 + {field: 'reserve_count_sort', align: 'right', title: '产生预定订单总量', sort: true},
  72 + {field: 'reserve_count', align: 'left', title: '预定订单构成（小程序/座机）'},
  73 + {field: 'sms_send_count_sort', align: 'right',title: '短信发送总量',colspan:1, sort: true},
  74 + {field: 'sms_send_count', align: 'left',title: '短信发送构成（小程序/座机）'},
  75 + {field: 'inviting', align: 'center',title: '当前商户通过邀请函拉到的顾客', sort: true},
71 ]], 76 ]],
72 done: function(res, curr, count){ 77 done: function(res, curr, count){
73 $('#count').html(res.countReserve); 78 $('#count').html(res.countReserve);