维修修改20260213

app/Http/Controllers/Api/Workbench/CashierDeskController.php

@@ -3565,6 +3565,9 @@ class CashierDeskController extends Controller
         $type = 1;
         $where_data = whereFunction($post,$type);
         $search_data = $request->all();
+        if (empty($search_data['search_data'])) {
+            return response()->json(['code'=>200, 'msg'=>'success', 'data'=>[]]);
+        }
         $list = DB::table('member')
             ->where([
                 'mem_cid' => $user_info->adm_cid
@@ -3621,6 +3624,9 @@ class CashierDeskController extends Controller
         $shop_id = $user_info->adm_shop_id;
 
         $search_data = $request->all();
+        if (empty($search_data['search_data'])) {
+            return response()->json(['code'=>200, 'msg'=>'success', 'data'=>[]]);
+        }
         $list = DB::table('business_client as bucl')
             ->leftjoin('business_account as buac', 'buac.buac_bucl_id', '=', 'bucl_id')
             ->where([

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

@@ -543,9 +543,9 @@ class WashWorkController extends Controller
             if (in_array($info->wor_state, [7, 8, 10]) && $info->wocl_check_car_state == 1) {
                $buttonData[] = 'validateCarInfo';
             }
-            if (in_array($info->ord_state, [1]) && $info->wor_state<6 && in_array($info->wor_type, [0,1])) {
-                $buttonData[] = 'editOrderMember';
-            }
+            // if (in_array($info->ord_state, [1]) && $info->wor_state<6 && in_array($info->wor_type, [0,1])) {
+            //     $buttonData[] = 'editOrderMember';
+            // }
             if (in_array($info->wor_state, [8, 10,12])) {
                $buttonData[] = 'completionInfo';
             }

app/Services/Business/WashOrderService.php

@@ -135,8 +135,7 @@ class WashOrderService extends Service
                         ->orwhere('orcl_name', 'like', '%' . $search_data['keywords'] . '%')
                         ->orwhere('ord_order_number', 'like', '%' . $search_data['keywords'] . '%')
                         ->orwhere('orcl_car_num', 'like', '%' . $search_data['keywords'] . '%')
-                        ->orwhere('orcl_car_brand_series', 'like', '%' . $search_data['keywords'] . '%')
-                        ->orwhere('adm_name', 'like', '%' . $search_data['keywords'] . '%');
+                        ->orwhere('orcl_car_brand_series', 'like', '%' . $search_data['keywords'] . '%');
                 }
             })
             ->where(function ($query) use ($search_data) {
@@ -611,7 +610,7 @@ class WashOrderService extends Service
                             $work_order = DB::table('work_order')
                                 ->where('wor_order_id',$value->ord_id)
                                 ->value('wor_state');
-                            if (in_array($value->ord_state, [1]) && (!$work_order || $work_order<=5) && $value_b['pri_id'] == 873 && in_array($value->ord_type, [0,1])) {
+                            if ((!$work_order || $work_order<=5) && $value_b['pri_id'] == 873 && in_array($value->ord_type, [0,1])) {
                                     $list_items[$key]->list_button_two[] = $value_b;
                             }
                             if (in_array($value->ord_state, [1]) && (!$work_order || $work_order<=5) && $value_b['pri_id'] == 895 && in_array($value->ord_type, [0,1])) {