审核、核销按钮单独一列

app/AdminAgent/Controllers/IndustryOrderController.php

@@ -63,7 +63,7 @@ class IndustryOrderController extends AdminController
 					return Table::make([], $info);
 				})->xl();
             $grid->column('title')->limit(15);
-            $grid->column('picture')->image('', 80, 80);
+//            $grid->column('picture')->image('', 60, 60);
 			$grid->column('pay_type')->using(PayType::array());
 			$grid->column('status')
 				->using(OrderStatus::array())

app/AdminAgent/Controllers/OrderController.php

@@ -139,8 +139,8 @@ class OrderController extends AdminController
 							])->value('price');
 					}
 				});
-            $grid->column('paid_at');
-            $grid->column('created_at');
+            $grid->column('paid_at')->width(100);
+            $grid->column('created_at')->width(100);
 
 			$grid->filter(function (Grid\Filter $filter) {
 				$filter->panel();

app/AdminSupplier/Controllers/IndustryOrderController.php

@@ -59,19 +59,14 @@ class IndustryOrderController extends AdminController
 				})->xl();
 			$grid->column('industry_product_id', '产品ID');
             $grid->column('title')->limit(15);
-            $grid->column('picture')->image('', 60, 60);
+//            $grid->column('picture')->image('', 60, 60);
 			$grid->column('pay_type')->using(PayType::array());
-			$grid->column('订单状态')
-				//待审核
-				->if(fn() => $this->audit_status == 0)
-				->then(function ($column) {
-					$column->append((new IndustryOrderAudit(null, 1))->setKey($this->id))->append(' ');
-					$column->append((new IndustryOrderAudit(null, 2))->setKey($this->id));
-				})
+			$grid->column('status')
+				->using(OrderStatus::array())
 				//审核拒绝
 				->if(fn() => $this->audit_status == -1)
 				->then(function ($column) {
-					$column->append('已拒绝')->label();
+					$column->display('已拒绝')->label();
 				})
 				//审核通过
 				->if(fn() => $this->audit_status == 1)
@@ -79,12 +74,19 @@ class IndustryOrderController extends AdminController
 					if ($this->status == OrderStatus::OFFLINE_UNPAID) {
 						$column->action(new IndustryOrderStatus);
 					} else {
-						$column->append(OrderStatus::array()[$this->status]);
+						$column->display(OrderStatus::array()[$this->status]);
 					}
 				});
-            $grid->column('paid_at');
+			$grid->column('审核')
+				//待审核
+				->if(fn() => $this->audit_status == 0)
+				->then(function ($column) {
+					$column->append((new IndustryOrderAudit(null, 1))->setKey($this->id))->append(' ');
+					$column->append((new IndustryOrderAudit(null, 2))->setKey($this->id));
+				});
+            $grid->column('paid_at')->width(100);
 //            $grid->column('timeout');
-            $grid->column('created_at');
+            $grid->column('created_at')->width(100);
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id')->width(2);

app/AdminSupplier/Controllers/OrderController.php

@@ -65,11 +65,10 @@ class OrderController extends AdminController
 					}, $info);
 					return Table::make([], $info);
 				})->xl();
-			$grid->column('status', '订单状态')
+			$grid->column('status', '订单状态')->using(OrderStatus::array());
+			$grid->column('核销')
 				->if(fn() => in_array($this->status, [OrderStatus::PAID, OrderStatus::PAID_RETAINAGE, OrderStatus::OFFLINE_PAID, OrderStatus::REFUSED_REFUND]))
-				->action(new VerificationOrder())
-				->else()
-				->using(OrderStatus::array());
+				->action(new VerificationOrder());
 			$grid->column('pay_type')->using(PayType::array());
 			$grid->column('price');
 			$grid->column('paid_money');
@@ -84,8 +83,8 @@ class OrderController extends AdminController
 						])->value('price');
 					}
 				});
-			$grid->column('paid_at');
-			$grid->column('created_at');
+			$grid->column('paid_at')->width(100);
+			$grid->column('created_at')->width(100);
 
 			$grid->filter(function (Grid\Filter $filter) {
 				$filter->panel();