diff --git a/app/AdminAgent/Controllers/IndustryOrderController.php b/app/AdminAgent/Controllers/IndustryOrderController.php
index 0b77e6e..3da97ea 100644
--- a/app/AdminAgent/Controllers/IndustryOrderController.php
+++ b/app/AdminAgent/Controllers/IndustryOrderController.php
@@ -32,7 +32,7 @@ class IndustryOrderController extends AdminController
*/
protected function grid()
{
- return Grid::make(new IndustryOrder(['supplier:id,company_name']), function (Grid $grid) {
+ return Grid::make(new IndustryOrder(['supplier:id,company_name', 'spec']), function (Grid $grid) {
$grid->disableRowSelector();
$grid->disableCreateButton();
$grid->disableActions();
@@ -44,8 +44,6 @@ class IndustryOrderController extends AdminController
$grid->column('order_no')->limit(10);
$grid->column('num');
$grid->column('price');
- $grid->column('name', '预留姓名');
- $grid->column('mobile', '预留手机');
$grid->column('info', '客户信息')
->display('查看')
->modal('客户信息', function ($modal) {
@@ -66,8 +64,18 @@ class IndustryOrderController extends AdminController
}, $info);
return Table::make([], $info);
})->xl();
- $grid->column('title')->limit(15);
-// $grid->column('picture')->image('', 60, 60);
+ $grid->column('购买信息')
+ ->display('查看')
+ ->modal('购买信息', function ($model) {
+ $info = [
+ '预留姓名' => $this->name ?? '',
+ '预留手机' => $this->mobile ?? '',
+ '产品名称' => $this->title,
+ '规格名称' => $this->spec->name ?? '',
+ '规格日期' => $this->spec->date ?? '',
+ ];
+ return Table::make([], $info);
+ });
$grid->column('pay_type')->using(PayType::array());
$grid->column('status')
->using(OrderStatus::array())
@@ -93,7 +101,7 @@ class IndustryOrderController extends AdminController
->then(function ($column) {
$column->display('待审核')->label(Admin::color()->blueDarker());
});
- $grid->column('paid_at');
+ $grid->column('paid_at')->width(100);
$grid->column('verify_qrcode', '核销二维码')
->if(fn() => $this->verify_code)
->then(function (Grid\Column $column) {
@@ -106,7 +114,7 @@ class IndustryOrderController extends AdminController
})
->else()
->display('');
- $grid->column('created_at');
+ $grid->column('created_at')->width(100);
$grid->filter(function (Grid\Filter $filter) {
$filter->equal('id')->width(2);
diff --git a/app/AdminSupplier/Controllers/IndustryOrderController.php b/app/AdminSupplier/Controllers/IndustryOrderController.php
index c17f5c6..9fd9878 100644
--- a/app/AdminSupplier/Controllers/IndustryOrderController.php
+++ b/app/AdminSupplier/Controllers/IndustryOrderController.php
@@ -23,7 +23,7 @@ class IndustryOrderController extends AdminController
*/
protected function grid()
{
- return Grid::make(new IndustryOrder(['agent:id,company_name']), function (Grid $grid) {
+ return Grid::make(new IndustryOrder(['agent:id,company_name', 'spec']), function (Grid $grid) {
$grid->disableCreateButton();
$grid->disableRowSelector();
$grid->disableActions();
@@ -40,6 +40,7 @@ class IndustryOrderController extends AdminController
$grid->column('info', '信息收集')
->display('查看')
->modal('信息收集', function ($modal) {
+ $modal->xl();
$info = $this->info ?? [];
$info = array_map(function($v) {
if (isset($v['value'], $v['type'])) {
@@ -56,10 +57,18 @@ class IndustryOrderController extends AdminController
return is_string($v) ? $v : json_encode($v);
}, $info);
return Table::make([], $info);
- })->xl();
+ });
+ $grid->column('规格信息')
+ ->display('查看')
+ ->modal('规格信息', function ($model) {
+ $info = [
+ '规格名称' => $this->spec->name ?? '',
+ '规格日期' => $this->spec->date ?? '',
+ ];
+ return Table::make([], $info);
+ });
$grid->column('industry_product_id', '产品ID');
$grid->column('title')->limit(15);
-// $grid->column('picture')->image('', 60, 60);
$grid->column('pay_type')->using(PayType::array());
$grid->column('status')
->using(OrderStatus::array())
@@ -91,7 +100,6 @@ class IndustryOrderController extends AdminController
$column->append('
' . $verify_code . '
');
});
$grid->column('paid_at')->width(100);
-// $grid->column('timeout');
$grid->column('created_at')->width(100);
$grid->filter(function (Grid\Filter $filter) {