Skip to content

S
SuperMan
Commit 6a5ca6d2 authored by 黄奎's avatar 黄奎
Browse files
Options

111

parent 7f283a70
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 592 additions and 289 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 6a5ca6d2
......@@ -2147,8 +2147,10 @@
<span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span v-if="childItem.isApplyPhoto == 1" style="color: red">({{ $t("salesModule.Zhao") }})</span>
<span style="cursor:pointer;" @click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
<span v-if="isShow===index||childItem.disclaimerId>0" style="cursor:pointer;" @click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>0?"查看参团免责承诺函":"签订参团免责承诺函"}}</span>
<span style="cursor:pointer;"
@click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
<span v-if="isShow===index||childItem.disclaimerId>0" style="cursor:pointer;"
@click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>0?"查看参团免责承诺函":"签订参团免责承诺函"}}</span>
&nbsp;&nbsp;
</span>
<span v-if="item.photoNum > 0">（{{ $t("salesModule.NoPhoto") }} {{ item.photoNum
......@@ -2164,8 +2166,9 @@
</p>
<span style="display: block">{{ $t("salesModule.RoomInfo")
}}<span v-if="item.oneSex > 0"
style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span><span v-if="item.chirdNoNeedBedNum > 0"
style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人 ）</span>：{{ item.orderGuestHouseStr }}</span>
style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span><span
v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人
）</span>：{{ item.orderGuestHouseStr }}</span>
<div>
......@@ -2182,10 +2185,10 @@
</span>
</div>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" >
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)">
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span>
</div>
</div>
<div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
<span class="GO_Contract"
@click="goSingleContract(item)">{{item.otherContractList.length==0?"单项合同":"查看单项合同"}}</span>
......@@ -2270,7 +2273,8 @@
style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
</a> -->
<a v-if="(item.orderGuestFlightList&&item.orderGuestFlightList.length>1&&item.outNotice == 1)||(uItem.ticketUnionId&&uItem.ticketUnionId>0)" @click="toTrip(item,uItem.ticketUnionId,uItem.guestIds)"
<a v-if="(item.orderGuestFlightList&&item.orderGuestFlightList.length>1&&item.outNotice == 1)||(uItem.ticketUnionId&&uItem.ticketUnionId>0)"
@click="toTrip(item,uItem.ticketUnionId,uItem.guestIds)"
style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
</a>
......@@ -2315,27 +2319,29 @@
</div>
</td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div >
<div>
<div>{{ $t("fnc.skdanju") }}：</div>
<div>
<span v-for="(item2, index2) in item.financeList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-for="(item2, index2) in item.financeList" :key="index2"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 3" class="groupTourOrder_tickets_red">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</span>
<span v-if="item.financeList.length === 0"
style="cursor: default">{{ $t("system.content_noData") }}</span>
</div>
</div>
<div >
<div>
<div>{{ $t("fnc.fkdanju") }}：</div>
<div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
......@@ -2489,7 +2495,7 @@
export default {
data() {
return {
isShow:'',
isShow: '',
pagesTitle: '跟团游订单',
SpecialAppShow: false,
SpecialAppMsg: {
......@@ -2525,7 +2531,7 @@
cityId: 0,
orderId: 0,
unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
GuestIds:'',
GuestIds: '',
},
userId: "",
customerId: "",
......@@ -2832,13 +2838,13 @@
},
},
methods: {
showMore(item,index){
if (this.isShow===index){
this.isShow=''
}else{
this.isShow= index;
}
},
showMore(item, index) {
if (this.isShow === index) {
this.isShow = ''
} else {
this.isShow = index;
}
},
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
......@@ -3007,8 +3013,8 @@
window.open(routeData.href, "_blank");
},
//跳转到老人/孕妇免责协议
goDisclaimer(item, sItem) {
//跳转到老人/孕妇免责协议
goDisclaimer(item, sItem) {
let ProtocolId = 0;
let guestId = 0;
var path = "disclaimerProtocol";
......@@ -3252,19 +3258,17 @@
);
}
},
toTrip: function (obj, TicketUnionId,GuestIds) {
toTrip: function (obj, TicketUnionId, GuestIds) {
this.tripObj.tcid = obj.tcid;
this.tripObj.configId = obj.configId;
this.tripObj.orderId = obj.orderId;
this.tripObj.cityId = obj.startCityId;
this.tripObj.GuestIds =GuestIds;
this.tripObj.unionfid =0;
this.tripObj.GuestIds = GuestIds;
this.tripObj.unionfid = 0;
if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId;
}
this.travelControlTripLayerShow = true;
console.log("this.tripObj",this.tripObj);
},
hideTripDown() {
this.travelControlTripLayerShow = false;
......@@ -4099,11 +4103,11 @@
this.addObj.ChildNoNeedPrice *
(Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum));
let lianyun =0;
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice));
let lianyun = 0;
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice));
let dandijie;
if (this.addMsg.GroupType == 4) {
......@@ -4166,11 +4170,11 @@
this.addObj.ChildNoNeedPrice *
(Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum));
let lianyun =0;
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice));
let lianyun = 0;
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice));
let dandijie;
if (this.addMsg.GroupType == 4) {
dandijie =
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 6a5ca6d2
......@@ -1234,12 +1234,16 @@
</div>
</div>
<div class="TC_remarkContent"
v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark||item.ProductRecommend">
<div class="clearfix TCL-redType"
v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
<div class="TCL_remarkTitle">驳回缘由：</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</div>
<div class="clearfix TCL-redType" v-if="item.ProductRecommend">
<div class="TCL_remarkTitle">{{$t('Operation.Op_bentuanMaidian')}}：</div>
<div class="TCL_Content">{{item.ProductRecommend}}</div>
</div>
<div class="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>
<div class="TCL_Content">{{item.OPRemark}}</div>
......@@ -2695,7 +2699,6 @@
this.VisaOPMsg.VisaShow = true;
this.VisaOPMsg.VisaId = item.VisaOPId == 0 ? '' : item.VisaOPId;
this.VisaOPMsg.VisaAssistId = '';
// this.VisaOPMsg.VisaAssistId = item.VisaAssistantId;
this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId && item.VisaAssistantId.length > 0) ? item.VisaAssistantId
.split(",").map((item) => Number(item)) : [];
this.VisaOPMsg.TCID = item.TCID;
......@@ -2704,7 +2707,6 @@
//签证op设置
SetVisaOPInfo() {
this.VisaOPMsg.VisaAssistId = '';
console.log(" this.VisaOPMsg", this.VisaOPMsg);
if (this.VisaOPMsg.VisaAssistIds && this.VisaOPMsg.VisaAssistIds.length > 0) {
this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',')
}
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 6a5ca6d2
......@@ -940,12 +940,16 @@
</div>
</div>
<div class="TC_remarkContent"
v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark||item.PriceTagList">
v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark||item.PriceTagList||item.ProductRecommend">
<div class="clearfix TCL-redType"
v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
<div class="TCL_remarkTitle">驳回缘由：</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</div>
<div class="clearfix TCL-redType" v-if="item.ProductRecommend">
<div class="TCL_remarkTitle">{{$t('Operation.Op_bentuanMaidian')}}：</div>
<div class="TCL_Content">{{item.ProductRecommend}}</div>
</div>
<div class="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>
<div class="TCL_Content">{{item.OPRemark}}</div>
......@@ -1370,8 +1374,8 @@
}
});
},
//根据当前员工所在部门获取该部门及子部门员工信息
getVisaEmployeeList() {
//根据当前员工所在部门获取该部门及子部门员工信息
getVisaEmployeeList() {
let userInfo = this.getLocalStorage();
let msg = {
GroupId: userInfo.RB_Group_id,
......@@ -1395,7 +1399,6 @@
this.VisaOPMsg.VisaShow = true;
this.VisaOPMsg.VisaId = item.VisaOPId == 0 ? '' : item.VisaOPId;
this.VisaOPMsg.VisaAssistId = '';
// this.VisaOPMsg.VisaAssistId = item.VisaAssistantId;
this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId && item.VisaAssistantId.length > 0) ? item.VisaAssistantId
.split(",").map((item) => Number(item)) : [];
this.VisaOPMsg.TCID = item.TCID;
......@@ -1404,7 +1407,6 @@
//签证op设置
SetVisaOPInfo() {
this.VisaOPMsg.VisaAssistId = '';
console.log(" this.VisaOPMsg", this.VisaOPMsg);
if (this.VisaOPMsg.VisaAssistIds && this.VisaOPMsg.VisaAssistIds.length > 0) {
this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',')
}
......
src/components/commonPage/travelDinner.vue
View file @ 6a5ca6d2
This diff is collapsed.
src/components/orderCommon/productOrderList.vue
View file @ 6a5ca6d2
......@@ -824,23 +824,18 @@
<p>
<i class="iconfont icon-hangban1"></i>{{ $t("Operation.Op_Warmprompt") }}
</p>
<!-- <p style="color:red;">
<span>签证人员</span><i>{{
item.VisaOPName === "" ? "未设置" : item.VisaOPName
}}</i>
</p> -->
<p>
<span>签证OP</span>
<span class="TCL-redType"> {{item.VisaOPName}}</span>
</p>
<template v-if="item.VisaAssistantList&&item.VisaAssistantList.length>0">
<p >
<span> 签证助理OP</span>
<template v-for="(subItem,subIndex) in item.VisaAssistantList">
<span :key="subIndex" style="padding-right:3px;">{{subItem}}</span>
</template>
</p>
</template>
<span>签证OP</span>
<span class="TCL-redType"> {{item.VisaOPName}}</span>
</p>
<template v-if="item.VisaAssistantList&&item.VisaAssistantList.length>0">
<p>
<span> 签证助理OP</span>
<template v-for="(subItem,subIndex) in item.VisaAssistantList">
<span :key="subIndex" style="padding-right:3px;">{{subItem}}</span>
</template>
</p>
</template>
<p style="color:red;">
<span>{{ $t("visa.v_sqtime") }}</span><i>{{
item.SendVisaTime === "" ? "未设置" : item.SendVisaTime
......@@ -972,8 +967,13 @@
</div>
</div>
<div class="d6">
<el-popover placement="right" width="500" trigger="click" :content="item.ProductRecommend">
<span style="
<!-- <template v-if="item.ProductRecommend&&item.ProductRecommend!=''">
<p>{{ $t("Operation.Op_bentuanMaidian") }}:</p>
<p :title="item.ProductRecommend">{{ item.ProductRecommend }}</p>
</template> -->
<template v-if="item.ProductRecommend&&item.ProductRecommend!=''">
<el-popover placement="right" width="500" trigger="click" :content="item.ProductRecommend">
<span style="
cursor: pointer;
padding: 2px 5px;
display: inline-block;
......@@ -982,7 +982,8 @@
border: 1px solid #ccc;
font-size: 12px;
" slot="reference">{{ $t("Operation.Op_bentuanMaidian") }}</span>
</el-popover>
</el-popover>
</template>
<p>{{ $t("Operation.Op_remark") }}:</p>
<p :title="item.OpRemark">{{ item.OpRemark }}</p>
</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