diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 0f98b1e..27d4cc7 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -17,6 +17,7 @@ use App\Admin\Repositories\ImsCjdcOrderMain; use App\Libs\SsdbClient; use App\Models\ImsCjdcMarket; use App\Models\LanzuStore; +use App\Models\v3\LanzuEmployees; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; @@ -70,12 +71,30 @@ class ImsCjdcOrderMainController extends AdminController return date('Y-m-d H:i:s',$time); } return '未支付'; - }); + })->width(100); $grid->column('shipping_type', '配送方式') ->using(config('order.shipping_type')) ->label([1 => '#FF9900', 2 => '#99CCFF', 3 => '#CCCCCC']); $grid->created_at('下单时间')->display(function ($time) { return date('Y-m-d H:i:s',$time); + })->width(100); + Admin::script(<<'); + + $("body").append(temp); + temp.val(content).select(); + document.execCommand("copy"); + temp.remove(); + + $(this).tooltip('show'); + }); + JS); + $grid->column('骑手')->display(function () { + //模型关联不起作用,暂时先不查找原因 + $employees = LanzuEmployees::find($this->horseman_id); + return ($this->shipping_name ?? '') . '
' . ($employees->tel ?? ''); }); $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) { $state = $actions->row->state; @@ -95,6 +114,8 @@ class ImsCjdcOrderMainController extends AdminController $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '
配送
')); $actions->append(new OrderStateHandle('
取消接单
', 2)); } + $url = config('app.url') . '/grab.html#order&id=837023'; + $actions->append('
复制
'); } elseif ($state == 8) { $actions->append(new OrderStateHandle('
同意
', 9)); $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '
拒绝
'));