Skip to content

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

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

parents cb8be08a 7065133d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 738 additions and 327 deletions
src/components/SalesModule/enrollTotal.vue
View file @ c7528b08
......@@ -193,8 +193,11 @@
<tr>
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
<span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">
<span>{{item.orderId}}</span>
<span style="font-weight: 100;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
......@@ -291,7 +294,7 @@
<span style="font-size: 14px;color: #333333">名单:</span>
<span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
<!-- <span v-else>暂无名单</span>-->
<span style="display: block;font-size: 14px;color: #333333">房间信息：{{item.orderGuestHouseStr}}</span>
<span style="display: block;font-size: 14px;color: #333333">房间信息<span v-if="item.oneSex>0">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
</td>
</tr>
<tr>
......@@ -518,6 +521,17 @@
this.$message.error("结束日期不能大于开始日期");
this.msg.QEndDate = "";
}
},
// 跳转调查列表
goInvetig: function (path, tcid, orderId) {
this.$router.push({
name: path,
query: {
OrderId: orderId,
TCID: tcid,
blank: "y",
}
});
},
goUrl(name, path, id, tcmun) {
this.$router.push({
......
src/components/SalesModule/groupTourOrder.vue
View file @ c7528b08
......@@ -932,8 +932,8 @@
</el-col>
<el-col :span="4">
<el-form-item label="单男男女">
<el-radio v-model="addMsg.OneSex" label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" label="2">女</el-radio>
<el-radio v-model="addMsg.OneSex" :label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" :label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
......@@ -1517,9 +1517,10 @@
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
@click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
<span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;">
<span :title="item.orderId" @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</span>
<span style="font-weight: 100;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip></p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
......@@ -1758,7 +1759,7 @@
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
<span style="display: block">房间信息<span v-if="item.oneSex>0">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
</td>
</tr>
......@@ -2011,6 +2012,7 @@
BackCityTime: '',
CommissionSharePeople: '-1',
CommissionShareMoney: '0',
OneSex:0
},
employeeMsg: {
BranchId: '-1',
......@@ -2734,7 +2736,6 @@
if (res.data.resultCode == 1) {
this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder
console.log('res.data.data', res.data.data)
this.addObj = res.data.data.modelPrice
let x = res.data.data.model;
......@@ -2742,7 +2743,8 @@
this.addObj.OpSetLossMoney = x.OpSetLossMoney;
this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.addMsg.OneSex = x.OneSex;
this.addMsg.PlatformAccount = ''
this.getScenicRefund(obj.tcid)
this.getPlatformAccount(obj.platformAccountTypeId, obj.platformAccount);
......@@ -2774,7 +2776,6 @@
}else {
this.HightUnitPrice = '2'
this.Unit_Price = this.addObj.SingleDMCPrice
console.log(this.addObj.SingleDMCPrice)
}
if (this.stratPrice == 0) {
this.stratPriceShow = false
......@@ -3667,7 +3668,6 @@
this.loading = false
this.total = res.data.data.count
this.list = res.data.data.pageData;
console.log(this.list,'list');
} else {
this.$message.error(res.data.message)
}
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ c7528b08
......@@ -834,9 +834,6 @@
<el-input v-model='addMsg.CommissionShareMoney' :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
......@@ -1239,8 +1236,11 @@
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
</el-col>
<el-form-item label="单男单女">
<el-radio v-model="addMsg.OneSex" :label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" :label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
......@@ -1518,8 +1518,10 @@
<td rowspan="3" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
<span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">
<span>{{item.orderId}}</span>
<span style="font-weight: 100;cursor:pointer;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<!-- <span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span> -->
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<div>
......@@ -1758,7 +1760,7 @@
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{item.orderGuestHouseStr}}</span>
<span style="display: block">房间信息<span v-if="item.oneSex>0">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
</td>
</tr>
......@@ -2350,7 +2352,8 @@
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: "-1",
CommissionShareMoney: "0"
CommissionShareMoney: "0",
OneSex: 0,
},
employeeMsg: {
BranchId: "-1",
......@@ -3062,7 +3065,7 @@
this.addObj = res.data.data.modelPrice;
this.addObj.OrderId=x.OrderId;
this.addObj.OpSetLossMoney=x.OpSetLossMoney;
this.addMsg.OneSex = x.OneSex;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid);
this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount);
......@@ -4103,7 +4106,6 @@
this.tuanMsg,
res => {
if (res.data.resultCode == 1) {
console.log("res",res);
this.loading = false;
this.total = res.data.data.count;
this.list = res.data.data.pageData.rtData;
......@@ -4356,7 +4358,6 @@
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList = [];
console.log(this.Unit_PriceList)
this.apipost('sellorder_post_GetLessPrice', {
"TCID": this.addMsg.TCID,
"MaxPeopleNum": maxPeopleNum
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ c7528b08
......@@ -1532,8 +1532,10 @@
<td rowspan="3" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
<span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">
<span>{{item.orderId}}</span>
<span style="font-weight: 100;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<!-- <span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span> -->
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
......@@ -1912,7 +1914,7 @@
<tr>
<td rowspan="2" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId">{{item.orderId}}
<span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
......
src/components/SalesModule/investigationList.vue
View file @ c7528b08
......@@ -93,7 +93,7 @@ export default {
}
},mounted() {
let TCID = this.$route.query.TCID,
OrderID = this.$route.query.OrderID;
OrderID = this.$route.query.OrderId;
this.getList(TCID, OrderID);
},methods: {
closeDialog: function () {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ c7528b08
......@@ -1755,7 +1755,7 @@
</div>
<p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p>
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId">
<span style="font-weight: 100;" v-if="childItem.ScoreNum >= 0">(评分{{childItem.ScoreNum}})</span>{{childItem.OrderId}}
<span style="font-weight: 100;" v-if="childItem.scoreNum >= 0" @click='goInvetig("investigationList", childItem.tcid, childItem.orderId)'>(评分{{childItem.scoreNum}})</span>{{childItem.OrderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top"
v-show="childItem.OrderForm==4"> <i class="iconfont icon-xiaochengxu"
style="font-size:22px;color:red;"></i></el-tooltip>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ c7528b08
......@@ -373,8 +373,8 @@
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName">
<div class="clearfix">
<div class="TCL_remarkTitle"><span style="font-weight: 100;" v-if="item.ScoreNum >= 0">(评分{{item.ScoreNum}})</span> {{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content">{{item.Title}}</div>
<div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;cursor:pointer;" v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span> {{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content" style="width:90%">{{item.Title}}</div>
</div>
</div>
<div>
......@@ -491,7 +491,7 @@
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="750" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"></commonHotelInfo>
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<span slot="reference" class="price"
style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover>
......@@ -1064,7 +1064,10 @@
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true
showZhan:true,
showBtnList: true,
showCaozuoTime: true,
isFromTCList:true
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -1099,7 +1102,24 @@
}
});
},
//更新手配书状态
SetShouPeiShu(TCID,ShouPeiStatus)
{
var msg=
{
TCID:TCID,
ShouPeiStatus:(ShouPeiStatus==0?1:0)
};
console.log(ShouPeiStatus,'ShouPeiStatus');
this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
SetGroupRecommendType(item, num) {
let msg = {};
msg.groupRecommendType = num;
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ c7528b08
......@@ -38,7 +38,8 @@
padding:15px;
background-color: #fff;
min-height:500px;
color:#c94052;
/* color:#c94052; */
color:#666;
}
.pri_title{
font-size: 18px;
......@@ -114,6 +115,7 @@
.priceContent table td, .priceContent table th {
height: 34px;
padding: 10px;
border:1px solid #c94052;
}
.priceContent .pri_EmpName {
......@@ -141,6 +143,10 @@
.comTextAlign {
text-align: left;
padding: 10px 30px !important;
color:#c94052;
}
.PC_ComConfirmTR td,.PC_ComConfirm{
color:#c94052;
}
</style>
......@@ -159,25 +165,25 @@
</div>
<table border="1" style="border-collapse: collapse;width:100%;font-size:14px;text-align:center;">
<tr>
<td>团号</td>
<td>团队编号</td>
<td>人数</td>
<td class="PC_ComConfirm">团号</td>
<td class="PC_ComConfirm">团队编号</td>
<td class="PC_ComConfirm">人数</td>
<td colspan="5">{{confirmInfo.PeopleNum}}</td>
</tr>
<tr>
<td>{{confirmInfo.TCID}}</td>
<td>{{confirmInfo.TCNUM}}</td>
<td>领队</td>
<td class="PC_ComConfirm">领队</td>
<td colspan="5">{{confirmInfo.LeaderName}}</td>
</tr>
<tr>
<td>团队收入合计</td>
<td class="PC_ComConfirm">团队收入合计</td>
<td colspan="7">{{confirmInfo.TotalIncome}}</td>
</tr>
<tr>
<td colspan="8" class="comTextAlign">交易明细</td>
</tr>
<tr>
<tr class="PC_ComConfirmTR">
<td>同行名称</td>
<td>应收金额</td>
<td>实收金额</td>
......@@ -202,7 +208,7 @@
<tr>
<td colspan="8" class="comTextAlign">平台款项</td>
</tr>
<tr>
<tr class="PC_ComConfirmTR">
<td>平台名称</td>
<td>应收金额</td>
<td>实收金额</td>
......@@ -223,27 +229,27 @@
<td>{{item.OutstandingAmount}}</td>
</tr>
<tr>
<td>其中</td>
<td>直客收入</td>
<td class="PC_ComConfirm">其中</td>
<td class="PC_ComConfirm">直客收入</td>
<td colspan="6">{{confirmInfo.DirectGuestIncome}}</td>
</tr>
<tr>
<td></td>
<td>同行交客收入</td>
<td class="PC_ComConfirm">同行交客收入</td>
<td colspan="6">{{confirmInfo.PlatformGuestIncome}}</td>
</tr>
<tr>
<td></td>
<td>平台收入</td>
<td class="PC_ComConfirm">平台收入</td>
<td colspan="6">{{confirmInfo.PlatformIncome}}</td>
</tr>
<tr>
<td colspan="8">
<span class="pri_EmpName">
操作人：{{confirmInfo.EmpName}}
<span class="PC_ComConfirm">操作人：</span>{{confirmInfo.EmpName}}
</span>
<span class="pri_DateTime">
操作时间：{{confirmInfo.DateTimeStr}}
<span class="PC_ComConfirm">操作时间：</span>{{confirmInfo.DateTimeStr}}
</span>
</td>
</tr>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ c7528b08
......@@ -215,10 +215,10 @@
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;text-decoration: none;display: inline-block;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis">下单时间：{{item.createDate}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
</td>
......
src/components/busManagement/busHandBook.vue
View file @ c7528b08
......@@ -230,7 +230,6 @@
},
mounted() {
this.TCIDS = this.$route.query.TCID;
//this.TCIDS = "2126,2405";
this.GetData();
},
}
......
src/components/commonPage/commonHotelInfo.vue
View file @ c7528b08
<style>
.comHotelOperation{margin-top:10px;}
.comHotelOperation tr td{
text-align: left;
width:50%;
padding:5px 0;
}
</style>
<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>
<th style="width:100px" 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>
<td v-if="showHotelObj.showZhan">
{{hotelSubItem.SureTimeStr}}
</td>
</tr>
</template>
<template v-if="HotelObj&&HotelObj.length>0">
<tfoot>
<tr style="display:none;">
<td>
开团时间:
</td>
<td>
{{HotelObj[0].PriceCreateDateStr}}</td>
<td>
吃房时间:
</td>
<td>
{{HotelObj[0].UseHotelTimeStr}}
</td>
<td>
操作时间:
</td>
<td>
{{HotelObj[0].DMCNumCreateTimeStr}}
</td>
<td>
操作时间:
</td>
<td>
{{HotelObj[0].ShouPeiStatusTimeStr}}
</td>
<div>
<div>
<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>
<th style="width:100px" 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>
<td v-if="showHotelObj.showZhan">
{{hotelSubItem.SureTimeStr}}
</td>
</tr>
</template>
</table>
</div>
<div>
<table width="100%" class="comHotelOperation">
<template v-if="HotelObj&&HotelObj.length>0&&showHotelObj.showCaozuoTime">
<tr>
<td>开团时间：
<span v-if="HotelObj[0].PriceCreateDateStr">{{HotelObj[0].PriceCreateDateStr}}</span>
<span v-else>暂无</span>
</td>
<td style="padding-left:26px;">吃房时间：
<span v-if="HotelObj[0].UseHotelTimeStr">{{HotelObj[0].UseHotelTimeStr}}</span>
<span v-else>暂无</span>
</td>
</tr>
<tr>
<td>地接团号生成时间：
<span v-if="HotelObj[0].DMCNumCreateTimeStr">{{HotelObj[0].DMCNumCreateTimeStr}}</span>
<span v-else>暂无</span>
</td>
<td>手配确认时间：
<span v-if="HotelObj[0].ShouPeiStatusTimeStr">{{HotelObj[0].ShouPeiStatusTimeStr}}</span>
<span v-else>暂无</span>
</td>
</tr>
</template>
<template v-if="showHotelObj.showBtnList">
<tr>
<td colspan="8" style="padding:10px 0">
<td colspan="2" style="padding:10px 0;text-align:center;">
<input type="button" class="normalBtn" :value="HotelObj[0].ShouPeiStatus==0?'手配书(确定)':'手配书(暂定)'"
v-if="showHotelObj.ShowShouPeiStatus" @click="subSetShouPeiShu(HotelObj[0].ShouPeiStatus)" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
<template v-if="showHotelObj.isFromTCList">
<input type="button" v-if="HotelObj[0].ShouPeiStatus==1" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
</template>
<template v-else>
<input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
</template>
</td>
</tr>
</template>
</tfoot>
</template>
</table>
</table>
</div>
</div>
</template>
<script>
export default {
props: ["HotelObj", "showHotelObj", "TCID", "DMCNum", "TCNUM"],
......@@ -127,7 +144,8 @@
});
}
},
mounted() {}
mounted() {
}
};
</script>
src/components/confirmationOrderDownLoad.vue
View file @ c7528b08
......@@ -13,9 +13,9 @@
<template>
<div class="travelControlTrip detail-box">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
<input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载电脑版PDF"
@click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;display:none; " class="travelControlTripBtn" value="下载电脑版PDF2"
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
@click="toPDF_V2(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"
@click="gernalFeature(0)" />
......@@ -24,7 +24,6 @@
<a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
:href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
<div id="pdfNode">
......@@ -130,10 +129,18 @@
<div class="collection-item clearfix">
<div><img src="../assets/img/TravelControlTripIcon13.png" />紧急联系人</div>
<template>
<span v-if='vshowLLR'> {{orderTripdiff!=null ?
orderTripdiff.emergencyContact : orderMsg.branchManager+"/"+orderMsg.mobilePhone}}</span>
<span v-else>{{orderTripdiff!=null ?
orderTripdiff.emergencyContact : orderMsg.sellName+"/"+orderMsg.sellTel}}</span>
<span v-if='vshowLLR'>
<template v-if="orderTripdiff!=null&&orderTripdiff.emergencyContact!=''">
{{orderTripdiff.emergencyContact}}
</template>
<template v-else-if="orderMsg.branchManager!=''&&orderMsg.mobilePhone!=''">
{{orderMsg.branchManager+"/"+orderMsg.mobilePhone}}
</template>
<template v-else-if="orderMsg.sellName!=''&&orderMsg.sellTel!=''">
{{orderMsg.sellName+"/"+orderMsg.sellTel}}
</template>
</span>
<span v-else></span>
</template>
</div>
</td>
......@@ -945,7 +952,7 @@
}
}).then(res => {
if (res.data.resultCode === 1) {
let sign = title
let sign = title+"V2"
const a = document.createElement('a');
a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ c7528b08
......@@ -553,6 +553,7 @@
showPay: true,
showZhan: true,
showBtnList: true,
showCaozuoTime: true,
ShowShouPeiStatus:true,//显示手配置暂定确定按钮
},
pickerBeginDateBefore: {
......@@ -912,7 +913,6 @@
this.$message.error(res.data.message);
}
}, err => {})
}
},
mounted() {
......
src/components/personalCenter.vue
View file @ c7528b08
This diff is collapsed.
src/components/personalCenter/fince.vue 0 → 100644
View file @ c7528b08
<template>
<div class="inerank-container">
<div :style="{height:'100%',width:'100%'}" ref="myLineRank"></div>
</div>
</template>
<script>
export default {
data() {
return {};
},
mounted() {
this.init();
},
methods: {
init() {
let myChart = this.$echarts.init(this.$refs.myLineRank);
var dataAxis = [
"9",
"10",
"11",
"12",
"13",
"14",
"15",
"16",
"17",
"18",
"19"
];
var data = [220, 182, 191, 234, 290, 330, 310, 100, 30, 60, 650];
var data2 = [130, 202, 101, 500, 10, 220, 310, 98, 17, 52, 360];
var yMax = 500;
var dataShadow = [];
for (var i = 0; i < data.length; i++) {
dataShadow.push(yMax);
}
let option = {
backgroundColor: "#fd397a", //"#19133e6e",
title: {
show: false
},
xAxis: {
data: dataAxis,
axisLabel: {
textStyle: {
color: "#79778a",
fontFamily: "DIN"
},
margin: 10,
interval: 0,
show: false
},
axisTick: {
show: false
},
axisLine: {
show: false
}
},
yAxis: {
axisLine: {
show: false
},
axisTick: {
show: false
},
axisLabel: {
textStyle: {
color: "#272938",
fontFamily: "DIN"
},
show: false
},
splitLine: {
show: false
},
interval: 1000,
max: 1000,
min: 0,
splitNumber: 5
},
grid: {
left: -30,
right: -30,
top: 0,
bottom: 0
},
tooltip: {
trigger: "item",
axisPointer: {
type: "none",
snap: true,
label: {
backgroundColor: "#6a7985"
}
}
},
series: [
{
name: "同行浏览与分享",
type: "line",
smooth: false,
symbol: "none",
itemStyle: {
normal: {
lineStyle: {
color: "#e63a5e"
},
areaStyle: {
color: "#e14c86"
}
}
},
data: data2
}
]
};
myChart.setOption(option);
}
}
};
</script>
<style>
.inerank-container {
height: 100%;
width: 100%;
}
</style>
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ c7528b08
......@@ -153,11 +153,11 @@
methods: {
personStrToWord(str) {
if (str == 1)
return '大'
return '大人'
if (str == 2)
return '中'
return '中人'
if (str == 3)
return '小'
return '小人'
},
goUrl(path, obj, name) {
this.$router.push({
......
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