Skip to content

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

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

parents a8974016 2f46b627
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 77 deletions
src/components/LeaderManagement/leaderTaskBoard.vue
View file @ cb20c2e4
...@@ -344,8 +344,8 @@ ...@@ -344,8 +344,8 @@
</div> </div>
<div class="leaderInfo clearfix" v-for="item in dataList" :key="item.subCode" @drop="drop($event,item.TCID,item.Id)" @dragover="allowDrop($event)"> <div class="leaderInfo clearfix" v-for="item in dataList" :key="item.subCode" @drop="drop($event,item.TCID,item.Id)" @dragover="allowDrop($event)">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="1"> <el-col :span="3">
<div class="leadersList"> <div class="leadersList" style="min-width:230px;height:70px;">
<div v-if="item.LeaderType==1"> <div v-if="item.LeaderType==1">
<div class="cirList" v-if="item.LeaderName!=''"> <div class="cirList" v-if="item.LeaderName!=''">
<div class="circleHeader"> <div class="circleHeader">
...@@ -398,10 +398,10 @@ ...@@ -398,10 +398,10 @@
<div class="forSaling notStart" v-if="item.TCType==2">{{$t('leader.leader_noStart')}}</div> <div class="forSaling notStart" v-if="item.TCType==2">{{$t('leader.leader_noStart')}}</div>
<div class="forSaling worked" v-if="item.TCType==3">{{$t('leader.leader_HasCompleted')}}</div> <div class="forSaling worked" v-if="item.TCType==3">{{$t('leader.leader_HasCompleted')}}</div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="1">
<div class="createName">{{$t('hotel.table_operater')}}</div> <div class="createName">{{$t('hotel.table_operater')}}</div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="3">
<div> <div>
<div class="litCircle"> <div class="litCircle">
<img v-if="!item.CreateUrl" src="../../assets/img/default_head_img.jpg" alt=""> <img v-if="!item.CreateUrl" src="../../assets/img/default_head_img.jpg" alt="">
......
src/components/SalesModule/freeTravelOrder.vue
View file @ cb20c2e4
...@@ -417,7 +417,7 @@ export default { ...@@ -417,7 +417,7 @@ export default {
RB_Branch_Id:-1, RB_Branch_Id:-1,
RB_Department_Id:0, RB_Department_Id:0,
CreateBy:0, CreateBy:0,
HotelName:'', ProductName:'',
StartTime:'', StartTime:'',
EndTime:'', EndTime:'',
CStartTime:'', CStartTime:'',
...@@ -595,7 +595,7 @@ export default { ...@@ -595,7 +595,7 @@ export default {
}, },
goOrderDetails(ID){ goOrderDetails(ID){
this.$router.push({ this.$router.push({
name: 'freeTravelOrderDetails', name: 'freeTravelOrderStatiDetails',
query: { query: {
ID: ID, ID: ID,
blank:'y', blank:'y',
......
src/components/ShoppingStore/ShoppingReimbursement2.vue
View file @ cb20c2e4
...@@ -43,11 +43,6 @@ ...@@ -43,11 +43,6 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; "> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; ">
<table border="0" cellspacing="1" cellpadding="0" class="ShoppingTable" <table border="0" cellspacing="1" cellpadding="0" class="ShoppingTable"
style="border: 1px solid rgb(230, 230, 230);min-width: 1600px" v-loading="loading"> style="border: 1px solid rgb(230, 230, 230);min-width: 1600px" v-loading="loading">
<!-- <tr>
<th colspan="2">公司通用信息</th>
<th colspan="6">导游操作</th>
<th colspan="9">地接OP</th>
</tr> -->
<tr> <tr>
<th width="115">序号</th> <th width="115">序号</th>
<th width="100">出发地</th> <th width="100">出发地</th>
...@@ -131,7 +126,7 @@ ...@@ -131,7 +126,7 @@
</td> </td>
<td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'> <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
<div> <div>
<p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p> <p style="cursor: pointer;color:blue;" @click="isShowFinaceDailog=true,CurrentOutItem=outItem">生成单据</p>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -167,6 +162,22 @@ ...@@ -167,6 +162,22 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
</div> </div>
<el-dialog title="生成财务单据" :visible.sync="isShowFinaceDailog" custom-class='w400' center>
<template>
<el-form label-width="100px">
<el-form-item label="付款方式">
<el-select v-model="PayType">
<el-option label="常规付款" :value="1" :key="1"></el-option>
<el-option label="资金池付款" :value="2" :key="2"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="isShowFinaceDailog=false,CurrentOutItem={}">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="CreateBill()">{{$t('pub.sureBtn')}}</button>
</div>
</template>
</el-dialog>
<a id='blankLink1' target="_blank" style="display:none">1</a> <a id='blankLink1' target="_blank" style="display:none">1</a>
</div> </div>
</template> </template>
...@@ -183,13 +194,19 @@ ...@@ -183,13 +194,19 @@
LineId: 0, LineId: 0,
LineteamId: 0, LineteamId: 0,
StartDate: '', StartDate: '',
TCNUM:"",
EndDate: '', EndDate: '',
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
PayType:1,//付款方式
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
shopDataList: [], shopDataList: [],
//是否显示
isShowFinaceDailog:false,
//当前点击的对象
CurrentOutItem:{},
} }
}, },
methods: { methods: {
...@@ -300,37 +317,50 @@ ...@@ -300,37 +317,50 @@
} }
}, err => {}) }, err => {})
}, },
//生成单据 //生成单据
CreateBill(ShopDetailsList, outItem) { CreateBill() {
var that = this; var that = this;
this.Confirm('是否生成财务单据？', function () { this.Confirm('是否生成财务单据？', function () {
that.loading = true; that.loading = true;
var array = []; // var array = [];
ShopDetailsList.forEach(subItem => { // ShopDetailsList.forEach(subItem => {
var obj = { // var obj = {
LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0, // LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0,
LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "", // LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "",
TCID: subItem.TCID, // TCID: subItem.TCID,
GuideId: subItem.GuideId != null ? subItem.GuideId : 0, // GuideId: subItem.GuideId != null ? subItem.GuideId : 0,
GuideName: subItem.GuideName != null ? subItem.GuideName : "", // GuideName: subItem.GuideName != null ? subItem.GuideName : "",
TCNUM: subItem.TCNUMS, // TCNUM: subItem.TCNUMS,
} // }
array.push(obj) // array.push(obj)
}); // });
var billMsg = { // var billMsg = {
ShopDetailsList: ShopDetailsList, // ShopDetailsList: ShopDetailsList,
LeaderGuide: array // LeaderGuide: array
// };
// that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
// that.loading = false;
// if (res.data.resultCode == 1) {
// that.Success(res.data.message);
// } else {
// that.Error(res.data.message);
// }
// }, err => {})
var nMsg = {
TCIDs: that.CurrentOutItem.TCIDs,
PayType:that.PayType,
uid: that.getLocalStorage().EmployeeId
}; };
that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => { let fileName = "生成[" + that.CurrentOutItem.NewCombinationNum + "]购物店数据.xls";
that.loading = false; that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
if (res.data.resultCode == 1) { res => {
that.Success(res.data.message); that.loading = false;
} else { this.isShowFinaceDailog=false;
that.Error(res.data.message); that.Success("导入成功!");
} that.getList();
}, err => {}) });
}); });
}, },
}, },
mounted() { mounted() {
...@@ -341,7 +371,8 @@ ...@@ -341,7 +371,8 @@
parseInt(myDate.getMonth() + 1) + parseInt(myDate.getMonth() + 1) +
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.StartDate = nowDate; //this.msg.StartDate = nowDate;
this.msg.TCNUM="NRTMU07190702A";
this.getLineList(); this.getLineList();
this.getList(); this.getList();
}, },
......
src/components/Ticketing/flightPerformance.vue
View file @ cb20c2e4
<style> <style>
.fpTable th { .flightPerformance .fpTable th {
border-bottom: 1px solid #d1d1d1; border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1; border-right: 1px solid #d1d1d1;
background: #E6E6E6;
height:40px;
font-size: 14px;
color: #333;
}
.flightPerformance .fpTable{
width:1000px;
margin-bottom:30px;
border-collapse:collapse;
}
.flightPerformance .creatName{
color:green;
font-weight: bold;
margin-right:10px;
}
.flightPerformance .fpTable tr{background: #fff;text-align: center; height: 40px;}
.flightPerformance .fpTable tr td{font-size: 12px;border: 1px solid #E5E5E5;}
.flightPerformance .fpTable tbody tr:last-child {
border-bottom: 2px solid #333;
} }
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne flightPerformance">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
...@@ -32,29 +50,66 @@ ...@@ -32,29 +50,66 @@
</li> </li>
</ul> </ul>
</div> </div>
<table class="singeRowTable fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading" v-for="(item,index) in dataList.resultList">
<tr> <tbody v-for="(subItem,subIndex) in item.TicketList">
<th>团期</th> <tr v-if="subIndex==0">
<th>出团公司</th> <td colspan="6">
<th>线路</th> <span class="creatName">{{item.CreateByName}}</span>
<th>人数</th> {{msg.QMonth}}
<th>操作人员</th> 提成数据</td>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-if="index==0&&subIndex==0">
<td> <th>序号</th>
<template v-if="item.TCID>0"> <th>公司</th>
<a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",item.TCID,"报名清单")'> <th>团号</th>
({{item.TCID}}){{item.TCNUM}} </a> <th>人数</th>
</template> <th>金额</th>
<template v-else> <th>小计</th>
{{item.TCNUM}} </tr>
</template> <template v-for="(childItem,childIndex) in subItem.SubList">
</td> <tr>
<td>{{item.OutBranchName}}</td> <td width="10%">
<td>{{item.LineName}}</td> {{childIndex+1}}
<td>{{item.TicketNum}}</td> </td>
<td>{{item.CreateByName}}</td> <td width="20%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black" v-if="childIndex==0">
</tr> {{subItem.OutBranchName}}
</td>
<td width="30%">
<template v-if="childItem.TCID>0">
<a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",childItem.TCID,"报名清单")'>
({{childItem.TCID}}){{childItem.TCNUM}}
</a>
</template>
<template v-else>
{{childItem.TCNUM}}
</template>
</td>
<td width="10%">{{childItem.TicketNum}}</td>
<td width="10%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black" v-if="childIndex==0">{{dataList.UnitPrice}}</td>
<td width="10%">{{childItem.TicketNum*dataList.UnitPrice}}</td>
</tr>
<tr v-if="childIndex==subItem.SubList.length-1">
<td></td>
<td style="font-weight:bold;">合计</td>
<td style="color:red;">
{{getPeopleCount(subItem.SubList)}}
</td>
<td style="color:red;">
{{getCount(subItem.SubList)}}
</td>
</tr>
</template>
<tr v-if="subIndex==item.TicketList.length-1">
<td></td>
<td></td>
<td style="font-weight:bold;">总计</td>
<td>
<span style="color:red;">{{getTotalNum(item.TicketList)}}</span>
</td>
<td>{{dataList.UnitPrice}}</td>
<td><span style="color:red;">{{getTotalCount(item.TicketList)}}</span></td>
</tr>
</tbody>
</table> </table>
</div> </div>
</template> </template>
...@@ -70,7 +125,7 @@ ...@@ -70,7 +125,7 @@
QMonth: '', //月份 QMonth: '', //月份
}, },
loading: false, loading: false,
dataList: [], dataList: {},
//航空公司下拉 //航空公司下拉
airlineList: [], airlineList: [],
//操作人下拉 //操作人下拉
...@@ -116,6 +171,42 @@ ...@@ -116,6 +171,42 @@
} }
}); });
}, },
//获取没个的人数
getPeopleCount(subList){
let count=0;
subList.forEach(x => {
count+=x.TicketNum;
});
return count;
},
//计算小计
getCount(list){
let count=0;
list.forEach(x => {
count+=x.TicketNum;
});
return count*this.dataList.UnitPrice;
},
//计算总计
getTotalCount(list){
let count=0;
list.forEach(x=>{
x.SubList.forEach(y=>{
count+=y.TicketNum
})
})
return count*this.dataList.UnitPrice;
},
//获取总计人数
getTotalNum(list){
let count=0;
list.forEach(x=>{
x.SubList.forEach(y=>{
count+=y.TicketNum
})
})
return count;
},
//初始化航空公司下拉 //初始化航空公司下拉
initAirlines() { initAirlines() {
this.apipost( this.apipost(
......
src/components/TravelManager/TravelList/freeTravelOrderStati.vue
View file @ cb20c2e4
...@@ -474,7 +474,7 @@ export default { ...@@ -474,7 +474,7 @@ export default {
RB_Branch_Id:-1, RB_Branch_Id:-1,
RB_Department_Id:0, RB_Department_Id:0,
CreateBy:0, CreateBy:0,
HotelName:'', ProductName:'',
StartTime:'', StartTime:'',
EndTime:'', EndTime:'',
CStartTime:'', CStartTime:'',
......
src/components/index.vue
View file @ cb20c2e4
...@@ -3258,15 +3258,19 @@ export default { ...@@ -3258,15 +3258,19 @@ export default {
}, },
goUrl(url, id, index) { goUrl(url, id, index) {
if(url.indexOf("http://")==-1){ if(url.indexOf("http://")==-1){
if(url=='/JapanHotel'){ if(url=='/JapanHotel' || url=='/KKDayFree'){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let msg = { let msg = {
id:userInfo.EmployeeId id:userInfo.EmployeeId
} }
this.apipost("sellorder_post_GetDesEncrypt",msg,res => { this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let pageName = url=='/JapanHotel' ? 'hotelHome' : 'FreeHome';
this.EnCodeWord=res.data.data; this.EnCodeWord=res.data.data;
window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank"); // http://testb2b.oytour.com
// http://www.oytour.com
// window.open("http://testb2b.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
window.open("http://www.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/public/leftNav.vue
View file @ cb20c2e4
...@@ -202,15 +202,19 @@ ...@@ -202,15 +202,19 @@
}) })
}, },
goUrl(path) { goUrl(path) {
if(path=='/JapanHotel'){ if(path=='/JapanHotel' || url=='/KKDayFree'){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let msg = { let msg = {
id:userInfo.EmployeeId id:userInfo.EmployeeId
} }
this.apipost("sellorder_post_GetDesEncrypt",msg,res => { this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EnCodeWord=res.data.data; let pageName = url=='/JapanHotel' ? 'hotelHome' : 'FreeHome';
window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank"); this.EnCodeWord=res.data.data;
// http://testb2b.oytour.com
// http://www.oytour.com
// window.open("http://testb2b.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
window.open("http://www.oytour.com/#/"+ pageName +"?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/plug/index.js
View file @ cb20c2e4
...@@ -113,15 +113,15 @@ export default { ...@@ -113,15 +113,15 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
// domainUrl = "http://testapi.oytour.com"; // domainUrl = "http://testapi.oytour.com";
domainUrl = "http://192.168.2.214:8082"; // domainUrl = "http://192.168.2.214:8082";
// domainUrl = "http://192.168.2.16:8083"; domainUrl = "http://192.168.2.65:8025";
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (locationName.indexOf('oytour') !== -1) { if (locationName.indexOf('yx.oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) { } else if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://test.viitto.com"; domainUrl = "http://testapi.oytour.com";
} }
var obj = { var obj = {
//主地址 //主地址
......
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