elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

跳转汇总结算单跳转修正，添加筛选发放状态的代码

Browse Source
master
zhengyongxing 4 years ago
parent dae421270f
commit ced9d51845
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
Application/Admin/Controller/MarketPercentageController.class.php
Unescape Escape View File

@ -493,6 +493,7 @@ class MarketPercentageController extends ThinkController
// $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):''; // $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
// $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):''; // $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
$_REQUEST['group_id']?($map['group_id'] = $_REQUEST['group_id']):''; $_REQUEST['group_id']?($map['group_id'] = $_REQUEST['group_id']):'';
($_REQUEST['status']||$_REQUEST['status']=='0')?($map['status'] = $_REQUEST['status']):'';
$admin_id = $_SESSION['onethink_admin']['user_auth']['uid']; $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
$map['admin_id'] = $admin_id; $map['admin_id'] = $admin_id;
@ -895,6 +896,11 @@ class MarketPercentageController extends ThinkController
$sum['extend_commission'] = number_format($sum['extend_commission'], 2, '.', '');; $sum['extend_commission'] = number_format($sum['extend_commission'], 2, '.', '');;
$sum['wait_commission'] = number_format($sum['wait_commission'], 2, '.', '');; $sum['wait_commission'] = number_format($sum['wait_commission'], 2, '.', '');;
$_REQUEST['time_start']?($start_time = date("Y-m-1",strtotime($_REQUEST['time_start']))):'';
$_REQUEST['time_end']?($end_time = date("Y-m-t",strtotime($_REQUEST['time_end']))):'';
$this->assign('start_time',$start_time);
$this->assign('end_time',$end_time);
if ($_REQUEST['export']) { if ($_REQUEST['export']) {
$title = ['real_name' => '姓名', $title = ['real_name' => '姓名',

7
Application/Admin/View/MarketPercentage/personmarketstaffsettle.html
Unescape Escape View File

@ -74,6 +74,13 @@
</volist> </volist>
</select> </select>
</div> </div>
<div class="input-list input-list-parent search_label_rehab">
<select id="status" name="status" class="select_gallery" style="width:120px;">
<option value="">请选择剩余金额发放状态</option>
<option value="1">已发放</option>
<option value="0">未发放</option>
</select>
</div>
<input type="hidden" name="" value="" class="sortBy"> <input type="hidden" name="" value="" class="sortBy">
<input type="hidden" name="type" value="{$_GET['type']}"> <input type="hidden" name="type" value="{$_GET['type']}">
<div class="input-list"> <div class="input-list">

16
Application/Admin/View/MarketPercentage/showbonuslist.html
Unescape Escape View File

@ -132,18 +132,18 @@
<td>{$data.real_name}</td> <td>{$data.real_name}</td>
<td>{$data.nickname}</td> <td>{$data.nickname}</td>
<td>{$data.level}</td> <td>{$data.level}</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time'],'admin_id'=>$data['admin_id']))}" >{$data.pay_amount}</a></td> <td><a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time,'admin_id'=>$data['admin_id']))}" >{$data.pay_amount}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time'],'admin_id'=>$data['admin_id']))}" >{$data.commission}</a></td> <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end'],'admin_id'=>$data['admin_id']))}" >{$data.commission}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']}</a></td> <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end'],'admin_id'=>$data['admin_id'],'status'=>1))}" >{$data['extend_commission']}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time'],'admin_id'=>$data['admin_id']))}" >{$data['wait_commission']}</a></td> <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end'],'admin_id'=>$data['admin_id'],'status'=>0))}" >{$data['wait_commission']}</a></td>
<td>{$data['remark']}</td> <td>{$data['remark']}</td>
</tr> </tr>
</volist> </volist>
<td colspan="3">合计</td> <td colspan="3">合计</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time']))}" >{$sum['pay_amount']|default="0.00"}</a></td> <td><a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['pay_amount']|default="0.00"}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time']))}" >{$sum['commission']|default="0.00"}</a></td> <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end']))}" >{$sum['commission']|default="0.00"}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time']))}" >{$sum['extend_commission']|default='0.00'}</a></td> <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end'],'status'=>1))}" >{$sum['extend_commission']|default='0.00'}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time']))}" >{$sum['wait_commission']|default='0.00'}</a></td> <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end'],'status'=>0))}" >{$sum['wait_commission']|default='0.00'}</a></td>
<td></td> <td></td>
</notemtpy> </notemtpy>
</tbody> </tbody>

Write Preview
Loading…
Cancel
Save