Skip to content

S
SuperMan
Commit 05fd5d49 authored by 黄奎's avatar 黄奎
Browse files
Options

统计调整

parent bc11ad52
Show whitespace changes
Inline Side-by-side
Showing with 329 additions and 345 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 05fd5d49
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
.roomReservationsDetailsTalbe thead tr th { .roomReservationsDetailsTalbe thead tr th {
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 1000; z-index: 10;
} }
</style> </style>
......
src/components/busManagement/BookAcar/components/JapanOrderDetailList.vue
View file @ 05fd5d49
<style scoped> <style scoped>
.busStatisticsTalbe {
table-layout: fixed;
}
.busStatisticsTalbe thead tr th {
position: sticky;
top: 0;
z-index: 10;
}
</style> </style>
<template> <template>
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
<thead>
<tr> <tr>
<th class="w100" >车公司</th> <th class="w100">车公司</th>
<th class="w110" >车牌号</th> <th class="w110">车牌号</th>
<th class="w110" >司机</th> <th class="w100">司机</th>
<th class="w150" >车型</th> <th class="w100">车型</th>
<th class="w150" >用车性质</th> <th class="w100">用车性质</th>
<th class="w150" >使用单位</th> <th class="w135">使用单位</th>
<th class="w100" >用车地点</th> <th class="w100">使用团号</th>
<th class="w100" >用车日期</th> <th class="w135">用车地点</th>
<th class="w100" >用车时间</th> <th class="w100">用车日期</th>
<th class="w100" >还车日期</th> <th class="w100">用车时间</th>
<th class="w100" >还车时间</th> <th class="w100">还车日期</th>
<th class="w200">行程</th> <th class="w100">还车时间</th>
<th class="w200">备注</th> <th class="w90">状态</th>
<th class="w210">行程</th>
<th class="w210">备注</th>
</tr> </tr>
<tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1"> </thead>
<tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1" :key="outindex">
<tr> <tr>
<td > <td>
<div class="w100">{{outItem.CarSupplierName}}</div> {{outItem.CarSupplierName}}
</td> </td>
<td > <td>
<div class="w110">
{{outItem.CarNo}} {{outItem.CarNo}}
</div>
</td> </td>
<td > <td>
<div class="w110">
{{outItem.DriverName}} {{outItem.CopilotDriverName}} {{outItem.DriverName}} {{outItem.CopilotDriverName}}
</div>
</td> </td>
<td > <td>
<div class="w120"> {{outItem.CarName}}({{outItem.CarSeatNum}} 座)
{{outItem.CarName}}
</div>
</td> </td>
<td> <td>
<div class="W100 ">
{{outItem.UseTypeStr}} {{outItem.UseTypeStr}}
</div>
</td> </td>
<td> <td>
<div class="w150">{{outItem.CustomerName}}</div> {{outItem.CustomerName}}
</td>
<td>
{{outItem.TCNUM}}
</td>
<td>
<div><span>{{outItem.StartCityName}}<span v-if="outItem.StartCity&&outItem.EndCity">--></span>
<span> {{outItem.EndCityName}}</span></span></div>
</td> </td>
<td> <td>
<div class="w100"><span>{{outItem.StartCityName}}<span v-if="outItem.StartCity&&outItem.EndCity">--></span> <span > {{outItem.EndCityName}}</span></span></div> {{outItem.UseDateStr}}
</td> </td>
<td> <td>
<div class="w100">{{outItem.UseDateStr}}</div> {{outItem.StartTime}}
</td> </td>
<td> <td>
<div class="w100">{{outItem.StartTime}}</div> {{outItem.UseDateStr}}
</td> </td>
<td> <td>
<div class="w100">{{outItem.UseDateStr}}</div> {{outItem.EndTime}}
</td> </td>
<td> <td>
<div class="w100">{{outItem.EndTime}}</div> <template v-if="outItem.UseState==0">
<span style="color:#E95252 ;">X</span>
</template>
<template v-else-if="outItem.UseState==1">
<span style="color: #ff6600;">O</span>
</template>
<template v-else-if="outItem.UseState==2">
<span style="color:#4BCA81 ;">√</span>
</template>
</td> </td>
<td> <td>
<div class="w150" >{{outItem.BusContent}}</div> <div style="padding:2px;">{{outItem.BusContent}}</div>
</td> </td>
<td> <td>
<div class="w150" >{{outItem.AppendNotes}}</div> <div style="padding:2px;">{{outItem.AppendNotes}}</div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</template> </template>
<script> <script>
export default {
export default { props: ["OrderList", "pagesTitle", 'loading'],
props: ["OrderList", "pagesTitle",'loading'],
data() { data() {
return { return {};
};
}, },
watch: { watch: {
pagesTitle(val, oldval) { pagesTitle(val, oldval) {
...@@ -96,28 +113,21 @@ export default { ...@@ -96,28 +113,21 @@ export default {
if (h < 110) { if (h < 110) {
return; return;
} }
//设置table的行高
// this.tableHeight = h;
}, },
success() { success() {
this.close(); this.close();
this.$emit("success"); this.$emit("success");
}, },
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf("is_correlationOP") != -1) {
this.is_correlationOP = true;
}
//自适应高度调节 //自适应高度调节
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
this.com_onresize(); this.com_onresize();
}; };
}, },
}; };
</script> </script>
<style></style> <style></style>
src/components/busManagement/BookAcar/components/JapanOrderFList.vue
View file @ 05fd5d49
<style scoped> <style scoped>
.busStatisticsTalbe {
table-layout: fixed;
}
.busStatisticsTalbe thead tr th {
position: sticky;
top: 0;
z-index: 10;
}
</style> </style>
<template> <template>
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
<tr> <tr>
<th class="w100" >车公司</th> <th width="120">车公司</th>
<th width="110" >车牌号</th> <th width="180">车牌号</th>
<th width="110" >司机</th> <th width="100">司机</th>
<th width="150" >出车日</th> <th width="120">出车日</th>
<th width="150" >客户</th> <th width="150">客户</th>
<th width="100" >出发地</th> <th width="150">团号</th>
<th width="100" >到达地</th> <th width="100">出发地</th>
<th width="100" >天数</th> <th width="100">到达地</th>
<th width="100" >总收入</th> <th width="100">天数</th>
<th width="300" >收入单据</th> <th width="100">总收入</th>
<th width="100" >总支出</th> <th width="300">收入单据</th>
<th width="300" >支出单据</th> <th width="100">总支出</th>
<th width="300">支出单据</th>
</tr> </tr>
<tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1"> <tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1" :key="outindex">
<tr> <tr>
<td> <td>
<div class="w100">{{outItem.SupplierName}}</div> {{outItem.SupplierName}}
</td> </td>
<td> <td>
<div class="w80"> {{outItem.CarName}} {{outItem.CarNo}} ({{outItem.CarSeatNum}} 座)
{{outItem.CarNo}}
</div>
</td> </td>
<td > <td>
<div class="w80">
{{outItem.DriverName}} {{outItem.CopilotDriverName}} {{outItem.DriverName}} {{outItem.CopilotDriverName}}
</div>
</td> </td>
<td > <td>
<div class="w120">
{{outItem.UseDateStr}} {{outItem.UseDateStr}}
</div>
</td> </td>
<td> <td>
<div class="w120 ">
{{outItem.CustomerName}} {{outItem.CustomerName}}
</div>
</td> </td>
<td> <td>
<div class="w80">{{outItem.StartCityName}}</div> {{outItem.TCNUM}}
</td> </td>
<td> <td>
<div class="w80">{{outItem.EndCityName}}</div> {{outItem.StartCityName}}
</td>
<td>
{{outItem.EndCityName}}
</td> </td>
<td> <td>
<div class="w100">
{{outItem.UseDayCount}} {{outItem.UseDayCount}}
</div>
</td> </td>
<td> <td>
<div class="w80">{{outItem.IncomeMoney}}</div> {{outItem.IncomeMoney}}
</td> </td>
<td> <td>
<div class="w300"> <div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py" style="padding:3px;">
<span class="cursor-pointer radius5 mr mb px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, <template v-for="(x, i) in outItem.IncomeList">
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in outItem.IncomeList" <span :key="i+10000" class="cursor-pointer radius5 mr mb px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}</span> @click="openDetails(x)">{{ x.FrID }}</span>
</template>
<span v-if="outItem.IncomeList.length == 0" class="c9e fz12"> <span v-if="outItem.IncomeList.length == 0" class="c9e fz12">
{{$t('objFill.nocollectiondocument')}} {{$t('objFill.nocollectiondocument')}}
</span> </span>
</div></div> </div>
</td> </td>
<td> <td>
<div class="w80">{{outItem.OutMoney}}</div> {{outItem.OutMoney}}
</td> </td>
<td> <td>
<div class="w300"> <div class="row wrap orderNo fz12 py" style="padding:3px;">
<div class="row wrap orderNo fz12 py"> <template v-for="(x, i) in outItem.RefundList">
<span class="cursor-pointer radius5 mr mb px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, <span :key="i+20000" class="cursor-pointer radius5 mr mb px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in outItem.RefundList" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}</span> @click="openDetails(x)">{{ x.FrID }}</span>
</template>
<span v-if="outItem.RefundList.length == 0" class="c9e fz12"> <span v-if="outItem.RefundList.length == 0" class="c9e fz12">
{{$t('objFill.norefundreceipt')}} {{$t('objFill.nocostdocument')}}
</span> </span>
</div> </div>
</div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</template> </template>
<script> <script>
export default {
export default { props: ["OrderList", "pagesTitle", 'loading'],
props: ["OrderList", "pagesTitle",'loading'],
data() { data() {
return { return {};
};
}, },
watch: { watch: {
pagesTitle(val, oldval) { pagesTitle(val, oldval) {
...@@ -118,7 +120,7 @@ export default { ...@@ -118,7 +120,7 @@ export default {
this.$emit("success"); this.$emit("success");
}, },
// 单据详情 // 单据详情
openDetails(item,x) { openDetails(item, x) {
let query = { let query = {
id: item.FrID ? item.FrID : item.ID, id: item.FrID ? item.FrID : item.ID,
blank: "y", blank: "y",
...@@ -130,18 +132,13 @@ export default { ...@@ -130,18 +132,13 @@ export default {
}, },
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf("is_correlationOP") != -1) {
this.is_correlationOP = true;
}
//自适应高度调节 //自适应高度调节
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
this.com_onresize(); this.com_onresize();
}; };
}, },
}; };
</script>
<style></style> </script>
<style></style>
src/components/busManagement/JapanBusMonthFStatistics.vue
View file @ 05fd5d49
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
<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')" @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 :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'> :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -16,35 +17,31 @@ ...@@ -16,35 +17,31 @@
<li> <li>
<span> <span>
<em>团号</em> <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> </span>
</li> </li>
<li><span><em>{{$t('pub.date')}}</em> <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> </span>
</li> </li>
<li><span><em>是否完结</em></span> <li style="display:none"><span><em>是否完结</em></span>
<el-select v-model='msg.IsFinish'> <el-select v-model='msg.IsFinish'>
<el-option label='全部' value='0' key='0'></el-option> <el-option label='全部' value='0' key='0'></el-option>
<el-option label='是' value='1' key='1'></el-option> <el-option label='是' value='1' key='1'></el-option>
</el-select> </el-select>
</li> </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> <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> </li>
</ul> </ul>
</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" :loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList> <OrderList :pagesTitle="Title" :OrderList="DataList" :loading="loading" @success="msg.pageIndex=1,GetList()">
</OrderList>
</div> </div>
<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>
...@@ -53,11 +50,9 @@ ...@@ -53,11 +50,9 @@
<script> <script>
import OrderList from './BookAcar/components/JapanOrderFList'; import OrderList from './BookAcar/components/JapanOrderFList';
export default { export default {
data() { data() {
return { return {
userInfo: {}, //用户信息
loading: false, loading: false,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
...@@ -70,34 +65,18 @@ ...@@ -70,34 +65,18 @@
IsFinish: "0", IsFinish: "0",
TCNUM: "" TCNUM: ""
}, },
Title:'日本车行运行统计表', Title: '印象车行用车单统计',
queryCommonData: { queryCommonData: {
PlaceList: [], CustomerList: [],
LineList: [],
LineTeamList: [],
}, },
thLengthTitle: [],
DataList: [], DataList: [],
colspanTotal: 0,
isCha: 0,
boxHeight: 0, boxHeight: 0,
showHotelObj: {
showPrice: false, //是否显示价格
showPay: false, //是否显示支付方式
showZhan: false, //占房时间
showBtnList: false, //是否下载、确认按钮
ShowTaxType: false, //显示税入税别
ShowRebateRatio: false, //显示返佣比列
ShowSupplier: false, //是否显示供应商
showCaozuoTime: false, //操作时间
colspanLength: 6 //跨行
}
} }
}, },
components: {OrderList components: {
OrderList
}, },
methods: { methods: {
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
...@@ -105,6 +84,7 @@ ...@@ -105,6 +84,7 @@
resetPageIndex() { resetPageIndex() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
this.getList();
}, },
getList() { getList() {
this.loading = true this.loading = true
...@@ -116,22 +96,22 @@ ...@@ -116,22 +96,22 @@
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) })
}, },
getCustomerList(CustomerKeyWord){ getCustomerList(CustomerKeyWord) {
this.apipost('JapanCar_get_GetJapanCarCustomerList', {keyWord:CustomerKeyWord}, res => { this.apipost('JapanCar_get_GetJapanCarCustomerList', {
keyWord: CustomerKeyWord
}, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data; this.queryCommonData.CustomerList = res.data.data;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) })
}, },
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date(); let myDate = new Date();
let nowDate = let nowDate =
myDate.getFullYear() + myDate.getFullYear() +
...@@ -140,7 +120,7 @@ ...@@ -140,7 +120,7 @@
"-" + "-" +
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;
...@@ -252,6 +232,7 @@ ...@@ -252,6 +232,7 @@
overflow: auto; overflow: auto;
max-height: 350px; max-height: 350px;
} }
.ownScrollbarStyle .cursor-pointer { .ownScrollbarStyle .cursor-pointer {
cursor: pointer; cursor: pointer;
} }
...@@ -263,24 +244,31 @@ ...@@ -263,24 +244,31 @@
.ownScrollbarStyle .mr { .ownScrollbarStyle .mr {
margin-right: 10px; margin-right: 10px;
} }
.ownScrollbarStyle .mb { .ownScrollbarStyle .mb {
margin-bottom: 10px; margin-bottom: 10px;
} }
.ownScrollbarStyle .px5 { .ownScrollbarStyle .px5 {
padding: 0 5px; padding: 0 5px;
} }
.ownScrollbarStyle .row { .ownScrollbarStyle .row {
display: flex; display: flex;
} }
.ownScrollbarStyle .wrap { .ownScrollbarStyle .wrap {
flex-wrap: wrap; flex-wrap: wrap;
} }
.ownScrollbarStyle .fz12 { .ownScrollbarStyle .fz12 {
font-size: 12px; font-size: 12px;
} }
.ownScrollbarStyle .py { .ownScrollbarStyle .py {
padding: 15px 0; padding: 15px 0;
} }
.ownScrollbarStyle .bgE8F5E9 { .ownScrollbarStyle .bgE8F5E9 {
background: #e8f5e9; background: #e8f5e9;
} }
...@@ -292,12 +280,15 @@ ...@@ -292,12 +280,15 @@
.ownScrollbarStyle .bgFAEAED { .ownScrollbarStyle .bgFAEAED {
background: #faeaed; background: #faeaed;
} }
.ownScrollbarStyle .bjFFF3E0 { .ownScrollbarStyle .bjFFF3E0 {
background: #FFF3E0; background: #FFF3E0;
} }
.ownScrollbarStyle .c3FC4FF { .ownScrollbarStyle .c3FC4FF {
color: #3fc4ff; color: #3fc4ff;
} }
.ownScrollbarStyle .cF1416C { .ownScrollbarStyle .cF1416C {
color: #f1416c; color: #f1416c;
} }
...@@ -305,19 +296,25 @@ ...@@ -305,19 +296,25 @@
.ownScrollbarStyle .cF57A98 { .ownScrollbarStyle .cF57A98 {
color: #f57a98; color: #f57a98;
} }
.ownScrollbarStyle .cff9800 { .ownScrollbarStyle .cff9800 {
color: #ff9800; color: #ff9800;
} }
.ownScrollbarStyle .c04C8C8 { .ownScrollbarStyle .c04C8C8 {
color: #04c8c8; color: #04c8c8;
} }
.ownScrollbarStyle .c9e { .ownScrollbarStyle .c9e {
color: #9e9e9e; color: #9e9e9e;
} }
.ownScrollbarStyle .c059FF6 { .ownScrollbarStyle .c059FF6 {
color: #059ff6; color: #059ff6;
} }
.ownScrollbarStyle .c3FC4FF { .ownScrollbarStyle .c3FC4FF {
color: #3fc4ff; color: #3fc4ff;
} }
</style> </style>
src/components/busManagement/JapanBusOrderStatistics.vue
View file @ 05fd5d49
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
<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')" @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 :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'> :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -16,41 +17,37 @@ ...@@ -16,41 +17,37 @@
<li> <li>
<span> <span>
<em>团号</em> <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> </span>
</li> </li>
<li><span><em>{{$t('pub.date')}}</em> <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> </span>
</li> </li>
<li><span><em>是否完结</em></span> <li style="display:none;"><span><em>是否完结</em></span>
<el-select v-model='msg.IsFinish'> <el-select v-model='msg.IsFinish'>
<el-option label='全部' value='0' key='0'></el-option> <el-option label='全部' value='0' key='0'></el-option>
<el-option label='是' value='1' key='1'></el-option> <el-option label='是' value='1' key='1'></el-option>
</el-select> </el-select>
</li> </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> <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> </li>
</ul> </ul>
</div> </div>
<div class="mt10 fz14 color333 busIconStyle"> <div class="mt10 fz14 color333 busIconStyle">
车辆状态&nbsp;&nbsp;&nbsp;已确定:<span style="color:#4BCA81 ;">√</span>未确定:<span 车辆状态&nbsp;&nbsp;&nbsp;确定:<span style="color:#4BCA81 ;">√</span>暂定:<span style="color: #ff6600;">O</span>未操作:<span
style="color: #ff6600;">O</span>未分配:<span style="color:#E95252 ;">X</span> style="color:#E95252 ;">X</span>
</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" :loading="loading" @success="msg.pageIndex=1,GetList()">
</OrderList>
<OrderList :pagesTitle="Title" :OrderList="DataList" :loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
</div> </div>
<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>
...@@ -59,11 +56,9 @@ ...@@ -59,11 +56,9 @@
<script> <script>
import OrderList from './BookAcar/components/JapanOrderDetailList'; import OrderList from './BookAcar/components/JapanOrderDetailList';
export default { export default {
data() { data() {
return { return {
userInfo: {}, //用户信息
loading: false, loading: false,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
...@@ -76,34 +71,18 @@ ...@@ -76,34 +71,18 @@
IsFinish: "0", IsFinish: "0",
TCNUM: "" TCNUM: ""
}, },
Title:'日本车行运行统计表', Title: '印象车行派车单统计',
queryCommonData: { queryCommonData: {
PlaceList: [], CustomerList: [],
LineList: [],
LineTeamList: [],
}, },
thLengthTitle: [],
DataList: [], DataList: [],
colspanTotal: 0,
isCha: 0,
boxHeight: 0, boxHeight: 0,
showHotelObj: {
showPrice: false, //是否显示价格
showPay: false, //是否显示支付方式
showZhan: false, //占房时间
showBtnList: false, //是否下载、确认按钮
ShowTaxType: false, //显示税入税别
ShowRebateRatio: false, //显示返佣比列
ShowSupplier: false, //是否显示供应商
showCaozuoTime: false, //操作时间
colspanLength: 6 //跨行
}
} }
}, },
components: {OrderList components: {
OrderList
}, },
methods: { methods: {
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
...@@ -111,9 +90,10 @@ ...@@ -111,9 +90,10 @@
resetPageIndex() { resetPageIndex() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
this.getList();
}, },
getList() { getList() {
this.loading = true this.loading = true;
this.apipost('JapanCar_get_GetJapanOrderCarDayPageList', this.msg, res => { this.apipost('JapanCar_get_GetJapanOrderCarDayPageList', this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -122,22 +102,22 @@ ...@@ -122,22 +102,22 @@
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) })
}, },
getCustomerList(CustomerKeyWord){ getCustomerList(CustomerKeyWord) {
this.apipost('JapanCar_get_GetJapanCarCustomerList', {keyWord:CustomerKeyWord}, res => { this.apipost('JapanCar_get_GetJapanCarCustomerList', {
keyWord: CustomerKeyWord
}, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data; this.queryCommonData.CustomerList = res.data.data;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) })
}, },
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date(); let myDate = new Date();
let nowDate = let nowDate =
myDate.getFullYear() + myDate.getFullYear() +
...@@ -146,7 +126,7 @@ ...@@ -146,7 +126,7 @@
"-" + "-" +
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;
......
src/router/config.js
View file @ 05fd5d49
...@@ -2071,7 +2071,7 @@ export default { ...@@ -2071,7 +2071,7 @@ export default {
}, },
}, },
{ {
path: '/JapanBusOrderStatistics', //派車單統計(財務單據) path: '/JapanBusOrderStatistics', //派車單統計
name: 'JapanBusOrderStatistics', name: 'JapanBusOrderStatistics',
component: resolve => require(['@/components/busManagement/JapanBusOrderStatistics'], resolve), component: resolve => require(['@/components/busManagement/JapanBusOrderStatistics'], resolve),
meta: { meta: {
......
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