Skip to content

L
lvsuo-pc
Commit 6cfd86fe by lizhilin
Options

更新

parent cc4303e0
Showing with 14 additions and 16 deletions
app/Admin/Controllers/CovenantReceivePaymentController.php
...@@ -59,10 +59,9 @@ protected function grid() ...@@ -59,10 +59,9 @@ protected function grid()
<tr> <tr>
<th width="90"></th> <th width="90"></th>
<th width="90"></th> <th width="90"></th>
<th width="90"></th>
<th width="90">合计</th> <th width="90">合计</th>
<th width="90"></th> <th width="90"></th>
<th width="90"></th> <th width="105"></th>
<th width="90">&nbsp;&nbsp;&nbsp;&nbsp;' . sprintf('%.2f', $invoicedMoney) . '</th> <th width="90">&nbsp;&nbsp;&nbsp;&nbsp;' . sprintf('%.2f', $invoicedMoney) . '</th>
<th width="90">&nbsp;&nbsp;' . sprintf('%.2f', $receivedMoney) . '</th> <th width="90">&nbsp;&nbsp;' . sprintf('%.2f', $receivedMoney) . '</th>
<th width="90">&nbsp;&nbsp;' . $receiptNoinvoice . '</th> <th width="90">&nbsp;&nbsp;' . $receiptNoinvoice . '</th>
...@@ -77,7 +76,7 @@ protected function grid() ...@@ -77,7 +76,7 @@ protected function grid()
</div>'; </div>';
}); });
//$grid->column('id')->sortable(); //$grid->column('id')->sortable();
$grid->column('lnum', '律师编号')->width(90); //$grid->column('lnum', '律师编号')->width(90);
$grid->column('lname', '律师姓名')->width(90); $grid->column('lname', '律师姓名')->width(90);
$grid->column('covenant_num', '合同编号')->width(90); $grid->column('covenant_num', '合同编号')->width(90);
$grid->column('covenant_name', '合同名称')->width(90); $grid->column('covenant_name', '合同名称')->width(90);
...@@ -96,7 +95,7 @@ protected function grid() ...@@ -96,7 +95,7 @@ protected function grid()
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
// 更改为 panel 布局 // 更改为 panel 布局
$filter->panel(); $filter->panel();
$filter->like('lnum', '律师编号')->width(3); //$filter->like('lnum', '律师编号')->width(3);
$filter->like('lname', '律师名称')->width(3); $filter->like('lname', '律师名称')->width(3);
$filter->like('cnum', '合同编号')->width(3); $filter->like('cnum', '合同编号')->width(3);
$filter->equal('ctype', '合同类型')->select(ModelsCovenant::CTYPE)->width(3); $filter->equal('ctype', '合同类型')->select(ModelsCovenant::CTYPE)->width(3);
......
app/Admin/Controllers/LawyerCollectController.php
...@@ -76,8 +76,7 @@ protected function grid() ...@@ -76,8 +76,7 @@ protected function grid()
<table class="table custom-data-table data-table" border=0 id="grid-table"> <table class="table custom-data-table data-table" border=0 id="grid-table">
<thead> <thead>
<tr> <tr>
<th width="90">&nbsp;&nbsp;&nbsp;</th> <th width="100" style="text-align:right;">合计</th>
<th width="100" style="text-align:center;">合计</th>
<th width="90">&nbsp;&nbsp;</th> <th width="90">&nbsp;&nbsp;</th>
<th width="100" style="text-align:center;">' . sprintf('%.2f', $received_amount) . '</th> <th width="100" style="text-align:center;">' . sprintf('%.2f', $received_amount) . '</th>
<th width="80" style="text-align:center;">' . sprintf('%.2f', $commissionAmount) . '</th> <th width="80" style="text-align:center;">' . sprintf('%.2f', $commissionAmount) . '</th>
...@@ -117,9 +116,9 @@ protected function grid() ...@@ -117,9 +116,9 @@ protected function grid()
// '</div>'; // '</div>';
// }); // });
//$grid->column('id')->sortable(); //$grid->column('id')->sortable();
$grid->column('lnumber', '律师编号')->width(90)->style([ // $grid->column('lnumber', '律师编号')->width(90)->style([
'text-align:center', // 'text-align:center',
]); // ]);
$grid->column('lname', '律师名称')->width(90)->style([ $grid->column('lname', '律师名称')->width(90)->style([
'text-align:center', 'text-align:center',
]); ]);
...@@ -172,7 +171,7 @@ protected function grid() ...@@ -172,7 +171,7 @@ protected function grid()
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
// 更改为 panel 布局 // 更改为 panel 布局
$filter->panel(); $filter->panel();
$filter->like('number', '律师编号')->width(3); //$filter->like('number', '律师编号')->width(3);
$filter->like('name', '律师姓名')->width(3); $filter->like('name', '律师姓名')->width(3);
$filter->equal('year', '年份')->width(3)->default(date('Y')); $filter->equal('year', '年份')->width(3)->default(date('Y'));
$filter->between('received_at', '收款日期')->month()->width(4); $filter->between('received_at', '收款日期')->month()->width(4);
......
app/Admin/Controllers/LawyerCommissionController.php
...@@ -24,7 +24,7 @@ protected function grid() ...@@ -24,7 +24,7 @@ protected function grid()
return Grid::make(new Lawyer(), function (Grid $grid) { return Grid::make(new Lawyer(), function (Grid $grid) {
$year = $grid->model()->filter()->input('year') ?? date('Y'); $year = $grid->model()->filter()->input('year') ?? date('Y');
//$grid->column('id')->sortable(); //$grid->column('id')->sortable();
$grid->column('number', '律师编号'); //$grid->column('number', '律师编号');
$grid->column('name', '律师姓名'); $grid->column('name', '律师姓名');
$grid->column('received_money', '创收已收款')->display(function ($val) use ($year) { $grid->column('received_money', '创收已收款')->display(function ($val) use ($year) {
$money = self::getReceivedMoney($year, $this->id); $money = self::getReceivedMoney($year, $this->id);
...@@ -68,7 +68,7 @@ protected function grid() ...@@ -68,7 +68,7 @@ protected function grid()
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
// 更改为 panel 布局 // 更改为 panel 布局
$filter->panel(); $filter->panel();
$filter->like('number', '律师编号')->width(3); //$filter->like('number', '律师编号')->width(3);
$filter->like('name', '律师姓名')->width(3); $filter->like('name', '律师姓名')->width(3);
$filter->like('year', '年份')->width(3)->default(date("Y"))->ignore(); $filter->like('year', '年份')->width(3)->default(date("Y"))->ignore();
}); });
......
app/Admin/Controllers/LawyerCostController.php
...@@ -26,7 +26,7 @@ protected function grid() ...@@ -26,7 +26,7 @@ protected function grid()
$name = $grid->model()->filter()->input('name') ?? ''; $name = $grid->model()->filter()->input('name') ?? '';
$year = $_GET['year'] ?? date("Y"); $year = $_GET['year'] ?? date("Y");
//$grid->column('id')->sortable(); //$grid->column('id')->sortable();
$grid->column('number', '律师编号'); //$grid->column('number', '律师编号');
$grid->column('name', '律师姓名'); $grid->column('name', '律师姓名');
$grid->column('basic_salary', '基本工资')->display(function ($val) use ($year) { $grid->column('basic_salary', '基本工资')->display(function ($val) use ($year) {
return self::getBasiSalary($this->number, $year); return self::getBasiSalary($this->number, $year);
...@@ -73,7 +73,7 @@ protected function grid() ...@@ -73,7 +73,7 @@ protected function grid()
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
// 更改为 panel 布局 // 更改为 panel 布局
$filter->panel(); $filter->panel();
$filter->like('number', '律师编号')->width(3); //$filter->like('number', '律师编号')->width(3);
$filter->like('name', '律师姓名')->width(3); $filter->like('name', '律师姓名')->width(3);
$filter->like('year', '年份')->width(3)->default(date("Y"))->ignore(); $filter->like('year', '年份')->width(3)->default(date("Y"))->ignore();
//$filter->date('sign_at')->format('YYYY-MM-DD'); //$filter->date('sign_at')->format('YYYY-MM-DD');
......
app/Admin/Controllers/LawyerIncomeController.php
...@@ -23,7 +23,7 @@ protected function grid() ...@@ -23,7 +23,7 @@ protected function grid()
return Grid::make(new ModelLawyer(), function (Grid $grid) { return Grid::make(new ModelLawyer(), function (Grid $grid) {
//$grid->column('id')->sortable(); //$grid->column('id')->sortable();
$year = $grid->model()->filter()->input('year') ?? date('Y'); $year = $grid->model()->filter()->input('year') ?? date('Y');
$grid->column('number', '律师编号'); //$grid->column('number', '律师编号');
$grid->column('name', '律师姓名'); $grid->column('name', '律师姓名');
$grid->column('sex', '性别')->display(function ($val) { $grid->column('sex', '性别')->display(function ($val) {
return $val == 1 ? '男' : '女'; return $val == 1 ? '男' : '女';
...@@ -81,7 +81,7 @@ protected function grid() ...@@ -81,7 +81,7 @@ protected function grid()
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
// 更改为 panel 布局 // 更改为 panel 布局
$filter->panel(); $filter->panel();
$filter->like('number', '律师编号')->width(3); //$filter->like('number', '律师编号')->width(3);
$filter->like('name', '律师姓名')->width(3); $filter->like('name', '律师姓名')->width(3);
$filter->like('year', '年份')->width(3)->default(date("Y"))->ignore(); $filter->like('year', '年份')->width(3)->default(date("Y"))->ignore();
//$filter->date('sign_at')->format('YYYY-MM-DD'); //$filter->date('sign_at')->format('YYYY-MM-DD');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment