|
|
@@ -408,6 +408,8 @@ class Account
|
|
|
$where['status'] = 2;
|
|
|
$total = Dever::db('option/bill_jiaofu')->total($where);
|
|
|
$daijiaofu = $total . '条';
|
|
|
+ $daijiaofu_qiquan = 0;
|
|
|
+ $daijiaofu_yuanshiqiquan = 0;
|
|
|
$cash = Dever::db('option/cash')->getTotal(array('aid' => $id, 'status' => 2));
|
|
|
$total = 0;
|
|
|
$qiquan = '';
|
|
|
@@ -417,11 +419,13 @@ class Account
|
|
|
$v['total'] = number_format($v['jiaofu'] + $v['fafang'] + $v['duifu'], 2, '.', '');
|
|
|
$total += $v['daijiaofu'];
|
|
|
if ($v['type'] == 1) {
|
|
|
+ $daijiaofu_qiquan += $v['daijiaofu'];
|
|
|
$qiquan .= $v['total'];
|
|
|
$qiquan .= '<br/ >发放' . $v['fafang'];
|
|
|
$qiquan .= '<br/ >未发' . $v['jiaofu'];
|
|
|
$qiquan .= '<br/ >兑付' . $v['duifu'];
|
|
|
} elseif ($v['type'] == 2) {
|
|
|
+ $daijiaofu_yuanshiqiquan += $v['daijiaofu'];
|
|
|
$yuanshiqiquan .= $v['total'];
|
|
|
$yuanshiqiquan .= '<br/ >发放' . $v['fafang'];
|
|
|
$yuanshiqiquan .= '<br/ >未发' . $v['jiaofu'];
|
|
|
@@ -429,7 +433,7 @@ class Account
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $daijiaofu .= '<br/ >' . number_format($total, 2, '.', '');
|
|
|
+ $daijiaofu .= '<br/ >' . number_format($daijiaofu_qiquan, 2, '.', '') . '<br/ >' . number_format($daijiaofu_yuanshiqiquan, 2, '.', '');
|
|
|
if (!$qiquan) {
|
|
|
$qiquan = '无';
|
|
|
}
|
rabin