Skip to content

S
SuperMan
Commit 4c948fdf authored by 黄奎's avatar 黄奎
Browse files
Options

新增拒签人数字段

parent 5d293eac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2891 additions and 3092 deletions
src/components/SalesModule/addPassenger.vue
View file @ 4c948fdf
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/SalesModule/groupTourOrder.vue
View file @ 4c948fdf
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 4c948fdf
...@@ -808,48 +808,11 @@ ...@@ -808,48 +808,11 @@
<el-input v-model='addMsg.OldPeopleNum' @keyup.native="checkInteger(addMsg,'OldPeopleNum')" @input='getNumber();getHouseNo();getTotalPrice()'></el-input> <el-input v-model='addMsg.OldPeopleNum' @keyup.native="checkInteger(addMsg,'OldPeopleNum')" @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col> -->
</el-row> </el-row>
<!-- <el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')" @input='yzBigBed2();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="大床房" prop="BigRoomNum">
<el-input v-model='addMsg.BigRoomNum' @keyup.native="checkInteger(addMsg,'BigRoomNum')" @input='yzBigBed();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="三人房" prop="TripleRoomNum">
<el-input v-model='addMsg.TripleRoomNum' @keyup.native="checkInteger(addMsg,'TripleRoomNum')" @input='yzBigBed1();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="签证数量" prop="VisaNum">
<el-input v-model='addMsg.VisaNum' @keyup.native="checkInteger(addMsg,'VisaNum')" @input='yzVisaNum();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')" @input='yzSafeNum();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
</el-col>
</el-row> -->
<el-row :gutter="20"> <el-row :gutter="20">
<!-- <el-col :span="4">
<el-form-item label="预计用房" prop="PredictRoomNum">
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice"> <el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input> <el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
...@@ -1189,7 +1152,10 @@ ...@@ -1189,7 +1152,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
&nbsp; <el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
<el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -2358,6 +2324,7 @@ export default { ...@@ -2358,6 +2324,7 @@ export default {
Remarks: "", Remarks: "",
VisaNum: "0", VisaNum: "0",
SafeNum: "0", SafeNum: "0",
RefuseVisaNum:'0',
AirticketNum: "0", AirticketNum: "0",
ScenicRefundArr: [], ScenicRefundArr: [],
GoCityTime: "", GoCityTime: "",
...@@ -3063,6 +3030,7 @@ submitYSZEForm(){ ...@@ -3063,6 +3030,7 @@ submitYSZEForm(){
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString(); this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString(); this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString(); this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
// this.addMsg_form.OrderId=x.OrderId; // this.addMsg_form.OrderId=x.OrderId;
// this.addMsg_form.OpSetLossMoney=x.OpSetLossMoney;//收损金额 // this.addMsg_form.OpSetLossMoney=x.OpSetLossMoney;//收损金额
...@@ -3714,6 +3682,7 @@ submitYSZEForm(){ ...@@ -3714,6 +3682,7 @@ submitYSZEForm(){
this.addMsg.MinOrderPrice = ""; this.addMsg.MinOrderPrice = "";
this.addMsg.VisaNum = "0"; this.addMsg.VisaNum = "0";
this.addMsg.SafeNum = "0"; this.addMsg.SafeNum = "0";
this.addMsg.RefuseVisaNum='0';
this.addMsg.AirticketNum = "0"; this.addMsg.AirticketNum = "0";
this.addMsg.ScenicRefundArr = []; this.addMsg.ScenicRefundArr = [];
this.ScenicRefundMoney = 0; this.ScenicRefundMoney = 0;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 4c948fdf
...@@ -1280,6 +1280,12 @@ ...@@ -1280,6 +1280,12 @@
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')" <el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input> @input='getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
<el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
&nbsp; &nbsp;
...@@ -1758,10 +1764,7 @@ ...@@ -1758,10 +1764,7 @@
<tbody v-for="(childItem,childIndex) in subItem.List"> <tbody v-for="(childItem,childIndex) in subItem.List">
<tr> <tr>
<td rowspan="3" style="position:relative;"> <td rowspan="3" style="position:relative;">
<div class="order_union"> <div v-if="childItem.IsReturnIntermodal==1 || childItem.IsIntermodal==1" class="order_union">联</div>
<div v-if="childItem.IsReturnIntermodal==1 || childItem.IsIntermodal==1" class="fl">联</div>
<div v-if="childItem.IsBackUnionMoney==0" class="fl">&nbsp;&nbsp;&nbsp;&nbsp;返</div>
</div>
<p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p> <p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p>
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId"> <div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId">
{{childItem.OrderId}} {{childItem.OrderId}}
...@@ -1955,7 +1958,6 @@ ...@@ -1955,7 +1958,6 @@
@click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'> @click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>
设置额外金额</div> 设置额外金额</div>
<div @click="lianyunFY(childItem)">联运返佣</div>
<div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'" <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@click='deleteItem(childItem)'> @click='deleteItem(childItem)'>
删除 删除
...@@ -2461,19 +2463,7 @@ ...@@ -2461,19 +2463,7 @@
<button class="hollowFixedBtn" @click="OrderLoading=false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="OrderLoading=false">{{$t('pub.cancelBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 联运返佣弹窗 -->
<el-dialog custom-class='w350' title="联运返佣" :visible.sync="FyongLoading" center>
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
<el-form-item label="是否返佣：" class="w280">
<el-switch v-model="IsBackStatus" :active-value="0" :inactive-value="1"></el-switch>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="FyongLossOk">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" @click="FyongLoading=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='w350' title="修改OP备注" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg"> <el-dialog custom-class='w350' title="修改OP备注" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg">
<!--zhaunMsg.TCNUM--> <!--zhaunMsg.TCNUM-->
<el-form label-width="110px"> <el-form label-width="110px">
...@@ -2680,7 +2670,6 @@ ...@@ -2680,7 +2670,6 @@
LatestCommissionMoney: '' LatestCommissionMoney: ''
}, },
OrderMoneyDialog: false, OrderMoneyDialog: false,
FyongLoading: false,
EwMsg: { EwMsg: {
OrderId: 0, OrderId: 0,
ExtraRewardMoney: '', ExtraRewardMoney: '',
...@@ -2778,8 +2767,8 @@ ...@@ -2778,8 +2767,8 @@
CommissionShareMoney: "0", CommissionShareMoney: "0",
//订单归属【HK新加，报名清单页面修改使用】 //订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0, CreateBy: 0,
RefuseVisaNum:0,//拒签人数
}, },
IsBackStatus: 1,
//行程下载使用 //行程下载使用
travelControlTripLayerShow: false, travelControlTripLayerShow: false,
tripObj: { tripObj: {
...@@ -3040,7 +3029,6 @@ ...@@ -3040,7 +3029,6 @@
OrderUnitPrice: 0 OrderUnitPrice: 0
}, },
SuperiorPeople: [], SuperiorPeople: [],
lianyunFYId: 0,
}; };
}, },
components: { components: {
...@@ -3048,27 +3036,6 @@ ...@@ -3048,27 +3036,6 @@
updateSalesMan: updateSalesMan updateSalesMan: updateSalesMan
}, },
methods: { methods: {
FyongLossOk: function () {
let msg = {
OrderId: this.lianyunFYId,
IsBackStatus: this.IsBackStatus
}
this.apipost('sellorder_post_SetOrderUnionBackMoney', msg, res=>{
console.log(res)
if (res.data.resultCode === 1) {
this.$message.success(res.data.message)
this.getList()
} else {
this.$message.error(res.data.message)
}
}, null)
},
lianyunFY: function (item) {
console.log(item)
this.FyongLoading = true
this.IsBackStatus = item.IsBackUnionMoney
this.lianyunFYId = item.OrderId
},
goIisDetail: function (id) { // 跳转发票详情页面 goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({ this.$router.push({
name: 'invoicesManagerDetail', name: 'invoicesManagerDetail',
...@@ -3140,6 +3107,7 @@ ...@@ -3140,6 +3107,7 @@
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString(); this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString(); this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString(); this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
this.IsChildrenTour = x.IsChildrenTour; this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount; this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople; this.OpSetLossPeople = x.OpSetLossPeople;
......
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ 4c948fdf
...@@ -692,9 +692,12 @@ ...@@ -692,9 +692,12 @@
this.journeyList.DayList = tempData.DayList; this.journeyList.DayList = tempData.DayList;
this.PostDaysTrip.TrafficList = []; this.PostDaysTrip.TrafficList = [];
tempData.DayList2.forEach(item => { if (tempData.DayList2&& tempData.dayList.length>0) {
this.PostDaysTrip.TrafficList.push(item.TrafficObj); tempData.DayList2.forEach(item => {
}) this.PostDaysTrip.TrafficList.push(item.TrafficObj);
})
}
this.journeyList.DayList.forEach(x => { this.journeyList.DayList.forEach(x => {
x['HotelChooseArray'] = [] x['HotelChooseArray'] = []
......
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