交车单修改

app/Service/ConstructionService.php

@@ -438,16 +438,20 @@ class ConstructionService extends Service
         $emp = Employee::whereIn('id',array_unique(array_column($sales_info,'data_id')))
             ->pluck('emp_name','id')
             ->toArray();
-        $sale_man = [];
+        $sale_man = $sale_man_tmp = [];
         foreach ($sales_info as $value){
-            $tt = $emp[$value['data_id']] ?? '';
-            $tmp = [
-                'id' => $value['data_id'],
-                'name' => $tt?? '',
-            ];
-            $sale_man[] = $tmp;
+            if(! in_array($value['data_id'], $sale_man_tmp)){
+                $tt = $emp[$value['data_id']] ?? '';
+                $tmp = [
+                    'id' => $value['data_id'],
+                    'name' => $tt?? '',
+                ];
+                $sale_man[] = $tmp;
+                $sale_man_tmp[] = $value['data_id'];
+            }
         }
         $construction['sale_man'] = $sale_man;
+        unset($sale_man_tmp);
 
         $customer_title = Customer::where('id',$construction['customer_id'])->value('title');
         $construction['customer_title'] = $customer_title ?? "";
@@ -1077,9 +1081,8 @@ class ConstructionService extends Service
         list($model, $new, $old) = $msg;
 
         try {
-            if(isset($data['is_submit'])) $model->state = 1;
-
             if(! isset($data['is_edit']) || $data['is_edit']) {
+                if(isset($data['is_submit'])) $model->state = 1;
                 $model->upd_id = $user['id'];
                 $model->construction_order_number = $data['construction_order_number'] ?? '';
                 $model->sales_order_number = $data['sales_order_number'] ?? '';
@@ -1139,6 +1142,11 @@ class ConstructionService extends Service
                     }
                 }
                 if(! empty($insert)) DeliveryNoteDetail::insert($insert);
+            }else{
+                if(isset($data['is_submit'])){
+                    $model->state = 1;
+                    $model->save();
+                }
             }
 
         }catch (\Throwable $e){
@@ -1176,7 +1184,7 @@ class ConstructionService extends Service
             $model = DeliveryNote::where('id',$data['id'])->first();
             if(empty($model) || $model->del_time > 0) return [false,'交车单不存在或已被删除！'];
             if($is_submit){
-                if(! $model->img3) return [false, '保存并交车时，必须客户确认签字！'];
+                if(! $model->img3 && ! $data['img3']) return [false, '保存并交车时，必须客户确认签字！'];
             }else{
                 if($model->img3) return [false,'客户已确认签字，保存失败！'];
             }