diff --git a/app/common/service/InvRequisitionItemReturnService.php b/app/common/service/InvRequisitionItemReturnService.php index a13fc2c..c260171 100644 --- a/app/common/service/InvRequisitionItemReturnService.php +++ b/app/common/service/InvRequisitionItemReturnService.php @@ -419,7 +419,7 @@ class InvRequisitionItemReturnService throw new BusinessException('更新领用单状态失败,可能记录不存在'); } }else{ - // 非耗材未全部都已归还 + // 非耗材未全部归还 $affected = InvRequisition::where('id', $requisitionId)->update([ 'status' => 16, 'updated_at' => time(), diff --git a/app/mobile/controller/InvRequisitionItemReturnController.php b/app/mobile/controller/InvRequisitionItemReturnController.php index 704dff9..77d2a65 100644 --- a/app/mobile/controller/InvRequisitionItemReturnController.php +++ b/app/mobile/controller/InvRequisitionItemReturnController.php @@ -62,6 +62,30 @@ class InvRequisitionItemReturnController extends BaseController return $data; } + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + protected function showFormat($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; + } + /** * 物品归还确认 diff --git a/config/route.php b/config/route.php index 647d849..960353c 100644 --- a/config/route.php +++ b/config/route.php @@ -684,6 +684,7 @@ Route::group('/mobile', function () { Route::any('/store', [app\mobile\controller\InvRequisitionItemReturnController::class, 'store']); Route::any('/update', [app\mobile\controller\InvRequisitionItemReturnController::class, 'update']); Route::any('/list', [app\mobile\controller\InvRequisitionItemReturnController::class, 'index']); + Route::any('/show', [app\mobile\controller\InvRequisitionItemReturnController::class, 'show']); Route::any('/confirm', [app\mobile\controller\InvRequisitionItemReturnController::class, 'returnConfirm']); }); });