Commit b2628406 authored by 黄奎's avatar 黄奎

11

parent cc38ce86
...@@ -150,7 +150,6 @@ ...@@ -150,7 +150,6 @@
</template> </template>
</font> </font>
</template> </template>
</el-tooltip> </el-tooltip>
</td> </td>
</template> </template>
......
...@@ -49,13 +49,24 @@ ...@@ -49,13 +49,24 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span><em>预定情况</em>
<el-select v-model="msg.CarIsPush" filterable :placeholder="$t('pub.pleaseSel')" clearable
@clear="getList()" @change="getList()">
<el-option label="已预订" :value="1" :key="1">
</el-option>
<el-option label="未预定" :value="2" :key="2">
</el-option>
</el-select>
</span>
</li>
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" />
</li> </li>
</ul> </ul>
</div> </div>
<div style="width: 98%; overflow-x: hidden;padding-bottom: 50px; " :style="{height: boxHeight + 'px'}" <div style="width: 98%; overflow-x: hidden;padding-bottom: 50px; " :style="{height: boxHeight + 'px'}"
class="ownScrollbarStyle" v-loading="loading"> class="ownScrollbarStyle" v-loading="loading" :element-loading-text="loadingText">
<table class="tripPlanTab" v-if="dataList&&dataList.length>0"> <table class="tripPlanTab" v-if="dataList&&dataList.length>0">
<thead> <thead>
<tr> <tr>
...@@ -104,15 +115,26 @@ ...@@ -104,15 +115,26 @@
<td v-if="subItem.DayNum==1" :colspan="subItem.ColumnNum>1? subItem.ColumnNum:0" <td v-if="subItem.DayNum==1" :colspan="subItem.ColumnNum>1? subItem.ColumnNum:0"
:key="`d2_`+index+`s2_`+subIndex"> :key="`d2_`+index+`s2_`+subIndex">
<el-tooltip :content="subItem.TCNUM+`(`+subItem.TCID+`),用车时间:`+subItem.StartDate+`至`+subItem.EndDate"> <el-tooltip :content="subItem.TCNUM+`(`+subItem.TCID+`),用车时间:`+subItem.StartDate+`至`+subItem.EndDate">
<font style="cursor:pointer;color:blue;text-decoration: underline" @click="gotoTeam(subItem)"> <!--color:blue;-->
<template v-if="subItem.DMCNum && subItem.DMCNum!=''"> <font style="cursor:pointer;text-decoration:underline;"
{{subItem.DMCNum}}<br/>(总机位:{{subItem.TotalSeat}} 订单人数:{{subItem.OrderNum}}+{{subItem.LeaderNum}}) :style="{color:subItem.CarIsPush==1?'blue':''}" @click="gotoTeam(subItem)">
</template>
<template v-else>
{{subItem.TCNUM}}<br/>(总机位:{{subItem.TotalSeat}} 订单人数:{{subItem.OrderNum}}+{{subItem.LeaderNum}})
</template>
</font> </font>
</el-tooltip> </el-tooltip>
<br />
<template v-if="subItem.DMCNum && subItem.DMCNum!=''">
{{subItem.DMCNum}}<br />(总机位:{{subItem.TotalSeat}}
订单人数:{{subItem.OrderNum}}+{{subItem.LeaderNum}})
</template>
<template v-else>
{{subItem.TCNUM}}<br />(总机位:{{subItem.TotalSeat}}
订单人数:{{subItem.OrderNum}}+{{subItem.LeaderNum}})
</template>
<template v-if="subItem.MainId>0 && (subItem.CarName&&subItem.CarName!='')">
<br />
{{subItem.CarName}}({{subItem.CarNo}}) {{subItem.DriverName}}({{subItem.DriverTel}})
</template>
&nbsp;
<el-button v-if="subItem.CarIsPush!=1" type="text" @click="setBusOrder(subItem)">同步</el-button>
</td> </td>
</template> </template>
<template v-else> <template v-else>
...@@ -131,9 +153,11 @@ ...@@ -131,9 +153,11 @@
data() { data() {
return { return {
loading: false, loading: false,
loadingText: "",
msg: { msg: {
MonthStr: "", MonthStr: "",
QBranchId: "", //出团公司 QBranchId: "", //出团公司
CarIsPush: "", //预定情况(1-已预订,2-未预定)
}, },
headerList: [], //表头 headerList: [], //表头
dataList: [], dataList: [],
...@@ -143,6 +167,46 @@ ...@@ -143,6 +167,46 @@
}, },
components: {}, components: {},
methods: { methods: {
//同步车订单
setBusOrder(item) {
var that = this;
var tipMsg = "是否要同步信息到车系统?"
that.Confirm(tipMsg, function () {
var orderMsg = {
TCIDS: item.TCID,
NewCombinationNum: ''
};
if (item.DMCNum && item.DMCNum != '') {
orderMsg.NewCombinationNum = item.DMCNum;
} else {
orderMsg.NewCombinationNum = item.TCNUM;
}
that.loading = true;
that.loadingText = "正在同步数据...";
that.apipost('dmcstatistics_get_SetBusJapanOrder', orderMsg, res => {
that.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
that.goToBus(res.data.data);
} else {
this.Error(res.data.message);
}
})
});
},
//跳转到车订单
goToBus(mainOrderId) {
let carUrl = this.domainManager().CarUrl;
var nPath = "CarPlaceOrder/" + mainOrderId + "/1";
var that = this;
this.apipost("travel_temp_token", {}, res => {
if (res.data.resultCode == 1) {
let newUrl = carUrl + "/auth/autologin?tk=" + res.data.data + "&gpath=" + nPath;
window.open(newUrl)
}
})
},
//初始化公司 //初始化公司
getCompanyList() { getCompanyList() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -186,6 +250,7 @@ ...@@ -186,6 +250,7 @@
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.loadingText = "数据加载中...";
this.dataList = []; this.dataList = [];
this.headerList = []; this.headerList = [];
this.apipost('travel_post_GetJourneyCarPlanList', this.msg, res => { this.apipost('travel_post_GetJourneyCarPlanList', this.msg, res => {
......
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