edit

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

@@ -800,6 +800,7 @@ class WashOrderController extends Controller
             $search_data_searchor['mem_name_like'] = $search_data['search_data'];
             $search_data_searchor['mem_phone_like'] = $search_data['search_data'];
             $search_data_searchor['meca_car_num_like'] = $search_data['search_data'];
+            $search_data_searchor['mem_4sname_like'] = $search_data['search_data'];
             $params['search_data_searchor'] = $search_data_searchor;
         }
         if (!empty($search_data['mem_id'])) {

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

@@ -1620,9 +1620,24 @@ class WashWorkController extends Controller
             DB::rollBack();
             return response()->json($return_data);
         }
-
+        $content = '修改';
+        switch ( $request['wotp_work_type'] ){
+            case 1:
+                $content .= '验件技师为：';
+                break;
+            case 2:
+                $content .= '验件技师为：';
+                break;
+            case 3:
+                $content .= '验件技师为：';
+                break;
+            default:
+                $content = '修改技师['.$request['wotp_work_type'].']为:';
+                break;
+        }
+        $content .= $return_data['adm_name'];
         // 生成操作记录
-        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '修改技师');
+        $orlo_res = orderLog($user_info, $return_data['data'], $request['wor_id'], $content);
         if ($orlo_res) {
             DB::commit();
             OperationLog::addLog($user_info, getRealIp($request), '工单列表', '修改技师', '修改技师成功');

app/Services/Business/WashOrderService.php

@@ -4248,6 +4248,9 @@ class WashOrderService extends Service
         if (empty($info)) {
             return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在1', 'data'=>''];
         }
+        $info->orderLog = DB::table('order_log')
+            ->where("orlo_ord_id",$info->ord_id)
+            ->select('orlo_create_adm_name','orlo_content','orlo_time')->orderBy('orlo_id','desc')->get()->toArray();
         $info->ord_new_type_name = DB::table('order_type')
             ->where('orty_id', $info->ord_new_type)
             ->value('orty_name');

app/Services/Business/WashWorkService.php

@@ -2999,6 +2999,9 @@ class WashWorkService extends Service
             $ord_Explainpic = $Explainpic['data'];
         }
         $info->ord_explain_pic = $ord_Explainpic;
+        $info->orderLog = DB::table('order_log')
+            ->where("orlo_ord_id",$info->ord_id)
+            ->select('orlo_create_adm_name','orlo_content','orlo_time')->orderBy('orlo_id','desc')->get()->toArray();
         // 获取该工单下的商品信息
         $goods_data = DB::table('work_good as wg')
             ->leftjoin('goods as g', 'g.goo_id', '=', 'wg.wogo_goo_id')
@@ -3506,6 +3509,9 @@ class WashWorkService extends Service
             return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在', 'data'=>''];
         }
 
+        $info->orderLog = DB::table('order_log')
+            ->where("orlo_ord_id",$info->ord_id)
+            ->select('orlo_create_adm_name','orlo_content','orlo_time')->orderBy('orlo_id','desc')->get()->toArray();
         $ord_Explainpic = [];
         $Explainpic = WashOrderService::getExplainpic($user_info, $request['ord_id']);
         if (!empty($Explainpic['data'])) {
@@ -6133,7 +6139,7 @@ class WashWorkService extends Service
             ->leftJoin('admin as a', 'a.adm_id', '=', 'wor.wor_service_adm_id')
             ->leftJoin('work_client as wocl', 'wocl.wocl_wor_id', '=', 'wor.wor_id')
             ->where('wor_id', $request['wor_id'])
-            ->select('wor_number', 'wor_state', 'wor_delete', 'wor_pass', 'wor_appoint_time', 'wor_order_number', 'wor_remark', 'ord_create_time', 'wor_service_adm_id', 'adm_name', 'adm_phone', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wor_order_id', 'wor_service_state', 'wor_address')
+            ->select('wor_number', 'wor_state', 'wor_delete', 'wor_pass', 'wor_appoint_time', 'wor_order_number', 'wor_remark', 'ord_create_time', 'wor_service_adm_id', 'adm_name', 'adm_phone', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wor_order_id', 'wor_service_state', 'wor_address','ord_id')
             ->first();
         if (empty($find_work)) {
             return ['code'=>ErrorInc::REQUEST_INAPTNESS, 'msg'=>'当前工单不存在，无法提交！', 'data'=>''];
@@ -6154,10 +6160,10 @@ class WashWorkService extends Service
             return ['code'=>ErrorInc::REQUEST_INAPTNESS, 'msg'=>'已验件，不可更换验件技师', 'data'=>''];
         }
         if ($request['wotp_work_type'] == 2 && $find_work->wor_state > 7) {
-            return ['code'=>ErrorInc::REQUEST_INAPTNESS, 'msg'=>'已验件，不可更换维修技师', 'data'=>''];
+            return ['code'=>ErrorInc::REQUEST_INAPTNESS, 'msg'=>'已维修，不可更换维修技师', 'data'=>''];
         }
         if ($request['wotp_work_type'] == 3 && $find_work->wor_state > 9) {
-            return ['code'=>ErrorInc::REQUEST_INAPTNESS, 'msg'=>'已验件，不可更换还件技师', 'data'=>''];
+            return ['code'=>ErrorInc::REQUEST_INAPTNESS, 'msg'=>'已还件，不可更换还件技师', 'data'=>''];
         }
         $update_woch_data = DB::table('wash_work_technician_part')
             ->where('wotp_wor_id', $request['wor_id'])
@@ -6165,7 +6171,7 @@ class WashWorkService extends Service
             ->update(['wotp_service_adm_id'=>$request['adm_id'], 'wotp_service_adm_name'=>$find_adm->adm_name, 'wotp_service_adm_phone'=>$find_adm->adm_phone]);
         
         if ($update_woch_data) {
-            return ['code'=>200, 'msg'=>'修改技师成功', 'data'=>'修改技师成功'];
+            return ['code'=>200, 'msg'=>'修改技师成功', 'data'=>$find_work->ord_id,'adm_name'=>$find_adm->adm_name];
         } else {
             return ['code'=>500, 'msg'=>'修改技师失败', 'data'=>'修改技师失败'];
         }
@@ -6305,6 +6311,7 @@ class WashWorkService extends Service
             ->value('adm_shop_leave');
         $list_button = getAppletListButton($request['api_token'], 40);
         $pri_id = array_column($list_button, 'pri_id');
+        CommonService::startmysql();
         if($adm_leave == 1 || in_array(79,$pri_id)){
             $wor_count = DB::table('work_order')
                 ->leftJoin('wash_work_technician_part as c', 'c.wotp_wor_id', '=', 'wor_id');
@@ -6319,6 +6326,7 @@ class WashWorkService extends Service
             ->where('wor_collection_bill', 1) //是否代收账单：1正常工单2代收账单
             ->whereIn('wor_state', [5,6,7,9]) //1.新订单 2未派单 3待接单/已派单  5.已接单/待验车 6.已验车（显示开始施工按钮） 7施工中（提交施工按钮）   8.待审核/完成待审核
             ->select(DB::raw('count(DISTINCT wotp_wor_id) as count, wor_state'));
+        $data
         if($adm_leave == 1 || in_array(79,$pri_id)) {
             $wor_count = $wor_count->groupBy('wor_state');
         }else{