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 14:08:19 +08:00
parent 5f605f5a63 fde98ea5b9
commit c72b128872
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/InvRequisitionController.php
+5 -3
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()->toArray(); $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->orderBy('id')->get()->toArray();
$approve_id = 0;
foreach ($data['approve'] as $key => $value) { foreach ($data['approve'] as $key => $value) {
if (isset($value['created_at'])){ if (isset($value['created_at'])){
$value['created_at'] = is_int($value['created_at'])?$value['created_at']:strtotime($value['created_at']); $value['created_at'] = is_int($value['created_at'])?$value['created_at']:strtotime($value['created_at']);
@@ -94,10 +96,10 @@ class InvRequisitionController extends BaseController
} }
if (isset($value['updated_at'])){ if (isset($value['updated_at'])){
$value['updated_at'] = is_int($value['updated_at'])?$value['updated_at']:strtotime($value['updated_at']); $value['updated_at'] = is_int($value['updated_at'])?$value['updated_at']:strtotime($value['updated_at']);
$data['approve'][$key] = date('Y-m-d H:i:s', $value['updated_at']); $data['approve'][$key]['updated_at'] = date('Y-m-d H:i:s', $value['updated_at']);
} }
$approve_id = $value['id'];
} }
$approve_id = !empty($data['approve'])?array_pop($data['approve'])['id']:null;
$data['approve_id'] = $approve_id; $data['approve_id'] = $approve_id;
} }
if (isset($data['created_at'])) if (isset($data['created_at']))