|
@@ -133,7 +133,7 @@ class AuxiliaryAccountService extends Service
|
|
|
}
|
|
}
|
|
|
$model = new ExpenseClaimsDetails();
|
|
$model = new ExpenseClaimsDetails();
|
|
|
//总金额
|
|
//总金额
|
|
|
- $list = $model->where('expense_claims_id',$month_ps_order_id)->select("fee_id","amount as total_amount","remark","entrust_type","item_id")->get()->toArray();
|
|
|
|
|
|
|
+ $list = $model->where('expense_claims_id',$month_ps_order_id)->where('del_time',0)->select("fee_id","amount as total_amount","remark","entrust_type","item_id")->get()->toArray();
|
|
|
///分组
|
|
///分组
|
|
|
$fee_type_list = Fee::Clear($user,$data)->where('del_time',0)->select("title","id","parent_id")->get()->toArray();
|
|
$fee_type_list = Fee::Clear($user,$data)->where('del_time',0)->select("title","id","parent_id")->get()->toArray();
|
|
|
return [true,$this->groupListByRoot($list,$fee_type_list)];
|
|
return [true,$this->groupListByRoot($list,$fee_type_list)];
|