Skip to content

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

新增拒签人数字段

parent 5d293eac
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2891 additions and 3092 deletions
src/components/SalesModule/addPassenger.vue
View file @ 4c948fdf
This diff is collapsed.
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 4c948fdf
......@@ -808,48 +808,11 @@
<el-input v-model='addMsg.OldPeopleNum' @keyup.native="checkInteger(addMsg,'OldPeopleNum')" @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</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 :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-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-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
......@@ -1189,7 +1152,10 @@
</el-form-item>
</el-col>
<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-row>
<el-row :gutter="20">
......@@ -2358,6 +2324,7 @@ export default {
Remarks: "",
VisaNum: "0",
SafeNum: "0",
RefuseVisaNum:'0',
AirticketNum: "0",
ScenicRefundArr: [],
GoCityTime: "",
......@@ -3063,6 +3030,7 @@ submitYSZEForm(){
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
// this.addMsg_form.OrderId=x.OrderId;
// this.addMsg_form.OpSetLossMoney=x.OpSetLossMoney;//收损金额
......@@ -3714,6 +3682,7 @@ submitYSZEForm(){
this.addMsg.MinOrderPrice = "";
this.addMsg.VisaNum = "0";
this.addMsg.SafeNum = "0";
this.addMsg.RefuseVisaNum='0';
this.addMsg.AirticketNum = "0";
this.addMsg.ScenicRefundArr = [];
this.ScenicRefundMoney = 0;
......
src/components/SalesModule/passengerSaleList.vue
View file @ 4c948fdf
......@@ -8,12 +8,12 @@
<table class="passengerSaleList_table" border="0" cellspacing="0" cellpadding="0" :loading="loading">
<thead>
<tr>
<th width="3%">ID</th>
<th width="3%">分房</th>
<th width="7%">酒店及房型</th>
<th width="6%">旅客姓名</th>
<th width="6%">英文姓</th>
<th width="6%">英文名</th>
<th width="2%">ID</th>
<th width="2%">分房</th>
<th width="5%">酒店及房型</th>
<th width="5%">旅客姓名</th>
<th width="5%">英文姓</th>
<th width="5%">英文名</th>
<th width="3%">性别</th>
<th width="7%">出生日期</th>
<th width="4%">年龄类型</th>
......@@ -24,6 +24,7 @@
<th width="7%">护照有效期</th>
<th width="6%">客户手机</th>
<th width="9%">身份证</th>
<th width="5%" style="display:none">签证状态</th>
<th width="8%">操作</th>
</tr>
</thead>
......@@ -45,16 +46,20 @@
<td>{{item.PassportExpiry}}</td>
<td>{{item.MobilePhone}}</td>
<td>{{item.IdCard}}</td>
<td style="display:none">{{item.VisaState==1?'拒签':"正常"}}</td>
<td>
<el-button-group>
<el-tooltip v-if="isOrder==1" class="item" effect="dark" content="修改" placement="top-start">
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' icon="iconfont icon-bianji-smal" @click="goUrlA(item.Id)"></el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-bianji-smal" @click="goUrlA(item.Id)"></el-button>
</el-tooltip>
<el-tooltip v-if="isOrder==1" class="item" effect="dark" content="删除" placement="top-start">
<el-button type="primary" style='background:#e95252; border-color:#e95252' icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button>
<el-button type="primary" style='background:#e95252; border-color:#e95252'
icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button>
</el-tooltip>
<el-tooltip v-if="isOrder==1" class="item" effect="dark" content="下载申请表" placement="top-start">
<el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3' icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
<el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3'
icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
</el-tooltip>
</el-button-group>
</td>
......@@ -71,7 +76,7 @@
</template>
<script>
export default {
export default {
data() {
return {
loading: false,
......@@ -81,17 +86,19 @@ export default {
tcnum: '0'
},
guestNum: 0,
isOrder:0,
tableList:[]
isOrder: 0,
tableList: []
};
},
methods: {
getData: function () {
this.loading = true
this.apipost("sellorder_get_GetTravelGuestList", {OrderId: this.msg.id}, res => {
this.apipost("sellorder_get_GetTravelGuestList", {
OrderId: this.msg.id
}, res => {
if (res.data.resultCode == 1) {
this.guestNum = res.data.data.GuestNum
this.tableList = res.data.data.list
this.guestNum = res.data.data.GuestNum;
this.tableList = res.data.data.list;
} else {
this.$message.error(res.data.message)
}
......@@ -104,46 +111,71 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('sellorder_post_DelTravelGuestInfo',{GuestId: item.Id},res=>{
if(res.data.resultCode == 1) {
this.apipost('sellorder_post_DelTravelGuestInfo', {
GuestId: item.Id
}, res => {
if (res.data.resultCode == 1) {
this.$message.success('删除成功！')
this.getData()
}else{
} else {
this.$message.error(res.data.message)
}
},err=>{})
}, err => {})
})
},
goUrlA: function (guestId){
this.$router.push({name: 'addPassenger',query:{"TCID":this.msg.tcid,"orderId":this.msg.id,'guestId':guestId}});
goUrlA: function (guestId) {
this.$router.push({
name: 'addPassenger',
query: {
"TCID": this.msg.tcid,
"orderId": this.msg.id,
'guestId': guestId
}
});
},
goUrlB: function (guestId){
let routeData = this.$router.resolve({name: 'VisaPersonalFormSell', query: {data: guestId}});
goUrlB: function (guestId) {
let routeData = this.$router.resolve({
name: 'VisaPersonalFormSell',
query: {
data: guestId
}
});
window.open(routeData.href, '_blank');
},
goUrlP: function () {
this.$router.push({ name: 'passengerListSale', query: { id: this.msg.id, tcnum: this.msg.tcnum, blank: 'y', tab: '旅客分房'} });
this.$router.push({
name: 'passengerListSale',
query: {
id: this.msg.id,
tcnum: this.msg.tcnum,
blank: 'y',
tab: '旅客分房'
}
});
},
},
mounted: function (){
this.msg.id = this.$route.query.id===undefined?"0":this.$route.query.id
this.msg.tcid = this.$route.query.tcid===undefined?"0":this.$route.query.tcid
this.msg.tcnum = this.$route.query.tcnum===undefined?"0":this.$route.query.tcnum
this.isOrder=this.$route.query.isOrder===undefined?0:this.$route.query.isOrder
mounted: function () {
this.msg.id = this.$route.query.id === undefined ? "0" : this.$route.query.id
this.msg.tcid = this.$route.query.tcid === undefined ? "0" : this.$route.query.tcid
this.msg.tcnum = this.$route.query.tcnum === undefined ? "0" : this.$route.query.tcnum
this.isOrder = this.$route.query.isOrder === undefined ? 0 : this.$route.query.isOrder
this.getData()
}
};
};
</script>
<style>
.passengerSaleList {
.passengerSaleList {
width: 100%;
}
.passengerSaleList_topBtn{
}
.passengerSaleList_topBtn {
padding: 20px 0 0 0;
text-align: right;
}
.passengerSaleList_topBtn>div{
}
.passengerSaleList_topBtn>div {
display: inline-block;
margin: 0 0 0 10px;
padding: 0 15px;
......@@ -155,39 +187,46 @@ export default {
border-radius: 15px;
background: #FFFFFF;
cursor: pointer;
}
.passengerSaleList_tableBox {
}
.passengerSaleList_tableBox {
padding: 20px 0 0 0;
width: 100%;
}
.passengerSaleList_table {
}
.passengerSaleList_table {
width: 100%;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
}
.passengerSaleList_table tr {
}
.passengerSaleList_table tr {
background: #fff;
}
.passengerSaleList_table tr th {
}
.passengerSaleList_table tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
text-align: center;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.passengerSaleList_table tr td {
}
.passengerSaleList_table tr td {
padding: 10px;
font-size: 12px;
text-align: center;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.passengerSaleList_table_noInfo tr td {
}
.passengerSaleList_table_noInfo tr td {
height: 30px;
text-align: center;
font-size: 12px;
color: #999999;
}
}
</style>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 4c948fdf
......@@ -1280,6 +1280,12 @@
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</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 :span="4">
&nbsp;
......@@ -1758,10 +1764,7 @@
<tbody v-for="(childItem,childIndex) in subItem.List">
<tr>
<td rowspan="3" style="position:relative;">
<div class="order_union">
<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>
<div v-if="childItem.IsReturnIntermodal==1 || childItem.IsIntermodal==1" class="order_union">联</div>
<p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p>
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId">
{{childItem.OrderId}}
......@@ -1955,7 +1958,6 @@
@click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>
设置额外金额</div>
<div @click="lianyunFY(childItem)">联运返佣</div>
<div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@click='deleteItem(childItem)'>
删除
......@@ -2461,19 +2463,7 @@
<button class="hollowFixedBtn" @click="OrderLoading=false">{{$t('pub.cancelBtn')}}</button>
</div>
</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">
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
......@@ -2680,7 +2670,6 @@
LatestCommissionMoney: ''
},
OrderMoneyDialog: false,
FyongLoading: false,
EwMsg: {
OrderId: 0,
ExtraRewardMoney: '',
......@@ -2778,8 +2767,8 @@
CommissionShareMoney: "0",
//订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0,
RefuseVisaNum:0,//拒签人数
},
IsBackStatus: 1,
//行程下载使用
travelControlTripLayerShow: false,
tripObj: {
......@@ -3040,7 +3029,6 @@
OrderUnitPrice: 0
},
SuperiorPeople: [],
lianyunFYId: 0,
};
},
components: {
......@@ -3048,27 +3036,6 @@
updateSalesMan: updateSalesMan
},
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) { // 跳转发票详情页面
this.$router.push({
name: 'invoicesManagerDetail',
......@@ -3140,6 +3107,7 @@
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
......
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ 4c948fdf
......@@ -692,9 +692,12 @@
this.journeyList.DayList = tempData.DayList;
this.PostDaysTrip.TrafficList = [];
if (tempData.DayList2&& tempData.dayList.length>0) {
tempData.DayList2.forEach(item => {
this.PostDaysTrip.TrafficList.push(item.TrafficObj);
})
}
this.journeyList.DayList.forEach(x => {
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