添加部分跳转
parent
27f2735f70
commit
66208ac796
|
|
@ -16,9 +16,11 @@ use App\Models\Tag;
|
|||
use Dcat\Admin\Admin;
|
||||
use Dcat\Admin\Form;
|
||||
use Dcat\Admin\Grid;
|
||||
use Dcat\Admin\Grid\Column;
|
||||
use Dcat\Admin\Http\Controllers\AdminController;
|
||||
use Dcat\Admin\Layout\Row;
|
||||
use Dcat\Admin\Show;
|
||||
use Illuminate\Support\Facades\Request;
|
||||
|
||||
class AfterSaleController extends AdminController
|
||||
{
|
||||
|
|
@ -30,7 +32,13 @@ class AfterSaleController extends AdminController
|
|||
protected function grid()
|
||||
{
|
||||
$builder = AfterSale::with(['user', 'order', 'orderProduct', 'tags']);
|
||||
|
||||
return Grid::make($builder, function (Grid $grid) {
|
||||
$orderProductId = Request::query('order_product_id', 0);
|
||||
if ($orderProductId) {
|
||||
$grid->model()->where('order_product_id', $orderProductId);
|
||||
}
|
||||
|
||||
$grid->column('sn')->copyable();
|
||||
$grid->column('tags', '标签')->display(function ($tags) {
|
||||
$array = [];
|
||||
|
|
@ -40,7 +48,17 @@ class AfterSaleController extends AdminController
|
|||
return $array;
|
||||
})->label();
|
||||
$grid->column('user.phone')->copyable();
|
||||
$grid->column('order.sn')->copyable();
|
||||
$grid->column('order.sn')->if(function () {
|
||||
return Admin::user()->can('dcat.admin.orders.show');
|
||||
})
|
||||
->then(function (Column $column) {
|
||||
$column->link(function ($value) {
|
||||
return admin_url('orders/'.$this->order_id);
|
||||
});
|
||||
})
|
||||
->else(function (Column $column) {
|
||||
$column->copyable();
|
||||
});
|
||||
|
||||
$grid->column('orderProduct.name');
|
||||
$grid->column('num');
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ class CouponController extends AdminController
|
|||
/** 查询 **/
|
||||
$grid->filter(function (Grid\Filter $filter) {
|
||||
$filter->panel();
|
||||
$filter->liek('name')->width(3);
|
||||
$filter->like('name')->width(3);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ use App\Models\Tag;
|
|||
use Dcat\Admin\Admin;
|
||||
use Dcat\Admin\Form;
|
||||
use Dcat\Admin\Grid;
|
||||
use Dcat\Admin\Grid\Column;
|
||||
use Dcat\Admin\Http\Controllers\AdminController;
|
||||
use Dcat\Admin\Layout\Row;
|
||||
use Dcat\Admin\Show;
|
||||
|
|
@ -38,7 +39,7 @@ class OrderController extends AdminController
|
|||
$builder = Order::with(['user', 'tags']);
|
||||
|
||||
return Grid::make($builder, function (Grid $grid) {
|
||||
$grid->column('id')->sortable();
|
||||
// $grid->column('id')->sortable();
|
||||
$grid->column('sn')->copyable();
|
||||
$grid->column('tags', '标签')->display(function ($tags) {
|
||||
$array = [];
|
||||
|
|
@ -100,6 +101,9 @@ class OrderController extends AdminController
|
|||
if (Admin::user()->can('dcat.admin.orders.tags')) {
|
||||
$actions->append(new OrderSetTag());
|
||||
}
|
||||
if (Admin::user()->can('dcat.admin.distribution_pre_incomes.index')) {
|
||||
$actions->append('<a href="'.admin_route('distribution_pre_incomes.index', ['order[sn]'=>$actions->row->sn]).'"><i class="fa fa-eye"></i> 预收益明细</a>');
|
||||
}
|
||||
// $actions->append(new CreateOrderPackage());
|
||||
});
|
||||
|
||||
|
|
@ -235,7 +239,14 @@ class OrderController extends AdminController
|
|||
0=>'success',
|
||||
1=>'danger',
|
||||
2=>'primary',
|
||||
]);
|
||||
])->if(function () {
|
||||
return in_array($this->after_sale_state, [1, 2]) && Admin::user()->can('dcat.admin.after_sales.index');
|
||||
})
|
||||
->then(function (Column $column) {
|
||||
$column->link(function ($value) {
|
||||
return admin_url('after-sales?order_product_id='.$this->id);
|
||||
});
|
||||
});
|
||||
$grid->disableActions();
|
||||
$grid->disablePagination();
|
||||
$grid->disableRefreshButton();
|
||||
|
|
|
|||
|
|
@ -30,7 +30,17 @@ class OrderPackageController extends AdminController
|
|||
$builder = OrderPackage::with(['order', 'tags']);
|
||||
return Grid::make($builder, function (Grid $grid) {
|
||||
// $grid->column('id')->sortable();
|
||||
$grid->column('order.sn')->copyable();
|
||||
$grid->column('order.sn')->if(function () {
|
||||
return Admin::user()->can('dcat.admin.orders.show');
|
||||
})
|
||||
->then(function (Column $column) {
|
||||
$column->link(function ($value) {
|
||||
return admin_url('orders/'.$this->order_id);
|
||||
});
|
||||
})
|
||||
->else(function (Column $column) {
|
||||
$column->copyable();
|
||||
});
|
||||
$grid->column('tags', '标签')->display(function ($tags) {
|
||||
$array = [];
|
||||
foreach ($this->tags as $key => $tag) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue