Skip to content

S
SuperMan
Commit fb879917 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents ba61aced 204cfb4f
Hide whitespace changes
Inline Side-by-side
Showing with 308 additions and 155 deletions
src/components/FinancialModule/addFinancialProcess.vue
View file @ fb879917
......@@ -327,8 +327,17 @@
<el-radio v-model="addMsg.IsUploadPic" :label="1">{{$t('fnc.qiyong')}}</el-radio>
</el-form-item>
<el-form-item :label="$t('ios.sfxianshi')">
<el-radio v-model="addMsg.IsShow" :label="1">{{$t('pub.yes')}}</el-radio>
<el-radio v-model="addMsg.IsShow" :label="2">{{$t('pub.no')}}</el-radio>
<el-radio @change="RadioShow" v-model="addMsg.IsShow" :label="1">{{$t('pub.yes')}}</el-radio>
<el-radio @change="RadioShow" v-model="addMsg.IsShow" :label="2">{{$t('pub.no')}}</el-radio>
</el-form-item>
<el-form-item v-show="addMsg.IsShow==2" label="可显示人">
<el-select filterable multiple v-model='addMsg.ShowEmployeeList' class="w200" style="max-height:100px;overflow:hidden" size="small">
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('fnc.syfeiyong')" v-if="addMsg.TemplateType==8" class="_treeselect">
<!-- <el-select filterable multiple v-model='CostIdS' class="w200" @change="disabledOption2">
......@@ -525,6 +534,7 @@ export default {
components: { Treeselect },
data(){
return{
EmployeeList:[],
Auditshow:false,
accListShow: true,
TemplateId:0,
......@@ -544,6 +554,7 @@ export default {
AuditUserList:[],
},
IsShow: 1,
ShowEmployeeList:[],
},
AuditUserList:{
EmName:'',
......@@ -714,8 +725,27 @@ export default {
}
this.getFinancialFlowTemplate_post_GetNodeList();
this.getRole()
this.getEmployeeList();
},
methods:{
RadioShow(val){
console.log(val);
if(val==1){
this.addMsg.ShowEmployeeList=[];
}
},
getEmployeeList () {
this.apipost(
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data
}
},
err => {
}
)
},
AuditSort(){
let sum=0;
let sortnum=0;
......@@ -771,6 +801,8 @@ export default {
this.addMsg.TempLateClass = data.TempLateClass;
this.addMsg.IsUploadPic = data.IsUploadPic;
this.addMsg.IsShow = data.IsShow;
this.addMsg.ShowEmployeeList = data.ShowEmployeeList;
if (data.list && data.list[0] !== -1) {
this.accListMsg = data.list;
}
......
src/components/Hotel/roomReservationsDetails.vue
View file @ fb879917
......@@ -5,9 +5,11 @@
margin: 5px auto;
font-size: 12px;
}
.rq_importNote {
color: red;
}
.rq_disImNote {
color: #ea6d6d;
}
......@@ -125,7 +127,8 @@
<td width="70" style="text-align:center;" colspan="2">
<span style="color:red">{{subItem.NewHotelName}}</span>
<el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
<comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList" :UseDate="item.UseTimeStr">
<comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
:UseDate="item.UseTimeStr">
</comCheckHotel>
<el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"
slot="reference" style="cursor:pointer;"
......@@ -244,7 +247,23 @@
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td width="70" style="text-align:right;">付款方式：</td>
<td width="70" style="text-align:right;color:red">地接付款方式：</td>
<td>
<el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='3'></el-option>
<el-option label='预付' :value='4'></el-option>
<el-option label='预付款抵扣' :value='5'></el-option>
</el-select>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td width="70" style="text-align:right;">报账付款方式：</td>
<td>
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
......@@ -281,7 +300,8 @@
<tr>
<td width="70" style="text-align:right;">提醒供应商:</td>
<td>
<el-select class='w135 sel' v-model='subItem.SupplierHotelStatus' :placeholder="$t('pub.pleaseSel')">
<el-select class='w135 sel' v-model='subItem.SupplierHotelStatus'
:placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='一般提醒' :value='1'></el-option>
<el-option label='重要提醒' :value='2'></el-option>
......@@ -297,10 +317,11 @@
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
</td>
</tr>
<tr v-if="subItem.SupplierToDmcRemarks">
<tr v-if="subItem.SupplierToDmcRemarks">
<td width="70" style="text-align:right;">供应商对地接备注：</td>
<td>
<span :class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
<span
:class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
{{subItem.SupplierToDmcRemarks}}
</span>
</td>
......@@ -545,7 +566,7 @@
})
});
this.list = list;
console.log(this.list,'listttt');
console.log(this.list, 'listttt');
this.$forceUpdate();
}
} else {
......@@ -608,7 +629,11 @@
this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.OrderDetailsList.forEach(y => {
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
if (y.HouseTypeCount) {
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
} else {
y.HouseTypeCount = 0;
}
if (y.UnitPrice) {
y.UnitPrice = parseInt(y.UnitPrice);
} else {
......@@ -619,7 +644,6 @@
} else {
y.HotelDiscount = 0;
}
if (y.BookNum == "") {
y.BookNum = 0;
}
......@@ -643,8 +667,17 @@
this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.OrderDetailsList.forEach(y => {
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
y.UnitPrice = parseInt(y.UnitPrice);
if (y.HouseTypeCount) {
y.HouseTypeCount = parseFloat(y.HouseTypeCount);
} else {
y.HouseTypeCount = 0;
}
if (y.UnitPrice) {
y.UnitPrice = parseInt(y.UnitPrice);
} else {
y.UnitPrice = 0;
}
if (y.HotelDiscount) {
y.HotelDiscount = parseInt(y.HotelDiscount);
} else {
......
src/components/SalesModule/productQuery.vue
View file @ fb879917
......@@ -706,7 +706,8 @@
<p><span>出团公司</span>{{item.OutBranchName}}</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">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"></commonHotelInfo>
<!-- <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
......@@ -744,7 +745,7 @@
</td>
</tr>
</template>
</table>
</table> -->
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover>
</p>
......@@ -937,6 +938,7 @@
import commonTeamInfo from "../commonPage/commonTeamInfo.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import carousel from "../commonPage/carousel.vue";
import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
export default {
data() {
......@@ -1149,13 +1151,18 @@
},
SingleDMCPricex:0,// 单地接;
SingleDMCPrice:0,// 单地接;
showHotelObj:{
showPrice:false,
showPay:false,
showZhan:false
}
}
},
components: {
commonTeamInfo: commonTeamInfo,
tripDownLoadCommon: tripDownLoadCommon,
carousel: carousel
carousel: carousel,
commonHotelInfo:commonHotelInfo
},
filters: {
priceFormat(value) {
......
src/components/Supplier/roomQuery2.vue
View file @ fb879917
......@@ -100,7 +100,7 @@
</div>
</transition>
<el-dialog custom-class='w800' title="酒店信息" :visible.sync="hotelUseDetail" center>
<el-dialog custom-class='w1006' :title='"【"+NewCombinationNum+"】"+"酒店信息"' :visible.sync="hotelUseDetail" center>
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<th width="120">
......@@ -109,7 +109,7 @@
<th width="150">
酒店
</th>
<th width="250">
<th width="300">
价格
</th>
<th width="100">
......@@ -117,6 +117,7 @@
</th>
<th width="100">提醒</th>
<th width="150">备注</th>
<th width="50">日志</th>
</tr>
<template v-for="(subItem,subIndex) in HotelList">
<tbody>
......@@ -171,9 +172,34 @@
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
<textarea class="w135" cols="25" rows="3" v-model='childItem.SupplierToDmcRemarks'></textarea>
</template>
</td>
<td style="text-align:center;">
<el-tooltip effect="dark" content="日志" placement="top-start">
<el-popover width='230' trigger="click">
<div class="priceContentDiv">
<div class="AuditLog">日志</div>
<div class="logContact" style="background:#f9f9f9; padding:20px 10px 0;">
<div v-if='LogsList.length>0' v-for="(item,index) in LogsList" :key="index">
<div class="clearfix">
<div class="Auditcircle" style="left: 6px!important;"></div>
<div class="operateName" style="color:#005CAA;font-size:12px;">{{item.CreateTimeStr}}</div>
<!-- <div class="operateDate fz12 color666">{{item.x}}</div> -->
</div>
<div class="fz12 color333">{{item.Remarks}}</div>
</div>
<div v-if='LogsList.length==0'>暂无数据</div>
</div>
</div>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<el-button slot="reference" @click='getLogsList(childItem.TCID,childItem.HotelId,subItem.UseTimeStr)' type="primary"
style='background:#47BF8C; border-color:#47BF8C;padding:5px;' icon="iconfont icon-rizhi1"></el-button>
</template>
</el-popover>
</el-tooltip>
</td>
</tr>
<tr>
<td colspan="6">
......@@ -192,7 +218,7 @@
<input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)" class="normalBtn" />
</div>
</el-dialog>
<el-dialog custom-class='w500' title="对地接备注" :visible.sync="dijieDialog" center>
<el-dialog custom-class='w500' style="margin-top:18vh" :title='"【"+NewCombinationNum+"】"+"对地接备注"' :visible.sync="dijieDialog" center>
<table>
<tr>
<td class="SP_RemarkTitle">
......@@ -220,6 +246,7 @@
hotelLoading: false,
hotelUseDetail:false,
dijieDialog:false,
NewCombinationNum:'',
total: 0,
top:0,
msg: {
......@@ -261,7 +288,8 @@
currentPage: 1,
total: 0,
HotelId: 0,
TCID: 0
TCID: 0,
sDate:''
},
//是否为今天
isToday: false,
......@@ -271,16 +299,20 @@
},
methods: {
//获取日志
getLogsList(TCID) {
// if (TCID) {
// this.queryLogMsg.TCID = TCID;
// }
// this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
// if (res.data.resultCode == 1) {
// this.LogsList = res.data.data.pageData;
// this.queryLogMsg.total = res.data.data.count;
// }
// }, err => {})
getLogsList(TCID,HotelId,timeStr) {
if (TCID) {
this.queryLogMsg.TCID = TCID;
}
if(HotelId){
this.queryLogMsg.HotelId = HotelId;
}
this.queryLogMsg.sDate = timeStr;
this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
if (res.data.resultCode == 1) {
this.LogsList = res.data.data.pageData;
this.queryLogMsg.total = res.data.data.count;
}
}, err => {})
},
//保存信息
saveSupplierjourneyorder(HotelList) {
......@@ -323,6 +355,7 @@
},
//获取酒店列表
getHotelList(TCID, NewCombinationNum) {
this.NewCombinationNum = NewCombinationNum;
this.hotelLoading = true;
this.HotelList = [];
var qMsg = {
......@@ -340,6 +373,7 @@
},
//获取点击备注
getClickItem(item) {
this.NewCombinationNum = item.NewCombinationNum;
this.RemarkObj.TCID = item.TCID;
this.RemarkObj.SupplierToDmcRemarks = item.SupplierToDmcRemarks;
},
......@@ -640,4 +674,55 @@
.roomQuery .page-component-up:hover i{
color: #F1f1f1;
}
.priceContentDiv {
overflow: auto;
max-height: 200px;
}
.priceContentDiv>div:first-child {
margin-bottom:10px;
}
.priceContentDiv::-webkit-scrollbar {
/*滚动条整体样式*/
width: 4px;
/*高宽分别对应横竖滚动条的尺寸*/
height: 1px;
}
.priceContentDiv::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
}
.priceContentDiv::-webkit-scrollbar-track {
/*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
.logContact {
width:90%;
height:auto;
margin-top: 20px;
padding-left:20px;
position: relative;
}
.logContact>div {
padding:0 0 20px 20px;
border-left:1px solid #d1d1d1;
}
.logContact>div:last-child {
border:none;
}
.AuditLog {
margin-left:15px;
}
.Auditcircle {
position: absolute;
width: 10px;
height: 10px;
left: 16px;
background-color: #e95252;
border-radius: 50%;
}
</style>
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ fb879917
......@@ -283,7 +283,7 @@
},
//获取线路列表
getLineList() {
this.apipost("line_post_GetList", {}, res => {
this.apipost("line_post_GetAllList_V2", {LineDirection:2}, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
}
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ fb879917
......@@ -491,61 +491,7 @@
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="700" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
<th style="width:150px;">使用数量/价格</th>
<th style="width:100px;">付款方式</th>
<th style="width:120px">占房时间</th>
</tr>
<template v-for="subItem in item.HotelOrderListReports">
<tr v-for="(childItem,childIndex) in subItem.SubList">
<td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;color:red">
{{childItem.HotelName!=childItem.NewHotelName?""+childItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;">
<span v-if="childItem.HotelName!='温馨的家'">
<template v-if="childItem.OPState==1">
<a style="color:green">OP-OK</a>
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
<a style="color:red">OP-暂定</a>
</template>
<template v-else>
<template v-if="childItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else>
<a style="color:red"> {{childItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
</template>
</template>
</span>
</td>
<td>
<a v-if="(childItem.OPState==1|| childItem.OPState==2 || childItem.DMCState==1 )">
{{childItem.UseCount>0? childItem.UseCount+" 间" :""}}
{{childItem.CostPriceNew>0?" 价格:"+childItem.CostPriceNew:(childItem.CostPrice!=0?" 价格:"+childItem.CostPrice:"")}}
</a>
</td>
<td>
{{childItem.PayTypeStr}}
</td>
<td>
<template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)">
{{childItem.CreateDateStr}}</template>
</td>
</tr>
</template>
</table>
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"></commonHotelInfo>
<span slot="reference" class="price"
style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover>
......@@ -951,6 +897,7 @@
</div>
</template>
<script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
export default {
data() {
return {
......@@ -1110,6 +1057,11 @@
],
//当前登录用户信息
CurrentUserInfo: {},
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true
},
pickerBeginDateBefore: {
disabledDate: time => {
if (this.queryMsg.EndGroupDate == null) {
......@@ -1128,6 +1080,9 @@
}
}
},
components: {
commonHotelInfo
},
methods: {
SetGroupRecommendType(item, num) {
let msg = {};
......@@ -1289,7 +1244,6 @@
})
}
});
console.log("this.queryCommonData.dataList", this.queryCommonData.dataList);
}
},
err => {}
......
src/components/busManagement/busStatistics.vue
View file @ fb879917
......@@ -49,6 +49,7 @@
<tr>
<th class="w100">序号</th>
<th width="110">出发地</th>
<th width="110">酒店</th>
<th width="150">航班时间</th>
<th width="150">公司团号</th>
<th width="100">线路负责人</th>
......@@ -74,6 +75,12 @@
{{item.StartCityNames}}
</div>
</td>
<td>
<el-popover width="700" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;">酒店信息</div>
</el-popover>
</td>
<td>
<div class="w120">
{{item.FlightDate}}
......@@ -200,6 +207,7 @@
</template>
<script>
import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
export default {
data() {
return {
......@@ -224,11 +232,17 @@
colspanTotal: 0,
isCha: 0,
boxHeight: 0,
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true
}
}
},
components: {
commonHotelInfo
},
methods: {
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
......@@ -383,8 +397,9 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData.data;
console.log("this.datalist",this.DataList);
this.thLengthTitle = [];
this.colspanTotal = res.data.data.pageData.columnsCount + 12;
this.colspanTotal = res.data.data.pageData.columnsCount + 13;
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
this.thLengthTitle.push('第' + i + '天');
}
......
src/components/commonPage/commonHotelInfo.vue 0 → 100644
View file @ fb879917
<template>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
<th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</th>
<th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th>
<th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th>
</tr>
<template v-for="hotelItem in HotelObj">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
<td width="100" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length">
{{hotelItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{hotelSubItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;">
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-OK</a>
</template>
<template v-else-if="hotelSubItem.OPState==2&&hotelSubItem.DMCState==0">
<a style="color:red">OP-暂定</a>
</template>
<template v-else>
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else>
<a style="color:red"> {{hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
</template>
</template>
</span>
</td>
<td v-if="showHotelObj.showPrice">
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td v-if="showHotelObj.showPay">
{{hotelSubItem.PayTypeStr}}
</td>
<td v-if="showHotelObj.showZhan">
<template
v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}}
</template>
</td>
</tr>
</template>
</table>
</template>
<script>
export default {
props: ["HotelObj","showHotelObj"],
data() {
return {
};
},
methods: {
},
mounted() {
}
};
</script>
src/components/commonPage/fiveday.vue
View file @ fb879917
......@@ -112,7 +112,7 @@
</td>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</td>
......
src/components/commonPage/fourday.vue
View file @ fb879917
......@@ -110,7 +110,7 @@
</td>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</td>
......
src/components/commonPage/oneday.vue
View file @ fb879917
......@@ -83,7 +83,7 @@
</td>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</td>
......
src/components/commonPage/threeday.vue
View file @ fb879917
......@@ -150,7 +150,7 @@
</td>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</td>
......
src/components/commonPage/twoday.vue
View file @ fb879917
......@@ -77,8 +77,8 @@
</td>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span>
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ fb879917
......@@ -266,63 +266,7 @@
<p
v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
<el-popover width="700" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
<th style="width:150px;">使用数量/价格</th>
<th style="width:100px;">付款方式</th>
<th style="width:120px">占房时间</th>
</tr>
<template v-for="hotelItem in item.CommonReport.PriceHotelResult">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
<td width="100" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length">
{{hotelItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{hotelSubItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;">
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-OK</a>
</template>
<template v-else-if="hotelSubItem.OPState==2&&hotelSubItem.DMCState==0">
<a style="color:red">OP-暂定</a>
</template>
<template v-else>
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else>
<a style="color:red"> {{hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
</template>
</template>
</span>
</td>
<td>
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td>
{{hotelSubItem.PayTypeStr}}
</td>
<td>
<template
v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}}</template>
</td>
</tr>
</template>
</table>
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
</el-popover>
</p>
......@@ -502,6 +446,7 @@
</template>
<script>
import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue";
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
export default {
data() {
return {
......@@ -566,6 +511,11 @@
cityId: 0,
orderId: 0
},
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true
},
pickerBeginDateBefore: {
disabledDate: time => {
if (this.msg.EndDate == null) {
......@@ -601,7 +551,8 @@
}
},
components: {
tripDownLoadCommon
tripDownLoadCommon,
commonHotelInfo
},
methods: {
openChart(obj) {
......
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