Skip to content

S
SuperMan
Commit 52159eb8 authored by 吴春's avatar 吴春
Browse files
Options

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

parents cb0c2686 317923e2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 311 additions and 68 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 52159eb8
...@@ -1070,6 +1070,7 @@ ...@@ -1070,6 +1070,7 @@
} }
} }
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => { this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
console.log("roomdataList",res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation; this.IsOperation = res.data.data.IsOperation;
if (this.IsEditHotel == 0) { if (this.IsEditHotel == 0) {
......
src/components/SalesModule/addPassenger.vue
View file @ 52159eb8
...@@ -1863,6 +1863,9 @@ ...@@ -1863,6 +1863,9 @@
this.addMsg.TCID = this.$route.query.TCID; this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId; this.addMsg.OrderId = this.$route.query.orderId;
this.Roominformation() //调取下房间信息 this.Roominformation() //调取下房间信息
this.Transformation(this.addMsg.SurName,'SurName',1)
this.Transformation(this.addMsg.Name,'Name',2)
} }
}, },
err => {} err => {}
......
src/components/SalesModule/productQuery2.vue
View file @ 52159eb8
...@@ -238,7 +238,8 @@ ...@@ -238,7 +238,8 @@
<li> <li>
<span><em>{{ $t("scen.sc_cp") }}</em> <span><em>{{ $t("scen.sc_cp") }}</em>
<!--台湾印象只能看自公司的 不能切换 HK 2023-10-26 添加--> <!--台湾印象只能看自公司的 不能切换 HK 2023-10-26 添加-->
<el-select class="w150" v-model="msg.BranchId" filterable :disabled="CurrentUserInfo.RB_Branch_id==1220" :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="msg.BranchId" filterable :disabled="CurrentUserInfo.RB_Branch_id==1220"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id"> <el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -290,10 +291,10 @@ ...@@ -290,10 +291,10 @@
<span><em>{{ $t("hotel.hotel_StarDate") }}</em> <span><em>{{ $t("hotel.hotel_StarDate") }}</em>
<!-- <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" <!-- <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> --> type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime" @change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit> <DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime"
@change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit>
- -
<el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" <el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" type="date"
type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker> :picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
...@@ -638,9 +639,11 @@ ...@@ -638,9 +639,11 @@
Id: "", Id: "",
BName: "", BName: "",
}; };
if (x.Id != 1248 && x.Id != 1255 && x.Id != 1256 && x.Id != 1256 && x.Id != 1258) {
obj.Id = x.Id.toString(); obj.Id = x.Id.toString();
obj.BName = x.BName; obj.BName = x.BName;
this.companyList.push(obj); this.companyList.push(obj);
}
}); });
} }
}, },
......
src/components/Ticketing/TicketManager.vue
View file @ 52159eb8
This diff is collapsed.
src/components/Ticketing/ticketSpider.vue
View file @ 52159eb8
...@@ -297,7 +297,6 @@ ...@@ -297,7 +297,6 @@
}, },
created() { created() {
this.getCompanyList(); this.getCompanyList();
//this.GetLineList();
this.initAirlines(); this.initAirlines();
this.getCondition(); this.getCondition();
if (this.$route.query) { if (this.$route.query) {
...@@ -305,9 +304,17 @@ ...@@ -305,9 +304,17 @@
this.msg.AirticketId = this.$route.query.AirticketId; this.msg.AirticketId = this.$route.query.AirticketId;
} }
} }
let myDate = new Date();
myDate.setDate(myDate.getDate());
let nowDate =
myDate.getFullYear() +
"-" +
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
this.msg.QStartDate = nowDate;
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.getDataList(); this.getDataList();
} }
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 52159eb8
...@@ -1173,42 +1173,84 @@ ...@@ -1173,42 +1173,84 @@
<div class="TC_SeatList" v-if="item.BindNum > 0" style="color: red"> <div class="TC_SeatList" v-if="item.BindNum > 0" style="color: red">
{{ $t("Operation.Op_bindNum") }}: {{ item.BindNum }} {{ $t("Operation.Op_bindNum") }}: {{ item.BindNum }}
</div> </div>
<el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table>
<template v-for="(subItem,subIndex) in item.TicketList">
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':''}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
</template>
</template>
</template>
</table>
<div class="TC_SeatList" v-if="item.NoBindNum > 0"
style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
尚未绑定: {{ item.NoBindNum }}
</div>
</el-popover>
<div class="TC_SeatList" v-if="item.TicketNum > 0 && item.TicketList"> <div class="TC_SeatList" v-if="item.TicketNum > 0 && item.TicketList">
<el-popover width="700" trigger="click"> <el-popover width="700" trigger="click">
<table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="145" style="text-align: center"> <th width="185" style="text-align: center">
团号 团号/{{ $t("Operation.Op_bindNum") }}
</th> </th>
<th width="90" style="text-align: center"> <th width="75" style="text-align: center">
{{ $t("Operation.Op_bindNum") }} 总机位
</th> </th>
<th width="90" style="text-align: center"> <th width="65" style="text-align: center">
{{ $t("op.TicketNum") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_price") }} {{ $t("Operation.Op_price") }}
</th> </th>
<th width="80" style="text-align: center"> <th width="65" style="text-align: center">
{{ $t('Airticket.Air_TicketType') }} {{ $t('Airticket.Air_TicketType') }}
</th> </th>
<th width="80" style="text-align: center"> <th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketDeadLine') }} {{ $t('Airticket.Air_TicketDeadLine') }}
</th> </th>
<th width="100" style="text-align: center"> <th width="80" style="text-align: center">
{{ $t("op.Tickets") }} {{ $t("op.Tickets") }}
</th> </th>
</tr> </tr>
<tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex"> <tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tr> <tr>
<td style="text-align: center"> <td style="text-align: center">
<a style="color:blue;text-decoration:underline;cursor:pointer;" @click="gotoTCList(subItem)"> <template v-for="(thirdItem,thirdIndex) in subItem.SubList">
{{ subItem.TCNUM }}<br/> <br v-if="thirdIndex!=0" />
({{subItem.TCID}}) <span style="color:blue;text-decoration:underline;cursor:pointer;"
</a> @click="gotoTCList(thirdItem)">
{{ thirdItem.TCNUM }}
({{thirdItem.TCID}})&nbsp;绑定:
{{ thirdItem.BindNum }}
</span>
</template>
</td>
<td style="text-align: center">{{ subItem.TicketNum }}
<template v-if="subItem.ChangeNum!=0">
<el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table>
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':''}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
</template>
</template>
</table>
<font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
</el-popover>
</template>
</td> </td>
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td> <td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center"> <td style="text-align: center">
<template v-if="subItem.TravelTicketType==1"> <template v-if="subItem.TravelTicketType==1">
...@@ -1586,7 +1628,6 @@ ...@@ -1586,7 +1628,6 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="ckOPInfo(item)">{{ $t("objFill.v101.qianzopshez") }} <el-dropdown-item @click.native="ckOPInfo(item)">{{ $t("objFill.v101.qianzopshez") }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="CopyTripAndFeature(item, 1)">{{ $t("objFill.v101.fuzhixingc") }} <el-dropdown-item @click.native="CopyTripAndFeature(item, 1)">{{ $t("objFill.v101.fuzhixingc") }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="CopyTripAndFeature(item, 2)"> <el-dropdown-item @click.native="CopyTripAndFeature(item, 2)">
...@@ -1681,6 +1722,15 @@ ...@@ -1681,6 +1722,15 @@
<template v-else-if="subItem.TravelTicketType==3"> <template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font> <font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template> </template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font>
<template v-if="subItem.ChangeNum!=0">
<font style="font-weight:bold;">{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}={{item.TicketNum}}</font>
</template>
;
<template v-for="thirdItem in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;">
{{thirdItem.BindNum}}</font>,
</template>
{{subItem.TicketOpRemark}} {{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】 【{{subItem.TicketCreateByName}}】
</font> </font>
...@@ -1688,7 +1738,6 @@ ...@@ -1688,7 +1738,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.BranchAuditState > 0"> <div class="TC_remarkContent" v-if="item.BranchAuditState > 0">
<div class="clearfix TCL-redType"> <div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto"> <div class="TCL_remarkTitle" style="width: auto">
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 52159eb8
...@@ -778,42 +778,84 @@ ...@@ -778,42 +778,84 @@
<div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
<div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}: <div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}:
{{item.BindNum}}</div> {{item.BindNum}}</div>
<div class="TC_SeatList" v-if="item.TicketNum>0 && item.TicketList"> <el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table>
<template v-for="(subItem,subIndex) in item.TicketList">
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
</template>
</template>
</template>
</table>
<div class="TC_SeatList" v-if="item.NoBindNum > 0"
style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
尚未绑定: {{ item.NoBindNum }}
</div>
</el-popover>
<div class="TC_SeatList" v-if="item.TicketNum > 0 && item.TicketList">
<el-popover width="700" trigger="click"> <el-popover width="700" trigger="click">
<table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="145" style="text-align: center"> <th width="185" style="text-align: center">
团号 团号/{{ $t("Operation.Op_bindNum") }}
</th> </th>
<th width="90" style="text-align: center"> <th width="75" style="text-align: center">
{{ $t("Operation.Op_bindNum") }} 总机位
</th> </th>
<th width="90" style="text-align: center"> <th width="65" style="text-align: center">
{{ $t("op.TicketNum") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_price") }} {{ $t("Operation.Op_price") }}
</th> </th>
<th width="80" style="text-align: center"> <th width="65" style="text-align: center">
{{ $t('Airticket.Air_TicketType') }} {{ $t('Airticket.Air_TicketType') }}
</th> </th>
<th width="80" style="text-align: center"> <th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketDeadLine') }} {{ $t('Airticket.Air_TicketDeadLine') }}
</th> </th>
<th width="100" style="text-align: center"> <th width="80" style="text-align: center">
{{ $t("op.Tickets") }} {{ $t("op.Tickets") }}
</th> </th>
</tr> </tr>
<tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex"> <tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tr> <tr>
<td style="text-align: center"> <td style="text-align: center">
<a style="color:blue;text-decoration:underline;cursor:pointer;" @click="gotoTCList(subItem)"> <template v-for="(thirdItem,thirdIndex) in subItem.SubList">
{{ subItem.TCNUM }}<br/> <br v-if="thirdIndex!=0" />
({{subItem.TCID}}) <span style="color:blue;text-decoration:underline;cursor:pointer;"
</a> @click="gotoTCList(thirdItem)">
{{ thirdItem.TCNUM }}
({{thirdItem.TCID}})&nbsp;绑定:
{{ thirdItem.BindNum }}
</span>
</template>
</td>
<td style="text-align: center">{{ subItem.TicketNum }}
<template v-if="subItem.ChangeNum!=0">
<el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table>
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
</template>
</template>
</table>
<font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
</el-popover>
</template>
</td> </td>
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td> <td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center"> <td style="text-align: center">
<template v-if="subItem.TravelTicketType==1"> <template v-if="subItem.TravelTicketType==1">
...@@ -1183,6 +1225,15 @@ ...@@ -1183,6 +1225,15 @@
<template v-else-if="subItem.TravelTicketType==3"> <template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font> <font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template> </template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font>
<template v-if="subItem.ChangeNum!=0">
<font style="font-weight:bold;">{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}={{item.TicketNum}}</font>
</template>
;
<template v-for="thirdItem in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;">
{{thirdItem.BindNum}}</font>,
</template>
{{subItem.TicketOpRemark}} {{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】 【{{subItem.TicketCreateByName}}】
</font> </font>
......
src/components/orderCommon/productOrderList.vue
View file @ 52159eb8
...@@ -1001,8 +1001,42 @@ ...@@ -1001,8 +1001,42 @@
" slot="reference">{{ $t("Operation.Op_bentuanMaidian") }}</span> " slot="reference">{{ $t("Operation.Op_bentuanMaidian") }}</span>
</el-popover> </el-popover>
</template> </template>
<p>{{ $t("Operation.Op_remark") }}:</p> <p>{{ $t("Operation.Op_remark") }}:</p>
<p :title="item.OpRemark">{{ item.OpRemark }}</p> <p :title="item.OpRemark">{{ item.OpRemark }}</p>
<template v-if="item.TicketList&&item.TicketList.length>0">
<br/>
<p>票务备注：</p>
<p>
<template v-for="(subItem,subIndex) in item.TicketList">
<font :key="`p_`+subIndex">
<template v-if="subItem.TravelTicketType==1">
<font style="color:#47BF8C;"> {{$t('objFill.v101.tuanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==2">
<font style="color:blue;"> {{$t('objFill.v101.shanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font>
<template v-if="subItem.ChangeNum!=0">
<font style="font-weight:bold;">
{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}={{item.TicketNum}}</font>
</template>
;
<template v-for="thirdItem in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;">
{{thirdItem.BindNum}}</font>,
</template>
{{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】
</font>
</template>
</p>
</template>
</div> </div>
</li> </li>
</ul> </ul>
...@@ -1203,7 +1237,7 @@ ...@@ -1203,7 +1237,7 @@
var that = this; var that = this;
this.tripTitle = title; this.tripTitle = title;
this.$nextTick(() => { this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id, TCID,2); that.$refs.comTeam.GetTrip(id, TCID, 2);
}); });
that.outerVisible = true; that.outerVisible = true;
}, },
......
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