Skip to content

S
SuperMan
Commit 6d0d974c authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents a638bb17 0294e3b8
Show whitespace changes
Inline Side-by-side
Showing with 297 additions and 165 deletions
src/components/Ticketing/seatStatistics.vue
View file @ 6d0d974c
......@@ -75,14 +75,6 @@
text-align: center;
}
.seatStatistics .days li:nth-child(7n-1) p {
color: #e95252 !important;
}
.seatStatistics .days li:nth-child(7n) p {
color: #e95252 !important;
}
.seatStatistics .days {
width: 100%;
padding: 0;
......@@ -93,39 +85,7 @@
justify-content: space-around;
}
.seatStatistics .days>li {
list-style-type: none;
width: 14.2857%;
height: 140px;
text-align: center;
position: relative;
font-size: 12px;
float: left;
color: #000;
box-sizing: border-box;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
}
.seatStatistics .days li>div {
height: 112px;
width: 100%;
overflow-y: auto;
text-align: left;
}
.seatStatistics .days li>div>p {
border-bottom: 1px dashed #ccc;
height: 28px;
line-height: 28px;
width: 100%;
text-indent: 10px;
background: #fff;
}
.seatStatistics .days li>div>p:nth-child(2n) {
background: #f5f5f5;
}
.seatStatistics .currentInput {
width: 120px;
......@@ -216,6 +176,56 @@
margin: 20px 0;
}
.seatStatistics .flightTab {
border-collapse: collapse;
border: 1px solid #ddd
}
.seatStatistics .flightTab tr td,
.seatStatistics .flightTab tr th {
border: 1px solid #ddd
}
.seatStatistics .flightTab tr th {
margin: 0;
padding: 3px 0;
background-color: #3fa783;
width: 100%;
flex-wrap: wrap;
color: #fff;
}
.seatStatistics .flightTab tr td>div>p {
width: 100%;
padding-left: 3px;
font-size: 12px;
cursor: pointer;
}
.seatStatistics .flightTab tr td>div>p {
border-bottom: 1px dashed #ccc;
height: 28px;
line-height: 28px;
width: 100%;
text-indent: 10px;
background: #fff;
}
.seatStatistics .flightTab tr td>div>p:nth-child(2n) {
background: #f5f5f5;
}
.seatStatistics .flightTab tr td:nth-child(7n-6) p {
color: #e95252 !important;
}
.seatStatistics .flightTab tr td:nth-child(7n) p {
color: #e95252 !important;
}
/* 日期样式结束*/
</style>
......@@ -292,32 +302,63 @@
</li>
</ul>
</div>
<ul class="weekdays">
<li>{{$t('hotel.hotel_Monday')}}</li>
<li>{{$t('hotel.hotel_Tuesday')}}</li>
<li>{{$t('hotel.hotel_Wednesday')}}</li>
<li>{{$t('hotel.hotel_Thursday')}}</li>
<li>{{$t('hotel.hotel_Friday')}}</li>
<li class="weekendDay">{{$t('hotel.hotel_Saturday')}}</li>
<li class="weekendDay">{{$t('hotel.hotel_Sunday')}}</li>
</ul>
<ul class="days clearfix" v-loading="loading">
<li v-for="(dayobject,index) in days" :key="dayobject.index">
<p class="ckStyle" :class="{ckStyleOther:dayobject.day.getMonth()+1 != currentMonth}">
{{dayobject.day.getDate()}} ({{dayobject.TotalCount}})</p>
<table class="flightTab" style="table-layout: fixed; width: 100%;" v-loading="loading">
<tr>
<th width="15%">
{{$t('hotel.hotel_Sunday')}}
</th>
<th width="14%">
{{$t('hotel.hotel_Monday')}}
</th>
<th width="14%">
{{$t('hotel.hotel_Tuesday')}}
</th>
<th width="14%">
{{$t('hotel.hotel_Wednesday')}}
</th>
<th width="14%">
{{$t('hotel.hotel_Thursday')}}
</th>
<th width="14%">
{{$t('hotel.hotel_Friday')}}
</th>
<th width="15%">
{{$t('hotel.hotel_Saturday')}}
</th>
</tr>
<tbody v-for="(rItem,rIndex) in totalRows" :key="`d_`+rIndex">
<tr>
<template v-for="(cItem,cIndex) in ColCount">
<td style="vertical-align:top;" :key="`d_`+rIndex+`C_`+cIndex">
<template v-if="getDataObj(rIndex,cIndex)">
<p class="ckStyle" :class="{ckStyleOther:getDataObj(rIndex,cIndex).day.getMonth()+1 != currentMonth}">
{{getDataObj(rIndex,cIndex).day.getDate()}}
<template v-if="getDataObj(rIndex,cIndex)&&getDataObj(rIndex,cIndex).TotalCount">
({{getDataObj(rIndex,cIndex).TotalCount}})
</template>
</p>
<div class="ownScrollbarStyle">
<p class="over_ellipsis" v-for="item in dayobject.listArr" @click="goUrl('TicketManager',item,'票务管理')">
<p class="over_ellipsis" v-for="(item,index) in getDataObj(rIndex,cIndex).listArr"
:key="`d_`+rIndex+`C_`+cIndex+`I_`+index" @click="goUrl('TravelticketManager',item,'票务管理')">
{{item.AirLineTicketId}}
{{item.DepartureName}}
-
{{item.AlCode}}
-
{{item.InOut}}
<template v-if="item.OutBranchName&&item.OutBranchName!=''">
[{{ item.OutBranchName}}]
</template>
</p>
</div>
</li>
</ul>
</template>
</td>
</template>
</tr>
</tbody>
</table>
<br />
<br />
</div>
</template>
<script>
......@@ -355,9 +396,19 @@
loading: false,
//航空公司
AirlineList: [],
totalRows: 0, //总行数
ColCount: 7, //列数
};
},
methods: {
getDataObj(rowIndex, colIndex) {
var obj = {};
var newIndex = rowIndex * 7 + colIndex;
if (this.days && this.days.length > 0) {
obj = this.days[newIndex];
}
return obj;
},
//获取航空公司
getAirlineList() {
this.apipost(
......@@ -402,7 +453,7 @@
this.GetHoltelInventory();
},
initCalendar: function (cur) {
var newDays = this.$calendarUtils.createCalendar(cur);
var newDays = this.$calendarUtils.createCalendar_V2(cur);
this.currentDay = newDays.CurrentDay;
this.currentYear = newDays.CurrentYear;
this.currentMonth = newDays.CurrentMonth;
......@@ -415,6 +466,11 @@
dayobject.day = d;
this.days.push(dayobject);
}
if (this.days.length % 7 == 0) {
this.totalRows = this.days.length / 7
} else {
this.totalRows = parseInt(this.days.length / 7) + 1;
}
},
//点击左箭头切换年月
pickPre: function (year, month) {
......@@ -508,7 +564,6 @@
res => {
this.loading = false;
});
},
},
mounted() {
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 6d0d974c
......@@ -687,7 +687,8 @@
<li>
<span>
<em>{{$t('op.Procurement')}}</em>
<el-select class="w150" v-model="Query.PurchaseCreateBy" filterable :placeholder="$t('pub.pleaseSel')" clearable>
<el-select class="w150" v-model="Query.PurchaseCreateBy" filterable :placeholder="$t('pub.pleaseSel')"
clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0">
</el-option>
<el-option v-for="(item, index) in AllEmployeeList" :label="item.EmName" :value="item.EmployeeId"
......@@ -1189,6 +1190,11 @@
created() {
this.getCompanyList();
this.getAllEmployeeList();
if (this.$route.query) {
if (this.$route.query.id) {
this.Query.ID = this.$route.query.id
}
}
},
mounted() {
this.Query.QFlightDateStart = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ 6d0d974c
......@@ -329,16 +329,15 @@
<table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="50">{{$t('hotel.order_Number')}}</th>
<th width="95">{{$t('salesModule.ThirdOrderNum')}}</th>
<th width="100">{{$t('salesModule.ThirdOrderNum')}}</th>
<th width="190">{{$t('visa.v_tuanhao')}}</th>
<th>{{$t('hotel.hotel_roomnumber')}}</th>
<th>{{$t('hotel.hotel_Currency')}}</th>
<th>{{$t('sm.zonge')}}</th>
<th>{{$t('fnc.shishou')}}</th>
<th>{{$t('salesModule.BigBag')}}</th>
<th>{{$t('fnc.ptshuijin')}}</th>
<th>{{$t('sm.youhuijine')}}</th>
<th>{{$t('Operation.Op_daishou')}}</th>
<th>{{$t('hotel.hotel_OrderStates')}}</th>
<th>{{$t('fnc.cjshijian')}}</th>
<th>{{$t('op.RZLDR')}}</th>
......@@ -365,7 +364,7 @@
<td>{{item.CurrencyCode}}</td>
<td>{{item.TotalPrice}}</td>
<td>{{item.Income}}</td>
<td>{{item.RedEnvelopeMoney}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.DiscountMoney}}</td>
<td>{{item.DueinMoney}}</td>
<!-- <td>{{item.UpdateJapanese}}/{{item.totalChargeableRateInfoTaxOut}}</td>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 6d0d974c
......@@ -1381,15 +1381,7 @@
{{ $t("objFill.xilietxbm") }}
</el-dropdown-item>
</template>
<el-dropdown-item @click.native="
goTonowTeam(
'TravelManager',
item.ID,
item.TCID,
item.TCNUM,
item
)
">
<el-dropdown-item @click.native="goTonowTeam(item) ">
{{ $t("objFill.dangtuanxbm") }}
</el-dropdown-item>
</el-dropdown-menu>
......@@ -3293,28 +3285,53 @@
}
},
//当团修改
goTonowTeam(path, configId, tcid, TCNUM, item) {
if (configId > 0) {
this.$store.commit("pageConditionUpdate", this.queryMsg);
this.$router.push({
name: path,
query: {
configId: configId,
goTonowTeam(item) {
var that = this;
var path = 'TravelManager';
var ttMsg = {
configId: item.ID,
offerId: item.Config_OfferId,
openState: 1,
tcid: tcid,
TCNUM: TCNUM,
tcid: item.TCID,
TCNUM: item.TCNUM,
blank: "y",
tab: "团期配置",
};
if (item.RelationPriceList && item.RelationPriceList.length > 0) {
var tipMsg = "当前行程为系列团，你是否确定需要将当前团期进行独立维护并且不再与系列团关联？"
that.Confirm(tipMsg, function () {
that.queryCommonData.loading = true;
var dMsg = {
ConfigId: item.ID,
TCID: item.TCID
};
that.apipost(
"travel_post_SetTravelConfigChangeDT",
dMsg,
(res) => {
that.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
ttMsg.configId = res.data.data;
that.getControlList();
that.gotoUrl(path,ttMsg);
} else {
that.Error(res.data.message);
}
},
null
);
});
} else {
that.gotoUrl(path, ttMsg);
}
},
gotoUrl(path, query) {
this.$router.push({
name: path,
query: query
});
}
},
//删除团期
removeTeamInfo(TCID) {
var that = this;
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 6d0d974c
......@@ -975,7 +975,7 @@
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}</el-dropdown-item>
</template>
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,item.TCID,item)">
<el-dropdown-item @click.native="goTonowTeam(item)">
{{$t('Operation.Op_dangtuanModify')}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -2582,6 +2582,54 @@
});
}
},
//当团修改
goTonowTeam(item) {
var that = this;
var path = 'TravelManager';
var ttMsg = {
configId: item.ID,
offerId: item.Config_OfferId,
openState: 1,
tcid: item.TCID,
TCNUM: item.TCNUM,
blank: "y",
tab: "团期配置",
};
if (item.RelationPriceList && item.RelationPriceList.length > 0) {
var tipMsg = "当前行程为系列团，你是否确定需要将当前团期进行独立维护并且不再与系列团关联？"
that.Confirm(tipMsg, function () {
that.queryCommonData.loading = true;
var dMsg = {
ConfigId: item.ID,
TCID: item.TCID
};
that.apipost(
"travel_post_SetTravelConfigChangeDT",
dMsg,
(res) => {
that.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
ttMsg.configId = res.data.data;
that.getControlList();
that.gotoUrl(path, ttMsg);
} else {
that.Error(res.data.message);
}
},
null
);
});
} else {
that.gotoUrl(path, ttMsg);
}
},
gotoUrl(path, query) {
this.$router.push({
name: path,
query: query
});
},
//删除团期
removeTeamInfo(TCID) {
var that = this;
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 6d0d974c
......@@ -745,7 +745,7 @@
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
</template>
<el-dropdown-item @click.native="goTonowTeam('TravelManager',item.ID,item.TCID,item.TCNUM,item)">
<el-dropdown-item @click.native="goTonowTeam(item)">
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
</el-dropdown-menu>
......@@ -1834,7 +1834,6 @@
}
)
},
//验证大小
checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum)
......@@ -2000,7 +1999,6 @@
}
})
},
goUrl(path, id, name) {
this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({
......@@ -2101,30 +2099,53 @@
}
},
//当团修改
goTonowTeam(path, configId, tcid, TCNUM, item) {
if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({
name: path,
query: {
configId: configId,
goTonowTeam(item) {
var that = this;
var path = 'TravelManager';
var ttMsg = {
configId: item.ID,
offerId: item.Config_OfferId,
openState: 1,
tcid: tcid,
TCNUM: TCNUM,
blank: 'y',
tab: '团期配置',
flag: this.$route.query.flag ? this.$route.query.flag : false
tcid: item.TCID,
TCNUM: item.TCNUM,
blank: "y",
tab: "团期配置",
};
if (item.RelationPriceList && item.RelationPriceList.length > 0) {
var tipMsg = "当前行程为系列团，你是否确定需要将当前团期进行独立维护并且不再与系列团关联？"
that.Confirm(tipMsg, function () {
that.queryCommonData.loading = true;
var dMsg = {
ConfigId: item.ID,
TCID: item.TCID
};
that.apipost(
"travel_post_SetTravelConfigChangeDT",
dMsg,
(res) => {
that.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
ttMsg.configId = res.data.data;
that.getControlList();
that.gotoUrl(path, ttMsg);
} else {
that.Error(res.data.message);
}
})
},
null
);
});
} else {
this.$router.push({
name: path
})
that.gotoUrl(path, ttMsg);
}
},
gotoUrl(path, query) {
this.$router.push({
name: path,
query: query
});
},
//删除团期
removeTeamInfo(TCID) {
var that = this
......
src/components/administrative/ElectronicAudit.vue
View file @ 6d0d974c
......@@ -350,7 +350,7 @@
<template v-if="item.CType!=4">
<el-tooltip class="item" effect="dark" :content="$t('objFill.shenhetongguo')" placement="top-start"
v-if="item.Status==1">
<el-button type="primary" icon="iconfont icon-shenpi" circle @click="item.CType==4?showTongGuo(item,2):SubmitContract(item,2)">
<el-button type="primary" icon="iconfont icon-shenpi" circle @click="SubmitContract(item,2)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.bohui')" placement="top-start"
......@@ -528,10 +528,6 @@
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="closeContractDialog">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" type="primary" @click="!isBoHui?AuditElec():SubmitContract(BoHuiObj,auditMsg.AuditContract)">{{$t('pub.sureBtn')}}</button>
<!-- <template v-else>
<button class="hollowFixedBtn" type="" @click="showBoHui(BoHuiObj,3)">{{$t('fnc.bohui')}}</button>&nbsp;
<button class="normalBtn" type="primary" @click="showTongGuo(BoHuiObj,2)">{{$t('visa.v_tongguo')}}</button>
</template> -->
</div>
</el-dialog>
</div>
......@@ -730,6 +726,7 @@
},
//审核通过或者驳回
AuditElec() {
if(this.activeName==1){
this.apipost("travelcontract_get_UpdateAuditContractService", this.auditMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -739,6 +736,9 @@
this.Error(res.data.message);
}
}, null);
}else if(this.activeName==2){
this.SubmitContract(this.BoHuiObj, this.auditMsg.AuditContract)
}
},
//切换
getSwitch() {
......@@ -787,17 +787,9 @@
this.hetongTitle = `${this.$t('objFill.v101.administrative.hetongbohui')}`
this.BoHuiObj = JSON.parse(JSON.stringify(item));
this.auditMsg.AuditContract = status;
// this.isShowContract = true
this.isBoHui = 2;
// this.getContractInfor(item)
},
showTongGuo(item, status) {
this.hetongTitle = `${this.$t('objFill.v102.hetongtongguo')}`
this.BoHuiObj = JSON.parse(JSON.stringify(item));
this.auditMsg.AuditContract = status;
// this.isShowContract = true
this.isBoHui = 2
this.auditMsg.Id = item.ID;
this.isShowContract = true
this.isBoHui = 0;
// this.getContractInfor(item)
},
showshenghe(item) {
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 6d0d974c
......@@ -6,16 +6,18 @@
</span>
<span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
<span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
<span v-if="FeatureData.ConfigId&&dataAll.FeaturePageType&&FeatureData.FeatureType==9" class="foldList"
style="margin-right: 5px;" @click="journeyTemplate()">{{$t('objFill.v101.myOrdersAllType.bianjixc')}}</span>
<span style="color: red;float: right;margin-right: 5px;line-height: 28px;font-weight:bold;">
{{$t('objFill.v101.myOrdersAllType.xinfzdtqrx')}}</span>
<template v-if="FeatureData.ConfigId&&FeatureData.FeatureType==9">
<span v-if="dataAll.FeaturePageType" class="foldList" style="margin-right: 5px;"
@click="journeyTemplate()">{{$t('objFill.v101.myOrdersAllType.bianjixc')}}</span>
<font v-else style="margin-right:5px;color:red;float:right;padding-top:5px;font-weight:bold;">
请选择 线路行程=>版型
</font>
</template>
<div class="TrfList clearfix">
<template v-for="item in TypeArray">
<div class="TFslide"
:class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode">
<!--v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)"-->
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
</div>
......@@ -202,14 +204,6 @@
<iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;"
:style="{'height':myIframeHeigth+'px'}">
</iframe>
<!-- <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
<template v-for="url in FeatureData.TripImageListNew">
<el-image
style="width: 100%; height: auto"
:src="url"
:preview-src-list="FeatureData.TripImageListNew"></el-image>
</template>
</div> -->
<div v-show="PostMessageText=='暂无行程数据'"
style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">
{{$t('objFill.v101.myOrdersAllType.zanwusjysjbjssb')}}</div>
......
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