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-10 10:09:45 +08:00
parent af90824edd 3da11b4b37
commit 698f532ced
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/InvRequisitionController.php
+7 -6
View File
@@ -79,17 +79,18 @@ class InvRequisitionController extends BaseController
*/ */
protected function indexFormat($data, $applicant_id) protected function indexFormat($data, $applicant_id)
{ {
// 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();
// } $data = $data->toArray();
}
if (isset($data['created_at'])){ if (isset($data['created_at'])){
$data['created_at'] = is_int($data['created_at'])?$data['created_at']:strtotime($data['created_at']);{ $data['created_at'] = is_int($data['created_at'])?$data['created_at']:strtotime($data['created_at']);
$data['updated_at'] = is_int($data['updated_at'])?$data['updated_at']:strtotime($data['updated_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();
} }