diff --git a/app/Admin/Controllers/Store/StockController.php b/app/Admin/Controllers/Store/StockController.php index 11e9aa2c..46d6dbcc 100644 --- a/app/Admin/Controllers/Store/StockController.php +++ b/app/Admin/Controllers/Store/StockController.php @@ -4,7 +4,7 @@ namespace App\Admin\Controllers\Store; use App\Models\Admin\Administrator; use App\Models\Store\{Store, StockLog, ProductSku}; -use App\Models\User; +use App\Models\{User, ProductCategory}; use Carbon\Carbon; use Dcat\Admin\{Form, Grid, Admin, Show}; use Dcat\Admin\Http\Controllers\AdminController; @@ -15,7 +15,7 @@ class StockController extends AdminController protected $translation = 'store-stock'; protected function grid() { - $grid = new Grid(StockLog::with(['store', 'productSku', 'tag'])); + $grid = new Grid(StockLog::with(['store', 'productSku.category', 'tag'])); $user = Admin::user(); $canAdmin = $this->canAdmin(); @@ -28,6 +28,7 @@ class StockController extends AdminController $grid->column('store.title', '门店'); $grid->column('productSku.name', '商品'); + $grid->column('productSku.category.name', '分类'); $grid->column('tag.name', '类目'); $grid->column('amount')->display(function ($value) { return ''.$value.''; @@ -46,6 +47,10 @@ class StockController extends AdminController $filter->panel(); $filter->equal('store_id')->select(Store::pluck('title', 'id'))->width(3); $filter->like('productSku.name', '商品')->width(3); + $filter->where('category_id', function ($q) { + $id = $this->input; + $q->whereHas('productSku', fn($q1) => $q1->filter(['category' => $id], \App\Endpoint\Api\Filters\ProductSkuFilter::class)); + }, '分类')->select(ProductCategory::selectOptions())->width(3); $filter->equal('tag_id', '类目')->select(StockLog::tags()->pluck('name', 'id'))->width(3); $filter->like('operator_name', '操作人')->width(3); $filter->whereBetween('created_at', function ($q) { diff --git a/app/Models/Store/StockBatch.php b/app/Models/Store/StockBatch.php index 1ed1cf88..126f83b6 100644 --- a/app/Models/Store/StockBatch.php +++ b/app/Models/Store/StockBatch.php @@ -4,7 +4,7 @@ namespace App\Models\Store; use Illuminate\Database\Eloquent\Model; use Dcat\Admin\Traits\HasDateTimeFormatter; -use App\Models\Tag; +use App\Models\{Tag}; use App\Models\Admin\Administrator; class StockBatch extends Model