Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
fbf13034
Commit
fbf13034
authored
Sep 30, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
罚款总计
parent
2622a5c8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
67 additions
and
46 deletions
+67
-46
AmercementService.php
application/index/service/AmercementService.php
+2
-1
fineMoney.html
application/index/view/finance/fineMoney.html
+54
-43
OAmercementModel.php
application/model/OAmercementModel.php
+10
-2
fineMoney.js
public/resource/js/fineMoney.js
+1
-0
No files found.
application/index/service/AmercementService.php
View file @
fbf13034
...
@@ -496,7 +496,8 @@ class AmercementService
...
@@ -496,7 +496,8 @@ class AmercementService
$result
[
$key
][
'money_sum'
]
=
$result
[
$key
][
'forfeit_penalty'
]
+
$val
[
'money'
];
//罚款总金额
$result
[
$key
][
'money_sum'
]
=
$result
[
$key
][
'forfeit_penalty'
]
+
$val
[
'money'
];
//罚款总金额
}
}
$result_
[
'list'
]
=
$result
;
$result_
[
'list'
]
=
$result
;
$result_
[
'total'
]
=
$result
=
$this
->
m_amercement
->
getAmercementTotal
(
$conditions
,
$field
);
$result_
[
'total'
]
=
$result
=
$this
->
m_amercement
->
getAmercementTotal
(
$conditions
);
$result_
[
'money'
]
=
$this
->
m_amercement
->
getAmercementListSum
(
$conditions
,
'money'
);
return
$result_
;
return
$result_
;
}
}
...
...
application/index/view/finance/fineMoney.html
View file @
fbf13034
...
@@ -167,49 +167,60 @@
...
@@ -167,49 +167,60 @@
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
<div
class=
"table-responsive"
>
<div
class=
"table-responsive"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<thead>
<tr>
<tr>
<td
colspan=
"14"
>
<td
colspan=
"14"
>
<form
id=
"form_search"
class=
""
>
<form
id=
"form_search"
>
<div
class=
"form-group"
>
<span
class=
"fore-span margin-top-ld"
>
提交时间:
</span>
<div
class=
"row"
>
<input
class=
"form-control btn4 margin-top-ld"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"submit_start_date"
name=
""
type=
"date"
>
<div
class=
"col-md-12"
>
<label
for=
"submit_start_date"
class=
"pull-left margin-top-ld control-label text-right"
>
提交时间:
</label>
<span
class=
"fore-span ld-Marheight"
style=
"margin-top: 15px;"
>
-
</span>
<input
class=
"form-control btn4 margin-top-ld"
value=
""
<input
class=
"form-control btn4 margin-top-ld"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"submit_end_date"
name=
""
type=
"date"
>
data-rule-phoneus=
"false"
<!--<span class="fore-span ld-Marheight">付款时间:</span>
data-rule-required=
"false"
id=
"submit_start_date"
name=
""
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="payment_start_date" name="" type="date">
type=
"date"
>
<span class="fore-span ld-Marheight">-</span>
<span
style=
"margin: 20px 5px;"
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="payment_end_date" name="" type="date">-->
class=
"glyphicon glyphicon-minus pull-left"
></span>
<select
class=
"form-control btn4 margin-top-ld state-pay"
>
<input
class=
"form-control btn4 margin-top-ld"
value=
""
<option
value=
""
>
状态
</option>
data-rule-phoneus=
"false"
data-rule-required=
"false"
<option
value=
"0"
>
待支付
</option>
id=
"submit_end_date"
name=
""
type=
"date"
>
<option
value=
"1"
>
已支付
</option>
<option
value=
"2"
>
已取消
</option>
<select
class=
"form-control btn4 margin-top-ld state-pay"
>
</select>
<option
value=
""
>
状态
</option>
<select
class=
"form-control btn4 margin-top-ld fine-item"
>
<option
value=
"0"
>
待支付
</option>
<option
value=
"1"
>
已支付
</option>
</select>
<option
value=
"2"
>
已取消
</option>
<input
class=
"form-control btn2 margin-top-ld"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"fine_id"
placeholder=
"罚款ID"
type=
"text"
value=
""
>
</select>
<input
class=
"form-control btn2 margin-top-ld"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"submit_fine_name"
placeholder=
"提交人姓名"
type=
"text"
value=
""
>
<select
class=
"form-control btn4 margin-top-ld fine-item"
>
<input
class=
"form-control btn2 margin-top-ld"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"fine_name"
placeholder=
"被罚款人姓名"
type=
"text"
value=
""
>
</select>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"search"
style=
"float:left ;"
>
搜索
</span>
<input
class=
"form-control btn4 margin-top-ld"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"fine_id"
placeholder=
"罚款ID"
type=
"text"
value=
""
>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"reset"
style=
"float:left ;"
>
重置
</span>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"export"
style=
"float:left ;"
>
导出excel
</span>
</div>
</form>
<div
class=
"col-md-12"
>
</td>
<input
class=
"form-control btn4 margin-top-ld"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"submit_fine_name"
placeholder=
"提交人姓名"
type=
"text"
value=
""
>
</tr>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"search"
style=
"float:left ;"
>
搜索
</span>
<tr
class=
"text-center"
>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"reset"
style=
"float:left ;"
>
重置
</span>
<th
class=
"text-center"
>
罚款ID
</th>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"export"
style=
"float:left ;"
>
导出excel
</span>
<th
class=
"text-center"
>
罚款项目
</th>
<label
class=
"margin-top-ld col-sm-2 control-label btn-lg"
>
总计:
<span
id=
"total_money"
></span>
元
</label>
<th
class=
"text-center"
>
提交时间
</th>
</div>
<th
class=
"text-center"
>
提交人
</th>
</div>
<th
class=
"text-center"
>
罚款金额
</th>
</div>
<th
class=
"text-center"
>
被罚款人
</th>
</form>
<th
class=
"text-center"
>
滞纳金
</th>
</td>
<th
class=
"text-center"
>
付款金额
</th>
</tr>
<th
class=
"text-center"
>
状态
</th>
<th
class=
"text-center"
>
操作
</th>
</tr>
<tr
class=
"text-center"
>
<th
class=
"text-center"
>
罚款ID
</th>
<th
class=
"text-center"
>
罚款项目
</th>
<th
class=
"text-center"
>
提交时间
</th>
<th
class=
"text-center"
>
提交人
</th>
<th
class=
"text-center"
>
罚款金额
</th>
<th
class=
"text-center"
>
被罚款人
</th>
<th
class=
"text-center"
>
滞纳金
</th>
<th
class=
"text-center"
>
付款金额
</th>
<th
class=
"text-center"
>
状态
</th>
<th
class=
"text-center"
>
操作
</th>
</tr>
<tbody
id=
"agentlist"
>
<tbody
id=
"agentlist"
>
</tbody>
</tbody>
...
...
application/model/OAmercementModel.php
View file @
fbf13034
...
@@ -47,6 +47,15 @@ class OAmercementModel extends Model
...
@@ -47,6 +47,15 @@ class OAmercementModel extends Model
return
$result
;
return
$result
;
}
}
public
function
getAmercementListSum
(
$params
,
$field
)
{
$params
[
'is_del'
]
=
0
;
$result
=
$this
->
db_
->
where
(
$params
)
->
sum
(
$field
);
return
$result
;
}
/**
/**
* 罚款列表前置操作 将已支付罚款状态改掉
* 罚款列表前置操作 将已支付罚款状态改掉
* @param $params
* @param $params
...
@@ -63,10 +72,9 @@ class OAmercementModel extends Model
...
@@ -63,10 +72,9 @@ class OAmercementModel extends Model
return
$result
;
return
$result
;
}
}
public
function
getAmercementTotal
(
$params
,
$field
)
public
function
getAmercementTotal
(
$params
)
{
{
$result
=
$this
->
db_
$result
=
$this
->
db_
->
field
(
$field
)
->
where
(
$params
)
->
where
(
$params
)
->
count
();
->
count
();
return
$result
;
return
$result
;
...
...
public/resource/js/fineMoney.js
View file @
fbf13034
...
@@ -462,6 +462,7 @@ define(['doT', 'text!temp/fineMoney_list_template_tpl.html', 'text!temp/phoneBin
...
@@ -462,6 +462,7 @@ define(['doT', 'text!temp/fineMoney_list_template_tpl.html', 'text!temp/phoneBin
data
:
params
,
data
:
params
,
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
$
(
"#total_money"
).
html
(
data
.
data
.
money
);
//获取对应的id
//获取对应的id
var
temp
=
document
.
getElementById
(
'fine_tpl'
).
innerHTML
;
var
temp
=
document
.
getElementById
(
'fine_tpl'
).
innerHTML
;
var
doTempl
=
doT
.
template
(
temp
);
var
doTempl
=
doT
.
template
(
temp
);
...
...
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