From 3965075bf89d9dee0ec972f1813b8fd2062a847d Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 28 Sep 2021 19:25:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AgentProductController.php | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index 8a18e3a..a2806c3 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -9,6 +9,7 @@ use App\AdminAgent\Repositories\AgentProduct; use App\Common\AgentType; use App\Common\ProductStatus; use App\Models\AgentProductItem; +use App\Models\AgentSetting; use App\Models\Category; use App\Models\Channel; use App\Models\Guide; @@ -168,7 +169,7 @@ class AgentProductController extends AdminController */ protected function form() { - return Form::make(new AgentProduct(['spec.productSpec']), function (Form $form) { + return Form::make(new AgentProduct(['product:id,title', 'spec.productSpec']), function (Form $form) { $agent_id = Admin::user()->id; //不允许查看非自己的数据 if ($form->isEditing() && $form->model()->agent_id != Admin::user()->id) { @@ -197,15 +198,23 @@ class AgentProductController extends AdminController } else { $form->hidden('type')->value(0)->default(0); $js = file_get_contents(resource_path('js/select-supplier-product-change.js')); - $js = str_replace(['{{url}}', '{{class}}', '\\'], [route(admin_api_route_name('form')), LoadSupplierSpec::class, '\\\\'], $js); - $form->selectTable('product_id', '供应商产品') - ->required() - ->help('产品列表显示的是该产品的标题和图片') - ->title('选择产品') - ->dialogWidth('80%;min-width:825px;') - ->from(SelectProduct::make(['ids' => $form->model()->product_ids])) - ->model(Product::class) - ->script($js); + $js = str_replace( + ['{{url}}', '{{class}}', '{{profit}}', '\\'], + [route(admin_api_route_name('form')), LoadSupplierSpec::class, AgentSetting::val(Admin::user()->id, 'profit'), '\\\\'], + $js + ); + if ($form->isCreating()) { + $form->selectTable('product_id', '供应商产品') + ->required() + ->help('产品列表显示的是该产品的标题和图片') + ->title('选择产品') + ->dialogWidth('80%;min-width:825px;') + ->from(SelectProduct::make(['ids' => $form->model()->product_ids])) + ->model(Product::class) + ->script($js); + } else { + $form->display('product.title'); + } $form->hasMany('spec', function (Form\NestedForm $form) { // $form->hidden('id'); hasMany时，ID会自动生成