Skip to content

S
SuperMan
Commit 93aca069 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent f0106663
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 93 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 93aca069
......@@ -2236,26 +2236,19 @@
</div>
<p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}
</p>
<template v-if="item.orderUnionFlightList&&item.orderUnionFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderUnionFlightList">
<div v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)"
:key="uIndex">
联运信息：<span style="color: red">已配联运{{uItem.configNum}}人,{{uItem.airticketUnionNotes}}
<template v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderGuestFlightList">
<div :key="uIndex+20000">
{{uItem.guestNames}} 航班信息：
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
</span>
<template v-if="uItem.flightName&&uItem.flightName.id">
<br />
<span style="color:blue;">去程:
{{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}}
{{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}}
{{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span>
</template>
<template v-if="uItem.backFlightName&&uItem.backFlightName.id">
<br />
<span style="color:blue;">回程:
{{uItem.backFlightName.startDateStr}} {{uItem.backFlightName.flight_number}}
{{uItem.backFlightName.departureTime}}-{{uItem.backFlightName.arrivalTime}}
{{uItem.backFlightName.dName}}-{{uItem.backFlightName.aName}}</span>
<template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
<span style="color:blue;" :key="sfIndex+30000">
{{sfItem.flightDateStr}} {{sfItem.flight_number}}
{{sfItem.departure_time}}-{{sfItem.arrival_time}}
{{sfItem.departureName}} ({{sfItem.diata}})-{{sfItem.arrivalCityName}}({{sfItem.aiata}})
</span>
<br :key="sfIndex+40000" />
</template>
</div>
</template>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 93aca069
......@@ -2436,28 +2436,20 @@
<div v-if="item.unionRemark" style="color: red">
<span>联运备注：{{ item.unionRemark }}</span>
</div>
<template v-if="item.orderUnionFlightList&&item.orderUnionFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderUnionFlightList">
<div
v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)"
:key="uIndex">
联运信息：<span style="color: red">已配联运{{uItem.configNum}}人,{{uItem.airticketUnionNotes}}
<template v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderGuestFlightList">
<div :key="uIndex+20000">
{{uItem.guestNames}} 航班信息：
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【暂定】</span>
</span>
<template v-if="uItem.flightName&&uItem.flightName.id">
<br />
<span style="color:blue;">去程:
{{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}}
{{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}}
{{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span>
</template>
<template v-if="uItem.backFlightName&&uItem.backFlightName.id">
<br />
<span style="color:blue;">回程:
{{uItem.backFlightName.startDateStr}} {{uItem.backFlightName.flight_number}}
{{uItem.backFlightName.departureTime}}-{{uItem.backFlightName.arrivalTime}}
{{uItem.backFlightName.dName}}-{{uItem.backFlightName.aName}}</span>
<template v-for="(sfItem,sfIndex) in uItem.guestFlightList">
<span style="color:blue;" :key="sfIndex+30000">
{{sfItem.flightDateStr}} {{sfItem.flight_number}}
{{sfItem.departure_time}}-{{sfItem.arrival_time}}
{{sfItem.departureName}} ({{sfItem.diata}})-{{sfItem.arrivalCityName}}({{sfItem.aiata}})
</span>
<br :key="sfIndex+40000" />
</template>
</div>
</template>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 93aca069
......@@ -1792,19 +1792,14 @@
<tr>
<th width="260">{{ $t("fnc.danhao") }}</th>
<th width="150">{{ $t("fnc.khxinxi") }}</th>
<th width="70" class="nowrap">
{{ $t("admin.admin_personNumber") }}/{{ $t("salesModule.AirNum") }}
</th>
<th width="70" class="nowrap"> {{ $t("admin.admin_personNumber") }}/{{ $t("salesModule.AirNum") }}</th>
<th width="110" class="nowrap">{{ $t("fnc.danjia") }}</th>
<th width="110" class="nowrap">{{ $t("fnc.cjdanjia") }}</th>
<th width="110" class="nowrap">{{ $t("fnc.yszonge") }}</th>
<th width="110" class="nowrap">{{ $t("fnc.shishou") }}</th>
<th width="110" class="nowrap">人头小费</th>
<th width="90" class="nowrap">{{ $t("fnc.youhui") }}</th>
<th width="90" class="nowrap">
{{ $t("salesModule.HappinessPassbook") }}
</th>
<th width="90" class="nowrap"> {{ $t("salesModule.HappinessPassbook") }} </th>
<th width="90" class="nowrap">{{ $t("fnc.tuikuan") }}</th>
<th width="90" class="nowrap">{{ $t("fnc.ptshuijin") }}</th>
<th width="110" class="nowrap">{{ $t("Operation.Op_platZaitu") }}</th>
......@@ -1818,14 +1813,9 @@
{{ $t("system.content_noData") }}
</td>
</tr>
<tr v-if="
OrderDataList.leadetList != null &&
OrderDataList.leadetList.length > 0
">
<tr v-if=" OrderDataList.leadetList != null &&OrderDataList.leadetList.length > 0 ">
<td colspan="17">
{{ $t("active.cl_orderType") }}：<span class="RL-redType">{{
$t("leader.leader_Leader")
}}</span>
{{ $t("active.cl_orderType") }}：<span class="RL-redType">{{ $t("leader.leader_Leader") }}</span>
</td>
</tr>
<tbody v-for="(item, index) in OrderDataList.leadetList" :key="index">
......@@ -1993,16 +1983,12 @@
<td>{{ item.PlatformTax }}</td>
<td>{{ item.ZaiTuMoney }}</td>
<td>
<span :class="{
color_red_order: item.DueInMoney && item.DueInMoney > 0,
}">{{ item.DueInMoney }}</span>
<span :class="{color_red_order: item.DueInMoney && item.DueInMoney > 0, }">{{ item.DueInMoney }}</span>
</td>
<td class="fz12">
<span :class="{ 'RL-redType': item.statsstr == '候补' }">{{
item.statsstr
}}</span>
<span :class="{ 'RL-redType': item.statsstr == '候补' }">{{item.statsstr}}</span>
</td>
<td></td>
<td>111</td>
<td class="RL-BTNlist" rowspan="2">
<el-button-group v-if="isShow === true">
<el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')" placement="top-start">
......@@ -2130,7 +2116,7 @@
</td>
</tr>
<tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px">
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px">
<div v-if="item.gatherAddress" style="font-size: 14px">
<span style="color: rgb(26, 168, 107)">集合地：</span>
<span style="color: rgb(26, 168, 107)">{{item.gatherAddress}}</span>
......@@ -2148,7 +2134,9 @@
</div>
</div>
</td>
<td colspan="6" class="groupTourOrder_remarks" style="height: 40px">
<td colspan="3">
</td>
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px">
<div class="clearfix RL-MARK">
<span class="RL-opremarkTitle">{{ $t("Operation.Op_remark") }}:</span>
<p class="RL-redType RL-remarkCon">
......@@ -2156,7 +2144,11 @@
</p>
</div>
</td>
<td colspan="5" style="height:40px;cursor:pointer">
<td colspan="2">
</td>
<td colspan="2">
</td>
<td colspan="3" style="height:40px;cursor:pointer">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span>收款单据：</span>
<span v-for="(item2, index2) in item.FinanceList" :key="index2">
......@@ -2660,7 +2652,7 @@
</td>
</tr>
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px">
<div v-if="childItem.GatherAddress" style="font-size: 14px">
<span style="color: rgb(26, 168, 107)">集合地：</span>
<span style="color: rgb(26, 168, 107)">{{
......@@ -2692,12 +2684,16 @@
{{childItem.Remarks }}
</p>
</div>
</div>
</td>
<td colspan="3">
<div>
<div v-if="childItem.UnionRemark">
联运备注：<span style="color: red">{{
childItem.UnionRemark
}}</span>
</div>
<template v-if="childItem.OrderUnionFlightList&&childItem.OrderUnionFlightList.length>0">
<!-- <template v-if="childItem.OrderUnionFlightList&&childItem.OrderUnionFlightList.length>0">
<template v-for="(uItem,uIndex) in childItem.OrderUnionFlightList">
<div
v-if="(uItem.FlightName&&uItem.FlightName.ID)||(uItem.BackFlightName&&uItem.BackFlightName.ID)"
......@@ -2722,8 +2718,30 @@
</template>
</div>
</template>
</template> -->
<template v-if="childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>0">
<template v-for="(uItem,uIndex) in childItem.OrderGuestFlightList">
<div :key="uIndex+20000">
{{uItem.GuestNames}} 航班信息：
<span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【暂定】</span>
<br />
<template v-for="(sfItem,sfIndex) in uItem.GuestFlightList">
<span style="color:blue;" :key="sfIndex+30000">
{{sfItem.FlightDateStr}} {{sfItem.Flight_number}}
{{sfItem.Departure_time}}-{{sfItem.Arrival_time}}
{{sfItem.DepartureName}} ({{sfItem.DIATA}})-{{sfItem.ArrivalCityName}}({{sfItem.AIATA}})
</span>
<br :key="sfIndex+40000" />
</template>
</div>
</template>
</template>
</div>
<div style="float: right">
<input type="button" value="设置联运" class="normalBtn"
style="display: block; padding: 0 15px; height: 25px" @click="ShowOrderUnion(childItem)" />
</div>
</td>
<td colspan="3" style="height: 40px">
<div class="clearfix RL-MARK" style="width: 100%; float: left">
......@@ -2760,7 +2778,7 @@
</div>
</div>
</td>
<td colspan="3">
<td colspan="2">
<template v-if="isShow == true">
<div style="float: right" v-if="childItem.IsCanClear == 0">
<input type="button" :value="$t('ground.qrendindan')" class="rgsureBtn"
......@@ -2809,7 +2827,7 @@
审批说明：<span>{{ childItem.OrderspecialofferReason }}</span>
</div>
</td>
<td colspan="4" style="height: 40px; cursor: pointer">
<td colspan="3" style="height: 40px; cursor: pointer">
<div @click="
goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)
">
......@@ -2935,10 +2953,7 @@
</tbody>
<!-- 取消订单 -->
<tr v-if="
OrderDataList.cancelList != null &&
OrderDataList.cancelList.length > 0
">
<tr v-if="OrderDataList.cancelList!= null&&OrderDataList.cancelList.length > 0">
<td colspan="17">
<span class="RL-redType" @click="isShowCancelOrder = !isShowCancelOrder" style="cursor: pointer"
title="点击查看">{{ $t("sm.exitOrder") }}（<span style="color: blue">{{
......@@ -3100,16 +3115,12 @@
<td>{{ item.PlatformTax }}</td>
<td>{{ item.ZaiTuMoney }}</td>
<td>
<span :class="{
color_red_order: item.DueInMoney && item.DueInMoney > 0,
}">{{ item.DueInMoney }}</span>
<span :class="{color_red_order: item.DueInMoney && item.DueInMoney > 0,}">{{ item.DueInMoney }}</span>
</td>
<td class="fz12" colspan="3">
<span class="RL-redType">{{ item.statsstr }}</span>
<br />
<span class="RL-redType" v-if="item.OrderCancelDate != ''">{{
item.OrderCancelDate
}}</span>
<span class="RL-redType" v-if="item.OrderCancelDate != ''">{{ item.OrderCancelDate}}</span>
</td>
<td class="RL-BTNlist" rowspan="2">
<!--恢复订单-->
......@@ -3239,7 +3250,7 @@
</td>
</tr>
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">{{ $t("pub.pubRemark") }}:</span>
<span class="RL-redType RL-remarkCon">
......@@ -3250,7 +3261,9 @@
</span>
</div>
</td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<td colspan="3">
</td>
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px">
<div class="clearfix RL-MARK">
<span class="RL-opremarkTitle">{{ $t("Operation.Op_remark") }}:</span>
<span class="RL-redType RL-remarkCon">{{
......@@ -3258,7 +3271,7 @@
}}</span>
</div>
</td>
<td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<td colspan="2" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
<div>
特价申请函:
<template v-if="item.OrderspecialofferId === 0">
......@@ -3277,6 +3290,8 @@
审批说明：<span>{{ item.OrderspecialofferReason }}</span>
</div>
</td>
<td colspan="2">
</td>
<td colspan="4" style="height: 40px; cursor: pointer"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
......@@ -3800,6 +3815,11 @@
<el-dialog width="350px" title="编辑小费" :visible.sync="isShowTip" center>
<EditTip :TipObj="TipObj" @close="isShowTip = false" @success="(isShowTip = false), getList()"></EditTip>
</el-dialog>
<div v-if="isShowOrderTicket">
<el-dialog width="600px" title="设置联运" :visible.sync="isShowOrderTicket">
<orderTicketUnion :orderInfo="orderTicketInfo" @close="closeDialog" @success="refreshPage"></orderTicketUnion>
</el-dialog>
</div>
</div>
</template>
......@@ -3808,6 +3828,7 @@
import updateSalesMan from "../../commonPage/updateSalesMan.vue";
import commonShouSun from "../../commonPage/commonShouSun.vue";
import EditTip from "../../SalesModule/Common/EditTip.vue";
import orderTicketUnion from '../../commonPage/orderTicketUnion.vue';
export default {
data() {
return {
......@@ -4247,6 +4268,12 @@
},
MiniAppUserId: 0,
MyIsChargeLossOrders: 0,
isShowOrderTicket: false, //是否显示设置机票联运弹窗
//订单机票联运信息
orderTicketInfo: {
TCID: 0,
OrderId: 0,
},
};
},
components: {
......@@ -4254,6 +4281,7 @@
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
commonShouSun: commonShouSun,
orderTicketUnion: orderTicketUnion,
},
filters: {
priceFormat(value) {
......@@ -4271,8 +4299,22 @@
return x1 + x2;
},
},
methods: {
//显示订单联运信息
ShowOrderUnion(item) {
this.orderTicketInfo.TCID = item.TCID;
this.orderTicketInfo.OrderId = item.OrderId;
this.isShowOrderTicket = true;
},
//关闭弹窗
closeDialog() {
this.isShowOrderTicket = false;
},
//刷新页面
refreshPage() {
this.isShowOrderTicket = false;
this.getList();
},
clickEditTip(item) {
this.isShowTip = true;
this.TipObj = JSON.parse(JSON.stringify(item));
......@@ -5944,6 +5986,7 @@
"sellorder_get_GetOrderListByTCID",
msg,
(res) => {
console.log("sellorder_get_GetOrderListByTCID", res.data);
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data;
......@@ -6240,7 +6283,6 @@
this.transferData.info.OldTCID = item.TCID;
this.transferData.info.OldTCNUM = item.TCNUM;
this.transferData.info.TCNUM = "";
this.isShowLayer = false;
this.isShowLayerRemarks = false;
this.transferData.show = true;
......@@ -6671,12 +6713,6 @@
previewFileFJ(e) {
window.open(this.addMsg.QuotationUrl, "_blank");
return;
const link = document.createElement("a");
let _loadUrl = this.domainManager().DomainUrl;
let str = window.location.href;
link.href = this.addMsg.QuotationUrl;
document.body.appendChild(link);
link.click();
},
//上传文件-报价单
uploadFileBtnFJ(file) {
......
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