diff --git a/app/Admin/Controllers/Store/StockTotalController.php b/app/Admin/Controllers/Store/StockTotalController.php index 513c41d8..d5db3275 100644 --- a/app/Admin/Controllers/Store/StockTotalController.php +++ b/app/Admin/Controllers/Store/StockTotalController.php @@ -17,6 +17,7 @@ class StockTotalController extends AdminController // return Grid::make(ProductSku::with(['productSku.category', 'stockLogs']), function (Grid $grid) { return Grid::make(new StoreTockRepository, function (Grid $grid) { $tags = StockLog::tags()->get(); + $grid->column('store_name', '门店'); $grid->column('name', '产品'); $grid->column('category_name', '分类'); $grid->column('cost_price', '成本单价'); diff --git a/app/Admin/Repositories/StoreTockRepository.php b/app/Admin/Repositories/StoreTockRepository.php index dda8fa2a..8cf2f392 100644 --- a/app/Admin/Repositories/StoreTockRepository.php +++ b/app/Admin/Repositories/StoreTockRepository.php @@ -32,6 +32,7 @@ class StoreTockRepository extends Repository $cost_price = data_get($item->productSku, 'cost_price') / 100; $subData = [ 'id' => $item->product_sku_id, + 'store_name' => data_get($item->store, 'title'), 'name' => data_get($item->productSku, 'name'), 'category_id' => data_get($item->productSku, 'category.id'), 'category_name' => data_get($item->productSku, 'category.name'), @@ -62,6 +63,7 @@ class StoreTockRepository extends Repository public function getQuery(Grid\Model $model) { $query = ProductSku::with([ + 'store', 'productSku.category', 'stockLogs' => function ($q) use ($model) { $q->select('id', 'product_sku_id', DB::raw('abs(`amount`) as `amount`'), 'tag_id');