Skip to content

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

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

parents 787ae6e1 eee903e2
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 23 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 13209c71
......@@ -263,8 +263,8 @@
<p class="_tit">{{GetDetail.FinanceName}}</p>
<div class="_conten">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
<!-- <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill> -->
<new-Bill :ID="GetDetail.FrID"></new-Bill>
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
<!-- <new-Bill :ID="GetDetail.FrID"></new-Bill> -->
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
......@@ -1107,7 +1107,7 @@ import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import newBill from "./FinancialSubmodule/NewBillModule.vue";
// import newBill from "./FinancialSubmodule/NewBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
......@@ -1240,7 +1240,7 @@ export default {
'SaleOrderModule':SaleOrderModule,
'TicketFinace':TicketFinace,
'my-HB-Bill':myhrBill,
'new-Bill':newBill
// 'new-Bill':newBill
},methods:{
payMsgListShow: function (type, index) {
if(this.choiceMsg.Status==1){
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 13209c71
......@@ -81,7 +81,10 @@
.TC_Content .avatar-uploader-icon {
height: auto;
}
.TC_HotelPop >div{
overflow: auto;
height:300px;
}
</style>
<template>
<div class="TC_Content">
......@@ -539,6 +542,37 @@
<span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span>
</el-popover>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th>
</tr>
</table>
<div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr v-for="subItem in item.HotelOrderListReports">
<td>
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:20px;">
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}}【<a
style="color:green">本团使用库存：{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
<template v-else v-for="childItem in subItem.SubList">
<div>{{childItem.HotelName}}</div>
</template>
</template>
</td>
</tr>
</table>
</div>
<span slot="reference" class="price">酒店信息</span>
</el-popover>
</p>
</div>
</div>
<div class="el-col" style="width:150px;">
......@@ -874,7 +908,7 @@
singleTCID: 0,
outerVisible: false,
flightCKed: [],
IsUnionCked:[],
IsUnionCked: [],
loading: false,
checkCompanyAll: true,
//本团卖点
......@@ -927,7 +961,7 @@
RateOnDay: '-1',
RateOn: '-1',
TeamType: 0, //一般常规团
IsShowUnion: 0,
IsShowUnion: -1,
TCID: '0',
HotelId: 0, //酒店编号
HotelUseTime: "", //酒店使用时间
......@@ -958,22 +992,28 @@
}
],
//联运状态
unionStatus:[{
Id:0,
Name:'主团',
Checked: true
},{
Id:1,
Name:'分销团',
Checked: false
}],
unionStatus: [{
Id: -1,
Name: '全部',
Checked: true
},
{
Id: 0,
Name: '主团',
Checked: false
}, {
Id: 1,
Name: '分销团',
Checked: false
}
],
//当前登录用户信息
CurrentUserInfo: {},
pickerBeginDateBefore: {
disabledDate: time => {
if(this.queryMsg.EndGroupDate==null){
if (this.queryMsg.EndGroupDate == null) {
return false;
}else{
} else {
let endTime = new Date(this.queryMsg.EndGroupDate)
return endTime.getTime() < time.getTime()
}
......@@ -1106,7 +1146,8 @@
res => {
this.queryCommonData.loading = false
if (res.data.resultCode == 1) {
this.queryCommonData.dataList = res.data.data.pageData
this.queryCommonData.dataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count
this.queryMsg.noData = !this.queryMsg.total > 0
this.queryCommonData.dataList.forEach(item => {
......@@ -1510,7 +1551,7 @@
this.queryCommonData.flightCKed = []
this.queryCommonData.flightCKed.push(item.Id)
},
checkedUnion(item){
checkedUnion(item) {
this.queryMsg.IsShowUnion = item.Id
this.queryCommonData.IsUnionCked = []
this.queryCommonData.IsUnionCked.push(item.Id)
......@@ -1686,14 +1727,14 @@
},
created() {
//默认显示联运
this.queryMsg.IsShowUnion = 0;
this.queryMsg.IsShowUnion = -1;
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun;
}
if (this.$route.query.HotelId) {
this.queryMsg.HotelId = this.$route.query.HotelId;
}
if (this.$route.query.HotelUseTime) {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 13209c71
......@@ -794,7 +794,8 @@
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;<span v-if="subItem.UseCount>0 && item.SubList.length==1">【<span style="color:green">本团使用库存：{{subItem.UseCount}}</span>】</span>【<span
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;<span v-if="subItem.UseCount>0 && item.SubList.length==1">
【<span style="color:green">本团使用库存：{{subItem.UseCount}} {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】</span>【<span
style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
<el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
@change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
......
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