From e7e3f763a3bd2c9d18539c5f25bee9dd690d3f76 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Sat, 6 Nov 2021 22:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AgentProductController.php        | 15 ++++++++++++++-
 app/AdminAgent/Controllers/OrderController.php    |  9 +++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php
index b803bfb..459d56c 100644
--- a/app/AdminAgent/Controllers/AgentProductController.php
+++ b/app/AdminAgent/Controllers/AgentProductController.php
@@ -44,8 +44,16 @@ class AgentProductController extends AdminController
         return Grid::make(new AgentProduct(['product.supplier:id,company_name', 'category:id,name']), function (Grid $grid) {
 			$agent_id = Admin::user()->id;
         	$grid->model()->where('agent_id', $agent_id);
+        	if ($source = request()->input('source')) {
+        		if ($source == 1) {
+					$grid->model()->where('product_id', 0);
+        		} else if ($source == 2) {
+					$grid->model()->where('product_id', '<>', 0);
+				}
+			}
 
             $grid->column('id')->sortable();
+			$grid->column('product.supplier.company_name')->limit(8);
             $grid->column('picture', '产品图片')->image('', 60, 60);
             $grid->column('title', '产品名称')->limit(15);
             $grid->column('price');
@@ -107,7 +115,12 @@ class AgentProductController extends AdminController
 				$filter->equal('status')->select(ProductStatus::array())->width(2);
 
 				$options = Supplier::where('status', 1)->pluck('company_name', 'id')->toArray();
-				$filter->equal('product.supplier_Id', '供应商')->select($options)->width(2);
+				$filter->equal('product.supplier_id', '供应商')->select($options)->width(2);
+
+				$filter->equal('source', '进货渠道')
+					->select([1 => '自营产品', 2 => '供应商产品'])
+					->ignore()
+					->width(2);
             });
         });
     }
diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php
index 4829fe0..1d8c4ae 100644
--- a/app/AdminAgent/Controllers/OrderController.php
+++ b/app/AdminAgent/Controllers/OrderController.php
@@ -63,7 +63,7 @@ class OrderController extends AdminController
 					}, $info);
 					return Table::make([], $info);
 				})->xl();
-			$grid->column('product', '产品信息')
+			$grid->column('产品信息')
 				->display('查看')
 				->modal('购买产品信息', function ($modal) {
 					$item = OrderProductItem::with(['supplier:id,company_name', 'product:id,title,pictures'])
@@ -72,16 +72,17 @@ class OrderController extends AdminController
 
 					$row = [];
 					foreach($item as $v) {
-						$picture = !is_null($v->product->picture) ? Storage::disk('public')->url($v->product->picture) : '';
+						$picture = !empty($v->product->picture) ? Storage::disk('public')->url($v->product->picture) : $this->picture;
 						$row[] = [
-							$v->product->title ?? '',
+							$v->product->title ?? $this->title,
 							'<img data-action="preview-img" src="' . $picture . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail">',
 							$v->num ?? '',
-							$v->supplier->company_name ?? '',
+							$v->supplier->company_name ?? '无',
 						];
 					}
 					return Table::make(['产品名称', '产品图片', '购买数量', '所属供应商'], $row);
 				})->xl();
+			$grid->column('product.supplier.company_name', '供应商')->limit(8);
 
 			//状态及退款处理
             $grid->column('status')