Merge branch 'master' of http://gitlab.bluearp.com/ldj/yhwx

app/Http/Controllers/Mounting/Business/WashOrderController.php

@@ -2240,12 +2240,23 @@ class WashOrderController extends Controller
         if ($request['type'] == 1) {
             $data = DB::table('cancel_order_data')
                 ->where('ord_id', $request['ord_id'])
+                ->orderBy('id', 'desc')
                 ->first();
             return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$data]);
         }
         DB::beginTransaction();
         $res = WashOrderService::auditCancel($user_info, $request);
         if ($res['code'] ==200) {
+            if($request['pass'] == 1) {
+                $state_name = '通过';
+            } else {
+                $state_name = '驳回';
+                if ($request['remark']) {
+                    $orre_res = orderRemark($user_info, $request['ord_id'], '', $request['remark'], '订单列表');
+                }
+            }
+            $orlo_res = orderLog($user_info, $request['ord_id'], '', '审核取消'.$state_name);
+            OperationLog::addLog($user_info, getRealIp($request), '订单列表', '审核取消', '审核取消' .$state_name. $request['ord_order_number'] . '成功');
             DB::commit();
         } else {
             DB::rollback();

app/Services/Business/WashWorkService.php

@@ -3248,7 +3248,12 @@ class WashWorkService extends Service
         $info->ord_new_type_name = DB::table('order_type')
             ->where('orty_id', $info->ord_new_type)
             ->value('orty_name');
+        $find_order_cancel = DB::table('cancel_order_data')
+            ->where('ord_id', $info->wor_order_id)
+            ->orderBy('id', 'desc')
+            ->get();
         $data['work_data'] = $info;
+        $data['find_order_cancel'] = $find_order_cancel?$find_order_cancel:[];
         $data['goods_data'] = $goods_data;
         $data['technician_part'] = $technician_part;
         return ['code'=>200, 'msg'=>'success', 'data'=>$data];