From 0dc0780ddd262c4987f4f5cba2167aa938d3881c Mon Sep 17 00:00:00 2001
From: lemon <15040771@qq.com>
Date: Sat, 11 Sep 2021 12:47:13 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/WorkorderController.php    | 2 +-
 app/AdminGuide/Controllers/WorkorderController.php    | 2 +-
 app/AdminSupplier/Controllers/WorkorderController.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php
index 5cc6aba..79e4fe8 100755
--- a/app/AdminAgent/Controllers/WorkorderController.php
+++ b/app/AdminAgent/Controllers/WorkorderController.php
@@ -208,7 +208,7 @@ class WorkorderController extends AdminController
 					])
 					->default(1)->required();
 			} else {
-				$form->select('point_type')
+				$form->hidden('point_type')
 					->options([
 						1 => '供应商',
 					])
diff --git a/app/AdminGuide/Controllers/WorkorderController.php b/app/AdminGuide/Controllers/WorkorderController.php
index 994b987..2c8e94a 100755
--- a/app/AdminGuide/Controllers/WorkorderController.php
+++ b/app/AdminGuide/Controllers/WorkorderController.php
@@ -181,7 +181,7 @@ class WorkorderController extends AdminController
             $form->display('id');
             //$form->text('title')->required();
             $form->textarea('content')->required();
-            $form->select('point_type')
+            $form->hidden('point_type')
 				->options([
 					0 => '代理商',
 				])
diff --git a/app/AdminSupplier/Controllers/WorkorderController.php b/app/AdminSupplier/Controllers/WorkorderController.php
index 30c4867..7c75131 100755
--- a/app/AdminSupplier/Controllers/WorkorderController.php
+++ b/app/AdminSupplier/Controllers/WorkorderController.php
@@ -180,7 +180,7 @@ class WorkorderController extends AdminController
             $form->display('id');
             //$form->text('title')->required();
             $form->textarea('content')->required();
-            $form->select('point_type')
+            $form->hidden('point_type')
 				->options([
 					0 => '代理商',
 				])

From 66d43dbb5084aa5d14204c774ad5a759d7689887 Mon Sep 17 00:00:00 2001
From: lemon <15040771@qq.com>
Date: Sat, 11 Sep 2021 14:00:20 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/WorkorderController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php
index 79e4fe8..6f6975a 100755
--- a/app/AdminAgent/Controllers/WorkorderController.php
+++ b/app/AdminAgent/Controllers/WorkorderController.php
@@ -51,7 +51,7 @@ class WorkorderController extends AdminController
 
 		// 先这么处理吧
 		if ($workorderId == 0 && !empty($workorder)) {
-			return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id);
+			return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id ?? 1);
 		}
 
 		foreach ($workorder as $v) {

From b4ef4e1350a944ce665739894e827dd77c7ac5f6 Mon Sep 17 00:00:00 2001
From: lemon <15040771@qq.com>
Date: Sat, 11 Sep 2021 14:01:52 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/WorkorderController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php
index 6f6975a..945cf97 100755
--- a/app/AdminAgent/Controllers/WorkorderController.php
+++ b/app/AdminAgent/Controllers/WorkorderController.php
@@ -51,7 +51,7 @@ class WorkorderController extends AdminController
 
 		// 先这么处理吧
 		if ($workorderId == 0 && !empty($workorder)) {
-			return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id ?? 1);
+			return redirect('/admin-agent/workorder_item?workorder_id=1');
 		}
 
 		foreach ($workorder as $v) {

From 9a322bd120a593b2728aa6b6894437b935f702ea Mon Sep 17 00:00:00 2001
From: lemon <15040771@qq.com>
Date: Sat, 11 Sep 2021 14:03:23 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/WorkorderController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php
index 945cf97..c5b05ae 100755
--- a/app/AdminAgent/Controllers/WorkorderController.php
+++ b/app/AdminAgent/Controllers/WorkorderController.php
@@ -22,6 +22,7 @@ use Dcat\Admin\Http\Controllers\AdminController;
 use Illuminate\Http\Request;
 use App\Traits\ResponseHelper;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 
@@ -48,10 +49,10 @@ class WorkorderController extends AdminController
 			})
 			->orderByDesc('updated_at')
 			->get();
-
 		// 先这么处理吧
 		if ($workorderId == 0 && !empty($workorder)) {
-			return redirect('/admin-agent/workorder_item?workorder_id=1');
+			Log::info($workorder);
+			return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id);
 		}
 
 		foreach ($workorder as $v) {

From 15cd3e97b6910c7f0b31a1854b9640865917dd42 Mon Sep 17 00:00:00 2001
From: lemon <15040771@qq.com>
Date: Sat, 11 Sep 2021 14:21:57 +0800
Subject: [PATCH 5/6] empty

---
 app/AdminAgent/Controllers/WorkorderController.php    | 3 +--
 app/AdminGuide/Controllers/WorkorderController.php    | 2 +-
 app/AdminSupplier/Controllers/WorkorderController.php | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php
index c5b05ae..93faf49 100755
--- a/app/AdminAgent/Controllers/WorkorderController.php
+++ b/app/AdminAgent/Controllers/WorkorderController.php
@@ -50,8 +50,7 @@ class WorkorderController extends AdminController
 			->orderByDesc('updated_at')
 			->get();
 		// 先这么处理吧
-		if ($workorderId == 0 && !empty($workorder)) {
-			Log::info($workorder);
+		if ($workorderId == 0 && !empty($workorder->toArray())) {
 			return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id);
 		}
 
diff --git a/app/AdminGuide/Controllers/WorkorderController.php b/app/AdminGuide/Controllers/WorkorderController.php
index 2c8e94a..e4c06e4 100755
--- a/app/AdminGuide/Controllers/WorkorderController.php
+++ b/app/AdminGuide/Controllers/WorkorderController.php
@@ -50,7 +50,7 @@ class WorkorderController extends AdminController
 			->get();
 
 		// 先这么处理吧
-		if ($workorderId == 0 && !empty($workorder)) {
+		if ($workorderId == 0 && !empty($workorder->toArray())) {
 			return redirect('/admin-guide/workorder_item?workorder_id='.$workorder[0]->id);
 		}
 
diff --git a/app/AdminSupplier/Controllers/WorkorderController.php b/app/AdminSupplier/Controllers/WorkorderController.php
index 7c75131..38b0292 100755
--- a/app/AdminSupplier/Controllers/WorkorderController.php
+++ b/app/AdminSupplier/Controllers/WorkorderController.php
@@ -49,7 +49,7 @@ class WorkorderController extends AdminController
 			->get();
 
 		// 先这么处理吧
-		if ($workorderId == 0 && !empty($workorder)) {
+		if ($workorderId == 0 && !empty($workorder->toArray())) {
 			return redirect('/admin-supplier/workorder_item?workorder_id='.$workorder[0]->id);
 		}
 

From 63cad20363b123099c3cfac4b1f319af71f0556f Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Sat, 11 Sep 2021 14:25:53 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/OrderController.php           | 42 ++++++++++++++-----
 resources/views/admin/filter/select.blade.php | 30 +++++++++++++
 2 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 resources/views/admin/filter/select.blade.php

diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php
index ec0e50a..55ec2a0 100644
--- a/app/AdminAgent/Controllers/OrderController.php
+++ b/app/AdminAgent/Controllers/OrderController.php
@@ -12,9 +12,12 @@ use App\Models\Supplier;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
+use Dcat\Admin\Grid\Filter\AbstractFilter;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Widgets\Dropdown;
 use Dcat\Admin\Widgets\Table;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Storage;
 
 class OrderController extends AdminController
@@ -26,15 +29,15 @@ class OrderController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new Order(['product']), function (Grid $grid) {
+        return Grid::make(new Order(['product.supplier:id,name']), function (Grid $grid) {
 			$grid->disableDeleteButton();
 			$grid->disableBatchDelete();
 			$grid->disableCreateButton();
 			$grid->disableRowSelector();
 			$grid->disableEditButton();
 			$grid->disableQuickEditButton(false);
-			$grid->quickSearch(['mobile', 'order_no', 'title'])
-				->placeholder('搜索手机号、订单号、产品名称')->width(20);
+			$grid->quickSearch(['id', 'mobile', 'order_no', 'title'])
+				->placeholder('搜索ID、手机号、订单号、产品名称')->width(25);
 
 			$grid->model()->where('agent_id', Admin::user()->id);
 
@@ -112,15 +115,32 @@ class OrderController extends AdminController
 
 			$grid->filter(function (Grid\Filter $filter) {
 				$filter->panel();
+				$filter->expand();
+
+				//自定义过滤器
+				$filter->extend('statusIn', new class ($column = null, $label = '') extends AbstractFilter {
+					protected $query = 'whereIn';
+					protected $width = 2;
+					public function condition($inputs)
+					{
+						$value = Arr::get($inputs, $this->column);
+						if ($value === null) {
+							return;
+						}
+						$this->value = is_array($value) ? $value : explode(',', $value);
+						return $this->buildCondition($this->column, $this->value);
+					}
+				});
 
-				$filter->equal('id')->width(2);
-				$filter->like('mobile')->width(2);
-				$filter->like('order_no')->width(3);
-				$filter->like('title')->width(3);
-				$filter->equal('status')->select(OrderStatus::array())->width(2);
-
-				$option = Supplier::query()->pluck('name', 'id');
-				$filter->equal('product.supplier_id', '供应商')->select($option)->width(3);
+				$filter->statusIn('status')->select([
+					join(',', [OrderStatus::UNPAID, OrderStatus::PAY_EARNEST]) => '待付款',
+					join(',', [OrderStatus::PAID, OrderStatus::OFFLINE_PAID, OrderStatus::PAID_RETAINAGE]) => '已付款',
+					OrderStatus::CANCEL => '已取消',
+					OrderStatus::SUCCESS => '已完成',
+					OrderStatus::REFUNDING => '退款中',
+					OrderStatus::REFUNDED => '已退款',
+					OrderStatus::REFUSED_REFUND => '已拒绝',
+				])->width(2);
 
 				$filter->between('created_at')->datetime()->width(4);
 			});
diff --git a/resources/views/admin/filter/select.blade.php b/resources/views/admin/filter/select.blade.php
new file mode 100644
index 0000000..cd4b359
--- /dev/null
+++ b/resources/views/admin/filter/select.blade.php
@@ -0,0 +1,30 @@
+<div class="input-group input-group-sm">
+    <div class="input-group-prepend">
+        <span class="input-group-text bg-white text-capitalize"><b>{!! $label !!}</b></span>
+    </div>
+
+    <select class="form-control {{ $class }}" name="{{$name}}" data-value="{{ join(',', $value) }}" style="width: 100%;">
+        <option value=""></option>
+        @foreach($options as $select => $option)
+            <option value="{{$select}}" {{ Dcat\Admin\Support\Helper::equal($select, join(',', $value)) ?'selected':'' }}>{{$option}}</option>
+        @endforeach
+    </select>
+</div>
+
+@include('admin::scripts.select')
+
+<script require="@select2?lang={{ config('app.locale') === 'en' ? '' : str_replace('_', '-', config('app.locale')) }}">
+	var configs = {!! admin_javascript_json($configs) !!};
+
+	@yield('admin.select-ajax')
+
+	@if(isset($remote))
+	$.ajax({!! admin_javascript_json($remote['ajaxOptions']) !!}).done(function(data) {
+		$("{{ $selector }}").select2($.extend({!! admin_javascript_json($configs) !!}, {
+			data: data,
+		})).val({!! json_encode($remote['values']) !!}).trigger("change");
+	});
+	@else
+	$("{!! $selector !!}").select2(configs);
+	@endif
+</script>