提交

app/Http/Controllers/Api/BasicTypeController.php

@@ -72,7 +72,7 @@ class BasicTypeController extends BaseController
         }
     }
 
-    public function basicTypeAllUseAdd(Request $request)
+    public function basicTypeUseAdd(Request $request)
     {
         $service = new BasicTypeService();
         $userData = $request->userData->toArray();
@@ -85,7 +85,7 @@ class BasicTypeController extends BaseController
         }
     }
 
-    public function basicTypeAllUseEdit(Request $request)
+    public function basicTypeUseEdit(Request $request)
     {
         $service = new BasicTypeService();
         $userData = $request->userData->toArray();
@@ -98,7 +98,7 @@ class BasicTypeController extends BaseController
         }
     }
 
-    public function basicTypeAllUseDel(Request $request)
+    public function basicTypeUseDel(Request $request)
     {
         $service = new BasicTypeService();
         $userData = $request->userData->toArray();
@@ -111,11 +111,11 @@ class BasicTypeController extends BaseController
         }
     }
 
-    public function basicTypeAllUseList(Request $request)
+    public function basicTypeUseList(Request $request)
     {
         $service = new BasicTypeService();
         $userData = $request->userData->toArray();
-        list($status,$data) = $service->basicTypeList($request->all(),$userData);
+        list($status,$data) = $service->basicTypeAllUseList($request->all(),$userData);
 
         if($status){
             return $this->json_return(200,'',$data);

app/Model/FollowUpRecord.php

@@ -16,4 +16,13 @@ class FollowUpRecord extends Model
         self::type_one => '客户跟进记录',
         self::type_two => '合同跟进记录',
     ];
+
+    const follow_type_zero = 0;
+    const follow_type_one = 1;
+    const follow_type_two = 2;
+    public static $follow_type = [
+        self::follow_type_zero => '跟进中',
+        self::follow_type_one => '联系不上',
+        self::follow_type_two => '无意向',
+    ];
 }

app/Service/BasicTypeService.php

@@ -276,7 +276,7 @@ class BasicTypeService extends Service
     }
 
     public function basicTypeAllUseAdd($data,$user){
-        list($status,$msg) = $this->basicTypeRule($data, $user);
+        list($status,$msg) = $this->basicTypeAllUseRule($data, $user);
         if(!$status) return [$status,$msg];
 
         BasicTypeAllUse::insert($msg['data']);
@@ -361,8 +361,6 @@ class BasicTypeService extends Service
                     ->exists();
                 $data['data'][$key]['crt_time'] = time();
                 $data['data'][$key]['crt_id'] = $user['id'];
-                $data['data'][$key]['depart_id'] = $data['depart_id'];
-                $data['data'][$key]['top_depart_id'] = $data['top_depart_id'];
             }else{
                 if($this->isEmpty($data,'id')) return [false,'id不能为空！'];
                 $bool = BasicTypeAllUse::where('title',$value['title'])

app/Service/CheckService.php

@@ -1351,7 +1351,7 @@ class CheckService extends Service
             ->first();
         if(empty($model)) return [false, '合同不存在或已被删除'];
         //安装件
-        if($model->state <= SalesOrder::State_four || $model->state >= SalesOrder::State_seven) return [false, '请确认合同状态，操作失败'];
+        if($model->state < SalesOrder::State_four || $model->state >= SalesOrder::State_seven) return [false, '请确认合同状态，操作失败'];
 
         SalesOrder::where('del_time',0)->where('order_number',$data['order_number'])
             ->update(['state' => SalesOrder::State_seven]);

app/Service/FollowUpRecordService.php

@@ -78,6 +78,7 @@ class FollowUpRecordService extends Service
             $model->crt_id = $user['id'];
             $model->result = $data['result'] ?? '';
             $model->customer_contact = $data['customer_contact'] ?? '';
+            $model->follow_type = $data['follow_type'] ?? 0;
             $model->save();
 
             $time = time();
@@ -171,13 +172,14 @@ class FollowUpRecordService extends Service
 
     public function followUpRecordList($data,$user){
         $model = FollowUpRecord::where('del_time',0)
-            ->select('data_id','data_title','basic_type_id','visit_time','id','content','is_remind','crt_time','crt_id','type','result')
+            ->select('data_id','data_title','basic_type_id','visit_time','id','content','is_remind','crt_time','crt_id','type','result','follow_type')
             ->orderBy('id','desc');
 
         if(! empty($data['data_id'])) $model->where('data_id',$data['data_id']);
         if(! empty($data['basic_type_id'])) $model->where('basic_type_id', $data['basic_type_id']);
         if(! empty($data['crt_id'])) $model->where('crt_id',$data['crt_id']);
         if(! empty($data['type'])) $model->where('type',$data['type']);
+        if(! empty($data['follow_type'])) $model->where('follow_type',$data['follow_type']);
 
         $list = $this->limit($model,'',$data);
         $list = $this->organizationData($list);
@@ -203,6 +205,7 @@ class FollowUpRecordService extends Service
             if(in_array($value['id'], $follow_up_record_id)) $has_image = 1;
             $data['data'][$key]['has_image'] = $has_image;
             $data['data'][$key]['basic_type_name'] = $basic_type[$value['basic_type_id']] ?? '';
+            $data['data'][$key]['follow_type_title'] = FollowUpRecord::$follow_type[$value['follow_type']] ?? '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']): '';
         }
         return $data;