xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/inv' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2026-02-05 11:06:14 +08:00
parent be44d1dda2 757689573b
commit 44dc6c06ee
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/InvRequisitionController.php
+3 -1
View File
@@ -86,7 +86,9 @@ class InvRequisitionController extends BaseController
protected function showFormat($data) protected function showFormat($data)
{ {
if (isset($data['id'])){ if (isset($data['id'])){
$data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get(); $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get()->toArray();
$approve_id = !empty($data['approve'])?array_pop($data['approve'])['id']:null;
$data['approve_id'] = $approve_id;
} }
if (isset($data['created_at'])) if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
app/common/service/InvRequisitionService.php
+1 -1
View File
@@ -147,7 +147,7 @@ class InvRequisitionService
return $res; return $res;
}); });
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw new BusinessException("创建物品申请失败："); throw new BusinessException("创建物品申请失败：".$e->getMessage());
} }
} }