Merge branch 'feature/market_percentage' of wmtx/platform into release

市场业绩提成优化
master
廖金灵 5 years ago committed by Gogs
commit 886c70665c

@ -2292,6 +2292,32 @@ function a_array_unique($array){
return $data;
}
}
/**
* 获取团体归属类型其他
* @author chenzhi 20200219
* $id 不传返回所有类型列表
* 传入ID 返回对应的团体类型
*/
function getCompanyBlongOther($id = -1)
{
$data = array(
["id"=>0,'name'=>"内团"],
["id"=>1,'name'=>"外团"],
["id"=>2,'name'=>"外团-分发"],
["id"=>3,'name'=>"无"],
["id"=>'1,2','name'=>"外团&外团-分发"]
);
if($id > -1){
foreach($data as $k=>$v){
if($v['id'] == $id){
return $v['name'];
break;
}
}
}else{
return $data;
}
}
/**
* 获取公会归属关系
* @author chenzhi 20200219
@ -2565,6 +2591,11 @@ function isMarketAdmin()
function getMarketAdmin() {
$map['group_id'] = ['in','11,12,21'];
$admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
$map['menber.uid'] = $admin_id;
if(is_administrator()||session('user_group_id') == 15) {
unset($map['menber.uid']);
}
$data = M("auth_group_access")
->field("real_name,menber.uid,nickname")
@ -2613,7 +2644,17 @@ function getCompanyDevelopTypes()
return [
1 => '自主开发',
2 => '自主开发及维护',
3 => '只维护'
3 => '只维护',
];
}
function getCompanyDevelopTypesOther()
{
return [
1 => '自主开发',
2 => '自主开发及维护',
3 => '只维护',
'1,2'=>'自主开发&自主开发及维护'
];
}

@ -241,7 +241,7 @@ class FinancePromoteController extends AdminController
}
if (isset($_REQUEST['company_belong'])) {
$map['promote.company_belong'] = $_REQUEST['company_belong'];
}
$isMarketLeader = isMarketLeader();
if ($isMarketLeader) {
@ -249,7 +249,7 @@ class FinancePromoteController extends AdminController
}
if (!empty(I('develop_type'))) {
$map['company.develop_type'] = I('develop_type');
$map['company.develop_type'] = ['in',I('develop_type')];
}
$adminId = 0;
@ -357,7 +357,8 @@ class FinancePromoteController extends AdminController
$title = '';
if (!empty(I('develop_type'))) {
$map['company.develop_type'] = I('develop_type');
// $map['company.develop_type'] = I('develop_type');
$map['company.develop_type'] = ['in',I('develop_type')];
}
self::setPromoteMap($map,"s.promote_id",$title);
@ -588,7 +589,8 @@ class FinancePromoteController extends AdminController
$map['s.pay_time'] = ['LT', strtotime($_REQUEST['time_end']) + 86399];
}
if (!empty(I('develop_type'))) {
$map['develop_type'] = I('develop_type');
// $map['develop_type'] = I('develop_type');
$map['develop_type'] = ['in',I('develop_type')];
}
$isMarketLeader = isMarketLeader();
if ($isMarketLeader) {

@ -15,11 +15,60 @@ class MarketPercentageController extends ThinkController
$map = [];
$_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
// $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
$_REQUEST['promote_id']?($map['promote_id'] = $_REQUEST['promote_id']):'';
$_REQUEST['relation_game_id']?($map['relation_game_id'] = $_REQUEST['relation_game_id']):'';
$_REQUEST['sdk_version']?($map['sdk_version'] = $_REQUEST['sdk_version']):'';
$search_date = [];
if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
$end = $_REQUEST['time_end'];
$start = $_REQUEST['time_start'];
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
} elseif (isset($_REQUEST['time_start'])) {
$end = date("Y-m",time());
$start = $_REQUEST['time_start'];
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end} -1 month")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
} elseif (isset($_REQUEST['time_end'])) {
$end = $_REQUEST['time_end'];
$start = '2019-08';
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end} -1 month")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
}
// var_dump($map);die();
$data = M("settleup_marketorder","tab_")
->field("pay_time,promote_account,company_belong,member.real_name,develop_type,game_name,
sum(pay_amount) pay_amount,sum(cp_amount) cp_amount,sum(promote_amount) promote_amount,
@ -86,6 +135,10 @@ class MarketPercentageController extends ThinkController
'company_tax' => '公司税费',
'company_profit' => '税后毛利额'];
foreach ($data as $key => $value) {
$data[$key]['pay_time'] = '`'.$data[$key]['pay_time'];
}
$sum['pay_time'] = '';
$sum['promote_account'] = '';
$sum['company_belong'] = '合计';
@ -95,7 +148,7 @@ class MarketPercentageController extends ThinkController
$data = array_merge($data,[$sum]);
data2csv($data,'市场结算管理',$title);
data2csv($data,'市场毛利统计',$title);
}
$count = M("settleup_marketorder","tab_")
@ -122,10 +175,64 @@ class MarketPercentageController extends ThinkController
$map['group_id'] = ['in','11,12,21'];
$_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['group_id']?($map['level'] = $_REQUEST['group_id']):'';
$search_date = [];
if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
$end = $_REQUEST['time_end'];
$start = $_REQUEST['time_start'];
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
} elseif (isset($_REQUEST['time_start'])) {
$end = date("Y-m",time());
$start = $_REQUEST['time_start'];
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
} elseif (isset($_REQUEST['time_end'])) {
$end = $_REQUEST['time_end'];
$start = '2019-08';
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
}
$_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);
$data = M("market_altogether","tab_")
->where($map);
@ -142,7 +249,7 @@ class MarketPercentageController extends ThinkController
->field("tab_market_altogether.*,market_percentage")
->join("left join sys_auth_group_access access on tab_market_altogether.admin_id = access.uid")
->join("left join sys_auth_group auth on access.group_id=auth.id")
->page($p, $row)
// ->page($p, $row)
->order("pay_time DESC")
->select();
}
@ -169,6 +276,14 @@ class MarketPercentageController extends ThinkController
}
$sum = [];
$sum['performance_revenue'] = 0;
$sum['performance_commission'] = 0;
$sum['achievement_bonus'] = 0;
$sum['commission'] = 0;
$sum['extend_commission'] = 0;
$sum['wait_commission'] = 0;
foreach ($data as $key => $value) {
$data[$key]['start_time'] = date("Y-m-1",strtotime($value['pay_time']));
@ -300,6 +415,16 @@ class MarketPercentageController extends ThinkController
}
}
$data[$key]['extend_commission'] = number_format($data[$key]['extend_commission'],2,'.','');
$data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'],2,'.','');
$sum['performance_revenue'] += $data[$key]['performance_revenue'];
$sum['appraisal_bonuses'] += $data[$key]['appraisal_bonuses'];
$sum['performance_commission'] += $data[$key]['performance_commission'];
$sum['achievement_bonus'] += $data[$key]['achievement_bonus'];
$sum['commission'] += $data[$key]['commission'];
$sum['extend_commission'] += $data[$key]['extend_commission'];
}
if ($_REQUEST['export']) {
@ -323,7 +448,7 @@ class MarketPercentageController extends ThinkController
foreach ($data as $key => $value) {
$line = $key+2;
// $develop_commission_ratio = $value['develop_commission_ratio']/100;
$data[$key]['pay_time'] = '`'.$data[$key]['pay_time'];
$data[$key]['performance_commission'] = "=ROUND(J{$line}*(F{$line}/100)+J{$line}*(G{$line}/100),2)";
$data[$key]['achievement_bonus'] = "=ROUND(J{$line}*(H{$line}/100)+J{$line}*(I{$line}/100),2)";
$data[$key]['commission'] = "=ROUND(K{$line}+L{$line},2)";
@ -332,32 +457,80 @@ class MarketPercentageController extends ThinkController
data2csv($data,'市场业绩提成',$title);
}
// $arraypage = $p;
// $size = $row;//每页显示的记录数
// $data = array_slice($data, ($arraypage - 1) * $size, $size);
$arraypage = $p;
$size = $row;//每页显示的记录数
$data = array_slice($data, ($arraypage - 1) * $size, $size);
$this->assign("sum",$sum);
$this->assign("list_data",$data);
$this->display("marketstaffsettle");
}
public function personMarketStaffSettle($row = 10, $p = 1) {
var_dump(getMarketAdmin());
$map = [];
$map['group_id'] = ['in','11,12,21'];
$_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['group_id']?($map['group_id'] = $_REQUEST['group_id']):'';
$admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
$map['admin_id'] = $admin_id;
if(is_administrator()) {
if(is_administrator()||session('user_group_id') == 15) {
unset($map['admin_id']);
$_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
}
$search_date = [];
if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
$end = $_REQUEST['time_end'];
$start = $_REQUEST['time_start'];
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
} elseif (isset($_REQUEST['time_start'])) {
$end = date("Y-m",time());
$start = $_REQUEST['time_start'];
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
} elseif (isset($_REQUEST['time_end'])) {
$end = $_REQUEST['time_end'];
$start = '2019-08';
$i = 0;
do {
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
}
$data = M("market_altogether","tab_")
->where($map);
@ -382,6 +555,8 @@ class MarketPercentageController extends ThinkController
}
$this->checkListOrCountAuthRestMap($map,[]);
$sum['performance_revenue'] = 0;
$sum['appraisal_bonuses'] = 0;
$sum['company_profit'] = 0;
$sum['performance_commission'] = 0;
$sum['achievement_bonus'] = 0;
@ -414,6 +589,9 @@ class MarketPercentageController extends ThinkController
$data[$key]['commission'] = $data[$key]['performance_commission'] + $data[$key]['achievement_bonus'];
$data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission'];
$sum['performance_revenue'] += $value['performance_revenue'];
$sum['appraisal_bonuses'] += $value['appraisal_bonuses'];
$sum['company_profit'] += $value['company_profit'];
$sum['performance_commission'] += $value['performance_commission'];
$sum['achievement_bonus'] += $value['achievement_bonus'];
@ -423,6 +601,16 @@ class MarketPercentageController extends ThinkController
}
$sum['performance_revenue'] = number_format($sum['performance_revenue'], 2, '.', '');
$sum['appraisal_bonuses'] = number_format($sum['appraisal_bonuses'], 2, '.', '');
$sum['company_profit'] = number_format($sum['company_profit'], 2, '.', '');
$sum['performance_commission'] = number_format($sum['performance_commission'], 2, '.', '');
$sum['achievement_bonus'] = number_format($sum['achievement_bonus'], 2, '.', '');
$sum['commission'] = number_format($sum['commission'], 2, '.', '');
$sum['extend_commission'] = number_format($sum['extend_commission'], 2, '.', '');
$sum['wait_commission'] = number_format($sum['wait_commission'], 2, '.', '');
$this->assign("sum",$sum);
if ($_REQUEST['export']) {
@ -442,6 +630,11 @@ class MarketPercentageController extends ThinkController
'is_send'=>'剩余金额发放状态'];
$data = array_merge($data,[$sum]);
foreach ($data as $key => $value) {
$data[$key]['pay_time'] = '`'.$data[$key]['pay_time'];
}
data2csv($data,'个人总提成列表',$title);
}
$arraypage = $p;
@ -581,7 +774,7 @@ class MarketPercentageController extends ThinkController
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end} -1 month")));
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
@ -596,7 +789,7 @@ class MarketPercentageController extends ThinkController
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end} -1 month")));
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
@ -611,12 +804,13 @@ class MarketPercentageController extends ThinkController
$date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
$search_date[] = $date;
$i++;
}while ($date < date('Y-m', strtotime("{$end} -1 month")));
}while ($date < date('Y-m', strtotime("{$end}")));
if ($search_date) {
$map['pay_time'] = ['in', $search_date];
}
}
if($_REQUEST['pay_time']) {
if (in_array($_REQUEST['pay_time'],$search_date)) {
$map['pay_time'] = $_REQUEST['pay_time'];
@ -629,10 +823,11 @@ class MarketPercentageController extends ThinkController
$map['pay_time'] = $_REQUEST['pay_time'];
}
}
// var_dump($map);die();
$data = M("market_altogether","tab_")
->field("max(pay_time) pay_time,real_name,admin_id,nickname,level,sum(pay_amount) pay_amount,sum(extend_commission) extend_commission,
sum(performance_commission) performance_commission,sum(achievement_bonus) achievement_bonus,
sum(wait_performance_commission)+sum(wait_achievement_commission) wait_amount,
sum(if(status > 0, wait_performance_commission, '0.00')) + sum(if(status > 0, wait_achievement_commission,'0.00')) wait_extend_commission,
sum(if(status = 0, wait_performance_commission, '0.00')) + sum(if(status = 0, wait_achievement_commission, '0.00')) wait_commission, remark,level,status")
->where($map);
@ -643,12 +838,18 @@ class MarketPercentageController extends ThinkController
->group("admin_id")
->select();
} else {
$data = $data->page($p, $row)
->order("id DESC")
$data = $data
// ->page($p, $row)
->order("pay_time DESC")
->group("admin_id")
->select();
}
$sum = [];
$sum['pay_amount'] = 0;
$sum['extend_commission'] = 0;
$sum['wait_commission'] = 0;
foreach($data as $key => $value) {
if ($value['level'] == 21) {
@ -664,9 +865,20 @@ class MarketPercentageController extends ThinkController
$data[$key]['extend_commission'] = number_format($data[$key]['commission'] - $data[$key]['wait_commission'], 2, '.', '');
$data[$key]['pay_amount'] = number_format($data[$key]['pay_amount'] , 2, '.', '');
$data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'] , 2, '.', '');
// $data[$key]['all_commission'] = $data[$key]['wait_amount'] + ;
$sum['pay_amount'] += $data[$key]['pay_amount'];
$sum['extend_commission'] += $data[$key]['extend_commission'];
$sum['wait_commission'] += $data[$key]['wait_commission'];
$sum['commission'] += $data[$key]['commission'];
}
$sum['pay_amount'] = number_format($sum['pay_amount'], 2, '.', '');;
$sum['extend_commission'] = number_format($sum['extend_commission'], 2, '.', '');;
$sum['wait_commission'] = number_format($sum['wait_commission'], 2, '.', '');;
if ($_REQUEST['export']) {
$title = ['real_name' => '姓名',
@ -690,8 +902,13 @@ class MarketPercentageController extends ThinkController
$this->assign('_page', $page);
}
$arraypage = $p;
$size = $row;//每页显示的记录数
$data = array_slice($data, ($arraypage - 1) * $size, $size);
$this->checkListOrCountAuthRestMap($map,[]);
$this->assign("sum",$sum);
$this->assign("list_data",$data);
$this->display("showbonuslist");

@ -140,7 +140,7 @@
<div class="input-list input-list-server search_label_rehab">
<select id="develop_type" name="develop_type" class="select_gallery" style="width:120px;">
<option value="">请选择开发类型</option>
<?php foreach(getCompanyDevelopTypes() as $key => $value):?>
<?php foreach(getCompanyDevelopTypesOther() as $key => $value):?>
<option value="<?=$key?>" <?php if($key == I('develop_type')):?>selected<?php endif;?>><?=$value?></option>
<?php endforeach;?>
</select>

@ -131,7 +131,7 @@
<div class="input-list input-list-server search_label_rehab">
<select id="develop_type" name="develop_type" class="select_gallery" style="width:120px;">
<option value="">请选择开发类型</option>
<?php foreach(getCompanyDevelopTypes() as $key => $value):?>
<?php foreach(getCompanyDevelopTypesOther() as $key => $value):?>
<option value="<?=$key?>" <?php if($key == I('develop_type')):?>selected<?php endif;?>><?=$value?></option>
<?php endforeach;?>
</select>

@ -117,11 +117,11 @@
<?php endforeach;?>
</select>
</div>
<div class="input-list input-list-server search_label_rehab">
<div class="input-list input-list-server search_label_rehab">
<select id="develop_type" name="develop_type" class="select_gallery" style="width:120px;">
<option value="">请选择开发类型</option>
<?php foreach(getCompanyDevelopTypes() as $key => $value):?>
<?php foreach(getCompanyDevelopTypesOther() as $key => $value):?>
<option value="<?=$key?>" <?php if($key == I('develop_type')):?>selected<?php endif;?>><?=$value?></option>
<?php endforeach;?>
</select>

@ -32,8 +32,8 @@
</style>
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">市场结算管理</h3>
<p class="description_text">说明:绩优流水结算管理</p>
<h3 class="page_title">市场毛利统计</h3>
<p class="description_text">说明:市场毛利统计</p>
</div>
@ -51,13 +51,21 @@
<div class="input-list search-title-box">
<label>搜索:</label>
</div>
<div class="input-list input-list-promote search_label_rehab">
<select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">
<option value="">请选择月份</option>
<volist name=":getMonth()" id="vo">
<option value="{$vo}" <if condition="$vo eq $_GET['pay_time']">selected=selected</if>>{$vo}</option>
</volist>
</select>
<!-- <div class="input-list input-list-promote search_label_rehab">-->
<!-- <select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">-->
<!-- <option value="">请选择月份</option>-->
<!-- <volist name=":getMonth()" id="vo">-->
<!-- <option value="{$vo}" <if condition="$vo eq $_GET['pay_time']">selected=selected</if>>{$vo}</option>-->
<!-- </volist>-->
<!-- </select>-->
<!-- </div>-->
<div class="input-list">
<input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="开始时间" />
&nbsp;-&nbsp;
<div class="input-append date" id="datetimepicker" style="display:inline-block">
<input type="text" readonly id="time_end" name="time_end" class="" value="{:I('time_end')}" placeholder="结束时间" />
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
<div class="input-list input-list-parent search_label_rehab">
<select id="promote_id" name="promote_id" class="select_gallery" style="width:120px;">
@ -167,6 +175,11 @@
</volist>
$(".select_gallery").select2();
</script>
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
<php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
<link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
<script type="text/javascript">
//导航高亮
highlight_subnav('{:U('MarketPercentage/index')}');
@ -234,6 +247,34 @@
})
});
$('#time_start').datetimepicker({
format: 'yyyy-mm',
language:"zh-CN",
// minView:2,
weekStart: 1,
todayBtn: true,
todayHighlight: false,
startView: 3,
minView: 3,
forceParse: 0,
autoclose:true,
pickerPosition:'bottom-left'
});
$('#datetimepicker').datetimepicker({
format: 'yyyy-mm',
language:"zh-CN",
// minView:2,
weekStart: 1,
todayBtn: true,
todayHighlight: false,
startView: 3,
minView: 3,
forceParse: 0,
autoclose:true,
pickerPosition:'bottom-left'
})
//下拉内容框
$(".drop-down2").on('click',function(event) {
var navlist = $(this).find('.i_list_li');

@ -34,7 +34,7 @@
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">市场业绩提成</h3>
<p class="description_text">说明:绩优流水计算管理</p>
<p class="description_text">说明:公会统计仅表示符合筛选条件下的数据统计,当搜索所属市场专员时,因为存在换绑等原因,所以不作为市场业绩统计依据</p>
</div>
@ -52,13 +52,21 @@
<div class="input-list search-title-box">
<label>搜索:</label>
</div>
<div class="input-list input-list-promote search_label_rehab">
<select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">
<option value="">请选择时间</option>
<volist name=":getMonth()" id="vo">
<option value="{$vo}" <if condition="$vo eq $_GET['pay_time']">selected=selected</if>>{$vo}</option>
</volist>
</select>
<!-- <div class="input-list input-list-promote search_label_rehab">-->
<!-- <select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">-->
<!-- <option value="">请选择时间</option>-->
<!-- <volist name=":getMonth()" id="vo">-->
<!-- <option value="{$vo}" <if condition="$vo eq $_GET['pay_time']">selected=selected</if>>{$vo}</option>-->
<!-- </volist>-->
<!-- </select>-->
<!-- </div>-->
<div class="input-list">
<input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="开始时间" />
&nbsp;-&nbsp;
<div class="input-append date" id="datetimepicker" style="display:inline-block">
<input type="text" readonly id="time_end" name="time_end" class="" value="{:I('time_end')}" placeholder="结束时间" />
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
<div class="input-list input-list-parent search_label_rehab">
<select id="admin_id" name="admin_id" class="select_gallery" style="width:120px;">
@ -117,16 +125,24 @@
<td>{$data.pay_time|default='无'}</td>
<td>{$data.real_name|default='无'}</td>
<td>{$data.level|default='无'}</td>
<td>{$data.performance_revenue|default='0.00'}</td>
<td><a href="{:U('FinancePromote/index',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id'],'develop_type'=>'1,2'))}" >{$data.performance_revenue|default='0.00'}</a></td>
<td>{$data['appraisal_bonuses']|default='0.00'}</td>
<td><a href="{:U('FinancePromote/index',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id'],'develop_type'=>3))}" >{$data['appraisal_bonuses']|default='0.00'}</a></td>
<td>{$data['performance_commission']|default='0.00'}</td>
<td>{$data['achievement_bonus']|default='0.00'}</td>
<td><a href="{:U('FinancePromote/index',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['commission']|default='0.00'}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time']))}" >{$data['extend_commission']|default='0.00'}</a></td>
<td>{$data['commission']|default='0.00'}</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>
<td><a href="{:U('MarketPercentage/showBonusList',array('pay_time'=>$data['pay_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>
</tr>
</volist>
<td colspan="3">合计</td>
<td><a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time,'develop_type'=>'1,2'))}" >{$sum['performance_revenue']|default="0.00"}</a></td>
<td><a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time,'develop_type'=>3))}" >{$sum['appraisal_bonuses']|default='0.00'}</a></td>
<td>{$sum['performance_commission']|default='0.00'}</td>
<td>{$sum['achievement_bonus']|default='0.00'}</td>
<td>{$sum['commission']|default='0.00'}</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time']))}" >{$sum['extend_commission']|default='0.00'}</a></td>
<td></td>
</notemtpy>
</tbody>
</table>
@ -151,6 +167,11 @@
</volist>
$(".select_gallery").select2();
</script>
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
<php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
<link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
<script type="text/javascript">
//导航高亮
highlight_subnav('{:U('MarketPercentage/marketStaffSettle')}');
@ -262,6 +283,34 @@
})
$('#time_start').datetimepicker({
format: 'yyyy-mm',
language:"zh-CN",
// minView:2,
weekStart: 1,
todayBtn: true,
todayHighlight: false,
startView: 3,
minView: 3,
forceParse: 0,
autoclose:true,
pickerPosition:'bottom-left'
});
$('#datetimepicker').datetimepicker({
format: 'yyyy-mm',
language:"zh-CN",
// minView:2,
weekStart: 1,
todayBtn: true,
todayHighlight: false,
startView: 3,
minView: 3,
forceParse: 0,
autoclose:true,
pickerPosition:'bottom-left'
})
$('.recaculate').click(function(){
var url = $(this).attr('url');
layer.confirm('是否确认重算提成!', {

@ -50,13 +50,21 @@
<div class="input-list search-title-box">
<label>搜索:</label>
</div>
<div class="input-list input-list-promote search_label_rehab">
<select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">
<option value="">请选择时间</option>
<volist name=":getMonth()" id="vo">
<option value="{$vo}" <if condition="$vo eq $_GET['pay_time']">selected=selected</if>>{$vo}</option>
</volist>
</select>
<!-- <div class="input-list input-list-promote search_label_rehab">-->
<!-- <select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">-->
<!-- <option value="">请选择时间</option>-->
<!-- <volist name=":getMonth()" id="vo">-->
<!-- <option value="{$vo}" <if condition="$vo eq $_GET['pay_time']">selected=selected</if>>{$vo}</option>-->
<!-- </volist>-->
<!-- </select>-->
<!-- </div>-->
<div class="input-list">
<input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="开始时间" />
&nbsp;-&nbsp;
<div class="input-append date" id="datetimepicker" style="display:inline-block">
<input type="text" readonly id="time_end" name="time_end" class="" value="{:I('time_end')}" placeholder="结束时间" />
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
<div class="input-list input-list-parent search_label_rehab">
<select id="admin_id" name="admin_id" class="select_gallery" style="width:120px;">
@ -90,7 +98,7 @@
<th>税后毛利</th>
<th >业绩提成</th>
<th >绩效考核奖金</th>
<th>总提成</th>
<th>当月总提成</th>
<th>本月发放</th>
<th>本月未发</th>
<th>剩余金额发放状态</th>
@ -140,8 +148,8 @@
<td></td>
<td></td>
<td>合计</td>
<td></td>
<td></td>
<td>{$sum.performance_revenue|default="0.00"}</td>
<td>{$sum.appraisal_bonuses|default="0.00"}</td>
<td>{$sum.company_profit|default="0.00"}</td>
<td>{$sum['performance_commission']|default='0.00'}</td>
<td>{$sum['achievement_bonus']|default='0.00'}</td>
@ -175,6 +183,11 @@
</volist>
$(".select_gallery").select2();
</script>
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
<php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
<link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
<script type="text/javascript">
//导航高亮
highlight_subnav('{:U('MarketPercentage/personMarketStaffSettle')}');
@ -291,6 +304,33 @@
})
$('#time_start').datetimepicker({
format: 'yyyy-mm',
language:"zh-CN",
// minView:2,
weekStart: 1,
todayBtn: true,
todayHighlight: false,
startView: 3,
minView: 3,
forceParse: 0,
autoclose:true,
pickerPosition:'bottom-left'
});
$('#datetimepicker').datetimepicker({
format: 'yyyy-mm',
language:"zh-CN",
// minView:2,
weekStart: 1,
todayBtn: true,
todayHighlight: false,
startView: 3,
minView: 3,
forceParse: 0,
autoclose:true,
pickerPosition:'bottom-left'
})
$('.send_back').click(function(){
var time = $(this).attr('data-time');

@ -112,6 +112,7 @@
<th>账号</th>
<th>级别</th>
<th>总流水</th>
<th>总提成</th>
<th>已发放总提成</th>
<th >剩余未发放总提成</th>
<th >操作备注</th>
@ -131,12 +132,19 @@
<td>{$data.real_name}</td>
<td>{$data.nickname}</td>
<td>{$data.level}</td>
<td>{$data.pay_amount}</td>
<td>{$data['extend_commission']}</td>
<td>{$data['wait_commission']}</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('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time'],'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('pay_time'=>$data['pay_time'],'admin_id'=>$data['admin_id']))}" >{$data['wait_commission']}</a></td>
<td>{$data['remark']}</td>
</tr>
</volist>
<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('MarketPercentage/personMarketStaffSettle',array('pay_time'=>$data['pay_time']))}" >{$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('pay_time'=>$data['pay_time']))}" >{$sum['wait_commission']|default='0.00'}</a></td>
<td></td>
</notemtpy>
</tbody>
</table>

Loading…
Cancel
Save