Skip to content

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

111

parent 7f283a70
Expand all Show 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 @@ ...@@ -2147,8 +2147,10 @@
<span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span> <span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span> <span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span v-if="childItem.isApplyPhoto == 1" style="color: red">({{ $t("salesModule.Zhao") }})</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 style="cursor:pointer;"
<span v-if="isShow===index||childItem.disclaimerId>0" style="cursor:pointer;" @click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>0?"查看参团免责承诺函":"签订参团免责承诺函"}}</span> @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; &nbsp;&nbsp;
</span> </span>
<span v-if="item.photoNum > 0">（{{ $t("salesModule.NoPhoto") }} {{ item.photoNum <span v-if="item.photoNum > 0">（{{ $t("salesModule.NoPhoto") }} {{ item.photoNum
...@@ -2164,8 +2166,9 @@ ...@@ -2164,8 +2166,9 @@
</p> </p>
<span style="display: block">{{ $t("salesModule.RoomInfo") <span style="display: block">{{ $t("salesModule.RoomInfo")
}}<span v-if="item.oneSex > 0" }}<span v-if="item.oneSex > 0"
style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span><span v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span><span
style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人 ）</span>：{{ item.orderGuestHouseStr }}</span> v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人
）</span>：{{ item.orderGuestHouseStr }}</span>
<div> <div>
...@@ -2182,7 +2185,7 @@ ...@@ -2182,7 +2185,7 @@
</span> </span>
</div> </div>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" > <div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)">
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}} <span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span> </span>
</div> </div>
...@@ -2270,7 +2273,8 @@ ...@@ -2270,7 +2273,8 @@
style="cursor:pointer;text-decoration:underline;color:green;"> style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}}) {{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
</a> --> </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;"> style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}}) {{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
</a> </a>
...@@ -2315,10 +2319,11 @@ ...@@ -2315,10 +2319,11 @@
</div> </div>
</td> </td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px"> <td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div > <div>
<div>{{ $t("fnc.skdanju") }}：</div> <div>{{ $t("fnc.skdanju") }}：</div>
<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-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
...@@ -2331,11 +2336,12 @@ ...@@ -2331,11 +2336,12 @@
style="cursor: default">{{ $t("system.content_noData") }}</span> style="cursor: default">{{ $t("system.content_noData") }}</span>
</div> </div>
</div> </div>
<div > <div>
<div>{{ $t("fnc.fkdanju") }}：</div> <div>{{ $t("fnc.fkdanju") }}：</div>
<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-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
...@@ -2489,7 +2495,7 @@ ...@@ -2489,7 +2495,7 @@
export default { export default {
data() { data() {
return { return {
isShow:'', isShow: '',
pagesTitle: '跟团游订单', pagesTitle: '跟团游订单',
SpecialAppShow: false, SpecialAppShow: false,
SpecialAppMsg: { SpecialAppMsg: {
...@@ -2525,7 +2531,7 @@ ...@@ -2525,7 +2531,7 @@
cityId: 0, cityId: 0,
orderId: 0, orderId: 0,
unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id) unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
GuestIds:'', GuestIds: '',
}, },
userId: "", userId: "",
customerId: "", customerId: "",
...@@ -2832,11 +2838,11 @@ ...@@ -2832,11 +2838,11 @@
}, },
}, },
methods: { methods: {
showMore(item,index){ showMore(item, index) {
if (this.isShow===index){ if (this.isShow === index) {
this.isShow='' this.isShow = ''
}else{ } else {
this.isShow= index; this.isShow = index;
} }
}, },
//关闭弹窗 //关闭弹窗
...@@ -3252,19 +3258,17 @@ ...@@ -3252,19 +3258,17 @@
); );
} }
}, },
toTrip: function (obj, TicketUnionId,GuestIds) { toTrip: function (obj, TicketUnionId, GuestIds) {
this.tripObj.tcid = obj.tcid; this.tripObj.tcid = obj.tcid;
this.tripObj.configId = obj.configId; this.tripObj.configId = obj.configId;
this.tripObj.orderId = obj.orderId; this.tripObj.orderId = obj.orderId;
this.tripObj.cityId = obj.startCityId; this.tripObj.cityId = obj.startCityId;
this.tripObj.GuestIds =GuestIds; this.tripObj.GuestIds = GuestIds;
this.tripObj.unionfid =0; this.tripObj.unionfid = 0;
if (TicketUnionId) { if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId; this.tripObj.unionfid = TicketUnionId;
} }
this.travelControlTripLayerShow = true; this.travelControlTripLayerShow = true;
console.log("this.tripObj",this.tripObj);
}, },
hideTripDown() { hideTripDown() {
this.travelControlTripLayerShow = false; this.travelControlTripLayerShow = false;
...@@ -4099,7 +4103,7 @@ ...@@ -4099,7 +4103,7 @@
this.addObj.ChildNoNeedPrice * this.addObj.ChildNoNeedPrice *
(Number(this.addMsg.ChirdNum) - (Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum)); Number(this.addMsg.ChirdNeedBedNum));
let lianyun =0; let lianyun = 0;
// (Number(this.addMsg.ManNum) + // (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) + // Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) * // Number(this.addMsg.OldPeopleNum)) *
...@@ -4166,7 +4170,7 @@ ...@@ -4166,7 +4170,7 @@
this.addObj.ChildNoNeedPrice * this.addObj.ChildNoNeedPrice *
(Number(this.addMsg.ChirdNum) - (Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum)); Number(this.addMsg.ChirdNeedBedNum));
let lianyun =0; let lianyun = 0;
// (Number(this.addMsg.ManNum) + // (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) + // Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) * // Number(this.addMsg.OldPeopleNum)) *
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 6a5ca6d2
...@@ -1234,12 +1234,16 @@ ...@@ -1234,12 +1234,16 @@
</div> </div>
</div> </div>
<div class="TC_remarkContent" <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" <div class="clearfix TCL-redType"
v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark"> v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
<div class="TCL_remarkTitle">驳回缘由：</div> <div class="TCL_remarkTitle">驳回缘由：</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div> <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</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="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div> <div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>
<div class="TCL_Content">{{item.OPRemark}}</div> <div class="TCL_Content">{{item.OPRemark}}</div>
...@@ -2695,7 +2699,6 @@ ...@@ -2695,7 +2699,6 @@
this.VisaOPMsg.VisaShow = true; this.VisaOPMsg.VisaShow = true;
this.VisaOPMsg.VisaId = item.VisaOPId == 0 ? '' : item.VisaOPId; this.VisaOPMsg.VisaId = item.VisaOPId == 0 ? '' : item.VisaOPId;
this.VisaOPMsg.VisaAssistId = ''; this.VisaOPMsg.VisaAssistId = '';
// this.VisaOPMsg.VisaAssistId = item.VisaAssistantId;
this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId && item.VisaAssistantId.length > 0) ? item.VisaAssistantId this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId && item.VisaAssistantId.length > 0) ? item.VisaAssistantId
.split(",").map((item) => Number(item)) : []; .split(",").map((item) => Number(item)) : [];
this.VisaOPMsg.TCID = item.TCID; this.VisaOPMsg.TCID = item.TCID;
...@@ -2704,7 +2707,6 @@ ...@@ -2704,7 +2707,6 @@
//签证op设置 //签证op设置
SetVisaOPInfo() { SetVisaOPInfo() {
this.VisaOPMsg.VisaAssistId = ''; this.VisaOPMsg.VisaAssistId = '';
console.log(" this.VisaOPMsg", this.VisaOPMsg);
if (this.VisaOPMsg.VisaAssistIds && this.VisaOPMsg.VisaAssistIds.length > 0) { if (this.VisaOPMsg.VisaAssistIds && this.VisaOPMsg.VisaAssistIds.length > 0) {
this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',') this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',')
} }
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 6a5ca6d2
...@@ -940,12 +940,16 @@ ...@@ -940,12 +940,16 @@
</div> </div>
</div> </div>
<div class="TC_remarkContent" <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" <div class="clearfix TCL-redType"
v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark"> v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
<div class="TCL_remarkTitle">驳回缘由：</div> <div class="TCL_remarkTitle">驳回缘由：</div>
<div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div> <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
</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="clearfix TCL-redType" v-if="item.OPRemark">
<div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div> <div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>
<div class="TCL_Content">{{item.OPRemark}}</div> <div class="TCL_Content">{{item.OPRemark}}</div>
...@@ -1395,7 +1399,6 @@ ...@@ -1395,7 +1399,6 @@
this.VisaOPMsg.VisaShow = true; this.VisaOPMsg.VisaShow = true;
this.VisaOPMsg.VisaId = item.VisaOPId == 0 ? '' : item.VisaOPId; this.VisaOPMsg.VisaId = item.VisaOPId == 0 ? '' : item.VisaOPId;
this.VisaOPMsg.VisaAssistId = ''; this.VisaOPMsg.VisaAssistId = '';
// this.VisaOPMsg.VisaAssistId = item.VisaAssistantId;
this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId && item.VisaAssistantId.length > 0) ? item.VisaAssistantId this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId && item.VisaAssistantId.length > 0) ? item.VisaAssistantId
.split(",").map((item) => Number(item)) : []; .split(",").map((item) => Number(item)) : [];
this.VisaOPMsg.TCID = item.TCID; this.VisaOPMsg.TCID = item.TCID;
...@@ -1404,7 +1407,6 @@ ...@@ -1404,7 +1407,6 @@
//签证op设置 //签证op设置
SetVisaOPInfo() { SetVisaOPInfo() {
this.VisaOPMsg.VisaAssistId = ''; this.VisaOPMsg.VisaAssistId = '';
console.log(" this.VisaOPMsg", this.VisaOPMsg);
if (this.VisaOPMsg.VisaAssistIds && this.VisaOPMsg.VisaAssistIds.length > 0) { if (this.VisaOPMsg.VisaAssistIds && this.VisaOPMsg.VisaAssistIds.length > 0) {
this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',') this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',')
} }
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 6a5ca6d2
...@@ -208,15 +208,32 @@ ...@@ -208,15 +208,32 @@
</el-input> </el-input>
</td> </td>
<td> <td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
早:<el-input placeholder="请输入餐厅名称" v-model="subItem.BreakfastName">
<el-button slot="append" icon="el-icon-search" @click="showDiningDig(subItem,1)">
</el-button>
</el-input>
<br />
午:<el-input placeholder="请输入餐厅名称" v-model="subItem.LunchName">
<el-button slot="append" icon="el-icon-search" @click="showDiningDig(subItem,2)">
</el-button>
</el-input>
<br />
晚:<el-input placeholder="请输入餐厅名称" v-model="subItem.DinnerName">
<el-button slot="append" icon="el-icon-search" @click="showDiningDig(subItem,3)">
</el-button>
</el-input>
</template>
<template v-else>
早:<el-input type="text" 早:<el-input type="text"
:disabled="(subItem.ContainDinnerType==1||subItem.ContainDinnerType==3)?true:false" :disabled="(subItem.ContainDinnerType==1||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.BreakfastName' class="w80" placeholder="早餐名称"> </el-input> v-model='subItem.BreakfastName' class="w80" placeholder="早餐名称"> </el-input>
<br /> <br />
午:<el-input type="text" v-model='subItem.LunchName' class="w80" placeholder="午餐名称"></el-input> 午: <el-input type="text" v-model='subItem.LunchName' class="w80" placeholder="午餐名称"></el-input>
<br /> 晚: <el-input type="text"
晚:<el-input type="text"
:disabled="(subItem.ContainDinnerType==2||subItem.ContainDinnerType==3)?true:false" :disabled="(subItem.ContainDinnerType==2||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.DinnerName' class="w80" placeholder="晚餐名称"></el-input> v-model='subItem.DinnerName' class="w80" placeholder="晚餐名称"></el-input>
</template>
</td> </td>
<td> <td>
早:<el-input type="text" 早:<el-input type="text"
...@@ -369,8 +386,8 @@ ...@@ -369,8 +386,8 @@
</td> </td>
<td> <td>
<el-form-item label="单地接(成本)"> <el-form-item label="单地接(成本)">
<el-input v-model="teamPrice.SingleDMCPrice" <el-input v-model="teamPrice.SingleDMCPrice" @keyup.native="checkInteger(teamPrice,'SingleDMCPrice')"
@keyup.native="checkInteger(teamPrice,'SingleDMCPrice')" @blur="getchange()" class="w70"> @blur="getchange()" class="w70">
</el-input> </el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -552,9 +569,14 @@ ...@@ -552,9 +569,14 @@
</div> </div>
</el-form> </el-form>
</div> </div>
<el-dialog custom-class='w750' :title="dialogDiningTitle" :visible.sync="isShowDiningDig" center>
<travelDinner v-if="isShowDiningDig" :qMsg="qMsg" @chooseDinner="chooseDinner" @closeDinner="closeDinner"
:otherDinner="otherDinner" :breakFirstList="breakFirstList"></travelDinner>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import travelDinner from '@/components/commonPage/travelDinner'
export default { export default {
props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt", props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
"CostCurrencyList", "teamPrice", 'queryMsg' "CostCurrencyList", "teamPrice", 'queryMsg'
...@@ -580,13 +602,51 @@ ...@@ -580,13 +602,51 @@
}, { }, {
value: 3, value: 3,
label: '外站自理' label: '外站自理'
}, ], }],
HotelName: null, //酒店下拉
loading: false, loading: false,
EmployeeList: [], //员工列表 EmployeeList: [], //员工列表
dialogDiningTitle: "选择餐厅",
qMsg: {
Country: 651,
DinnerType: 0, //1-早餐,2-午餐，3-晚餐
},
clickDinner: {},
isShowDiningDig: false, //是否显示选择餐弹窗
breakFirstList: [], //午餐、晚餐默认类型
otherDinner: [], //早餐默认类型
} }
}, },
components: {
travelDinner: travelDinner,
},
methods: { methods: {
//关闭弹窗
closeDinner() {
this.isShowDiningDig = false;
this.clickDinner = {};
this.qMsg.DinnerType = 0;
},
chooseDinner(obj) {
if (this.qMsg.DinnerType == 1) {
this.clickDinner.BreakfastName = obj.DiningName;
} else if (this.qMsg.DinnerType == 2) {
this.clickDinner.LunchName = obj.DiningName;
this.clickDinner.LunchCostPrice = obj.UnitPrice;
this.clickDinner.LunchIds = obj.DiningId;
} else if (this.qMsg.DinnerType == 3) {
this.clickDinner.DinnerName = obj.DiningName;
this.clickDinner.DinnerCostPrice = obj.UnitPrice;
this.clickDinner.DinnerIds = obj.DiningId;
}
this.isShowDiningDig = false;
this.clickDinner = {};
this.qMsg.DinnerType = 0;
},
showDiningDig(item, dinnerType) {
this.qMsg.DinnerType = dinnerType;
this.clickDinner = item;
this.isShowDiningDig = true;
},
GetDayStr(dayNum) { GetDayStr(dayNum) {
var str = ""; var str = "";
if (this.postConfig.OutDateTime && this.postConfig.OutDateTime != '') { if (this.postConfig.OutDateTime && this.postConfig.OutDateTime != '') {
...@@ -618,6 +678,71 @@ ...@@ -618,6 +678,71 @@
this.HotelName = []; this.HotelName = [];
} }
}, },
// //搜索餐厅
// remoteSearchDinner(query, dinnerType, subItem) {
// if (query !== '') {
// this.loading = true;
// this.initDinner(query, dinnerType, subItem)
// } else {
// if (dinnerType == 2) {
// subItem.LunchList = []
// this.DLunch = [];
// } else {
// subItem.DinnerList = []
// this.DDinner = [];
// }
// }
// },
// //初始化餐厅列表
// initDinner(query, dinnerType, subItem, day) {
// this.apipost(
// "dining_post_GetOfferDinnerListService", {
// Name: query
// },
// res => {
// this.loading = false
// if (res.data.resultCode == 1) {
// var tempData = res.data.data;
// if (dinnerType == 2) {
// subItem.LunchList = tempData;
// } else if (dinnerType == 3) {
// subItem.DinnerList = tempData;
// }
// if (day) {
// for (let i = 0; i < this.dayCostPrice.length; i++) {
// if (!this.dayCostPrice[i].LunchList || this.dayCostPrice[i].LunchList.length == 0) {
// this.dayCostPrice[i].LunchList = tempData;
// }
// if (!this.dayCostPrice[i].DinnerList || this.dayCostPrice[i].DinnerList.length == 0) {
// this.dayCostPrice[i].DinnerList = tempData;
// }
// }
// }
// this.$forceUpdate()
// }
// },
// null
// );
// },
// 获取餐厅名称
getDinner(subItem, dinnerType, dinnerIds) {
if (dinnerType == 2) {
subItem.LunchList.forEach(x => {
if (x.ID == dinnerIds) {
subItem.LunchName = x.Name;
subItem.LunchCostPrice = x.UnitPrice;
}
})
} else if (dinnerType == 3) {
subItem.DinnerList.forEach(x => {
if (x.ID == dinnerIds) {
subItem.DinnerName = x.Name;
subItem.DinnerCostPrice = x.UnitPrice;
}
})
}
this.$forceUpdate()
},
//初始化酒店列表 //初始化酒店列表
initHotel(query, subItem, day) { initHotel(query, subItem, day) {
this.apipost( this.apipost(
...@@ -635,13 +760,11 @@ ...@@ -635,13 +760,11 @@
} }
if (subItem && (subItem.HotelList || subItem.HotelList.length > 0)) { if (subItem && (subItem.HotelList || subItem.HotelList.length > 0)) {
subItem.HotelList = res.data.data subItem.HotelList = res.data.data
} }
} else if (day != null) { } else if (day != null) {
this.dayCostPrice[day].HotelList = res.data.data this.dayCostPrice[day].HotelList = res.data.data
} }
this.$forceUpdate() this.$forceUpdate()
this.HotelName = res.data.data;
} }
}, },
null null
...@@ -1008,15 +1131,29 @@ ...@@ -1008,15 +1131,29 @@
} }
); );
}, },
//获取配置餐厅信息
getConfigDinnerList() {
this.apipost(
"travel_get_GetConfigDinnerList", {},
res => {
if (res.data.resultCode == 1) {
this.breakFirstList = res.data.data.breakFirstList;
this.otherDinner = res.data.data.otherDinner;
}
},
err => {}
);
}
}, },
mounted() { mounted() {
this.IsDefault = this.queryMsg.IsDefault this.IsDefault = this.queryMsg.IsDefault;
this.canEdit = this.queryMsg.canEdit this.canEdit = this.queryMsg.canEdit;
this.getSubtotalMoney(); this.getSubtotalMoney();
this.getAllCurrency(); this.getAllCurrency();
}, },
created() { created() {
this.getEmployeeList(); this.getEmployeeList();
this.getConfigDinnerList();
}, },
watch: { watch: {
postConfig: { postConfig: {
...@@ -1041,7 +1178,9 @@ ...@@ -1041,7 +1178,9 @@
if (this.dayCostPrice && this.dayCostPrice.length > 0) { if (this.dayCostPrice && this.dayCostPrice.length > 0) {
let arrList = function (list) { let arrList = function (list) {
list.forEach(x => { list.forEach(x => {
x.HotelList = [] x.HotelList = [];
x.LunchList = [];
x.DinnerList = [];
}) })
} }
arrList(this.dayCostPrice) arrList(this.dayCostPrice)
...@@ -1049,6 +1188,12 @@ ...@@ -1049,6 +1188,12 @@
if (this.dayCostPrice[i].HotelName != '') { if (this.dayCostPrice[i].HotelName != '') {
this.initHotel(this.dayCostPrice[i].HotelName, this.dayCostPrice[i], i) this.initHotel(this.dayCostPrice[i].HotelName, this.dayCostPrice[i], i)
} }
// if (this.dayCostPrice[i].LunchIds != '') {
// this.initDinner(this.dayCostPrice[i].LunchName, 2, this.dayCostPrice[i], i)
// }
// if (this.dayCostPrice[i].DinnerIds != '') {
// this.initDinner(this.dayCostPrice[i].DinnerName, 3, this.dayCostPrice[i], i)
// }
} }
} }
}, 100) }, 100)
......
src/components/commonPage/travelDinner.vue
View file @ 6a5ca6d2
This diff is collapsed.
src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue
View file @ 6a5ca6d2
...@@ -72,38 +72,37 @@ ...@@ -72,38 +72,37 @@
<div class="Traveltrip-item-box"> <div class="Traveltrip-item-box">
<div class="TC-Comtitlediv"> <div class="TC-Comtitlediv">
<table class="TC-HotelDinner"> <table class="TC-HotelDinner">
<template v-if="showDining">
<tr> <tr>
<td width="70" valign="middle"> <td width="70" valign="middle">
<img crossorigin="Anonymous" src="../../../assets/img/daily_breakfast.png"> <img crossorigin="Anonymous" src="../../../assets/img/daily_breakfast.png">
</td> </td>
<td width="140" valign="middle"> <td valign="middle">
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="" :placeholder="$t('pub.pleaseSel')" filterable <el-select v-if="!dayObj.isRead&&IsDirect==1" class="Ht_hotelSelect" :placeholder="$t('pub.pleaseSel')"
v-model="dayObj.DinnerArray[0].BreakfastUseType" @change="changeBreakfastList(dayObj.DinnerArray[0])"> filterable v-model="dayObj.DinnerArray[0].BreakfastUseType"
@change="changeBreakfastList(dayObj.DinnerArray[0])">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in breakFirstList" :label="item.name" :value="item.Id" :key="item.Id"> <el-option v-for="item in breakFirstList" :label="item.name" :value="item.Id" :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
<el-input type="text" v-model="dayObj.DinnerArray[0].DinnerName" class="" <el-input type="text" v-model="dayObj.DinnerArray[0].DinnerName" class="" v-if="!dayObj.isRead&&IsDirect==0"
v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(0)"></el-input> @change="noDirectDinnerChange(0)"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead "> <span class="TC-hotelName" v-if="dayObj.isRead ">
{{IsDirect==1? getBreakfirst(dayObj.DinnerArray[0].BreakfastUseType):dayObj.DinnerArray[0].DinnerName}} {{IsDirect==1? getBreakfirst(dayObj.DinnerArray[0].BreakfastUseType):dayObj.DinnerArray[0].DinnerName}}
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr class="marginT10">
<td width="70" valign="middle" align="center"> <td width="70" valign="middle" align="center">
<img crossorigin="Anonymous" src="../../../assets/img/daily_lunch.png"> <img crossorigin="Anonymous" src="../../../assets/img/daily_lunch.png">
</td> </td>
<td width="140" valign="middle"> <td valign="middle">
<!-- <template v-if="PostConfig.LineId==14||PostConfig.LineId==118"> <template v-if="PostConfig.LineId==14||PostConfig.LineId==118">
<el-input placeholder="请输入餐厅名称" v-model="dayObj.DinnerArray[1].DinnerName" <el-input placeholder="请输入餐厅名称" v-model="dayObj.DinnerArray[1].DinnerName" class="Ht_hotelSelect">
class="input-with-select dinnerBtn"> <el-button slot="append" icon="el-icon-search" @click="showDiningDig(dayObj.DinnerArray[1],2)">
<el-button slot="append" icon="el-icon-search" @click="showDiningDig(dayObj.DinnerArray[1])">
</el-button> </el-button>
</el-input> </el-input>
</template> </template>
<template v-else> --> <template v-else>
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="" :placeholder="$t('pub.pleaseSel')" filterable <el-select v-if="!dayObj.isRead&&IsDirect==1" class="" :placeholder="$t('pub.pleaseSel')" filterable
v-model="dayObj.DinnerArray[1].DinnerId" @visible-change="getDinnerList($event)" v-model="dayObj.DinnerArray[1].DinnerId" @visible-change="getDinnerList($event)"
@change="changeDinnerList(dayObj.DinnerArray[1])"> @change="changeDinnerList(dayObj.DinnerArray[1])">
...@@ -113,9 +112,9 @@ ...@@ -113,9 +112,9 @@
<span class="TC-realSpan">{{item.RealName}}</span> <span class="TC-realSpan">{{item.RealName}}</span>
</el-option> </el-option>
</el-select> </el-select>
<!-- </template> --> </template>
<el-input type="text" v-model="dayObj.DinnerArray[1].DinnerName" class="" <el-input type="text" v-model="dayObj.DinnerArray[1].DinnerName" class="" v-if="!dayObj.isRead&&IsDirect==0"
v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(1)"></el-input> @change="noDirectDinnerChange(1)"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead"> <span class="TC-hotelName" v-if="dayObj.isRead">
{{IsDirect==1? getQDinnerList(dayObj.DinnerArray[1].DinnerId):dayObj.DinnerArray[1].DinnerName}} {{IsDirect==1? getQDinnerList(dayObj.DinnerArray[1].DinnerId):dayObj.DinnerArray[1].DinnerName}}
</span> </span>
...@@ -126,23 +125,31 @@ ...@@ -126,23 +125,31 @@
<img src="../../../assets/img/daily_dinner.png"> <img src="../../../assets/img/daily_dinner.png">
</td> </td>
<td valign="middle"> <td valign="middle">
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="" style="width: 140px;" <template v-if="PostConfig.LineId==14||PostConfig.LineId==118">
:placeholder="$t('pub.pleaseSel')" filterable v-model="dayObj.DinnerArray[2].DinnerId" <el-input placeholder="请输入餐厅名称" v-model="dayObj.DinnerArray[2].DinnerName" class="Ht_hotelSelect">
@visible-change="getDinnerList($event)" @change="changeDinner2List(dayObj.DinnerArray[2])"> <el-button slot="append" icon="el-icon-search" @click="showDiningDig(dayObj.DinnerArray[2],3)">
</el-button>
</el-input>
</template>
<template v-else>
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="Ht_hotelSelect" :placeholder="$t('pub.pleaseSel')"
filterable v-model="dayObj.DinnerArray[2].DinnerId" @visible-change="getDinnerList($event)"
@change="changeDinner2List(dayObj.DinnerArray[2])">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in QDinnerList2" :label="item.Name" :value="item.ID" :key="item.ID"> <el-option v-for="item in QDinnerList2" :label="item.Name" :value="item.ID" :key="item.ID">
<span>{{ item.Name }}</span> <span>{{ item.Name }}</span>
<span class="TC-realSpan">{{item.RealName}}</span> <span class="TC-realSpan">{{item.RealName}}</span>
</el-option> </el-option>
</el-select> </el-select>
<el-input type="text" v-model="dayObj.DinnerArray[2].DinnerName" class="" </template>
v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(2)"></el-input>
<el-input type="text" v-model="dayObj.DinnerArray[2].DinnerName" class="" v-if="!dayObj.isRead&&IsDirect==0"
@change="noDirectDinnerChange(2)"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead"> <span class="TC-hotelName" v-if="dayObj.isRead">
{{IsDirect==1?getQDinnerList2(dayObj.DinnerArray[2].DinnerId):dayObj.DinnerArray[2].DinnerName}} {{IsDirect==1?getQDinnerList2(dayObj.DinnerArray[2].DinnerId):dayObj.DinnerArray[2].DinnerName}}
</span> </span>
</td> </td>
</tr> </tr>
</template>
<tr class="marginT10"> <tr class="marginT10">
<td width="70" valign="top"> <td width="70" valign="top">
<img crossorigin="Anonymous" src="../../../assets/img/daily_hotel-1.png"> <img crossorigin="Anonymous" src="../../../assets/img/daily_hotel-1.png">
...@@ -175,7 +182,8 @@ ...@@ -175,7 +182,8 @@
</table> </table>
</div> </div>
<el-dialog custom-class='w750' :title="dialogDiningTitle" :visible.sync="isShowDiningDig" center> <el-dialog custom-class='w750' :title="dialogDiningTitle" :visible.sync="isShowDiningDig" center>
<travelDinner :Country="651"></travelDinner> <travelDinner :qMsg="qMsg" @chooseDinner="chooseDinner" @closeDinner="closeDinner" :otherDinner="otherDinner"
:breakFirstList="breakFirstList"></travelDinner>
</el-dialog> </el-dialog>
</div> </div>
...@@ -202,18 +210,32 @@ ...@@ -202,18 +210,32 @@
isFirstInitDinner: false, //初始含有酒店列表，加载完酒店数据在初始化餐厅列表 isFirstInitDinner: false, //初始含有酒店列表，加载完酒店数据在初始化餐厅列表
DinnerByKeyList: [], DinnerByKeyList: [],
totalDinnerByKeyList: 0, totalDinnerByKeyList: 0,
checlItem: {}, clickDinner: {},
dialogDiningTitle: "选择餐厅", dialogDiningTitle: "选择餐厅",
isShowDiningDig: false, //是否显示餐弹窗 isShowDiningDig: false, //是否显示餐弹窗
qMsg: {
Country: 651,
DinnerType: 1, //1-早餐,2-午餐，3-晚餐
}
}; };
}, },
components: { components: {
travelDinner: travelDinner, travelDinner: travelDinner,
}, },
methods: { methods: {
showDiningDig(item) { //关闭弹窗
this.checlItem = item; closeDinner() {
this.isShowDiningDig = false;
this.clickDinner = {};
},
chooseDinner(obj) {
this.clickDinner.DinnerId = obj.DiningId;
this.clickDinner.DinnerName = obj.DiningName
this.isShowDiningDig = false;
},
showDiningDig(item, dinnerType) {
this.clickDinner = item;
this.qMsg.DinnerType = dinnerType;
this.isShowDiningDig = true; this.isShowDiningDig = true;
}, },
// 非直采酒店 // 非直采酒店
...@@ -572,7 +594,7 @@ ...@@ -572,7 +594,7 @@
value.UseDinnerType = index + 1; value.UseDinnerType = index + 1;
}); });
} }
this.showDining = true;
}, },
//根据ID遍历早餐酒店名 //根据ID遍历早餐酒店名
getBreakfirst(Id) { getBreakfirst(Id) {
......
src/components/orderCommon/productOrderList.vue
View file @ 6a5ca6d2
...@@ -824,17 +824,12 @@ ...@@ -824,17 +824,12 @@
<p> <p>
<i class="iconfont icon-hangban1"></i>{{ $t("Operation.Op_Warmprompt") }} <i class="iconfont icon-hangban1"></i>{{ $t("Operation.Op_Warmprompt") }}
</p> </p>
<!-- <p style="color:red;">
<span>签证人员</span><i>{{
item.VisaOPName === "" ? "未设置" : item.VisaOPName
}}</i>
</p> -->
<p> <p>
<span>签证OP</span> <span>签证OP</span>
<span class="TCL-redType"> {{item.VisaOPName}}</span> <span class="TCL-redType"> {{item.VisaOPName}}</span>
</p> </p>
<template v-if="item.VisaAssistantList&&item.VisaAssistantList.length>0"> <template v-if="item.VisaAssistantList&&item.VisaAssistantList.length>0">
<p > <p>
<span> 签证助理OP</span> <span> 签证助理OP</span>
<template v-for="(subItem,subIndex) in item.VisaAssistantList"> <template v-for="(subItem,subIndex) in item.VisaAssistantList">
<span :key="subIndex" style="padding-right:3px;">{{subItem}}</span> <span :key="subIndex" style="padding-right:3px;">{{subItem}}</span>
...@@ -972,6 +967,11 @@ ...@@ -972,6 +967,11 @@
</div> </div>
</div> </div>
<div class="d6"> <div class="d6">
<!-- <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"> <el-popover placement="right" width="500" trigger="click" :content="item.ProductRecommend">
<span style=" <span style="
cursor: pointer; cursor: pointer;
...@@ -983,6 +983,7 @@ ...@@ -983,6 +983,7 @@
font-size: 12px; font-size: 12px;
" slot="reference">{{ $t("Operation.Op_bentuanMaidian") }}</span> " slot="reference">{{ $t("Operation.Op_bentuanMaidian") }}</span>
</el-popover> </el-popover>
</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>
</div> </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