Commit 2682482a authored by 黄奎's avatar 黄奎
parents 698a8115 6c56f569
...@@ -215,10 +215,10 @@ ...@@ -215,10 +215,10 @@
:key='item.ID'> :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<el-select filterable v-if="msg.ClientType==7&&!showDisable" v-model='msg.IsLeader' :placeholder="$t('fnc.khmingcheng')" class="w135 _border_b_1"> <!-- <el-select filterable v-if="msg.ClientType==7&&!showDisable" v-model='msg.IsLeader' :placeholder="$t('fnc.khmingcheng')" class="w135 _border_b_1">
<el-option :label='$t("fnc.zslingdui")' :value='1' :key='1'> </el-option> <el-option :label='$t("fnc.zslingdui")' :value='1' :key='1'> </el-option>
<el-option :label='$t("fnc.lslingdui")' :value='0' :key='0'> </el-option> <el-option :label='$t("fnc.lslingdui")' :value='0' :key='0'> </el-option>
</el-select> </el-select> -->
<template v-if="msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable"> <template v-if="msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable">
<el-select v-if="msg.IsLeader==1" filterable v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1"> <el-select v-if="msg.IsLeader==1" filterable v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1">
<el-option v-for='item in ClientAccountList' <el-option v-for='item in ClientAccountList'
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<th>备注</th> <th>备注</th>
</tr> </tr>
<template v-for='(item,index) in dataList'> <template v-for='(item,index) in dataList'>
<!-- <template v-for="(subItem,subIndex) in item.ScenicStatisticsList"> --> <template v-if="item.ReimburseList && item.ReimburseList.length">
<tr v-for="(childItem,childIndex) in item.ReimburseList.ReimburseDetailsList"> <tr v-for="(childItem,childIndex) in item.ReimburseList.ReimburseDetailsList" >
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">{{item.CheckInDateStr}}</td> <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">{{item.CheckInDateStr}}</td>
<td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length"> <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
{{item.HotelName}} {{item.HotelName}}
...@@ -52,7 +52,11 @@ ...@@ -52,7 +52,11 @@
{{item.ReimburseList.Remarks}} {{item.ReimburseList.Remarks}}
</td> </td>
</tr> </tr>
<!-- </template> --> </template>
<tr v-else>
<td colspan="9">暂无数据</td>
</tr>
</template> </template>
</table> </table>
......
...@@ -1646,8 +1646,10 @@ ...@@ -1646,8 +1646,10 @@
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="已出中段" placement="top-start" <el-tooltip class="item" effect="dark" content="已出中段" placement="top-start"
v-show="item.TicketState==0"> v-show="item.TicketState==0">
<el-button type="primary" class="iconfont icon-zhongzhuan" @click="UpdateTicketState(item.ID,2)"> <el-button type="primary" class="iconfont icon-zhongzhuan" @click="ZhongDuanPNR = true, ZhongDuanID= item.ID">
</el-button> </el-button>
<!-- <el-button type="primary" class="iconfont icon-zhongzhuan" @click="UpdateTicketState(item.ID,2)">
</el-button> -->
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="出票完成" placement="top-start" <el-tooltip class="item" effect="dark" content="出票完成" placement="top-start"
v-show="item.TicketState!=1"> v-show="item.TicketState!=1">
...@@ -2149,7 +2151,17 @@ ...@@ -2149,7 +2151,17 @@
</div> </div>
</el-form> </el-form>
<el-dialog custom-class="w400" :title="importFileTitle" :visible.sync="ZhongDuanPNR" center>
<el-form label-width="110px">
<el-form-item label="中段PNR">
<el-input v-model="MidpiecePNR"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="dialogFormVisible=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="UpdateTicketState(ZhongDuanID, 2)">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class="w700" :title="importFileTitle" :visible.sync="outerVisible" center> <el-dialog custom-class="w700" :title="importFileTitle" :visible.sync="outerVisible" center>
<el-upload v-if="uploadDoc" ref="ticketUpload" drag class="upload-demo" :action="getImportFileUrl()" <el-upload v-if="uploadDoc" ref="ticketUpload" drag class="upload-demo" :action="getImportFileUrl()"
:on-success="handleAvatarSuccess"> :on-success="handleAvatarSuccess">
...@@ -2186,6 +2198,9 @@ ...@@ -2186,6 +2198,9 @@
} }
} }
return { return {
MidpiecePNR: '',
ZhongDuanID: 0,
ZhongDuanPNR: false,
outerVisible1: false, outerVisible1: false,
//导入文件弹窗标题 //导入文件弹窗标题
importFileTitle: "批量导入", importFileTitle: "批量导入",
...@@ -2857,7 +2872,8 @@ ...@@ -2857,7 +2872,8 @@
this.apipost( this.apipost(
"AirTicket_get_UpdateTicketState", { "AirTicket_get_UpdateTicketState", {
ID: ID, ID: ID,
TicketState: TicketState TicketState: TicketState,
MidpiecePNR: this.MidpiecePNR
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -2866,6 +2882,7 @@ ...@@ -2866,6 +2882,7 @@
} else { } else {
this.Warning(res.data.message); this.Warning(res.data.message);
} }
this.ZhongDuanPNR=false
}, },
err => {} err => {}
); );
......
...@@ -224,7 +224,7 @@ input[type="number"] { ...@@ -224,7 +224,7 @@ input[type="number"] {
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length"> <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{scenicTotalPrice(subItem, subItem.TicketPriceList)}} {{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
</td> </td>
<td v-if="childIndex==0 && subIndex ==0" :rowspan="item.data.length*subItem.TicketPriceList.length"> <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.TradingTotalPrice}} {{subItem.TradingTotalPrice}}
</td> </td>
...@@ -436,7 +436,7 @@ input[type="number"] { ...@@ -436,7 +436,7 @@ input[type="number"] {
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length"> <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{item.CheckInDateStr}} {{item.CheckInDateStr}}
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length"> <td v-if="subIndex==0 && childIndex == 0" :rowspan="item.row">
{{subItem.HotelName}} {{subItem.HotelName}}
</td> </td>
<td> <td>
...@@ -488,11 +488,11 @@ input[type="number"] { ...@@ -488,11 +488,11 @@ input[type="number"] {
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length"> <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{hotelTotalPrice(subItem.OrderDetailsList)}} {{hotelTotalPrice(subItem.OrderDetailsList)}}
</td> </td>
<td v-if="childIndex==0 && subIndex ==0" :rowspan="subItem.OrderDetailsList.length * item.data.length">{{subItem.TradingTotalPrice}}</td> <td v-if="subIndex==0 && childIndex == 0" :rowspan="item.row">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length"> <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.Remarks}} {{subItem.Remarks}}
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length"><span class="cursorpointer text-decoratio" @click="godetail('hotel', subItem)">明细</span></td> <td v-if="childIndex==0 && subIndex ==0" :rowspan="item.row"><span class="cursorpointer text-decoratio" @click="godetail('hotel', subItem)">明细</span></td>
</tr> </tr>
</template> </template>
</template> </template>
...@@ -1206,14 +1206,11 @@ export default { ...@@ -1206,14 +1206,11 @@ export default {
date = obj ? obj.UseTimeStr : 'all' date = obj ? obj.UseTimeStr : 'all'
} else if (name === 'bus') { } else if (name === 'bus') {
path="CarDetails" path="CarDetails"
TCIDs=obj.TCIDs; date=obj?obj.UseTime:'all';
date=obj.UseTime;
} else if (name === 'dining') { } else if (name === 'dining') {
path="DinningDetails" path="DinningDetails"
TCIDs=obj.TCIDs; date=obj?obj.UseTimeStr:'all';
date=obj.UseTimeStr;
} else if (name === 'hotel') { } else if (name === 'hotel') {
path = 'leaderPayHotelDetail' path = 'leaderPayHotelDetail'
date = obj ? obj.CheckInDateStr : 'all' date = obj ? obj.CheckInDateStr : 'all'
...@@ -1677,6 +1674,7 @@ export default { ...@@ -1677,6 +1674,7 @@ export default {
ScenicList.push(res.data.data.ScenicList[i].ScenicStatisticsList[o]) ScenicList.push(res.data.data.ScenicList[i].ScenicStatisticsList[o])
} }
} }
console.log(ScenicList)
var Scenicmap = {}, var Scenicmap = {},
Scenicdest = []; Scenicdest = [];
for(var i = 0; i < ScenicList.length; i++){ for(var i = 0; i < ScenicList.length; i++){
...@@ -1691,7 +1689,7 @@ export default { ...@@ -1691,7 +1689,7 @@ export default {
}else{ }else{
for(var j = 0; j < Scenicdest.length; j++){ for(var j = 0; j < Scenicdest.length; j++){
var dj = Scenicdest[j]; var dj = Scenicdest[j];
if(dj.UseTimeStr == ai.UseTimeStr && dj.TicketID == ai.TicketID){ if(dj.UseTimeStr == ai.UseTimeStr){
dj.data.push(ai); dj.data.push(ai);
break; break;
} }
...@@ -1727,6 +1725,13 @@ export default { ...@@ -1727,6 +1725,13 @@ export default {
} }
} }
} }
for(var i = 0; i < Hoteldest.length; i++){
let row = 0;
for(var l = 0; l < Hoteldest[i].data.length; l++){
row = row + Hoteldest[i].data[l].OrderDetailsList.length
}
Hoteldest[i].row = row
}
this.HotelDataList = Hoteldest this.HotelDataList = Hoteldest
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
......
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