Skip to content

S
SuperMan
Commit 209d5674 authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent c7c84f31
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 206 deletions
src/components/busManagement/BookAcar/components/JapanMonthRunList.vue
View file @ 209d5674
...@@ -8,53 +8,80 @@ ...@@ -8,53 +8,80 @@
top: 0; top: 0;
z-index: 10; z-index: 10;
} }
.CustomerListDriverBox{
.CustomerListDriverBox {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.CustomerListDriver{
width: 100%; .CustomerListDriver {
height: 35px; width: 100%;
line-height: 35px; height: 35px;
border-bottom: 1px solid #eee; line-height: 35px;
} border-bottom: 1px solid #eee;
.CustomerListDriver:last-child{ }
border: 0;
} .CustomerListDriver:last-child {
/deep/.japanorder .el-table .cell{ border: 0;
padding-left: 0 !important; }
padding-right: 0 !important;
height: 100%; /deep/.japanorder .el-table .cell {
display: flex; padding-left: 0 !important;
flex-direction: column; padding-right: 0 !important;
} height: 100%;
/deep/.japanorder .el-table th{ display: flex;
padding: 0 5px; flex-direction: column;
line-height: 35px; }
}
/deep/.el-table .el-table__cell{ /deep/.japanorder .el-table th {
padding: 0; padding: 0 5px;
} line-height: 35px;
.text-p-xs{ }
padding: 0 5px;
} /deep/.el-table .el-table__cell {
.text-center{ padding: 0;
/* text-align: center; */ }
}
.text-p-xs {
/deep/.japanorder .el-table .el-table__fixed-right{ padding: 0 5px;
height:auto !important; }
bottom:10px !important;
} .text-center {
/deep/.japanorder .el-table .el-table__fixed{ /* text-align: center; */
height:auto !important; }
bottom:10px !important;
} /deep/.japanorder .el-table .el-table__fixed-right {
height: auto !important;
bottom: 10px !important;
}
/deep/.japanorder .el-table .el-table__fixed {
height: auto !important;
bottom: 10px !important;
}
.jieji {
color: #409eff;
}
.songji {
color: #e6a23c;
}
.yiriyou {
color: #67c23a;
}
</style> </style>
<template> <template>
<div class="japanorder" v-if="OrderList.length>0"> <div class="japanorder" v-if="OrderList.length>0">
<el-table ref="mytableJap" :data="OrderList" style="width: 100%" <div>
:loading="loading" :height="tableHeight" key="index"> <font class="jieji">接机 √</font> &nbsp;<font class="songji">送机 √</font>&nbsp;
<font class="yiriyou">一日游 √</font>
</div>
<el-table ref="mytableJap" :data="OrderList" style="width: 100%" :loading="loading" :height="tableHeight"
key="index">
<el-table-column fixed prop="SupplierName" :label="$t('objFill.v101.busManagement.chegongs')" width="150"> <el-table-column fixed prop="SupplierName" :label="$t('objFill.v101.busManagement.chegongs')" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="text-p-xs">{{scope.row.SupplierName}}</div> <div class="text-p-xs">{{scope.row.SupplierName}}</div>
...@@ -70,131 +97,46 @@ ...@@ -70,131 +97,46 @@
<div class="text-p-xs">{{scope.row.CarName}}</div> <div class="text-p-xs">{{scope.row.CarName}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed prop="CustomerName" :label="$t('objFill.v101.busManagement.shiyongdanw')" width="150"> <el-table-column fixed prop="CustomerList" :label="$t('objFill.v101.busManagement.shiyongdanw')" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="CustomerListDriverBox"> <div class="CustomerListDriverBox">
<div <div class="text-p-xs CustomerListDriver" v-for="(item,index) in scope.row.CustomerList">
class="text-p-xs CustomerListDriver"
:style="{'height':item.OrderList.length*35+'px','line-height':item.OrderList.length*35+'px'}"
v-for="(item,index) in scope.row.CustomerList"
>
{{item.CustomerName?item.CustomerName:'-'}} {{item.CustomerName?item.CustomerName:'-'}}
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed prop="DriverName" :label="$t('objFill.driver')" width="150"> <el-table-column v-for='(dayItem,index) in OrderList[0].DayList' :label="dayItem.UseDateStr" :key='index'>
<template slot-scope="scope"> <template slot-scope="scope">
<template v-for="(item,index) in scope.row.CustomerList"> <div class="CustomerListDriverBox">
<div <div class="text-p-xs CustomerListDriver" v-for="(item,index) in scope.row.CustomerList">
class="text-p-xs CustomerListDriver" <template v-for="(subItem, subIndex) in item.OrderList">
v-for="(items,indexs) in item.OrderList" <template v-if="dayItem.UseDate==subItem.UseDate">
> <template v-for="childItem in subItem.SubDetailsList">
<el-tooltip class="item" effect="dark" :content="items.DriverName+items.CopilotDriverName" placement="top"> <template v-if="childItem.UseState > 0">
<span style="width: 150px;overflow: hidden; text-overflow: ellipsis;display: block;white-space: nowrap;cursor: pointer;">{{items.DriverName}}{{items.CopilotDriverName}}</span> <el-tooltip class="item" effect="dark" :content="childItem.DriverName" placement="top-start">
</el-tooltip> <font v-if="childItem.UseState == 1" class="jieji">√
</font>
</div> <font v-if="childItem.UseState == 2" class="songji">√
</template> </font>
</template> <font v-if="childItem.UseState == 3 || childItem.UseState == 4" class="yiriyou">
</el-table-column> √
<template v-if="OrderList&&OrderList.length>0"> </font>
<el-table-column v-for='(item,index) in OrderList[0].DayList' :label="item.UseDateStr" :key='index' </el-tooltip>
min-width="300"> </template>
<el-table-column :label="$t('system.table_begTime')">
<template slot-scope="scope">
<template v-if="scope.row.CustomerList.length>0">
<template v-for="(childItem,index) in scope.row.CustomerList">
<template v-for="child in childItem.OrderList">
<template v-for="childs in child.nowOrderDayCalendar">
<div
class="text-p-xs text-center CustomerListDriver"
v-if="item.UseDateStr==childs.UseDateStr">
{{ childs.StartCity}}
</div>
</template>
</template>
</template>
</template>
</template>
</el-table-column>
<el-table-column :label="$t('MarketingActi.endTime')">
<template slot-scope="scope">
<template v-if="scope.row.CustomerList.length>0">
<template class="text-p-xs" v-for="(childItem,index) in scope.row.CustomerList">
<template v-for="child in childItem.OrderList">
<template v-for="childs in child.nowOrderDayCalendar">
<div
class="text-p-xs text-center CustomerListDriver"
v-if="item.UseDateStr==childs.UseDateStr">
{{ childs.EndCity}}
</div>
</template>
</template>
</template>
</template>
</template>
</el-table-column>
<el-table-column :label="$t('objFill.v101.busManagement.pickup')">
<template slot-scope="scope">
<template v-if="scope.row.CustomerList.length>0">
<template v-for="(childItem,index) in scope.row.CustomerList">
<template v-for="child in childItem.OrderList">
<template v-for="childs in child.nowOrderDayCalendar">
<div
class="text-p-xs text-center CustomerListDriver"
v-if="item.UseDateStr==childs.UseDateStr">
{{childs.UseState&&childs.UseState==1?'√':''}}
</div>
</template>
</template>
</template>
</template>
</template>
</el-table-column>
<el-table-column :label="$t('objFill.v101.busManagement.send')">
<template slot-scope="scope">
<template v-if="scope.row.CustomerList.length>0">
<template v-for="(childItem,index) in scope.row.CustomerList">
<template v-for="child in childItem.OrderList">
<template v-for="childs in child.nowOrderDayCalendar">
<div
class="text-p-xs text-center CustomerListDriver"
v-if="item.UseDateStr==childs.UseDateStr">
{{childs.UseState&&childs.UseState==2?'√':''}}
</div>
</template>
</template>
</template>
</template>
</template>
</el-table-column>
<el-table-column :label="$t('op.Onedaytour')">
<template slot-scope="scope">
<template v-if="scope.row.CustomerList.length>0">
<template v-for="(childItem,index) in scope.row.CustomerList">
<template v-for="child in childItem.OrderList">
<template v-for="childs in child.nowOrderDayCalendar">
<div
class="text-p-xs text-center CustomerListDriver"
v-if="item.UseDateStr==childs.UseDateStr">
{{ childs.UseState&&(childs.UseState==3||childs.UseState==4)?'√':' '}}
</div>
</template> </template>
</template> </template>
</template> </template>
</template> </div>
</template> </div>
</el-table-column> </template>
</el-table-column> </el-table-column>
</template>
</el-table> </el-table>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: ["OrderList", "pagesTitle", 'loading', 'headerList','tableHeight'], props: ["OrderList", "pagesTitle", 'loading', 'headerList', 'tableHeight'],
data() { data() {
return {}; return {};
}, },
......
src/components/busManagement/JapanBusMonthStatistics.vue
View file @ 209d5674
<template> <template>
<div> <div>
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none">
<ul> <ul>
<li> <li>
<span> <span>
<em>{{$t('fnc.khmingcheng')}}</em> <em>{{ $t("fnc.khmingcheng") }}</em>
<el-select v-model="msg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" clearable clear <el-select v-model="msg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')" clearable clear
@clear="resetPageIndex()"> @clear="resetPageIndex()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in queryCommonData.CustomerList" :label='item.CustomerName' :value='item.Id' <el-option v-for="item in queryCommonData.CustomerList" :label="item.CustomerName" :value="item.Id"
:key='item.Id'> :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('visa.v_tuanhao')}}</em> <em>{{ $t("visa.v_tuanhao") }}</em>
<el-input v-model='msg.TCNUM' maxlength="40" @keyup.native.enter="resetPageIndex()" clear <el-input v-model="msg.TCNUM" maxlength="40" @keyup.native.enter="resetPageIndex()" clear
@clear="resetPageIndex()" clearable></el-input> @clear="resetPageIndex()" clearable></el-input>
</span> </span>
</li> </li>
<li><span><em>{{$t('pub.date')}}</em> <li>
<el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" type="date" @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker> <span><em>{{ $t("pub.date") }}</em>
<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" @change="resetPageIndex()" clearable @clear="resetPageIndex()"></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> </span>
</li> </li>
<li style="display:none;"><span><em>{{$t('objFill.v101.busManagement.shifouwj')}}</em></span> <li style="display: none">
<el-select v-model='msg.IsFinish'> <span><em>{{ $t("objFill.v101.busManagement.shifouwj") }}</em></span>
<el-option :label="$t('advmanager.v_all')" value='0' key='0'></el-option> <el-select v-model="msg.IsFinish">
<el-option :label="$t('pub.yes')" value='1' key='1'></el-option> <el-option :label="$t('advmanager.v_all')" value="0" key="0"></el-option>
<el-option :label="$t('pub.yes')" value="1" key="1"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
...@@ -39,15 +43,14 @@ ...@@ -39,15 +43,14 @@
</ul> </ul>
</div> </div>
<div class="mt10 fz14 color333 busIconStyle"> <div class="mt10 fz14 color333 busIconStyle">
{{$t('objFill.v101.busManagement.chelianzt')}}&nbsp;&nbsp;&nbsp;{{$t('pub.sureBtn')}}:<span style="color:#4BCA81 ;">√</span>{{$t('visa.v_zanding')}}:<span style="color: #ff6600;">O</span>{{$t('objFill.weicaozuo')}}:<span {{ $t("objFill.v101.busManagement.chelianzt") }}&nbsp;&nbsp;&nbsp;{{
style="color:#E95252 ;">X</span> $t("pub.sureBtn")
}}:<span style="color: #4bca81">√</span>{{ $t("visa.v_zanding") }}:<span
style="color: #ff6600">O</span>{{ $t("objFill.weicaozuo") }}:<span style="color: #e95252">X</span>
</div> </div>
<!-- <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
</div> --> <OrderList v-if="DataList.length > 0" :pagesTitle="Title" :OrderList="DataList" :loading="loading"
<OrderList v-if="DataList.length>0" :pagesTitle="Title" :OrderList="DataList" :loading="loading" :tableHeight="tableHeight" @success="(msg.pageIndex = 1), GetList()">
:tableHeight="tableHeight" @success="msg.pageIndex=1,GetList()">
</OrderList> </OrderList>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
...@@ -55,7 +58,7 @@ ...@@ -55,7 +58,7 @@
</template> </template>
<script> <script>
import OrderList from './BookAcar/components/JapanMonthRunList'; import OrderList from "./BookAcar/components/JapanMonthRunList";
export default { export default {
data() { data() {
...@@ -68,22 +71,22 @@ ...@@ -68,22 +71,22 @@
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
CustomerId: 0, CustomerId: 0,
UseSTime: '', UseSTime: "",
UseETime: '', UseETime: "",
IsFinish: "0", IsFinish: "0",
TCNUM: "" TCNUM: "",
}, },
Title: '印象车行-月运行统计表', Title: "印象车行-月运行统计表",
queryCommonData: { queryCommonData: {
CustomerList: [], CustomerList: [],
}, },
DataList: [], DataList: [],
boxHeight: 0, boxHeight: 0,
ColsCount: 1,//动态及时跨多少列 ColsCount: 1, //动态及时跨多少列
} };
}, },
components: { components: {
OrderList OrderList,
}, },
methods: { methods: {
com_onresize() { com_onresize() {
...@@ -106,35 +109,26 @@ ...@@ -106,35 +109,26 @@
this.getList(); this.getList();
}, },
getCustomerList(CustomerKeyWord) { getCustomerList(CustomerKeyWord) {
this.apipost('JapanCar_get_GetJapanCarCustomerList', { this.apipost(
keyWord: CustomerKeyWord "JapanCar_get_GetJapanCarCustomerList", {
}, res => { keyWord: CustomerKeyWord,
this.loading = false; },
if (res.data.resultCode == 1) { (res) => {
this.queryCommonData.CustomerList = res.data.data; this.loading = false;
} else { if (res.data.resultCode == 1) {
this.Error(res.data.message); this.queryCommonData.CustomerList = res.data.data;
} else {
this.Error(res.data.message);
}
} }
}); );
}, },
getList() { getList() {
this.loading = true this.loading = true;
this.apipost('JapanCar_get_GetJapanOrderCarRunPage', this.msg, res => { this.apipost("JapanCar_get_GetJapanOrderCarRunPage", this.msg, (res) => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// this.ColsCount = res.data.data.MaxUseDay;
// this.total = res.data.data.pmodel.count;
this.DataList = res.data.data.pageData; this.DataList = res.data.data.pageData;
for(let i =0;i<this.DataList.length;i++){
let x = this.DataList[i]
// for(let j =0;i<x.CustomerList.length;j++){
// for(let j =0;i<x.OrderList.length;j++){
// let UseDateStr =
// }
// let UseDateStr =
// }
}
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -150,7 +144,14 @@ ...@@ -150,7 +144,14 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.UseSTime = nowDate; 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 width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210; let height = window.innerHeight - 65 - 210;
this.boxHeight = height; this.boxHeight = height;
...@@ -160,9 +161,9 @@ ...@@ -160,9 +161,9 @@
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
this.com_onresize(); this.com_onresize();
} };
}, },
} };
</script> </script>
<style> <style>
...@@ -180,7 +181,7 @@ ...@@ -180,7 +181,7 @@
} }
.busStatisticsTalbe tr th { .busStatisticsTalbe tr th {
background: #E6E6E6; background: #e6e6e6;
height: 40px; height: 40px;
font-size: 12px; font-size: 12px;
color: #333; color: #333;
......
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