修改

app/Service/ConstructionService.php

@@ -1074,14 +1074,37 @@ class ConstructionService extends Service
         $id = $user['id'];
         if(isset($data['id'])) {
             $model = DeliveryNote::where('id',$data['id'])->first();
+            if($model->del_time > 0) return [false,'交车单不存在或已被删除！'];
             if($model->img3) return [false,'客户已签字，无法编辑！'];
-            if(DeliveryNote::where('del_time',0)->where('construction_order_number',$data['construction_order_number'])->where('id','<>',$data['id'])->first()) return [false,'施工单客户确认单已存在！'];
-        }
+            $bool = DeliveryNote::where('del_time',0)
+                ->where('construction_order_number',$data['construction_order_number'])
+                ->where('id','<>',$data['id'])->first();
+            if($bool) return [false,'施工单已创建交车单！'];
+
+            $new = $old = [];
+            if($model->img2 != "" && $data['img2'] != $model->img2) {
+                $old[] = $model->img2;
+            }else{
+                if($data['img2'] != "") $new[] = $data['img2'];
+            }
+            if($model->img3 != "" && $data['img3'] != $model->img3) {
+                $old[] = $model->img3;
+            }else{
+                if($data['img3'] != "") $new[] = $data['img3'];
+            }
+        } else {
+            $bool = DeliveryNote::where('del_time',0)
+                ->where('construction_order_number',$data['construction_order_number'])
+                ->first();
+            if($bool) return [false,'施工单已创建交车单！'];
 
-        else {
             $model = new DeliveryNote();
             $model->crt_id = $id;
+            $new = [];
+            if($data['img2'] != "") $new[] = $data['img2'];
+            if($data['img3'] != "") $new[] = $data['img3'];
         }
+
         try {
             $model->upd_id = $id;
             $model->construction_order_number = $data['construction_order_number'] ?? '';
@@ -1113,7 +1136,7 @@ class ConstructionService extends Service
             return [false, $e->getMessage()];
         }
 
-        return [true,''];
+        return [true, ['file' => ['old' => $old ?? [], 'new' => $new]]];
     }
 
     public function deliveryNoteList($data)
@@ -1134,8 +1157,8 @@ class ConstructionService extends Service
         foreach ($data['data'] as $key => $value){
             $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]['sale_man_title'] = $this->returnMan2($value['sale_man']);
-            $data['data'][$key]['install_man_title'] = $this->returnMan2($value['install_man']);
+            $data['data'][$key]['sale_man_title'] = $this->returnMan2($value['sale_man'],$emp);
+            $data['data'][$key]['install_man_title'] = $this->returnMan2($value['install_man'],$emp);
         }
 
         return $data;
@@ -1167,7 +1190,7 @@ class ConstructionService extends Service
         return $emp;
     }
 
-    public function returnMan2($value){
+    public function returnMan2($value,$emp){
         $str_man = "";
         if(! empty($value)){
             $tmp = explode(',', $value);
@@ -1188,8 +1211,12 @@ class ConstructionService extends Service
         $detail = $model->toArray();
         $emp = $this->returnMan([$detail]);
 
-        $detail['sale_man_title'] = $emp[$detail['sale_man']] ?? "";
-        $detail['install_man_title'] = $emp[$detail['install_man']] ?? "";
+        $fileUploadService = new FileUploadService();
+        $detail['img2_url'] = $fileUploadService->getFileShow($detail['img2']);
+        $detail['img3_url'] = $fileUploadService->getFileShow($detail['img3']);
+
+        $detail['sale_man_title'] = $this->returnMan2($detail['sale_man'], $emp);
+        $detail['install_man_title'] = $this->returnMan2($detail['install_man'], $emp);
         $detail['crt_name'] = $emp[$detail['crt_id']] ?? "";
         $detail['crt_time'] = $detail['crt_time'] ? date('Y-m-d H:i:s',$detail['crt_time']) : '';
         $img_list = ConstructionFile::where('order_number',$detail['construction_order_number'])
@@ -1202,6 +1229,12 @@ class ConstructionService extends Service
 
     public function deliveryNoteDel($data,$user){
         if(empty($data['id'])) return [false, '请选择删除的交车单数据'];
+        $model = DeliveryNote::where('id', $data['id'])->first();
+        if($model->del_time > 0) return [false, '交车单不存在或已被删除！'];
+
+        $old = [];
+        if($model->img2 != "" ) $old[] = $model->img2;
+        if($model->img3 != "" ) $old[] = $model->img3;
 
         DeliveryNote::where('id',$data['id'])->update(
             [
@@ -1210,7 +1243,7 @@ class ConstructionService extends Service
             ]
         );
 
-        return [true,''];
+        return [true, ['file' => ['old' => $old]]];
     }
 
     public function constructionPdf($data, $user){