Merge branch 'feature/inv' into develop
This commit is contained in:
@@ -5,6 +5,7 @@ use app\common\controller\BaseController;
|
||||
use app\common\model\Corp;
|
||||
use app\common\model\InvItem;
|
||||
use app\common\model\InvRequisitionItem;
|
||||
use app\common\model\InvRequisitionItemReturn;
|
||||
use app\common\model\InvRequisitionItemReturnAttachment;
|
||||
use app\common\service\OssService;
|
||||
use app\common\traits\crud\CrudControllerTrait;
|
||||
@@ -49,11 +50,10 @@ class InvRequisitionItemReturnController extends BaseController
|
||||
*/
|
||||
protected function indexFormat($data)
|
||||
{
|
||||
if (isset($data['item_id'])){
|
||||
$data['item'] = InvItem::where('id', $data['item_id'])->get();
|
||||
foreach ($data['item'] as $key => $item){
|
||||
$corpId = InvItem::where('id', $item->item_id)->value('company_id');
|
||||
$item['company_name'] = Corp::where('id', $corpId)->value('name');
|
||||
if(isset($data['id'])){
|
||||
$data['return_item'] = InvRequisitionItemReturn::where('return_id', $data['id'])->get();
|
||||
foreach ($data['return_item'] as $key => $value) {
|
||||
$data['return_item'][$key]['item'] = InvItem::where('id', $data['item_id'])->get();
|
||||
}
|
||||
}
|
||||
if (isset($data['return_at']))
|
||||
|
||||
Reference in New Issue
Block a user