Skip to content

T
tl_estate
Commit 733ffd14 authored by hujun's avatar hujun
Browse files
Options

已支付总计

parent 80f83ef4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
application/index/service/AmercementService.php
View file @ 733ffd14
......@@ -497,7 +497,8 @@ class AmercementService
}
$result_['list'] = $result;
$result_['total'] = $result = $this->m_amercement->getAmercementTotal($conditions);
$result_['money'] = $this->m_amercement->getAmercementListSum($conditions, 'money');
$money = $this->m_amercement->getAmercementInfo($conditions, 'sum(forfeit_penalty) as forfeit_penalty,sum(money_sum) as money_sum');
$result_['money'] = $money['forfeit_penalty'] + $money['money_sum'];
return $result_;
}
......
application/index/view/finance/fineMoney.html
View file @ 733ffd14
......@@ -200,7 +200,7 @@
<span class="btn btn-info btn3 margin-top-ld" id="search" style="float:left ;">搜索</span>
<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>
<label class="margin-top-ld col-sm-2 control-label btn-lg">总计：<span id="total_money"></span>元</label>
<label class="margin-top-ld col-sm-2 control-label btn-lg">已支付总计：<span id="total_money"></span>元</label>
</div>
</div>
</div>
......
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