Skip to content

S
SuperMan
Commit b3c38e63 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents cdba408f 54e06c72
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1329 additions and 1335 deletions
src/components/BusExport.vue
View file @ b3c38e63
<style>
.BusExportTitle{
width:800px;
width:1000px;
margin:0 auto;
text-align: center;
font-weight: bold;
......@@ -11,9 +11,10 @@
width:100%;
height:auto;
margin:auto;
position: absolute;
}
.Bus_detailTable {
width: 800px;
width: 1000px;
font-size: 12px;
color: #333;
margin: 10px auto;
......@@ -24,7 +25,8 @@
.Bus_detailTable td {
border: 1px solid #d1d1d1;
padding: 3px 10px;
padding:0 10px;
height:32px;
font-size:16px;
}
......@@ -33,6 +35,7 @@
border: 1px solid #d1d1d1;
font-size:16px;
font-weight:bold;
height:32px;
}
.txLeft{
text-align: left;
......@@ -46,9 +49,6 @@
.totalTabal td{
height:33px;
}
/* body{
min-width: 100%!important;
} */
</style>
<template>
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ b3c38e63
......@@ -131,6 +131,16 @@
</el-select>
</span>
</li>
<li v-if='msg.Conditon==3'>
<span>
<em>佣金单据</em>
<el-select v-model="msg.IsSpecial" filterable class="w150">
<el-option :value="0" label="不限"></el-option>
<el-option :value="1" label="否"></el-option>
<el-option :value="2" label="是"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>模板类型</em>
......@@ -205,7 +215,7 @@
</el-option>
</el-select>
</span>
</li>
</li>
<li>
<span>
<em>账户类型</em>
......@@ -777,6 +787,7 @@ export default {
QStartDate:'',
UpdateBy:'',
Sort:'2',
IsSpecial:1
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
......@@ -1356,6 +1367,7 @@ export default {
OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
IsSpecial: this.msg.IsSpecial
}
this.msg = msg;
},
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ b3c38e63
......@@ -96,6 +96,7 @@
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==3">{{'外币现金'}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==4">{{'资金池'}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==5">{{'平台虚拟账户'}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==6">{{'地接虚拟账户'}}</span>
</p>
<p style="font-weight: bold"><span class="">编号：</span>{{GetDetail.FrID}}</p>
</div>
......
src/components/Hotel/HotelProductCalendar.vue
View file @ b3c38e63
......@@ -35,8 +35,8 @@
<div :class="stockColor(item.data.InventoryType)" v-if="item.data&&item.month===calendar.data.date">
<p><span @click="goUrlA('2', item)" class="text_underLine">价格：{{item.data.CostPrice}}（{{item.data.CurrencyName}}）</span></p>
<p><span class="text_underLine" @click="goUrlB(item)">总库存：{{item.data.Inventory}}（间）</span></p>
<!-- <p><span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{item.data.RemainingInventory}}（间）</span></p> -->
<p><span>剩余库存：{{item.data.RemainingInventory}}（间）</span></p>
<p><span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{item.data.RemainingInventory}}（间）</span></p>
<!-- <p><span>剩余库存：{{item.data.RemainingInventory}}（间）</span></p> -->
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已使用库存：{{item.data.UseAmount}}（间）</span></p>
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory">欠房数量：{{item.data.OweAmount}}（间）</span></p>
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已确定：{{item.data.SureAmount}}（间）</span></p>
......
src/components/Hotel/HotelsTeam.vue
View file @ b3c38e63
......@@ -215,7 +215,8 @@
})
this.apipost('dmcstatistics_post_SetNewHotelOrder',item.CommonReport.HotelList[0],res=>{
if(res.data.resultCode==1){
this.Success(res.data.message)
this.Success(res.data.message);
this.getList();
}else{
this.Error(res.data.message)
}
......
src/components/LeaderManagement/leaderArrangement.vue
View file @ b3c38e63
......@@ -60,10 +60,10 @@
.leaderArrangement .leaderInfo {
width: 100%;
height: 80px;
height: 100px;
background-color: #fff;
margin-top: 20px;
line-height: 80px;
line-height: 100px;
border: 1px solid #dddddd;
font-size: 12px;
}
......@@ -223,7 +223,7 @@
.leaderArrangement ._oll_line {
float: left;
width: 5px;
height: 79px;
height: 100px;
background-color: #e95252;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
......@@ -463,7 +463,8 @@
<img v-else :src="imgBeforeFile+item.GuidePhoto" :onerror='defaultImg' />
</div>
<div style="white-space:nowrap;">{{item.GuideName}}/导游</div>
<div style="white-space:nowrap;">{{item.GuideMobilePhone}}</div>
<div style="white-space:nowrap;margin:5px 0;">手机号：{{item.GuideMobilePhone}}</div>
<div style="white-space:nowrap;" v-if="item.SpareTel!=null&&item.SpareTel!=''">境外号：{{item.SpareTel}}</div>
</div>
</div>
</el-col>
......@@ -576,6 +577,7 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
console.log(this.dataList,'dataListssssssssss');
} else {
this.Error(res.data.message);
}
......@@ -609,6 +611,7 @@
if (res.data.resultCode == 1) {
this.LeaderList = res.data.data.pageData;
this.noTaskLeaderMsg.PageCount = res.data.data.pageCount;
console.log(this.LeaderList,'leaderlist');
} else {
this.Error(res.data.message);
}
......
src/components/busManagement/BusApportionManagement.vue
View file @ b3c38e63
......@@ -952,7 +952,7 @@ export default {
ClientId:this.exportInfo.ClientId
}
});
window.open(routeData.href, "_blank");
window.open(routeData.href, "_blank");
},
showUpLoadFile(i){ // 预览上传文件
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ b3c38e63
......@@ -2,6 +2,14 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li><span><em>线路</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" class="w150" @change="getLineTeamList()">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li><span><em>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')" class="w150">
<el-option label="不限" value='-1'></el-option>
......@@ -273,7 +281,7 @@
pageIndex: 1,
pageSize: 10,
SelectType: 6,
LineId: 14,
LineId: 0,
LineteamId: "-1",
PriceStatus: "0",
//地接团号
......@@ -330,7 +338,7 @@
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
lineID: this.msg.LineId,
isTOOP: 1
},
res => {
......@@ -482,8 +490,9 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
this.getLineList();
this.getList()
this.getLineTeamList()
//this.getLineTeamList();
},
}
......
src/components/dmc/manager/teamReimbursement.vue
View file @ b3c38e63
......@@ -383,7 +383,9 @@
<div class="d7">
<el-button-group>
<el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
<!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 -->
<el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
</el-button>
</el-button-group>
</div>
......@@ -562,6 +564,19 @@
}
})
},
//跳转打印页面
goToExport(path,obj,title){
let routeData = this.$router.resolve({
name: path,
query: {
"id": obj.TCIDs,
'num': obj.CombinationNum,
isUpdate: true,
}
});
window.open(routeData.href, "_blank");
},
//翻页
handleCurrentChange(val) {
this.queryMsg.pageIndex = val;
......
src/components/leaderPay2.vue 0 → 100644
View file @ b3c38e63
<style>
.leaderPayTable{
width:100%;
margin:10px auto;
text-align: center;
font-size: 12px;
color: #333;
border-collapse: collapse;
background-color: #fff;
border: 1px solid #d1d1d1;
}
.leaderPayTable th{
background: #E6E6E6;
padding:8px 0;
color: #333;
border: 1px solid #d1d1d1;
font-weight:bold;
}
.leaderPayTable tr td{
background-color:#fff;
padding:8px 0;
height: 32px;
border: 1px solid #d1d1d1;
}
.LeaderPrintDiv .LeaderTitle{
padding:10px;
text-align: left;
}
.leaderPayTable .itemName {
text-align: left;
padding: 0 10px;
}
.LeaderPrintDiv .printBtn{
color: #fff;
padding: 0 15px;
height: 30px;
background: #E95252;
border: 1px solid #E95252;
cursor: pointer;
border-radius: 15px;
position: fixed;
right:50px;
top:30px;
}
@media print{
.LeaderPrintDiv .printBtn{display:none}
}
.comTotal{
text-align:left;
padding-left:30px!important;
}
.LeaderPrintDiv{
width:100%;
position: absolute;
}
.LeaderPrintDiv .childDiv{
width:1000px;
margin:0 auto;
}
</style>
<template>
<div class="LeaderPrintDiv">
<div class="childDiv">
<table border="0" cellspacing='1' class="leaderPayTable">
<tr>
<th width="8%">出发地</th>
<th width="30%">行程名称</th>
<th width="15%">团号</th>
<th width="15%">出发时间</th>
<th width="8%">天数</th>
<th width="8%">出团人数</th>
<th width="8%">领队</th>
<th width="8%">导游</th>
</tr>
<tr v-for="item in nav">
<td>{{item.StartCityNames}}</td>
<td>
<div class="LeaderTitle">{{item.Titles}}</div>
</td>
<td>{{item.TCNUMS}}</td>
<td>{{item.FlightDate}}</td>
<td>{{item.DayNum}}天</td>
<td>{{item.TotalSeat}}人</td>
<td>{{item.LeaderName}}</td>
<td>{{item.GuideName}}</td>
</tr>
</table>
<table border="0" cellspacing='1' class="leaderPayTable">
<tbody>
<tr>
<th>项目类型</th>
<th>项目内容</th>
<th>实付金额</th>
<th>备注</th>
</tr>
<template v-for='(item,index) in dataList.ScenicList'>
<tr>
<td v-if="index==0" :rowspan="dataList.ScenicList.length">景点门票</td>
<td>
<div class="itemName" v-for="subItem in item.ScenicStatisticsList">
{{subItem.ScenicName}}
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
{{getTotal(subItem.ReimburseList.ReimburseDetailsList)}}
</div>
</td>
<td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
{{sitem.Remarks}}
</template>
</td>
</tr>
</template>
<tr>
<td class="comTotal" colspan="4">合计：</td>
</tr>
<tr v-for="(item,index) in dataList.BusList">
<td v-if="index==0" :rowspan="dataList.BusList.length">交通</td>
<td>
<span v-if='index==0'>接机</span>
<span v-if='index!=0&&index!=dataList.BusList.length-1'>{{item.AirportPickUpStr}}</span>
<span v-if='index==dataList.BusList.length-1'>送机</span>
</td>
<td>
{{item.TotalPrice}}
</td>
<td>
{{item.Remarks}}
</td>
</tr>
<tr>
<td class="comTotal" colspan="4">合计：{{totalTrafficPrice}}</td>
</tr>
<template v-for='(item,index) in dataList.DiningList'>
<tr class="splitP ScenicTr" v-for='(titem,tindex) in item.DiningSummaryList'>
<td v-if="index==0" :rowspan="dataList.DiningList.length">餐饮</td>
<td>
<div class="itemName" v-for="subItem in item.DiningSummaryList">
{{subItem.DiningName}}
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
{{getTotal(subItem.ReimburseList.ReimburseDetailsList)}}
</div>
</td>
<td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
{{sitem.Remarks}}
</template>
</td>
</tr>
</template>
<tr>
<td class="comTotal" colspan="4">合计：</td>
</tr>
<template v-for='(item,index) in dataList.HotelList'>
<tr>
<td v-if="index==0" :rowspan="dataList.HotelList.length">酒店</td>
<td width="30%">
<div class="itemName" >{{item.NewHotelName}}</div>
</td>
<td>{{item.TotalPrice}}</td>
<td>{{item.Remarks}}</td>
</tr>
</template>
<tr>
<td class="comTotal" colspan="4">合计：{{totalHotelPrice}}</td>
</tr>
</tbody>
</table>
<input type="button" class="printBtn" value="打印" @click="printTable()">
</div>
</div>
</template>
<script>
export default {
data () {
return {
isUpdate: false,
loading:false,
msg: {
TCIDs: '',
NewCombinationNum: ''
},
nav:[],
dataList:[],
//合计酒店
totalHotelPrice:0,
//合计交通
totalTrafficPrice:0,
}
},
methods: {
//获取数据
getList(){
this.loading = true
this.apipost('dmcstatistics_post_GetNewLeaderPayStatics', this.msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
console.log(res,'ressssssss');
this.dataList = res.data.data;
this.dataList.HotelList.forEach(x=>{
this.totalHotelPrice+=x.TotalPrice
})
this.dataList.BusList.forEach(x=>{
this.totalTrafficPrice+=x.TotalPrice
})
} else {
this.Error(res.data.message)
}
}, err => {})
},
//获取顶部数据
getNav() {
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
TCIDs: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) {
this.nav = res.data.data;
} else {
this.Error(res.data.message)
}
}, err => {})
},
//获取总额
getTotal(obj) {
let totalPrice = 0
obj.forEach(x => {
totalPrice += x.UserNum * x.UnitPrice
})
return totalPrice
},
//打印
printTable(){
window.print();
}
},
created() {
},
mounted() {
this.isUpdate = this.$route.query.isUpdate;
this.msg.TCIDs = this.$route.query.id;
this.getNav();
this.getList();
},
}
</script>
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ b3c38e63
......@@ -774,7 +774,7 @@
goB2B() {
let userInfo = this.getLocalStorage();
var B2BDomain = userInfo.B2BDomain;
let configId = this.NewConfigId
let configId = this.NewConfigId;
window.open(
B2BDomain + "/#/detailTwo/" +
encodeURIComponent(configId) + '/' + 0 +
......
src/plug/index.js
View file @ b3c38e63
......@@ -115,11 +115,8 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
<<<<<<< HEAD
domainUrl = "http://192.168.2.65:8025"; //214主域名
=======
// domainUrl = "http://192.168.2.65:8025"; //214主域名
domainUrl = "http://192.168.2.214:8082"; //214主域名
>>>>>>> 7b8479755cbf4d14d1c76d3cc81fe02bca102d72
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "http://reborn.oytour.com";
}
......
src/router/config.js
View file @ b3c38e63
......@@ -1031,7 +1031,8 @@ export default {
meta: {
title: '机票列表'
},
}, {
},
{
path: '/individualTicket', //散客机票
name: 'individualTicket',
component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
......@@ -1039,14 +1040,15 @@ export default {
title: '散客机票'
},
},
,{
path: '/IndividualTicketOrder', //散客今日机票订单
name: 'IndividualTicketOrder',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
meta: {
title: '散客机票今日订单'
},
},{
// ,{
// path: '/IndividualTicketOrder', //散客今日机票订单
// name: 'IndividualTicketOrder',
// component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
// meta: {
// title: '散客机票今日订单'
// },
// },
{
path: '/IndividualTicketOrderDetails', //散客机票订单详情
name: 'IndividualTicketOrderDetails',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrderDetails'], resolve),
......@@ -1866,14 +1868,14 @@ export default {
title: '机票订单'
},
},
{ // 销售 散卖机票订单
path: '/BulkAirTicketOrders',
name: 'BulkAirTicketOrders',
component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
meta: {
title: '散卖机票订单'
},
},
// { // 销售 散卖机票订单
// path: '/BulkAirTicketOrders',
// name: 'BulkAirTicketOrders',
// component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
// meta: {
// title: '散卖机票订单'
// },
// },
{ // 销售 报名统计
path: '/enrollTotal',
......@@ -2787,6 +2789,11 @@ export default {
component: resolve => require(['@/components/PermissionManage'], resolve),
},
]
},
{
path: '/leaderPay2', //领队报账
name: 'leaderPay2',
component: resolve => require(['@/components/leaderPay2'], resolve),
}
]
}
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