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 14:57:16 +08:00
parent e3b38ee117 cdb889137f
commit d58c54da76
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/mobile/controller/InvRequisitionItemReturnController.php
+19 -8
View File
@@ -2,6 +2,8 @@
namespace app\mobile\controller; namespace app\mobile\controller;
use app\common\controller\BaseController; use app\common\controller\BaseController;
use app\common\model\Corp;
use app\common\model\InvItem;
use app\common\traits\crud\CrudControllerTrait; use app\common\traits\crud\CrudControllerTrait;
use app\common\service\InvRequisitionItemReturnService; use app\common\service\InvRequisitionItemReturnService;
use support\Request; use support\Request;
@@ -42,14 +44,23 @@ class InvRequisitionItemReturnController extends BaseController
* @param array $data * @param array $data
* @return array * @return array
*/ */
// protected function indexFormat($data) protected function indexFormat($data)
// { {
// if (isset($data['created_at'])) if (isset($data['item_id'])){
// $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); $data['item'] = InvItem::where('id', $data['item_id'])->get();
// if (isset($data['updated_at'])) foreach ($data['item'] as $key => $item){
// $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); $corpId = InvItem::where('id', $item->item_id)->value('company_id');
// return $data; $item['company_name'] = Corp::where('id', $corpId)->value('name');
// } }
}
if (isset($data['return_at']))
$data['return_at'] = date('Y-m-d H:i:s', $data['return_at']);
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
return $data;
}
/** /**