提交 387db56f authored 作者: chengye's avatar chengye

修复结算明细显示错误

上级 5032b4d3
...@@ -197,7 +197,15 @@ class Settle extends Base ...@@ -197,7 +197,15 @@ class Settle extends Base
//实缴金额 //实缴金额
$amount = EmCertSettle::where('settle_id', '=', $settle_id)->sum('amount'); $amount = EmCertSettle::where('settle_id', '=', $settle_id)->sum('amount');
$this->assign('payment_sum_amount', $amount); //实缴金额
if($settle->mark){
if($settle->balance == 0){
$amount = $settle->amount;
} else {
$amount = $settle->amount - $settle->balance;
}
}
$this->assign('payment_sum_amount',$amount);
//查询凭证信息 //查询凭证信息
$receipts = (new EmSettleReceipt)->getSettleReceiptBySettleId($settle_id); $receipts = (new EmSettleReceipt)->getSettleReceiptBySettleId($settle_id);
...@@ -224,6 +232,7 @@ class Settle extends Base ...@@ -224,6 +232,7 @@ class Settle extends Base
$this->assign('invs', new EmInvoice()); $this->assign('invs', new EmInvoice());
$this->assign('receipts', new EmSettleReceipt()); $this->assign('receipts', new EmSettleReceipt());
} }
$this->assign('settle_sum_amount',$settle_sum_amount);
$this->assign('settle', $settle); $this->assign('settle', $settle);
//员工列表 //员工列表
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</label> </label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" name="paid_totle" id="paid_totle" <input type="text" name="paid_totle" id="paid_totle"
class="layui-input no-border" value="{$settle.settle_sum_amount|round=3|default=0}" disabled="disabled"> class="layui-input no-border" value="{$settle_sum_amount|round=3|default=0}" disabled="disabled">
</div> </div>
</div> </div>
</div> </div>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论