Merge branch 'master' of ssh://47.103.131.176:10022/var/git/bswas

app/Services/ReceivingTaskService.php

@@ -61,7 +61,7 @@ class ReceivingTaskService
             if ($receivingTask->id) {
                 $ans_number_string = $deliveryAppointmentCar->deliveryAppointment->asn_number ?? '';
                 $ans_numbers = array_filter(preg_split('/[,， ]+/is', $ans_number_string));
-                $ans_numbers = array_merge($ans_numbers, $params['asn_nos'] ?? []);
+                $ans_numbers = array_unique(array_merge($ans_numbers, $params['asn_nos'] ?? []));
                 $this->itemService->createItems($receivingTask, $ans_numbers);
                 $this->saveImage($receivingTask, $params['driving_license_image']);
             }

resources/views/order/workOrder/index.blade.php

@@ -869,11 +869,13 @@
                 },
                 groupImages(workOrder, type) {
                     let images = [];
+
                     workOrder.details.forEach(detail => {
                         let imageList = detail.images.map(item => {
                             item.issue_type_name = detail.issue_type ? detail.issue_type.name : '';
                             return item;
                         }).filter(item => {
+                            if (!item.upload_file) return false;
                             return item.type === type;
                         }).map(e => {
                             let {url, type} = e['upload_file'];