From 8eb736e70835d190651a14bde61cf8e6251168c9 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Wed, 1 Dec 2021 23:41:05 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E7=94=B5=E8=AF=9D=EF=BC=9B2=E3=80=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/IndustryOrderController.php   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/AdminAgent/Controllers/IndustryOrderController.php b/app/AdminAgent/Controllers/IndustryOrderController.php
index e84cf31..a19a4c3 100644
--- a/app/AdminAgent/Controllers/IndustryOrderController.php
+++ b/app/AdminAgent/Controllers/IndustryOrderController.php
@@ -27,7 +27,7 @@ class IndustryOrderController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new IndustryOrder(['supplier:id,company_name,contact_phone']), function (Grid $grid) {
+        return Grid::make(new IndustryOrder(['supplier:id,company_name']), function (Grid $grid) {
 			$grid->disableRowSelector();
 			$grid->disableCreateButton();
 			$grid->disableActions();
@@ -36,7 +36,6 @@ class IndustryOrderController extends AdminController
 
             $grid->column('id')->sortable();
             $grid->column('supplier.company_name', '供应商')->limit(10);
-            $grid->column('supplier.contact_phone', '供应商电话');
             $grid->column('order_no')->limit(10);
             $grid->column('num');
             $grid->column('price');
@@ -264,6 +263,23 @@ JS
 			$form->number('name');
 			$form->mobile('mobile');
 
+			//支付信息
+			$pay_type = [PayType::ONLINE, PayType::OFFLINE];
+			if ((float)$form->model()->deposit) { //订金支付
+				$pay_type = [...$pay_type, PayType::DEPOSIT_PAY];
+			}
+			if ((float)$form->model()->earnest) { //定金支付
+				$pay_type = [...$pay_type, PayType::EARNEST_PAY];
+			}
+			$options = array_filter(PayType::array(), fn($k) => in_array($k, $pay_type), ARRAY_FILTER_USE_KEY);
+			$form->select('pay_type')
+				->options($options)->default(PayType::ONLINE)->required()
+				->when(PayType::DEPOSIT_PAY, function () use ($form) {
+					$form->display('deposit', '订金')->customFormat(fn() => $form->model()->deposit);
+				})->when(PayType::EARNEST_PAY, function () use ($form) {
+					$form->display('earnest', '定金')->customFormat(fn() => $form->model()->earnest);
+				});
+
 			//载入信息收集表单数据
 			if (!empty($form->model()->info)) {
 				$form->html(Alert::make(null, '客户信息收集表单')->warning())->width(12);