From 6ebb82b22710c97f8c18b37ce5a53715fb2d8e35 Mon Sep 17 00:00:00 2001 From: shuixiang Date: Sat, 11 Sep 2021 11:50:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89title?= 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 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php index ece73bb..5cc6aba 100755 --- a/app/AdminAgent/Controllers/WorkorderController.php +++ b/app/AdminAgent/Controllers/WorkorderController.php @@ -185,7 +185,7 @@ class WorkorderController extends AdminController { return Form::make(new Workorder(), function (Form $form) { $form->display('id'); - $form->text('title')->required(); + //$form->text('title')->required(); $form->textarea('content')->required(); if (Admin::user()->type == AgentType::CLUSTER) { $form->select('point_type') diff --git a/app/AdminGuide/Controllers/WorkorderController.php b/app/AdminGuide/Controllers/WorkorderController.php index f1ae3aa..994b987 100755 --- a/app/AdminGuide/Controllers/WorkorderController.php +++ b/app/AdminGuide/Controllers/WorkorderController.php @@ -179,7 +179,7 @@ class WorkorderController extends AdminController { return Form::make(new Workorder(), function (Form $form) { $form->display('id'); - $form->text('title')->required(); + //$form->text('title')->required(); $form->textarea('content')->required(); $form->select('point_type') ->options([ diff --git a/app/AdminSupplier/Controllers/WorkorderController.php b/app/AdminSupplier/Controllers/WorkorderController.php index ec8e996..30c4867 100755 --- a/app/AdminSupplier/Controllers/WorkorderController.php +++ b/app/AdminSupplier/Controllers/WorkorderController.php @@ -178,13 +178,13 @@ class WorkorderController extends AdminController { return Form::make(new Workorder(), function (Form $form) { $form->display('id'); - $form->text('title')->required(); + //$form->text('title')->required(); $form->textarea('content')->required(); $form->select('point_type') ->options([ 0 => '代理商', ]) - ->default(1) + ->default(0) ->required(); $form->select('point_id', '代理商')->options(function () { $agentIds = AgentProductItem::query()->where('supplier_id',Admin::user()->id)->distinct()->pluck('agent_id'); 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 2/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 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 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 4/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 5/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 6/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); }