补充货运单字段显示翻译
parent
c9164d7f89
commit
9733f929dc
|
|
@ -7,6 +7,7 @@ use App\Models\Order;
|
||||||
use Dcat\Admin\Admin;
|
use Dcat\Admin\Admin;
|
||||||
use Dcat\Admin\Form;
|
use Dcat\Admin\Form;
|
||||||
use Dcat\Admin\Grid;
|
use Dcat\Admin\Grid;
|
||||||
|
use Dcat\Admin\Grid\Column;
|
||||||
use Dcat\Admin\Http\Controllers\AdminController;
|
use Dcat\Admin\Http\Controllers\AdminController;
|
||||||
use Dcat\Admin\Show;
|
use Dcat\Admin\Show;
|
||||||
|
|
||||||
|
|
@ -21,7 +22,7 @@ class OrderPackageController extends AdminController
|
||||||
{
|
{
|
||||||
$builder = OrderPackage::with('order');
|
$builder = OrderPackage::with('order');
|
||||||
return Grid::make($builder, function (Grid $grid) {
|
return Grid::make($builder, function (Grid $grid) {
|
||||||
$grid->column('id')->sortable();
|
// $grid->column('id')->sortable();
|
||||||
$grid->column('order.sn');
|
$grid->column('order.sn');
|
||||||
$grid->column('order.consignee_name');
|
$grid->column('order.consignee_name');
|
||||||
$grid->column('order.consignee_telephone');
|
$grid->column('order.consignee_telephone');
|
||||||
|
|
@ -30,10 +31,22 @@ class OrderPackageController extends AdminController
|
||||||
$grid->column('packageProduct');
|
$grid->column('packageProduct');
|
||||||
$grid->column('shipping_company');
|
$grid->column('shipping_company');
|
||||||
$grid->column('shipping_number');
|
$grid->column('shipping_number');
|
||||||
$grid->column('remarks');
|
$grid->column('is_failed')
|
||||||
|
->if(function () {
|
||||||
|
return Admin::user()->can('dcat.admin.order_packages.failed');
|
||||||
|
})
|
||||||
|
->then(function (Column $column) {
|
||||||
|
$column->switch();
|
||||||
|
})
|
||||||
|
->else(function (Column $column) {
|
||||||
|
$column->bool();
|
||||||
|
});
|
||||||
|
$grid->column('status');
|
||||||
|
// $grid->column('remarks');
|
||||||
$grid->column('created_at')->sortable();
|
$grid->column('created_at')->sortable();
|
||||||
// $grid->column('updated_at');
|
// $grid->column('updated_at');
|
||||||
|
|
||||||
|
$grid->model()->orderBy('ceated_at', 'desc');
|
||||||
/** 操作 **/
|
/** 操作 **/
|
||||||
//新增
|
//新增
|
||||||
// if (Admin::user()->can('dcat.admin.order_packages.create')) {
|
// if (Admin::user()->can('dcat.admin.order_packages.create')) {
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,10 @@ class OrderPackage extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
|
protected $casts = [
|
||||||
|
'is_failed' => 'bool',
|
||||||
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单
|
* 订单
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ return [
|
||||||
'packageProduct'=>'包裹内容',
|
'packageProduct'=>'包裹内容',
|
||||||
'shipping_company' => '快递公司',
|
'shipping_company' => '快递公司',
|
||||||
'shipping_number' => '快递单号',
|
'shipping_number' => '快递单号',
|
||||||
|
'is_failed' => '作废',
|
||||||
|
'status'=>'状态',
|
||||||
'inspected_at'=>'签收时间',
|
'inspected_at'=>'签收时间',
|
||||||
'remarks' => '备注',
|
'remarks' => '备注',
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue