Merge pull request 'dev' (#252) from dev into main
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/252
This commit is contained in:
commit
1e09de4212
@ -76,6 +76,8 @@ class WarehouseOrderLists extends BaseAdminDataLists implements ListsSearchInter
|
|||||||
}
|
}
|
||||||
if ($item->supplier_id) {
|
if ($item->supplier_id) {
|
||||||
$item->supplier_name = Supplier::where('id', $item->supplier_id)->value('mer_name');
|
$item->supplier_name = Supplier::where('id', $item->supplier_id)->value('mer_name');
|
||||||
|
}else{
|
||||||
|
$item->supplier_name = '';
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
->toArray();
|
->toArray();
|
||||||
|
@ -27,7 +27,7 @@ class PurchaseProductOfferLists extends BaseApiDataLists implements ListsSearchI
|
|||||||
public function setSearch(): array
|
public function setSearch(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'=' => [],
|
'=' => ['buyer_confirm'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user