Skip to content

S
SuperMan
Commit c7be6b26 authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 1384d450 09ffcfff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 282 additions and 248 deletions
src/components/Hotel/HotelWorkList.vue
View file @ c7be6b26
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
</li> </li>
<li> <li>
<input type="button" class="normalBtn" value="查询" @click="getList()" /> <input type="button" class="normalBtn" value="查询" @click="getList()" />
<!-- <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" /> -->
</li> </li>
</ul> </ul>
</div> </div>
...@@ -36,19 +35,87 @@ ...@@ -36,19 +35,87 @@
<div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存 <div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存
</div> </div>
</template> </template>
<template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList"> <template v-else>
<template <template
v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0"> v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
<div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0"> <template v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
{{childItem.BookGroup}}</div> <div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'"
<div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==0">
v-if="childItem.DMCState==1"> {{childItem.BookGroup}}</div>
{{childItem.BookGroup}}</div> <div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'"
<div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==1">
v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div> {{childItem.BookGroup}}</div>
<div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'"
v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
</template>
</template> </template>
<template v-else> <template v-else>
<a style="text-decoration:underline;cursor:pointer;">添加酒店</a> <el-popover width="650" trigger="click" popper-class="Bus_HotelPop" style="display:none;">
<table v-loading="changeLoading">
<tr>
<th width="60">
选择
</th>
<th width="140">
团号
</th>
<th width="120">
酒店
</th>
<th width="120">
更换酒店
</th>
<th width="100">
OP状态
</th>
<th width="100">
地接状态
</th>
</tr>
<tr v-for="(hItem,hIndex) in ChangeHotelList">
<td>
<el-checkbox :checked="hItem.IsChecked" @change="ChangeStatus(hItem)"></el-checkbox>
</td>
<td style="text-align:center;">
{{hItem.TCNUM}}<br />({{hItem.TCID}})
</td>
<td style="text-align:left;">
{{hItem.OldHotelName}}
</td>
<td style="text-align:left;">
{{hItem.NewHotelName}}
</td>
<td>
<template v-if="hItem.OPState==1">
<a style="color:green">OP-指定</a>
</template>
<template v-else-if="hItem.OPState==2">
<a style="color:red">OP-暂定</a>
</template>
</td>
<td>
<template v-if="hItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else-if="hItem.DMCState==2">
<a style="color:red">地接-暂定</a>
</template>
<template v-else-if="hItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</td>
</tr>
<tfoot>
<tr>
<td colspan="6">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder(scope.row.Hotel)" />
</td>
</tr>
</tfoot>
</table>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
@click="GetChangeList(item.DateAllStr)">设置酒店</div>
</el-popover>
</template> </template>
</template> </template>
</template> </template>
...@@ -74,9 +141,14 @@ ...@@ -74,9 +141,14 @@
dataList: [], dataList: [],
loading: false, loading: false,
isShow: false, isShow: false,
changeLoading: false, //改变酒店loading
ChangeHotelList: [], //获取可变更的酒店列表
}; };
}, },
methods: { methods: {
ChangeStatus(item) {
item.IsChecked = !item.IsChecked;
},
GotoHotel(HotelId) { GotoHotel(HotelId) {
this.$router.push({ this.$router.push({
path: "HotelManagement", path: "HotelManagement",
...@@ -99,7 +171,6 @@ ...@@ -99,7 +171,6 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
this.isShow = true; this.isShow = true;
console.log("this.dataList", this.dataList);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -107,7 +178,58 @@ ...@@ -107,7 +178,58 @@
err => {} err => {}
); );
}, },
//获取可以改变的酒店列表
GetChangeList(useTime) {
this.changeLoading = true;
this.ChangeHotelList = [];
this.apipost("journeyorder_post_GetCanChangeHotelListService", {
UseTime: useTime
},
res => {
this.changeLoading = false;
if (res.data.resultCode == 1) {
this.ChangeHotelList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//保存酒店订单
SaveHotelOrder(HotelID) {
var newList=[];
if (this.ChangeHotelList && this.ChangeHotelList.length > 0) {
this.ChangeHotelList.forEach(item => {
if(item.IsChecked)
{
var Nitem=JSON.parse(JSON.stringify(item));
Nitem.NewHotelID=HotelID;
newList.push(Nitem);
}
});
}
if(newList&&newList.length>0)
{
this.apipost("journeyorder_post_SaveWorkHotelOrderService",newList,
res => {
if (res.data.resultCode == 1) {
con
} else {
this.Error(res.data.message);
}
},
err => {}
);
}else
{
this.Info("请选择团期!");
}
}
}, },
mounted() { mounted() {
this.msg.YearMonthStr = new Date().Format("yyyy-MM"); this.msg.YearMonthStr = new Date().Format("yyyy-MM");
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ c7be6b26
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</p> </p>
</td> </td>
<td style="white-space:nowrap; "> <td style="white-space:nowrap; ">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}} {{subItem.PayStyle === 1 && subItem.DMCPayType !== 9 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td> </td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1"> <template v-if="subItem.RebateType==1">
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ c7be6b26
...@@ -562,8 +562,8 @@ export default { ...@@ -562,8 +562,8 @@ export default {
} }
}, },
queren(type, OrderID){ queren(type, OrderID){
let text = type == 1 ? '确认' : '取消' let text = type == 1 ? '确认后，订单不会自动取消' : '取消后，订单会自动取消'
this.$confirm('确定“'+ text +'”订单？', this.$t('tips.tips'), { this.$confirm(text, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
...@@ -690,25 +690,26 @@ export default { ...@@ -690,25 +690,26 @@ export default {
}, },
//点击收款 //点击收款
getShouKuan(obj){ getShouKuan(obj){
let orderObj = { let TCIDARR = obj.TCID ? [obj.TCID] : [];
OrderID:obj.OrderID, let orderObj = {
OrderSource:1, OrderID:obj.OrderID,
Obj: {}, OrderSource:1,
SourceID:null, Obj: {},
TCIDList: [] SourceID:null,
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":1,
"companyID":obj.RB_Branch_id,
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj),
'tradeWay':1,
'platformAccount':0
} }
this.$router.push({ });
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":1,
"companyID":obj.RB_Branch_id,
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj),
'tradeWay':1,
'platformAccount':0
}
});
} }
}, },
mounted() { mounted() {
......
src/components/leaderPay2.vue
View file @ c7be6b26
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