Skip to content

S
SuperMan
Commit 2e042297 authored by 黄奎's avatar 黄奎
Browse files
Options

用车统计调整

parent 05fd5d49
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 227 deletions
src/components/busManagement/BookAcar/components/JapanOrderList.vue
View file @ 2e042297
<style scoped>
.busStatisticsTalbe {
table-layout: fixed;
}
.busStatisticsTalbe thead tr th {
position: sticky;
top: 0;
z-index: 10;
}
</style>
<template>
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
<tr>
<th class="w100" rowspan="2" v-if="pagesTitle=='日本车行运行统计表'">车公司</th>
<th width="110" rowspan="2" v-if="pagesTitle=='日本车行运行统计表'">车牌号</th>
<th width="110" rowspan="2" v-if="pagesTitle=='日本车行运行统计表'">司机</th>
<th width="150" rowspan="2" v-if="pagesTitle=='日本车行运行统计表'">车型</th>
<th width="150" rowspan="2">使用单位</th>
<th width="100" colspan="3">用车性质</th>
<th width="100" colspan="2">用车时间</th>
<template v-if="OrderList&&OrderList.length>0">
<th width="100" rowspan="2" v-for="(outItem,outindex) in OrderList[0].OrderDayCalendar">{{outItem.UseDateStr}}</th>
</template>
</tr>
<tr>
<th width="100" >接机</th>
<th width="100" >送机</th>
<th width="100" >包机</th>
<th width="100" >出发预订</th>
<th width="100" >结束预订</th>
</tr>
<tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1">
<tr>
<td v-if="pagesTitle=='日本车行运行统计表'">
<div class="w100">{{outItem.SupplierName}}</div>
</td>
<td v-if="pagesTitle=='日本车行运行统计表'">
<div class="w80">
{{outItem.CarNo}}
</div>
</td>
<td v-if="pagesTitle=='日本车行运行统计表'">
<div class="w80">
{{outItem.DriverName}} {{outItem.CopilotDriverName}}
</div>
</td>
<td v-if="pagesTitle=='日本车行运行统计表'">
<div class="w120">
{{outItem.CarName}}
</div>
</td>
<td>
<div class="w120 ">
{{outItem.CustomerName}}
</div>
</td>
<td>
<div class="w80">{{outItem.AirportPickUpCount}}</div>
</td>
<td>
<div class="w80">{{outItem.SendingMachineCount}}</div>
</td>
<td>
<div class="w100">
{{outItem.UseDayCount}}
</div>
</td>
<td>
<div class="w80">{{outItem.UseDateStr}}</div>
</td>
<td>
<div class="w80">{{outItem.EndUseDateStr}}</div>
</td>
<td v-for="(x,ww) in outItem.OrderDayCalendar" >
<div class="w100" >
<div v-if="x.UseState>-1">
<el-tooltip class="item" effect="dark" :content="x.BusContent" placement="top">
<span>{{x.StartCity}}<span v-if="x.StartCity&&x.EndCity">--></span> <span > {{x.EndCity}} </span>
<span style="color: #4BCA81;" v-if="(x.UseState==1)">√</span>
<span style="color: #E95252;" v-else>O</span> </span>
</el-tooltip>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<template>
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
<tr>
<th width="100" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车公司</th>
<th width="110" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车牌号</th>
<th width="110" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">司机</th>
<th width="150" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车型</th>
<th width="150" rowspan="2">使用单位</th>
<th width="100" colspan="3">用车性质</th>
<th width="100" colspan="2">用车时间</th>
<th rowspan="2" :colspan="ColsCount">用车详情 </th>
</tr>
<tr>
<th width="100">接机</th>
<th width="100">送机</th>
<th width="100">包机</th>
<th width="100">出发预订</th>
<th width="100">结束预订</th>
</tr>
<tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1" :key="outindex">
<tr>
<td v-if="pagesTitle=='印象车行-运行统计表'">
{{outItem.SupplierName}}
</td>
<td v-if="pagesTitle=='印象车行-运行统计表'">
{{outItem.CarNo}}
</td>
<td v-if="pagesTitle=='印象车行-运行统计表'">
{{outItem.DriverName}} {{outItem.CopilotDriverName}}
</td>
<td v-if="pagesTitle=='印象车行-运行统计表'">
{{outItem.CarName}}
</td>
<td>
{{outItem.CustomerName}}
</td>
<td>
{{outItem.AirportPickUpCount}}
</td>
<td>
{{outItem.SendingMachineCount}}
</td>
<td>
{{outItem.UseDayCount}}
</td>
<td>
{{outItem.UseDateStr}}
</td>
<td>
{{outItem.EndUseDateStr}}
</td>
<td v-for="(item,index) in ColsCount" :key="index">
<div class="w135" v-if="(index+1)<=outItem.OrderDayCalendar.length">
<div v-if="outItem.OrderDayCalendar[index].UseState>-1">
<p>
{{outItem.OrderDayCalendar[index].UseDateStr}}
</p>
<el-tooltip class="item" effect="dark" :content="outItem.OrderDayCalendar[index].BusContent"
placement="top">
<span>{{outItem.OrderDayCalendar[index].StartCity}}
<template
v-if="outItem.OrderDayCalendar[index].StartCity&&outItem.OrderDayCalendar[index].EndCity">--></template>
{{outItem.OrderDayCalendar[index].EndCity}}
</span>
</el-tooltip>
<p>
<span style="color: #4BCA81;" v-if="(outItem.OrderDayCalendar[index].UseState==1)">√</span>
<span style="color: #E95252;" v-else>O</span>
</p>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</template>
<script>
export default {
props: ["OrderList", "pagesTitle",'loading'],
data() {
return {
};
},
watch: {
pagesTitle(val, oldval) {
},
OrderList: {
handler(val, oldVal) {},
<script>
export default {
props: ["OrderList", "pagesTitle", 'loading', 'ColsCount'],
data() {
return {};
},
},
methods: {
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 180 - 40;
if (h < 110) {
return;
}
//设置table的行高
// this.tableHeight = h;
watch: {
pagesTitle(val, oldval) {
},
OrderList: {
handler(val, oldVal) {},
},
},
success() {
this.close();
this.$emit("success");
methods: {
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 180 - 40;
if (h < 110) {
return;
}
//设置table的行高
// this.tableHeight = h;
},
success() {
this.close();
this.$emit("success");
},
},
},
mounted() {
this.userInfo = this.getLocalStorage();
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf("is_correlationOP") != -1) {
this.is_correlationOP = true;
}
//自适应高度调节
this.com_onresize();
window.onresize = () => {
mounted() {
//自适应高度调节
this.com_onresize();
};
},
};
window.onresize = () => {
this.com_onresize();
};
},
};
</script>
<style></style>
<style></style>
src/components/busManagement/JapanBusMonthFStatistics.vue
View file @ 2e042297
......@@ -65,7 +65,7 @@
IsFinish: "0",
TCNUM: ""
},
Title: '印象车行用车单统计',
Title: '印象车行-用车单统计',
queryCommonData: {
CustomerList: [],
},
......
src/components/busManagement/JapanBusMonthStatistics.vue
View file @ 2e042297
......@@ -5,9 +5,10 @@
<li>
<span>
<em>{{$t('fnc.khmingcheng')}}</em>
<el-select v-model="msg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-select v-model="msg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" clearable clear
@clear="resetPageIndex()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.CustomerName' :value='item.Id'
<el-option v-for="item in queryCommonData.CustomerList" :label='item.CustomerName' :value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
......@@ -16,41 +17,36 @@
<li>
<span>
<em>团号</em>
<el-input v-model='msg.TCNUM'></el-input>
<el-input v-model='msg.TCNUM' maxlength="40" @keyup.native.enter="resetPageIndex()" clear
@clear="resetPageIndex()" clearable></el-input>
</span>
</li>
<li><span><em>{{$t('pub.date')}}</em>
<el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" type="date" @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
-
<el-date-picker v-model='msg.UseETime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.UseETime' class='w135' value-format="yyyy-MM-dd" type="date" @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
</span>
</li>
<li><span><em>是否完结</em></span>
<li style="display:none;"><span><em>是否完结</em></span>
<el-select v-model='msg.IsFinish'>
<el-option label='全部' value='0' key='0'></el-option>
<el-option label='是' value='1' key='1'></el-option>
</el-select>
</li>
<!-- <li><span><em>状态</em></span>
<el-select v-model='msg.PriceStatus'>
<el-option label='正常' value='0' key='0'></el-option>
<el-option label='取消' value='1' key='1'></el-option>
</el-select>
</li> -->
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex()" />
</li>
</ul>
</div>
<div class="mt10 fz14 color333 busIconStyle">
车辆状态&nbsp;&nbsp;&nbsp;已确定:<span style="color:#4BCA81 ;">√</span>未确定:<span
style="color: #ff6600;">O</span>未分配:<span style="color:#E95252 ;">X</span>
车辆状态&nbsp;&nbsp;&nbsp;确定:<span style="color:#4BCA81 ;">√</span>暂定:<span style="color: #ff6600;">O</span>未操作:<span
style="color:#E95252 ;">X</span>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<OrderList :pagesTitle="Title" :OrderList="DataList" :loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
<OrderList :pagesTitle="Title" :OrderList="DataList" :ColsCount="ColsCount" :loading="loading"
@success="msg.pageIndex=1,GetList()">
</OrderList>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
......@@ -59,11 +55,10 @@
<script>
import OrderList from './BookAcar/components/JapanOrderList';
export default {
data() {
return {
userInfo: {}, //用户信息
loading: false,
currentPage: 1,
total: 0,
......@@ -76,34 +71,19 @@
IsFinish: "0",
TCNUM: ""
},
Title:'日本车行运行统计表',
Title: '印象车行-运行统计表',
queryCommonData: {
PlaceList: [],
LineList: [],
LineTeamList: [],
CustomerList: [],
},
thLengthTitle: [],
DataList: [],
colspanTotal: 0,
isCha: 0,
boxHeight: 0,
showHotelObj: {
showPrice: false, //是否显示价格
showPay: false, //是否显示支付方式
showZhan: false, //占房时间
showBtnList: false, //是否下载、确认按钮
ShowTaxType: false, //显示税入税别
ShowRebateRatio: false, //显示返佣比列
ShowSupplier: false, //是否显示供应商
showCaozuoTime: false, //操作时间
colspanLength: 6 //跨行
}
ColsCount: 1,//动态及时跨多少列
}
},
components: {OrderList
components: {
OrderList
},
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......@@ -111,33 +91,35 @@
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
this.getList();
},
getCustomerList(CustomerKeyWord){
this.apipost('JapanCar_get_GetJapanCarCustomerList', {keyWord:CustomerKeyWord}, res => {
getCustomerList(CustomerKeyWord) {
this.apipost('JapanCar_get_GetJapanCarCustomerList', {
keyWord: CustomerKeyWord
}, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.CustomerList = res.data.data;
} else {
this.Error(res.data.message);
}
}, err => {})
},
});
},
getList() {
this.loading = true
this.apipost('JapanCar_get_GetJapanOrderStatisticsPageList', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
this.ColsCount = res.data.data.MaxUseDay;
this.total = res.data.data.pmodel.count;
this.DataList = res.data.data.pmodel.pageData;
} else {
this.Error(res.data.message);
}
}, err => {})
});
},
},
mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -146,7 +128,7 @@
"-" +
myDate.getDate();
this.msg.UseSTime = nowDate;
this.msg.UseETime= myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 2) + "-" + myDate.getDate();
this.msg.UseETime = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 2) + "-" + myDate.getDate();
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
......
src/components/busManagement/JapanBusOrderMonthStatistics.vue
View file @ 2e042297
......@@ -5,9 +5,10 @@
<li>
<span>
<em>{{$t('fnc.khmingcheng')}}</em>
<el-select v-model="msg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-select v-model="msg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" clearable clear
@clear="resetPageIndex()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.CustomerName' :value='item.Id'
<el-option v-for="item in queryCommonData.CustomerList" :label='item.CustomerName' :value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
......@@ -16,54 +17,47 @@
<li>
<span>
<em>团号</em>
<el-input v-model='msg.TCNUM'></el-input>
<el-input v-model='msg.TCNUM' maxlength="40" @keyup.native.enter="resetPageIndex()" clear
@clear="resetPageIndex()" clearable></el-input>
</span>
</li>
<li><span><em>{{$t('pub.date')}}</em>
<el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" type="date"
@change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
-
<el-date-picker v-model='msg.UseETime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.UseETime' class='w135' value-format="yyyy-MM-dd" type="date"
@change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
</span>
</li>
<li><span><em>是否完结</em></span>
<li style="display:none;"><span><em>是否完结</em></span>
<el-select v-model='msg.IsFinish'>
<el-option label='全部' value='0' key='0'></el-option>
<el-option label='是' value='1' key='1'></el-option>
</el-select>
</li>
<!-- <li><span><em>状态</em></span>
<el-select v-model='msg.PriceStatus'>
<el-option label='正常' value='0' key='0'></el-option>
<el-option label='取消' value='1' key='1'></el-option>
</el-select>
</li> -->
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex()" />
</li>
</ul>
</div>
<div class="mt10 fz14 color333 busIconStyle">
车辆状态&nbsp;&nbsp;&nbsp;已确定:<span style="color:#4BCA81 ;">√</span>未确定:<span
style="color: #ff6600;">O</span>未分配:<span style="color:#E95252 ;">X</span>
车辆状态&nbsp;&nbsp;&nbsp;确定:<span style="color:#4BCA81 ;">√</span>暂定:<span style="color: #ff6600;">O</span>未操作:<span
style="color:#E95252 ;">X</span>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<OrderList :pagesTitle="Title" :OrderList="DataList" :loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
<OrderList :pagesTitle="Title" :OrderList="DataList" :ColsCount="ColsCount" :loading="loading" @success="msg.pageIndex=1,GetList()">
</OrderList>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
</div>
</template>
<script>
import OrderList from './BookAcar/components/JapanOrderList';
export default {
data() {
return {
userInfo: {}, //用户信息
loading: false,
currentPage: 1,
total: 0,
......@@ -76,34 +70,19 @@
IsFinish: "0",
TCNUM: ""
},
Title:'车辆预订表',
Title: '印象车行-车辆预订表',
queryCommonData: {
PlaceList: [],
LineList: [],
LineTeamList: [],
CustomerList: [],
},
thLengthTitle: [],
DataList: [],
colspanTotal: 0,
isCha: 0,
boxHeight: 0,
showHotelObj: {
showPrice: false, //是否显示价格
showPay: false, //是否显示支付方式
showZhan: false, //占房时间
showBtnList: false, //是否下载、确认按钮
ShowTaxType: false, //显示税入税别
ShowRebateRatio: false, //显示返佣比列
ShowSupplier: false, //是否显示供应商
showCaozuoTime: false, //操作时间
colspanLength: 6 //跨行
}
ColsCount:1,//动态计算跨多少列
}
},
components: {OrderList
components: {
OrderList
},
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......@@ -111,33 +90,36 @@
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
this.getList();
},
getList() {
this.loading = true
this.apipost('JapanCar_get_GetJapanOrderStatisticsPageList', this.msg, res => {
this.loading = false;
console.log("JapanCar_get_GetJapanOrderStatisticsPageList",res)
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
this.ColsCount=res.data.data.MaxUseDay;
this.total = res.data.data.pmodel.count;
this.DataList = res.data.data.pmodel.pageData;
} else {
this.Error(res.data.message);
}
}, err => {})
})
},
getCustomerList(CustomerKeyWord){
this.apipost('JapanCar_get_GetJapanCarCustomerList', {keyWord:CustomerKeyWord}, res => {
getCustomerList(CustomerKeyWord) {
this.apipost('JapanCar_get_GetJapanCarCustomerList', {
keyWord: CustomerKeyWord
}, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.CustomerList = res.data.data;
} else {
this.Error(res.data.message);
}
}, err => {})
},
})
},
},
mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -146,7 +128,7 @@
"-" +
myDate.getDate();
this.msg.UseSTime = nowDate;
this.msg.UseETime= myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 2) + "-" + myDate.getDate();
this.msg.UseETime = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 2) + "-" + myDate.getDate();
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
......
src/components/busManagement/JapanBusOrderStatistics.vue
View file @ 2e042297
......@@ -71,7 +71,7 @@
IsFinish: "0",
TCNUM: ""
},
Title: '印象车行派车单统计',
Title: '印象车行-派车单统计',
queryCommonData: {
CustomerList: [],
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment