Skip to content

S
SuperMan
Commit 7381cc07 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 0645eb89 5d03e1a4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 654 additions and 144 deletions
src/assets/utils/commonUtils.js
View file @ 7381cc07
...@@ -414,8 +414,18 @@ var commonUtils = { ...@@ -414,8 +414,18 @@ var commonUtils = {
} }
myDate = myDate.setDate(myDate.getDate() + day); myDate = myDate.setDate(myDate.getDate() + day);
myDate = new Date(myDate); myDate = new Date(myDate);
//返回年月日 var seperator1 = "-";
return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate() var year = myDate.getFullYear();
var month = myDate.getMonth() + 1;
var strDate = myDate.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = year + seperator1 + month + seperator1 + strDate;
return currentdate;
} }
} }
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 7381cc07
...@@ -438,6 +438,7 @@ ...@@ -438,6 +438,7 @@
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p> <p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<div class="_tit _tit2 w890px"> <div class="_tit _tit2 w890px">
<myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" /> <myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
</div> </div>
<template v-if="sonTCIDList"> <template v-if="sonTCIDList">
<div class="w890px"> <div class="w890px">
...@@ -1314,6 +1315,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue"; ...@@ -1314,6 +1315,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue";
import ChongDiPage from "../commonPage/ChongDiPage.vue"; import ChongDiPage from "../commonPage/ChongDiPage.vue";
import { truncate } from 'fs'; import { truncate } from 'fs';
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue"; import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js'; // import MsgBus from '../../assets/utils/msgBus.js';
export default { export default {
data(){ data(){
...@@ -1476,6 +1478,7 @@ export default { ...@@ -1476,6 +1478,7 @@ export default {
'my-HB-Bill':myhrBill, 'my-HB-Bill':myhrBill,
'ChongDiPage': ChongDiPage, 'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill, 'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill
}, },
methods:{ methods:{
// 单选计算 // 单选计算
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 7381cc07
...@@ -524,6 +524,7 @@ ...@@ -524,6 +524,7 @@
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p> <p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<div class="_tit _tit2 w890px"> <div class="_tit _tit2 w890px">
<myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" /> <myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
</div> </div>
<template v-if="sonTCIDList"> <template v-if="sonTCIDList">
<div class="w890px"> <div class="w890px">
...@@ -820,6 +821,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue"; ...@@ -820,6 +821,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue";
import ChongDiPage from "../commonPage/ChongDiPage.vue"; import ChongDiPage from "../commonPage/ChongDiPage.vue";
import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue"; import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue"; import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
export default { export default {
data(){ data(){
return{ return{
...@@ -904,6 +906,7 @@ export default { ...@@ -904,6 +906,7 @@ export default {
'myDJieBill': myDJieBill, 'myDJieBill': myDJieBill,
'ChongDiPage': ChongDiPage, 'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill, 'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill
}, },
created(){ created(){
this.ID = this.$route.query.id; this.ID = this.$route.query.id;
......
src/components/FinancialModule/FinancialSubmodule/DjieMergeBillModule.vue
View file @ 7381cc07
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
this.EndDate = yaer + '-' + month + '-' + dateS; this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(THIS.ID); this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化 },watch: { // 监听参数变化
GetDetail: { GetDetail: {
handler: function(val, oldVal) { handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/JiPiaoBillModule.vue 0 → 100644
View file @ 7381cc07
<style>
@import url('../../../assets/css/domestic/TicketingModule.css');
.sanjiao-box{
position: relative;
}
._sanjiao_{
position: absolute;
top: 0px;
left: 0px;
width: 0px;
height: 0px;
border-top: 20px solid #e73828;
border-bottom: 20px solid transparent;
border-left: 20px solid #e73828;
border-right: 20px solid transparent;
}
.sanjiao-box ._sanjiao_:after{
content: '关';
position: absolute;
top: -15px;
left: -14px;
white-space: nowrap;
color: #FFFFFF;
font-size: 12px;
}
.sanjiao-box .Receipt_table td{
padding: 0 10px;
}
.hover_text span{
cursor: pointer;
text-decoration: underline;
}
</style>
<template>
<div class="m_TicketingModule" >
<div class="_tit">
<span class="_text">{{tit}}</span>
<div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15">
<div class="_sanjiao_"></div>
<table border="1" class="_border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="68">{{$t('fnc.bweibi')}}</th>
</tr>
<template v-if="details&&details.length">
<tr v-for="(item) in details" class="_color_b">
<td height="34px">{{item.BName}}</td>
<td height="34px" @click="goDetail(item.FinanceId)" class="hover_text"><span>{{item.FinanceId}}</span></td>
<td height="34px">{{item.CostTypeName}}</td>
<td height="34px">{{item.CurrencyName}}</td>
<td height="34px">{{item.OriginalMoney}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{item.Money}}</td>
<td height="34px" style="max-width: 120px;">{{item.Remark}}</td>
<td height="34px">{{item.EmName}}</td>
</tr>
</template>
<tr v-if="details&&details.length<2">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="details&&details.length<3">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="details&&details.length<4">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
export default {
props:["FrID", "TemplateId"],
data(){
return{
tableShow: true,
tit: '',
details: [],
loading: true,
}
},watch:{
},created(){
this.tit = '团相关机票单据'
this.getDetails()
},mounted(){
},methods:{
goDetail(id){
this.$router.push({ name: 'FinancialDocumentsDetail',query:{"id":id,blank:'y',tab:'单据详情'} })
},
getDetails(){
this.loading = true
this.apipost('Financial_post_GetTicketFinanceRelevance', {FrId: this.FrID}, res=>{
if(res.data.resultCode == 1) {
this.loading = false
let data= res.data.data;
this.details = data;
}
}, null)
}
}
}
</script>
src/components/Hotel/roomReservationsDetails.vue
View file @ 7381cc07
...@@ -233,15 +233,21 @@ ...@@ -233,15 +233,21 @@
</td> </td>
<!--返佣--> <!--返佣-->
<td> <td>
<template v-if="childIndex==4 && subItem.DriverGuideIsRebate==0"> <template v-if="childIndex<4">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')" <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> % v-model='childItem.RebateRatio' @input="SetRebateRatio(subItem,childItem.RebateRatio),calculationPrice(subItem)"
:disabled="IsEditHotel==0?true:false"></el-input> %
</template> </template>
<template v-else> <template v-if="childIndex==5">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')" <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" v-model='childItem.RebateRatio' @input="calculationPrice(subItem)"
:disabled="IsEditHotel==0?true:false"></el-input> % :disabled="true"></el-input> %
</template> </template>
<template v-if="childIndex==4 && subItem.DriverGuideIsRebate==0">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> %
</template>
</td> </td>
<!--返佣金额--> <!--返佣金额-->
<td> <td>
...@@ -557,6 +563,16 @@ ...@@ -557,6 +563,16 @@
let str = `comCheckHotel${index}${subIndex}` let str = `comCheckHotel${index}${subIndex}`
this.$refs[str][0].getCheckHotel(); this.$refs[str][0].getCheckHotel();
}, },
//输入返佣自动前面4个房型赋值
SetRebateRatio(subItem,newValue)
{
subItem.OrderDetailsList.forEach((sItem,sIndex)=>{
if(sIndex<4)
{
sItem.RebateRatio=newValue;
}
});
},
DateMinus(sDate) { DateMinus(sDate) {
var newDate = moment(sDate).format("YYYY-MM-DD"); var newDate = moment(sDate).format("YYYY-MM-DD");
var sdate = new Date(newDate.replace(/-/g, "/")); var sdate = new Date(newDate.replace(/-/g, "/"));
......
src/components/LeaderManagement/leaderManagement.vue
View file @ 7381cc07
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
color: #333; color: #333;
} }
.guideMg .midList { .guideMg .midList {
margin-top: 16px; margin-top: 0;
} }
.guideMg .icon-dianhua ,.guideMg .icon-zuoji{ .guideMg .icon-dianhua ,.guideMg .icon-zuoji{
color: #47bf8c; color: #47bf8c;
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
</ul> </ul>
</div> </div>
<div class="contentDiv clearfix"> <div class="contentDiv clearfix">
<div class="listDiv" v-for="item in DataList" :key="item.Code"> <div class="listDiv" v-for="(item, index) in DataList" :key="index">
<div class="topInfo clearfix" v-if="item.Type === 3"> <div class="topInfo clearfix" v-if="item.Type === 3">
<div class="_sanjiao_" v-if="item.LeaderGuidClass==1"></div> <div class="_sanjiao_" v-if="item.LeaderGuidClass==1"></div>
<div class="leftImg"> <div class="leftImg">
...@@ -334,11 +334,11 @@ ...@@ -334,11 +334,11 @@
</div> </div>
<div class="nainfo" v-if="!item.LeaderGuidClass">{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div> <div class="nainfo" v-if="!item.LeaderGuidClass">{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div>
<div class="midList" v-if="!item.LeaderGuidClass">{{$t('system.table_sex')}}：{{item.Sex==0?'男/M':'女/F'}}</div> <div class="midList" v-if="!item.LeaderGuidClass">{{$t('system.table_sex')}}：{{item.Sex==0?'男/M':'女/F'}}</div>
<div v-if="!item.LeaderGuidClass">{{$t('system.query_goCoun')}}：{{item.CountryName}}</div> <div v-if="!item.LeaderGuidClass">{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" popper-class="max-w200" v-if="!item.LeaderGuidClass"> <el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" popper-class="max-w200" v-if="!item.LeaderGuidClass">
<div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}} <div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}}
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="clearfix botmInfo" v-if="!item.LeaderGuidClass"> <div class="clearfix botmInfo" v-if="!item.LeaderGuidClass">
<div class="leftCode"> <div class="leftCode">
...@@ -375,6 +375,7 @@ ...@@ -375,6 +375,7 @@
<div class="nainfo" >{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div> <div class="nainfo" >{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div>
<div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?'男/M':'女/F'}}</div> <div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?'男/M':'女/F'}}</div>
<div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div> <div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<div>带团数：{{item.TourNum}}</div>
<el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" popper-class="max-w200" > <el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" popper-class="max-w200" >
<div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}} <div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}}
</div> </div>
......
src/components/SalesModule/CustomerCertification.vue
View file @ 7381cc07
<template> <template>
<div class="CertificationDetail"> <div class="CertificationDetail">
<div> <div>
<div <div
:class="{salesApprovalLayercontentDiv:showlayer,rightZero:isTransition}" :class="{salesApprovalLayercontentDiv:showlayer,rightZero:isTransition}"
class="ownScrollbarStyle" class="ownScrollbarStyle"
...@@ -81,6 +81,19 @@ ...@@ -81,6 +81,19 @@
type="date" type="date"
></el-date-picker> ></el-date-picker>
</li> </li>
<li>
<span>
<em>{{$t('system.query_company')}}</em>
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li> <li>
<span> <span>
<em>状态</em> <em>状态</em>
...@@ -113,18 +126,20 @@ ...@@ -113,18 +126,20 @@
<th width="10%">门店名称</th> <th width="10%">门店名称</th>
<th width="10%">联系人</th> <th width="10%">联系人</th>
<th width="10%">电话</th> <th width="10%">电话</th>
<th width="10%">交易金额</th>
<th width="10%">地址</th> <th width="10%">地址</th>
<th width="10%">申请时间</th> <th width="10%">申请时间</th>
<th width="10%">申请状态</th> <th width="10%">申请状态</th>
<th width="10%">操作</th> <th width="10%">操作</th>
</tr> </tr>
<tr> <tr>
<td colspan="6" align="center" v-show="list.length==0">暂无数据</td> <td colspan="8" align="center" v-show="list.length==0">暂无数据</td>
</tr> </tr>
<tr v-for="(item,index) in list"> <tr v-for="(item,index) in list">
<td>{{item.CustomerName}}</td> <td>{{item.CustomerName}}</td>
<td>{{item.Customer}}</td> <td>{{item.Customer}}</td>
<td>{{item.ContactPhone}}</td> <td>{{item.ContactPhone}}</td>
<td>{{item.TradeMoney}}</td>
<td>{{item.Addres}}</td> <td>{{item.Addres}}</td>
<td>{{item.CreateDateStr}}</td> <td>{{item.CreateDateStr}}</td>
<td> <td>
...@@ -164,7 +179,8 @@ export default { ...@@ -164,7 +179,8 @@ export default {
pageSize: 10, pageSize: 10,
SDate: "", SDate: "",
EDate: "", EDate: "",
ApplyState: "-1" ApplyState: "-1",
RB_Branch_Id: -2,
}, },
Reason:"", Reason:"",
showlayer: false, showlayer: false,
...@@ -173,10 +189,22 @@ export default { ...@@ -173,10 +189,22 @@ export default {
currentPage: 1, currentPage: 1,
total: 0, total: 0,
answerDetailList: [], answerDetailList: [],
list: [] list: [],
CompanyList: [],
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
Status:'0',
},
}; };
}, },
methods: { methods: {
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
// 结束日期不能大于开始日期 // 结束日期不能大于开始日期
dataDui() { dataDui() {
if (this.msg.SDate > this.msg.EDate && this.msg.EDate !== "") { if (this.msg.SDate > this.msg.EDate && this.msg.EDate !== "") {
...@@ -264,7 +292,10 @@ export default { ...@@ -264,7 +292,10 @@ export default {
} }
}, },
mounted() { mounted() {
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= userInfo.RB_Group_id; //集团ID
this.getList(); this.getList();
this.getCompanyList()
} }
}; };
</script> </script>
......
src/components/SalesModule/productQuery.vue
View file @ 7381cc07
...@@ -707,6 +707,14 @@ ...@@ -707,6 +707,14 @@
<p><span>出发城市</span>{{item.StartCityName}}</p> <p><span>出发城市</span>{{item.StartCityName}}</p>
<p><span>返回城市</span>{{item.ReturnArriveCityName}}</p> <p><span>返回城市</span>{{item.ReturnArriveCityName}}</p>
<p><span>出团公司</span>{{item.OutBranchName}}</p> <p><span>出团公司</span>{{item.OutBranchName}}</p>
<p v-show="item.ClearOrderHour>0">
<span>同行清位时间</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
<p v-show="item.SaleClearOrderHour&&item.SaleClearOrderHour>0">
<span>销售清位时间</span>
<span class="TCL-greenType">{{item.SaleClearOrderHour}}小时</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="PQ_HotelPop"> <el-popover width="600" trigger="click" popper-class="PQ_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"></commonHotelInfo> <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"></commonHotelInfo>
......
src/components/TravelManager/TravelList/PassengerFeedback.vue
View file @ 7381cc07
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<span> <span>
<em>线路</em> <em>线路</em>
</span> </span>
<el-select filterable v-model="msg.CreateBy" @change="getLineTeamList(msg.LineId)"> <el-select filterable v-model="msg.lineID" @change="getLineTeamList(msg.lineID)">
<el-option label="不限" value='-1'></el-option> <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-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
</el-select> </el-select>
</li> </li>
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<span> <span>
<em>系列</em> <em>系列</em>
</span> </span>
<el-select filterable v-model="msg.CreateBy"> <el-select filterable v-model="msg.LineteamId">
<el-option label="不限" value='-1'></el-option> <el-option label="不限" :value='0'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -26,11 +26,10 @@ ...@@ -26,11 +26,10 @@
<span> <span>
<em>只看有评分</em> <em>只看有评分</em>
</span> </span>
<el-select filterable class='multiple_input' v-model='msg.Brand' :placeholder="$t('pub.pleaseSel')"> <el-select filterable class='multiple_input' v-model='msg.isScore' :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="0"></el-option>
<el-option label="是" :value="-1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="否" :value="-1"></el-option> <el-option label="否" :value="-1"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
...@@ -54,7 +53,7 @@ ...@@ -54,7 +53,7 @@
value="查询" value="查询"
@click="resetPageIndex(),getList()" @click="resetPageIndex(),getList()"
> >
<el-button @click="goUrl" type="danger" style="border-radius:14px;margin-left:8px" size="small">旅客反馈分析</el-button> <input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析"/>
</li> </li>
</ul> </ul>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
...@@ -67,7 +66,7 @@ ...@@ -67,7 +66,7 @@
</tr> </tr>
<tr v-for="(item,i) in dataList" :key="i"> <tr v-for="(item,i) in dataList" :key="i">
<td>{{item.start}}</td> <td>{{item.start}}</td>
<td>没有字段({{item.tcid}})</td> <td>{{item.tCNUM}}</td>
<td> <td>
{{(item.sumScore/fields.length).toFixed(1)}} {{(item.sumScore/fields.length).toFixed(1)}}
</td> </td>
...@@ -78,7 +77,7 @@ ...@@ -78,7 +77,7 @@
</td> </td>
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td colspan="10" align="center">暂无数据</td> <td colspan="12" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
<el-pagination <el-pagination
...@@ -103,6 +102,11 @@ export default { ...@@ -103,6 +102,11 @@ export default {
msg:{ msg:{
pageSize:10, pageSize:10,
pageIndex:1, pageIndex:1,
lineID:0,
LineteamId:0,
reStartDate:'',
reEndDate:'',
isScore:0
}, },
total:0, total:0,
currentPage:1, currentPage:1,
...@@ -117,11 +121,8 @@ export default { ...@@ -117,11 +121,8 @@ export default {
this.getList(); this.getList();
}, },
methods:{ methods:{
chaKan(item){ chaKan(item){
console.log("item",item)
this.$router.push({ name:'investigationList',query:{"TCID":item.tcid,blank: 'y'} }) this.$router.push({ name:'investigationList',query:{"TCID":item.tcid,blank: 'y'} })
}, },
goUrl(){ goUrl(){
this.$router.push({ name:'FeedbackChart',query:{"customerId":1,blank: 'y'} }) this.$router.push({ name:'FeedbackChart',query:{"customerId":1,blank: 'y'} })
...@@ -149,23 +150,20 @@ export default { ...@@ -149,23 +150,20 @@ export default {
getList(){ getList(){
if(this.dateList){ if(this.dateList){
this.msg.startDate=this.dateList[0]; this.msg.reStartDate=this.dateList[0];
this.msg.endDate=this.dateList[1]; this.msg.reEndDate=this.dateList[1];
}else{ }else{
this.msg.startDate=""; this.msg.reStartDate="";
this.msg.endDate=""; this.msg.reEndDate="";
} }
this.loading=true;
this.apiJavaPost("/api/erp/survey//getSurveyList", this.msg, res => { this.apiJavaPost("/api/erp/survey//getSurveyList", this.msg, res => {
// this.loading = false; this.loading = false;
console.log(res);
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let arrays=[] let arrays=[]
res.data.data.pageData.forEach(x => { res.data.data.pageData.forEach(x => {
let isHave=false let isHave=false
if(this.fields.indexOf(x.title)==-1){ if(this.fields.indexOf(x.title)==-1&&x.title!=''){
this.fields.push(x.title) this.fields.push(x.title)
} }
if(arrays.length>0){ if(arrays.length>0){
...@@ -182,7 +180,8 @@ export default { ...@@ -182,7 +180,8 @@ export default {
let obj={ let obj={
tcid:x.tCID, tcid:x.tCID,
start:x.startDate.split('T')[0], start:x.startDate.split('T')[0],
sumScore:x.scoreNum sumScore:x.scoreNum,
tCNUM:x.tCNUM
} }
obj[x.title]=x.scoreNum obj[x.title]=x.scoreNum
arrays.push(obj) arrays.push(obj)
...@@ -191,12 +190,8 @@ export default { ...@@ -191,12 +190,8 @@ export default {
}); });
this.dataList=arrays; this.dataList=arrays;
this.total=this.dataList.length; this.total=this.dataList.length;
console.log(this.dataList,'datalist');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
}, null); }, null);
}, },
......
src/components/commonPage/comCheckHotelV2.vue
View file @ 7381cc07
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</table> </table>
</div> </div>
<div> <div>
<el-tabs type="border-card" v-loading="loading" v-if="IsShow"> <el-tabs type="border-card" v-loading="loading" v-if="qHotelType==1">
<el-tab-pane :label="item.ProvinceName" v-for="(item,index) in dataList" :key="item.subCode"> <el-tab-pane :label="item.ProvinceName" v-for="(item,index) in dataList" :key="item.subCode">
<div class="clearfix comCheckHotelV2"> <div class="clearfix comCheckHotelV2">
<div class="comCk_list" v-for="(subItem,subIndex) in item.HotelList"> <div class="comCk_list" v-for="(subItem,subIndex) in item.HotelList">
...@@ -124,6 +124,36 @@ ...@@ -124,6 +124,36 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<template v-else>
<table v-loading="loading" >
<thead>
<tr>
<th>选择</th>
<th>酒店名称</th>
<th>价格</th>
</tr>
</thead>
<tbody>
<tr v-for="item in ThirdHotelList">
<td width="50">
<input :id="item.hotelId" type="checkbox" />
</td>
<td width="150">{{item.hotelName}}</td>
<td width="150">{{item.lowrateTotal}}</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="3">
<el-pagination v-if="thirdHotelMsg.numberOfResultMatched>0" background @current-change="handleCurrentChange"
:current-page.sync="thirdHotelMsg.displayFrom" :page-size="thirdHotelMsg.numberOfResults"
layout="total,prev, pager, next, jumper" :total="thirdHotelMsg.numberOfResultMatched">
</el-pagination>
</td>
</tr>
</tfoot>
</table>
</template>
</div> </div>
<input type="button" class="normalBtn com_SaveBtn" @click="sendCkedHotel()" value="保存" /> <input type="button" class="normalBtn com_SaveBtn" @click="sendCkedHotel()" value="保存" />
</div> </div>
...@@ -142,6 +172,34 @@ ...@@ -142,6 +172,34 @@
Name: "", //酒店名称 Name: "", //酒店名称
UseDate: "", //入住时间 UseDate: "", //入住时间
}, },
thirdHotelMsg: {
displayFrom: 1, //当前页
numberOfResults: 5, //每页条数
numberOfResultMatched: 0, //总条数
arrivalDate: "", //入住时间
departureDate: "", //离店时间
//房间信息列表
searchroomGroup: [{
numberOfAdults: 1, //大人数,
numberOfChildren: 0, //儿童数
childAges: 0, //儿童年龄
roomNum: 1, //房间数
}],
searchHotelIdList: [], //酒店id，[1,2,3]
freeword: "", //关键字
//类型 1，地区，2-酒店名称
freewordType: 0,
reviewRatingUpperLimits: 0, //指定评论分数的上限
reviewRatingLowerLimits: 0, //指定评论分数的下限
searchHotelCategory: [], //酒店分类
searchHotelFeatures: [], //酒店的特征
searchRoomType: [], //类型的房间
searchMealType: [], //饮食条件搜索
searchMinRate: 0, //検索最小金額,
searchMinRate: 0, //検索最大金額
sort: 0, //排序
},
ThirdHotelList: [], //第三方酒店列表
IsShow: false, IsShow: false,
ckedHotel: {} ckedHotel: {}
}; };
...@@ -152,88 +210,88 @@ ...@@ -152,88 +210,88 @@
this.IsShow = false; this.IsShow = false;
this.dataList = []; this.dataList = [];
this.HotelList = []; this.HotelList = [];
this.ThirdHotelList=[];
//地接酒店 //地接酒店
if (this.qHotelType == 1) { if (this.qHotelType == 1) {
this.apipost('hotel_post_GetHasStockHotelList_V2', { this.GetDMCHotelList();
//1-只查询有库存的酒店
IsMoreThanZero: 0,
Country: "651",
IsAllHotel: 1,
Province: this.qMsg.ProvinceId,
Name: this.qMsg.Name,
sDate: this.qMsg.UseDate
}, res => {
this.loading = false;
this.IsShow = true;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
this.dataList.forEach(x => {
x.HotelList.forEach(y => {
y.isChecked = false;
})
})
} else {
this.Error(res.data.message)
}
}, err => {})
} }
//第三方酒店 //第三方酒店
else { else {
var nQMsg = { this.GetThirdHotelList();
displayFrom: "1", //当前页 }
numberOfResults: "10", //每页条数 },
arrivalDate: this.qMsg.UseDate, //入住时间 //查询地接酒店
departureDate: "", //离店时间 GetDMCHotelList() {
//房间信息列表 this.apipost('hotel_post_GetHasStockHotelList_V2', {
searchroomGroup: { //1-只查询有库存的酒店
numberOfAdults: 2, //大人数, IsMoreThanZero: 0,
numberOfChildren: 0, //儿童数 Country: "651",
childAges: 0, //儿童年龄 IsAllHotel: 1,
}, Province: this.qMsg.ProvinceId,
searchHotelIdList:[],//酒店id，[1,2,3] Name: this.qMsg.Name,
freeword:this.qMsg.Name,//关键字 sDate: this.qMsg.UseDate
//类型 1，地区，2-酒店名称 }, res => {
freewordType:0, this.loading = false;
reviewRatingUpperLimits:0,//指定评论分数的上限 this.IsShow = true;
reviewRatingLowerLimits:0,//指定评论分数的下限 if (res.data.resultCode == 1) {
searchHotelCategory:[],//酒店分类 this.dataList = res.data.data;
searchHotelFeatures:[],//酒店的特征 this.dataList.forEach(x => {
searchRoomType:[],//类型的房间 x.HotelList.forEach(y => {
searchMealType:[],//饮食条件搜索 y.isChecked = false;
searchMinRate:0,//検索最小金額, })
searchMinRate:100000,//検索最大金額 })
sort:0,//排序 } else {
}; this.Error(res.data.message)
if(nQMsg.arrivalDate=="")
{
this.Info("请选择入住时间!");
return;
}
else
{
nQMsg.departureDate=this.$commonUtils.AddDay(nQMsg.arrivalDate,1);
}
if(nQMsg.freeword!="")
{
nQMsg.freewordType=1;
}
else
{
nQMsg.freewordType=2;
nQMsg.freeword="";
} }
console.log("nQMsg",nQMsg); }, err => {})
//多了一个参数调用线上的就酒店数据 },
this.apipost('dmc_post_Get_GetJAPAN_HotelList', nQMsg, res => { //查询第三方酒店
this.loading = false; GetThirdHotelList() {
this.IsShow = true; this.thirdHotelMsg.arrivalDate=this.qMsg.UseDate;
if (res.data.resultCode == 1) { if (this.thirdHotelMsg.arrivalDate == "") {
console.log("res.data",res.data); this.Info("请选择入住时间!");
return;
} else {
this.thirdHotelMsg.departureDate = this.$commonUtils.AddDay(this.thirdHotelMsg.arrivalDate, 1);
}
this.thirdHotelMsg.freeword=this.qMsg.Name;
if (this.thirdHotelMsg.freeword == "") {
this.thirdHotelMsg.freewordType = 1;
if (this.qMsg.ProvinceId > 0) {
//获取当前选中的对象
let obj = {};
obj = this.ProvinceList.find(item => {
return item.ID === this.qMsg.ProvinceId; //筛选出匹配数据
});
if (obj != undefined) {
this.thirdHotelMsg.freeword = obj.Name;
} else { } else {
this.Error(res.data.message) this.thirdHotelMsg.freeword = this.ProvinceList[0].Name;
} }
}, err => {},true) } else {
this.thirdHotelMsg.freeword = this.ProvinceList[0].Name;
}
} else {
this.thirdHotelMsg.freewordType = 2;
this.thirdHotelMsg.freeword = this.qMsg.Name;
} }
//多了一个参数调用线上的就酒店数据
this.apipost('dmc_post_Get_GetJAPAN_HotelList', this.thirdHotelMsg, res => {
this.loading = false;
this.IsShow = true;
if (res.data.resultCode == 1) {
//总条数
this.thirdHotelMsg.numberOfResultMatched = Number(res.data.data.numberOfResultMatched);
this.ThirdHotelList = res.data.data.hotelSummary;
} else {
this.Error(res.data.message)
}
}, err => {}, true)
},
handleCurrentChange(val) {
this.thirdHotelMsg.displayFrom = val;
this.GetThirdHotelList();
}, },
getCheck(hotelList, index) { getCheck(hotelList, index) {
hotelList.forEach((x, subIndex) => { hotelList.forEach((x, subIndex) => {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 7381cc07
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<tr> <tr>
<th colspan="11">公司通用信息</th> <th colspan="11">公司通用信息</th>
<th colspan="5">团队需求表</th> <th colspan="5">团队需求表</th>
<th colspan="8">地接op操作</th> <th colspan="9">地接op操作</th>
</tr> </tr>
<tr> <tr>
<th width="130">序号</th> <th width="130">序号</th>
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
<th width="60">餐食</th> <th width="60">餐食</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="120">操作</th> <th width="120">操作</th>
</tr> </tr>
<tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}"> <tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}">
...@@ -338,8 +339,23 @@ ...@@ -338,8 +339,23 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
<el-popover width="100" trigger="click" popper-class="DMC_HotelPop">
<table style="width: 100%;" border="0" cellspacing="1" class="dmcTotalTable">
<tr>
<th>单号</th>
<th>金额</th>
</tr>
<tr v-for="(fnc, findex) in outItem.FinanceIds">
<td class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', fnc.FinanceId)">{{fnc.FinanceId}}</td>
<td>{{moneyFormat(fnc.OriginalMoney)}}</td>
</tr>
</table>
<span slot="reference" style="cursor:pointer;text-decoration:underline;">{{outItem.TotalPrice}}</span>
</el-popover>
</td>
<td> <td>
<div class="w250"> <div style="width: 150px;">
<el-button-group> <el-button-group>
<el-tooltip class="item" effect="dark" content="地接信息" placement="top-start"> <el-tooltip class="item" effect="dark" content="地接信息" placement="top-start">
<el-popover placement="bottom" width="300" trigger="click"> <el-popover placement="bottom" width="300" trigger="click">
...@@ -448,7 +464,7 @@ ...@@ -448,7 +464,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="22" style="text-align: left!important;padding:0 20px;"> <td colspan="21" style="text-align: left!important;padding:0 20px;">
<div class="link"> <div class="link">
<p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p> <p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''" <div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
...@@ -471,6 +487,7 @@ ...@@ -471,6 +487,7 @@
</div> </div>
</div> </div>
</td> </td>
<td></td>
</tr> </tr>
</template> </template>
</tbody> </tbody>
...@@ -742,6 +759,15 @@ ...@@ -742,6 +759,15 @@
}) })
window.open(routeData.href, '_blank'); window.open(routeData.href, '_blank');
}, },
goFncUrl: function(path, id) {
this.$router.push({
name: path,
query: {
id: id,
blank: 'y',
}
})
},
goUrlR(path, obj, title) { goUrlR(path, obj, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
......
src/components/leaderPay2.vue
View file @ 7381cc07
This diff is collapsed.
src/components/systemManagement/HistoryRateQuery.vue
View file @ 7381cc07
...@@ -234,12 +234,12 @@ ...@@ -234,12 +234,12 @@
}, },
timeAdd(){ timeAdd(){
if(!this.productionDate){ if(!this.productionDate){
this.msg.sDate = ''; this.msg.StartTime = '';
this.msg.eDate = ''; this.msg.EndTime = '';
return return
} }
this.msg.sDate = this.productionDate[0]; this.msg.StartTime = this.productionDate[0];
this.msg.eDate = this.productionDate[1]; this.msg.EndTime = this.productionDate[1];
}, },
financeinfo_post_GetList(){ // 币种类型 financeinfo_post_GetList(){ // 币种类型
this.apipost('financeinfo_post_GetList',{Name:''},res=>{ this.apipost('financeinfo_post_GetList',{Name:''},res=>{
......
src/plug/index.js
View file @ 7381cc07
...@@ -118,8 +118,9 @@ export default { ...@@ -118,8 +118,9 @@ export default {
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function() {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.214:8082"; domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.65:8025"; domainUrl = "http://192.168.2.65:8025";
domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) { if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) { } else if (locationName.indexOf('viitto') !== -1) {
......
src/router/config.js
View file @ 7381cc07
...@@ -2147,12 +2147,12 @@ export default { ...@@ -2147,12 +2147,12 @@ export default {
meta: { meta: {
title: '路线' title: '路线'
}, },
}, { //财务 现金账户 }, { //财务 实名认证
path: '/CustomerCertification', path: '/CustomerCertification',
name: 'CustomerCertification', name: 'CustomerCertification',
component: resolve => require(['@/components/SalesModule/CustomerCertification'], resolve), component: resolve => require(['@/components/SalesModule/CustomerCertification'], resolve),
meta: { meta: {
title: '现金账户' title: '实名认证'
}, },
}, },
{ // 销售 我的任务 { // 销售 我的任务
......
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