Merge remote-tracking branch 'origin/develop' into develop

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,9 +49,8 @@ class WorkorderController extends AdminController
 			})
 			->orderByDesc('updated_at')
 			->get();
-
 		// 先这么处理吧
-		if ($workorderId == 0 && !empty($workorder)) {
+		if ($workorderId == 0 && !empty($workorder->toArray())) {
 			return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id);
 		}
 
@@ -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')
@@ -208,7 +208,7 @@ class WorkorderController extends AdminController
 					])
 					->default(1)->required();
 			} else {
-				$form->select('point_type')
+				$form->hidden('point_type')
 					->options([
 						1 => '供应商',
 					])

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);
 		}
 
@@ -179,9 +179,9 @@ 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')
+            $form->hidden('point_type')
 				->options([
 					0 => '代理商',
 				])

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);
 		}
 
@@ -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')
+            $form->hidden('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');