Skip to content

S
SuperMan
Commit 5ca83d4c authored by zhengke's avatar zhengke
Browse files
Options

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

parents 24ce9654 da26a366
Show whitespace changes
Inline Side-by-side
Showing with 209 additions and 195 deletions
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 5ca83d4c
......@@ -903,25 +903,29 @@
font-size: 12px;
margin-left: 10px;
}
.RL_Scenic{
width:400px;
.RL_Scenic {
width: 400px;
max-height: 400px;
overflow: auto;
}
.RL_Scenic table th{
height:30px;
.RL_Scenic table th {
height: 30px;
border: 1px solid #d2d2d2;
}
.RL_Scenic table td{
padding:9px 5px!important;
.RL_Scenic table td {
padding: 9px 5px !important;
border: 1px solid #d2d2d2;
}
.RL_Scenic table ._color_666 {
background-color: #ededed;
color:#666666;
color: #666666;
}
.RL_Scenic table{
.RL_Scenic table {
padding: 10px 0 0 20px;
border-collapse: collapse;
border: 1px solid #d2d2d2;
......@@ -929,12 +933,14 @@
margin: 0 20px 5px 0;
width: 100%;
}
.GO_Contract{
color:blue;
.GO_Contract {
color: blue;
display: block;
cursor: pointer;
width:60px;
width: 60px;
}
</style>
<template>
......@@ -1225,7 +1231,8 @@
</el-select>
</el-form-item>
<el-form-item label="成交单价" prop="Unit_Price" v-else>
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)" ></el-input><!--:disabled="addMsg.GroupType==4" -->
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
<!--:disabled="addMsg.GroupType==4" -->
</el-form-item>
</template>
<el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4">
......@@ -1240,7 +1247,7 @@
<el-col :span="5" v-else>
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' class="w210"
@keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
@keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item>
<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
......@@ -1264,7 +1271,7 @@
<el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p>
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" >
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
......@@ -1428,13 +1435,32 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="可退景点">
<el-select filterable multiple class='multiple_input' v-model='addMsg.ScenicRefundArr'
:placeholder="$t('pub.pleaseSel')" @change='ScenicRefundMethods'>
<el-option v-for='item in ScenicRefundList' :label='item.ScenicName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</el-form-item>
<el-popover popper-class="RL_Scenic" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="_color_666">景点名称</td>
<td class="_color_666">OP设置金额</td>
<td class="_color_666">人数</td>
<td class="_color_666">退款金额</td>
</tr>
<tr v-for="item in ScenicRefundList" v-if="item.IsChecked">
<td>
{{item.CouponsName}}
</td>
<td>
{{item.RefundMoney}}
</td>
<td>
{{item.Number}}
</td>
<td>
{{item.BackMoney}}
</td>
</tr>
</table>
<span slot="reference" style="color:#f56c6c;margin-left:20px;cursor:pointer;">可退景点</span>
</el-popover>
</el-col>
</el-row>
<el-row :gutter="20">
......@@ -1687,10 +1713,10 @@
<th>金额</th>
<th>类型</th>
<th>描述</th>
<th>时间(<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>)</th>
<th>时间(<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4"
align="center">查看更多</span>)</th>
</tr>
<tr v-for="(item2,index2) in redBagList"
:key="index2">
<tr v-for="(item2,index2) in redBagList" :key="index2">
<td>{{item2.Money}}</td>
<td>
{{item2.Type==1?"收入":"折扣"}}
......@@ -1706,7 +1732,8 @@
</tr>
</table>
</div>
<span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;padding:0 15px" slot="reference">{{item.RedEnvelopeMoney}}</span>
<span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;padding:0 15px"
slot="reference">{{item.RedEnvelopeMoney}}</span>
</el-popover>
<span v-else style="cursor: pointer;color: #e95252;">{{item.RedEnvelopeMoney}}</span>
......@@ -1781,7 +1808,7 @@
</p>
<p v-if="item.CancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span v-for="(childItem) in item.CancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
......@@ -2086,7 +2113,7 @@
@click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
</span>
<p v-if="childItem.CancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span v-for="(subItem) in childItem.CancelGuestList">{{subItem.userName}} &nbsp;&nbsp;</span>
</span>
......@@ -2095,7 +2122,8 @@
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">
房间信息<span v-if="childItem.OneSex>0" style="color: #e95252">（{{childItem.OneSex==1?'单男':'单女'}}）</span>：{{childItem.OrderGuestHouseStr}}
房间信息<span v-if="childItem.OneSex>0"
style="color: #e95252">（{{childItem.OneSex==1?'单男':'单女'}}）</span>：{{childItem.OrderGuestHouseStr}}
<el-popover trigger="click" popper-class="RL_Scenic">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
......@@ -2109,15 +2137,19 @@
<td>{{fItem.BackMoney}}</td>
</tr>
</table>
<span slot="reference" v-if="childItem.OrderBackScenicList&&childItem.OrderBackScenicList.length>0" style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span>
<span slot="reference" v-if="childItem.OrderBackScenicList&&childItem.OrderBackScenicList.length>0"
style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span>
</el-popover>
</span>
<div>
<span v-if="childItem.OPTipMoney==''&&childItem.TipMoney!=''" style="color:red">（小费：{{childItem.TipMoney}}）</span>
<span v-if="childItem.OPTipMoney==''&&childItem.TipMoney!=''"
style="color:red">（小费：{{childItem.TipMoney}}）</span>
<span v-if="childItem.OPTipMoney!=''" style="color:red">
（小费：{{childItem.OPTipMoney}}）
<span>单据：</span>
<span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span>
<span @click="gourlTip('FinancialDocumentsDetail',id)"
style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId"
:key="i">{{id}}</span>
</span>
<span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)">领取合同</span>
<span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
......@@ -2446,9 +2478,10 @@
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span>
<p v-if="item.CancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span style="color: red;" v-for="(childItem) in item.CancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
<span style="color: red;" v-for="(childItem) in item.CancelGuestList">{{childItem.userName}}
&nbsp;&nbsp;</span>
</span>
</p>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
......@@ -2531,7 +2564,8 @@
<div class="RL_ListDiv">
<div class="LeaderSpan" :class="{'ckedClass':ckedIndex==index}" v-for="(item,index) in leaderListArr"
@click="getLeaderInfo(index,item.LeaderId)" :key="item.subCode">
<span class="RL_LeaderName">{{item.LeaderName}}【{{getLeaderTypeStr(item.Type, item.LeaderGuidClass)}}】</span>
<span
class="RL_LeaderName">{{item.LeaderName}}【{{getLeaderTypeStr(item.Type, item.LeaderGuidClass)}}】</span>
</div>
</div>
</div>
......@@ -2666,7 +2700,8 @@
<el-switch v-model="fanyongMsg.IsBackStatus" :active-value="0" :inactive-value="1"></el-switch>
</el-form-item>
<el-form-item label="额外返佣金额：" class="w280">
<el-input :rows="2" v-model="fanyongMsg.UnionExtraMoney" @keyup.native="checkPrice(fanyongMsg,'UnionExtraMoney',true)"></el-input>
<el-input :rows="2" v-model="fanyongMsg.UnionExtraMoney"
@keyup.native="checkPrice(fanyongMsg,'UnionExtraMoney',true)"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -2728,7 +2763,8 @@
</div>
</el-dialog>
<el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" :SetShouSunGuestNum="SetShouSunGuestNum" center>
<el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog"
:SetShouSunGuestNum="SetShouSunGuestNum" center>
<commonShouSun ref="childShou" :Type="1" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
</el-dialog>
......@@ -2865,7 +2901,8 @@
export default {
data() {
return {
redBagList:[],
HightUnitPrice: "0",
redBagList: [],
IsHaveAuth: 0, //是否有权限
// 修改应收总额
Ysze: false,
......@@ -2883,10 +2920,10 @@
LossMoney: 0,
},
//联运返佣msg
fanyongMsg:{
IsBackStatus:'',
UnionExtraMoney:'',
OrderId:0
fanyongMsg: {
IsBackStatus: '',
UnionExtraMoney: '',
OrderId: 0
},
FyongLoading: false,
pickerOptions0: {
......@@ -3085,15 +3122,6 @@
message: "请选择客户门店",
trigger: "change"
}],
// DepartureCityId: [
// { required: true, message: "请选择出发城市", trigger: "change" }
// ],
// ReturnArriveCityId: [
// { required: true, message: "请选择返回城市", trigger: "change" }
// ],
// GroupType: [
// { required: true, message: "请选择参团类型", trigger: "change" }
// ],
ClientSource: [{
required: true,
message: "请选择客人来源",
......@@ -3289,17 +3317,19 @@
},
methods: {
// OP备注赋值
OPRemark(item){
this.apipost('sellorder_post_GetOrderEntity',{ID:item.OrderId}, res => {
OPRemark(item) {
this.apipost('sellorder_post_GetOrderEntity', {
ID: item.OrderId
}, res => {
if (res.data.resultCode == 1) {
this.OPRemarkMsg.OP_Remarks=res.data.data.model.OP_Remarks;
this.OPRemarkMsg.OP_Remarks = res.data.data.model.OP_Remarks;
} else {
this.$message.error(res.data.message);
}
}, null)
},
// 20190807 新增追加团款 提交按钮
submitZhuiJiaTuanKuan(){
submitZhuiJiaTuanKuan() {
if (!this.zhuijiaMsg.ChangePrice) {
this.$message.error('请输入追加金额！')
return
......@@ -3308,7 +3338,7 @@
this.$message.error('请输入备注！')
return
}
this.apipost('sellorder_get_SetOrderOPTotalPrice',this.zhuijiaMsg, res => {
this.apipost('sellorder_get_SetOrderOPTotalPrice', this.zhuijiaMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
this.zhuijiaShow = false
......@@ -3319,7 +3349,7 @@
}, err => {})
},
// 20190807 新增追加团款
ZhuiJiaTuanKuan(orderID){
ZhuiJiaTuanKuan(orderID) {
this.zhuijiaShow = true
this.zhuijiaMsg = {
OrderId: orderID,
......@@ -3327,10 +3357,10 @@
ChangePrice: '',
}
},
setDanren(e){
setDanren(e) {
e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
},
getLeaderTypeStr: function (type, clas){
getLeaderTypeStr: function (type, clas) {
if (type == 2) {
return "领兼地"
} else if (type == 1 && clas == 0) {
......@@ -3341,7 +3371,7 @@
return "临时领队"
}
},
gourlTip(path,id){
gourlTip(path, id) {
this.$router.push({
name: path,
query: {
......@@ -3350,7 +3380,7 @@
}
});
},
goUrlHappy(item){
goUrlHappy(item) {
this.$router.push({
name: "HappyPassbook",
query: {
......@@ -3359,22 +3389,20 @@
}
});
},
getRedBag(item){
let msg={
CustomerId:item.CustomerId,
getRedBag(item) {
let msg = {
CustomerId: item.CustomerId,
pageIndex: 1,
pageSize: 4,
};
if(item.CustomerId){
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => {
if (item.CustomerId) {
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList', msg, res => {
if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData;
} else {}
}, err => {})
} else {
}
}, err => {
})
}else{
this.redBagList =[];
this.redBagList = [];
}
},
......@@ -3390,7 +3418,7 @@
})
},
FyongLossOk: function () {
if(this.fanyongMsg.UnionExtraMoney===""){
if (this.fanyongMsg.UnionExtraMoney === "") {
this.Error('请输入额外返佣金额');
return;
}
......@@ -3467,17 +3495,16 @@
},
res => {
if (res.data.resultCode == 1) {
this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
this.addObj = res.data.data.modelPrice;
let x = res.data.data.model;
this.addMsg = x;
this.addObj.OrderId = x.OrderId;
this.addObj.OpSetLossMoney = x.OpSetLossMoney;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid);
this.getScenicRefund(obj.TCID, obj.OrderId);
this.getPlatformAccount(obj.PlatformAccountTypeId, obj.PlatformAccount);
this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId;
......@@ -3497,7 +3524,7 @@
}
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderBackScenicList=x.OrderBackScenicList;
this.addMsg.OrderBackScenicList = x.OrderBackScenicList;
this.addMsg.GroupTypeNeedHouse = String(x.GroupTypeNeedHouse)
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
......@@ -3591,7 +3618,7 @@
},
err => {}
);
this.getKhmdList(this.addMsg.CustomerType, obj.LineId, this.addMsg.CreateBy,x.CustomerId);
this.getKhmdList(this.addMsg.CustomerType, obj.LineId, this.addMsg.CreateBy, x.CustomerId);
this.getDdlyList(this.addMsg.CustomerType);
} else {
this.Error(res.data.message);
......@@ -3885,19 +3912,17 @@
this.getTotalPrice();
this.getTicheng();
},
getScenicRefund(TCID) {
getScenicRefund(TCID, OrderId) {
this.OrderId = OrderId;
let msg = {
TCID: TCID,
OrderId: OrderId
}
this.apipost(
"sellorder_get_GetScenicRefundList", {
TCID
},
"sellorder_get_GetScenicRefundList", msg,
res => {
if (res.data.resultCode == 1) {
this.ScenicRefundList = res.data.data;
this.ScenicRefundList.forEach(item => {
item["ScenicName"] =
item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
});
this.ScenicRefundMethods();
}
},
err => {}
......@@ -4039,7 +4064,6 @@
if (this.addMsg.GroupType == 4) {
ChirdNum = 0
}
console.log(ChirdNum)
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
this.addMsg.VisaNum =
Number(this.addMsg.AirticketNum) +
......@@ -4081,7 +4105,7 @@
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
if (this.addMsg.Unit_Price < this.addMsg.TC_Price && this.addMsg.GroupType!=4) {
if (this.addMsg.Unit_Price < this.addMsg.TC_Price && this.addMsg.GroupType != 4) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
......@@ -4141,7 +4165,8 @@
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (
Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
......@@ -4204,7 +4229,8 @@
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (
Number(this.addMsg.ChirdNoNeedBedNum))
ertong = 0
ertongbed = 0
zafeiqianzhen = 0
......@@ -4633,12 +4659,12 @@
);
}
},
getKhmdList(id, lineId, employeeId,CustomerId) {
getKhmdList(id, lineId, employeeId, CustomerId) {
var qMsg = {
typeId: id,
lineId: lineId,
EmoloyeeId: employeeId,
customerId:CustomerId
customerId: CustomerId
};
this.apipost(
"app_today_visit_GetNewOrderMyCustomerList",
......@@ -4725,7 +4751,6 @@
IsTravelMoney: 1
},
res => {
if (res.data.resultCode == 1) {
this.orderList = res.data.data;
}
......@@ -4747,7 +4772,6 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data;
console.log(" this.OrderDataList ", this.OrderDataList )
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
}
},
......@@ -4762,8 +4786,8 @@
this.msg.pageIndex = 1;
this.currentPage = 1;
},
getEmployee() {
//员工
getEmployee() {
this.apipost(
"admin_get_EmployeeGetList",
this.employeeMsg,
......@@ -5086,7 +5110,7 @@
query: {
id: id,
OutBranchId: OutBranchId,
IsHaveAuth:true,
IsHaveAuth: true,
blank: "y",
tab: "团队收支明细"
}
......@@ -5109,23 +5133,23 @@
},
//跳转至领取合同
goContract(item){
if(item.ContractNum){
goContract(item) {
if (item.ContractNum) {
let routeData = this.$router.resolve({
name: 'ElectronicContract',
query: {
TCID: item.TCID,
orderID:item.OrderId,
orderID: item.OrderId,
blank: 'y'
}
})
window.open(routeData.href, '_blank')
}else{
} else {
let routeData = this.$router.resolve({
name: 'TravelContract',
query: {
TCID: item.TCID,
orderID:item.OrderId,
orderID: item.OrderId,
blank: 'y'
}
})
......@@ -5220,16 +5244,6 @@
OrderId: item.OrderId,
IsLeaderUseSeat: this.ConfigData.Config.IsLeaderUseSeat
};
// this.apipost('sellorder_post_SetOrderIsCanClear', msg,
// res => {
// if (res.data.resultCode == 1) {
// this.Success(res.data.message)
// this.getList();
// } else {
// this.Error(res.data.message)
// }
// },
// err => {})
},
gettypechange(type) {
//切换参团类型时 把值初始化
......
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