|
|
@@ -35,7 +35,7 @@
|
|
|
</div>
|
|
|
|
|
|
|
|
|
- <div style="max-height: 90px; overflow-y: scroll;border: solid 1px #ddd;border-radius:5px;opacity:0.5;text-align: center;transform:scale(0.9)" v-if="ownersCopy.length>0">
|
|
|
+ <div style="max-height: 90px; overflow-y: scroll;border: solid 1px #ddd;border-radius:5px;text-align: center;transform:scale(0.9)" v-if="ownersCopy.length>0">
|
|
|
<ul class="list-group tooltipTarget" id="seek" onselectstart="return false;">
|
|
|
<li title="单击添加货主" v-for="ownerCopy in ownersCopy" :id="ownerCopy.name" class="list-group-item list-group-item-action pt-0 pb-0"
|
|
|
@click="selectedOwner(ownerCopy)" :class="ownerCopy.style ? 'active' :''"><span style="cursor: default;" :id="ownerCopy.name">@{{ ownerCopy.name }}</span></li>
|
|
|
@@ -54,7 +54,7 @@
|
|
|
title="输入关键词快速定位下拉列表">
|
|
|
</p>
|
|
|
</div>
|
|
|
- <div style="max-height: 90px;overflow-y: scroll;border: solid 1px #ddd;border-radius:5px;opacity:0.5;text-align: center;transform:scale(0.9)" v-if="logisticsAll.length>0">
|
|
|
+ <div style="max-height: 90px;overflow-y: scroll;border: solid 1px #ddd;border-radius:5px;text-align: center;transform:scale(0.9)" v-if="logisticsAll.length>0">
|
|
|
<ul class="list-group tooltipTarget" onselectstart="return false;">
|
|
|
<li title="单击添加物流公司" v-for="logistic in logisticsAll" class=" list-group-item list-group-item-action pt-0 pb-0"
|
|
|
@click="selectedLogistic(logistic)" :class="logistic.style ? 'active' :''" >
|
|
|
@@ -64,30 +64,45 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</td>
|
|
|
- <td >
|
|
|
+ <td style="position: relative">
|
|
|
+ <table class="table table-sm table-borderless">
|
|
|
+ <tr>
|
|
|
+ <td class="text-right" style="line-height: 60px">
|
|
|
+ 时间：
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <div class="form-inline">
|
|
|
+ <div class="form-group">
|
|
|
+ <input style="width: 170px;transform:scale(0.8)" type="date" v-model="filterData.date_start" class="form-control">
|
|
|
+ <input id="hour_input" type="text" class="form-control" placeholder="00:00"
|
|
|
+ @input="hourFilter($event)" v-model="inputtingAdd_start" style="transform:scale(0.8);width: 80px"
|
|
|
+ @keypress="hourFilter($event)" >
|
|
|
+ <input v-if="filterData.date_start" hidden name="date_start" :value="filterData.date_start+' '+inputtingAdd_start">
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="form-inline">
|
|
|
+ <div class="form-group">
|
|
|
+ <input style="transform:scale(0.8);width: 170px" type="date" v-model="filterData.date_end" class="form-control" >
|
|
|
+ <input id="hour_input" type="text" class="form-control" placeholder="00:00"
|
|
|
+ @input="hourFilter($event)" v-model="inputtingAdd_end" style="transform:scale(0.8);width:80px"
|
|
|
+ @keypress="hourFilter($event)" >
|
|
|
+ <input v-if="filterData.date_end" hidden name="date_end" :value="filterData.date_end+' '+inputtingAdd_end">
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td class="text-center" colspan="2">
|
|
|
+ <button class="btn btn-primary btn-sm pl-5 pr-5">提交</button>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ <span class="text-muted"
|
|
|
+ style="position: absolute; bottom: 10px;left:calc(50% - 165px);transform: scale(0.65)" v-if="filterData.date_start">
|
|
|
+ 时间区间：@{{ filterData.date_start }} @{{ inputtingAdd_start }} <b v-if="filterData.date_end">-</b> @{{ filterData.date_end }} @{{ inputtingAdd_end }}</span>
|
|
|
|
|
|
- <div style="height: 100px">
|
|
|
- <div class="form-inline ">
|
|
|
- <label >时间：</label>
|
|
|
- <div class="pl-1" style="width: 300px">
|
|
|
- <input style="width: 170px;transform:scale(0.8)" type="date" v-model="filterData.date_start" class="form-control">
|
|
|
- <input id="hour_input" type="text" class="form-control" placeholder="00:00"
|
|
|
- @input="hourFilter($event)" v-model="inputtingAdd_start" style="transform:scale(0.8);width: 80px"
|
|
|
- @keypress="hourFilter($event)" >
|
|
|
- </div>
|
|
|
- <input v-if="filterData.date_start" hidden name="date_start" :value="filterData.date_start+' '+inputtingAdd_start">
|
|
|
- </div>
|
|
|
- <div class="form-inline pl-5" style="width: 300px">
|
|
|
- <input style="transform:scale(0.8);width: 170px" type="date" v-model="filterData.date_end" class="form-control" >
|
|
|
- <input id="hour_input" type="text" class="form-control" placeholder="00:00"
|
|
|
- @input="hourFilter($event)" v-model="inputtingAdd_end" style="transform:scale(0.8);width:80px"
|
|
|
- @keypress="hourFilter($event)" >
|
|
|
- <input v-if="filterData.date_end" hidden name="date_end" :value="filterData.date_end+' '+inputtingAdd_end">
|
|
|
- </div>
|
|
|
- </div>
|
|
|
<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>
|
|
|
@@ -472,8 +487,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);
|
|
|
},
|
Zhouzhendong