diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index 82fd956..8fb3047 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -186,7 +186,7 @@ class AgentProductController extends AdminController ->help('请选择两个或两个以上的产品组合销售') ->title('选择产品') ->dialogWidth('80%;min-width:825px;') - ->from(SelectProduct::make()) + ->from(SelectProduct::make(['ids' => $form->model()->product_ids])) ->model(Product::class); /** 自定义内容 **/ @@ -205,7 +205,7 @@ class AgentProductController extends AdminController ->help('产品列表显示的是该产品的标题和图片') ->title('选择产品') ->dialogWidth('80%;min-width:825px;') - ->from(SelectProduct::make()) + ->from(SelectProduct::make(['ids' => $form->model()->product_ids])) ->model(Product::class); })->when(1, function (Form $form) { /** 组合销售 **/ @@ -213,7 +213,7 @@ class AgentProductController extends AdminController ->help('可单选或多选组合销售') ->title('选择产品') ->dialogWidth('80%;min-width:825px;') - ->from(SelectProduct::make()) + ->from(SelectProduct::make(['ids' => $form->model()->product_ids])) ->model(Product::class); /** 自定义内容 **/ diff --git a/app/AdminAgent/Renderable/SelectProduct.php b/app/AdminAgent/Renderable/SelectProduct.php index f9bda59..ee0ffc1 100644 --- a/app/AdminAgent/Renderable/SelectProduct.php +++ b/app/AdminAgent/Renderable/SelectProduct.php @@ -25,6 +25,9 @@ class SelectProduct extends LazyRenderable $grid->disableBatchActions(); $grid->model()->where('status', ProductStatus::ON_SALE)->whereIn('agent_id', [0, Admin::user()->id]); + if (!is_null($this->ids)) { + $grid->model()->orderByRaw("FIELD(`id`, {$this->ids}) DESC"); + } $grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商'); $grid->column('id'); @@ -39,7 +42,6 @@ class SelectProduct extends LazyRenderable $grid->paginate(15); $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id')->width(2); $filter->like('title')->width(4); $filter->like('supplier.name', '供应商名称')->width(4); });