najixian / xt_dc_admin · Commits

Go to a project

Commit 762deaea703307ee037225d979e6078c672e5681

Authored by teemitop
1 parent e51c4646
build: skipped

筛选条件增加全部选项

Inline Side-by-side
Showing 3 changed files with 11 additions and 4 deletions
@@ -156,6 +156,7 @@ class Seller extends Common @@ -156,6 +156,7 @@ class Seller extends Common
156 $data['channel'] = $data['channel'] ? $data['channel'] : 1; 156 $data['channel'] = $data['channel'] ? $data['channel'] : 1;
157 157
158 $parame = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&sid='.$sid.'&time_type='.@$data['time_type']; 158 $parame = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&sid='.$sid.'&time_type='.@$data['time_type'];
  159 +
159 //获取运营人员列表 160 //获取运营人员列表
160 $list= file_get_contents(ON_LINE.'App.Report.GetReserveDataBydev'.$parame); 161 $list= file_get_contents(ON_LINE.'App.Report.GetReserveDataBydev'.$parame);
161 $array = json_decode($list,TRUE); 162 $array = json_decode($list,TRUE);
@@ -632,6 +633,9 @@ class Seller extends Common @@ -632,6 +633,9 @@ class Seller extends Common
632 $array = json_decode($list,TRUE); 633 $array = json_decode($list,TRUE);
633 foreach ($array['data']['list'] as $key => $value) { 634 foreach ($array['data']['list'] as $key => $value) {
634 switch ($value['type']) { 635 switch ($value['type']) {
  636 + case '0':
  637 + $array['data']['list'][$key]['type'] = $facturer[0]['facturer'];
  638 + break;
635 case '1': 639 case '1':
636 $array['data']['list'][$key]['type'] = $facturer[0]['facturer']; 640 $array['data']['list'][$key]['type'] = $facturer[0]['facturer'];
637 break; 641 break;
@@ -646,7 +650,7 @@ class Seller extends Common @@ -646,7 +650,7 @@ class Seller extends Common
646 break; 650 break;
647 651
648 default: 652 default:
649 - $array['data']['list'][$key]['type'] = 'error'; 653 + $array['data']['list'][$key]['type'] = $value['type'];
650 break; 654 break;
651 } 655 }
652 } 656 }
@@ -13,7 +13,8 @@ @@ -13,7 +13,8 @@
13 <div class="layui-input-inline layui-form"> 13 <div class="layui-input-inline layui-form">
14 <div class="layui-input-8"> 14 <div class="layui-input-8">
15 <select name="class" id="channel" lay-filter="myselect"> 15 <select name="class" id="channel" lay-filter="myselect">
16 - <option value="1">合作</option> 16 + <option value="-1">全部</option>
  17 + <option value="1" selected>合作</option>
17 <option value="2">推广</option> 18 <option value="2">推广</option>
18 <option value="3">测试</option> 19 <option value="3">测试</option>
19 </select> 20 </select>
@@ -24,8 +25,9 @@ @@ -24,8 +25,9 @@
24 <div class="layui-input-inline layui-form"> 25 <div class="layui-input-inline layui-form">
25 <div class="layui-input-8"> 26 <div class="layui-input-8">
26 <select name="class" id="manufacturer" lay-filter="manufacturer"> 27 <select name="class" id="manufacturer" lay-filter="manufacturer">
  28 + <option value="-1">全部</option>
27 {foreach $facturer as $key=>$vo} 29 {foreach $facturer as $key=>$vo}
28 - <option value="{$vo.id}">{$vo.facturer}</option> 30 + <option value="{$vo.id}" {if $vo.id eq 1} selected{/if}>{$vo.facturer}</option>
29 {/foreach} 31 {/foreach}
30 </select> 32 </select>
31 </div> 33 </div>
@@ -16,7 +16,8 @@ @@ -16,7 +16,8 @@
16 <div class="layui-input-inline layui-form"> 16 <div class="layui-input-inline layui-form">
17 <div class="layui-input-8"> 17 <div class="layui-input-8">
18 <select name="class" id="channel" lay-filter="myselect"> 18 <select name="class" id="channel" lay-filter="myselect">
19 - <option value="1">合作</option> 19 + <option value="-1">全部</option>
  20 + <option value="1" selected>合作</option>
20 <option value="2">推广</option> 21 <option value="2">推广</option>
21 <option value="3">测试</option> 22 <option value="3">测试</option>
22 </select> 23 </select>