Skip to content

S
SuperMan
Commit adead566 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 8c2d4644 4fee25bb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 424 additions and 148 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ adead566
...@@ -299,20 +299,20 @@ ...@@ -299,20 +299,20 @@
<div class="_conten"> <div class="_conten">
<template v-if="!otherTable"> <template v-if="!otherTable">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4 && showModel"> <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4 && showModel">
<my-Bill :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill> <my-Bill :ID="FrID" :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template> </template>
<template v-else-if="GetDetail.Type===4 && showModel"> <template v-else-if="GetDetail.Type===4 && showModel">
<new-Bill :GetDetail="GetDetail"></new-Bill> <new-Bill :ID="FrID" :GetDetail="GetDetail"></new-Bill>
</template> </template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7 && showModel"> <template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7 && showModel">
<my-RVB-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-RVB-Bill> <my-RVB-Bill :ID="FrID" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template> </template>
<template v-else-if="GetDetail.Type===7 && showModel"> <template v-else-if="GetDetail.Type===7 && showModel">
<my-GZ-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-GZ-Bill> <my-GZ-Bill :ID="FrID" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-GZ-Bill>
</template> </template>
</template> </template>
<template v-else-if="showModel"> <template v-else-if="showModel">
<my-DJ-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-DJ-Bill> <my-DJ-Bill :ID="FrID" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-DJ-Bill>
</template> </template>
<div class="_explain"> <div class="_explain">
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ adead566
...@@ -355,12 +355,12 @@ export default { ...@@ -355,12 +355,12 @@ export default {
}) })
} }
}, },
Financial_post_GetDetail(id){ //获取单据详情 Financial_post_GetDetail(){ //获取单据详情
if(!id) return // if(!id) return
this.loading = true; this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => { // this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) { // if(res.data.resultCode == 1) {
let data= res.data.data; let data = this.GetDetail;
data.DetailList.forEach(x=>{ data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100 x.Money = Math.round(x.Money * 100) / 100
...@@ -381,8 +381,8 @@ export default { ...@@ -381,8 +381,8 @@ export default {
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); // this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) // console.log(this.GetDetail)
} // }
}, err => {}) // }, err => {})
}, },
},mounted(){ },mounted(){
// console.log(this.ID+"mounted") // console.log(this.ID+"mounted")
...@@ -394,9 +394,7 @@ export default { ...@@ -394,9 +394,7 @@ export default {
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;
if (this.ID){ this.Financial_post_GetDetail();
this.Financial_post_GetDetail(this.ID);
}
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { // GetDetail: {
......
src/components/FinancialModule/FinancialSubmodule/CashierBillModule.vue
View file @ adead566
...@@ -136,11 +136,11 @@ export default { ...@@ -136,11 +136,11 @@ export default {
this.picIsShow= true; this.picIsShow= true;
}, },
Financial_post_GetDetail(id){ //获取单据详情 Financial_post_GetDetail(id){ //获取单据详情
if(!id) return // if(!id) return
this.loading = true; this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => { // this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) { // if(res.data.resultCode == 1) {
let data= res.data.data; let data= this.GetDetail;
let Money = 0; let Money = 0;
data.DetailList.forEach(x=>{ data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100); x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100);
...@@ -158,11 +158,11 @@ export default { ...@@ -158,11 +158,11 @@ export default {
data.AuditSteps.reverse(); data.AuditSteps.reverse();
this.GetDetail = data; this.GetDetail = data;
this.loading=false; this.loading=false;
} // }
}, err => {}) // }, err => {})
}, },
},mounted(){ },mounted(){
// this.Financial_post_GetDetail(this.ID) this.Financial_post_GetDetail()
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { // GetDetail: {
// handler: function(val, oldVal) { // handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/DjieMergeBillModule.vue
View file @ adead566
...@@ -332,12 +332,12 @@ ...@@ -332,12 +332,12 @@
}) })
} }
}, },
Financial_post_GetDetail(id){ //获取单据详情 Financial_post_GetDetail(){ //获取单据详情
if(!id) return // if(!id) return
this.loading = true; this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => { // this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) { // if(res.data.resultCode == 1) {
let data= res.data.data; let data= this.GetDetail;
data.DetailList.forEach(x=>{ data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100 x.Money = Math.round(x.Money * 100) / 100
...@@ -362,8 +362,8 @@ ...@@ -362,8 +362,8 @@
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); // this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) // console.log(this.GetDetail)
} // }
}, err => {}) // }, err => {})
}, },
},mounted(){ },mounted(){
// console.log(this.ID+"mounted") // console.log(this.ID+"mounted")
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,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();
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { // GetDetail: {
// handler: function(val, oldVal) { // handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/GZBillModule.vue
View file @ adead566
...@@ -372,12 +372,12 @@ export default { ...@@ -372,12 +372,12 @@ export default {
}) })
} }
}, },
Financial_post_GetDetail(id){ //获取单据详情 Financial_post_GetDetail(){ //获取单据详情
if(!id) return // if(!id) return
this.loading = true; this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => { // this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) { // if(res.data.resultCode == 1) {
let data= res.data.data; let data= this.GetDetail;
data.DetailList.forEach(x=>{ data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100 x.Money = Math.round(x.Money * 100) / 100
...@@ -397,8 +397,8 @@ export default { ...@@ -397,8 +397,8 @@ export default {
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); // this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) // console.log(this.GetDetail)
} // }
}, err => {}) // }, err => {})
}, },
},mounted(){ },mounted(){
// console.log(this.ID+"mounted") // console.log(this.ID+"mounted")
...@@ -410,7 +410,7 @@ export default { ...@@ -410,7 +410,7 @@ export default {
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();
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { // GetDetail: {
// handler: function(val, oldVal) { // handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue
View file @ adead566
...@@ -282,12 +282,12 @@ ...@@ -282,12 +282,12 @@
}) })
} }
}, },
Financial_post_GetDetail(id){ //获取单据详情 Financial_post_GetDetail(){ //获取单据详情
if(!id) return // if(!id) return
this.loading = true; // this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => { // this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) { // if(res.data.resultCode == 1) {
let data= res.data.data; let data= this.GetDetail;
data.DetailList.forEach(x=>{ data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100 x.Money = Math.round(x.Money * 100) / 100
...@@ -302,8 +302,8 @@ ...@@ -302,8 +302,8 @@
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); // this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) // console.log(this.GetDetail)
} // }
}, err => {}) // }, err => {})
}, },
},mounted(){ },mounted(){
console.log(this.GetDetail,"mounted") console.log(this.GetDetail,"mounted")
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,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();
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { // GetDetail: {
// handler: function(val, oldVal) { // handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ adead566
...@@ -336,12 +336,12 @@ export default { ...@@ -336,12 +336,12 @@ export default {
}) })
} }
}, },
Financial_post_GetDetail(id){ //获取单据详情 Financial_post_GetDetail(){ //获取单据详情
if(!id) return; // if(!id) return;
this.loading = true; this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => { // this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) { // if(res.data.resultCode == 1) {
let data= res.data.data; let data = this.GetDetail;
let numberC = 0; let numberC = 0;
let price = 0; let price = 0;
let rate = 0; let rate = 0;
...@@ -364,8 +364,8 @@ export default { ...@@ -364,8 +364,8 @@ export default {
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); // this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) // console.log(this.GetDetail)
} // }
}, err => {}) // }, err => {})
}, },
},mounted(){ },mounted(){
// console.log(this.ID+"mounted") // console.log(this.ID+"mounted")
...@@ -377,9 +377,7 @@ export default { ...@@ -377,9 +377,7 @@ export default {
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;
if (this.ID){ this.Financial_post_GetDetail();
this.Financial_post_GetDetail(this.ID);
}
// this.Financial_post_GetDetail(this.ID); // this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { // GetDetail: {
......
src/components/Hotel/roomReservationsDetails.vue
View file @ adead566
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeName}} {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeName}}
<template v-if="childIndex==4"> <template v-if="childIndex==4">
<template v-if="subItem.DriverGuideIsRebate==1"> <template v-if="subItem.DriverGuideIsRebate==1">
<br />返佣 <br /><span style="color:green">返佣</span>
</template> </template>
<template v-else-if="subItem.DriverGuideIsRebate==0"> <template v-else-if="subItem.DriverGuideIsRebate==0">
<br /><span style="color:red;">不返佣</span> <br /><span style="color:red;">不返佣</span>
...@@ -186,11 +186,11 @@ ...@@ -186,11 +186,11 @@
<!-- 房间数 --> <!-- 房间数 -->
<td> <td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')" <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input> v-model='childItem.HouseTypeCount' :disabled="true"></el-input>
</td> </td>
<td> <td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')" <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false"> @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="true">
</el-input> </el-input>
</td> </td>
<!-- 尚差房间数 --> <!-- 尚差房间数 -->
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<!-- 返佣类型 --> <!-- 返佣类型 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6"> <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1"> <template v-if="subItem.RebateType==1">
含税 <span style="color:green">含税</span>
</template> </template>
<template v-else> <template v-else>
<span style="color:red"> 不含税</span> <span style="color:red"> 不含税</span>
...@@ -690,8 +690,7 @@ ...@@ -690,8 +690,7 @@
if (obj.TaxType == 2) { if (obj.TaxType == 2) {
if (index == 4) { if (index == 4) {
if (obj.DriverGuideIsRebate == 1) { if (obj.DriverGuideIsRebate == 1) {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100);
100);
} else { } else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100); totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
} }
......
src/components/Ticketing/TicketManager.vue
View file @ adead566
...@@ -1371,10 +1371,11 @@ ...@@ -1371,10 +1371,11 @@
<el-col :span="2"> <el-col :span="2">
<span class="_lian_style" v-if="item.IsSetUnion==1">联</span> <span class="_lian_style" v-if="item.IsSetUnion==1">联</span>
<div class="_oll_img_box"> <div class="_oll_img_box">
<span class="TICK_Code PingFangSC">编号：{{item.ID}}&nbsp;&nbsp;天数：<span style="color:#ff0066;font-weight:bold">{{item.DayNum}}</span></span> <span class="TICK_Code PingFangSC">编号：{{item.ID}} </span>
<img v-if="!item.AirlineUrl" class="_oll_img" :src="defaultImg"> <img v-if="!item.AirlineUrl" class="_oll_img" :src="defaultImg">
<img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg"> <img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
</div> </div>
<span style="display:block;padding-left:10px;" title="国际段">行程天数：<span style="color:#ff0066;font-weight:bold">{{item.DayNum}} 天</span></span>
</el-col> </el-col>
<el-col :span="2" class="vmiddle" style="width:85px;"> <el-col :span="2" class="vmiddle" style="width:85px;">
<div class="_oll_info"> <div class="_oll_info">
......
src/components/index.vue
View file @ adead566
...@@ -899,7 +899,7 @@ ...@@ -899,7 +899,7 @@
</div> </div>
<div style="text-align:center"> <div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p> <p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
<a @click="CloseTs" href="http://we.oytour.com:8110/?/article/8" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a> <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/8" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
</div> </div>
</div> </div>
</div> </div>
......
src/components/leaderPay2.vue
View file @ adead566
This diff is collapsed.
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