diff --git a/app/mobile/controller/InvRequisitionItemReturnController.php b/app/mobile/controller/InvRequisitionItemReturnController.php index a5d8dd1..704dff9 100644 --- a/app/mobile/controller/InvRequisitionItemReturnController.php +++ b/app/mobile/controller/InvRequisitionItemReturnController.php @@ -2,6 +2,8 @@ namespace app\mobile\controller; use app\common\controller\BaseController; +use app\common\model\Corp; +use app\common\model\InvItem; use app\common\traits\crud\CrudControllerTrait; use app\common\service\InvRequisitionItemReturnService; use support\Request; @@ -42,14 +44,23 @@ class InvRequisitionItemReturnController extends BaseController * @param array $data * @return array */ - // protected function indexFormat($data) - // { - // if (isset($data['created_at'])) - // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); - // if (isset($data['updated_at'])) - // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); - // return $data; - // } + protected function indexFormat($data) + { + if (isset($data['item_id'])){ + $data['item'] = InvItem::where('id', $data['item_id'])->get(); + foreach ($data['item'] as $key => $item){ + $corpId = InvItem::where('id', $item->item_id)->value('company_id'); + $item['company_name'] = Corp::where('id', $corpId)->value('name'); + } + } + if (isset($data['return_at'])) + $data['return_at'] = date('Y-m-d H:i:s', $data['return_at']); + if (isset($data['created_at'])) + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + if (isset($data['updated_at'])) + $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + return $data; + } /**