cqpCow пре 1 година
родитељ
комит
ff086267d0
1 измењених фајлова са 8 додато и 4 уклоњено
  1. 8 4
      app/Service/OperationLogService.php

+ 8 - 4
app/Service/OperationLogService.php

@@ -46,7 +46,14 @@ class OperationLogService extends Service
 //                ]
 //            ]
 //        ];
-        $list = OperationLog::where('order_number', $data['order_number'])->select('*')->get()->toArray();
+        $array = [];
+        if (strpos($data['order_number'], '|') !== false) {
+            $array = explode('|',$data['order_number']);
+            $order = $array[0].'|'.$array[1];
+            $list = OperationLog::where('order_number', 'LIKE', '%' . $order .'%')->select('*')->get()->toArray();
+        }else{
+            $list = OperationLog::where('order_number', $data['order_number'])->select('*')->get()->toArray();
+        }
         $employee_key_list = Employee::pluck('emp_name', 'id')->toArray();
         $log_ids = [];
         $log_list = [];
@@ -124,9 +131,6 @@ class OperationLogService extends Service
 //                ]
 //            ]
 //        ];
-        
-        $array = [];
-        if (strpos($data['order_number'], '|') !== false)  $array = explode('|',$data['order_number']);
 
         //按钮类功能的操作日志
         $log_list2 = OrderOperation::where('del_time',0)