1

app/Model/BasicType.php

@@ -36,7 +36,8 @@ class BasicType extends Model
         19 => '紧急程度',
         20 => '产品单位',
         21 => '跟进方式',
-        22 => '产品价格'
+        22 => '产品价格',
+        23 => '安装地点',
     ];
 
     public static $user = [];

app/Service/ConstructionService.php

@@ -39,7 +39,7 @@ class ConstructionService extends Service
             $model->customer_id = $data['customer_id'] ?? 0;
             $model->customer_contact_id = $data['customer_contact_id'] ?? 0;
             $model->install_method = $data['install_method'] ?? 0;
-            $model->install_position = $data['install_position'] ?? '';
+            $model->install_position = $data['install_position'] ?? 0;
             $model->sales_order_id = $data['sales_order_id'] ?? 0;
             $model->construction_fee = $data['construction_fee'] ?? 0;
             $model->service_price = $data['service_price'] ?? 0;
@@ -140,7 +140,7 @@ class ConstructionService extends Service
             $model->customer_id = $data['customer_id'] ?? 0;
             $model->customer_contact_id = $data['customer_contact_id'] ?? 0;
             $model->install_method = $data['install_method'] ?? 0;
-            $model->install_position = $data['install_position'] ?? '';
+            $model->install_position = $data['install_position'] ?? 0;
             $model->sales_order_id = $data['sales_order_id'] ?? 0;
             $model->construction_fee = $data['construction_fee'] ?? 0;
             $model->service_price = $data['service_price'] ?? 0;
@@ -288,6 +288,7 @@ class ConstructionService extends Service
         $construction['employee_one'] = $construction['construction_contact'] = $construction['product'] = [];
         $array = [
             $construction['install_method'],
+            $construction['install_position'],
             $construction['urgency'],
         ];
         $basic_map = BasicType::whereIn('id',$array)
@@ -296,6 +297,7 @@ class ConstructionService extends Service
         $construction = [$construction];
         foreach ($construction as $key => $value){
             $construction[$key]['install_method_title'] = $basic_map[$value['install_method']] ?? '';
+            $construction[$key]['install_position_title'] = $basic_map[$value['install_position']] ?? '';
             $construction[$key]['urgency_title'] = $basic_map[$value['urgency']] ?? '';
         }
         $construction = $construction[0];

app/Service/PurchaseOrderService.php

@@ -223,7 +223,7 @@ class PurchaseOrderService extends Service
         $order['crt_name'] = $emp_map[$order['crt_id']] ?? '';
         $order['crt_time'] = $order['crt_time'] ? date("Y-m-d H:i:s",$order['crt_time']): '';
         //可见范围
-        $return = (new RangeService())->RangeDetail($order['id'],SeeRange::type_three);
+        $return = (new RangeService())->RangeDetail($order['id'],SeeRange::type_five);
         $order['depart'] = $return[0] ?? [];
         $order['employee'] = $return[1] ?? [];
 

app/Service/RangeService.php

@@ -29,6 +29,7 @@ class RangeService extends Service
             foreach ($data['depart'] as $value){
                 $insert[] = [
                     'data_id' => $data['data_id'],
+                    'data_type' => $data['data_type'],
                     'param_id' => $value,
                     'type' => SeeRange::data_one,
                     'crt_time' => $time,
@@ -42,6 +43,7 @@ class RangeService extends Service
             foreach ($data['employee'] as $value){
                 $insert[] = [
                     'data_id' => $data['data_id'],
+                    'data_type' => $data['data_type'],
                     'param_id' => $value,
                     'type' => SeeRange::data_two,
                     'crt_time' => $time,
@@ -79,7 +81,7 @@ class RangeService extends Service
             if ($value['type'] == SeeRange::data_one){
                 $tmp = [
                     'id' => $value['param_id'],
-                    'name' => $depart_map[$value['param_id']],
+                    'name' => $depart_map[$value['param_id']] ?? "",
                 ];
                 $depart[] = $tmp;
             }elseif ($value['type'] == SeeRange::data_two){
@@ -108,7 +110,7 @@ class RangeService extends Service
         $type2 = [SeeRange::data_one,SeeRange::data_three];
         $type2 = implode(',',$type2);
         $depart_str = implode(',',$depart_id);
-        $str = "(param_id = $user_id AND type = $type) OR (data_id IN({$depart_str}) AND type IN ({$type2}))";
+        $str = "(param_id = $user_id AND type = $type) OR (param_id IN({$depart_str}) AND type IN ({$type2}))";
 
         // 可见部门 可见人 可以看见
         $data_id = SeeRange::where('del_time',0)

app/Service/SalesOrderService.php

@@ -347,7 +347,7 @@ class SalesOrderService extends Service
         if(empty($sales)) return [false,'合同不存在或已被删除'];
         $sales = $sales->toArray();
         $customer = Customer::where('id',$sales['customer_id'])->value('title');
-        $sales['customer_title'] = $customer;
+        $sales['customer_title'] = $customer ?? '';
         $sales['sales_order_type_title'] = SalesOrder::$order_type[$sales['sales_order_type']] ?? '';
         $sales['activity_product'] = $sales['file'] = $sales['employee_one'] = $sales['employee_two'] = $sales['employee_three'] = $sales['product'] = $sales['dispatch_depart_one'] = $sales['dispatch_employee'] = $sales['dispatch_depart_two'] = [];
         $array = [
@@ -647,6 +647,10 @@ class SalesOrderService extends Service
             $data['data'][$key]['send_state_title'] = $basic_map[$value['send_state']] ?? '';
             $data['data'][$key]['logistics_company_title'] = $basic_map[$value['logistics_company']] ?? '';
             $data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';
+            $data['data'][$key]['sign_time'] = $value['sign_time'] ? date('Y-m-d H:i:s',$value['sign_time']) : '';
+            $data['data'][$key]['construction_time'] = $value['construction_time'] ? date('Y-m-d H:i:s',$value['construction_time']) : '';
+            $data['data'][$key]['handover_time'] = $value['handover_time'] ? date('Y-m-d H:i:s',$value['handover_time']) : '';
+            $data['data'][$key]['expire_time'] = $value['expire_time'] ? date('Y-m-d H:i:s',$value['expire_time']) : '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];

routes/api.php

@@ -196,5 +196,5 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     //设置开关
     $route->any('productInventorySet', 'Api\ProductInventoryController@productInventorySet');
     //可见范围
-    $route->any('seeRange', 'Api\RangeseeRangeController@seeRange');
+    $route->any('seeRange', 'Api\RangeController@seeRange');
 });