Skip to content

S
SuperMan
Commit 42c1a8c3 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 4e438e32
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 72 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 42c1a8c3
......@@ -932,8 +932,10 @@
@click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">
{{$t('objFill.dxcdd')+':'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==80">
<span class="illustrate-right fygsbumen-box-right" v-if="GetDetail.DMCNum" @click="goTravelInfo(GetDetail.DMCNum)">{{$t('salesModule.DJNum')+':'+GetDetail.DMCNum}}</span>
<span class="illustrate-right fygsbumen-box-right" @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">{{$t('objFill.chdd')+':'+GetDetail.TCNUM}}</span>
<span class="illustrate-right fygsbumen-box-right" v-if="GetDetail.DMCNum"
@click="goTravelInfo(GetDetail.DMCNum)">{{$t('salesModule.DJNum')+':'+GetDetail.DMCNum}}</span>
<span class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">{{$t('objFill.chdd')+':'+GetDetail.TCNUM}}</span>
</div>
<div v-if="GetDetail.OtherType==83" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
......@@ -951,7 +953,8 @@
<td :colspan="3">
{{o.TCNUM}}（{{o.TCID}}）
<template v-if="o.TeamTypeNameStr&&o.TeamTypeNameStr!=''">（{{o.TeamTypeNameStr}}）</template>
<template v-if="o.DMCNum&&o.DMCNum!=''"><span style="cursor: pointer;" @click="goTravelInfo(o.DMCNum)">{{o.DMCNum}}</span>{{(o.MergeNumber>1?' ['+o.MergeNumber+$t('op.HE')+']':'')}}</template>
<template v-if="o.DMCNum&&o.DMCNum!=''"><span style="cursor: pointer;"
@click="goTravelInfo(o.DMCNum)">{{o.DMCNum}}</span>{{(o.MergeNumber>1?' ['+o.MergeNumber+$t('op.HE')+']':'')}}</template>
<span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowGuestUrl===1"
@click="goInves('investigationList',o.TCID)" class="FD_yijian">{{$t('objFill.lkyj')}}
<span>{{o.GuestSurveyNum?o.GuestSurveyNum:0}}</span>/
......@@ -994,7 +997,7 @@
v-if="isCostTypeId||GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
|| GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58
|| GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
|| GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99|| GetDetail.TemplateId === 126
|| GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)"
@click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span
class="_jump_page _font_bold">{{$t('objFill.ykjh')}}</span>
......@@ -1195,7 +1198,7 @@
</div>
<template v-if="(GetDetail.InvoiceExamineBy==userInfo.EmployeeId
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)">
<div style="margin-top: 10px;" >
<div style="margin-top: 10px;">
<div class="_pic_upload">
<el-upload drag :http-request="uploadFileBtnFP" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
......@@ -1207,7 +1210,7 @@
</div>
</template>
<template v-else-if="(GetDetail.CreateBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2">
<div style="margin-top: 10px;" >
<div style="margin-top: 10px;">
<div class="_pic_upload">
<el-upload drag :http-request="uploadFileBtnFP" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
......@@ -1241,7 +1244,9 @@
:GetDetail="GetDetail">
</SamePayment>
<!-- 台湾经营费关联 -->
<TaiwanWorkingExpense v-if="userInfo.RB_Group_id ==2 && (GetDetail.TemplateId==282 || GetDetail.TemplateId==283)" :GetDetail="GetDetail">
<TaiwanWorkingExpense
v-if="userInfo.RB_Group_id ==2 && (GetDetail.TemplateId==282 || GetDetail.TemplateId==283)"
:GetDetail="GetDetail">
</TaiwanWorkingExpense>
<!-- 团成员已制单名单 -->
<template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
......@@ -1891,7 +1896,7 @@
event_id: 'CarDealerOrder',
data: {
OrderId: this.GetDetail.ReFinanceId,
type:2
type: 2
}
}, `${href}`)
} else {
......@@ -1903,15 +1908,14 @@
}
});
}
}
else if(this.GetDetail.OtherType == 83){
} else if (this.GetDetail.OtherType == 83) {
if (this.typeSystem == 1) {
let href = this.domainManager().CarUrl
window.parent.postMessage({
event_id: 'CarDealerOrder',
data: {
OrderId: this.GetDetail.ReFinanceId,
type:1
type: 1
}
}, `${href}`)
} else {
......@@ -1923,8 +1927,7 @@
}
});
}
}
else {
} else {
this.$router.push({
path: path,
query: {
......@@ -2128,18 +2131,17 @@
path = GetDetail.OtherType == 72 ? 'TradeTicketDetails' : 'TradeTicketUserDetails'
obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
obj.OutBranchId = null
}else if (GetDetail.OtherType == 88) { //印尼出境提成详情
} else if (GetDetail.OtherType == 88) { //印尼出境提成详情
obj.tab = '出境提成详情'
path = 'YNTradeTicketDetails'
obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
obj.OutBranchId = null
}else if (GetDetail.OtherType == 85) { //销售年终奖励
} else if (GetDetail.OtherType == 85) { //销售年终奖励
obj.tab = '年终奖励详情'
path = 'YearBonusDetails'
obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
obj.Year = GetDetail.ReFinanceId
}
else if (GetDetail.OtherType == 73 || GetDetail.OtherType == 77) { //OP提成详情
} else if (GetDetail.OtherType == 73 || GetDetail.OtherType == 77) { //OP提成详情
obj.tab = '出境OP提成详情'
path = GetDetail.OtherType == 73 ? 'OpComPersonDetails' : 'OPCommissionDetail'
} else if (GetDetail.OtherType == 78) { //票务提成详情
......@@ -2235,7 +2237,7 @@
}
});
},
goTravelInfo(DMCNum){
goTravelInfo(DMCNum) {
let query = {
CombinationNum: DMCNum,
blank: "y",
......@@ -2750,9 +2752,9 @@
TemplateType: tid
}, res => {
if (res.data.resultCode == 1) {
let arrText = [this.$t('fnc.huiqian1'),this.$t('fnc.huoqian1')]
let arrText = [this.$t('fnc.huiqian1'), this.$t('fnc.huoqian1')]
res.data.data.forEach(y => {
y.contentTips = y.AuditDescription + (y.AuditWay == '2' ?arrText[0]:arrText[1])
y.contentTips = y.AuditDescription + (y.AuditWay == '2' ? arrText[0] : arrText[1])
})
this.AuditListData.AuditList = res.data.data;
} else {}
......@@ -2799,7 +2801,8 @@
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
if (data.Type == 2 || data.FTravelID || (data.Type==1 && data.PlatformChangeFrIds && data.PlatformChangeFrIds.length>0)) {
if (data.Type == 2 || data.FTravelID || (data.Type == 1 && data.PlatformChangeFrIds && data
.PlatformChangeFrIds.length > 0)) {
this.isClientBankAccount = true;
}
if (data.Type == 2 && data.HelpBranchId > -1) {
......@@ -2820,8 +2823,8 @@
FTravelID: data.FTravelID,
FTracelRemark: data.FTracelRemark,
JapanPayMark: data.JapanPayMark,
PlatformChangeFee : data.PlatformChangeFee,
PlatformChangeFrIds : data.PlatformChangeFrIds
PlatformChangeFee: data.PlatformChangeFee,
PlatformChangeFrIds: data.PlatformChangeFrIds
}
this.helpBranchData = {
Type: data.Type,
......
src/components/TravelManager/Ticket/TravelticketManager.1.vue
View file @ 42c1a8c3
......@@ -67,7 +67,7 @@
overflow: hidden;
transition: linear all 0.5s;
background-color: #fff;
padding:10px 0 5px 0;
padding: 10px 0 5px 0;
}
.TravelticketManager ._ol_list>li:hover {
......@@ -117,7 +117,7 @@
.TravelticketManager ._oll_info {
padding-left: 20px;
overflow: hidden;
margin-top:-15px;
margin-top: -15px;
}
.TravelticketManager ._oll_img {
......@@ -648,14 +648,15 @@
<li>
<span class="hotel_name">
<em>{{$t('system.query_flightNum')}}</em>
<el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList" :placeholder="$t('system.ph_airNum')">
<el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList"
:placeholder="$t('system.ph_airNum')">
</el-input>
</span>
</li>
<li>
<button class="hollowFixedBtn" type="button"
@click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="isShowNeed=true,isShowOrder=false" style="display:none;">{{$t('objFill.v101.tixuqiu')</button>
<button class="normalBtn" type="button" @click="isShowNeed=true,isShowOrder=false" style="display:none;">{{$t('objFill.v101.tixuqiu')}}</button>
</li>
</ul>
</div>
......@@ -858,8 +859,8 @@
</el-col>
<el-col :span="5">
<el-form-item :label="$t('hotel.hotel_StarDate')">
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" :placeholder="$t('system.ph_flightTime')"
v-model="addNeedMsg.NeedDate">
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('system.ph_flightTime')" v-model="addNeedMsg.NeedDate">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -876,7 +877,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
<button type="button" class="normalBtn" style="margin:5px 0 0 55px;" @click="SetNeed()">{{$t('op.Send')}}</button>
<button type="button" class="normalBtn" style="margin:5px 0 0 55px;"
@click="SetNeed()">{{$t('op.Send')}}</button>
<button type="button" class="hollowFixedBtn" @click="isShowNeed=false">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-form>
......@@ -1022,7 +1024,8 @@
},
GetPlaceHolder() {
this.UseNum_placeholder =
this.$t('objFill.v101.zuiduoband') + this.bindAirticket.TotalNum + this.$t('objFill.v101.myOrdersAllType.gejiwei');
this.$t('objFill.v101.zuiduoband') + this.bindAirticket.TotalNum + this.$t(
'objFill.v101.myOrdersAllType.gejiwei');
},
//翻页功能按钮
......@@ -1208,4 +1211,5 @@
this.getList();
}
};
</script>
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 42c1a8c3
......@@ -846,14 +846,17 @@
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div style="margin-bottom:20px;">
{{$t('hotel.hotel_StartDate')}}
{{$t('hotel.hotel_StartDate')}}:
<el-date-picker class="w150" type="date" v-model="QFlightDateStart"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder>
</el-date-picker>
{{$t('hotel.hotel_EndDate')}}
{{$t('hotel.hotel_EndDate')}}:
<el-date-picker class="w150" type="date" v-model="QFlightDateEnd"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder>
</el-date-picker>
{{$t('fnc.jpbianhao')}}:
<el-input v-model="QAirTicketId" class="w150">
</el-input>
<button class="normalBtn" @click.stop="getSelectFilght()">{{$t('pub.searchBtn')}}</button>
</div>
<div class="jiDiv">
......@@ -864,8 +867,8 @@
<td class="_color_666">
{{$t('system.query_flightNum')}}/{{$t('system.query_airCompanyName')}}/{{$t('Airticket.Air_segment')}}
</td>
<td class="_color_666">{{$t('adm.adm_time')}}</td>
<td class="_color_666">PNR</td>
<td class="_color_666">{{$t('adm.adm_time')}}/PNR</td>
<td class="_color_666">{{$t('visa.v_xcdays')}}</td>
<td class="_color_666">{{$t('op.TicketNum')}}/{{$t('hotel.table_UseAmount')}}</td>
<td class="_color_666">{{$t('op.BindTicket')}}</td>
......@@ -882,8 +885,10 @@
@click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> /
{{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
</td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
<td>{{fitem.PNR}}</td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}}
<br/>
{{fitem.PNR}}
</td>
<td>{{fitem.DayNum}}</td>
<td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
<td>
......@@ -1250,7 +1255,7 @@
currentPriceIndex: 0, //当前团期索引位置
showPriceList: [],
priceShowCount: 6, //团期展示条数
QAirTicketId:"",//机票Id
QAirTicketId: "", //机票Id
QFlightDateStart: '', //航班查询开始日期
QFlightDateEnd: '', //航班查询结束日期
pickerBeginDateBefore: {
......@@ -1440,7 +1445,7 @@
IsLeaderDaiTuan: 1, //领队带团/不带团
IsGuideDaiTuan: 1, //导游带团/不带团
IsNewArrival: 0, //是否新品
TeamId:0,//团队分组编号
TeamId: 0, //团队分组编号
};
}
this.returnPriceList.push(objItem);
......@@ -1547,7 +1552,7 @@
AirTicketId: this.priceData.AirTicketId,
TCID: this.priceData.TCID,
LineId: this.PostConfig.LineId,
QAirTicketId:this.QAirTicketId,
QAirTicketId: this.QAirTicketId,
};
let that = this;
......
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