From fde98ea5b93b15574fe14a6a5a62cab2d670177f Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Mon, 9 Feb 2026 14:08:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/InvRequisitionController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/admin/controller/InvRequisitionController.php b/app/admin/controller/InvRequisitionController.php index bd31235..68b39f7 100644 --- a/app/admin/controller/InvRequisitionController.php +++ b/app/admin/controller/InvRequisitionController.php @@ -86,7 +86,9 @@ class InvRequisitionController extends BaseController protected function showFormat($data) { 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) { if (isset($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'])){ $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; } if (isset($data['created_at']))