|
|
@@ -977,7 +977,7 @@ class StatisticService extends Service
|
|
|
"voucher_remark" => $v['voucher_remark'],
|
|
|
"voucher_amount" => $v['voucher_amount'],
|
|
|
"aggregation_amount" => $v['aggregation_amount'],
|
|
|
- "total_amount" => $v['type'] == 1 ?round( $item_salary[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['allocated_salary']/100,2) : (isset($device_depreciation[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['allocated_depreciation']) ?round($device_depreciation[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['allocated_depreciation']/100,2) : 0),
|
|
|
+ "total_amount" => $v['type'] == 1 ?round( $item_salary[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['allocated_salary']/100,2) : (isset($device_depreciation[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['depreciation']) ?round($device_depreciation[$vv['id'] . "_" . date("Y-m", $v['voucher_date'])]['depreciation']/100,2) : 0),
|
|
|
"fee_id" => $v['fee_id'],
|
|
|
"entrust1_amount" => $v['entrust1_amount'],
|
|
|
"entrust2_amount" => $v['entrust2_amount'],
|
gogs