1

app/Http/Controllers/Api/SalesOrderController.php

@@ -62,7 +62,8 @@ class SalesOrderController extends BaseController
     public function salesOrderDetail(Request $request)
     {
         $service = new SalesOrderService();
-        list($status,$data) = $service->detail($request->all());
+        $userData = $request->userData->toArray();
+        list($status,$data) = $service->detail($request->all(),$userData);
 
         if($status){
             return $this->json_return(200,'',$data);

app/Service/ConstructionService.php

@@ -592,6 +592,7 @@ class ConstructionService extends Service
         if(empty($sale)) return [false,'合同不存在或已被删除'];
         $sale = $sale->toArray();
         if($sale['state'] < SalesOrder::State_two) return [false,'合同未通过确认，不允许新建施工单'];
+        if($sale['state'] >= SalesOrder::State_seven) return [false,'请确认合同状态，新建施工单失败'];
         if($sale['top_depart_id'] == $user['head']['id']){
             //总社的订单 需要派单 才能建施工
             if($sale['state'] < SalesOrder::State_four) return [false,'合同未门店派单，不允许新建施工单'];

app/Service/SalesOrderService.php

@@ -528,7 +528,7 @@ class SalesOrderService extends Service
      * @param $data
      * @return array
      */
-    public function detail($data){
+    public function detail($data,$user){
         if(empty($data['id']) && empty($data['order_number'])) return [false,'请选择数据！'];
 
         if(! empty($data['id'])){
@@ -544,6 +544,14 @@ class SalesOrderService extends Service
 
         if(empty($sales)) return [false,'合同不存在或已被删除'];
         $sales = $sales->toArray();
+        $is_add_construction = 0;
+        if($sales['top_depart_id'] == $user['head']['id']){
+            if($sales['state'] >= SalesOrder::State_four && $sales['state'] < SalesOrder::State_seven) $is_add_construction = 1;
+        }else{
+            if($sales['state'] >= SalesOrder::State_two && $sales['state'] < SalesOrder::State_seven) $is_add_construction = 1;
+        }
+        $sales['add_construction'] = $is_add_construction;
+
         $customer = Customer::where('id',$sales['customer_id'])->value('title');
         $sales['customer_title'] = $customer ?? '';
         $sales['sales_order_type_title'] = SalesOrder::$order_type[$sales['sales_order_type']] ?? '';
@@ -916,7 +924,7 @@ class SalesOrderService extends Service
             $order = SalesOrder::where('del_time',0)->where('id',$data['id'])->first();
             if(empty($order)) return [false,'合同不存在或已被删除'];
             $order = $order->toArray();
-            if($order['state'] != SalesOrder::State2_zero) return [false, '请确认合同状态，编辑失败'];
+            if(! in_array($order['state'], [SalesOrder::State_minus_one,SalesOrder::State_zero])) return [false, '请确认合同状态，编辑失败'];
 
 //            if($data['model_type'] == SalesOrder::Model_type_two){
 //                $boolean = SalesOrder::where('del_time',0)