diff --git a/app/Admin/Controllers/OrderPackageController.php b/app/Admin/Controllers/OrderPackageController.php index c799a1d8..9080de55 100644 --- a/app/Admin/Controllers/OrderPackageController.php +++ b/app/Admin/Controllers/OrderPackageController.php @@ -7,6 +7,7 @@ use App\Models\Order; 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\Show; @@ -21,7 +22,7 @@ class OrderPackageController extends AdminController { $builder = OrderPackage::with('order'); return Grid::make($builder, function (Grid $grid) { - $grid->column('id')->sortable(); + // $grid->column('id')->sortable(); $grid->column('order.sn'); $grid->column('order.consignee_name'); $grid->column('order.consignee_telephone'); @@ -30,10 +31,22 @@ class OrderPackageController extends AdminController $grid->column('packageProduct'); $grid->column('shipping_company'); $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('updated_at'); + $grid->model()->orderBy('ceated_at', 'desc'); /** 操作 **/ //新增 // if (Admin::user()->can('dcat.admin.order_packages.create')) { diff --git a/app/Models/OrderPackage.php b/app/Models/OrderPackage.php index 3f4925f4..f8df8621 100644 --- a/app/Models/OrderPackage.php +++ b/app/Models/OrderPackage.php @@ -9,6 +9,10 @@ class OrderPackage extends Model { use HasFactory; + protected $casts = [ + 'is_failed' => 'bool', + ]; + /** * 订单 * diff --git a/resources/lang/zh_CN/order-package.php b/resources/lang/zh_CN/order-package.php index cca4bf75..5977969b 100644 --- a/resources/lang/zh_CN/order-package.php +++ b/resources/lang/zh_CN/order-package.php @@ -17,6 +17,8 @@ return [ 'packageProduct'=>'包裹内容', 'shipping_company' => '快递公司', 'shipping_number' => '快递单号', + 'is_failed' => '作废', + 'status'=>'状态', 'inspected_at'=>'签收时间', 'remarks' => '备注', ],