修改

app/Model/Customer.php

@@ -23,4 +23,5 @@ class Customer extends UseScopeBaseModel
     public static $search = [];
     public static $limitKey = "customerPondState";
     const range_function = 'customerRange';
+    public static $order_number = "customerTravelOrderNumber";
 }

app/Model/OrderOperation.php

@@ -36,6 +36,8 @@ class OrderOperation extends Model
     const twenty = 20;
     const twenty_one = 21;
     const twenty_two = 22;
+    const twenty_three = 23;
+    const twenty_four = 24;
 
     public static $type = [
         self::zero => '系统设置变更 ',
@@ -61,5 +63,7 @@ class OrderOperation extends Model
         self::twenty => '采购确认弃审',
         self::twenty_one => '收付款单审核',
         self::twenty_two => '收付款单弃审',
+        self::twenty_three => '客户分配',
+        self::twenty_four => '客户移交',
     ];
 }

app/Service/CustomerService.php

@@ -27,6 +27,10 @@ class CustomerService extends Service
         list($status,$msg) = $this->customerRule($data,$user, false);
         if(!$status) return [$status,$msg];
 
+        $data['order_number'] = Customer::$order_number . "|" . $data['id'] . "|" . $data['title'];
+        $params = $this->getDataFile($data);
+        (new OperationLogService())->setOperationList($params,$user,2);
+
         try {
             DB::beginTransaction();
 
@@ -306,6 +310,9 @@ class CustomerService extends Service
             return [false,$exception->getMessage()];
         }
 
+        $data['order_number'] = Customer::$order_number . "|" . $model->id . "|" . $data['title'];
+        (new OperationLogService())->setOperationList($data,$user);
+
         return [true,''];
     }
 
@@ -739,6 +746,7 @@ class CustomerService extends Service
             $record_tmp = $record_array[$value['id']] ?? "";
             $data['data'][$key]['has_record'] = $record_tmp ? "查看" : "无记录";
             $data['data'][$key]['follow_record'] = $record_array[$value['id']] ?? "";
+            $data['data'][$key]['order_number'] = Customer::$order_number . "|" . $value['id'] . "|" . $value['title'];
         }
 
         return $data;
@@ -828,7 +836,7 @@ class CustomerService extends Service
         $model = BasicType::TopClear($user,$data);
         $result = $model->where('del_time',0)
             ->where('type', 2)
-            ->where('title', 'LIKE', '%'.$data['title'].'%')
+            ->where('title', 'LIKE', '%'.$data['customer_from'].'%')
             ->select('id')
             ->get()->toArray();
 

app/Service/DeleteService.php

@@ -142,13 +142,12 @@ class DeleteService extends Service
             }
             CustomerInfo::insert($insert);
 
-//            $order = Customer::where('id',$data['id'])->first();
-//            $order = $order->toArray();
-//            (new OrderOperationService())->add([
-//                'order_number' => $order['order_number'],
-//                'msg' => OrderOperation::$type[OrderOperation::eighteen] ?? "",
-//                'type' => OrderOperation::eighteen
-//            ],$user);
+            $title = Customer::where('id',$data['id'])->value('title') ?? "";
+            (new OrderOperationService())->add([
+                'order_number' => Customer::$order_number . "|" . $data['id'] . "|" . $title,
+                'msg' => OrderOperation::$type[OrderOperation::twenty_three] ?? "",
+                'type' => OrderOperation::twenty_three
+            ],$user);
         }
     }
 
@@ -221,13 +220,12 @@ class DeleteService extends Service
             }
             CustomerInfo::insert($insert);
 
-//            $order = Customer::where('id',$data['id'])->first();
-//            $order = $order->toArray();
-//            (new OrderOperationService())->add([
-//                'order_number' => $order['order_number'],
-//                'msg' => OrderOperation::$type[OrderOperation::nineteen] ?? "",
-//                'type' => OrderOperation::nineteen
-//            ],$user);
+            $title = Customer::where('id',$data['id'])->value('title') ?? "";
+            (new OrderOperationService())->add([
+                'order_number' => Customer::$order_number . "|" . $data['id'] . "|" . $title,
+                'msg' => OrderOperation::$type[OrderOperation::twenty_four] ?? "",
+                'type' => OrderOperation::twenty_four
+            ],$user);
         }
     }
 

app/Service/OperationLogService.php

@@ -4,6 +4,7 @@ namespace App\Service;
 
 
 use App\Model\BasicType;
+use App\Model\Customer;
 use App\Model\Employee;
 use App\Model\FollowUpRecord;
 use App\Model\FollowUpRecordFile;
@@ -123,6 +124,9 @@ class OperationLogService extends Service
 //                ]
 //            ]
 //        ];
+        
+        $array = [];
+        if (strpos($data['order_number'], '|') !== false)  $array = explode('|',$data['order_number']);
 
         //按钮类功能的操作日志
         $log_list2 = OrderOperation::where('del_time',0)
@@ -133,15 +137,28 @@ class OperationLogService extends Service
             $log_list2[$key]['type'] = 4; //操作类
             $log_list2[$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s', $value['crt_time']) : "";
             $log_list2[$key]['user_name'] = $employee_key_list[$value['user_id']] ?? "";
+            if(! empty($array[2])) $log_list2[$key]['order_number'] = $array[2];
         }
 
         $list_final = array_merge($log_list, $log_list2);
 
         //跟进日志
-        $log_list3 = FollowUpRecord::where('del_time',0)
-            ->where('data_title',$data['order_number'])
-            ->select('id','data_title as order_number','basic_type_id','visit_time','content','crt_id as user_id','result','crt_time')
-            ->get()->toArray();
+        $log_list3 = [];
+        if(! empty($array[0]) && ! empty($array[1])){
+            if($array[0] == Customer::$order_number){
+                $log_list3 = FollowUpRecord::where('del_time',0)
+                    ->where('type', FollowUpRecord::type_one)
+                    ->where('data_id',$array[1])
+                    ->select('id','data_title as order_number','basic_type_id','visit_time','content','crt_id as user_id','result','crt_time')
+                    ->get()->toArray();
+            }
+        }else{
+            $log_list3 = FollowUpRecord::where('del_time',0)
+                ->where('data_title',$data['order_number'])
+                ->select('id','data_title as order_number','basic_type_id','visit_time','content','crt_id as user_id','result','crt_time')
+                ->get()->toArray();
+        }
+
         $basic_type_map = BasicType::whereIn('id',array_unique(array_column($log_list3,'basic_type_id')))->pluck('title','id')->toArray();
         $log_list3_detail = FollowUpRecordFile::where('del_time',0)
             ->whereIn('follow_up_record_id',array_column($log_list3,'id'))
@@ -170,9 +187,6 @@ class OperationLogService extends Service
         return [true, $list_final];
     }
 
-//    public function
-
-
     public function setOperationList($data, $user, $type = 1, $menu_id = 18)
     {
 

config/morequery.php

@@ -2,6 +2,8 @@
 
 return [
     "api/customerList" => 16,
+    "api/customerAdd" => 16,
+    "api/customerEdit" => 16,
     "api/paymentReceiptList" => 48,
     "api/salesOrderList" => [
         'key' => 'order_list',