Skip to content

S
SuperMan
Commit 4cdd2250 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 4de0ab67 dcf71d32
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1229 additions and 594 deletions
src/assets/img/hotel/hotelBanner.png 0 → 100644
View file @ 4cdd2250
This diff is collapsed.
src/components/Details.vue
View file @ 4cdd2250
......@@ -578,6 +578,9 @@ export default {
case "/happyMoney": // 红包结算
path = "/LianMengManagement";
break;
case "/OpHotelOrderDetail": // 酒店订单详情
path = "/OpHotelOrder";
break;
}
//找到Root
......@@ -807,6 +810,9 @@ export default {
case "/happyMoney": // 红包结算
path = "/LianMengManagement";
break;
case "/OpHotelOrderDetail": // 酒店订单详情
path = "/OpHotelOrder";
break;
}
//找到Root
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 4cdd2250
......@@ -391,15 +391,18 @@
<td :colspan="3">
{{o.TCNUM}}（{{o.TCID}}）
<span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份</span>
<span v-if="GetDetail.IsShowPlanUrl==1&&GetDetail.ClientType==7" @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">领队导游往来</span>
<span v-if="(GetDetail.IsShowPlanUrl===1||GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56)&&GetDetail.ClientType===7" @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">领队导游往来</span>
</td>
<td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
<td @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
|| GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58
|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
<td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td>
</tr>
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 4cdd2250
......@@ -492,7 +492,7 @@
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
<textarea v-model="Description">
<textarea v-model="msg.Description">
</textarea>
</div>
<div>
......@@ -915,7 +915,7 @@ export default {
}
}
this.loading = true;
this.msg.Description=this.Description;
// this.msg.Description=this.Description;
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
//清除旅客名单数据
......@@ -1257,7 +1257,7 @@ export default {
if(this.orderObj!=null&&this.orderObj.OrderSource===10){
}else{
this.Description=this.GetDetail.Description;
this.msg.Description=this.GetDetail.Description;
}
if(this.orderObj){
......@@ -1272,7 +1272,7 @@ export default {
this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
this.detailList.Number = this.orderObj.CostType ? 1 : 0
if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
this.msg.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
}
}
if(data.VorcherInos){
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 4cdd2250
......@@ -398,7 +398,7 @@
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
<textarea v-model="Description">
<textarea v-model="msg.Description">
</textarea>
</div>
......@@ -485,6 +485,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue";
export default {
data(){
return{
Description:'',
msg:{
FrID:0,
ClientType:0,
......@@ -1052,7 +1053,7 @@ export default {
this.msg.TipGuestList=tipguestInfo;
}
this.msg.Description=this.Description;
// this.msg.Description=this.Description;
if(z){
this.msg.Status = 0;
}else{
......@@ -1395,7 +1396,7 @@ export default {
this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
this.msg.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
}
}
if(data.VorcherInos){
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 4cdd2250
......@@ -22,7 +22,7 @@
<ul>
<li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input v-if="IsOperation==1&&CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能再修改!</span>
</li>
</ul>
......@@ -694,7 +694,6 @@
if (this.CurrentUserInfo.EmployeeId == 615) {
this.IsEditHotel = 1;
this.IsEditHotelPeople = 1;
}
let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy;
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 4cdd2250
......@@ -4,13 +4,13 @@
<ul>
<li>
<template v-if="IsOperation != 1">
<input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
</template>
<template v-else>
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
<span style="color:red;font-size:14px;">已制单，不能在修改!</span>
<input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</template>
<input type="button" class="fr normalBtn mb30" style="display:none;" value="保存" @click="saveList(1)" />
</li>
</ul>
</div>
......@@ -192,6 +192,8 @@
GuestNum: 0,
loading: false,
IsOperation: '',
//当前登录人信息
CurrentUserInfo:{},
};
},
methods: {
......@@ -343,6 +345,8 @@
},
},
mounted() {
let userInfo = this.getLocalStorage();
this.CurrentUserInfo = userInfo;
this.TCNUM = this.$route.query.TCNUM;
this.GuestNum = this.$route.query.GuestNum;
this.getList();
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ 4cdd2250
......@@ -289,7 +289,7 @@
</el-pagination>
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item :label="$t('system.query_workType')" prop="Type">
<el-form-item :label="$t('system.query_workType')" prop="LeaderGuidClass">
<el-select v-model="addMsg.LeaderGuidClass" :placeholder="$t('admin.admin_workType')" class="w210">
<el-option key="0" label="公司领队" :value="0"></el-option>
<el-option key="1" label="同行领队" :value="1"></el-option>
......@@ -506,7 +506,7 @@ export default {
trigger: "change"
}
],
Type: [
LeaderGuidClass: [
{
required: true,
message: "请选择工作类型",
......@@ -856,7 +856,7 @@ export default {
//初始化创建、修改表单数据
let newMsg = {
ID: "0",
Type: "",
Type: 1,
EmployeeId: "",
Surname: "",
Name: "",
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ 4cdd2250
......@@ -294,8 +294,8 @@
<th>订单号</th>
<th>第三方订单号</th>
<th>房间数</th>
<th>总价</th>
<th>已收</th>
<th>总额</th>
<th>实收</th>
<th>大红包</th>
<th>优惠金额</th>
<th>待收金额</th>
......
src/components/TravelManager/TravelList/OpHotelOrder.vue
View file @ 4cdd2250
......@@ -73,8 +73,8 @@
<th>订单号</th>
<th>客户信息</th>
<th>房间数</th>
<th>总价格</th>
<th>总收入</th>
<th>总额</th>
<th>实收</th>
<th>抵扣金额</th>
<th>优惠金额</th>
<th>待收金额</th>
......@@ -83,7 +83,7 @@
<th>入住时间</th>
<th>离店时间</th>
<th>取消费用</th>
<!-- <th>操作</th> -->
<th>操作</th>
</tr>
<tbody v-for="(item,index) in dataList">
<tr>
......@@ -103,7 +103,7 @@
<td>{{item.CheckInStr}}</td>
<td>{{item.CheckOutStr}}</td>
<td>{{item.CancelFee}}</td>
<!-- <td>详情</td> -->
<td class="cursorpointer" @click="goOrderDetails(item.OrderID)">详情</td>
</tr>
<tr>
<td colspan="6" style="text-align:left;width:600px">
......@@ -116,7 +116,7 @@
</div>
</div>
</td>
<td colspan="6" style="text-align:left;width:600px">
<td colspan="7" style="text-align:left;width:600px">
<div class="SH_OrderDan">
<div>收款单据：</div>
<div>
......@@ -181,6 +181,15 @@ export default {
};
},
methods: {
goOrderDetails(ID){
this.$router.push({
name: 'OpHotelOrderDetail',
query: {
ID: ID,
blank:'y',
}
})
},
getList() {
//获取现有线路列表
this.loading = true;
......
src/components/TravelManager/TravelList/OpHotelOrderDetail.vue 0 → 100644
View file @ 4cdd2250
This diff is collapsed.
src/components/TravelManager/TravelList/TravelpassengerList.vue
View file @ 4cdd2250
<style>
.PT_teamTable {
width: 800px;
border-collapse: collapse;
}
.PT_teamTable td,
.PT_teamTable th {
border: 1px solid #dcdcdc;
padding: 5px;
height: 30px;
}
.PT_teamTable tr th {
background: #eee;
height: 30px;
border: 1px solid #dcdcdc;
}
.PT_teamTable tr td{background: #fff;}
.travelpassengerlist{font-size: 12px; background: #dcdcdc;}
.travelpassengerlist tr th {
height: 30px;
}
.travelpassengerlist tr td{background: #fff; text-align: center;}
/*拒签人员*/
.travelpassengerlist .redTr td{
.PT_teamTable {
width: 800px;
border-collapse: collapse;
}
.PT_teamTable td,
.PT_teamTable th {
border: 1px solid #dcdcdc;
padding: 5px;
height: 30px;
}
.PT_teamTable tr th {
background: #eee;
height: 30px;
border: 1px solid #dcdcdc;
}
.PT_teamTable tr td {
background: #fff;
}
.travelpassengerlist {
font-size: 12px;
background: #dcdcdc;
}
.travelpassengerlist tr th {
height: 30px;
}
.travelpassengerlist tr td {
background: #fff;
text-align: center;
}
/*拒签人员*/
.travelpassengerlist .redTr td {
color: #E95252;
}
}
</style>
<template>
......@@ -39,7 +55,8 @@
<th width="120">出发日期</th>
</tr>
<tr v-for="item in QueryMsg.TeamInfoData">
<td><a @click="goUrlTravelControl('团控列表','TravelControlList',item.TCID,item.TCNUM)" style="cursor:pointer;color:blue;">{{item.TCNUM}}</a></td>
<td><a @click="goUrlTravelControl('团控列表','TravelControlList',item.TCID,item.TCNUM)"
style="cursor:pointer;color:blue;">{{item.TCNUM}}</a></td>
<td>{{item.Title}}</td>
<td>{{item.Inventory}}人</td>
<td>{{item.StartDate}} {{item.WeekStr}}</td>
......@@ -51,13 +68,7 @@
</li>
</ul>
</div>
<table
class="travelpassengerlist"
border="0"
cellspacing="1"
cellpadding="0"
v-loading="QueryMsg.loading"
>
<table class="travelpassengerlist" border="0" cellspacing="1" cellpadding="0" v-loading="QueryMsg.loading">
<tr>
<th width="50">房间数</th>
<th width="50">房号</th>
......@@ -91,13 +102,13 @@
<td>
<!--自然单间 指定单间（单房差）-->
<template v-if="subItem.SingleRoomType==subItem.HouseType">
{{getHouseTypeStr(subItem.HouseType)}}
{{getHouseTypeStr(subItem.HouseType)}}
</template>
<template v-else>
{{getHouseTypeStr(subItem.SingleRoomType)}} <br/><span style="color:red;">(指定)</span>
{{getHouseTypeStr(subItem.SingleRoomType)}} <br /><span style="color:red;">(指定)</span>
</template>
<template v-if="subItem.IsBed==0"><br/><span style="color:red;">(不占床)</span></template>
</td>
<template v-if="subItem.IsBed==0"><br /><span style="color:red;">(不占床)</span></template>
</td>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ESurName}}</td>
<td>{{subItem.EName}}</td>
......@@ -124,128 +135,128 @@
</div>
</template>
<script>
export default {
data() {
return {
//请求数据
msg: {
PageIndex: 1,
PageSize: 100,
TCID: 0,
OrderId: 0,
currentPage: 1
},
IsHaveLeader:1,//1-有领队,0-无领队
IsLeaderGuide:0,//1-领兼导,0-领队
TCID: 0,
QueryMsg: {
loading: true,
//返回数据
dataList: [],
export default {
data() {
return {
//请求数据
msg: {
PageIndex: 1,
PageSize: 100,
TCID: 0,
OrderId: 0,
currentPage: 1
},
IsHaveLeader: 1, //1-有领队,0-无领队
IsLeaderGuide: 0, //1-领兼导,0-领队
TCID: 0,
OrderId: 0,
//团期数据
TeamInfoData: []
}
};
},
methods: {
goUrlTravelControl(name, path, id, tcmun) {
this.$router.push({
name: path,
query: {
id: id,
tcmun: tcmun,
blank: "y",
tab: name
QueryMsg: {
loading: true,
//返回数据
dataList: [],
TCID: 0,
OrderId: 0,
//团期数据
TeamInfoData: []
}
});
},
//获取性别字符串
getSexStr(item) {
var str = "";
if (item.Sex == 1) {
str = "男";
} else {
str = "女";
}
return str;
},
//获取房间类型
getHouseTypeStr(HouseType) {
var str = "";
if (HouseType == 1) {
str = "自然单间";
} else if (HouseType == 2) {
str = "标准双人间";
} else if (HouseType == 3) {
str = "大床房";
}
else if (HouseType == 4) {
str = "三人间";
}
else if (HouseType== 5) {
str = "拼凑双人间";
}
else {
str = "未分配";
}
return str;
};
},
//获取数据
getList() {
this.QueryMsg.loading = true;
this.apipost(
"travel_get_GetTravelGuestPageList",
this.msg,
res => {
this.QueryMsg.loading = false;
if (res.data.resultCode == 1) {
this.QueryMsg.dataList = res.data.data.pageData.result;
this.IsHaveLeader=res.data.data.pageData.IsHaveLeader;
this.IsLeaderGuide=res.data.data.pageData.IsLeaderGuide;
methods: {
goUrlTravelControl(name, path, id, tcmun) {
this.$router.push({
name: path,
query: {
id: id,
tcmun: tcmun,
blank: "y",
tab: name
}
},
err => {}
);
},
exportExcel() {
//导出报表
let msg = {
TCID: this.msg.TCID
};
var fileName = "旅客名单.xls";
if (this.QueryMsg.TeamInfoData != null) {
fileName =
"【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】旅客名单.xls";
});
},
//获取性别字符串
getSexStr(item) {
var str = "";
if (item.Sex == 1) {
str = "男";
} else {
str = "女";
}
return str;
},
//获取房间类型
getHouseTypeStr(HouseType) {
var str = "";
if (HouseType == 1) {
str = "自然单间";
} else if (HouseType == 2) {
str = "标准双人间";
} else if (HouseType == 3) {
str = "大床房";
} else if (HouseType == 4) {
str = "三人间";
} else if (HouseType == 5) {
str = "拼凑双人间";
} else {
str = "未分配";
}
return str;
},
//获取数据
getList() {
this.QueryMsg.loading = true;
this.apipost(
"travel_get_GetTravelGuestPageList",
this.msg,
res => {
this.QueryMsg.loading = false;
if (res.data.resultCode == 1) {
this.QueryMsg.dataList = res.data.data.pageData.result;
this.IsHaveLeader = res.data.data.pageData.IsHaveLeader;
this.IsLeaderGuide = res.data.data.pageData.IsLeaderGuide;
}
},
err => {}
);
},
exportExcel() {
this.QueryMsg.loading = true;
//导出报表
let msg = {
TCID: this.msg.TCID
};
var fileName = "旅客名单.xls";
if (this.QueryMsg.TeamInfoData != null) {
fileName =
"【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】旅客名单.xls";
}
this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName, res => {
this.QueryMsg.loading = false;
});
},
//获取团期信息
getTeamInfo() {
var qmsg = {
TCID: this.TCID
};
this.apipost(
"travel_get_GetTravelPriceReportInfo",
qmsg,
res => {
if (res.data.resultCode == 1) {
this.QueryMsg.TeamInfoData = res.data.data;
}
},
err => {}
);
}
this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName);
},
//获取团期信息
getTeamInfo() {
var qmsg = {
TCID: this.TCID
};
this.apipost(
"travel_get_GetTravelPriceReportInfo",
qmsg,
res => {
if (res.data.resultCode == 1) {
this.QueryMsg.TeamInfoData = res.data.data;
}
},
err => {}
);
mounted() {
this.TCID = this.$route.query.id;
this.msg.TCID = this.TCID;
this.msg.OrderId = this.$route.query.OrderId;
this.getTeamInfo();
this.getList();
}
},
mounted() {
this.TCID = this.$route.query.id;
this.msg.TCID = this.TCID;
this.msg.OrderId = this.$route.query.OrderId;
this.getTeamInfo();
this.getList();
}
};
</script>
\ No newline at end of file
};
</script>
src/components/dmc/manager/dmcTotalTable.vue
View file @ 4cdd2250
......@@ -330,6 +330,7 @@
<span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
</div>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadDinner(item)">餐配下载</a>
</td>
<td>
......@@ -514,7 +515,7 @@
<tr>
<td colspan="22" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p>
<p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.PriceCommonList[index].DMCNum}}
</div>
......@@ -689,11 +690,11 @@
return "（临时领队）"
}
},
getJourney(id, title) {
getJourney(item) {
var that = this;
this.tripTitle = title;
this.tripTitle = item.Title;
this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id);
that.$refs.comTeam.GetTrip(item.ConfigID,item.TCID);
});
that.teamVisible = true;
},
......@@ -1058,7 +1059,26 @@
tab: "手配依赖书"
}
})
}
},
DownLoadDinner(item)
{
this.loading = true;
//导出报表
let msg = {
TCID: item.TCID,
StartDate:item.StartDateStr,
DayNum:item.DayNum
};
var fileName = "餐配下载.xls";
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】餐配下载.xls";
}
this.GetLocalFile("travel_get_GetTravelDinnerDownLoad", msg, fileName,
res => {
this.loading = false;
});
},
},
mounted() {
let myDate = new Date();
......@@ -1069,7 +1089,6 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
//this.msg.CombinationNum = 'JVS0727OTC-MUA';
this.getLineList();
this.getList();
this.getCompanyList();
......
src/components/leaderPay2.vue
View file @ 4cdd2250
......@@ -488,7 +488,7 @@ input[type="number"] {
<th>类型</th>
<th>预计总金额</th>
<th>实付金额</th>
<th>报账金额
<!-- <th>报账金额
<input
v-if="totalList.SelfPayingExpendTotalPrice>0 || totalList.SelfPayingIncomeTotalPrice>0 || (totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0 ||
totalScenicPrice>0 || totalTrafficPrice>0 || totalDinnerPrice>0 || totalHotelPrice>0"
......@@ -496,7 +496,7 @@ input[type="number"] {
value="保存"
class="leader2Btn"
@click="saveBZPrice()"
>
> -->
</th>
</tr>
<tr v-show="totalList.SelfPayingExpendTotalPrice>0">
......@@ -524,49 +524,49 @@ input[type="number"] {
<td>景点门票</td>
<td>{{moneyFormat(OtherTotalPrice)}}</td>
<td>{{moneyFormat(totalScenicPrice)}}</td>
<td>
<!-- <td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.ScenicPrice" @change="getAllBZPrice"></el-input>
</td>
</td> -->
</tr>
<tr v-show="totalTrafficPrice>0">
<td>交通</td>
<td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalTrafficPrice)}}</td>
<td>
<!-- <td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.BusPrice" @change="getAllBZPrice"></el-input>
</td>
</td> -->
</tr>
<tr v-show="totalDinnerPrice>0">
<td>餐饮</td>
<td>{{moneyFormat(IncomeTotalPrice)}}</td>
<td>{{moneyFormat(totalDinnerPrice)}}</td>
<td>
<!-- <td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.DiningPrice" @change="getAllBZPrice"></el-input>
</td>
</td> -->
</tr>
<tr v-show="totalHotelPrice>0">
<td>酒店</td>
<td>{{moneyFormat(ExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalHotelPrice)}}</td>
<td>
<!-- <td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.HotelPrice" @change="getAllBZPrice"></el-input>
</td>
</td> -->
</tr>
</table>
<table border="0" cellspacing="1" class="leaderPayTable" v-if="TotalPriceData.length>0">
......@@ -575,7 +575,7 @@ input[type="number"] {
<th>预付合计</th>
<th>实际领款</th>
<th>实付合计</th>
<th>实际报账金额</th>
<!-- <th>实际报账金额</th> -->
<th>领队退款</th>
</tr>
<tr
......@@ -586,7 +586,7 @@ input[type="number"] {
<td>{{moneyFormat(item.PlanPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice)}}</td>
<td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
<td>{{index == 0 ? moneyFormat(AllBZPrice) : moneyFormat(item.ExpendTotalPrice)}}</td>
<!-- <td>{{index == 0 ? moneyFormat(AllBZPrice) : moneyFormat(item.ExpendTotalPrice)}}</td> -->
<td>{{index == 0 ? moneyFormat(item.PlanTotalPrice - AllBZPrice): moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)}}</td>
</tr>
<tr v-if="!TotalPriceData.length">
......@@ -698,6 +698,7 @@ input[type="number"] {
class="leader2Btn"
@click="goZhiDan(item)"
>
</td>
</tr>
<tr v-if="!TotalNav && !TotalNav.length">
......@@ -777,6 +778,48 @@ input[type="number"] {
<td colspan="5">暂无数据</td>
</tr>
</table>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
<tr>
<th colspan="7">稽核单据
</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<td colspan="3">{{item.TCNUMS}}</td>
<td colspan="3"><el-input
size="mini"
class="w150"
type="number"
v-model="item.price"></el-input></td>
<td colspan="1">
<input
type="button"
value="制稽核单"
class="leader2Btn"
@click="ZhiDanJiHe(item)">
</td>
</tr>
<tr>
<th width="140">序号</th>
<th>单号</th>
<th>费用说明</th>
<th>日期</th>
<th>备注</th>
<th>应付/应收金额</th>
<th>业务员</th>
</tr>
<template v-for="(item, index) in TotalNav">
<tr v-for="(Sitem, Sindex) in item.FinanceAuditList">
<td>{{Sindex+1}}</td>
<td><span class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', Sitem.FinanceId)">{{Sitem.FinanceId}}</span></td>
<td>{{Sitem.CostTypeName}}</td>
<td>{{Sitem.CreateDate}}</td>
<td>{{Sitem.Remark}}</td>
<td>{{Sitem.OriginalMoney}}</td>
<td>{{Sitem.CreateByStr}}</td>
</tr>
</template>
</table>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
<tr>
<th colspan="4">意见调查表</th>
......@@ -878,6 +921,29 @@ export default {
};
},
methods: {
// 稽核单据
ZhiDanJiHe: function(obj){
if(!obj.price) {
this.$message.error('请输入金额')
return
}
let userinfo = this.getLocalStorage()
let templateID = JSON.stringify([76, 77])
let TCIDARR = [obj.TCIDS];
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
SourceID: 0,
CostType: 57,
TCIDList: TCIDARR,
Money: obj.price,
};
let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${templateID}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
},
// 意见调查列表
goDIaoCha: function (obj){
let fullPath = `/investigationList?TCID=${obj.TCIDS}&blank=y&tab=问券调查列表`;
......
src/components/scenicSpot/admissionStatistics.vue
View file @ 4cdd2250
......@@ -105,7 +105,7 @@
{{thirdItem.UseTimeStr}}
</td>
<td style="text-align:left;padding-left:3px;">
{{thirdItem.ScenicName}}
{{thirdItem.ScenicName}} 【<span style="color:red">{{getUseTypeStr(thirdItem.TicketPriceList)}}</span>】
</td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="link">
......@@ -143,6 +143,8 @@
loading: false,
currentPage: 1,
total: 0,
//当前登录用户
CurrentUserInfo: {},
msg: {
pageIndex: 1,
pageSize: 5,
......@@ -158,6 +160,25 @@
}
},
methods: {
getUseTypeStr(item) {
var str = '';
if (item) {
item.forEach(childItem => {
var useStr = "";
if (childItem.PeopleType == 1) {
useStr = "成人"
}
if (childItem.PeopleType == 2) {
useStr = "中人"
}
if (childItem.PeopleType == 3) {
useStr = "小人"
}
str+=useStr+":"+childItem.UsePeopleNum+"，";
});
}
return str.substring(0,str.lastIndexOf('，'));
},
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
......@@ -245,6 +266,8 @@
},
},
mounted() {
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -284,10 +307,12 @@
.admissionStatisticsTalbe tr td {
font-size: 12px;
}
.admissionStatisticsTalbe tr td .link p:hover {
text-decoration: underline;
cursor: pointer;
}
.admissionStatistics_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 4cdd2250
......@@ -9,8 +9,8 @@
</template>
<template v-else>
<span style="color:red;font-size:14px;">已制单，不能在修改!</span>
<input v-if="CurrentUserInfo.EmployeeId == 615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</template>
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</li>
</ul>
</div>
......
src/components/systemManagement/destinationManagement.vue
View file @ 4cdd2250
......@@ -212,7 +212,7 @@ export default {
let msg = {
IsShow: -1
};
this.apipost("line_post_GetAllList", msg, res => {
this.apipost("line_post_GetAllList_V3", msg, res => {
this.lineList = res.data.data;
});
},
......
src/components/systemManagement/seriesManagement.vue
View file @ 4cdd2250
......@@ -301,7 +301,7 @@ export default {
let msg = {
IsShow: -1
};
this.apipost("line_post_GetAllList", msg, res => {
this.apipost("line_post_GetAllList_V3", msg, res => {
this.lineList = res.data.data;
});
},
......
src/router/config.js
View file @ 4cdd2250
......@@ -1805,6 +1805,13 @@ export default {
meta: {
title: '散卖酒店订单'
},
}, {
path: '/OpHotelOrderDetail', //操作 散卖酒店订单详情
name: 'OpHotelOrderDetail',
component: resolve => require(['@/components/TravelManager/TravelList/OpHotelOrderDetail'], resolve),
meta: {
title: '散卖酒店订单'
},
},{
path: '/HotelOrderTotal', //操作 散卖酒店订单统计
name: 'HotelOrderTotal',
......
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