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-09 11:00:46 +08:00
parent 1dfc183cac 537b22c6fb
commit 92776b39d4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/mobile/controller/InvRequisitionController.php
+9 -2
View File
@@ -86,10 +86,17 @@ class InvRequisitionController extends BaseController
*/ */
protected function indexFormat($data, $uid) protected function indexFormat($data, $uid)
{ {
if (isset($data['created_at'])) if(isset($data['id']) && is_object($data)){
$data = $data->toArray();
}
if (isset($data['created_at'])){
$data['created_at'] = is_int($data['created_at'])?$data['created_at']:strtotime($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']);
if (isset($data['updated_at'])) }
if (isset($data['updated_at'])){
$data['updated_at'] = is_int($data['updated_at'])?$data['updated_at']:strtotime($data['updated_at']);
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
}
if (isset($data['id'])){ if (isset($data['id'])){
$data['item'] = InvRequisitionItem::where('requisition_id', $data['id'])->get(); $data['item'] = InvRequisitionItem::where('requisition_id', $data['id'])->get();
foreach ($data['item'] as $key => $item){ foreach ($data['item'] as $key => $item){