Merge branch 'waybill_ZD'

# Conflicts:
#	resources/views/weight/package/statistics.blade.php

resources/views/weight/package/statistics.blade.php

@@ -98,11 +98,12 @@
                                         </tr>
                                     </table>
                                     <span class="text-muted"
-                                          style="position: absolute; bottom: 10px;left:calc(50% - 165px);transform: scale(0.65)">
-                                            时间区间：2020-03-20 13:43 - 2020-03-20 13:43</span>
+                                          style="position: absolute; bottom: 10px;left:calc(50% - 165px);transform: scale(0.65)" v-if="filterData.date_start">
+                                        时间区间：@{{ filterData.date_start }}&nbsp;@{{ inputtingAdd_start }} <b v-if="filterData.date_end">-</b> @{{ filterData.date_end }}&nbsp;@{{ inputtingAdd_end }}</span>
 
                                     <div class=" align-items-center d-flex pt-2">
                                         <div class="m-auto d-flex">
+                                            <button class="btn btn-primary btn-sm pl-5 pr-5">提交</button>
                                         </div>
                                     </div>
                                 </td>
@@ -181,7 +182,7 @@
                     @endforeach
                 },
                 logisticsAll:[
-                        @foreach($logistics as $logistic)
+                    @foreach($logistics as $logistic)
                     {id:'{{$logistic->id}}', name: '{{$logistic->name}}',style:false},
                     @endforeach
                 ],
@@ -304,7 +305,7 @@
                                         return  true;
                                     });
                                 }
-                                    {{--URL有参数且有logistic字段 --}}
+                                {{--URL有参数且有logistic字段 --}}
                                 let logistics=data.selectedLogistics;
                                 if (logistics.length>0){
                                     for (let i=0;i<logistics.length;i++){
@@ -487,8 +488,9 @@
                         e.target.value=e.target.value.replace(/^([\d]{1})([\d]{2})([\S\s]{1,99})/,"$1$2:$3");
                         e.target.value=e.target.value.replace(/^([\d]{1}):([\d]{2})([\S\s]{1,99})/,"$1:$2");
                         e.target.value=e.target.value.replace(/^([\d])/,"$1");
+                        e.target.value=e.target.value.replace(/^([1])([\d]{1})/,"$1$2");
                         e.target.value=e.target.value.replace(/^([3-9])([\d]{1})/,"2$2");
-                        e.target.value=e.target.value.replace(/^([\d]{1})([4-9]{1})/,"$13");
+                        e.target.value=e.target.value.replace(/^([2-9]{1})([4-9]{1})/,"$13");
                         e.target.value=e.target.value.replace(/^([\d]{1})([\d]{1}):([6-9]{1})/,"$1$2:5");
                     },1);
                 },