edit

app/Http/Controllers/Api/ProductManage/ServiceProjectController.php

@@ -235,7 +235,7 @@ class ServiceProjectController extends Controller
         if ($request['type'] == 1) {
             $find_sepr = DB::table('service_project')
                 ->where('sepr_id', $request['sepr_id'])
-                ->select('sepr_id', 'sepr_name', 'sepr_img', 'sepr_order_money', 'sepr_check_car', 'sepr_money', 'sepr_show_location', 'sepr_remark', 'sepr_work_type', 'sepr_sort', 'sepr_code')
+                ->select('sepr_id', 'sepr_name', 'sepr_img', 'sepr_order_money', 'sepr_check_car', 'sepr_money', 'sepr_show_location', 'sepr_remark', 'sepr_work_type', 'sepr_sort', 'sepr_code', 'sepr_class_id', 'sepr_class_name')
                 ->first();
             $seim_data = DB::table('sepr_img')
                 ->where('seim_sepr_id', $request['sepr_id'])
@@ -317,8 +317,8 @@ class ServiceProjectController extends Controller
             'sepr_update_time'=>date('Y-m-d H:i:s'),
         ];
         $sepr_edit_data['sepr_check_car'] = 1;//是否验车1是2否
-        $sepr_add_data['sepr_class_id'] = $request->input('sepr_class_id', 0);//分类id
-        $sepr_add_data['sepr_class_name'] = $request->input('sepr_class_name', '');//分类名称
+        $sepr_edit_data['sepr_class_id'] = $request->input('sepr_class_id', 0);//分类id
+        $sepr_edit_data['sepr_class_name'] = $request->input('sepr_class_name', '');//分类名称
         if (isset($request['sepr_img'])) {
             if (empty($request['sepr_img'])) {
                 $sepr_edit_data['sepr_img'] = ''; //新上传的图片路径

app/Http/Controllers/Api/Verify/ProductManage/VerifyServiceProjectController.php

@@ -40,7 +40,7 @@ class VerifyServiceProjectController extends Controller
             'sepr_name.max' => '服务项目名称长度超过最大限制',
             'sepr_order_money.required' => '请输入:服务费用',
             'sepr_order_money.numeric' => '服务费用参数类型错误',
-            'sepr_img.required' => '请上传图片',
+//            'sepr_img.required' => '请上传图片',
             'sepr_check_car.required' => '请选择是否验车',
             'sepr_check_car.in' => '是否验车参数类型错误',
             'sepr_show_location.required' => '请选择显示平台',
@@ -92,7 +92,7 @@ class VerifyServiceProjectController extends Controller
             'sepr_name.max' => '服务项目名称长度超过最大限制',
             'sepr_order_money.required' => '请输入:服务费用',
             'sepr_order_money.numeric' => '服务费用参数类型错误',
-            'sepr_img.required' => '请上传图片',
+//            'sepr_img.required' => '请上传图片',
             'sepr_check_car.required' => '请选择是否验车',
             'sepr_check_car.in' => '是否验车参数类型错误',
             'sepr_show_location.required' => '请选择显示平台',
@@ -108,7 +108,7 @@ class VerifyServiceProjectController extends Controller
             'sepr_id' => 'required|integer|min:1',
             'sepr_name' => 'required|max:20',
             'sepr_order_money' => 'sometimes|required|numeric',
-            'sepr_img' => 'required',
+//            'sepr_img' => 'required',
             'sepr_check_car' => [//是否验车1是2否
                 'sometimes',
                 'required',
@@ -144,7 +144,7 @@ class VerifyServiceProjectController extends Controller
 //            'sepr_name.max' => '服务项目名称长度超过最大限制',
             'sepr_order_money.required' => '请输入:服务费用',
             'sepr_order_money.numeric' => '服务费用参数类型错误',
-            'sepr_img.required' => '请上传图片',
+//            'sepr_img.required' => '请上传图片',
             'sepr_check_car.required' => '请选择是否验车',
             'sepr_check_car.in' => '是否验车参数类型错误',
             'sepr_show_location.required' => '请选择显示平台',
@@ -160,7 +160,7 @@ class VerifyServiceProjectController extends Controller
             'sepr_id' => 'required|integer|min:1',
 //            'sepr_name' => 'required|max:20',
             'sepr_order_money' => 'sometimes|required|numeric',
-            'sepr_img' => 'required',
+//            'sepr_img' => 'required',
             'sepr_check_car' => [//是否验车1是2否
                 'sometimes',
                 'required',

app/Http/Controllers/WeChatApplet/Technician/WashWorkController.php

@@ -533,6 +533,10 @@ class WashWorkController extends Controller
                $buttonData[] = 'completion';
             }
 
+            if($info->wor_state < 7){
+                $buttonData[] = 'cancelOrder';
+            }
+
             if (!empty($info->wocl_client_id)) {
                $buttonData[] = 'assign';
             }
@@ -1307,7 +1311,6 @@ class WashWorkController extends Controller
         // 生成操作记录
         $orlo_res = orderLog($user_info, $request['ord_id'], 0, '生成工单');
         if ($orlo_res) {
-            DB::commit();
             $data = [
                 'oplo_module'=>'派单',
                 'oplo_action'=>'派单',
@@ -1318,7 +1321,9 @@ class WashWorkController extends Controller
                 'data_source'=>2,//操作来源  1 PC  2 小程序
             ];
             $log = addNewLog($user_info, $data);
-            return $this->success('派单成功');
+            DB::commit();
+            return response()->json(['code'=>200, 'msg'=>'派单成功', 'data'=>'']);
+            // return $this->success('派单成功');
         } else {
             DB::rollBack();
             return $this->error('派单失败', ErrorInc::MYSQL_FAILED);
@@ -2088,7 +2093,7 @@ class WashWorkController extends Controller
                 ->first();
             $find_com_img = DB::table('completion_info')
                 ->where('coin_wor_id', $request['wor_id'])
-                ->where('coin_type', 3)
+                ->where('coin_type', 2)
                 // ->where('coin_must', 1)
                 ->select('coin_wor_id', 'coin_type', 'coin_data')
                 ->get()->toArray();