tempTip样式优化

运输一些BUG修复

app/Http/Controllers/RejectedBillController.php

@@ -162,6 +162,7 @@ class RejectedBillController extends Controller
         }
         $mobileDigits = '';
         if($data['mobile_sender']&&$data['mobile_sender'][0]=='1'){
+            $data['mobile_sender'] = str_replace('*','0',$data['mobile_sender']);
             $mobileDigits = 'digits:11';
         }
         return Validator::make($data, [
@@ -175,7 +176,7 @@ class RejectedBillController extends Controller
             'fee_collected' => ['nullable','between:0,99999','numeric'],
             'is_loaded' => ['nullable'],
         ],[
-            'mobile_sender.digits'=>'如果是手机则必须为11位',
+            'mobile_sender.digits'=>'如果是手机则必须为11位且不可包含非法符号',
         ],[
             'id_owner'=>'客户名称',
             'order_number'=>'订单号',

app/Http/Controllers/TestController.php

@@ -66,6 +66,7 @@ use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Facades\Validator;
 use PhpOffice\PhpSpreadsheet\Calculation\Web\Service;
 
 class TestController extends Controller
@@ -87,7 +88,8 @@ class TestController extends Controller
     public function test4()
     {
 
-        dd(base64_encode("123456"),base64_decode("MTIzNDU2"));
+        $a = '185****1058';
+        dd(str_replace('*','0',$a));
     }
 
     public function OwnerStoreFeeReportService_recordReport()

resources/js/utilities/tempTip.js

@@ -14,7 +14,7 @@ const tempTip={
     },
     showSuccess:function(text){
         let tiper=$("<div class='row' style='color:white;opacity:0.9;position: fixed;top:40%;transform:translateY(-50%);z-index:"+this.index+";width:100%;'>" +
-            "<div class='col-8 offset-2'><div class='card'><div class='card-body h4 bg-success text-center'>" +
+            "<div class='col-8 offset-2'><div class='card'><div class='card-body h4 bg-success text-center h-100 m-0'>" +
             text +
             "</div></div></div></div>");
         tiper.animate({opacity:'0'},this.fadingDuration,'swing',function () {
@@ -24,7 +24,7 @@ const tempTip={
     },
     show:function(text){
         let tiper=$("<div class='row' style='color:white;opacity:0.9;top:40%;position: fixed;transform:translateY(-50%);width:100%;z-index:"+this.index+";'>" +
-            "<div class='col-8 offset-2'><div class='card'><div class='card-body h2 bg-danger text-center'>" +
+            "<div class='col-8 offset-2'><div class='card'><div class='card-body h2 bg-danger text-center h-100 m-0'>" +
             text +
             "</div></div></div></div>");
         tiper.animate({opacity:'0'},this.fadingDuration,'swing',function () {

resources/views/transport/waybill/index.blade.php

@@ -159,7 +159,7 @@
                         <input v-else type="number" class="form-control form-control-sm" @blur="addWaybillCharge($event)" onfocus="$(this).css('width','85px')" :value="waybill.charge" :data_id="waybill.id" >
                         <input type="number" class="form-control form-control-sm"  @blur="updateWaybillCharge($event)" :value="waybill.charge" :data_id="waybill.id" style="min-width:85px;display: none">
                         @else
-                        <td class="td-warm" ><span v-if="waybill.charge">@{{waybill.charge|money}}</span></td>
+                        <span v-if="waybill.charge">@{{waybill.charge|money}}</span>
                         @endcan
                     </td>
                     <td class="td-warm"><span>@{{waybill.other_charge}}</span></td>
@@ -883,6 +883,8 @@
                         {name:'dispatch_remark',value: '调度备注', class:"td-helpful"},
                             @can('运输管理-运单-删除'){name:'remove',value: '操作', neglect: true, class:"td-delete"},@endcan
                     ];
+                    let isOnTop = column[1].name === 'onTop';
+                    let couLen = (column[column.length-1].name==='remove' ? column.length : column.length+1)-((isOnTop ? 4 : 3)+15+17);
                     new Header({
                         el: "table",
                         name: "waybill",
@@ -891,11 +893,11 @@
                         restorationColumn: 'id',
                         fixedTop:($('#form_div').height())+2,
                         before : [
-                            {colspan:'4',value: '', class:"table-header-layer-1"},
+                            {colspan:isOnTop ? '4' : '3',value: '', class:"table-header-layer-1"},
                             {colspan:'15',value: '运单信息',font:"fa fa-file-text-o", class:"table-header-layer-1"},
                             {colspan:'17',value: '运输信息',font:"fa fa-truck", class:"table-header-layer-1"},
-                            {colspan:'5',value: '收费信息',font:"fa fa-rmb", class:"table-header-layer-1"},
-                                @can('运输管理-运单-删除'){colspan:'1',value: '',font:"", class:"table-header-layer-1"},@endcan
+                            {colspan:couLen,value: '收费信息',font:"fa fa-rmb", class:"table-header-layer-1"},
+                            @can('运输管理-运单-删除'){colspan:'1',value: '',font:"", class:"table-header-layer-1"},@endcan
                         ],
                     }).init();
                 },