完成老板工资管理更新

dev
曾超新 5 years ago
parent 022e293ea5
commit 8c506480e8
  1. 123
      frontend/controllers/FinanceController.php
  2. 1283
      frontend/views/finance/gongzi-all-info.php
  3. 284
      frontend/views/finance/gongzi-all-list.php
  4. 2
      frontend/views/finance/pay2-info.php

@ -7564,66 +7564,74 @@ class FinanceController extends \frontend\controllers\UserBaseController
* 财务工资列表 * 财务工资列表
* @return string * @return string
*/ */
public function actionGongziAllList() public function actionGongziAllList() {
$group_items = GroupT::getTree();
return $this->render('gongzi-all-list',[
'group_items' => $group_items
]);
}
public function actionGongziAllListJson()
{ {
Yii::$app->response->format = Response::FORMAT_JSON;
$request = Yii::$app->request; $request = Yii::$app->request;
$username = $request->get('username'); $username = $request->get('username');
$name = $request->get('name'); $name = $request->get('name');
$pay_date = $request->get('pay_date', date('Y-m')); $pay_date = $request->get('pay_date', date('Y-m'));
$group_id = $request->get('group_id', 0); $group_id = $request->get('group_id', 0);
$page = $request->get('page', 1); $is_leave = $request->get('is_leave');
$status_id = $request->get('status_id',0); $status_id = $request->get('status_id',0);
$offset = $request->get('offset', 0);
$limit = $request->get('limit', 10);
$user_id = $this->my->id; $user_id = $this->my->id;
// var_dump($user_id); // var_dump($user_id);
$query = UserT::find() $query = UserT::find()
->leftJoin('pay_t','pay_t.user_id=user_t.id') ->leftJoin('pay_t','pay_t.user_id=user_t.id')
->where('group_id>0 and is_delete=0'); ->where('group_id>0 and is_delete=0');
if ($username != '') { if ($username != '') {
$query = $query->andWhere('username like "' . $username . '"'); $query->andWhere('username like "' . $username . '"');
} }
if ($name != '') { if ($name != '') {
$query = $query->andWhere('name like "' . $name . '"'); $query->andWhere('name like "' . $name . '"');
} }
if ($group_id > 0) { if ($group_id > 0) {
$query = $query->andWhere('group_id=' . $group_id); $query->andWhere('group_id=' . $group_id);
}
if($is_leave != '') {
$query->andWhere('is_leave='.$is_leave);
} }
if($status_id > 0) { if($status_id > 0) {
$query = $query->andWhere(['IN','pay_t.status_id',[7,8,9]]); $query->andWhere(['IN','pay_t.status_id',[7,8,9]]);
} }
$query = $query->orderBy('username ASC,id ASC'); $query = $query->orderBy('username ASC,id ASC');
$total = $query->count(); $total = $query->count();
$total_real_pay = 0;
foreach ($query->each() as $item) {
$pay_info = $item->getPay($pay_date);
if ($pay_info)
$total_real_pay += $pay_info->real_pay;
}
$pagination = new Pagination(['totalCount' => $total, 'pageSize' => 20]);
$pagination->setPage($page - 1);
$query = $query->offset($pagination->offset)->limit($pagination->limit); $query->offset($offset)->limit($limit);
$items = $query->all(); $items = $query->all();
$page_info = MyLib::getPageInfo($pagination); $page_info = MyLib::getPageInfo($pagination);
$group_items = GroupT::getTree(); $group_items = GroupT::getTree();
return $this->render('gongzi-all-list', [ $data = [];
'group_items' => $group_items, $data['total'] = $total;
'items' => $items, $data['rows'] = [];
'page_info' => $page_info, foreach($items as $item) {
'page' => $page, $row = $item->toArray();
'username' => $username, $row['pay_date'] = $pay_date;
'name' => $name, $row['group_name'] = $item->group ? $item->group->path : '';
'pay_date' => $pay_date, $row['is_leave'] = $item->is_leave ? '已离职':'';
'group_id' => $group_id, $pay_info = $item->getPay($pay_date);
'total_real_pay' => $total_real_pay, $row['status_name'] = $pay_info ? $pay_info->getStatus($pay_info->status_id) : '';
'status_id' => $status_id $row['real_pay'] = $pay_info->base_real_pay;
]); $row['should_pay'] = $pay_info->ticheng_real_pay;
$row['is_show'] = ($pay_info->renshi_status_id > 0 && $pay_info->chuna_status_id > 0 && $pay_info->status_id != 7 && $pay_info->status_id != 8) ? 1 : 0;
$data['rows'][] = $row;
}
return $data;
} }
/** /**
* 出纳工资-详情 * 出纳工资-详情
@ -7688,6 +7696,10 @@ class FinanceController extends \frontend\controllers\UserBaseController
->orderBy('created_at asc'); ->orderBy('created_at asc');
//原新保
$my_type0_query = PayOrderUserT::find()
->where('pay_date="' . $pay_date . '" and type=1 and user_id=' . $user_id.' and is_own =0')
->orderBy('created_at asc');
@ -7730,6 +7742,7 @@ class FinanceController extends \frontend\controllers\UserBaseController
'user_info' => $user_info, 'user_info' => $user_info,
'group_info' => $group_info, 'group_info' => $group_info,
'pay_info' => $pay_info, 'pay_info' => $pay_info,
'my_type0_query' => $my_type0_query,
'my_type1_query' => $my_type1_query, 'my_type1_query' => $my_type1_query,
'my_type3_query' => $my_type3_query, 'my_type3_query' => $my_type3_query,
'my_type5_query' => $my_type5_query, 'my_type5_query' => $my_type5_query,
@ -8008,4 +8021,54 @@ class FinanceController extends \frontend\controllers\UserBaseController
'r_bu_dian_all'=>$r_bu_dian_all 'r_bu_dian_all'=>$r_bu_dian_all
]); ]);
} }
public function actionGongziAllReturnSave()
{
Yii::$app->response->format = Response::FORMAT_JSON;
$request = Yii::$app->request;
$result = array();
$result['success'] = false;
$result['msg'] = '保存失败';
$id = $request->post('id',0);
$remark = $request->post('remark','');
$status_id = 4;
$pay_info = PayT::findOne($id);
$pay_info->status_id = $status_id + 6;
$content = '老板:'.$this->my->showName.'退回'.$pay_info->pay_date.'工资';
$this->addUserLog($pay_info->id, $content,$remark);
if($pay_info->save()){
$result['success'] = true;
$result['msg'] = '保存成功';
}
return $result;
}
public function actionGongziAllSave()
{
Yii::$app->response->format = Response::FORMAT_JSON;
$request = Yii::$app->request;
$result = array();
$result['success'] = false;
$result['msg'] = '保存失败';
$id = $request->post('id',0);
$pay_info = PayT::findOne($id);
$pay_info->status_id = 5;
$content = '老板:'.$this->my->showName.'同意本条记录'.$pay_info->pay_date.'工资';
$this->addUserLog($pay_info->id, $content);
if($pay_info->save()){
$result['success'] = true;
$result['msg'] = '保存成功';
}
return $result;
}
} }

File diff suppressed because it is too large Load Diff

@ -1,159 +1,149 @@
<?php <?php
use \common\libs\MyLib; use \common\libs\MyLib;
?> ?>
<script type="text/javascript" language="javascript" src="/js/jquery-1.8.3.js"></script> <?php $this->beginBlock('header_css'); ?>
<script type="text/javascript" language="javascript" src="/js/datepicker/WdatePicker.js"></script> <link href="/assets/css/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
<link rel="stylesheet" href="../Myfile/css/font.css?v=20190611"> <?php $this->endBlock(); ?>
<link rel="stylesheet" href="../Myfile/css/xadmin.css?v=20190605">
<link rel="stylesheet" href="../Myfile/css/theme274.min.css?v=20190605"> <div class="wrapper wrapper-content animated fadeInRight">
<script type="text/javascript" language="javascript" src="/js/jquery-1.8.3.js"></script> <div class="ibox float-e-margins">
<script src="../Myfile/lib/layui/layui.js?v=20190611" charset="utf-8"></script> <div class="ibox-title">
<script type="text/javascript" src="../Myfile/js/xadmin.js?v=20190612"></script> <h5>出纳工资管理</h5>
<script type="text/javascript" language="javascript" src="/js/ajax.js?v=2019"></script><script type="text/javascript" language="javascript" src="/js/func.js"></script> <div class="ibox-tools">
<script type="text/javascript" language="javascript"> <a class="btn btn-primary btn-xs edit-btn" data-id="0" href="javascript:void(0);" onclick="$('#listTable').bootstrapTable('refresh');">
//编辑 <i class="fa fa-refresh"></i> 刷新
</a>
</div>
</div>
<div class="ibox-content">
<form role="form" id="searchFrm" class="form-inline" onsubmit="return search();">
<div class="form-group" style="margin-bottom: 8px;">
<label>工号</label>
<input type="text" name="username" id="username" class="form-control">
</div>
<div class="form-group" style="margin-bottom: 8px;">
<label>真实姓名</label>
<input type="text" name="name" id="name" class="form-control">
</div>
<div class="form-group" style="margin-bottom: 8px;">
<label>工资月份</label>
<input type="text" name="pay_date" id="pay_date" class="form-control date" value="<?=date('Y-m')?>" autocomplete="off">
</div>
<div class="form-group" style="margin-bottom: 8px;">
<label>是否离职</label>
<select name="is_leave" class="form-control">
<option value="">全部</option>
<option value="1"></option>
<option value="0"></option>
</select>
</div>
<div class="form-group" style="margin-bottom: 8px;">
<label>分组</label>
<select name="group_id" class="form-control">
<option value="0">全部</option>
<?php
foreach($group_items as $group) {
echo '<option value="'.$group->id.'">'.$group->name.'</option>';
}
?>
</select>
</div>
<div class="form-group" style="margin-bottom: 8px;">
<label>状态</label>
<select name="status_id" class="form-control">
<option value="0">全部</option>
<option value="1">人事✔</option>
<option value="2">出纳✔</option>
<option value="3">人事✔,出纳✔</option>
<option value="4">财务✔</option>
<option value="5">老板✔</option>
<option value="6">已发放</option>
<option value="7">退回</option>
</select>
</div>
<button type="submit" class="btn btn-primary mb-8">搜索</button>
</form>
<div class="row">
<div class="col-md-12">
<table id="listTable">
<thead>
<tr>
<th width="50" data-field="id">ID</th>
<th data-field="username">工号</th>
<th data-field="name">真实姓名</th>
<th data-field="pay_date">工资月份</th>
<th data-field="group_name">所属岗位</th>
<th data-field="real_pay">基本工资</th>
<th data-field="should_pay">提成工资</th>
<th data-field="is_leave">是否离职</th>
<th data-field="status_name">状态</th>
<th data-formatter="opFormatter">操作</th>
</tr>
</thead>
</table>
</div>
</div>
</div>
</div>
</div>
<?php $this->beginBlock('footer_js'); ?>
<script src="/assets/js/plugins/bootstrap-table/bootstrap-table.min.js"></script>
<script src="/assets/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
<script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<script>
var o = {};
function opFormatter(value, row, index) {
var opStr = [];
if(row.is_show == 1) {
opStr.push('<a href="javascript:void(0);" onclick="edit(' + row.id + ')">');
opStr.push('<i class="fa fa-edit" title="详情"></i>');
opStr.push('</a>');
}
return opStr.join(' ');
}
function edit(id) { function edit(id) {
var params = $('#searchForm').serialize(); var title = '详情';
window.location.href = '/finance/gongzi-all-info?id=' + id + '&pay_date=<?=$pay_date?>' + '&back_params=' + encodeURIComponent(params); var pay_date = $('#pay_date').val();
layer_show(title, '/finance/gongzi-all-info?id=' + id + '&pay_date=' + pay_date);
} }
function refreshList() {
$(function(){ $('#listTable').bootstrapTable('refresh');
$("#search-btn").click(function(){ }
$('#page').val(0); function search() {
var params = $('#searchForm').serialize(); o = {};
window.location.href = "/finance/gongzi-all-list?" + params; var params = $("#searchFrm").serializeArray();
}); $.each(params, function(index) {
$('#searchForm').submit(function(){ o[this['name']] = this['value'];
$('#search-btn').click();
return false;
}); });
$("#reset-btn").click(function(){ $('#listTable').bootstrapTable('destroy');
var pay_date = $('#pay_date').val(); $('#listTable').bootstrapTable({
if(confirm('是否对'+ pay_date + '月份的工资进行重新计算?')) { url: "/finance/pay2-list-json",
$('#reseting').show(); pagination: false,
$(this).hide(); sidePagination: 'server',
$.post('/finance/pay2-reset',{pay_date:pay_date},function(obj){ queryParams: function(params) {
alert(obj.msg); o['offset'] = params['offset'];
if(obj.success) { o['limit'] = params['limit'];
window.location.reload(); return o;
}
$('#reseting').hide();
$(this).show();
},'json');
} }
}); });
return false;
}
$(function() {
search();
$("#pay-btn").click(function(){ $('.date').datepicker({
var params = $('#searchForm').serialize(); minViewMode: 1,
window.location.href = "/finance/pay2-tiao?" + params; keyboardNavigation: false,
forceParse: false,
autoclose: true,
todayHighlight: true,
format: "yyyy-mm"
}); });
}); });
</script> </script>
<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table"> <?php $this->endBlock(); ?>
<form id="searchForm">
<input type="hidden" id="page" name="page" value="<?=$page?>">
<tr>
<td class="td_bg">
工号:<input name="username" type="text" value="<?=$username?>">
真实姓名:<input name="name" type="text" value="<?=$name?>">
工资月份:<input name="pay_date" id="pay_date" class="Wdate" type="text" value="<?=$pay_date?>" onClick="WdatePicker({dateFmt:'yyyy-MM'})">
分组:<select name="group_id">
<option value="0">全部</option>
<?php
foreach($group_items as $group) {
echo '<option value="'.$group->id.'"';
if($group->id == $group_id)
echo ' selected ';
echo '>'.$group->name.'</option>';
}
?>
</select>
状态:<select name="status_id">
<option value="0">全部</option>
<option value="1" <?=$status_id == 1?'selected':''?>>人事✔</option>
<option value="2" <?=$status_id == 2?'selected':''?>>出纳✔</option>
<option value="3" <?=$status_id == 3?'selected':''?>>人事✔,出纳✔</option>
<option value="4" <?=$status_id == 4?'selected':''?>>财务✔</option>
<option value="5" <?=$status_id == 5?'selected':''?>>老板✔</option>
<option value="6" <?=$status_id == 6?'selected':''?>>已发放</option>
<option value="10" <?=$status_id == 10?'selected':''?>>退回</option>
</select>
<input type="submit" class="act_btn" id="search-btn" name="search-btn" value="搜索">
<!-- <span id="reseting" style="display: none;">正在计算中...</span>-->
<!-- <input type="button" class="act_btn" id="reset-btn" name="reset-btn" value="重新计算">-->
<!-- <input type="button" class="act_btn" id="pay-btn" name="pay-btn" value="工资条">-->
</td>
</tr>
</form>
</table>
<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table">
<tr>
<td width="100" align="center" align="center" class="bg_tr">工号</td>
<td align="center" class="bg_tr">真实姓名</td>
<td width="100" align="center" class="bg_tr">工资月份</td>
<td align="center" class="bg_tr">所属岗位</td>
<!-- <td width="60" align="center" class="bg_tr">角色</td>-->
<td width="60" align="center" class="bg_tr">基本工资</td>
<td width="60" align="center" class="bg_tr">提成工资</td>
<td width="60" align="center" class="bg_tr">状态</td>
<td width="30" align="center" class="bg_tr">操作</td>
</tr>
<form id="delFrm">
<?php
foreach($items as $index => $item) {
$pay_info = $item->getPay($pay_date);
$base_real_pay = 0;
$ticheng_real_pay = 0;
$is_begin = 0;
if($pay_info){
$is_begin = 1;
$base_real_pay = $pay_info->base_real_pay;
$ticheng_real_pay = $pay_info->ticheng_real_pay;
}
?>
<tr onMouseOver=overColor(this) onMouseOut=outColor(this)>
<td align="left" class="td_bg" nowrap ><?=$item->username?></td>
<td class="td_bg" nowrap><?=$item->name?></td>
<td class="td_bg" nowrap><?=$pay_date?></td>
<td align="left" class="td_bg" nowrap><?=$item->group?$item->group->name:''?></td>
<!-- <td class="td_bg" nowrap><=$item->role?$item->role->name:''?></td>-->
<td align="center" class="td_bg" nowrap data="<?=$item->id?>">
<?=number_format($base_real_pay,2)?>
</td>
<td align="center" class="td_bg" nowrap data="<?=$item->id?>">
<?=number_format($ticheng_real_pay,2)?>
</td>
<td align="center" class="td_bg" nowrap data="<?=$item->id?>">
<?php if($is_begin == 0):?>
<?php else:?>
<?=$pay_info->getStatus($pay_info->status_id)?>
<?php endif;?>
</td>
<td align="center" class="td_bg" nowrap>
<?php if($is_begin == 0):?>
<?php else:?>
[<a href="javascript:void(0);" onclick="edit(<?=$item->id?>)">详情</a>]
<?php endif;?>
</td>
</tr>
<?php
}
?>
</form>
<tr>
<td width="100" align="center" align="center" class="bg_tr"></td>
<td align="center" class="bg_tr"></td>
<td width="100" align="center" class="bg_tr"></td>
<td align="center" class="bg_tr"></td>
<td width="60" align="center" class="bg_tr"></td>
<td width="60" align="center" class="bg_tr"><?=number_format($total_real_pay,2)?></td>
<td width="30" align="center" class="bg_tr"></td>
</tr>
<tr >
<td height="25" colspan="11" align="center" class="td_bg"><?=$page_info?></td>
</tr>
</table>

@ -81,7 +81,7 @@ use \common\libs\MyLib;
<label class="form-control-static"><?=$pay_chexian + $pay_dz?></label> <label class="form-control-static"><?=$pay_chexian + $pay_dz?></label>
</div> </div>
</div> </div>
<?php if($pay_info->status_id < 4 || $pay_info->status_id == 8) { ?> <?php if($pay_info->status_id < 4 || $pay_info->status_id == 8 || $pay_info->status_id == 10) { ?>
<div> <div>
<div class="row"> <div class="row">
<div class="col-sm-1 col-md-offset-5"> <div class="col-sm-1 col-md-offset-5">

Loading…
Cancel
Save