Skip to content

S
SuperMan
Commit a9cf4119 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents eb7c7491 bda9560e
Hide whitespace changes
Inline Side-by-side
Showing with 425 additions and 175 deletions
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ a9cf4119
......@@ -1598,7 +1598,7 @@ export default {
return this.priceFormat(rowData.YongJinShouRu);
if (field === "YingFu") return this.priceFormat(rowData.YingFu);
if (field === "MaoLi") return this.priceFormat(rowData.MaoLi);
if (field === "MaoLiRate") return this.priceFormat(rowData.MaoLiRate*100)+'%';
if (field === "MaoLiRate") return rowData.MaoLiRate+'%';
if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
if (field === "TransportCost")
return this.priceFormat(rowData.TransportCost);
......
src/components/SalesModule/groupTourOrder.vue
View file @ a9cf4119
......@@ -687,6 +687,41 @@
font-size: 14px;
vertical-align: top;
}
.Ysze{
position: relative;
}
.Ysze .changeYsze{
position: absolute;
left: 110%;
z-index: 10000;
top: 0;
width: 700px;
background: #fff;
box-shadow: 0 0 8px #888;
padding:10px;
box-sizing: border-box;
}
.Ysze .Ysze-button{
position: absolute;
left: 98%;
top:3px;
border-radius: 4px;
cursor: pointer;
}
.Ysze .changeYsze .el-form-item{
display: inline-block;
width:30%;
margin-bottom: 5px;
}
.Ysze .changeYsze .el-icon-close{
position: absolute;
right: 6px;
top:6px;
color: #f78989;
font-size:20px;
cursor: pointer;
}
</style>
<template>
......@@ -904,10 +939,59 @@
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="4" class="Ysze">
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input>
</el-form-item>
<button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="background: rgb(0, 198, 255); border-color: rgb(0, 198, 255);">
<i class="iconfont icon-nav-hangzheng" style="font-size:12px"></i>
</button>
<!-- 修改应收总额 -->
<div class="changeYsze" v-show="Ysze">
<el-form :model="addMsg_form" ref="addMsg_form" label-position="right" label-width="100px">
<span class="el-icon-close" @click="Ysze=false"></span>
<el-form-item label="签证费">
<el-input v-model='addMsg_form.VisaPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="退签证费">
<el-input v-model='addMsg_form.BackVisaPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="杂费">
<el-input v-model='addMsg_form.OtherPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="老人附加费">
<el-input v-model='addMsg_form.OldManChargePrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="儿童附加费">
<el-input v-model='addMsg_form.BabyChargePrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单房差">
<el-input v-model='addMsg_form.SingleRoomPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="儿童占床增收">
<el-input v-model='addMsg_form.ChildNeedPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="儿童不占床减免">
<el-input v-model='addMsg_form.ChildNoNeedPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="收损金额">
<el-input v-model='addMsg_form.OpSetLossMoney' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单地接">
<el-input v-model='addMsg_form.SingleDMCPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="婴儿价">
<el-input v-model='addMsg_form.BabyPrice' :disabled="true"></el-input>
</el-form-item>
<!-- <el-form-item v-if="IsUpdateOrderMoney">
<el-button type="primary" style="padding:6px 15px" @click="submitYSZEForm">确定</el-button>
<el-button type="danger" style="padding:6px" @click="Ysze=false">关闭</el-button> -->
<!-- </el-form-item> -->
</el-form >
</div>
</el-col>
<el-col :span="4">
<el-form-item label="预计提成" prop="Commission">
......@@ -1730,6 +1814,10 @@
export default {
data () {
return {
// 修改应收总额
Ysze:false,
addMsg_form:{},
pickerOptions0: {
disabledDate: time => {
let starTime = new Date(this.starTime)
......@@ -1985,6 +2073,11 @@
}
},
methods: {
// 给其他费用赋值
Yszefz(){
this.Ysze=true;
this.addMsg_form=Object.assign({},this.addObj);
},
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
......@@ -2406,6 +2499,7 @@
this.remarksMsg.isOrder = obj.isOrder
},
getDetail (obj) {
this.Ysze=false;
this.starTime = obj.startDate
this.endTime = obj.backDate
this.getMinPrice(obj.orderId)
......@@ -2418,9 +2512,13 @@
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 = res.data.data.modelPrice
let x = res.data.data.model;
this.addObj.OrderId=x.OrderId;
this.addObj.OpSetLossMoney=x.OpSetLossMoney;
this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr
this.addMsg.PlatformAccount = ''
this.getScenicRefund(obj.tcid)
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ a9cf4119
......@@ -631,15 +631,16 @@
top: 0;
width: 700px;
background: #fff;
box-shadow: 0 0 8px #333;
box-shadow: 0 0 8px #888;
padding:10px;
box-sizing: border-box;
}
.Ysze .Ysze-button{
position: absolute;
left: 98%;
top:15%;
top:3px;
border-radius: 4px;
cursor: pointer;
}
.Ysze .changeYsze .el-form-item{
display: inline-block;
......@@ -672,20 +673,20 @@
<el-form-item label="客户类型" prop="CustomerType">
<el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice' :disabled="true">
<el-option
v-for="item in khlxList"
v-for="(item,index) in khlxList"
:label='item.Name'
:value='item.Id'
:key='item.Id'>
:key='index'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="参团类型" prop="GroupType">
<el-select v-model='addMsg.GroupType' disabled filterable :placeholder="$t('pub.pleaseSel')">
<el-option
v-for="item in ctlxList"
v-for="(item,index) in ctlxList"
:label='item.Name'
:value='item.Id'
:key='item.Id'>
:key='index'>
</el-option>
</el-select>
</el-form-item>
......@@ -700,10 +701,10 @@
<el-form-item label="客户门店" prop="CustomerId" v-show="addMsg.CustomerType==1||addMsg.CustomerType==2||addMsg.CustomerType==''" >
<el-select v-model='addMsg.CustomerId' filterable :placeholder="$t('pub.pleaseSel')" @change='getSspt' :disabled="true">
<el-option
v-for="item in khmdList"
v-for="(item,index) in khmdList"
:label='item.customerName'
:value='item.customerId'
:key='item.customerId'>
:key='index'>
</el-option>
</el-select>
</el-form-item>
......@@ -983,7 +984,7 @@
<!-- 其他类型的修改信息2 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer" >
<p>修改123655
<p>修改
<span class="fr">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmit()"/>
<input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')"/>
......@@ -1112,60 +1113,60 @@
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="成人人数" prop="ManNum">
<el-form-item label="成人人数">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')" @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<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="儿童不占床">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')" @input='getNumber();getHouseNo();getTotalPrice()' ></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="儿童占床" prop="ChirdNeedBedNum">
<el-form-item label="儿童占床">
<el-input v-model='addMsg.ChirdNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')" @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="婴儿人数" prop="BabyNum">
<el-form-item label="婴儿人数">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')" @input='getNumber();getTotalPrice();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="老人人数" prop="OldPeopleNum">
<el-form-item label="老人人数">
<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-form-item label="单地接数量">
<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-form-item label="单房数量">
<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-form-item label="大床房">
<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-form-item label="三人房">
<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-form-item label="签证数量">
<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-form-item label="保险数量">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')" @input='yzSafeNum();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
......@@ -1175,7 +1176,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="预计用房" prop="PredictRoomNum">
<el-form-item label="预计用房">
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
</el-form-item>
</el-col>
......@@ -1185,13 +1186,15 @@
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="background: rgb(0, 198, 255); border-color: rgb(0, 198, 255);"><i class="iconfont icon-nav-hangzheng"></i></button>
<button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="background: rgb(0, 198, 255); border-color: rgb(0, 198, 255);">
<i class="iconfont icon-nav-hangzheng" style="font-size:12px"></i>
</button>
<!-- 修改应收总额 -->
<div class="changeYsze" v-show="Ysze">
<el-form :model="addMsg_form" ref="addMsg_form" label-position="right" label-width="100px">
<span class="el-icon-close" @click="Ysze=false"></span>
<el-form-item label="签证费">
<el-input v-model='addMsg_form.VisaPrice'></el-input>
<el-input v-model='addMsg_form.VisaPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="退签证费">
<el-input v-model='addMsg_form.BackVisaPrice' :disabled="!IsUpdateOrderMoney"></el-input>
......@@ -1216,7 +1219,7 @@
<el-form-item label="儿童不占床减免">
<el-input v-model='addMsg_form.ChildNoNeedPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="收损">
<el-form-item label="收损金额">
<el-input v-model='addMsg_form.OpSetLossMoney' :disabled="true"></el-input>
</el-form-item>
......@@ -1227,8 +1230,8 @@
<el-input v-model='addMsg_form.BabyPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item v-if="IsUpdateOrderMoney">
<el-button type="primary" style="padding:6px" @click="submitYSZEForm">确定</el-button>
<el-button type="danger" style="padding:6px" @click="Ysze=false">关闭</el-button>
<el-button type="primary" style="padding:6px 15px" @click="submitYSZEForm">确定</el-button>
<!-- <el-button type="danger" style="padding:6px" @click="Ysze=false">关闭</el-button> -->
</el-form-item>
</el-form >
</div>
......@@ -1244,7 +1247,7 @@
<el-form-item label="分摊人" prop="CommissionSharePeople">
<el-select :disabled="isUpdateSharePeople" filterable clearable @change='getTicheng' v-model='addMsg.CommissionSharePeople' :placeholder="$t('pub.pleaseSel')">
<el-option label='无' :value='comSelect'></el-option>
<el-option v-for='item in employeeList' :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'></el-option>
<el-option v-for='(item,index) in employeeList' :label='item.EmName' :value='item.EmployeeId' :key='index'></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -1284,7 +1287,7 @@
<el-option v-for='item in ScenicRefundList'
:label='item.ScenicName'
:value='item.Id'
:key='item.Id'>
:key='item.ScenicName'>
</el-option>
</el-select>
</el-form-item>
......@@ -1301,7 +1304,7 @@
v-for="item in ddlyList"
:label='item.Name'
:value='item.Id'
:key='item.Id'>
:key='item.Name'>
</el-option>
</el-select>
</el-form-item>
......@@ -1313,7 +1316,7 @@
v-for="item in ssptList"
:label='item.brandName'
:value='item.dictId'
:key='item.dictId'>
:key='item.brandName'>
</el-option>
</el-select>
</el-form-item>
......@@ -1325,7 +1328,7 @@
v-for="item in jyfsList"
:label='item.Name'
:value='item.Id'
:key='item.Id'>
:key='item.Name'>
</el-option>
</el-select>
</el-form-item>
......@@ -1333,7 +1336,7 @@
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="收款账户">
<el-select filterable v-model='addMsg.PlatformAccount' @change="changeSelect">
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.Alias'>
</el-option>
</el-select>
</el-form-item>
......@@ -1492,6 +1495,11 @@
<div>领队导游</div>
</div>
</div>
<!-- v-if="tuanInfo.config.IsOrder!=1" -->
<div style="float:right">
<span style="color:#f78989"> 订单操作已关闭，如需修改请联系OP.</span>
</div>
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle">
<!-- 表格 -->
......@@ -1781,18 +1789,18 @@
<tr>
<td></td>
<td colspan="14" class="groupTourOrderByTuan_seat">
<div>
<div>
<span>本团机位：</span>
<span>{{tuanInfo.config&&tuanInfo.config.YSeat}}Y + {{tuanInfo.config&&tuanInfo.config.CSeat}}E + {{tuanInfo.config&&tuanInfo.config.FSeat}}F</span>
</div>
<div>
<span>剩余机位：</span>
<span>{{tuanInfo.config&&tuanInfo.config.YSeat-seat.YSeat>0?tuanInfo.config.YSeat-seat.YSeat:0}}Y + {{tuanInfo.config&&tuanInfo.config.CSeat-seat.CSeat>0?tuanInfo.config.CSeat-seat.CSeat:0}}E + {{tuanInfo.config&&tuanInfo.config.FSeat-seat.FSeat>0?tuanInfo.config.FSeat-seat.FSeat:0}}F</span>
<span>{{tuanInfo.config&&tuanInfo.config.YSeat-seat.YSeat >0 ? tuanInfo.config.YSeat-seat.YSeat:0}}Y + {{tuanInfo.config&&tuanInfo.config.CSeat-seat.CSeat>0?tuanInfo.config.CSeat-seat.CSeat:0}}E + {{tuanInfo.config&&tuanInfo.config.FSeat-seat.FSeat>0?tuanInfo.config.FSeat-seat.FSeat:0}}F</span>
</div>
<div>
<span>候补机位：</span>
<span>{{tuanInfo.config&&tuanInfo.config.YSeat-seat.YSeat>0?0:seat.YSeat-tuanInfo.config.YSeat}}Y + {{tuanInfo.config&&tuanInfo.config.CSeat-seat.CSeat>0?0:seat.CSeat-tuanInfo.config.CSeat}}E + {{tuanInfo.config&&tuanInfo.config.FSeat-seat.FSeat>0?0:seat.FSeat-tuanInfo.config.FSeat}}F</span>
</div>
<span>{{tuanInfo.config&&tuanInfo.config.YSeat-seat.YSeat>0 ? 0 : seat.YSeat-tuanInfo.config.YSeat}}Y + {{tuanInfo.config&&tuanInfo.config.CSeat-seat.CSeat>0?0:seat.CSeat-tuanInfo.config.CSeat}}E + {{tuanInfo.config&&tuanInfo.config.FSeat-seat.FSeat>0?0:seat.FSeat-tuanInfo.config.FSeat}}F</span>
</div>
<div>
<span>参团：</span>
<span>{{seat.joinGroupNum}}</span>
......@@ -2108,6 +2116,7 @@ export default {
// 修改应收总额
Ysze:false,
addMsg_form:{},
OPRemarkMsg: {
OrderId: '',
OP_Remarks: '',
......@@ -2844,7 +2853,7 @@ submitYSZEForm(){
this.getTotalPrice();
}else{
this.Ysze=false;
this.$message.erroe(res.data.message);
this.$message.error(res.data.message);
}
},
err => {}
......@@ -2870,8 +2879,10 @@ submitYSZEForm(){
let modelPrice=res.data.data.modelPrice;
this.addMsg = x;
this.addObj = res.data.data.modelPrice;
this.addObj.OrderId=x.OrderId;
this.addObj.OpSetLossMoney=x.OpSetLossMoney;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid);
this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount);
......@@ -3856,6 +3867,8 @@ submitYSZEForm(){
this.seat.joinGroupNum = res.data.data.pageData.joinGroupNum
this.seat.leaderNum = res.data.data.pageData.leaderNum
this.seat.ownVisaNum = res.data.data.pageData.ownVisaNum
console.log("this.seat",this.seat)
} else {
this.$message.error(res.data.message);
}
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ a9cf4119
......@@ -813,10 +813,46 @@
.RegistrationList .nowrap{
white-space:nowrap;
}
.Ysze{
position: relative;
}
.Ysze .changeYsze{
position: absolute;
left: 110%;
z-index: 10000;
top: 0;
width: 700px;
background: #fff;
box-shadow: 0 0 8px #888;
padding:10px;
box-sizing: border-box;
}
.Ysze .Ysze-button{
position: absolute;
left: 93%;
top:3px;
border-radius: 4px;
cursor: pointer;
}
.Ysze .changeYsze .el-form-item{
display: inline-block;
width:30%;
margin-bottom: 5px;
}
.Ysze .changeYsze .el-icon-close{
position: absolute;
right: 6px;
top:6px;
color: #f78989;
font-size:20px;
cursor: pointer;
}
</style>
<template>
<div class="flexOne RegistrationList" style="min-width: 1200px;">
<div class="planeTicketEdit ownScrollbarStyle" v-show="isShowLayer2">
<p>修改
<span class="fr" style="margin-right:60px;">
......@@ -1012,6 +1048,7 @@
</el-row>
</el-form>
</div>
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer">
<p>修改
<span class="fr" style="margin-right:60px;">
......@@ -1194,11 +1231,59 @@
<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-col :span="4" class="Ysze">
<el-form-item label="应收总额" prop="PreferPrice" style="position:relative">
<el-input v-model='addMsg.PreferPrice' type="number" @input.native='getTicheng()'
:disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input>
</el-form-item>
<button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="background: rgb(0, 198, 255); border-color: rgb(0, 198, 255);">
<i class="iconfont icon-nav-hangzheng" style="font-size:12px"></i>
</button>
</el-form-item>
<!-- 修改应收总额 -->
<div class="changeYsze" v-show="Ysze">
<el-form :model="addMsg_form" ref="addMsg_form" label-position="right" label-width="100px">
<span class="el-icon-close" @click="Ysze=false"></span>
<el-form-item label="签证费">
<el-input v-model='addMsg_form.VisaPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="退签证费">
<el-input v-model='addMsg_form.BackVisaPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="杂费">
<el-input v-model='addMsg_form.OtherPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="老人附加费">
<el-input v-model='addMsg_form.OldManChargePrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="儿童附加费">
<el-input v-model='addMsg_form.BabyChargePrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="单房差">
<el-input v-model='addMsg_form.SingleRoomPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="儿童占床增收">
<el-input v-model='addMsg_form.ChildNeedPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="儿童不占床减免">
<el-input v-model='addMsg_form.ChildNoNeedPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="收损金额">
<el-input v-model='addMsg_form.OpSetLossMoney' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单地接">
<el-input v-model='addMsg_form.SingleDMCPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item label="婴儿价">
<el-input v-model='addMsg_form.BabyPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
<el-form-item v-if="IsUpdateOrderMoney">
<el-button type="primary" style="padding:6px 15px" @click="submitYSZEForm">确定</el-button>
</el-form-item>
</el-form >
</div>
</el-col>
<!-- <el-col :span="4">
<el-form-item label="预计提成" prop="Commission">
......@@ -1371,6 +1456,8 @@
<input type="button" class="normalBtn" @click="goUrl('TravelPassengerList',msg.TCID,'旅客名单')" value="旅客名单" />
</div>
</div>
<!-- 表格 -->
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle">
<table class="RegisTrationTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
......@@ -1393,6 +1480,7 @@
<tr>
<td v-show="OrderDataList.Length==0" colspan="14" align="center">暂无数据</td>
</tr>
<tr v-if="OrderDataList.leadetList!=null && OrderDataList.leadetList.length>0">
<td colspan="14">
订单类型：<span class="RL-redType">领队</span>
......@@ -2146,6 +2234,11 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
export default {
data() {
return {
// 修改应收总额
Ysze:false,
addMsg_form:{},
IsUpdateOrderMoney:false,
OrderLoading:false,
OrderLossMsg:{
OrderId:"",
......@@ -2516,6 +2609,162 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan
},
methods: {
// 给其他费用赋值
Yszefz(){
this.Ysze=true;
this.addMsg_form=Object.assign({},this.addObj);
},
// 修改应收总额
submitYSZEForm(){
this.apipost("sellorder_post_SetOrderHistoryPrice",this.addMsg_form,
res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.Ysze=false;
this.addObj=this.addMsg_form;
this.getTotalPrice();
}else{
this.Ysze=false;
this.$message.error(res.data.message);
}
},
err => {}
);
},
// 点击弹出下拉框
getDetail(obj) {
this.Ysze=false;
this.starTime = obj.StartDate;
this.endTime = obj.BackDate;
this.getMinPrice(obj.OrderId);
this.addMsg.OrderId = obj.OrderId;
this.IsChargeLossOrders=obj.IsChargeLossOrders;
this.apipost(
"sellorder_post_GetOrderEntity", {
ID: obj.OrderId
},
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.getPlatformAccount(obj.PlatformAccountTypeId,obj.PlatformAccount);
this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString();
this.addMsg.ClientSource = x.ClientSource.toString();
this.addMsg.GroupType = x.GroupType.toString();
this.addMsg.TradeWay = x.TradeWay.toString();
this.addMsg.PredictRoomNum = x.PredictRoomNum;
this.addMsg.IsIntermodal = x.IsIntermodal.toString();
this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
this.addMsg.ChirdNum = x.ChirdNum.toString();
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
this.OpSetLossMoney = x.OpSetLossMoney;
this.stratPrice = 0;
if (res.data.data.modelPrice && res.data.data.modelPrice.GoAddPrice) {
this.stratPrice = res.data.data.modelPrice.GoAddPrice;
}
if (this.stratPrice == 0) {
this.stratPriceShow = false;
} else {
this.stratPriceShow = true;
}
this.returnPrice = 0;
if (res.data.data.modelPrice && res.data.data.modelPrice.BackAddPrice) {
this.returnPrice = res.data.data.modelPrice.BackAddPrice;
}
if (this.returnPrice == 0) {
this.returnPriceShow = false;
} else {
this.returnPriceShow = true;
}
if (x.ClientSource == 1) {
this.isPingtai = true;
}
if (this.addMsg.GroupType != 5) {
this.isShowLayer = true;
this.isShowLayer2 = false;
} else {
this.isShowLayer = false;
this.isShowLayer2 = true;
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.TCID}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
this.isShowLayerRemarks = false;
this.showSetLeader = false;
this.apipost(
"app_today_visit_GetCustomerBrandByCustomerId", {
customerInfoId: x.CustomerId
},
res => {
if (res.data.resultCode == 1) {
this.ssptList = res.data.data;
this.addMsg.BrandId = x.BrandId;
}
},
err => {}
);
this.getKhmdList(this.addMsg.CustomerType, obj.LineId, this.addMsg.CreateBy);
this.getDdlyList(this.addMsg.CustomerType);
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
// 获取订单收损详情
OrderLossInfo(childItem){
this.OrderLossMsg.OrderId=childItem.OrderId;
......@@ -2842,132 +3091,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
this.remarksMsg.Remarks = obj.Remarks
this.remarksMsg.OldRemarks = obj.Remarks;
},
getDetail(obj) {
this.starTime = obj.StartDate;
this.endTime = obj.BackDate;
this.getMinPrice(obj.OrderId);
this.addMsg.OrderId = obj.OrderId;
this.IsChargeLossOrders=obj.IsChargeLossOrders;
this.apipost(
"sellorder_post_GetOrderEntity", {
ID: obj.OrderId
},
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.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid);
this.getPlatformAccount(obj.PlatformAccountTypeId,obj.PlatformAccount);
this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString();
this.addMsg.ClientSource = x.ClientSource.toString();
this.addMsg.GroupType = x.GroupType.toString();
this.addMsg.TradeWay = x.TradeWay.toString();
this.addMsg.PredictRoomNum = x.PredictRoomNum;
this.addMsg.IsIntermodal = x.IsIntermodal.toString();
this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
this.addMsg.ChirdNum = x.ChirdNum.toString();
this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
this.OpSetLossMoney = x.OpSetLossMoney;
this.stratPrice = 0;
if (res.data.data.modelPrice && res.data.data.modelPrice.GoAddPrice) {
this.stratPrice = res.data.data.modelPrice.GoAddPrice;
}
if (this.stratPrice == 0) {
this.stratPriceShow = false;
} else {
this.stratPriceShow = true;
}
this.returnPrice = 0;
if (res.data.data.modelPrice && res.data.data.modelPrice.BackAddPrice) {
this.returnPrice = res.data.data.modelPrice.BackAddPrice;
}
if (this.returnPrice == 0) {
this.returnPriceShow = false;
} else {
this.returnPriceShow = true;
}
if (x.ClientSource == 1) {
this.isPingtai = true;
}
if (this.addMsg.GroupType != 5) {
this.isShowLayer = true;
this.isShowLayer2 = false;
} else {
this.isShowLayer = false;
this.isShowLayer2 = true;
}
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.TCID}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
this.isShowLayerRemarks = false;
this.showSetLeader = false;
this.apipost(
"app_today_visit_GetCustomerBrandByCustomerId", {
customerInfoId: x.CustomerId
},
res => {
if (res.data.resultCode == 1) {
this.ssptList = res.data.data;
this.addMsg.BrandId = x.BrandId;
}
},
err => {}
);
this.getKhmdList(this.addMsg.CustomerType, obj.LineId, this.addMsg.CreateBy);
this.getDdlyList(this.addMsg.CustomerType);
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
getTypePrice() {
this.addMsg.ContactName = "";
this.addMsg.ContactMobile = "";
......@@ -3706,8 +3830,10 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
msg,
res => {
this.loading = false;
console.log("数据列表",res)
if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data;
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
}
},
err => {}
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ a9cf4119
......@@ -179,7 +179,19 @@
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>提成
</span>联运成本
</div>
<div class="Team_Incontent">
<div>联运成本<span>￥{{DataList.LYCB}}</span></div>
</div>
</div>
</el-col>
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>提成（无单据）
</div>
<div class="Team_Incontent">
<div>预计提成<span>￥{{DataList.ExpectedCut}}</span></div>
......@@ -209,7 +221,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FiniceReciveList">
<tr v-if="isExists(item.CostTypeList,'团费')">
<tr v-if="isExists(item.CostTypeList,'团费') || isExists(item.CostTypeList,'团款')">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td>
......@@ -429,7 +441,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FiniceReciveList">
<tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入')&& NotExists(item.CostTypeList,'自费收入')&& NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'团款') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入') && NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td>
......@@ -1189,7 +1201,7 @@
this.$router.push({
name: path,
query: {
id: id
id: id,blank: "y"
}
});
},
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ a9cf4119
......@@ -256,7 +256,8 @@
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[index].OPInnerRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPInnerRemark}}</div>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP对外备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
</div>
</td>
......
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