From fca86da42eedd4b454c1362f40aa0ce7f1668f20 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Thu, 19 Aug 2021 18:39:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B8=E9=94=80=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=92=8C=E5=9C=B0=E6=8E=A5=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AgentProductController.php    | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php
index 0423449..2ed13dd 100644
--- a/app/AdminAgent/Controllers/AgentProductController.php
+++ b/app/AdminAgent/Controllers/AgentProductController.php
@@ -2,13 +2,18 @@
 
 namespace App\AdminAgent\Controllers;
 
+use App\AdminAgent\Renderable\SelectGuide;
 use App\AdminAgent\Renderable\SelectProduct;
+use App\AdminAgent\Renderable\SelectUser;
 use App\AdminAgent\Repositories\AgentProduct;
+use App\Common\AgentType;
 use App\Common\ProductStatus;
 use App\Models\Category;
 use App\Models\Channel;
+use App\Models\Guide;
 use App\Models\Product;
 use App\Models\Supplier;
+use App\Models\User;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -31,7 +36,7 @@ class AgentProductController extends AdminController
         	$grid->model()->where('agent_id', $agent_id);
 
             $grid->column('id')->sortable();
-            $grid->column('product.picture', '产品图片')->image(60, 60);
+            $grid->column('product.picture', '产品图片')->image('', 60, 60);
             $grid->column('product.title', '产品名称')->limit(15);
 			$grid->column('product_id', '产品详情')
 				->display('查看')
@@ -98,7 +103,7 @@ class AgentProductController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make($id, new AgentProduct(['agent:id,name', 'product.supplier:id,name']), function (Show $show) {
+        return Show::make($id, new AgentProduct(['agent:id,name', 'product.supplier:id,name', 'user:id,nickname', 'guide:id,name']), function (Show $show) {
 			//不允许查看非自己的数据
 			if ($show->model()->agent_id != Admin::user()->id) {
 				Admin::exit('数据不存在');
@@ -113,6 +118,10 @@ class AgentProductController extends AdminController
             $show->field('channel_id');
             $show->field('category_id');
             $show->field('status')->using(ProductStatus::array());
+			$show->field('verifier.nickname', '核销人员');
+			if (Admin::user()->type == AgentType::CLUSTER) {
+				$show->field('guide.name', '地接');
+			}
             $show->field('created_at');
             $show->field('updated_at');
 
@@ -121,7 +130,7 @@ class AgentProductController extends AdminController
 			$show->field('product.id', '供应商产品ID');
 			$show->field('product.supplier.name');
 			$show->field('product.title');
-			$show->field('product.pictures')->image(80, 80);
+			$show->field('product.pictures')->image('', 80, 80);
 			$show->field('product.original_price');
 			$show->field('product.price');
 			$show->field('product.sale');
@@ -147,18 +156,16 @@ class AgentProductController extends AdminController
 			}
 
 			$form->display('id');
-            $form->hidden('agent_id')->value($agent_id);
-			$form->hidden('status')->value(ProductStatus::UNAUDITED);
 			$form->hidden('product_id');
-            $form->multipleSelectTable('product_ids', '选择产品')
-				->help('可多选组合销售')
+			$form->selectTable('product_id', '封面产品')
+				->help('当多选产品时，产品列表显示的是该产品的标题和图片')
 				->title('选择产品')
 				->dialogWidth('80%;min-width:825px;')
 				->from(SelectProduct::make())
 				->model(Product::class)
 				->required();
-            $form->selectTable('product_id', '封面产品')
-				->help('当多选产品时，产品列表显示的是该产品的标题和图片')
+            $form->multipleSelectTable('product_ids', '选择产品')
+				->help('可多选组合销售')
 				->title('选择产品')
 				->dialogWidth('80%;min-width:825px;')
 				->from(SelectProduct::make())
@@ -183,6 +190,21 @@ class AgentProductController extends AdminController
 					ProductStatus::SOLD_OUT => '下架',
 				])
 				->required();
+			$form->selectTable('verifier')
+				->title('选择核销人员')
+				->dialogWidth('50%;min-width:600px;') //不起作用
+				->from(SelectUser::make())
+				->model(User::class, 'id', 'nickname')
+				->required();
+
+			//组团版旅行社可以选择地接
+			if (Admin::user()->type == AgentType::CLUSTER) {
+				$form->selectTable('guide_id', '地接人员')
+					->title('选择地接人员')
+					->dialogWidth('50%;min-width:600px;') //不起作用
+					->from(SelectGuide::make())
+					->model(Guide::class, 'id', 'name');
+			}
         })->saving(function (Form $form) {
 			//不允许修改非自己的数据
 			if ($form->isEditing() && $form->model()->agent_id != Admin::user()->id) {
@@ -210,6 +232,7 @@ class AgentProductController extends AdminController
 			}
 
 			//处理特殊字段
+			$form->hidden(['agent_id', 'status']); //表单没有的字段，必须加这句才能够重写
 			$form->agent_id = $agent_id;
 			$form->status = $form->status == ProductStatus::ON_SALE ? ProductStatus::ON_SALE : ProductStatus::SOLD_OUT;