Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lvsuo-pc
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhilin
lvsuo-pc
Commits
50469b0a
Commit
50469b0a
authored
Dec 02, 2024
by
lizhilin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
f78a2a23
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
21 deletions
+47
-21
app/Admin/Controllers/CovenantController.php
+1
-1
app/Admin/Controllers/CovenantReceivePaymentController.php
+41
-17
app/Admin/Controllers/LawyerCollectController.php
+1
-1
app/Admin/Controllers/LawyerController.php
+2
-1
app/Admin/Controllers/PrincipalController.php
+2
-1
No files found.
app/Admin/Controllers/CovenantController.php
View file @
50469b0a
...
...
@@ -24,7 +24,7 @@ protected function grid()
{
return
Grid
::
make
(
ModelsCovenant
::
with
([
'principal'
,
'lawyer'
]),
function
(
Grid
$grid
)
{
$grid
->
model
()
->
orderBy
(
'id'
,
'DESC'
);
$grid
->
column
(
'id'
)
->
sortable
();
//
$grid->column('id')->sortable();
$grid
->
column
(
'number'
);
$grid
->
column
(
'cname'
);
$grid
->
column
(
'ctype'
)
->
display
(
function
(
$val
)
{
...
...
app/Admin/Controllers/CovenantReceivePaymentController.php
View file @
50469b0a
...
...
@@ -29,26 +29,50 @@ protected function grid()
//已开票未收款
$invoiceNoreceipt
=
ModelsCovenantReceivePayment
::
getInvoiceNoreceipt
();
// 添加一行表头数据
// $grid->header(function () use ($invoicedMoney, $receivedMoney, $receiptNoinvoice, $invoiceNoreceipt) {
// return '<div class="row" style="text-align:center;">' .
// '<div class="col-md-7" >合计</div>' .
// '<div class="col-md-1">' . $invoicedMoney . '</div>' .
// '<div class="col-md-1">' . $receivedMoney . '</div>' .
// '<div class="col-md-1">' . $receiptNoinvoice . '</div>' .
// '<div class="col-md-2">' . $invoiceNoreceipt . '</div>' .
// '</div>';
// });
$grid
->
header
(
function
()
use
(
$invoicedMoney
,
$receivedMoney
,
$receiptNoinvoice
,
$invoiceNoreceipt
)
{
return
'<div class="row" style="text-align:center;">'
.
'<div class="col-md-7" >合计</div>'
.
'<div class="col-md-1">'
.
$invoicedMoney
.
'</div>'
.
'<div class="col-md-1">'
.
$receivedMoney
.
'</div>'
.
'<div class="col-md-1">'
.
$receiptNoinvoice
.
'</div>'
.
'<div class="col-md-2">'
.
$invoiceNoreceipt
.
'</div>'
.
'</div>'
;
return
'<div class="table-responsive table-wrapper complex-container table-middle mt-1 table-collapse ">
<table class="table custom-data-table data-table" id="grid-table" border=0>
<thead>
<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">'
.
$invoicedMoney
.
'</th>
<th width="90">'
.
$receivedMoney
.
'</th>
<th width="90">'
.
$receiptNoinvoice
.
'</th>
<th width="90">'
.
$invoiceNoreceipt
.
'</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>'
;
});
//$grid->column('id')->sortable();
$grid
->
column
(
'lnum'
,
'律师编号'
);
$grid
->
column
(
'lname'
,
'律师姓名'
);
$grid
->
column
(
'covenant_num'
,
'合同编号'
);
$grid
->
column
(
'covenant_name'
,
'合同名称'
);
$grid
->
column
(
'covenant_type'
,
'合同类型'
);
$grid
->
column
(
'principal'
,
'委托人'
);
$grid
->
column
(
'invoice_amount'
,
'开票金额'
);
$grid
->
column
(
'receipt_money'
,
'已收款'
);
$grid
->
column
(
'receipt_noinvoice'
,
'已收款未开票'
);
$grid
->
column
(
'invoice_noreceipt'
,
'已开票未收款'
);
$grid
->
column
(
'lnum'
,
'律师编号'
)
->
width
(
90
)
;
$grid
->
column
(
'lname'
,
'律师姓名'
)
->
width
(
90
)
;
$grid
->
column
(
'covenant_num'
,
'合同编号'
)
->
width
(
90
)
;
$grid
->
column
(
'covenant_name'
,
'合同名称'
)
->
width
(
90
)
;
$grid
->
column
(
'covenant_type'
,
'合同类型'
)
->
width
(
90
)
;
$grid
->
column
(
'principal'
,
'委托人'
)
->
width
(
90
)
;
$grid
->
column
(
'invoice_amount'
,
'开票金额'
)
->
width
(
90
)
;
$grid
->
column
(
'receipt_money'
,
'已收款'
)
->
width
(
90
)
;
$grid
->
column
(
'receipt_noinvoice'
,
'已收款未开票'
)
->
width
(
90
)
;
$grid
->
column
(
'invoice_noreceipt'
,
'已开票未收款'
)
->
width
(
90
)
;
//$grid->column('updated_at')->sortable();
$grid
->
disableCreateButton
();
...
...
app/Admin/Controllers/LawyerCollectController.php
View file @
50469b0a
...
...
@@ -68,7 +68,7 @@ protected function grid()
// 添加一行表头数据
$grid
->
header
(
function
()
use
(
$received_amount
,
$commissionAmount
,
$received_noinvoiced
,
$invoiced_noreceived
,
$costTotal
,
$basicSalary
,
$special_additional
,
$social
,
$accumulation_fund
,
$posting_tickets
,
$advance_fee
,
$payable_amount
)
{
return
'<div class="table-responsive table-wrapper complex-container table-middle mt-1 table-collapse ">
<table class="table custom-data-table data-table" id="grid-table">
<table class="table custom-data-table data-table"
border=1
id="grid-table">
<thead>
<tr>
<th width="90"> </th>
...
...
app/Admin/Controllers/LawyerController.php
View file @
50469b0a
...
...
@@ -20,7 +20,7 @@ class LawyerController extends AdminController
protected
function
grid
()
{
return
Grid
::
make
(
new
Lawyer
(),
function
(
Grid
$grid
)
{
$grid
->
column
(
'id'
)
->
sortable
();
//
$grid->column('id')->sortable();
$grid
->
column
(
'number'
);
$grid
->
column
(
'name'
);
$grid
->
column
(
'sex'
)
->
display
(
function
(
$val
)
{
...
...
@@ -41,6 +41,7 @@ protected function grid()
// $grid->column('created_at');
// $grid->column('updated_at')->sortable();
$grid
->
disableViewButton
();
$grid
->
disableRowSelector
();
$grid
->
filter
(
function
(
Grid\Filter
$filter
)
{
// 更改为 panel 布局
...
...
app/Admin/Controllers/PrincipalController.php
View file @
50469b0a
...
...
@@ -23,7 +23,7 @@ protected function grid()
return
Grid
::
make
(
new
Principal
(),
function
(
Grid
$grid
)
{
$ptype
=
$grid
->
model
()
->
filter
()
->
input
(
'wtype'
)
??
1
;
$grid
->
model
()
->
where
(
'wtype'
,
$ptype
)
->
orderBy
(
"id"
,
"desc"
);
$grid
->
column
(
'id'
)
->
sortable
();
//
$grid->column('id')->sortable();
$grid
->
column
(
'number'
);
if
(
$ptype
==
1
)
{
$grid
->
column
(
'company'
);
...
...
@@ -42,6 +42,7 @@ protected function grid()
// $grid->column('created_at');
// $grid->column('updated_at')->sortable();
$grid
->
disableViewButton
();
$grid
->
disableRowSelector
();
$grid
->
filter
(
function
(
Grid\Filter
$filter
)
use
(
$ptype
)
{
// 更改为 panel 布局
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment