工单添加记录

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

@@ -1086,13 +1086,13 @@ class WashWorkController extends Controller
         }
 
         // 生成操作记录
-        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '完成提交');
+        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '维修完成提交');
         if ($orlo_res) {
             DB::commit();
             $log_data = [
                 'oplo_module'=>'工单列表',
-                'oplo_action'=>'完成提交',
-                'oplo_content'=>$return_data['data']['wor_number'] . '完成提交成功',
+                'oplo_action'=>'维修完成提交',
+                'oplo_content'=>$return_data['data']['wor_number'] . '维修完成提交成功',
                 'oplo_ip'=>getRealIp($request),
                 'order_number'=>$find_wor_data->ord_order_number,
                 'work_number'=>$find_wor_data->wor_number,
@@ -2002,8 +2002,27 @@ class WashWorkController extends Controller
         // 取消订单
         DB::beginTransaction();
         $return_data = WashWorkService::cancelOrder($user_info, $request->all());
+        // 生成操作记录
+        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '取消订单提交');
         if ($return_data['code'] == 200) {
             DB::commit();
+            // 工单信息
+            $find_wor_data = DB::table('work_order as wo')
+                ->leftJoin('work_client as wc', 'wo.wor_id', '=', 'wc.wocl_wor_id')
+                ->leftJoin('order as o', 'wo.wor_order_id', '=', 'o.ord_id')
+                ->where('wor_id', $request['wor_id'])
+                ->select('wocl_client_id', 'wor_shop_id', 'wor_order_id', 'ord_order_number', 'wor_number', '')
+                ->first();
+            $log_data = [
+                'oplo_module'=>'工单列表',
+                'oplo_action'=>'取消订单',
+                'oplo_content'=>$find_wor_data->wor_number . '取消订单提交成功',
+                'oplo_ip'=>getRealIp($request),
+                'order_number'=>$find_wor_data->ord_order_number,
+                'work_number'=>$find_wor_data->wor_number,
+                'data_source'=>2,//操作来源  1 PC  2 小程序
+            ];
+            $log = addNewLog($user_info, $log_data);
         } else {
             DB::rollBack();
         }
@@ -2033,6 +2052,24 @@ class WashWorkController extends Controller
 
         // 工单返工
         $return_data = WashWorkService::returnWork($user_info, $request->all());
+        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '工单返工提交');
+        // 工单信息
+        $find_wor_data = DB::table('work_order as wo')
+            ->leftJoin('work_client as wc', 'wo.wor_id', '=', 'wc.wocl_wor_id')
+            ->leftJoin('order as o', 'wo.wor_order_id', '=', 'o.ord_id')
+            ->where('wor_id', $request['wor_id'])
+            ->select('wocl_client_id', 'wor_shop_id', 'wor_order_id', 'ord_order_number', 'wor_number', '')
+            ->first();
+        $log_data = [
+            'oplo_module'=>'工单列表',
+            'oplo_action'=>'工单返工',
+            'oplo_content'=>$find_wor_data->wor_number . '工单返工成功',
+            'oplo_ip'=>getRealIp($request),
+            'order_number'=>$find_wor_data->ord_order_number,
+            'work_number'=>$find_wor_data->wor_number,
+            'data_source'=>2,//操作来源  1 PC  2 小程序
+        ];
+        $log = addNewLog($user_info, $log_data);
         return response()->json($return_data);
     }
 
@@ -2059,7 +2096,17 @@ class WashWorkController extends Controller
 
         // 工单返工
         $return_data = WashWorkService::returnItem($user_info, $request->all());
-        OperationLog::addLog($user_info, getRealIp($request), '技师工单列表', '还件', '还件成功');
+        $orlo_res = orderLog($user_info, 0, $request['wor_id'], '工单还件提交');
+        $log_data = [
+            'oplo_module'=>'工单列表',
+            'oplo_action'=>'工单还件',
+            'oplo_content'=>$find_wor_data->wor_number . '工单还件成功',
+            'oplo_ip'=>getRealIp($request),
+            'order_number'=>$find_wor_data->ord_order_number,
+            'work_number'=>$find_wor_data->wor_number,
+            'data_source'=>2,//操作来源  1 PC  2 小程序
+        ];
+        $log = addNewLog($user_info, $log_data);
         return response()->json($return_data);
     }
 
@@ -2101,6 +2148,17 @@ class WashWorkController extends Controller
             return response()->json(['code'=>200,'msg'=>'success','data'=>$data]);
         }
         $res = WashWorkService::auditWork($user_info,$request);
+        OperationLog::addLog($user_info, getRealIp($request), '技师工单列表', '还件', '还件成功');
+        $log_data = [
+            'oplo_module'=>'工单列表',
+            'oplo_action'=>'工单还件',
+            'oplo_content'=>$find_wor_data->wor_number . '工单还件成功',
+            'oplo_ip'=>getRealIp($request),
+            'order_number'=>$find_wor_data->ord_order_number,
+            'work_number'=>$find_wor_data->wor_number,
+            'data_source'=>2,//操作来源  1 PC  2 小程序
+        ];
+        $log = addNewLog($user_info, $log_data);
         return response()->json($res);
     }
 

app/Http/Enum/Business/OrderEnum.php

@@ -10,10 +10,10 @@ class OrderEnum
     // 下单来源：1pc端2车主小程序3技师端4智配贴装
     public $ord_source_enum = [
         ['state' => 1, 'state_show' => 'PC'],
-        ['state' => 2, 'state_show'=> '车主端'],
+        // ['state' => 2, 'state_show'=> '车主端'],
         ['state' => 3, 'state_show' => '技师端'],
-        ['state' => 4, 'state_show' => '合作商'],
-        ['state' => 5, 'state_show' => '智配贴装'],
+        // ['state' => 4, 'state_show' => '合作商'],
+        // ['state' => 5, 'state_show' => '智配贴装'],
     ];
 
     // 返回key=>value格式数据

app/Services/Business/WashWorkService.php

@@ -329,6 +329,9 @@ class WashWorkService extends Service
                     if ($value_b['pri_operate_method'] == 'info') {//详情
                         $list_items[$key]->button_one[] = $value_b;
                     }
+                    if ($value_b['pri_operate_method'] == 'log') {//操作记录
+                        $list_items[$key]->button_two[] = $value_b;
+                    }
                     if ($value_b['pri_operate_method'] == 'check' && $value->wor_state > 9 && $value->wor_state != 11) {//绩效核算
                         $list_items[$key]->button_two[] = $value_b;
                     }