Skip to content

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

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

parents 2ccb759f 45abbd48
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 74 deletions
src/components/Hotel/reservation/HotelOrderList.vue
View file @ 52150942
......@@ -336,7 +336,8 @@
Refund: item.Refund,
PlatformMoney:item.PlatformMoney,
HandFittingIncome: item.HandFittingIncome,
HandFittingTax: item.HandFittingTax
HandFittingTax: item.HandFittingTax,
DueInMoney:item.DueInMoney
}
item.list.push(datas)
})
......
src/components/Hotel/reservation/OrderList.vue
View file @ 52150942
......@@ -1218,7 +1218,7 @@ export default {
},
// 制作单据
makeAdocument(row, index, num, name,Offset) {
if((num==2||num==3)&&row.Income<=0){
if((num==2||num==3)&&(row.Income+row.PlatformMoney)<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ 52150942
......@@ -1510,7 +1510,7 @@
// 制作单据
makeAdocument(row, index, num, Offset) {
if ((num == 2 || num == 3) && row.income <= 0) {
if ((num == 2 || num == 3) && (row.income+row.PlatformMoney) <= 0) {
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
......
src/components/Ticketing/TicketManager.vue
View file @ 52150942
......@@ -4066,12 +4066,13 @@
this.Success("保存成功");
this.initAddMsg();
this.getList();
this.addShow = false;
this.command = false;
this.isSubmit = true;
} else {
this.Warning(res.data.message);
this.isSubmit = true;
this.Error(res.data.message);
}
this.addShow = false;
this.command = false;
this.isSubmit = true;
},
err => {}
);
......
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ 52150942
......@@ -138,7 +138,7 @@
<p class="Quo_Content" style="padding-right:20px;width:100%;" v-if="item.CustomerName">
<span>{{item.CustomerName}}</span>
</p>
<p class="Quo_Content" style="padding-right:20px;width:100%;">
<p class="Quo_Content" style="padding-right:20px;width:100%;">
<span>出团公司：{{item.OutBranchName}}
</span>
</p>
......@@ -262,6 +262,11 @@
<span @click="offerAudit(item,2)">审</span>
</el-tooltip>
</span>
<span class="openGroup opbdList" v-if="item.TravelState==3" >
<el-tooltip class="item" effect="dark" content="驳回重新调整" placement="top-start" popper-class="max-w250">
<span @click="refuseOffer(item)">驳</span>
</el-tooltip>
</span>
<span class="openGroup opbdList">
<el-tooltip class="item" effect="dark" content="日志" placement="top-start" popper-class="max-w250">
<el-popover popper-class="salsSetPrice" trigger="click">
......@@ -461,6 +466,33 @@
}
});
},
//驳回报价单
refuseOffer(item) {
var that = this;
var nObj = {
ID: item.ID,
AuditContent: "驳回",
TravelState: 4,
OfferPayType: 0,
TeamType: item.TeamType,
};
var str = "是否要驳回【" + item.TCNUMS + "】的报价单?";
this.Confirm(str, function () {
that.apipost(
"travel_get_AuditTravelOffer", nObj,
res => {
that.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
});
},
getCompanyList() {
//出团公司
this.apipost(
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 52150942
......@@ -472,18 +472,18 @@
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="2">
<template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
{{teamPrice.SingleDMCPrice}}
</template>
<template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{subItem.SubtotalMoney}}
</template>
<template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
{{teamPrice.SingleDMCPrice}}
</template>
<template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{subItem.SubtotalMoney}}
</template>
</td>
<td colspan="2">
{{subItem.TotalMoney}}
......@@ -523,7 +523,7 @@
{{postConfig.ManagerAduitContent}}
</p>
</template>
<template v-if="postConfig.AuditDate&&postConfig.AuditDate!=''">
<template v-if="IsEdit!=2&&postConfig.AuditDate&&postConfig.AuditDate!=''">
<br />
<p>
{{postConfig.AuditByName}}：{{postConfig.AuditDate}}
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 52150942
......@@ -237,7 +237,11 @@
var offerObj = tempData.OfferArray[0];
if (offerObj) {
if (offerObj.AuditContent) {
this.postData.AuditContent = offerObj.AuditContent;
if (this.IsEdit == 2) {
this.postData.AuditContent = "";
} else {
this.postData.AuditContent = offerObj.AuditContent;
}
}
if (offerObj.AuditByName) {
this.postData.AuditByName = offerObj.AuditByName;
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ 52150942
......@@ -1424,7 +1424,7 @@ export default {
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.Income<=0){
if((num==2||num==3)&&(row.Income+row.PlatformMoney)<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
......
src/components/index.vue
View file @ 52150942
......@@ -1917,45 +1917,23 @@
}
},
testApi() {
// var postMsg = {};
// var cmd = "";
// cmd = "AirTicket_get_GetTicketProduct";
// postMsg = {
// StartDate: "2023-09-28", //开始日期
// EndDate: "2023-12-31", //结束日期
// DepartCityId: 343, //出发城市(西安)
// ArriveCityId: 653, //到达城市(东京)
// AirLineID: 0, //航空公司编号
// TicketType: 0, //类型(1-单程，2-往返)
// }
// // cmd = "sellorder_post_SetOrderInfoForAirTicket";
// // postMsg = {
// // OrderId: 0, //新增传0
// // AirticketId:0,//选中的机票编号
// // TCID: 18024, //团期编号
// // CustomerId: 23435, //同行Id（461671400@qq.com）
// // ManNum: 1,//成人
// // BabyNum: 1,//婴儿
// // GuestNum: 2,//总人数
// // YSeatNum: 1, //经济舱
// // FSeatNum: 0, //头等舱
// // ESeatNum: 0, //商务舱
// // OrderSource: 5, //小程序
// // Unit_Price: 3580, //单价
// // PreferPrice: 7160, //应收
// // GuestList: [{
// // SurName: "HK",
// // IdCard: "IdCard",
// // MobilePhone: "13551126755",
// // }],
// // PlaceOrderFrom:1,//下单平台
// // };
// this.apipost(
// cmd, postMsg,
// res => {
// console.log("testApi", res);
// }
// );
var postMsg = {};
var cmd = "";
cmd = "AirTicket_get_GetTicketProduct";
postMsg = {
StartDate: "2023-09-28", //开始日期
EndDate: "2023-12-31", //结束日期
DepartCityId: 343, //出发城市(西安)
ArriveCityId: 653, //到达城市(东京)
AirLineID: 0, //航空公司编号
TicketType: 0, //类型(1-单程，2-往返)
}
this.apipost(
cmd, postMsg,
res => {
console.log("testApi", res);
}
);
},
//测试方法
testEmp() {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 52150942
......@@ -1481,7 +1481,8 @@
QFlightDateEnd: this.QFlightDateEnd,
CreateBy: createBy,
AirTicketId: this.priceData.AirTicketId,
TCID: this.priceData.TCID
TCID: this.priceData.TCID,
LineId:this.PostConfig.LineId
};
let that = this;
......
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ 52150942
......@@ -28,9 +28,12 @@
</div>
</div>
<!-- 一张图 1-单张图，2-多张图-->
<template v-if="item.TitleObj.ShowTripType==1||(item.TitleObj.ShowTripType==2&&item.ScenicArray.length==1)||item.ScenicArray.length==0">
<template v-if="
(item.TitleObj.ShowTripType==2&&(item.ScenicArray.length==1||item.ScenicArray.length==0))
||((item.TitleObj.ShowTripType==1||item.TitleObj.ShowTripType==0)&&
(item.ScenicArray.length>0||item.ScenicArray.length==0))">
<div class="column travelDaysMasterMap2-box" style="padding: 45px 32px 0 32px;">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden" style="margin-top: 0;">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
......@@ -83,7 +86,7 @@
</div>
</div>
</template>
<template v-if="item.TitleObj.ShowTripType==2">
<template v-if="item.TitleObj.ShowTripType==2&&item.ScenicArray.length>1">
<div class="column travelDaysMasterMap2-box">
<!-- 2张 -->
<div v-if="item.ScenicArray.length==2">
......
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @ 52150942
......@@ -229,7 +229,7 @@
:true-label="ShowTripType[0]" :false-label="ShowTripType[1]"></el-checkbox>
</div>
</div>
<div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.TitleObj.ShowTripType==1&&dayObj.ScenicArray.length>0">
<div class="row-aic marginT10" style="width: 100%;" v-if="(dayObj.TitleObj.ShowTripType==1||dayObj.TitleObj.ShowTripType==0)&&dayObj.ScenicArray.length>0">
<span v-if="ishasScenic">默认展示图</span>
<el-select style="margin-left: 5px;" v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini"
:placeholder="$t('pub.pleaseSel')" v-model="ScenicArraySingle" filterable @change="setDefaultScenic">
......
src/components/scenicSpot/reservation/OrderList.vue
View file @ 52150942
......@@ -575,9 +575,9 @@
<div class="mb">
<el-table :data="scope.row.DetailList" style="width:100%" border>
<el-table-column label="景区名称(日期)" min-width="100" style="background:#EAEAEA">
<template slot-scope="scope" v-if="scope.$index == 0" :row="scope.row.DetailList.length">
<template slot-scope="scopes">
<template>
<div>{{ scope.row.CouponsName }}</div>
<div>{{scope.row.CouponsName }}</div>
<span style="color: #999999;">{{ scope.row.UseDate }}</span>
</template>
</template>
......@@ -638,10 +638,12 @@
</template>
</el-table-column>
<el-table-column label="待收" min-width="100">
<template slot-scope="scope">
{{scope.row.DueInMoney}}
<span class="fz15 fbold"
:class="{'cF1416C':scope.row.DaiShou>0}">
{{scope.row.DaiShou}}
:class="{'cF1416C':scope.row.DueInMoney>0}">
</span>
</template>
</el-table-column>
......@@ -1194,7 +1196,7 @@
},
OrderList: {
handler(val, oldVal) {
console.log(val,'------');
}
}
},
......@@ -1430,7 +1432,8 @@
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.Income<=0){
console.log("row",row);
if((num==2||num==3)&&(row.Income)<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
......
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ 52150942
......@@ -441,7 +441,8 @@ export default {
CostMoney: item.CostMoney,
PlatformTax: item.PlatformTax,
Refund: item.Refund,
PlatformMoney: item.PlatformMoney
PlatformMoney: item.PlatformMoney,
DueInMoney: item.DueInMoney
}
let DaiShou
DaiShou = Number(item.Money-item.Income-item.PlatformTax-item.PlatformMoney+item.Refund)
......
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