Skip to content

S
SuperMan
Commit 991b37d0 authored by 吴春's avatar 吴春
Browse files
Options

index冲突提交

parents 8ea293b5 59e1be3e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1844 additions and 1807 deletions
src/components/FinancialModule/accDetail/GuideAccount.vue
View file @ 991b37d0
...@@ -13,14 +13,8 @@ ...@@ -13,14 +13,8 @@
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
} }
._bg__ ._bg_red:hover{ .Guid_bg_red{color: #E95252;}
color: rgb(230, 97, 97); .Guid_bg_green{color: #2BB87C}
}
._bg__ ._bg_green:hover{
color:rgb(66, 182, 132);
}
._bg_red{color: #E95252;}
._bg_green{color: #2BB87C}
._addChuNa_tit{color: gray;margin-bottom: 10px;} ._addChuNa_tit{color: gray;margin-bottom: 10px;}
._addChuNa_tit span{ color:#333333} ._addChuNa_tit span{ color:#333333}
</style> </style>
...@@ -95,7 +89,7 @@ ...@@ -95,7 +89,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" :gutter="35"> <!-- <el-col :span="8" :gutter="35">
<el-form-item :label="$t('fnc.a_hkfkriqi')"> <el-form-item :label="$t('fnc.a_hkfkriqi')">
<el-date-picker class="h34" <el-date-picker class="h34"
@change="timeAdd" @change="timeAdd"
...@@ -105,17 +99,32 @@ ...@@ -105,17 +99,32 @@
:range-separator="$t('restaurant.res_To')"> :range-separator="$t('restaurant.res_To')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="汇款/付款日期">
<el-date-picker
@change="timeAdd"
v-model="productionDate"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col> </el-col>
<el-col :span="8" :gutter="35"> <el-col :span="6">
<el-form-item label="发团日期"> <el-form-item label="发团日期">
<el-date-picker class="h34" <el-date-picker
@change="timeAddByTC" @change="timeAddByTC"
v-model="productionDateByTC" v-model="productionDateByTC"
type="daterange" type="daterange"
value-format="yyyy-MM-dd" range-separator="-"
:range-separator="$t('restaurant.res_To')"> start-placeholder="开始日期"
</el-date-picker> end-placeholder="结束日期"
</el-form-item> value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4" :gutter="35"> <!-- <el-col :span="4" :gutter="35">
<el-form-item label="费用类型"> <el-form-item label="费用类型">
...@@ -148,8 +157,8 @@ ...@@ -148,8 +157,8 @@
<th>{{$t('fnc.a_hkfkshijian')}}</th> <th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th> <th>{{$t('fnc.jylshuihao')}}</th>
<th>制单人</th> <th>制单人</th>
<th>{{$t('fnc.skjine')}}</th> <th>待收金额</th>
<th>{{$t('fnc.fkjine')}}</th> <th>待付金额</th>
<th>总计</th> <th>总计</th>
</tr> </tr>
<!-- <tr> <!-- <tr>
...@@ -170,9 +179,9 @@ ...@@ -170,9 +179,9 @@
</td> --> </td> -->
<td>{{item.TypeName}}</td> <td>{{item.TypeName}}</td>
<td>{{item.BName}}</td> <td>{{item.BName}}</td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> --> <!-- <td><span class="cursorpointer" :class="item.Type==1?'Guid_bg_green':'Guid_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
<td> <td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)"> <span class="cursorpointer" :class=" item.Type === 1 ? 'Guid_bg_green' : 'Guid_bg_red'" @click="goUrlNew(item)">
{{ item.FinanceId }}</span> {{ item.FinanceId }}</span>
</td> </td>
<td> <td>
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 991b37d0
...@@ -196,14 +196,14 @@ ...@@ -196,14 +196,14 @@
<div class="rb_top_row _r_mb5"> <div class="rb_top_row _r_mb5">
<p >{{$t('fnc.fkduixiang')}}： <p >{{$t('fnc.fkduixiang')}}：
<el-select filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1"> <el-select filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1">
<el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option> <el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.sizhang')" :value='0' :key='0' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option> <el-option :label="$t('fnc.sizhang')" :value='0' :key='0' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option> <el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.wbxianjin')" :value='3' :key='3' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option> <el-option :label="$t('fnc.wbxianjin')" :value='3' :key='3' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.zjinchi')" :value='4' :key='4' v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48 || msg.TemplateId===53'></el-option> <el-option :label="$t('fnc.zjinchi')" :value='4' :key='4' v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48 || msg.TemplateId===53'></el-option>
<el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option> <el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option> <el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option> <el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option> <el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option>
<el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67'></el-option> <el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67'></el-option>
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 991b37d0
...@@ -510,12 +510,12 @@ ...@@ -510,12 +510,12 @@
findex: 0, findex: 0,
childIndex: 0, childIndex: 0,
//修改酒店价格，付款方式权限[0-不能修改，1-有权限修改] //修改酒店价格，付款方式权限[0-不能修改，1-有权限修改]
IsEditHotel: 0, IsEditHotel: 1,
//0-可以操作，1-已制单，不能操作 //0-可以操作，1-已制单，不能操作
IsOperation: 1, IsOperation: 1,
LeaderName: "", //领队名称 LeaderName: "", //领队名称
GuideName: "", //导游名称 GuideName: "", //导游名称
IsEditHotelPeople: 0, //是否有修改人数权限[0-不能修改，1-可以修改] IsEditHotelPeople: 1, //是否有修改人数权限[0-不能修改，1-可以修改]
IsCombine: false, //是否是合团，true-是合团，false-不是合团 IsCombine: false, //是否是合团，true-是合团，false-不是合团
allCurrencyList: [], //币种列表 allCurrencyList: [], //币种列表
} }
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 991b37d0
...@@ -26,21 +26,21 @@ ...@@ -26,21 +26,21 @@
</th> </th>
</tr> </tr>
<tr> <tr>
<th width="150">用餐时间</th> <th width="100">用餐时间</th>
<th width="250">餐厅名称</th> <th width="200">餐厅名称</th>
<th width="160">修改餐厅</th> <th width="150">修改餐厅</th>
<th width="80">类别</th> <th width="80">类别</th>
<th width="200" style="display:none;">餐饮类型</th> <th width="200" style="display:none;">餐饮类型</th>
<th width="80">总人数</th> <th width="70">总人数</th>
<th width="70">用餐人<br />类型</th> <th width="70">用餐人<br />类型</th>
<th width="70">用餐<br />人数</th> <th width="70">用餐<br />人数</th>
<th width="100">价格</th> <th width="90">价格</th>
<th width="100">免人数</th> <th width="90">免人数</th>
<th width="80">金额小计</th> <th width="80">金额小计</th>
<th width="100">返佣</th> <th width="90">返佣</th>
<th width="120">总金额</th> <th width="100">总金额</th>
<th width="210">付款方式/订餐方式/订团号</th> <th width="210">付款方式/订餐方式/订团号</th>
<th width="80">备注</th> <th width="170">备注</th>
</tr> </tr>
<template v-for="(item,index) in list"> <template v-for="(item,index) in list">
<template v-for="(subItem,subIndex) in item.DiningSummaryList"> <template v-for="(subItem,subIndex) in item.DiningSummaryList">
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID' <el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
:key='itemHotel.ID'></el-option> :key='itemHotel.ID'></el-option>
</el-select> </el-select>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{subItem.UseDinnerTypeStr}} {{subItem.UseDinnerTypeStr}}
...@@ -102,7 +101,8 @@ ...@@ -102,7 +101,8 @@
<span class="spanlink" v-if='childItem.PeoplePrice==0' <span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span> @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
<template v-else> <template v-else>
{{childItem.PeoplePrice}} <el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.PeoplePrice'
@keyup.native="checkInteger(childItem,'PeoplePrice')"></el-input>
</template> </template>
</td> </td>
<td> <td>
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
付款方式： 付款方式：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option> <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
...@@ -150,7 +149,6 @@ ...@@ -150,7 +149,6 @@
<el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option> <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option> <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option> <el-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -186,7 +184,22 @@ ...@@ -186,7 +184,22 @@
</table> </table>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
<el-input type='textarea' rows="4" class='w120' v-model='subItem.Remarks'></el-input> <table class="dinnerTable">
<tr>
<td width="80" style="text-align:right;">备注：</td>
<td>
<el-input type='textarea' rows="2" class='w120' v-model='subItem.Remarks'></el-input>
</td>
</tr>
<tr>
<td width="80" style="text-align:right;">
餐配备注：
</td>
<td style="text-align:left;">
<el-input type='textarea' rows="2" class='w120' v-model='subItem.DinnerRemark'></el-input>
</td>
</tr>
</table>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -195,7 +208,6 @@ ...@@ -195,7 +208,6 @@
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
...@@ -301,7 +313,7 @@ ...@@ -301,7 +313,7 @@
return item.ID === obj.CurrencyId; //筛选出匹配数据 return item.ID === obj.CurrencyId; //筛选出匹配数据
}); });
} }
//日元 //日元
let jpaObj = this.allCurrencyList.find(item => { let jpaObj = this.allCurrencyList.find(item => {
return item.ID === 3; //筛选出匹配数据 return item.ID === 3; //筛选出匹配数据
...@@ -309,7 +321,8 @@ ...@@ -309,7 +321,8 @@
obj.DiningPriceList.forEach((item, index) => { obj.DiningPriceList.forEach((item, index) => {
var tempPrice = 0; var tempPrice = 0;
var coefficient = 1; var coefficient = 1;
totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice / 100); totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice /
100);
totalPrice += tempPrice; totalPrice += tempPrice;
}) })
obj.TotalPrice = totalPrice.toFixed(2); obj.TotalPrice = totalPrice.toFixed(2);
...@@ -322,24 +335,18 @@ ...@@ -322,24 +335,18 @@
else if (currentObj.ID == 3) { else if (currentObj.ID == 3) {
obj.NewTotalPrice = ""; obj.NewTotalPrice = "";
} else { } else {
if(currentObj.CurrentRate>1) if (currentObj.CurrentRate > 1) {
{ obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) / currentObj.CurrentRate)
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2); .toFixed(2);
} } else {
else obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) * currentObj.CurrentRate)
{ .toFixed(2);
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
} }
} }
} else { } else {
obj.NewTotalPrice = ""; obj.NewTotalPrice = "";
} }
this.$forceUpdate(); this.$forceUpdate();
// let totalPrice = 0;
// obj.DiningPriceList.forEach(item => {
// totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
// })
// obj.TotalPrice = totalPrice.toFixed(2);
}, },
saveList(type) { saveList(type) {
this.IsDisabled = true; this.IsDisabled = true;
......
src/components/Ticketing/flightPerformance.vue
View file @ 991b37d0
...@@ -41,8 +41,15 @@ ...@@ -41,8 +41,15 @@
<th>操作人员</th> <th>操作人员</th>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td> <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",item.TCID,"报名清单")'> <td>
({{item.TCID}}){{item.TCNUM}} </a></td> <template v-if="item.TCID>0">
<a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",item.TCID,"报名清单")'>
({{item.TCID}}){{item.TCNUM}} </a>
</template>
<template v-else>
{{item.TCNUM}}
</template>
</td>
<td>{{item.OutBranchName}}</td> <td>{{item.OutBranchName}}</td>
<td>{{item.LineName}}</td> <td>{{item.LineName}}</td>
<td>{{item.TicketNum}}</td> <td>{{item.TicketNum}}</td>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 991b37d0
...@@ -1791,10 +1791,14 @@ ...@@ -1791,10 +1791,14 @@
<tr> <tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注时间:</span> <div style="display:inline-block;width:100%">
<p class="RL-redType RL-remarkCon" style="margin-left:62px;">{{item.RematksTime}}</p> <span class="RL-remarkTitle">备注时间:</span>
<span class="RL-remarkTitle">备注:</span> <p class="RL-redType RL-remarkCon" style="margin-left:62px;">{{item.RematksTime}}</p>
<p class="RL-redType RL-remarkCon">{{item.Remarks}}</p> </div>
<div style="display:inline-block;text-align:left;float:left;width:100%;">
<span class="RL-remarkTitle">备注:</span>
<p class="RL-redType RL-remarkCon">{{item.Remarks}}</p>
</div>
</div> </div>
</td> </td>
<td colspan="6" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="6" class="groupTourOrder_remarks" style="height: 40px;">
...@@ -2085,7 +2089,7 @@ ...@@ -2085,7 +2089,7 @@
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </span>--> <!-- </span>-->
<span style="display: block"> <span style="display: block">
房间信息：{{childItem.OrderGuestHouseStr}} 房间信息<span v-if="childItem.OneSex>0" style="color: #e95252">（{{childItem.OneSex==1?'单男':'单女'}}）</span>：{{childItem.OrderGuestHouseStr}}
<el-popover trigger="click" popper-class="RL_Scenic"> <el-popover trigger="click" popper-class="RL_Scenic">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;"> <tr class="_color_666" style="text-align:center;">
...@@ -2117,20 +2121,22 @@ ...@@ -2117,20 +2121,22 @@
<tr> <tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注时间:</span> <div style="display:inline-block;width:100%">
<p class="RL-redType RL-remarkCon" style="margin-left:62px;">{{childItem.RematksTime}}</p> <span class="RL-remarkTitle">备注时间:</span>
<p class="RL-redType RL-remarkCon" style="margin-left:62px;">{{childItem.RematksTime}}</p>
<span class="RL-remarkTitle"> 备注:</span> </div>
<p class="RL-redType RL-remarkCon"> <div style="display:inline-block;text-align:left;float:left;width:100%;">
<span v-if="childItem.TsIdList&&childItem.TsIdList.length>0">投诉单号： <span class="RL-remarkTitle"> 备注:</span>
<a clas="underline" v-for="ts in childItem.TsIdList" href="javascript:void(0);" <p class="RL-redType RL-remarkCon">
@click="goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')">{{ts}} </a> <span v-if="childItem.TsIdList&&childItem.TsIdList.length>0">投诉单号：
;</span> <a clas="underline" v-for="ts in childItem.TsIdList" href="javascript:void(0);"
<span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单 @click="goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')">{{ts}} </a>
{{childItem.PlatformOrder}};</span> ;</span>
{{childItem.Remarks}} <span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
</p> {{childItem.PlatformOrder}};</span>
{{childItem.Remarks}}
</p>
</div>
</div> </div>
</td> </td>
<td colspan="6" style="height: 40px;"> <td colspan="6" style="height: 40px;">
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 991b37d0
...@@ -373,7 +373,8 @@ ...@@ -373,7 +373,8 @@
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}"> :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName"> <div class="TC_remarkContent TC_teamName">
<div class="clearfix"> <div class="clearfix">
<div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;" <div class="TCL_remarkTitle" style="width:105px;"><span
style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
v-if="item.ScoreNum >= 0" v-if="item.ScoreNum >= 0"
@click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span> @click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span>
{{$t('Operation.Op_TeamName')}}：</div> {{$t('Operation.Op_TeamName')}}：</div>
...@@ -445,7 +446,8 @@ ...@@ -445,7 +446,8 @@
<div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div> <div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div>
<div style="margin-top:5px;">({{fItem.AIATA}}){{fItem.aName}}</div> <div style="margin-top:5px;">({{fItem.AIATA}}){{fItem.aName}}</div>
</td> </td>
<td><template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}</td> <td><template
v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}</td>
</tr> </tr>
</table> </table>
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
...@@ -501,11 +503,11 @@ ...@@ -501,11 +503,11 @@
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo> @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<div slot="reference" > <div slot="reference">
<span class="price" <span class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> <span
style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> <span style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}分房</span> style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}分房</span>
</div> </div>
</el-popover> </el-popover>
</p> </p>
<p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1"> <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
...@@ -782,6 +784,10 @@ ...@@ -782,6 +784,10 @@
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)"> <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$t('Operation.Op_xiajia')}} {{$t('Operation.Op_xiajia')}}
</el-dropdown-item> </el-dropdown-item>
<!--酒店下架-->
<el-dropdown-item v-if="item.LineID==14" @click.native="RemoveHotelJourneyOrder(item.TCID)">
酒店下架
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)"> <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}} {{$t('Operation.Op_jietuan')}}
</el-dropdown-item> </el-dropdown-item>
...@@ -1077,15 +1083,15 @@ ...@@ -1077,15 +1083,15 @@
//当前登录用户信息 //当前登录用户信息
CurrentUserInfo: {}, CurrentUserInfo: {},
showHotelObj: { showHotelObj: {
showPrice: true,//是否显示价格 showPrice: true, //是否显示价格
showPay: false,//是否显示支付方式 showPay: false, //是否显示支付方式
showZhan: true,//占房时间 showZhan: true, //占房时间
showBtnList: false,//是否下载、确认按钮 showBtnList: false, //是否下载、确认按钮
ShowTaxType: false, //显示税入税别 ShowTaxType: false, //显示税入税别
ShowRebateRatio: false, //显示返佣比列 ShowRebateRatio: false, //显示返佣比列
ShowSupplier:false,//是否显示供应商 ShowSupplier: false, //是否显示供应商
showCaozuoTime:true,//操作时间 showCaozuoTime: true, //操作时间
colspanLength:4//跨行 colspanLength: 4 //跨行
}, },
IsModifyTravelControl: 0, //分公司是否有修改团控权限 IsModifyTravelControl: 0, //分公司是否有修改团控权限
pickerBeginDateBefore: { pickerBeginDateBefore: {
...@@ -1427,6 +1433,24 @@ ...@@ -1427,6 +1433,24 @@
} }
} }
}, },
//单团酒店下架
RemoveHotelJourneyOrder(TCID) {
var that = this;
this.Confirm("是否要下架酒店?下架过后将释放酒店库存!", function () {
let msg = {
TCID: TCID,
}
that.apipost('travel_post_RemoveHotelJourneyOrderService', msg, res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message)
that.getControlList()
} else {
that.Info(res.data.message)
}
})
});
},
//单团设置下架 //单团设置下架
Setshelves(TCID) { Setshelves(TCID) {
let msg = { let msg = {
...@@ -1881,7 +1905,7 @@ ...@@ -1881,7 +1905,7 @@
if (this.$route.query.IsUnionCked) { if (this.$route.query.IsUnionCked) {
this.queryMsg.IsShowUnion = this.$route.query.IsUnionCked; this.queryMsg.IsShowUnion = this.$route.query.IsUnionCked;
} }
if (this.CurrentUserInfo.RB_Branch_id == 0 || this.CurrentUserInfo.RB_Branch_id == 1216 || this.CurrentUserInfo if (this.CurrentUserInfo.RB_Branch_id == 0 || this.CurrentUserInfo.RB_Branch_id == 1216 || this.CurrentUserInfo
.RB_Branch_id == 49) { .RB_Branch_id == 49) {
this.IsModifyTravelControl = 1; this.IsModifyTravelControl = 1;
......
src/components/confirmationOrderDownLoad.vue
View file @ 991b37d0
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" /> <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<span>行程补充说明</span> <span style="font-size:14px">行程补充说明:</span>
<el-select filterable size="small" v-model="Typevalue" placeholder="请选择"> <el-select filterable size="small" v-model="Typevalue" placeholder="请选择">
<el-option label="日本寻秋意赏枫季" :value="-1"></el-option> <el-option label="日本寻秋意赏枫季" :value="-1"></el-option>
<el-option label="仲夏花火夜" :value="-2"></el-option> <el-option label="仲夏花火夜" :value="-2"></el-option>
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<el-option label="邂逅北海道的雪" :value="-4"></el-option> <el-option label="邂逅北海道的雪" :value="-4"></el-option>
<el-option <el-option
v-for="item in titleList" v-for="item in titleList"
:key="item.subCode"
:label="item.title" :label="item.title"
:value="item.id"> :value="item.id">
</el-option> </el-option>
......
src/components/dmc/manager/LeaderHander.vue
View file @ 991b37d0
...@@ -140,46 +140,46 @@ ...@@ -140,46 +140,46 @@
<tr> <tr>
<td> <td>
人数：{{sendReceiptData.StartCityName}}出发 人数：{{sendReceiptData.StartCityName}}出发
<el-input type="text" class="w100" v-model="sendReceiptData.StartCityNum"/> <el-input type="text" class="w100" v-model="sendReceiptData.StartCityNum" @keyup.native="checkPrice(sendReceiptData,'StartCityNum')" />
位 位
</td> </td>
<td width="250"> <td width="250">
其他：凑票 其他：凑票
<el-input type="text" class="w135" v-model="sendReceiptData.TogetherNum"/> <el-input type="text" class="w135" v-model="sendReceiptData.TogetherNum" @keyup.native="checkPrice(sendReceiptData,'TogetherNum')" />
位 位
</td> </td>
<td colspan="7"> <td colspan="7">
外站JOIN 外站JOIN
<el-input type="text" class="w100" v-model="sendReceiptData.OutsideNum"/> <el-input type="text" class="w100" v-model="sendReceiptData.OutsideNum" @keyup.native="checkPrice(sendReceiptData,'OutsideNum')" />
位 位
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
小费：金额 小费：金额
<el-input type="text" class="w128" v-model="sendReceiptData.Trip"/> <el-input type="text" class="w128" v-model="sendReceiptData.Trip" @keyup.native="checkPrice(sendReceiptData,'Trip')" />
元/位 元/位
</td> </td>
<td> <td>
人数：共 人数：共
<el-input type="text" class="w150" v-model="sendReceiptData.TripNum"/> <el-input type="text" class="w150" v-model="sendReceiptData.TripNum" @keyup.native="checkPrice(sendReceiptData,'TripNum')" />
位 位
</td> </td>
<td colspan="7"> <td colspan="7">
总计： 总计：
<el-input type="text" class="w120" v-model="sendReceiptData.TripTotal"/> <el-input type="text" class="w120" v-model="sendReceiptData.TripTotal" @keyup.native="checkPrice(sendReceiptData,'TripTotal')" />
万日元 万日元
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
团款： 团款：
<el-input type="text" class="w160" v-model="sendReceiptData.TeamPrice"/> <el-input type="text" class="w160" v-model="sendReceiptData.TeamPrice" @keyup.native="checkPrice(sendReceiptData,'TeamPrice')" />
人民币 人民币
</td> </td>
<td colspan="8"> <td colspan="8">
名单表费： 名单表费：
<el-input type="text" class="w135" v-model="sendReceiptData.TableFee"/> <el-input type="text" class="w135" v-model="sendReceiptData.TableFee" @keyup.native="checkPrice(sendReceiptData,'TableFee')" />
元 元
</td> </td>
</tr> </tr>
...@@ -541,7 +541,6 @@ ...@@ -541,7 +541,6 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.sendReceiptData = res.data.data; this.sendReceiptData = res.data.data;
console.log("sendReceiptData",this.sendReceiptData);
this.isShow=true; this.isShow=true;
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
......
src/components/dmc/manager/groundOperation.vue
View file @ 991b37d0
...@@ -37,14 +37,17 @@ ...@@ -37,14 +37,17 @@
.GD_comPad { .GD_comPad {
padding: 0 !important; padding: 0 !important;
} }
.groundLastTable{
margin:20px 0; .groundLastTable {
font-size:12px; margin: 20px 0;
font-size: 12px;
} }
.gdBtn{
.gdBtn {
position: relative; position: relative;
top:-45px; top: -45px;
} }
</style> </style>
<template> <template>
...@@ -88,14 +91,14 @@ ...@@ -88,14 +91,14 @@
</td> </td>
<td>机票负责人</td> <td>机票负责人</td>
<td> <td>
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].CreateByName}} <el-input v-model='PrincipalList[0].CreateByName' class='w200'></el-input>
</template> </template>
</td> </td>
<td>联系电话</td> <td>联系电话</td>
<td colspan="5"> <td colspan="5">
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].CreateByMobile}} <el-input v-model='PrincipalList[0].CreateByMobile' class='w200'></el-input>
</template> </template>
</td> </td>
</tr> </tr>
...@@ -103,13 +106,13 @@ ...@@ -103,13 +106,13 @@
<td>订房负责人</td> <td>订房负责人</td>
<td> <td>
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].HConfirmName}} <el-input v-model='PrincipalList[0].HConfirmName' class='w200'></el-input>
</template> </template>
</td> </td>
<td>联系电话</td> <td>联系电话</td>
<td colspan="5"> <td colspan="5">
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].HConfirmMobile}} <el-input v-model='PrincipalList[0].HConfirmMobile' class='w200'></el-input>
</template> </template>
</td> </td>
</tr> </tr>
...@@ -117,27 +120,27 @@ ...@@ -117,27 +120,27 @@
<td>车辆负责人</td> <td>车辆负责人</td>
<td> <td>
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].BConfirmName}} <el-input v-model='PrincipalList[0].BConfirmName' class='w200'></el-input>
</template> </template>
</td> </td>
<td>联系电话</td> <td>联系电话</td>
<td colspan="5"> <td colspan="5">
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].BConfirmMobile}} <el-input v-model='PrincipalList[0].BConfirmMobile' class='w200'></el-input>
</template> </template>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>订餐负责人</td> <td>订餐负责人</td>
<td> <td>
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].DConfirmName}} <el-input v-model='PrincipalList[0].DConfirmName' class='w200'></el-input>
</template> </template>
</td> </td>
<td>联系电话</td> <td>联系电话</td>
<td colspan="5"> <td colspan="5">
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].DConfirmMobile}} <el-input v-model='PrincipalList[0].DConfirmMobile' class='w200'></el-input>
</template> </template>
</td> </td>
</tr> </tr>
...@@ -145,13 +148,13 @@ ...@@ -145,13 +148,13 @@
<td>门票负责人</td> <td>门票负责人</td>
<td> <td>
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].TConfirmName}} <el-input v-model='PrincipalList[0].TConfirmName' class='w200'></el-input>
</template> </template>
</td> </td>
<td>联系电话</td> <td>联系电话</td>
<td colspan="5"> <td colspan="5">
<template v-if="PrincipalList.length>0"> <template v-if="PrincipalList.length>0">
{{PrincipalList[0].TConfirmMobile}} <el-input v-model='PrincipalList[0].TConfirmMobile' class='w200'></el-input>
</template> </template>
</td> </td>
</tr> </tr>
...@@ -198,8 +201,8 @@ ...@@ -198,8 +201,8 @@
<td>{{subItem.ReserveNo}}</td> <td>{{subItem.ReserveNo}}</td>
<td style="text-align:left;">{{subItem.HotelName}}</td> <td style="text-align:left;">{{subItem.HotelName}}</td>
<td>{{subItem.CheckInDateStr}}</td> <td>{{subItem.CheckInDateStr}}</td>
<td>{{DMCStaticsCommon.HouseStatistics.NeedBed}}/{{DMCStaticsCommon.HouseStatistics.NoNeedBed}}</td> <td>{{getHotelTotalNum(subItem)}}</td>
<td>{{DMCStaticsCommon.HouseStatistics.RealityRoomNum}}</td> <td>{{getHotelTotal(subItem)}}</td>
<td>{{subItem.Tel}}</td> <td>{{subItem.Tel}}</td>
<td style="text-align:left;">{{subItem.Address}}</td> <td style="text-align:left;">{{subItem.Address}}</td>
<td style="text-align:left;">{{subItem.Remarks}}</td> <td style="text-align:left;">{{subItem.Remarks}}</td>
...@@ -225,10 +228,11 @@ ...@@ -225,10 +228,11 @@
<tr v-for="subItem in item.DiningSummaryList"> <tr v-for="subItem in item.DiningSummaryList">
<td>{{subItem.ReserveNo}}</td> <td>{{subItem.ReserveNo}}</td>
<td>{{subItem.UseTimeStr}}</td> <td>{{subItem.UseTimeStr}}</td>
<td>{{subItem.DiningName}}</td> <td style="text-align:left;">{{subItem.DiningName}}</td>
<td>{{subItem.UseDinnerTypeStr}}</td> <td>{{subItem.UseDinnerTypeStr}}</td>
<td>{{subItem.MealName}}</td> <td>{{subItem.MealName}}</td>
<td>{{DMCStaticsCommon.HouseStatistics.RealityNum>0?(DMCStaticsCommon.HouseStatistics.RealityNum-1):0}}+1</td> <td>{{getDinnerTotal(subItem)}}
</td>
<td>{{subItem.Tel}}</td> <td>{{subItem.Tel}}</td>
<td style="text-align:left;">{{subItem.Address}}</td> <td style="text-align:left;">{{subItem.Address}}</td>
<td style="text-align:left;">{{subItem.Remarks}}</td> <td style="text-align:left;">{{subItem.Remarks}}</td>
...@@ -250,8 +254,10 @@ ...@@ -250,8 +254,10 @@
<tbody v-for="item in DMCStaticsCommon.ScenicList"> <tbody v-for="item in DMCStaticsCommon.ScenicList">
<tr v-for="subItem in item.ScenicStatisticsList"> <tr v-for="subItem in item.ScenicStatisticsList">
<td>{{subItem.UseTimeStr}}</td> <td>{{subItem.UseTimeStr}}</td>
<td>{{subItem.ScenicName}}</td> <td style="text-align:left;">{{subItem.ScenicName}}</td>
<td>{{DMCStaticsCommon.HouseStatistics.RealityNum>0?(DMCStaticsCommon.HouseStatistics.RealityNum-1):0}}+1</td> <td>
{{getScenicTotal(subItem)}}
</td>
<td>{{subItem.Tel}}</td> <td>{{subItem.Tel}}</td>
<td style="text-align:left;">{{subItem.Address}}</td> <td style="text-align:left;">{{subItem.Address}}</td>
<td style="text-align:left;">{{subItem.Remarks}}</td> <td style="text-align:left;">{{subItem.Remarks}}</td>
...@@ -308,8 +314,8 @@ ...@@ -308,8 +314,8 @@
注意事项： 注意事项：
</td> </td>
<td> <td>
<el-input v-model="PostConfig.PlanDescription" type="textarea" class="w700" :autosize="{minRows: 3, maxRows: 3 }" <el-input v-model="PostConfig.PlanDescription" type="textarea" class="w700"
resize="none" placeholder="注意事项" maxlength="300"></el-input> :autosize="{minRows: 3, maxRows: 3 }" resize="none" placeholder="注意事项" maxlength="300"></el-input>
<input type="button" class="normalBtn gdBtn" @click="UpdateLeaderPay" value="保存" /> <input type="button" class="normalBtn gdBtn" @click="UpdateLeaderPay" value="保存" />
<input type="button" class="normalBtn gdBtn" @click="DownLoadLeaderPay" value="下载" /> <input type="button" class="normalBtn gdBtn" @click="DownLoadLeaderPay" value="下载" />
</td> </td>
...@@ -344,10 +350,49 @@ ...@@ -344,10 +350,49 @@
TCIDs: "", TCIDs: "",
PlanDescription: "" PlanDescription: ""
}, },
loading2:false, loading2: false,
}; };
}, },
methods: { methods: {
//酒店统计（用房数）
getHotelTotal(item) {
var totalCount = 0;
item.OrderDetailsList.forEach(subItem => {
totalCount+= subItem.HouseTypeCount;
});
return totalCount;
},
getHotelTotalNum(item) {
var totalCount = 0;
var noBed=0;
item.OrderDetailsList.forEach((subItem,subIndex) => {
if(subItem.HouseType<=4)
{
totalCount+= subItem.BookNum;
}
else if(subItem.HouseType==6)
{
noBed+= subItem.BookNum;
}
});
return totalCount+"/"+noBed;
},
//景点统计
getScenicTotal(item) {
var totalCount = 0;
item.TicketPriceList.forEach(subItem => {
totalCount += subItem.UsePeopleNum - subItem.Discount;
});
return totalCount;
},
//餐厅人数统计
getDinnerTotal(item) {
var totalCount = 0;
item.DiningPriceList.forEach(subItem => {
totalCount += subItem.UsePeopleNum - subItem.Discount;
});
return totalCount;
},
//根据团号获取负责人的信息 //根据团号获取负责人的信息
getConfirmName() { getConfirmName() {
let msg = { let msg = {
...@@ -355,9 +400,9 @@ ...@@ -355,9 +400,9 @@
NewCombinationNum: '', NewCombinationNum: '',
}; };
//更新酒店图片 //更新酒店图片
this.loading2=true; this.loading2 = true;
this.apipost( "dmcstatistics_post_GetExtendLeaderAllStatics",msg,res => { this.apipost("dmcstatistics_post_GetExtendLeaderAllStatics", msg, res => {
this.loading2=false; this.loading2 = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.BaseInfo = res.data.data.BaseInfo; this.BaseInfo = res.data.data.BaseInfo;
this.PrincipalList = res.data.data.PrincipalList; this.PrincipalList = res.data.data.PrincipalList;
...@@ -366,6 +411,7 @@ ...@@ -366,6 +411,7 @@
this.DMCStaticsCommon = res.data.data.DMCStaticsCommon; this.DMCStaticsCommon = res.data.data.DMCStaticsCommon;
this.shopList = res.data.data.shopList; this.shopList = res.data.data.shopList;
this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply; this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -400,7 +446,10 @@ ...@@ -400,7 +446,10 @@
}, },
UpdateLeaderPay() { UpdateLeaderPay() {
this.PostConfig.TCIDs = this.TCIDs; this.PostConfig.TCIDs = this.TCIDs;
this.apipost('dmcstatistics_post_AuditLeaderapply', this.PostConfig, res => { this.apipost('dmcstatistics_post_AuditLeaderapply', {
LeaderApply: this.PostConfig,
LeaderGuidePlan: this.PrincipalList[0]
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
} else { } else {
...@@ -415,12 +464,12 @@ ...@@ -415,12 +464,12 @@
uid: this.getLocalStorage().EmployeeId uid: this.getLocalStorage().EmployeeId
}; };
let fileName = "导游计划表" + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = "导游计划表" + this.$commonUtils.getCurrentDate() + ".xls";
this.loading=true; this.loading = true;
this.GetLocalFile("dmcstatistics_get_DwonLoadLeaderapply", msg, fileName, this.GetLocalFile("dmcstatistics_get_DwonLoadLeaderapply", msg, fileName,
res => { res => {
this.loading=false; this.loading = false;
}); });
} }
}, },
mounted() { mounted() {
this.TCIDs = this.$route.query.id; this.TCIDs = this.$route.query.id;
...@@ -428,4 +477,5 @@ ...@@ -428,4 +477,5 @@
this.getConfirmName(); this.getConfirmName();
} }
}; };
</script>
\ No newline at end of file </script>
src/components/leaderPay2.vue
View file @ 991b37d0
...@@ -1270,7 +1270,7 @@ export default { ...@@ -1270,7 +1270,7 @@ export default {
}, null) }, null)
}, },
goZhiDan: function(obj) { goZhiDan: function(obj) {
let id = [59,63]; let id = [59,63,78];
let TCIDARR = [obj.TCIDS]; let TCIDARR = [obj.TCIDS];
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 991b37d0
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" <TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="TeamType"></TravelPrice3> :TeamType="TeamType"></TravelPrice3>
<div class="btnFixedDiv"> <div class="btnFixedDiv" v-if="IsShowBtn">
<div class="toTop" @click="backTop"> <div class="toTop" @click="backTop">
<i class="iconfont icon-huidaodingbu"></i> <i class="iconfont icon-huidaodingbu"></i>
</div> </div>
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
}, },
data() { data() {
return { return {
IsShowBtn:false,//是否显示按钮
ConfigId: 0, //地址栏查询参数 ConfigId: 0, //地址栏查询参数
NewConfigId: "", //configID加密后的字符串【预览使用】 NewConfigId: "", //configID加密后的字符串【预览使用】
TCNUM: '', //团控列表传过来的tcnum TCNUM: '', //团控列表传过来的tcnum
...@@ -630,7 +631,6 @@ ...@@ -630,7 +631,6 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
if (tempData.Feature != null) { if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID; this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId; this.FeatureData.ConfigId = tempData.Feature.ConfigId;
...@@ -753,6 +753,7 @@ ...@@ -753,6 +753,7 @@
this.Error(res.data.message); this.Error(res.data.message);
} }
this.loading = false; this.loading = false;
this.IsShowBtn=true;
}, },
err => {} err => {}
); );
...@@ -783,6 +784,7 @@ ...@@ -783,6 +784,7 @@
this.Error(res.data.message); this.Error(res.data.message);
} }
this.loading = false; this.loading = false;
this.IsShowBtn=true;
}, },
err => {} err => {}
); );
......
src/plug/index.js
View file @ 991b37d0
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