Skip to content

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

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

parents 23207671 bcc638c0
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 5 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 37286584
......@@ -438,6 +438,7 @@
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<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" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
</div>
<template v-if="sonTCIDList">
<div class="w890px">
......@@ -1314,6 +1315,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue";
import ChongDiPage from "../commonPage/ChongDiPage.vue";
import { truncate } from 'fs';
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
......@@ -1476,6 +1478,7 @@ export default {
'my-HB-Bill':myhrBill,
'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill
},
methods:{
// 单选计算
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 37286584
......@@ -524,6 +524,7 @@
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<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" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
</div>
<template v-if="sonTCIDList">
<div class="w890px">
......@@ -820,6 +821,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue";
import ChongDiPage from "../commonPage/ChongDiPage.vue";
import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
export default {
data(){
return{
......@@ -904,6 +906,7 @@ export default {
'myDJieBill': myDJieBill,
'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill
},
created(){
this.ID = this.$route.query.id;
......
src/components/FinancialModule/FinancialSubmodule/JiPiaoBillModule.vue 0 → 100644
View file @ 37286584
<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/FinancialModule/addFinancialProcess.vue
View file @ 37286584
......@@ -379,6 +379,9 @@
<el-checkbox :value="4" :label="4" :key="4">{{$t('fnc.zjinchi')}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="排序">
<el-input v-model="addMsg.Sort" class="w250" maxlength="60"></el-input>
</el-form-item>
<el-form-item :label="$t('fnc.mbmiaoshu')">
<el-input v-model="addMsg.DescribeInfo" class="w450" maxlength="100"></el-input>
</el-form-item>
......@@ -553,6 +556,7 @@ export default {
Id:0,
Name:'',
DescribeInfo:'',
Sort:'0',
TemplateType:'8',
TempLateClass:'',
FinancialInstitutions:[],
......@@ -830,6 +834,7 @@ export default {
this.addMsg.Id= data.Id;
this.addMsg.Name= data.Name;
this.addMsg.DescribeInfo = data.DescribeInfo;
this.addMsg.Sort=data.Sort;
this.addMsg.TempLateClass = data.TempLateClass;
this.addMsg.IsUploadPic = data.IsUploadPic;
this.addMsg.IsShow = data.IsShow;
......@@ -997,6 +1002,7 @@ export default {
Id:this.addMsg.Id,
Name:this.addMsg.Name,
DescribeInfo:this.addMsg.DescribeInfo,
Sort:this.addMsg.Sort,
TemplateType:this.addMsg.TemplateType,
TempLateClass:this.radio,
FinancialInstitutions:[],
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 37286584
......@@ -233,15 +233,21 @@
</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')"
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 v-else>
<template v-if="childIndex==5">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)"
:disabled="IsEditHotel==0?true:false"></el-input> %
:disabled="true"></el-input> %
</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>
......@@ -557,6 +563,16 @@
let str = `comCheckHotel${index}${subIndex}`
this.$refs[str][0].getCheckHotel();
},
//输入返佣自动前面4个房型赋值
SetRebateRatio(subItem,newValue)
{
subItem.OrderDetailsList.forEach((sItem,sIndex)=>{
if(sIndex<4)
{
sItem.RebateRatio=newValue;
}
});
},
DateMinus(sDate) {
var newDate = moment(sDate).format("YYYY-MM-DD");
var sdate = new Date(newDate.replace(/-/g, "/"));
......
src/plug/index.js
View file @ 37286584
......@@ -118,8 +118,9 @@ export default {
Vue.prototype.domainManager = function() {
let domainUrl = '';
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.16:8083";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......
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