diff --git a/app/Admin/Controllers/AgentController.php b/app/Admin/Controllers/AgentController.php index fdb11ae..9067435 100644 --- a/app/Admin/Controllers/AgentController.php +++ b/app/Admin/Controllers/AgentController.php @@ -35,7 +35,6 @@ class AgentController extends AdminController $grid->column('id')->sortable(); $grid->column('username'); - $grid->column('name'); $grid->column('type')->using(AgentType::array()); $grid->column('company_name'); $grid->column('logo')->image('', 60, 60); @@ -65,7 +64,7 @@ class AgentController extends AdminController $filter->panel(); $filter->equal('id')->width(2); - $filter->like('name')->width(3); + $filter->like('company_name')->width(3); $filter->equal('status', '用户状态')->select(UserStatus::array())->width(2); }); }); diff --git a/app/Admin/Controllers/DemandProductController.php b/app/Admin/Controllers/DemandProductController.php index d8ee9ee..7e8f20a 100644 --- a/app/Admin/Controllers/DemandProductController.php +++ b/app/Admin/Controllers/DemandProductController.php @@ -23,7 +23,7 @@ class DemandProductController extends AdminController */ protected function grid() { - return Grid::make(new DemandProduct(['supplier:id,name', 'category:id,name']), function (Grid $grid) { + return Grid::make(new DemandProduct(['supplier:id,company_name', 'category:id,name']), function (Grid $grid) { $grid->disableCreateButton(); //如果是审核页面，多加where条件判断 if (strpos(Route::current()->uri, 'audit')) { @@ -35,7 +35,7 @@ class DemandProductController extends AdminController $grid->column('picture')->image('', 60, 60); $grid->column('title'); //$grid->column('sale'); - $grid->column('supplier.name', '供应商'); + $grid->column('supplier.company_name', '供应商'); $grid->column('status') ->if(fn() => $this->status == ProductStatus::UNAUDITED) ->display('') diff --git a/app/Admin/Controllers/IndustryOrderController.php b/app/Admin/Controllers/IndustryOrderController.php index e0cec0a..8ab2053 100644 --- a/app/Admin/Controllers/IndustryOrderController.php +++ b/app/Admin/Controllers/IndustryOrderController.php @@ -2,10 +2,8 @@ namespace App\Admin\Controllers; -use App\Admin\Extensions\Grid\IndustryOrderStatus; use App\Admin\Repositories\IndustryOrder; use App\Common\OrderStatus; -use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; @@ -20,7 +18,7 @@ class IndustryOrderController extends AdminController */ protected function grid() { - return Grid::make(new IndustryOrder(['agent:id,name']), function (Grid $grid) { + return Grid::make(new IndustryOrder(['agent:id,company_name']), function (Grid $grid) { $grid->disableCreateButton(); $grid->disableRowSelector(); $grid->disableActions(); @@ -28,7 +26,7 @@ class IndustryOrderController extends AdminController //$grid->model()->where('supplier_id', Admin::user()->id); $grid->column('id')->sortable(); - $grid->column('agent.name', '代理商名称'); + $grid->column('agent.company_name', '代理商名称'); $grid->column('order_no'); $grid->column('num'); $grid->column('price'); diff --git a/app/Admin/Controllers/IndustryProductController.php b/app/Admin/Controllers/IndustryProductController.php index 326b4b6..c27ef21 100644 --- a/app/Admin/Controllers/IndustryProductController.php +++ b/app/Admin/Controllers/IndustryProductController.php @@ -75,12 +75,12 @@ class IndustryProductController extends AdminController */ protected function detail($id) { - return Show::make($id, new IndustryProduct(['category:id,name', 'supplier:id,name,contact_phone']), function (Show $show) { + return Show::make($id, new IndustryProduct(['category:id,name', 'supplier:id,company_name,contact_phone']), function (Show $show) { $show->disableDeleteButton(); $show->disableEditButton(); $show->field('id'); - $show->field('supplier.name', '供应商'); + $show->field('supplier.company_name', '供应商'); $show->field('supplier.contact_phone', '供应商联系电话'); $show->field('category.name', '分类'); $show->field('type')->using(admin_trans('product.options.publish_type')); @@ -108,7 +108,7 @@ class IndustryProductController extends AdminController */ protected function form() { - return Form::make(new IndustryProduct(['supplier:id,name', 'category:id,name']), function (Form $form) { + return Form::make(new IndustryProduct(), function (Form $form) { $form->disableDeleteButton(); $form->display('id'); diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php index d787bcf..bd111e6 100644 --- a/app/Admin/Controllers/OrderController.php +++ b/app/Admin/Controllers/OrderController.php @@ -23,9 +23,9 @@ class OrderController extends AdminController protected function grid() { return Grid::make(new Order([ - 'agent:id,name', + 'agent:id,company_name', 'agentProduct.product:id,title,price,pictures', - 'product.supplier:id,name' + 'product.supplier:id,company_name' ]), function (Grid $grid) { $grid->disableCreateButton(); $grid->disableDeleteButton(); @@ -34,7 +34,7 @@ class OrderController extends AdminController $grid->column('id')->sortable(); $grid->column('order_no')->limit(10); - $grid->column('agent.name', '代理商'); + $grid->column('agent.company_name', '代理商'); $grid->column('mobile'); $grid->column('name'); $grid->column('product', '产品信息') @@ -45,8 +45,8 @@ class OrderController extends AdminController $this->title, '', $this->num, - $this->agent->name, - $this->product->supplier->name, + $this->agent->company_name, + $this->product->supplier->company_name, ]]); })->xl(); $grid->column('paid_money'); @@ -65,10 +65,10 @@ class OrderController extends AdminController $filter->equal('order_no')->width(3); $filter->equal('status')->select(OrderStatus::array())->width(2); - $option = Agent::query()->pluck('name', 'id'); + $option = Agent::query()->pluck('company_name', 'id'); $filter->equal('agent_id', '代理商')->select($option)->width(3); - $option = Supplier::query()->pluck('name', 'id'); + $option = Supplier::query()->pluck('company_name', 'id'); $filter->equal('product.supplier_id', '供应商')->select($option)->width(3); $filter->between('created_at')->datetime()->width(4); @@ -85,13 +85,13 @@ class OrderController extends AdminController */ protected function detail($id) { - return Show::make($id, new Order(['agent:id,name']), function (Show $show) { + return Show::make($id, new Order(['agent:id,company_name']), function (Show $show) { $show->disableDeleteButton(); $show->disableQuickEdit(); $show->disableEditButton(); $show->field('id'); - $show->field('agent.name'); + $show->field('agent.company_name'); $show->field('mobile'); $show->field('name'); $show->field('num'); diff --git a/app/Admin/Controllers/ProductController.php b/app/Admin/Controllers/ProductController.php index ca57abd..fa3dcde 100644 --- a/app/Admin/Controllers/ProductController.php +++ b/app/Admin/Controllers/ProductController.php @@ -5,12 +5,9 @@ namespace App\Admin\Controllers; use App\Admin\Extensions\Grid\AuditProduct; use App\Admin\Repositories\Product; use App\Common\ProductStatus; -use App\Common\UserStatus; use App\Models\AgentProduct; use App\Models\AgentProductItem; use App\Models\Category; -use App\Models\Supplier; -use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Form\NestedForm; use Dcat\Admin\Grid; @@ -27,7 +24,7 @@ class ProductController extends AdminController */ protected function grid() { - return Grid::make(new Product(['supplier:id,name', 'category:id,name']), function (Grid $grid) { + return Grid::make(new Product(['supplier:id,company_name', 'category:id,name']), function (Grid $grid) { $grid->disableCreateButton(); //如果是审核页面，多加where条件判断 if (strpos(Route::current()->uri, 'audit')) { @@ -42,7 +39,7 @@ class ProductController extends AdminController $grid->column('price'); $grid->column('sale'); $grid->column('stock'); - $grid->column('supplier.name', '供应商'); + $grid->column('supplier.company_name', '供应商'); $grid->column('status') ->if(fn() => $this->status == ProductStatus::UNAUDITED) ->display('') @@ -80,7 +77,7 @@ class ProductController extends AdminController */ protected function detail($id) { - return Show::make($id, new Product(['supplier:id,name', 'category:id,name']), function (Show $show) { + return Show::make($id, new Product(['supplier:id,company_name', 'category:id,name']), function (Show $show) { $show->field('id'); $show->field('category.name', '所属分类'); $show->field('title'); @@ -90,7 +87,7 @@ class ProductController extends AdminController $show->field('sale'); $show->field('stock'); $show->field('status')->using(ProductStatus::array()); - $show->field('supplier.name', '供应商'); + $show->field('supplier.company_name', '供应商'); $show->field('know')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); $show->field('content')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); $show->field('created_at'); diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php index 874ebfe..f8ab8c7 100644 --- a/app/Admin/Controllers/SupplierController.php +++ b/app/Admin/Controllers/SupplierController.php @@ -7,7 +7,6 @@ use App\Admin\Repositories\Supplier; use App\Common\ProductStatus; use App\Common\UserStatus; use App\Models\Product; -use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; @@ -36,7 +35,7 @@ class SupplierController extends AdminController $grid->column('id')->sortable(); $grid->column('username'); - $grid->column('name'); + // $grid->column('name'); $grid->column('company_name'); $grid->column('logo')->image('', 60, 60); $grid->column('address'); @@ -66,7 +65,7 @@ class SupplierController extends AdminController $filter->panel(); $filter->equal('id')->width(2); - $filter->like('name')->width(3); + $filter->like('company_name')->width(3); $filter->equal('status', '用户状态')->select(UserStatus::array())->width(2); }); }); diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index dea23ff..d1922e0 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -9,7 +9,6 @@ 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; @@ -40,7 +39,7 @@ class AgentProductController extends AdminController ->orWhere('stock', '<=', 0) ->update(['status' => ProductStatus::SOLD_OUT]); - return Grid::make(new AgentProduct(['product.supplier:id,name', 'category:id,name']), function (Grid $grid) { + return Grid::make(new AgentProduct(['product.supplier:id,company_name', 'category:id,name']), function (Grid $grid) { $agent_id = Admin::user()->id; $grid->model()->where('agent_id', $agent_id); @@ -68,7 +67,7 @@ class AgentProductController extends AdminController ? "product->picture}\" style=\"max-width:80px;max-height:200px;cursor:pointer\" class=\"img img-thumbnail\">" : ''; $data = [[ - $this->product->supplier->name ?? '', + $this->product->supplier->company_name ?? '', $this->product->title ?? '', $pic, $this->product->original_price ?? '', @@ -105,7 +104,7 @@ class AgentProductController extends AdminController $filter->like('product.title', '产品标题')->width(3); $filter->equal('status')->select(ProductStatus::array())->width(2); - $options = Supplier::where('status', 1)->pluck('name', 'id')->toArray(); + $options = Supplier::where('status', 1)->pluck('company_name', 'id')->toArray(); $filter->equal('product.supplier_Id', '供应商')->select($options)->width(2); }); }); @@ -120,15 +119,15 @@ class AgentProductController extends AdminController */ protected function detail($id) { - return Show::make($id, new AgentProduct(['agent:id,name', 'category:id,name', 'product.supplier:id,name', 'guide:id,name']), function (Show $show) { + return Show::make($id, new AgentProduct(['category:id,name', 'product.supplier:id,company_name', 'guide:id,name']), function (Show $show) { //不允许查看非自己的数据 if ($show->model()->agent_id != Admin::user()->id) { Admin::exit('数据不存在'); } $show->field('id'); - $show->field('agent_id'); $show->field('product_id'); + $show->field('product.supplier.company_name', '供应商'); $show->field('price'); $show->field('original_price'); $show->field('sale'); @@ -144,7 +143,7 @@ class AgentProductController extends AdminController $show->field('content')->unescape(); if (Admin::user()->type != AgentType::CLUSTER) { $show->field('is_rec')->using(['未推荐', '已推荐']); - $show->field('channel_id'); + $show->field('channel_id')->as(fn($v) => join('，', Channel::whereIn('id', explode(',', $v))->pluck('name')->toArray())); $show->field('earnest'); $show->field('earnest_timeout'); $show->field('deposit'); @@ -152,19 +151,6 @@ class AgentProductController extends AdminController } $show->field('created_at'); $show->field('updated_at'); - - /*$show->html(Alert::make(null, '供应商产品详情')->info()); 因为可能是组合销售多个产品，这里暂时不显示 - - $show->field('product.id', '供应商产品ID'); - $show->field('product.supplier.name'); - $show->field('product.title'); - $show->field('product.pictures')->image('', 80, 80); - $show->field('product.original_price'); - $show->field('product.price'); - $show->field('product.sale'); - $show->field('product.stock'); - $show->field('product.created_at', '创建时间'); - $show->field('product.updated_at', '更新时间');*/ }); } diff --git a/app/AdminAgent/Controllers/GroupOrderController.php b/app/AdminAgent/Controllers/GroupOrderController.php index 752ae70..8b8ef36 100644 --- a/app/AdminAgent/Controllers/GroupOrderController.php +++ b/app/AdminAgent/Controllers/GroupOrderController.php @@ -60,7 +60,7 @@ class GroupOrderController extends AdminController $filter->equal('order_no')->width(3); $filter->equal('status')->select(OrderStatus::array())->width(2); - $option = Supplier::query()->pluck('name', 'id'); + $option = Supplier::query()->pluck('company_name', 'id'); $filter->equal('product.supplier_id', '供应商')->select($option)->width(3); $filter->between('created_at')->datetime()->width(4); diff --git a/app/AdminAgent/Controllers/IndustryOrderController.php b/app/AdminAgent/Controllers/IndustryOrderController.php index 9676fc5..04e2908 100644 --- a/app/AdminAgent/Controllers/IndustryOrderController.php +++ b/app/AdminAgent/Controllers/IndustryOrderController.php @@ -27,13 +27,13 @@ class IndustryOrderController extends AdminController */ protected function grid() { - return Grid::make(new IndustryOrder(['supplier:id,name,contact_phone']), function (Grid $grid) { + return Grid::make(new IndustryOrder(['supplier:id,company_name,contact_phone']), function (Grid $grid) { $grid->disableRowSelector(); $grid->disableCreateButton(); $grid->disableActions(); $grid->column('id')->sortable(); - $grid->column('supplier.name', '供应商'); + $grid->column('supplier.company_name', '供应商'); $grid->column('supplier.contact_phone', '供应商电话'); $grid->column('order_no')->limit(10); $grid->column('num'); diff --git a/app/AdminAgent/Controllers/IndustryProductController.php b/app/AdminAgent/Controllers/IndustryProductController.php index 62d6daf..e12b73a 100644 --- a/app/AdminAgent/Controllers/IndustryProductController.php +++ b/app/AdminAgent/Controllers/IndustryProductController.php @@ -2,7 +2,6 @@ namespace App\AdminAgent\Controllers; -use App\AdminAgent\Forms\IndustryProductBuy; use App\AdminAgent\Repositories\IndustryProduct; use App\Common\ProductStatus; use Dcat\Admin\Grid; @@ -62,12 +61,12 @@ class IndustryProductController extends AdminController */ protected function detail($id) { - return Show::make($id, new IndustryProduct(['category:id,name', 'supplier:id,name,contact_phone']), function (Show $show) { + return Show::make($id, new IndustryProduct(['category:id,name', 'supplier:id,company_name,contact_phone']), function (Show $show) { $show->disableEditButton(); $show->disableDeleteButton(); $show->field('id'); - $show->field('supplier.name', '供应商'); + $show->field('supplier.company_name', '供应商'); $show->field('supplier.contact_phone', '供应商联系电话'); $show->field('category.name', '分类'); $show->field('type')->using(admin_trans('product.options.publish_type')); diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php index 17b276c..3bebb4b 100644 --- a/app/AdminAgent/Controllers/OrderController.php +++ b/app/AdminAgent/Controllers/OrderController.php @@ -27,7 +27,7 @@ class OrderController extends AdminController */ protected function grid() { - return Grid::make(new Order(['product.supplier:id,name']), function (Grid $grid) { + return Grid::make(new Order(['product.supplier:id,company_name']), function (Grid $grid) { $grid->disableDeleteButton(); $grid->disableBatchDelete(); $grid->disableCreateButton(); @@ -64,7 +64,7 @@ class OrderController extends AdminController $grid->column('product', '产品信息') ->display('查看') ->modal('购买产品信息', function ($modal) { - $item = OrderProductItem::with(['supplier:id,name', 'product:id,title,pictures']) + $item = OrderProductItem::with(['supplier:id,company_name', 'product:id,title,pictures']) ->where('order_id', $this->id) ->get(['num', 'supplier_id', 'product_id']); @@ -75,7 +75,7 @@ class OrderController extends AdminController $v->product->title ?? '', '', $v->num ?? '', - $v->supplier->name ?? '', + $v->supplier->company_name ?? '', ]; } return Table::make(['产品名称', '产品图片', '购买数量', '所属供应商'], $row); @@ -172,7 +172,7 @@ class OrderController extends AdminController */ protected function detail($id) { - return Show::make($id, new Order(['product.supplier:id,name']), function (Show $show) { + return Show::make($id, new Order(['product.supplier:id,company_name']), function (Show $show) { $show->disableDeleteButton(); $show->disableEditButton(); @@ -185,7 +185,7 @@ class OrderController extends AdminController $show->field('user_id'); $show->field('order_no'); $show->field('agent_product_id', '代理商产品ID'); - $show->field('product.supplier.name', '供应商'); + $show->field('product.supplier.company_name', '供应商'); $show->field('price'); $show->field('paid_money'); $show->field('paid_at'); diff --git a/app/AdminAgent/Controllers/SupplierController.php b/app/AdminAgent/Controllers/SupplierController.php index c1a4e87..30d857a 100644 --- a/app/AdminAgent/Controllers/SupplierController.php +++ b/app/AdminAgent/Controllers/SupplierController.php @@ -32,7 +32,6 @@ class SupplierController extends AdminController }); $grid->column('id')->sortable(); - $grid->column('name'); $grid->column('company_name'); $grid->column('address'); $grid->column('director'); diff --git a/app/AdminAgent/Renderable/SelectProduct.php b/app/AdminAgent/Renderable/SelectProduct.php index ee0ffc1..584b67f 100644 --- a/app/AdminAgent/Renderable/SelectProduct.php +++ b/app/AdminAgent/Renderable/SelectProduct.php @@ -19,7 +19,7 @@ class SelectProduct extends LazyRenderable // 获取外部传递的参数 // $id = $this->id; Admin::translation('product'); - return Grid::make(new Product(['supplier:id,name']), function (Grid $grid) { + return Grid::make(new Product(['supplier:id,company_name']), function (Grid $grid) { $grid->disableActions(); $grid->disableBatchDelete(); $grid->disableBatchActions(); @@ -28,10 +28,10 @@ class SelectProduct extends LazyRenderable if (!is_null($this->ids)) { $grid->model()->orderByRaw("FIELD(`id`, {$this->ids}) DESC"); } - $grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商'); + $grid->quickSearch(['title', 'supplier.company_name'])->placeholder('搜索产品名称、供应商'); $grid->column('id'); - //$grid->column('supplier.name', '供应商'); + //$grid->column('supplier.company_name', '供应商'); $grid->column('title'); $grid->column('picture')->image('',60, 60); $grid->column('price'); @@ -43,7 +43,7 @@ class SelectProduct extends LazyRenderable $grid->filter(function (Grid\Filter $filter) { $filter->like('title')->width(4); - $filter->like('supplier.name', '供应商名称')->width(4); + $filter->like('supplier.company_name', '供应商名称')->width(4); }); }); } diff --git a/app/AdminGuide/Controllers/OrderController.php b/app/AdminGuide/Controllers/OrderController.php index b1c7c02..46b599c 100644 --- a/app/AdminGuide/Controllers/OrderController.php +++ b/app/AdminGuide/Controllers/OrderController.php @@ -22,7 +22,7 @@ class OrderController extends AdminController */ protected function grid() { - return Grid::make(new Order(['agent:id,name']), function (Grid $grid) { + return Grid::make(new Order(['agent:id,company_name']), function (Grid $grid) { $grid->disableBatchActions(); $grid->disableCreateButton(); $grid->disableActions(); @@ -31,7 +31,7 @@ class OrderController extends AdminController $grid->model()->where('guide_id', Admin::user()->id); $grid->column('id')->sortable(); - $grid->column('agent.name'); + $grid->column('agent.company_name', '代理商'); $grid->column('order_no')->limit(10); $grid->column('num'); $grid->column('price'); @@ -55,10 +55,10 @@ class OrderController extends AdminController $filter->equal('order_no')->width(3); $filter->equal('status')->select(OrderStatus::array())->width(2); - $option = Agent::query()->pluck('name', 'id'); + $option = Agent::query()->pluck('company_name', 'id'); $filter->equal('agent_id', '代理商')->select($option)->width(3); - $option = Supplier::query()->pluck('name', 'id'); + $option = Supplier::query()->pluck('company_name', 'id'); $filter->equal('product.supplier_id', '供应商')->select($option)->width(3); $filter->between('created_at')->datetime()->width(4); diff --git a/app/AdminSupplier/Controllers/AgentController.php b/app/AdminSupplier/Controllers/AgentController.php index 21639ed..8a53bc4 100644 --- a/app/AdminSupplier/Controllers/AgentController.php +++ b/app/AdminSupplier/Controllers/AgentController.php @@ -36,7 +36,6 @@ class AgentController extends AdminController $grid->disableActions(); $grid->column('id')->sortable(); - $grid->column('name'); $grid->column('type')->using(AgentType::array()); $grid->column('company_name'); $grid->column('address'); @@ -51,7 +50,6 @@ class AgentController extends AdminController $filter->panel(); $filter->equal('id')->width(2); - $filter->like('name')->width(2); $filter->like('company_name')->width(3); $filter->equal('contact_phone')->width(2); }); diff --git a/app/AdminSupplier/Controllers/DepositLogController.php b/app/AdminSupplier/Controllers/DepositLogController.php index fd912e6..dbea6c9 100755 --- a/app/AdminSupplier/Controllers/DepositLogController.php +++ b/app/AdminSupplier/Controllers/DepositLogController.php @@ -3,12 +3,8 @@ namespace App\AdminSupplier\Controllers; use App\AdminSupplier\Repositories\DepositLog; -use App\AdminSupplier\Repositories\Withdrawal; -use App\Traits\DemandTraits; use App\Traits\StatementTraits; -use App\Traits\WithdrawalTraits; use Dcat\Admin\Admin; -use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Layout\Column; use Dcat\Admin\Layout\Content; @@ -79,7 +75,7 @@ HTML; $grid->model()->where('supplier_id', Admin::user()->id); $grid->column('id')->sortable(); $grid->column('price'); - $grid->column('supplier.name', '供应商'); + $grid->column('supplier.company_name', '供应商'); $grid->column('type', '类型')->using(StatementTraits::$depositText); $grid->column('created_at'); $grid->column('updated_at')->sortable(); diff --git a/app/AdminSupplier/Controllers/IndustryOrderController.php b/app/AdminSupplier/Controllers/IndustryOrderController.php index 4513f18..3b5e45f 100644 --- a/app/AdminSupplier/Controllers/IndustryOrderController.php +++ b/app/AdminSupplier/Controllers/IndustryOrderController.php @@ -20,7 +20,7 @@ class IndustryOrderController extends AdminController */ protected function grid() { - return Grid::make(new IndustryOrder(['agent:id,name']), function (Grid $grid) { + return Grid::make(new IndustryOrder(['agent:id,company_name']), function (Grid $grid) { $grid->disableCreateButton(); $grid->disableRowSelector(); $grid->disableActions(); @@ -28,7 +28,7 @@ class IndustryOrderController extends AdminController $grid->model()->where('supplier_id', Admin::user()->id); $grid->column('id')->sortable(); - $grid->column('agent.name', '代理商名称'); + $grid->column('agent.company_name', '代理商名称'); $grid->column('order_no'); $grid->column('num'); $grid->column('price'); diff --git a/app/AdminSupplier/Controllers/OrderController.php b/app/AdminSupplier/Controllers/OrderController.php index 6094be8..3c4c15f 100644 --- a/app/AdminSupplier/Controllers/OrderController.php +++ b/app/AdminSupplier/Controllers/OrderController.php @@ -24,7 +24,7 @@ class OrderController extends AdminController protected function grid() { return Grid::make(new Order([ - 'agent:id,name', + 'agent:id,company_name', 'agentProduct.product:id,title,price,pictures', 'product' ]), function (Grid $grid) { @@ -40,7 +40,7 @@ class OrderController extends AdminController }); $grid->column('id')->sortable(); - $grid->column('agent.name', '代理商'); + $grid->column('agent.company_name', '代理商'); $grid->column('order_no', '订单号')->limit(10); $grid->column('title')->limit(20); $grid->column('picture')->image('', 60, 60); @@ -80,10 +80,10 @@ class OrderController extends AdminController $filter->equal('order_no')->width(3); $filter->equal('status')->select(OrderStatus::array())->width(2); - $option = Agent::query()->pluck('name', 'id'); + $option = Agent::query()->pluck('company_name', 'id'); $filter->equal('agent_id', '代理商')->select($option)->width(3); - $option = Supplier::query()->pluck('name', 'id'); + $option = Supplier::query()->pluck('company_name', 'id'); $filter->equal('product.supplier_id', '供应商')->select($option)->width(3); $filter->between('created_at')->datetime()->width(4); @@ -100,7 +100,7 @@ class OrderController extends AdminController */ protected function detail($id) { - return Show::make($id, new Order(['agent:id,name', 'orderProductItem']), function (Show $show) { + return Show::make($id, new Order(['agent:id,company_name', 'orderProductItem']), function (Show $show) { $show->disableDeleteButton(); $show->disableQuickEdit(); $show->disableEditButton(); @@ -111,7 +111,7 @@ class OrderController extends AdminController }); $show->field('id'); - $show->field('agent.name'); + $show->field('agent.company_name', '代理商'); $show->field('mobile'); $show->field('name'); $show->field('num'); diff --git a/app/AdminSupplier/Renderable/SelectProduct.php b/app/AdminSupplier/Renderable/SelectProduct.php index 755f07b..c126bf4 100644 --- a/app/AdminSupplier/Renderable/SelectProduct.php +++ b/app/AdminSupplier/Renderable/SelectProduct.php @@ -19,7 +19,7 @@ class SelectProduct extends LazyRenderable // 获取外部传递的参数 // $id = $this->id; Admin::translation('product'); - return Grid::make(new DemandProduct(['supplier:id,name']), function (Grid $grid) { + return Grid::make(new DemandProduct(['supplier:id,company_name']), function (Grid $grid) { $grid->disableActions(); $grid->disableBatchDelete(); $grid->disableBatchActions(); @@ -29,10 +29,10 @@ class SelectProduct extends LazyRenderable 'supplier_id' => Admin::user()->id, 'status' => ProductStatus::ON_SALE ]); - $grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商'); + $grid->quickSearch(['title', 'supplier.company_name'])->placeholder('搜索产品名称、供应商'); $grid->column('id'); - $grid->column('supplier.name', '供应商')->display(fn($v) => $v); + $grid->column('supplier.company_name', '供应商')->display(fn($v) => $v); $grid->column('title'); $grid->column('picture')->image('',60, 60); $grid->column('sale'); @@ -43,7 +43,7 @@ class SelectProduct extends LazyRenderable $grid->filter(function (Grid\Filter $filter) { $filter->equal('id')->width(2); $filter->like('title')->width(4); - $filter->like('supplier.name', '供应商名称')->width(4); + $filter->like('supplier.company_name', '供应商名称')->width(4); }); }); }