ajun 4 лет назад
Родитель
Сommit
6a98122205

+ 1 - 1
app/Services/OrderPackageCommoditySerialNumberService.php

@@ -158,7 +158,7 @@ class OrderPackageCommoditySerialNumberService
         $created_At = Carbon::now()->format(Carbon::DEFAULT_TO_STRING_FORMAT);
         return [
             'order_package_commodity_id' => $orderPackageCommodity['id'],
-            'serial_number' => $oracleDocOrderSubSerialNo['subserialno'],
+            'serial_number' => $oracleDocOrderSubSerialNo['serialno'] . '/' . $oracleDocOrderSubSerialNo['subserialno'],
             'created_at' => $created_At,
             'updated_at' => $created_At
         ];

+ 3 - 1
resources/views/order/tracking/index.blade.php

@@ -208,7 +208,9 @@
                             <template v-if="trackOrder.commodities['serial_numbers'].length > 0">
                                     <template v-for="serialNumber in trackOrder.commodities['serial_numbers']">
                                         <transition name="fade">
-                                        <p v-show="trackOrder.displayed || trackOrder.commodities['serial_numbers'].length === 1">@{{ serialNumber.serial_number }}</p>
+                                        <p v-show="trackOrder.displayed || trackOrder.commodities['serial_numbers'].length === 1">
+                                            @{{ serialNumber.serial_number.indexOf("/") ? serialNumber.serial_number.split('/')[1] : serialNumber.serial_number }}
+                                        </p>
                                         </transition>
                                     </template>
                                 <p class="text-primary m-0 p-0" v-if="trackOrder.commodities.serial_numbers.length !== 1" @click="trackOrder.displayed = !trackOrder.displayed" style="cursor: pointer">@{{ trackOrder.displayed ? '点击隐藏' : '点击展开' }}</p>