Skip to content

S
SuperMan
Commit bdfc7d2b authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

合并代码

parents 58819207 994ab4ed
Hide whitespace changes
Inline Side-by-side
Showing with 813 additions and 372 deletions
src/components/Hotel/HotelWorkList.vue
View file @ bdfc7d2b
...@@ -38,84 +38,26 @@ ...@@ -38,84 +38,26 @@
<template v-else> <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">
<template v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList"> <template v-for="(childItem,childIndex) in scope.row.DayList[index].HotelJourneyOrderList">
<div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" <div :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0" slot="reference" class="w80"
v-if="childItem.DMCState==0"> style="white-space:nowrap;color:red;cursor:pointer;text-decoration:underline;"
@click="outerVisible=true,GetChangeHotelList(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
{{childItem.BookGroup}}</div> {{childItem.BookGroup}}</div>
<div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'" <div :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1" slot="reference" class="w80"
v-if="childItem.DMCState==1"> style="white-space:nowrap;color:green;cursor:pointer;text-decoration:underline;"
@click="outerVisible=true,GetChangeHotelList(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
{{childItem.BookGroup}} </div>
<div :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2" slot="reference" class="w80"
style="white-space:nowrap;color:#3333CC;;cursor:pointer;text-decoration:underline;"
@click="outerVisible=true,GetChangeHotelList(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
{{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>
<template v-else> <template v-else>
<el-popover width="650" trigger="click" popper-class="Bus_HotelPop" style="display:none;"> <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
<table v-loading="changeLoading"> @click="outerVisible=true,GetChangeHotelList(item.DateAllStr,scope.row.Hotel,0)">设置酒店
<tr> </div>
<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>
...@@ -126,9 +68,81 @@ ...@@ -126,9 +68,81 @@
<p>{{$t("active.ld_noData")}}</p> <p>{{$t("active.ld_noData")}}</p>
</div> </div>
</template> </template>
<el-dialog custom-class='Tp_hotelDialog' :title="'【'+CurrentDateStr+'】团期酒店信息列表'" :visible.sync="outerVisible" center>
<table v-loading="changeLoading">
<tr>
<th width="60" style="text-align:center;">
选择
</th>
<th width="145" style="text-align:center;">
团号
</th>
<th width="140" style="text-align:center;">
地接团号
</th>
<th width="120" style="text-align:center;">
酒店
</th>
<th width="120" style="text-align:center;">
更换酒店
</th>
<th width="100" style="text-align:center;">
OP状态
</th>
<th width="100" style="text-align:center;">
地接状态
</th>
</tr>
<tr v-for="(hItem,hIndex) in MyDataList">
<td style="text-align:center;">
<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:center;">
{{hItem.DMCNum}}
</td>
<td style="text-align:left;">
{{hItem.OldHotelName}}
</td>
<td style="text-align:left;">
{{hItem.NewHotelName}}
</td>
<td style="text-align:center;">
<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 style="text-align:center;">
<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="7" style="text-align:center;">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder()" />
<input type="button" class="normalBtn" value="关闭" @click="CloseHotel()" />
</td>
</tr>
</tfoot>
</table>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import commonHotelWork from "../commonPage/commonHotelWork.vue";
export default { export default {
data() { data() {
return { return {
...@@ -138,17 +152,20 @@ ...@@ -138,17 +152,20 @@
CountryId: 651, //只查询日本 CountryId: 651, //只查询日本
}, },
defaultSelectValue: 0, defaultSelectValue: 0,
HotelId: 0,
dataList: [], dataList: [],
loading: false, loading: false,
isShow: false, isShow: false,
changeLoading: false, //改变酒店loading changeLoading: false, //改变酒店loading
ChangeHotelList: [], //获取可变更的酒店列表 MyDataList: [], //获取可变更的酒店列表
outerVisible: false,
CurrentDateStr:"",//选中的日期
}; };
}, },
components: {
commonHotelWork
},
methods: { methods: {
ChangeStatus(item) {
item.IsChecked = !item.IsChecked;
},
GotoHotel(HotelId) { GotoHotel(HotelId) {
this.$router.push({ this.$router.push({
path: "HotelManagement", path: "HotelManagement",
...@@ -159,77 +176,95 @@ ...@@ -159,77 +176,95 @@
} }
}); });
}, },
getList() { ChangeStatus(item) {
this.loading = true; item.IsChecked = !item.IsChecked;
this.dataList = []; },
if (this.msg.YearMonthStr == "") { CloseHotel()
this.msg.YearMonthStr = new Date().Format("yyyy-MM"); {
} this.outerVisible=false;
this.apipost("hotel_post_GetHotelWorkListService", this.msg, this.HotelId=0;
res => { this.MyDataList=[];
this.loading = false; this.CurrentDateStr='';
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
this.isShow = true;
} else {
this.Error(res.data.message);
}
},
err => {}
);
}, },
//获取可以改变的酒店列表 //获取可以改变的酒店列表
GetChangeList(useTime) { GetChangeHotelList(DateStr, HotelId,TCID) {
this.CurrentDateStr=DateStr;
this.changeLoading = true; this.changeLoading = true;
this.ChangeHotelList = []; this.HotelId=HotelId;
this.MyDataList = [];
var that = this;
this.apipost("journeyorder_post_GetCanChangeHotelListService", { this.apipost("journeyorder_post_GetCanChangeHotelListService", {
UseTime: useTime UseTime: DateStr
}, },
res => { res => {
this.changeLoading = false; that.changeLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.ChangeHotelList = res.data.data; var nArray = res.data.data;
nArray.forEach(item => {
if (item.TCID == TCID) {
item.IsChecked = true;
}
});
that.MyDataList = nArray;
} else { } else {
this.Error(res.data.message); that.Error(res.data.message);
} }
}, },
err => {} err => {}
); );
}, },
//保存酒店订单 //保存酒店订单
SaveHotelOrder(HotelID) { SaveHotelOrder() {
var that = this;
var newList=[]; that.Confirm("是否要替换选中的酒店?", function () {
if (this.ChangeHotelList && this.ChangeHotelList.length > 0) { var newList = [];
this.ChangeHotelList.forEach(item => { if (that.MyDataList && that.MyDataList.length > 0) {
if(item.IsChecked) that.MyDataList.forEach(item => {
{ if (item.IsChecked) {
var Nitem=JSON.parse(JSON.stringify(item)); var Nitem = JSON.parse(JSON.stringify(item));
Nitem.NewHotelID=HotelID; Nitem.NewHotelID = that.HotelId;
newList.push(Nitem); newList.push(Nitem);
} }
}); });
}
if (newList && newList.length > 0) {
that.apipost("journeyorder_post_SaveWorkHotelOrderService", newList,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
that.CloseHotel();
} else {
that.Error(res.data.message);
}
},
err => {}
);
} else {
that.Info("请选择团期!");
}
});
},
getList() {
this.loading = true;
this.isShow = false;
this.dataList = [];
if (this.msg.YearMonthStr == "") {
this.msg.YearMonthStr = new Date().Format("yyyy-MM");
} }
if(newList&&newList.length>0) this.apipost("hotel_post_GetHotelWorkListService", this.msg,
{
this.apipost("journeyorder_post_SaveWorkHotelOrderService",newList,
res => { res => {
this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
con this.dataList = res.data.data;
this.isShow = true;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
err => {} 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/leaderPerformance.vue
View file @ bdfc7d2b
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
} }
.guidPerformance .leftTop { .guidPerformance .leftTop {
width: 810px; width: 1010px;
height: 360px; height: 360px;
border: 1px solid #E6E6E6; border: 1px solid #E6E6E6;
background-color: #fff; background-color: #fff;
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
.guidPerformance .bottomList { .guidPerformance .bottomList {
float: left; float: left;
width: 399px; width: 495px;
height: 230px; height: 230px;
border: 1px solid #E6E6E6; border: 1px solid #E6E6E6;
border-radius: 4px; border-radius: 4px;
...@@ -329,6 +329,14 @@ ...@@ -329,6 +329,14 @@
<el-option label="回佣人均" :value='5'></el-option> <el-option label="回佣人均" :value='5'></el-option>
<el-option label="人均低于1W" :value='7'></el-option> <el-option label="人均低于1W" :value='7'></el-option>
</el-option> </el-option>
<el-option label="带团次数" :value='8'></el-option>
</el-option>
<el-option label="自费总金额" :value='9'></el-option>
</el-option>
<el-option label="自费人均" :value='10'></el-option>
</el-option>
<el-option label="自费次数" :value='11'></el-option>
</el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -374,9 +382,25 @@ ...@@ -374,9 +382,25 @@
人均低于1W 人均低于1W
<i></i> <i></i>
</li> </li>
<li :class="msg.Type==8?'Day_active':''" @click="msg.Type=8,getStatis()" title="带团次数">
带团次数
<i></i>
</li>
<li :class="msg.Type==9?'Day_active':''" @click="msg.Type=9,getStatis()" title="自费总金额">
自费总金额
<i></i>
</li>
<li :class="msg.Type==10?'Day_active':''" @click="msg.Type=10,getStatis()" title="自费人均">
自费人均
<i></i>
</li>
<li :class="msg.Type==11?'Day_active':''" @click="msg.Type=11,getStatis()" title="自费次数">
自费次数
<i></i>
</li>
</ul> </ul>
<div class="ChampionsLeague clearfix"> <div class="ChampionsLeague clearfix">
<template v-if="msg.Type!=7"> <template v-if="msg.Type<7">
<div class="championList" v-for="item in yajun" :key="item.subCode"> <div class="championList" v-for="item in yajun" :key="item.subCode">
<div class="runnderUp"> <div class="runnderUp">
<img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg"> <img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
...@@ -411,26 +435,48 @@ ...@@ -411,26 +435,48 @@
<template v-else> <template v-else>
<table class="singeRowTable" style="margin-top:5px;"> <table class="singeRowTable" style="margin-top:5px;">
<tr> <tr>
<th width="100">编号</th> <th width="100">编号</th>
<th width="100">姓名</th> <th width="100">姓名</th>
<th width="200">人均回佣金额</th> <th width="200">
<template v-if="msg.Type==7">
人均回佣金额
</template>
<template v-if="msg.Type==8">
带团次数
</template>
<template v-if="msg.Type==9">
自费总金额
</template>
<template v-if="msg.Type==10">
自费人均
</template>
<template v-if="msg.Type==11">
自费次数
</template>
</th>
</tr> </tr>
<tr v-for="(item,index) in DataList"> <tr v-for="(item,index) in DataList">
<td> <td>
{{index+1}} {{index+1}}
</td> </td>
<td> <td>
{{item.Name}} {{item.Name}}
</td> </td>
<td> <td>
￥{{item.LeaderExtract}} <template v-if="msg.Type==7">
￥
</template>
{{item.LeaderExtract}}
<template v-if="msg.Type==8">
次
</template>
</td> </td>
</tr> </tr>
</table> </table>
</template> </template>
</div> </div>
</div> </div>
<template v-if="msg.Type!=7"> <template v-if="msg.Type<7">
<div class="leftBottom clearfix"> <div class="leftBottom clearfix">
<div class="bottomList"> <div class="bottomList">
<div class="btLittle" v-for="(item,index) in fourToSeven" :key="item.subCode"> <div class="btLittle" v-for="(item,index) in fourToSeven" :key="item.subCode">
...@@ -461,7 +507,7 @@ ...@@ -461,7 +507,7 @@
</div> </div>
</template> </template>
</div> </div>
<template v-if="msg.Type!=7"> <template v-if="msg.Type<7">
<div class="rightDiv"> <div class="rightDiv">
<div class="_btTitle" v-for="(item,index) in twelveToTwenty" :key="item.subCode"> <div class="_btTitle" v-for="(item,index) in twelveToTwenty" :key="item.subCode">
<div class="tweleindex">{{12+index}}</div> <div class="tweleindex">{{12+index}}</div>
...@@ -539,7 +585,7 @@ ...@@ -539,7 +585,7 @@
this.apipost("LeaderSchedule_get_GetLeaderList", msg, res => { this.apipost("LeaderSchedule_get_GetLeaderList", msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DataList =JSON.parse(JSON.stringify(res.data.data)); this.DataList = JSON.parse(JSON.stringify(res.data.data));
var nArray = JSON.parse(JSON.stringify(res.data.data)); var nArray = JSON.parse(JSON.stringify(res.data.data));
if (nArray && nArray.length > 0) { if (nArray && nArray.length > 0) {
this.Champion = nArray.splice(0, 1); this.Champion = nArray.splice(0, 1);
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ bdfc7d2b
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<th width="100">使用时间</th> <th width="100">使用时间</th>
<th width="80">司机姓名</th> <th width="80">司机姓名</th>
<th width="80">司机电话</th> <th width="80">司机电话</th>
<th width="80">车辆大小</th> <th width="80">车辆大小</th>
<th width="100">车配号</th> <th width="100">车配号</th>
<th width="100">车辆号</th> <th width="100">车辆号</th>
<th width="60">用车方式</th> <th width="60">用车方式</th>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</td> </td>
</tr> </tr>
<template> <template>
<tr v-if="TotalNav.busPrice && TotalNav.busPrice.length"> <tr v-if="TotalNav.busPrice && TotalNav.busPrice.length">
<td>总金额</td> <td>总金额</td>
<td colspan="16"> <td colspan="16">
<span v-for="item in TotalNav.busPrice"> <span v-for="item in TotalNav.busPrice">
...@@ -135,9 +135,9 @@ ...@@ -135,9 +135,9 @@
</span> </span>
</td> </td>
</tr> </tr>
<tr v-else> <tr v-else>
<td>总金额</td> <td>总金额</td>
<td colspan="16"> <td colspan="16">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4">
现付：{{plan.PlanTotalPrice}} 现付：{{plan.PlanTotalPrice}}
</span> </span>
...@@ -147,10 +147,10 @@ ...@@ -147,10 +147,10 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th colspan="24" class="bgwhite">酒店使用 </th> <th colspan="25" class="bgwhite">酒店使用 </th>
</tr> </tr>
<tr> <tr>
<th colspan="24" class="bgwhite"> <th colspan="25" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br /> 税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br /> 税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
司导间【月结】不计入总金额 司导间【月结】不计入总金额
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
<th width="60">税入<br />税别</th> <th width="60">税入<br />税别</th>
<th width="60">总金额</th> <th width="60">总金额</th>
<th width="60">付款<br />方式</th> <th width="60">付款<br />方式</th>
<th width="60">币种</th>
<th width="60">司导间<br />付款方式</th> <th width="60">司导间<br />付款方式</th>
<th width="100">供应商</th> <th width="100">供应商</th>
<th width="100">状态</th> <th width="100">状态</th>
...@@ -238,7 +239,7 @@ ...@@ -238,7 +239,7 @@
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
<!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}} --> <!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}} -->
{{moneyFormat(childItem.UnitPrice)}} {{moneyFormat(childItem.UnitPrice)}}
</p> </p>
</td> </td>
<td style="white-space:nowrap; "> <td style="white-space:nowrap; ">
...@@ -308,6 +309,9 @@ ...@@ -308,6 +309,9 @@
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td v-if="childIndex==0" :rowspan="6">
{{GetCurrency(subItem.CurrencyId)}}
</td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
<span v-if="subItem.DMCPayType === 1">现付</span> <span v-if="subItem.DMCPayType === 1">现付</span>
<span v-else-if="subItem.DMCPayType === 2">签单</span> <span v-else-if="subItem.DMCPayType === 2">签单</span>
...@@ -346,9 +350,9 @@ ...@@ -346,9 +350,9 @@
</template> </template>
<tr v-if="TotalNav.planPriceList"> <tr v-if="TotalNav.planPriceList">
<td>总金额</td> <td>总金额</td>
<td colspan="23"> <td colspan="24">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span> </span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}} --> <!-- {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}} -->
</td> </td>
...@@ -356,7 +360,7 @@ ...@@ -356,7 +360,7 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th colspan="12" class="bgwhite">餐食使用</th> <th colspan="13" class="bgwhite">餐食使用</th>
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="100">使用时间</th> <th width="100">使用时间</th>
...@@ -370,6 +374,7 @@ ...@@ -370,6 +374,7 @@
<th width="">返佣</th> <th width="">返佣</th>
<th width="">总金额</th> <th width="">总金额</th>
<th width="">付款方式</th> <th width="">付款方式</th>
<th width="">币种</th>
<th width="100">备注</th> <th width="100">备注</th>
</tr> </tr>
<template v-for='(item,index) in list.DiningList'> <template v-for='(item,index) in list.DiningList'>
...@@ -395,7 +400,6 @@ ...@@ -395,7 +400,6 @@
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
{{ moneyFormat(childItem.PeoplePrice) }} {{ moneyFormat(childItem.PeoplePrice) }}
<!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} -->
</p> </p>
</td> </td>
<td> <td>
...@@ -415,6 +419,9 @@ ...@@ -415,6 +419,9 @@
<span v-else></span> <span v-else></span>
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{GetCurrency(subItem.CurrencyId)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{subItem.Remarks}} {{subItem.Remarks}}
...@@ -424,9 +431,9 @@ ...@@ -424,9 +431,9 @@
</template> </template>
<tr v-if="TotalNav.planPriceList"> <tr v-if="TotalNav.planPriceList">
<td>总金额</td> <td>总金额</td>
<td colspan="11"> <td colspan="12">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span> </span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}} --> <!-- {{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}} -->
</td> </td>
...@@ -471,7 +478,7 @@ ...@@ -471,7 +478,7 @@
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
<!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} --> <!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} -->
{{ moneyFormat(childItem.PeoplePrice)}} {{ moneyFormat(childItem.PeoplePrice)}}
</p> </p>
</td> </td>
<td> <td>
...@@ -502,7 +509,7 @@ ...@@ -502,7 +509,7 @@
<td>总金额</td> <td>总金额</td>
<td colspan="11"> <td colspan="11">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span> </span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}} --> <!-- {{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}} -->
</td> </td>
...@@ -555,19 +562,20 @@ ...@@ -555,19 +562,20 @@
<td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额： <td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额：
<span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{cur.money}} <span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{cur.money}}
<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span> <span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
</br></span> </br></span>
</td> </td>
<td style="padding: 5px 20px;"> <td style="padding: 5px 20px;">
<div style="margin:10px 0" v-for="cur in CurrencyListMoney"> <div style="margin:10px 0" v-for="cur in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr"> <template v-for="leadr in cur.LeaderGetPriceArr">
<p style="padding-left:20px;display:inline-block" > <p style="padding-left:20px;display:inline-block">
已领款： 已领款：
<span style="color: red;"> <span style="color: red;">
{{moneyFormat(leadr.LeaderGetPrice)}} {{moneyFormat(leadr.LeaderGetPrice)}}
<span v-if="cur.CurrencyId > 0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span> <span v-if="cur.CurrencyId > 0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span>
</span> </span>
</p> </p>
<el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number" v-model="leadr.LeaderGetPriceT"></el-input> <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
v-model="leadr.LeaderGetPriceT"></el-input>
</template> </template>
</div> </div>
</td> </td>
...@@ -581,9 +589,11 @@ ...@@ -581,9 +589,11 @@
<td width="80" class="_zhidan"> <td width="80" class="_zhidan">
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney"> <div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr"> <template v-for="leadr in cur.LeaderGetPriceArr">
<input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn" @click="goZhiDan(item, 2)" /> <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
@click="goZhiDan(item, 2)" />
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top"> <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr)" /> <input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn"
@click="goZhiDan(item,0,leadr)" />
</el-tooltip> </el-tooltip>
</template> </template>
</div> </div>
...@@ -591,91 +601,90 @@ ...@@ -591,91 +601,90 @@
</tr> </tr>
</table> </table>
<table border="0" cellspacing="1" class="leaderReimbursementTable"> <table border="0" cellspacing="1" class="leaderReimbursementTable">
<tr> <tr>
<th :colspan="7"> <th :colspan="7">
<span >追加团款</span> <span>追加团款</span>
</th> </th>
<th :colspan="1"><input <th :colspan="1"><input type="button" value="制单" class="leader2Btn" @click="ZhuiJiaTuanKuan()"></th>
type="button" </tr>
value="制单" <tr>
class="leader2Btn" <th>单号</th>
@click="ZhuiJiaTuanKuan()"></th> <th>所属公司</th>
</tr> <th>单据类型</th>
<tr> <th>费用类型</th>
<th>单号</th> <th>交易方式</th>
<th>所属公司</th> <th>金额</th>
<th>单据类型</th> <th>付款对象</th>
<th>费用类型</th> <th>制单人员</th>
<th>交易方式</th> </tr>
<th>金额</th> <tr class="_item_list" v-for="(item,index) in zhuijiaList">
<th>付款对象</th> <td>{{item.BranchName}}</td>
<th>制单人员</th> <td class="Bill_par">
</tr> <el-popover popper-class="detailsIT_Journal" placement="bottom-start" trigger="click">
<tr class="_item_list" v-for="(item,index) in zhuijiaList"> <template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
<td>{{item.BranchName}}</td> <my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<td class="Bill_par"> </template>
<el-popover <template v-else-if="item.Type==1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
popper-class="detailsIT_Journal" <my-RVB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
placement="bottom-start" </template>
trigger="click"> <template v-else-if="item.Type==7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
<template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)"> <my-GZ-Bill :ID="item.FrID" :width="'1000px'" :color="colorSon"></my-GZ-Bill>
<my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill> </template>
</template> <template v-else-if="item.Is_Merge===1&&item.modelShow">
<template v-else-if="item.Type==1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)"> <my-HB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
<my-RVB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill> </template>
</template> <span slot="reference" @click="item.modelShow = true" class="text_d PingFangSC">{{item.FrID}}</span>
<template v-else-if="item.Type==7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)"> </el-popover>
<my-GZ-Bill :ID="item.FrID" :width="'1000px'" :color="colorSon"></my-GZ-Bill> </td>
</template> <td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
<template v-else-if="item.Is_Merge===1&&item.modelShow"> </td>
<my-HB-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <td>
</template> <template v-for="(s,si) in item.CostTypeList">
<span slot="reference" @click="item.modelShow = true" class="text_d PingFangSC" >{{item.FrID}}</span> <span class="_tag_span">{{s}}</span><br />
</el-popover> </template>
</td> </td>
<td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span></td> <td class="_number">
<td> <template v-if="item.TradeWayList&&item.TradeWayList.length>0">
<template v-for="(s,si) in item.CostTypeList"> <div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList">
<span class="_tag_span">{{s}}</span><br/> <p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span
</template> class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type"
</td> :class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span>
<td class="_number"> </p>
<template v-if="item.TradeWayList&&item.TradeWayList.length>0"> <p>{{tw.BankNo}}</p>
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList"> </div>
<p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type" :class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span> </p> </template>
<p>{{tw.BankNo}}</p> <template v-else>
</div> <div class="_pad5">
</template> {{$t('fnc.no')}}
<template v-else> </div>
<div class="_pad5"> </template>
{{$t('fnc.no')}} </td>
</div> <td>
</template> <p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.Money)}}</span>
</td> </p>
<td> <p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span
<p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.Money)}}</span></p> class="">{{moneyFormat(item.PayMoney)}}</span></p>
<p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p> </td>
</td> <td>
<td> <template v-if='item.Type===1'>
<template v-if='item.Type===1'> <span class="_color_gar">{{$t('fnc.huikuanren')}}：</span><span>{{item.RemitterName}}</span>
<span class="_color_gar">{{$t('fnc.huikuanren')}}：</span><span>{{item.RemitterName}}</span> </template>
</template> <template v-if='item.Type===2'>
<template v-if='item.Type===2'> <span class="_color_gar">{{$t('fnc.fkduixiang')}}：</span><span>{{item.RemitterName}}</span>
<span class="_color_gar">{{$t('fnc.fkduixiang')}}：</span><span>{{item.RemitterName}}</span> </template>
</template> <template v-if='item.Type===4'>
<template v-if='item.Type===4'> <span class="_color_gar">{{$t('fnc.no')}}</span>
<span class="_color_gar">{{$t('fnc.no')}}</span> </template>
</template> </td>
</td> <td valign="middle">
<td valign="middle"> <img class="_head_img" :src="item.EmPhoto" alt="">
<img class="_head_img" :src="item.EmPhoto" alt=""> <span>{{item.EmName}}</span>
<span>{{item.EmName}}</span> </td>
</td> </tr>
</tr> <tr v-if="!zhuijiaList.length">
<tr v-if="!zhuijiaList.length"> <td colspan="8">暂无数据</td>
<td colspan="8">暂无数据</td> </tr>
</tr> </table>
</table>
<div v-if='picIsShow' class="viewBigPicLayer"> <div v-if='picIsShow' class="viewBigPicLayer">
<i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i> <i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click"> <el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
...@@ -690,7 +699,9 @@ ...@@ -690,7 +699,9 @@
<script> <script>
import commonHotelInfo from "../commonPage/commonHotelInfo.vue"; import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
import { constants } from 'os'; import {
constants
} from 'os';
export default { export default {
data() { data() {
return { return {
...@@ -705,7 +716,7 @@ import { constants } from 'os'; ...@@ -705,7 +716,7 @@ import { constants } from 'os';
TCIDs: '', TCIDs: '',
NewCombinationNum: '' NewCombinationNum: ''
}, },
zhuijiaList:[], zhuijiaList: [],
list: [], list: [],
nav: [], nav: [],
TravelDayNum: 0, TravelDayNum: 0,
...@@ -727,27 +738,80 @@ import { constants } from 'os'; ...@@ -727,27 +738,80 @@ import { constants } from 'os';
showCaozuoTime: true, //操作时间 showCaozuoTime: true, //操作时间
colspanLength: 6 //跨行 colspanLength: 6 //跨行
}, },
CurrencyListMoney:[], CurrencyListMoney: [],
currencyTypeObj:[], currencyTypeObj: [],
} }
}, },
components: { components: {
commonHotelInfo commonHotelInfo
}, },
methods: { methods: {
financeinfo_post_GetList(){ // 币种类型 GetCurrency(Id) {
this.apipost('financeinfo_post_GetList',{Name:''},res=>{ var str = "";
if(res.data.resultCode==1){ switch (Id) {
let data=res.data.data; case 0:
data.forEach(item=>{ str = "日元";
this.currencyTypeObj[item.ID]=item.Name; break;
}) case 1:
}else{ str = "人民币";
break;
case 2:
str = "美元";
break;
case 3:
str = "日元";
break;
case 4:
str = "韩元";
break;
case 5:
str = "欧元";
break;
case 6:
str = "英镑";
break;
case 7:
str = "港币";
break;
case 8:
str = "加拿大元";
break;
case 9:
str = "澳大利亚元";
break;
case 10:
str = "新西兰元";
break;
case 11:
str = "新台币";
break;
case 12:
str = "泰国铢";
break;
case 13:
str = "新加坡元";
break;
case 14:
str = "瑞士法郎";
break;
}
return str;
},
financeinfo_post_GetList() { // 币种类型
this.apipost('financeinfo_post_GetList', {
Name: ''
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(item => {
this.currencyTypeObj[item.ID] = item.Name;
})
} else {
} }
},err=>{}) }, err => {})
}, },
ZhuiJiaTuanKuan(){ ZhuiJiaTuanKuan() {
let TCIDARR = [this.$route.query.id] let TCIDARR = [this.$route.query.id]
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
...@@ -755,9 +819,9 @@ import { constants } from 'os'; ...@@ -755,9 +819,9 @@ import { constants } from 'os';
Obj: {}, Obj: {},
SourceID: 0, SourceID: 0,
TCIDList: TCIDARR, TCIDList: TCIDARR,
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route.query.id, TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route
OtherType: 1, .query.id
} }
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query: { query: {
...@@ -769,10 +833,11 @@ import { constants } from 'os'; ...@@ -769,10 +833,11 @@ import { constants } from 'os';
} }
}); });
}, },
getzhuijiaList(){ getzhuijiaList() {
this.apipost( this.apipost(
'Financial_post_GetTravelFinanceReplenishList', { 'Financial_post_GetTravelFinanceReplenishList', {
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route.query.id TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route
.query.id
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -815,12 +880,12 @@ import { constants } from 'os'; ...@@ -815,12 +880,12 @@ import { constants } from 'os';
} }
}); });
}, },
goZhiDan2: function (obj,type,leadr) { goZhiDan2: function (obj, type, leadr) {
if (leadr) { if (leadr) {
// let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95 // let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95
let allMoney = leadr.PlanPrice; let allMoney = leadr.PlanPrice;
let totailMoney = 0; let totailMoney = 0;
totailMoney=Number(leadr.LeaderGetPriceT)+Number(leadr.LeaderGetPrice); totailMoney = Number(leadr.LeaderGetPriceT) + Number(leadr.LeaderGetPrice);
// this.nav.forEach(x => { // this.nav.forEach(x => {
// totailMoney += parseFloat(x.LeaderGetPriceT) // totailMoney += parseFloat(x.LeaderGetPriceT)
// totailMoney += x.LeaderGetPrice // totailMoney += x.LeaderGetPrice
...@@ -838,7 +903,7 @@ import { constants } from 'os'; ...@@ -838,7 +903,7 @@ import { constants } from 'os';
CostType: 56, CostType: 56,
Money: leadr.LeaderGetPriceT, Money: leadr.LeaderGetPriceT,
TCNUMS: obj.TCNUMS, TCNUMS: obj.TCNUMS,
CurrencyId:leadr.CurrencyId, CurrencyId: leadr.CurrencyId,
} }
let id = []; let id = [];
if (obj.OutBranchId === 0) { if (obj.OutBranchId === 0) {
...@@ -858,19 +923,19 @@ import { constants } from 'os'; ...@@ -858,19 +923,19 @@ import { constants } from 'os';
} }
}); });
}, },
goZhiDan: function (obj,num,leadr) { goZhiDan: function (obj, num, leadr) {
if (this.list.hotelNoSureInfo !== '') { if (this.list.hotelNoSureInfo !== '') {
this.$confirm(`${this.list.hotelNoSureInfo},是否去制单？`, this.$t('tips.tips'), { this.$confirm(`${this.list.hotelNoSureInfo},是否去制单？`, 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'
}).then(() => { }).then(() => {
this.goZhiDan2(obj,num,leadr) this.goZhiDan2(obj, num, leadr)
}).catch(() => { }).catch(() => {
return false return false
}); });
} else { } else {
this.goZhiDan2(obj,num,leadr) this.goZhiDan2(obj, num, leadr)
} }
}, },
addOtherList(index, id) { addOtherList(index, id) {
...@@ -933,10 +998,10 @@ import { constants } from 'os'; ...@@ -933,10 +998,10 @@ import { constants } from 'os';
deleteSelfPlayingExpendList(outIndex, index) { deleteSelfPlayingExpendList(outIndex, index) {
this.list.OtherOrderReportList.SelfPlayingExpendList.splice(index, 1) this.list.OtherOrderReportList.SelfPlayingExpendList.splice(index, 1)
}, },
busTotalPrice(obj) { busTotalPrice(obj) {
let totalPrice = 0 let totalPrice = 0
obj.forEach(item => { obj.forEach(item => {
totalPrice += Number(item.CostPrice) + Number(item.HighSpeedPrice) + Number(item.StopPrice) totalPrice += Number(item.CostPrice) + Number(item.HighSpeedPrice) + Number(item.StopPrice)
}) })
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
}, },
...@@ -1039,78 +1104,78 @@ import { constants } from 'os'; ...@@ -1039,78 +1104,78 @@ import { constants } from 'os';
let nav = res.data.data.list; let nav = res.data.data.list;
let num = 0; let num = 0;
nav.forEach(x => { nav.forEach(x => {
x.CurrencyIdArr=[]; x.CurrencyIdArr = [];
nav.LeaderGetPriceT = 0; nav.LeaderGetPriceT = 0;
num += x.LeaderGetPrice num += x.LeaderGetPrice
x.hideZDBtn = false; x.hideZDBtn = false;
if (Number(x.DMCRemark) >= 0) { if (Number(x.DMCRemark) >= 0) {
x.hideZDBtn = true; x.hideZDBtn = true;
} }
x.LeaderGetPriceList.forEach(lead=>{ x.LeaderGetPriceList.forEach(lead => {
if(x.CurrencyIdArr.indexOf(lead.CurrencyId) < 0){ if (x.CurrencyIdArr.indexOf(lead.CurrencyId) < 0) {
x.CurrencyIdArr.push(lead.CurrencyId) x.CurrencyIdArr.push(lead.CurrencyId)
} }
}) })
}) })
// 预付合计总金额 // 预付合计总金额
let CurrencyIdArr=[]; let CurrencyIdArr = [];
this.CurrencyListMoney=[]; this.CurrencyListMoney = [];
if(this.TotalNav.planPriceList){ if (this.TotalNav.planPriceList) {
this.TotalNav.planPriceList.forEach(item=>{ this.TotalNav.planPriceList.forEach(item => {
if(CurrencyIdArr.indexOf(item.CurrencyId) < 0){ if (CurrencyIdArr.indexOf(item.CurrencyId) < 0) {
CurrencyIdArr.push(item.CurrencyId) CurrencyIdArr.push(item.CurrencyId)
} }
}) })
CurrencyIdArr.forEach(id=>{ CurrencyIdArr.forEach(id => {
let obj={ let obj = {
money:0, money: 0,
CurrencyId:0 CurrencyId: 0
}; };
this.TotalNav.planPriceList.forEach(item=>{ this.TotalNav.planPriceList.forEach(item => {
if(item.CurrencyId==id){ if (item.CurrencyId == id) {
obj.money+=item.PlanTotalPrice; obj.money += item.PlanTotalPrice;
obj.CurrencyId=item.CurrencyId; obj.CurrencyId = item.CurrencyId;
} }
}) })
this.CurrencyListMoney.push(obj); this.CurrencyListMoney.push(obj);
}) })
} }
this.CurrencyListMoney.forEach((cur,i)=>{ this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr=[]; cur.LeaderGetPriceArr = [];
let obj={ let obj = {
CurrencyId:cur.CurrencyId, CurrencyId: cur.CurrencyId,
LeaderGetPrice:0, LeaderGetPrice: 0,
LeaderGetPriceT:0, LeaderGetPriceT: 0,
}; };
nav.forEach(x => { nav.forEach(x => {
x.LeaderGetPriceList.forEach(price=>{ x.LeaderGetPriceList.forEach(price => {
if(cur.CurrencyId==price.CurrencyId){ if (cur.CurrencyId == price.CurrencyId) {
obj.CurrencyId=price.CurrencyId; obj.CurrencyId = price.CurrencyId;
obj.LeaderGetPrice+=price.OrderMakingPrice; obj.LeaderGetPrice += price.OrderMakingPrice;
} }
})
}) })
cur.LeaderGetPriceArr.push(obj);
}) })
cur.LeaderGetPriceArr.push(obj); this.CurrencyListMoney.forEach((cur, i) => {
}) cur.LeaderGetPriceArr.forEach(lead => {
this.CurrencyListMoney.forEach((cur,i)=>{ if (i === 0) {
cur.LeaderGetPriceArr.forEach(lead=>{ lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) * 100) / 100;
if (i === 0) { lead.PlanPrice = cur.money * 0.95;
lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) *100) / 100; } else {
lead.PlanPrice=cur.money * 0.95; lead.LeaderGetPriceT = 0;
} else { lead.PlanPrice = cur.money * 0.95;
lead.LeaderGetPriceT = 0; }
lead.PlanPrice=cur.money * 0.95; })
}
}) })
// console.log("CurrencyListMoney",this.CurrencyListMoney)
})
// console.log("CurrencyListMoney",this.CurrencyListMoney)
this.nav = nav; this.nav = nav;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
...@@ -1218,52 +1283,201 @@ import { constants } from 'os'; ...@@ -1218,52 +1283,201 @@ import { constants } from 'os';
background: #fff; background: #fff;
text-align: center; text-align: center;
} }
.leader2Btn {
color: #fff; .leader2Btn {
padding: 0 15px; color: #fff;
height: 30px; padding: 0 15px;
background: #e95252; height: 30px;
border: 1px solid #e95252; background: #e95252;
cursor: pointer; border: 1px solid #e95252;
border-radius: 15px; cursor: pointer;
} border-radius: 15px;
.Receipt_box{padding: 15px;color: #c94052;width: 614px;background-color: rgba(242, 242, 242, 1);border: 1px solid rgba(228, 228, 228, 1)} }
.Receipt_box.color_blur{color: #106BAF;}
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px} .Receipt_box {
.rb_tit{font-size: 18px;text-align: center} padding: 15px;
.rb_stit{font-size: 14px;text-align: center} color: #c94052;
.rb_stit span{display: inline-block;border-bottom: 2px solid #C94052;padding: 0 20px} width: 614px;
.rb_top_row{display: flex;justify-content: space-between;font-size: 12px;} background-color: rgba(242, 242, 242, 1);
.rb_top_row span._r_name{color: #333333} border: 1px solid rgba(228, 228, 228, 1)
.rb_top_row span._r_bold{font-weight: bold} }
.rb_top_row ._r_time span{color: #333333}
._r_mb5{margin-bottom: 5px;} .Receipt_box.color_blur {
.Receipt_table{width: 100%;font-size: 14px;text-align: center} color: #106BAF;
.Receipt_table .th{font-weight: 200 !important} }
._r_mt10{margin-top: 10px;}
._bg__{display: inline-block;padding: 2px 8px;color: white;border-radius: 4px} .Receipt_box.color_blur .rb_stit span {
._bg_red{background-color: #E95252;} display: inline-block;
._bg_green{background-color: #2BB87C} border-bottom: 2px solid #106BAF;
.text_d{text-decoration: underline;cursor: pointer;} padding: 0 20px
.PingFangSC{font-weight: bold} }
.Bill_par{position: relative;}
tr._item_list{border-bottom: 1px solid #E5E5E5;height: 78px;} .rb_tit {
tr._item_list td{border-bottom: 1px solid #e5e5e5; padding: 10px;} font-size: 18px;
/* tr._t_head th{border-top: 1px solid #e5e5e5;} */ text-align: center
tr._item_list td:first-child{border-left: 1px solid #e5e5e5;} }
tr._item_list td:last-child{border-right: 1px solid #e5e5e5;}
._head_img{width: 28px;height: 28px;border-radius: 50%;vertical-align:middle;} .rb_stit {
._btn_group{font-size: 14px;} font-size: 14px;
.icon-daiqueren{color: #4BCA81} text-align: center
.icon-yiqueren{color: #4BCA81} }
.icon-yiquxiao{color: #959595}
.icon-shenhebohui{color: #E95252} .rb_stit span {
.icon-icon-zancun{color: #FF9C01} display: inline-block;
.singeRowTable tr:hover{background-color: white} border-bottom: 2px solid #C94052;
._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px} padding: 0 20px
._bold{font-weight: bold} }
._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
._bank_name{margin-left: 10px;} .rb_top_row {
._bank_type{background-color: #2AAEF2} display: flex;
._bank_type2{background-color: #FF9C01} justify-content: space-between;
font-size: 12px;
}
.rb_top_row span._r_name {
color: #333333
}
.rb_top_row span._r_bold {
font-weight: bold
}
.rb_top_row ._r_time span {
color: #333333
}
._r_mb5 {
margin-bottom: 5px;
}
.Receipt_table {
width: 100%;
font-size: 14px;
text-align: center
}
.Receipt_table .th {
font-weight: 200 !important
}
._r_mt10 {
margin-top: 10px;
}
._bg__ {
display: inline-block;
padding: 2px 8px;
color: white;
border-radius: 4px
}
._bg_red {
background-color: #E95252;
}
._bg_green {
background-color: #2BB87C
}
.text_d {
text-decoration: underline;
cursor: pointer;
}
.PingFangSC {
font-weight: bold
}
.Bill_par {
position: relative;
}
tr._item_list {
border-bottom: 1px solid #E5E5E5;
height: 78px;
}
tr._item_list td {
border-bottom: 1px solid #e5e5e5;
padding: 10px;
}
/* tr._t_head th{border-top: 1px solid #e5e5e5;} */
tr._item_list td:first-child {
border-left: 1px solid #e5e5e5;
}
tr._item_list td:last-child {
border-right: 1px solid #e5e5e5;
}
._head_img {
width: 28px;
height: 28px;
border-radius: 50%;
vertical-align: middle;
}
._btn_group {
font-size: 14px;
}
.icon-daiqueren {
color: #4BCA81
}
.icon-yiqueren {
color: #4BCA81
}
.icon-yiquxiao {
color: #959595
}
.icon-shenhebohui {
color: #E95252
}
.icon-icon-zancun {
color: #FF9C01
}
.singeRowTable tr:hover {
background-color: white
}
._TradeWayList {
padding: 5px 10px;
background-color: #EEEEEE;
border-radius: 4px;
margin: 10px 0;
width: 230px
}
._bold {
font-weight: bold
}
._bank_name,
._bank_type {
display: inline-block;
background-color: #333333;
color: white;
padding: 2px 4px;
border-radius: 4px;
margin-left: 10px;
}
._bank_name {
margin-left: 10px;
}
._bank_type {
background-color: #2AAEF2
}
._bank_type2 {
background-color: #FF9C01
}
</style> </style>
src/components/commonPage/commonHotelWork.vue 0 → 100644
View file @ bdfc7d2b
<template>
<div class="commonPriceHotelInfo">
<table v-loading="changeLoading">
<tr>
<th width="60" style="text-align:center;">
选择
</th>
<th width="145" style="text-align:center;">
团号
</th>
<th width="140" style="text-align:center;">
地接团号
</th>
<th width="120" style="text-align:center;">
酒店
</th>
<th width="120" style="text-align:center;">
更换酒店
</th>
<th width="100" style="text-align:center;">
OP状态
</th>
<th width="100" style="text-align:center;">
地接状态
</th>
</tr>
<tr v-for="(hItem,hIndex) in MyDataList">
<td style="text-align:center;">
<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:center;">
{{hItem.DMCNum}}
</td>
<td style="text-align:left;">
{{hItem.OldHotelName}}
</td>
<td style="text-align:left;">
{{hItem.NewHotelName}}
</td>
<td style="text-align:center;">
<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 style="text-align:center;">
<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" style="text-align:center;">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder()" />
</td>
</tr>
</tfoot>
</table>
</div>
</template>
<script>
export default {
props: ["TCID", "HotelId", "DateStr"],
data() {
return {
changeLoading: false,
MyDataList: [],
};
},
methods: {
ChangeStatus(item) {
item.IsChecked = !item.IsChecked;
},
//获取可以改变的酒店列表
GetChangeHotelList() {
this.changeLoading = true;
this.MyDataList = [];
var that = this;
this.apipost("journeyorder_post_GetCanChangeHotelListService", {
UseTime: this.DateStr
},
res => {
that.changeLoading = false;
if (res.data.resultCode == 1) {
that.MyDataList = res.data.data;
} else {
that.Error(res.data.message);
}
},
err => {}
);
},
//保存酒店订单
SaveHotelOrder() {
var that = this;
this.Confirm("是否要替换选中的酒店?", function () {
var newList = [];
if (that.ChangeHotelList && that.ChangeHotelList.length > 0) {
that.ChangeHotelList.forEach(item => {
if (item.IsChecked) {
var Nitem = JSON.parse(JSON.stringify(item));
Nitem.NewHotelID = this.HotelId;
newList.push(Nitem);
}
});
}
if (newList && newList.length > 0) {
that.apipost("journeyorder_post_SaveWorkHotelOrderService", newList,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
//that.getList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
} else {
that.Info("请选择团期!");
}
});
}
},
mounted() {
},
created() {
}
};
</script>
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