修改

app/Service/FollowUpRecordService.php

@@ -289,13 +289,12 @@ class FollowUpRecordService extends Service
         $visit_time = $this->changeDateToDateMin($time);
 
         $follow_up_record = FollowUpRecord::where('del_time',0)
-            ->where('visit_time',$visit_time)
+            ->where('visit_time','>=',$visit_time)
             ->where('type',$type)
-            ->whereRaw("data_id not in (select data_id from follow_up_record where visit_time > $visit_time and del_time = 0)")
             ->select('data_id')
             ->get()->toArray();
 
-        return array_values(array_column($follow_up_record,'data_id'));
+        return array_unique(array_column($follow_up_record,'data_id'));
     }
 
     public function getVisitDataOfTime($data_id = [], $type = 0){

app/Service/SalesOrderService.php

@@ -821,7 +821,7 @@ class SalesOrderService extends Service
                 $model->where('top_depart_id', $depart_id);
             }
         }
-
+        if(! empty($data['customer_contact'])) $model->where('customer_contact','LIKE', '%'.$data['customer_contact'].'%');
         if(! empty($data['order_number'])) $model->where('order_number','LIKE', '%'.$data['order_number'].'%');
         if(! empty($data['sales_order_type'])) $model->where('sales_order_type',$data['sales_order_type']);
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');

config/header/37.php

@@ -118,8 +118,8 @@ return [
         'key' => 'belong_top_depart_title',
         'value' => '所属门店',
     ],
-//    [
-//        'key' => 'pay_way_title',
-//        'value' => '付款方式',
-//    ],
+    [
+        'key' => 'mark',
+        'value' => '备注',
+    ],
 ];

config/header/43.php

@@ -114,10 +114,10 @@ return [
         'key' => 'dispatch_time_second_time',
         'value' => '派单时间',
     ],
-//    [
-//        'key' => 'pay_way_title',
-//        'value' => '付款方式',
-//    ],
+    [
+        'key' => 'mark',
+        'value' => '备注',
+    ],
     [
         'key' => 'u8_message',
         'value' => '同步用友',