Skip to content

S
SuperMan
Commit 6166b237 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 5c32db81
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 115 deletions
src/assets/utils/alioss.js
View file @ 6166b237
...@@ -2,8 +2,8 @@ var OSS = require('ali-oss').Wrapper ...@@ -2,8 +2,8 @@ var OSS = require('ali-oss').Wrapper
export function client(data) { export function client(data) {
var client = new OSS({ var client = new OSS({
region: 'oss-cn-hangzhou.aliyuncs.com', //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，部署在服务端使用RAM子账号或STS，部署在客户端使用STS。 region: 'oss-cn-hangzhou.aliyuncs.com', //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，部署在服务端使用RAM子账号或STS，部署在客户端使用STS。
accessKeyId: 'LTAIwE7l9dImZSa3', accessKeyId: 'LTAI5tFgqt1pwnoA35cigYTr',
accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI', accessKeySecret: 'wXPoEqJ7qLdvX9iBluIebhCPSzoemy',
bucket: 'reborndev' bucket: 'reborndev'
}) //后端提供数据 }) //后端提供数据
return client return client
......
src/components/busManagement/BookAcar/components/JapanOrderList.vue
View file @ 6166b237
...@@ -11,85 +11,83 @@ ...@@ -11,85 +11,83 @@
</style> </style>
<template> <template>
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'> <div class="japanorder">
<tr> <el-table :data="OrderList" style="width: 100%" height="250">
<th width="100" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车公司</th> <el-table-column fixed prop="CustomerName" label="使用单位" width="150">
<th width="110" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车牌号</th> </el-table-column>
<th width="110" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">司机</th> <el-table-column fixed label="用车性质" width="165">
<th width="150" rowspan="2" v-if="pagesTitle=='印象车行-运行统计表'">车型</th> <el-table-column prop="UseType" label="接机" width="50">
<th width="150" rowspan="2">使用单位</th> <template slot-scope="scope">
<th width="100" colspan="3">用车性质</th> <template v-if="scope.row.UseType==1">
<th width="100" colspan="2">用车时间</th> <span>√</span>
<th rowspan="2" :colspan="ColsCount">用车详情 </th> </template>
</tr> </template>
<tr> </el-table-column>
<th width="100">接机</th> <el-table-column prop="UseType" label="送机" width="50">
<th width="100">送机</th> <template slot-scope="scope">
<th width="100">包机</th> <template v-if="scope.row.UseType==2">
<th width="100">出发预订</th> <span>√</span>
<th width="100">结束预订</th> </template>
</tr> </template>
<tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1" :key="outindex"> </el-table-column>
<tr> <el-table-column prop="UseType" label="一日游" width="65">
<td v-if="pagesTitle=='印象车行-运行统计表'"> <template slot-scope="scope">
{{outItem.SupplierName}} <template v-if="scope.row.UseType==4">
</td> <span>√</span>
<td v-if="pagesTitle=='印象车行-运行统计表'"> </template>
{{outItem.CarNo}} </template>
</td> </el-table-column>
<td v-if="pagesTitle=='印象车行-运行统计表'"> </el-table-column>
{{outItem.DriverName}} {{outItem.CopilotDriverName}} <el-table-column fixed prop="GuestNum" label="人数" width="80">
</td> <template slot-scope="scope">
<td v-if="pagesTitle=='印象车行-运行统计表'"> <span>
{{outItem.CarName}} {{scope.row.GuestNum}} <template v-if="scope.row.TourGuideNum==4">
</td> +{{scope.row.TourGuideNum}}
<td> </template>
{{outItem.CustomerName}} </span>
</td> </template>
<td> </el-table-column>
{{outItem.AirportPickUpCount}} <el-table-column fixed label="用车时段" width="160">
</td> <el-table-column prop="StartTime" label="出发预定" width="80">
<td> <template slot-scope="scope">
{{outItem.SendingMachineCount}} <span>{{scope.row.StartTime}}</span>
</td> </template>
<td> </el-table-column>
{{outItem.UseDayCount}} <el-table-column prop="EndTime" label="结束预定" width="80">
</td> <template slot-scope="scope">
<td> <span>{{scope.row.EndTime}}</span>
{{outItem.UseDateStr}} </template>
</td> </el-table-column>
<td> <template v-for="(item,index) in headerList">
{{outItem.EndUseDateStr}} <el-table-column :key="index" :prop="item.LabelValue" :label="item.LabelName" width="135" align="center">
</td> <template slot-scope="scope">
<td v-for="(item,index) in ColsCount" :key="index"> <template v-if="scope.row.OrderDayCalendar[index].UseState!=-1">
<div class="w135" v-if="(index+1)<=outItem.OrderDayCalendar.length"> <el-tooltip class="item" effect="dark" placement="top">
<div v-if="outItem.OrderDayCalendar[index].UseState>-1"> <div slot="content" style="width:200px;">{{scope.row.OrderDayCalendar[index].BusContent}}</div>
<p> <div>
{{outItem.OrderDayCalendar[index].UseDateStr}} <span>{{scope.row.OrderDayCalendar[index].StartCity}}
</p> <template
<el-tooltip class="item" effect="dark" placement="top"> v-if="scope.row.OrderDayCalendar[index].StartCity&&scope.row.OrderDayCalendar[index].EndCity">--></template>
<div slot="content" style="width:200px;">{{outItem.OrderDayCalendar[index].BusContent}}</div> {{scope.row.OrderDayCalendar[index].EndCity}}
<span>{{outItem.OrderDayCalendar[index].StartCity}} </span>
<template <p>
v-if="outItem.OrderDayCalendar[index].StartCity&&outItem.OrderDayCalendar[index].EndCity">--></template> <span style="color: #4BCA81;" v-if="(scope.row.OrderDayCalendar[index].UseState==2)">√</span>
{{outItem.OrderDayCalendar[index].EndCity}} <span style="color: #ff6600;" v-else-if="(scope.row.OrderDayCalendar[index].UseState==1)">O</span>
</span> <span style="color: #E95252;" v-else>×</span>
</el-tooltip> </p>
<p> </div>
<span style="color: #4BCA81;" v-if="(outItem.OrderDayCalendar[index].UseState==2)">√</span> </el-tooltip>
                      <span style="color: #ff6600;" v-else-if="(outItem.OrderDayCalendar[index].UseState==1)">O</span> </template>
                      <span style="color: #E95252;" v-else>×</span> </template>
</p> </el-table-column>
</div> </template>
</div> </el-table-column>
</td> </el-table>
</tr> </div>
</tbody>
</table>
</template> </template>
<script> <script>
export default { export default {
props: ["OrderList", "pagesTitle", 'loading', 'ColsCount'], props: ["OrderList", "pagesTitle", 'loading', 'headerList'],
data() { data() {
return {}; return {};
}, },
...@@ -129,4 +127,9 @@ ...@@ -129,4 +127,9 @@
</script> </script>
<style></style> <style scope="this api replaced by slot-scope in 2.5.0+">
.japanorder .el-table .el-table__cell.is-hidden>* {
visibility: initial !important;
}
</style>
src/components/busManagement/JapanBusOrderMonthStatistics.vue
View file @ 6166b237
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle" <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}"> :style="{height: boxHeight + 'px'}">
<OrderList :pagesTitle="Title" :OrderList="DataList" :ColsCount="ColsCount" :loading="loading" @success="msg.pageIndex=1,GetList()"> <OrderList :pagesTitle="Title" :headerList="headerList" :OrderList="DataList" :loading="loading"
@success="msg.pageIndex=1,GetList()">
</OrderList> </OrderList>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
...@@ -76,7 +77,8 @@ ...@@ -76,7 +77,8 @@
}, },
DataList: [], DataList: [],
boxHeight: 0, boxHeight: 0,
ColsCount:1,//动态计算跨多少列 ColsCount: 1, //动态计算跨多少列
headerList: [], //动态表头
} }
}, },
components: { components: {
...@@ -93,13 +95,38 @@ ...@@ -93,13 +95,38 @@
this.getList(); this.getList();
}, },
getList() { getList() {
this.loading = true this.loading = true;
this.apipost('JapanCar_get_GetJapanOrderStatisticsPageList', this.msg, res => { this.headerList = [];
this.apipost('JapanCar_get_GetJapanOrderCarConfirmPageList', this.msg, res => {
this.loading = false; this.loading = false;
console.log("JapanCar_get_GetJapanOrderCarConfirmPageList", JSON.parse(JSON.stringify(res.data)));
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.ColsCount=res.data.data.MaxUseDay; this.total = res.data.data.count;
this.total = res.data.data.pmodel.count; var tempArray = res.data.data.pageData;
this.DataList = res.data.data.pmodel.pageData; if (tempArray && tempArray.length > 0) {
var headerArray = tempArray[0].OrderDayCalendar;
if (headerArray && headerArray.length > 0) {
headerArray.forEach((item, index) => {
this.headerList.push({
LabelName: item.UseDateStr,
LabelValue: "" + index + ""
})
});
}
// tempArray.forEach(item => {
// item.OrderDayCalendar.forEach(subItem => {
// item[subItem.UseDateStr] = {
// BusContent: subItem.BusContent,
// EndCity: subItem.EndCity,
// StartCity: subItem.StartCity,
// UseDateStr: subItem.UseDateStr,
// UseState: subItem.UseState,
// };
// });
// });
}
console.log("tempArray", tempArray)
this.DataList = tempArray;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/plug/index.js
View file @ 6166b237
This diff is collapsed.
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