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
Show 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">
...@@ -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
...@@ -80,6 +80,19 @@ ...@@ -80,6 +80,19 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
></el-date-picker> ></el-date-picker>
</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> <li>
<span> <span>
...@@ -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,
...@@ -118,10 +122,7 @@ export default { ...@@ -118,10 +122,7 @@ export default {
}, },
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,10 +190,6 @@ export default { ...@@ -191,10 +190,6 @@ 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)
} }
......
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,8 +210,18 @@ ...@@ -152,8 +210,18 @@
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.GetDMCHotelList();
}
//第三方酒店
else {
this.GetThirdHotelList();
}
},
//查询地接酒店
GetDMCHotelList() {
this.apipost('hotel_post_GetHasStockHotelList_V2', { this.apipost('hotel_post_GetHasStockHotelList_V2', {
//1-只查询有库存的酒店 //1-只查询有库存的酒店
IsMoreThanZero: 0, IsMoreThanZero: 0,
...@@ -176,64 +244,54 @@ ...@@ -176,64 +244,54 @@
this.Error(res.data.message) this.Error(res.data.message)
} }
}, err => {}) }, err => {})
}
//第三方酒店
else {
var nQMsg = {
displayFrom: "1", //当前页
numberOfResults: "10", //每页条数
arrivalDate: this.qMsg.UseDate, //入住时间
departureDate: "", //离店时间
//房间信息列表
searchroomGroup: {
numberOfAdults: 2, //大人数,
numberOfChildren: 0, //儿童数
childAges: 0, //儿童年龄
}, },
searchHotelIdList:[],//酒店id，[1,2,3] //查询第三方酒店
freeword:this.qMsg.Name,//关键字 GetThirdHotelList() {
//类型 1，地区，2-酒店名称 this.thirdHotelMsg.arrivalDate=this.qMsg.UseDate;
freewordType:0, if (this.thirdHotelMsg.arrivalDate == "") {
reviewRatingUpperLimits:0,//指定评论分数的上限
reviewRatingLowerLimits:0,//指定评论分数的下限
searchHotelCategory:[],//酒店分类
searchHotelFeatures:[],//酒店的特征
searchRoomType:[],//类型的房间
searchMealType:[],//饮食条件搜索
searchMinRate:0,//検索最小金額,
searchMinRate:100000,//検索最大金額
sort:0,//排序
};
if(nQMsg.arrivalDate=="")
{
this.Info("请选择入住时间!"); this.Info("请选择入住时间!");
return; return;
} else {
this.thirdHotelMsg.departureDate = this.$commonUtils.AddDay(this.thirdHotelMsg.arrivalDate, 1);
} }
else this.thirdHotelMsg.freeword=this.qMsg.Name;
{ if (this.thirdHotelMsg.freeword == "") {
nQMsg.departureDate=this.$commonUtils.AddDay(nQMsg.arrivalDate,1); 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 {
this.thirdHotelMsg.freeword = this.ProvinceList[0].Name;
} }
if(nQMsg.freeword!="") } else {
{ this.thirdHotelMsg.freeword = this.ProvinceList[0].Name;
nQMsg.freewordType=1;
} }
else } else {
{ this.thirdHotelMsg.freewordType = 2;
nQMsg.freewordType=2; this.thirdHotelMsg.freeword = this.qMsg.Name;
nQMsg.freeword="";
} }
console.log("nQMsg",nQMsg);
//多了一个参数调用线上的就酒店数据 //多了一个参数调用线上的就酒店数据
this.apipost('dmc_post_Get_GetJAPAN_HotelList', nQMsg, res => { this.apipost('dmc_post_Get_GetJAPAN_HotelList', this.thirdHotelMsg, res => {
this.loading = false; this.loading = false;
this.IsShow = true; this.IsShow = true;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log("res.data",res.data); //总条数
this.thirdHotelMsg.numberOfResultMatched = Number(res.data.data.numberOfResultMatched);
this.ThirdHotelList = res.data.data.hotelSummary;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
}, err => {},true) }, 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
...@@ -356,7 +356,7 @@ input[type="number"] { ...@@ -356,7 +356,7 @@ input[type="number"] {
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2"> <table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
<tr> <tr>
<th colspan="10" class="bgwhite">酒店使用</th> <th colspan="11" class="bgwhite">酒店使用</th>
</tr> </tr>
<tr> <tr>
<th width="180">使用日期</th> <th width="180">使用日期</th>
...@@ -365,6 +365,7 @@ input[type="number"] { ...@@ -365,6 +365,7 @@ input[type="number"] {
<th width="">预定人数 </th> <th width="">预定人数 </th>
<th width="">单价/人</th> <th width="">单价/人</th>
<th width="">付款方式</th> <th width="">付款方式</th>
<th width="60">返佣<br />类型</th>
<th width="">金额小计</th> <th width="">金额小计</th>
<th width="">预计总金额</th> <th width="">预计总金额</th>
<th width="">实付金额</th> <th width="">实付金额</th>
...@@ -384,7 +385,16 @@ input[type="number"] { ...@@ -384,7 +385,16 @@ input[type="number"] {
<span v-if="childItem.HouseType === 2">标准双人间</span> <span v-if="childItem.HouseType === 2">标准双人间</span>
<span v-if="childItem.HouseType === 3">大床房</span> <span v-if="childItem.HouseType === 3">大床房</span>
<span v-if="childItem.HouseType === 4">三人间</span> <span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5">司导间</span> <span v-if="childItem.HouseType === 5">司导间
<template v-if="childIndex==4">
<template v-if="subItem.DriverGuideIsRebate==1">
<br /><span style="color:green">返佣</span>
</template>
<template v-else-if="subItem.DriverGuideIsRebate==0">
<br /><span style="color:red;">不返佣</span>
</template>
</template>
</span>
<span v-if="childItem.HouseType === 6">不占床</span> <span v-if="childItem.HouseType === 6">不占床</span>
</td> </td>
<td> <td>
...@@ -395,7 +405,6 @@ input[type="number"] { ...@@ -395,7 +405,6 @@ input[type="number"] {
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}} {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p> </p>
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length"> <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<span v-if="subItem.PayStyle === 1">现付</span> <span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span> <span v-else-if="subItem.PayStyle === 2">签单</span>
...@@ -406,6 +415,14 @@ input[type="number"] { ...@@ -406,6 +415,14 @@ input[type="number"] {
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<template v-if="subItem.RebateType==1">
<span style="color:green">含税</span>
</template>
<template v-else>
<span style="color:red"> 不含税</span>
</template>
</td>
<td> <td>
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}} {{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
</td> </td>
...@@ -470,7 +487,15 @@ input[type="number"] { ...@@ -470,7 +487,15 @@ input[type="number"] {
<tr> <tr>
<th>类型</th> <th>类型</th>
<th>预计总金额</th> <th>预计总金额</th>
<th>金额</th> <th>实付金额</th>
<th>报账金额
<input
type="button"
value="保存"
class="leader2Btn"
@click="saveBZPrice()"
>
</th>
</tr> </tr>
<tr v-show="totalList.SelfPayingExpendTotalPrice>0"> <tr v-show="totalList.SelfPayingExpendTotalPrice>0">
<td>自费支出</td> <td>自费支出</td>
...@@ -497,21 +522,49 @@ input[type="number"] { ...@@ -497,21 +522,49 @@ input[type="number"] {
<td>景点门票</td> <td>景点门票</td>
<td>{{moneyFormat(OtherTotalPrice)}}</td> <td>{{moneyFormat(OtherTotalPrice)}}</td>
<td>{{moneyFormat(totalScenicPrice)}}</td> <td>{{moneyFormat(totalScenicPrice)}}</td>
<td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.ScenicPrice" @change="getAllBZPrice"></el-input>
</td>
</tr> </tr>
<tr v-show="totalTrafficPrice>0"> <tr v-show="totalTrafficPrice>0">
<td>交通</td> <td>交通</td>
<td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td> <td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalTrafficPrice)}}</td> <td>{{moneyFormat(totalTrafficPrice)}}</td>
<td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.BusPrice" @change="getAllBZPrice"></el-input>
</td>
</tr> </tr>
<tr v-show="totalDinnerPrice>0"> <tr v-show="totalDinnerPrice>0">
<td>餐饮</td> <td>餐饮</td>
<td>{{moneyFormat(IncomeTotalPrice)}}</td> <td>{{moneyFormat(IncomeTotalPrice)}}</td>
<td>{{moneyFormat(totalDinnerPrice)}}</td> <td>{{moneyFormat(totalDinnerPrice)}}</td>
<td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.DiningPrice" @change="getAllBZPrice"></el-input>
</td>
</tr> </tr>
<tr v-show="totalHotelPrice>0"> <tr v-show="totalHotelPrice>0">
<td>酒店</td> <td>酒店</td>
<td>{{moneyFormat(ExpendTotalPrice)}}</td> <td>{{moneyFormat(ExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalHotelPrice)}}</td> <td>{{moneyFormat(totalHotelPrice)}}</td>
<td>
<el-input
size="mini"
class="w150"
type="number"
v-model="BaoZhangPrice.HotelPrice" @change="getAllBZPrice"></el-input>
</td>
</tr> </tr>
</table> </table>
<table border="0" cellspacing="1" class="leaderPayTable" v-if="TotalPriceData.length>0"> <table border="0" cellspacing="1" class="leaderPayTable" v-if="TotalPriceData.length>0">
...@@ -520,17 +573,19 @@ input[type="number"] { ...@@ -520,17 +573,19 @@ input[type="number"] {
<th>预付合计</th> <th>预付合计</th>
<th>实际领款</th> <th>实际领款</th>
<th>实付合计</th> <th>实付合计</th>
<th>实际报账金额</th>
<th>领队退款</th> <th>领队退款</th>
</tr> </tr>
<tr <tr
v-for="item in TotalPriceData" v-for="(item, index) in TotalPriceData"
v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice > 0" v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice > 0"
> >
<td>{{item.CurrencyStr}}</td> <td>{{item.CurrencyStr}}</td>
<td>{{moneyFormat(item.PlanPrice)}}</td> <td>{{moneyFormat(item.PlanPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice)}}</td> <td>{{moneyFormat(item.PlanTotalPrice)}}</td>
<td>{{moneyFormat(item.ExpendTotalPrice)}}</td> <td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice - 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>
<tr v-if="!TotalPriceData.length"> <tr v-if="!TotalPriceData.length">
<td colspan="5">暂无数据</td> <td colspan="5">暂无数据</td>
...@@ -647,6 +702,45 @@ input[type="number"] { ...@@ -647,6 +702,45 @@ input[type="number"] {
<td colspan="5">暂无数据</td> <td colspan="5">暂无数据</td>
</tr> </tr>
</table> </table>
<table border="0" cellspacing="1" class="leaderPayTable" v-if="listCost.length>0">
<tr>
<th>人头费</th>
<th>人数</th>
<th>单价</th>
<th>总金额</th>
<th>财务单号</th>
<th>制单</th>
</tr>
<tr
v-for="(item, index) in listCost"
>
<td>{{item.Type == 1 ? "领兼地" : "领队"}}：{{item.LeaderOrGuidName}}</td>
<td>{{item.PeopleNum}}</td>
<td>{{moneyFormat(item.UnitPrice)}}</td>
<td>
<el-input
size="mini"
class="w150"
type="number"
v-model="item.price"></el-input>
</td>
<td v-if="index == 0" :rowspan="listCost.length">
<span>已付款：{{moneyFormat(item.TotalPrice)}}</span>
<p>财务单号：<span v-for="(i, d) in item.FrId" class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', i)">{{i}} {{d == item.FrId.length-1 ? '' : '、'}}</span></p>
</td>
<td>
<input
type="button"
value="制单"
class="leader2Btn"
@click="goZhiDan2(item, index)"
>
</td>
</tr>
<tr v-if="!listCost.length">
<td colspan="5">暂无数据</td>
</tr>
</table>
<template <template
v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1" v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1"
> >
...@@ -715,10 +809,123 @@ export default { ...@@ -715,10 +809,123 @@ export default {
busDataList: [], busDataList: [],
DiningDataList: [], DiningDataList: [],
ScenicDataList: [], ScenicDataList: [],
HotelDataList: [] HotelDataList: [],
listCost: [],
BaoZhangPrice: {},
AllBZPrice: 0,
}; };
}, },
methods: { methods: {
// 保存报账金额
saveBZPrice: function (){
let HotelPrice = this.BaoZhangPrice.HotelPrice ? parseFloat(this.BaoZhangPrice.HotelPrice) : 0
let BusPrice = this.BaoZhangPrice.BusPrice ? parseFloat(this.BaoZhangPrice.BusPrice) : 0
let DiningPrice = this.BaoZhangPrice.DiningPrice ? parseFloat(this.BaoZhangPrice.DiningPrice) : 0
let ScenicPrice = this.BaoZhangPrice.ScenicPrice ? parseFloat(this.BaoZhangPrice.ScenicPrice) : 0
let msg = [
{TCIDs: this.msg.TCIDs, UserType: 1, TotalPrice: HotelPrice},
{TCIDs: this.msg.TCIDs, UserType: 2, TotalPrice: DiningPrice},
{TCIDs: this.msg.TCIDs, UserType: 3, TotalPrice: ScenicPrice},
{TCIDs: this.msg.TCIDs, UserType: 4, TotalPrice: BusPrice},
]
this.apipost('dmcstatistics_get_SetLeaderReimburseLessList', msg, res=>{
if (res.data.resultCode == 1) {
this.$message.success('操作成功')
} else {
this.$message.error(res.data.message)
}
}, null)
},
getAllBZPrice: function (){
let allPrice = this.TotalPriceData[0].ExpendTotalPrice
let endPrice = allPrice - this.totalScenicPrice - this.totalTrafficPrice - this.totalDinnerPrice - this.totalHotelPrice
let HotelPrice = this.BaoZhangPrice.HotelPrice ? parseFloat(this.BaoZhangPrice.HotelPrice) : 0
let BusPrice = this.BaoZhangPrice.BusPrice ? parseFloat(this.BaoZhangPrice.BusPrice) : 0
let DiningPrice = this.BaoZhangPrice.DiningPrice ? parseFloat(this.BaoZhangPrice.DiningPrice) : 0
let ScenicPrice = this.BaoZhangPrice.ScenicPrice ? parseFloat(this.BaoZhangPrice.ScenicPrice) : 0
let newPrice = endPrice + HotelPrice + BusPrice + DiningPrice + ScenicPrice
this.AllBZPrice = newPrice
},
getBaoZhangPrice: function (){
this.apipost('dmcstatistics_get_GetLeaderReimburseLessList', this.msg, res=>{
if (res.data.resultCode == 1) {
let BaoZhangPrice = res.data.data
BaoZhangPrice.HotelPrice = BaoZhangPrice.HotelPrice > 0 ? BaoZhangPrice.HotelPrice : this.totalHotelPrice
BaoZhangPrice.BusPrice = BaoZhangPrice.BusPrice > 0 ? BaoZhangPrice.BusPrice : this.totalTrafficPrice
BaoZhangPrice.DiningPrice = BaoZhangPrice.DiningPrice > 0 ? BaoZhangPrice.DiningPrice : this.totalDinnerPrice
BaoZhangPrice. ScenicPrice = BaoZhangPrice. ScenicPrice > 0 ? BaoZhangPrice. ScenicPrice : this.totalScenicPrice
this.BaoZhangPrice = BaoZhangPrice
} else {
this.$message.error(res.data.message)
}
}, null)
},
goZhiDan2: function (obj, index) {
let inputPrice = obj.price ? parseFloat(obj.price) : 0
let userinfo = this.getLocalStorage()
if(inputPrice<=0){
this.$message.error('请输入制单金额')
return
}
let list = this.listCost
let allPrice = 0;
let yizhiPrice = list[0].TotalPrice;
for(let i = 0; i < list.length; i++) {
allPrice = list[i].UnitPrice * list[i].PeopleNum
}
if (allPrice < inputPrice + yizhiPrice){
this.$message.error('金额有误')
return
}
if (obj.Type == 1) {
let id = [72, 73];
let TCIDARR = [obj.TCIDs];
let orderObj = {
OrderID: 0,
OrderSource: 6,
Obj: {},
SourceID: 0,
CostType: 180,
TCIDList: TCIDARR,
Money: inputPrice,
TCNUMS: ''
};
let fullPath = `/ChoiceAddFinancialDocuments?Type=${2}&templateID=${JSON.stringify(id)}&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();
} else {
// 自动生成
let msg = {
TemplateId: 71,
RB_Branch_Id: userinfo.RB_Branch_id,
IsPublic: 0,
BType: 4,
AccountId: 14,
CostTypeID: 180,
WBMoney: obj.price,
Remark: "",
TCID: obj.TCIDs,
IsRelevanceTravel: 1,
OrderID: 0,
vorcherInos: [{FrIdStr:''}],
Description: "",
RemitterName: obj.LeaderOrGuidName,
TradeDate: new Date().Format("yyyy-MM-dd"),
OrderSource: 6,
}
this.apipost('Financial_post_SetFinanceInfoCommonForIn', msg, res=>{
if (res.data.resultCode == 1) {
obj.FrId.push(res.data.data)
this.listCost[index] = obj
this.$forceUpdate()
this.$message.success("制单成功")
} else {
this.$message.error(res.data.message)
}
}, null)
}
},
goZhiDan: function(obj) { goZhiDan: function(obj) {
let id = [59]; let id = [59];
let TCIDARR = [obj.TCIDS]; let TCIDARR = [obj.TCIDS];
...@@ -751,11 +958,16 @@ export default { ...@@ -751,11 +958,16 @@ export default {
{ TCIDs: this.$route.query.id }, { TCIDs: this.$route.query.id },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let TotalNav = res.data.data; let TotalNav = res.data.data.list;
let listCost = res.data.data.listCost;
listCost.forEach(x=>{
x.price = 0
})
TotalNav.forEach(x => { TotalNav.forEach(x => {
TotalNav.LeaderGetPriceT = 0; TotalNav.LeaderGetPriceT = 0;
}); });
this.TotalNav = TotalNav; this.TotalNav = TotalNav;
this.listCost = listCost;
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
...@@ -796,6 +1008,7 @@ export default { ...@@ -796,6 +1008,7 @@ export default {
this.totalDinnerPrice this.totalDinnerPrice
).toFixed(2); ).toFixed(2);
this.isShowRemark = true; this.isShowRemark = true;
this.getBaoZhangPrice()
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -832,6 +1045,7 @@ export default { ...@@ -832,6 +1045,7 @@ export default {
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TotalPriceData = res.data.data; this.TotalPriceData = res.data.data;
this.getAllBZPrice()
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -1102,14 +1316,13 @@ export default { ...@@ -1102,14 +1316,13 @@ export default {
mounted() { mounted() {
this.isUpdate = this.$route.query.isUpdate; this.isUpdate = this.$route.query.isUpdate;
this.msg.TCIDs = this.$route.query.id; this.msg.TCIDs = this.$route.query.id;
this.getzongJE() this.getzongJE();
this.getNav(); this.getNav();
this.getList(); this.getList();
this.getTotalMoney(); this.getTotalMoney();
this.getTotalPrice(); this.getTotalPrice();
this.getNavT(); this.getNavT();
this.getnewList() this.getnewList();
this.getzongJE()
} }
}; };
</script> </script>
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