|
|
@@ -289,7 +289,7 @@ class Account
|
|
|
$where['aid'] = $id;
|
|
|
$total = Dever::db('option/bill_jiaofu')->total($where);
|
|
|
$daijiaofu = $total . '条';
|
|
|
- $cash = Dever::db('option/cash')->select(array('aid' => $id));
|
|
|
+ $cash = Dever::db('option/cash')->select(array('aid' => $id, 'status' => 2));
|
|
|
$total = 0;
|
|
|
$qiquan = '';
|
|
|
$yuanshiqiquan = '';
|
|
|
@@ -299,14 +299,14 @@ class Account
|
|
|
$total += $v['daijiaofu'];
|
|
|
if ($v['type'] == 1) {
|
|
|
$qiquan .= $v['total'];
|
|
|
- $qiquan .= '发放' . $v['fafang'];
|
|
|
- $qiquan .= '未发' . $v['jiaofu'];
|
|
|
- $qiquan .= '兑付' . $v['duifu'];
|
|
|
+ $qiquan .= '<br/ >发放' . $v['fafang'];
|
|
|
+ $qiquan .= '<br/ >未发' . $v['jiaofu'];
|
|
|
+ $qiquan .= '<br/ >兑付' . $v['duifu'];
|
|
|
} elseif ($v['type'] == 2) {
|
|
|
$yuanshiqiquan .= $v['total'];
|
|
|
- $yuanshiqiquan .= '发放' . $v['fafang'];
|
|
|
- $yuanshiqiquan .= '未发' . $v['jiaofu'];
|
|
|
- $yuanshiqiquan .= '兑付' . $v['duifu'];
|
|
|
+ $yuanshiqiquan .= '<br/ >发放' . $v['fafang'];
|
|
|
+ $yuanshiqiquan .= '<br/ >未发' . $v['jiaofu'];
|
|
|
+ $yuanshiqiquan .= '<br/ >兑付' . $v['duifu'];
|
|
|
}
|
|
|
}
|
|
|
}
|
dever