najixian / xt_dc_admin · Commits

Go to a project

Commit c2af5465f1bf4e504fdc00aee0d3afb38d657647

Authored by teemitop
1 parent 762deaea
build: skipped

条件筛选增加全部选项

Inline Side-by-side
Showing 5 changed files with 16 additions and 6 deletions
@@ -96,6 +96,7 @@ class Seller extends Common @@ -96,6 +96,7 @@ class Seller extends Common
96 $data['channel'] = $data['channel'] ? $data['channel'] : 1; 96 $data['channel'] = $data['channel'] ? $data['channel'] : 1;
97 97
98 $parame = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&sid='.$sid.'&time_type='.@$data['time_type']; 98 $parame = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&sid='.$sid.'&time_type='.@$data['time_type'];
  99 +
99 //获取运营人员列表 100 //获取运营人员列表
100 $list= file_get_contents(ON_LINE.'App.Report.GetReserveData'.$parame); 101 $list= file_get_contents(ON_LINE.'App.Report.GetReserveData'.$parame);
101 102
@@ -512,6 +513,9 @@ class Seller extends Common @@ -512,6 +513,9 @@ class Seller extends Common
512 $array = json_decode($list,TRUE); 513 $array = json_decode($list,TRUE);
513 foreach ($array['data']['list'] as $key => $value) { 514 foreach ($array['data']['list'] as $key => $value) {
514 switch ($value['type']) { 515 switch ($value['type']) {
  516 + case '0':
  517 + $array['data']['list'][$key]['type'] = $facturer[0]['facturer'];
  518 + break;
515 case '1': 519 case '1':
516 $array['data']['list'][$key]['type'] = $facturer[0]['facturer']; 520 $array['data']['list'][$key]['type'] = $facturer[0]['facturer'];
517 break; 521 break;
@@ -526,7 +530,7 @@ class Seller extends Common @@ -526,7 +530,7 @@ class Seller extends Common
526 break; 530 break;
527 531
528 default: 532 default:
529 - $array['data']['list'][$key]['type'] = 'error'; 533 + $array['data']['list'][$key]['type'] = 'error: '.$value['type'];
530 break; 534 break;
531 } 535 }
532 536
@@ -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>
@@ -23,8 +24,9 @@ @@ -23,8 +24,9 @@
23 <div class="layui-input-inline layui-form"> 24 <div class="layui-input-inline layui-form">
24 <div class="layui-input-8"> 25 <div class="layui-input-8">
25 <select name="class" id="manufacturer" lay-filter="manufacturer"> 26 <select name="class" id="manufacturer" lay-filter="manufacturer">
  27 + <option value="-1">全部</option>
26 {foreach $facturer as $key=>$vo} 28 {foreach $facturer as $key=>$vo}
27 - <option value="{$vo.id}">{$vo.facturer}</option> 29 + <option value="{$vo.id}" {if $vo.id eq 1} selected{/if}>{$vo.facturer}</option>
28 {/foreach} 30 {/foreach}
29 </select> 31 </select>
30 </div> 32 </div>
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
24 <div class="layui-input-inline layui-form"> 24 <div class="layui-input-inline layui-form">
25 <div class="layui-input-8"> 25 <div class="layui-input-8">
26 <select name="class" id="status" lay-filter="myselect"> 26 <select name="class" id="status" lay-filter="myselect">
  27 + <option value="-1">全部</option>
27 <option value="1">待处理</option> 28 <option value="1">待处理</option>
28 <option value="2" selected="true">超时5分钟未处理</option> 29 <option value="2" selected="true">超时5分钟未处理</option>
29 <option value="3">已拒绝</option> 30 <option value="3">已拒绝</option>
@@ -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>
@@ -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>