入库预约 页面BUG修复

resources/views/store/deliveryAppointment/exhibition.blade.php

@@ -121,7 +121,7 @@
             </div>
             <div class="w-100 h-90">
                 <div class="h-9 mt-1 row" v-for="(data,i) in list" :class="data.status==1 ? 'text-primary' : (data.status==2 ? 'text-success' : 'text-dark')" v-if="i<5">
-                    <div class="col-3 text-line">@{{ data.license_plate_number }}
+                    <div class="col-3 text-line">@{{ data.license_plate_number ? data.license_plate_number : '*******' }}
                         <span class="badge" :class="data.status==1 ? 'badge-primary' : (data.status==2 ? 'badge-success' : 'badge-secondary')" style="font-size: 20px" v-if="data.tonne || data.cubic_meter">
                             <span v-if="data.tonne">吨&nbsp;&nbsp;&nbsp;：@{{ data.tonne }}<br></span>
                             <span v-if="data.cubic_meter">立方：@{{ data.cubic_meter }}</span>
@@ -137,7 +137,7 @@
                 <div class="row h-50">
                     <div class="col-5">
                         <div class="row" style="height: 20%" v-for="(data,i) in list" :class="data.status==1 ? 'text-primary' : (data.status==2 ? 'text-success' : 'text-dark')" v-if="i>5">
-                            <div class="col-8 text-line">@{{ data.license_plate_number }}
+                            <div class="col-8 text-line">@{{ data.license_plate_number ? data.license_plate_number : '*******' }}
                                 <span class="badge" :class="data.status==1 ? 'badge-primary' : (data.status==2 ? 'badge-success' : 'badge-secondary')" style="font-size: 20px" v-if="data.tonne || data.cubic_meter">
                                     <span v-if="data.tonne">吨&nbsp;&nbsp;&nbsp;：@{{ data.tonne }}<br></span>
                                     <span v-if="data.cubic_meter">立方：@{{ data.cubic_meter }}</span>
@@ -150,7 +150,7 @@
                     <div class="col-7" style="border: 3px solid #6c757d;border-radius: 5px">
                         <div class="w-100 text-center h1 font-weight-bold">次日预约</div>
                         <div class="mt-2 text-muted row" v-for="(data,i) in nextList">
-                            <div class="col-5">@{{ data.license_plate_number }}
+                            <div class="col-5">@{{ data.license_plate_number ? data.license_plate_number : '*******' }}
                                 <span class="badge badge-secondary" style="font-size: 14px" v-if="data.tonne || data.cubic_meter">
                                     <span v-if="data.tonne">吨&nbsp;&nbsp;&nbsp;：@{{ data.tonne }}<br></span>
                                     <span v-if="data.cubic_meter">立方：@{{ data.cubic_meter }}</span>
@@ -160,6 +160,9 @@
                             <div class="col-3">@{{ data.driver_name }}</div>
                             <div class="col-3">@{{ data.driver_phone }}</div>
                         </div>
+                        <div class="media h-100" v-if="nextList.length==0">
+                            <div class="align-self-center mx-auto text-secondary font-weight-bold h1" style="transform:scale(1.6) ">暂无</div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -236,6 +239,7 @@
     function selectedWarehouse() {
         if (!selected) return;
         warehouse = document.getElementById(selected).dataset.id;
+        vue._initData();
         history.pushState(null,null,window.location.href+"?warehouse="+warehouse);
         $("#modal").modal('hide');
         alert("是否需要开启全屏?");
@@ -261,7 +265,7 @@
             element.msRequestFullscreen();
         }
     }
-    new Vue({
+    let vue = new Vue({
         el:"#container",
         data:{
             list:[],
@@ -278,7 +282,7 @@
         },
         mounted(){
             $("#container").removeClass("d-none");
-            this._initData();
+            if (warehouse) this._initData();
             //this._broadcast();
             /*this._getKey();
             setTimeout(()=>{

resources/views/store/deliveryAppointment/list.blade.php

@@ -56,7 +56,7 @@
                     <div class="row">
                         <div class="col-12 text-center">明细单</div>
                     </div>
-                    <div class="row" style="min-width: 300px">
+                    <div class="row" style="min-width: 500px">
                         <div class="col-5 text-center">商品名称</div>
                         <div class="col-4 text-center">条码</div>
                         <div class="col-2 text-center">数量</div>
@@ -140,14 +140,14 @@
                 <td>
                     <div v-if="info.details.length>0">
                         <div class="row">
-                            <div class="col-5 font-weight-bold">@{{ info.details[0].commodity_id ? (info.details[0].commodity ? info.details[0].commodity.name : '') : info.details[0].name }}</div>
-                            <div class="col-4 text-secondary">@{{ info.details[0] | getCommodity }}</div>
+                            <div class="col-5 font-weight-bold text-overflow-warp">@{{ info.details[0].commodity_id ? (info.details[0].commodity ? info.details[0].commodity.name : '') : info.details[0].name }}</div>
+                            <div class="col-4 text-secondary text-overflow-warp">@{{ info.details[0] | getCommodity }}</div>
                             <div class="col-2 text-secondary">@{{ info.details[0].amount }}</div>
                         </div>
                         <div class="up" :id="'detail-'+info.id" v-show="info.details.length>1">
                             <div class="row" v-for="(detail,i) in info.details" v-if="i!==0">
-                                <div class="col-5 font-weight-bold">@{{ detail.commodity_id ? (detail.commodity ? detail.commodity.name : '') : detail.name }}</div>
-                                <div class="col-4 text-secondary">@{{ detail | getCommodity }}</div>
+                                <div class="col-5 font-weight-bold text-overflow-warp">@{{ detail.commodity_id ? (detail.commodity ? detail.commodity.name : '') : detail.name }}</div>
+                                <div class="col-4 text-secondary text-overflow-warp">@{{ detail | getCommodity }}</div>
                                 <div class="col-2 text-secondary">@{{ detail.amount }}</div>
                             </div>
                         </div>