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
Hide 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 @@ ...@@ -903,25 +903,29 @@
font-size: 12px; font-size: 12px;
margin-left: 10px; margin-left: 10px;
} }
.RL_Scenic{
width:400px; .RL_Scenic {
width: 400px;
max-height: 400px; max-height: 400px;
overflow: auto; overflow: auto;
} }
.RL_Scenic table th{
height:30px; .RL_Scenic table th {
border: 1px solid #d2d2d2; height: 30px;
border: 1px solid #d2d2d2;
} }
.RL_Scenic table td{
padding:9px 5px!important; .RL_Scenic table td {
border: 1px solid #d2d2d2; padding: 9px 5px !important;
border: 1px solid #d2d2d2;
} }
.RL_Scenic table ._color_666 { .RL_Scenic table ._color_666 {
background-color: #ededed; background-color: #ededed;
color:#666666; color: #666666;
} }
.RL_Scenic table{ .RL_Scenic table {
padding: 10px 0 0 20px; padding: 10px 0 0 20px;
border-collapse: collapse; border-collapse: collapse;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
...@@ -929,12 +933,14 @@ ...@@ -929,12 +933,14 @@
margin: 0 20px 5px 0; margin: 0 20px 5px 0;
width: 100%; width: 100%;
} }
.GO_Contract{
color:blue; .GO_Contract {
color: blue;
display: block; display: block;
cursor: pointer; cursor: pointer;
width:60px; width: 60px;
} }
</style> </style>
<template> <template>
...@@ -1225,7 +1231,8 @@ ...@@ -1225,7 +1231,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="成交单价" prop="Unit_Price" v-else> <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> </el-form-item>
</template> </template>
<el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4"> <el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4">
...@@ -1240,7 +1247,7 @@ ...@@ -1240,7 +1247,7 @@
<el-col :span="5" v-else> <el-col :span="5" v-else>
<el-form-item label="成交单价" prop="Unit_Price"> <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' class="w210" <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>
<el-form-item> <el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p> <p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
...@@ -1264,7 +1271,7 @@ ...@@ -1264,7 +1271,7 @@
<el-col :span="4"> <el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;"> <p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p> 本团不支持儿童出游!</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')" <el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
...@@ -1287,7 +1294,7 @@ ...@@ -1287,7 +1294,7 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
...@@ -1428,13 +1435,32 @@ ...@@ -1428,13 +1435,32 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="可退景点">
<el-select filterable multiple class='multiple_input' v-model='addMsg.ScenicRefundArr' <el-popover popper-class="RL_Scenic" trigger="click">
:placeholder="$t('pub.pleaseSel')" @change='ScenicRefundMethods'> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<el-option v-for='item in ScenicRefundList' :label='item.ScenicName' :value='item.Id' :key='item.Id'> <tr>
</el-option> <td class="_color_666">景点名称</td>
</el-select> <td class="_color_666">OP设置金额</td>
</el-form-item> <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-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -1681,36 +1707,37 @@ ...@@ -1681,36 +1707,37 @@
</td> </td>
<td> <td>
<el-popover v-if="item.CustomerId || item.CustomerId==0" style='padding: 0;' width="600" trigger="click"> <el-popover v-if="item.CustomerId || item.CustomerId==0" style='padding: 0;' width="600" trigger="click">
<div class="personNolayer"> <div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<tr> <tr>
<th>金额</th> <th>金额</th>
<th>类型</th> <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"
</tr> align="center">查看更多</span>)</th>
<tr v-for="(item2,index2) in redBagList" </tr>
:key="index2"> <tr v-for="(item2,index2) in redBagList" :key="index2">
<td>{{item2.Money}}</td> <td>{{item2.Money}}</td>
<td> <td>
{{item2.Type==1?"收入":"折扣"}} {{item2.Type==1?"收入":"折扣"}}
</td> </td>
<td>{{item2.Description}}</td> <td>{{item2.Description}}</td>
<td>{{item2.UpdateTime}}</td> <td>{{item2.UpdateTime}}</td>
</tr> </tr>
<tr v-if='redBagList.length==0'> <tr v-if='redBagList.length==0'>
<td colspan="4" align="center">暂无数据</td> <td colspan="4" align="center">暂无数据</td>
</tr> </tr>
<tr> <tr>
<!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> --> <!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> -->
</tr> </tr>
</table> </table>
</div> </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> </el-popover>
</td> <span v-else style="cursor: pointer;color: #e95252;">{{item.RedEnvelopeMoney}}</span>
</td>
<td>{{item.Refund}}</td> <td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td> <td>{{item.PlatformTax}}</td>
<td>{{item.ZaiTuMoney}}</td> <td>{{item.ZaiTuMoney}}</td>
...@@ -1779,11 +1806,11 @@ ...@@ -1779,11 +1806,11 @@
<!-- <span style="color:blue !important" v-for="(childItem) in item.GuestList" <!-- <span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> --> @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> -->
</p> </p>
<p v-if="item.CancelGuestList.length>0"> <p v-if="item.CancelGuestList.length>0">
<span class="" >取消名单:</span> <span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
<span v-for="(childItem) in item.CancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span> <span v-for="(childItem) in item.CancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
</span> </span>
</p> </p>
<!-- <p class="RL-redType RL-remarkCon" v-else>--> <!-- <p class="RL-redType RL-remarkCon" v-else>-->
...@@ -1860,19 +1887,19 @@ ...@@ -1860,19 +1887,19 @@
<p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}} <p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}}
</p> </p>
<div> <div>
<div style="color:green" v-if="childItem.CommissionMoney==''||childItem.CommissionMoney=='-1'"> <div style="color:green" v-if="childItem.CommissionMoney==''||childItem.CommissionMoney=='-1'">
<p v-if="childItem.ExtraRewardMoney>0">额外奖励金额：{{childItem.ExtraRewardMoney}}</p> <p v-if="childItem.ExtraRewardMoney>0">额外奖励金额：{{childItem.ExtraRewardMoney}}</p>
<p v-if="childItem.ExtraDeductMoney>0">额外扣除金额：{{childItem.ExtraDeductMoney}}</p> <p v-if="childItem.ExtraDeductMoney>0">额外扣除金额：{{childItem.ExtraDeductMoney}}</p>
</div> </div>
<div style="color:red" v-else> <div style="color:red" v-else>
<p v-if="childItem.ExtraRewardMoney>0">额外奖励金额：{{childItem.ExtraRewardMoney}}</p> <p v-if="childItem.ExtraRewardMoney>0">额外奖励金额：{{childItem.ExtraRewardMoney}}</p>
<p v-if="childItem.ExtraDeductMoney>0">额外扣除金额：{{childItem.ExtraDeductMoney}}</p> <p v-if="childItem.ExtraDeductMoney>0">额外扣除金额：{{childItem.ExtraDeductMoney}}</p>
</div> </div>
<div style="color:red"> <div style="color:red">
<p v-if="childItem.UnionExtraMoney!=0">联运额外返佣：{{childItem.UnionExtraMoney}}</p> <p v-if="childItem.UnionExtraMoney!=0">联运额外返佣：{{childItem.UnionExtraMoney}}</p>
</div> </div>
</div> </div>
</td> </td>
<td> <td>
<p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;"
...@@ -2086,42 +2113,47 @@ ...@@ -2086,42 +2113,47 @@
@click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span> @click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
</span> </span>
<p v-if="childItem.CancelGuestList.length>0"> <p v-if="childItem.CancelGuestList.length>0">
<span class="" >取消名单:</span> <span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
<span v-for="(subItem) in childItem.CancelGuestList">{{subItem.userName}} &nbsp;&nbsp;</span> <span v-for="(subItem) in childItem.CancelGuestList">{{subItem.userName}} &nbsp;&nbsp;</span>
</span> </span>
</p> </p>
<!-- <span class="RL-redType RL-remarkCon" v-else>--> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </span>--> <!-- </span>-->
<span style="display: block"> <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"
<el-popover trigger="click" popper-class="RL_Scenic"> style="color: #e95252">（{{childItem.OneSex==1?'单男':'单女'}}）</span>：{{childItem.OrderGuestHouseStr}}
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <el-popover trigger="click" popper-class="RL_Scenic">
<tr class="_color_666" style="text-align:center;"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<th width="150">景点名称</th> <tr class="_color_666" style="text-align:center;">
<th width="60">人数</th> <th width="150">景点名称</th>
<th width="60">退款金额</th> <th width="60">人数</th>
</tr> <th width="60">退款金额</th>
<tr v-for="fItem in childItem.OrderBackScenicList" style="text-align:center;"> </tr>
<td style="text-align:left;">{{fItem.CouponsName}}</td> <tr v-for="fItem in childItem.OrderBackScenicList" style="text-align:center;">
<td>{{fItem.Number}}</td> <td style="text-align:left;">{{fItem.CouponsName}}</td>
<td>{{fItem.BackMoney}}</td> <td>{{fItem.Number}}</td>
</tr> <td>{{fItem.BackMoney}}</td>
</table> </tr>
<span slot="reference" v-if="childItem.OrderBackScenicList&&childItem.OrderBackScenicList.length>0" style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span> </table>
</el-popover> <span slot="reference" v-if="childItem.OrderBackScenicList&&childItem.OrderBackScenicList.length>0"
style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span>
</el-popover>
</span> </span>
<div> <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"> <span v-if="childItem.OPTipMoney!=''" style="color:red">
（小费：{{childItem.OPTipMoney}}） （小费：{{childItem.OPTipMoney}}）
<span>单据：</span> <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)"
</span> style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId"
<span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)">领取合同</span> :key="i">{{id}}</span>
<span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span> </span>
</div> <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)">领取合同</span>
<span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -2152,18 +2184,18 @@ ...@@ -2152,18 +2184,18 @@
style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span> style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
</div> </div>
<template v-if="isShow==true"> <template v-if="isShow==true">
<div style="float:right;" v-if="childItem.IsCanClear==0"> <div style="float:right;" v-if="childItem.IsCanClear==0">
<input type="button" value="确认订单" class="rgsureBtn" @click="clearSeat(childItem,1)" <input type="button" value="确认订单" class="rgsureBtn" @click="clearSeat(childItem,1)"
style="display:block;" /> style="display:block;" />
<div class="rgComTips">该订单<span style="color:red;">未确认</span>会</div> <div class="rgComTips">该订单<span style="color:red;">未确认</span>会</div>
<div class="rgComTips">被系统自动清位</div> <div class="rgComTips">被系统自动清位</div>
</div> </div>
<div style="float:right;" v-else> <div style="float:right;" v-else>
<input type="button" value="取消确认" class="normalBtn" @click="clearSeat(childItem,2)" <input type="button" value="取消确认" class="normalBtn" @click="clearSeat(childItem,2)"
style="display:block;padding:0 15px;height:25px;" /> style="display:block;padding:0 15px;height:25px;" />
<div class="rgComTips">该订单<span style="color:green">已确认</span>不</div> <div class="rgComTips">该订单<span style="color:green">已确认</span>不</div>
<div class="rgComTips">会被系统清位</div> <div class="rgComTips">会被系统清位</div>
</div> </div>
</template> </template>
</td> </td>
<td colspan="4" style="height: 40px;cursor: pointer;" <td colspan="4" style="height: 40px;cursor: pointer;"
...@@ -2446,9 +2478,10 @@ ...@@ -2446,9 +2478,10 @@
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span> </span>
<p v-if="item.CancelGuestList.length>0"> <p v-if="item.CancelGuestList.length>0">
<span class="" >取消名单:</span> <span class="">取消名单:</span>
<span class="RL-redType RL-remarkCon"> <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> </span>
</p> </p>
<!-- <span class="RL-redType RL-remarkCon" v-else>--> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
...@@ -2531,7 +2564,8 @@ ...@@ -2531,7 +2564,8 @@
<div class="RL_ListDiv"> <div class="RL_ListDiv">
<div class="LeaderSpan" :class="{'ckedClass':ckedIndex==index}" v-for="(item,index) in leaderListArr" <div class="LeaderSpan" :class="{'ckedClass':ckedIndex==index}" v-for="(item,index) in leaderListArr"
@click="getLeaderInfo(index,item.LeaderId)" :key="item.subCode"> @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> </div>
</div> </div>
...@@ -2666,7 +2700,8 @@ ...@@ -2666,7 +2700,8 @@
<el-switch v-model="fanyongMsg.IsBackStatus" :active-value="0" :inactive-value="1"></el-switch> <el-switch v-model="fanyongMsg.IsBackStatus" :active-value="0" :inactive-value="1"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="额外返佣金额：" class="w280"> <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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -2728,7 +2763,8 @@ ...@@ -2728,7 +2763,8 @@
</div> </div>
</el-dialog> </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> <commonShouSun ref="childShou" :Type="1" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
</el-dialog> </el-dialog>
...@@ -2865,7 +2901,8 @@ ...@@ -2865,7 +2901,8 @@
export default { export default {
data() { data() {
return { return {
redBagList:[], HightUnitPrice: "0",
redBagList: [],
IsHaveAuth: 0, //是否有权限 IsHaveAuth: 0, //是否有权限
// 修改应收总额 // 修改应收总额
Ysze: false, Ysze: false,
...@@ -2883,10 +2920,10 @@ ...@@ -2883,10 +2920,10 @@
LossMoney: 0, LossMoney: 0,
}, },
//联运返佣msg //联运返佣msg
fanyongMsg:{ fanyongMsg: {
IsBackStatus:'', IsBackStatus: '',
UnionExtraMoney:'', UnionExtraMoney: '',
OrderId:0 OrderId: 0
}, },
FyongLoading: false, FyongLoading: false,
pickerOptions0: { pickerOptions0: {
...@@ -3085,15 +3122,6 @@ ...@@ -3085,15 +3122,6 @@
message: "请选择客户门店", message: "请选择客户门店",
trigger: "change" trigger: "change"
}], }],
// DepartureCityId: [
// { required: true, message: "请选择出发城市", trigger: "change" }
// ],
// ReturnArriveCityId: [
// { required: true, message: "请选择返回城市", trigger: "change" }
// ],
// GroupType: [
// { required: true, message: "请选择参团类型", trigger: "change" }
// ],
ClientSource: [{ ClientSource: [{
required: true, required: true,
message: "请选择客人来源", message: "请选择客人来源",
...@@ -3289,17 +3317,19 @@ ...@@ -3289,17 +3317,19 @@
}, },
methods: { methods: {
// OP备注赋值 // OP备注赋值
OPRemark(item){ OPRemark(item) {
this.apipost('sellorder_post_GetOrderEntity',{ID:item.OrderId}, res => { this.apipost('sellorder_post_GetOrderEntity', {
if (res.data.resultCode == 1) { ID: item.OrderId
this.OPRemarkMsg.OP_Remarks=res.data.data.model.OP_Remarks; }, res => {
} else { if (res.data.resultCode == 1) {
this.$message.error(res.data.message); this.OPRemarkMsg.OP_Remarks = res.data.data.model.OP_Remarks;
} } else {
}, null) this.$message.error(res.data.message);
}
}, null)
}, },
// 20190807 新增追加团款 提交按钮 // 20190807 新增追加团款 提交按钮
submitZhuiJiaTuanKuan(){ submitZhuiJiaTuanKuan() {
if (!this.zhuijiaMsg.ChangePrice) { if (!this.zhuijiaMsg.ChangePrice) {
this.$message.error('请输入追加金额！') this.$message.error('请输入追加金额！')
return return
...@@ -3308,7 +3338,7 @@ ...@@ -3308,7 +3338,7 @@
this.$message.error('请输入备注！') this.$message.error('请输入备注！')
return return
} }
this.apipost('sellorder_get_SetOrderOPTotalPrice',this.zhuijiaMsg, res => { this.apipost('sellorder_get_SetOrderOPTotalPrice', this.zhuijiaMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message) this.$message.success(res.data.message)
this.zhuijiaShow = false this.zhuijiaShow = false
...@@ -3319,7 +3349,7 @@ ...@@ -3319,7 +3349,7 @@
}, err => {}) }, err => {})
}, },
// 20190807 新增追加团款 // 20190807 新增追加团款
ZhuiJiaTuanKuan(orderID){ ZhuiJiaTuanKuan(orderID) {
this.zhuijiaShow = true this.zhuijiaShow = true
this.zhuijiaMsg = { this.zhuijiaMsg = {
OrderId: orderID, OrderId: orderID,
...@@ -3327,10 +3357,10 @@ ...@@ -3327,10 +3357,10 @@
ChangePrice: '', ChangePrice: '',
} }
}, },
setDanren(e){ setDanren(e) {
e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
}, },
getLeaderTypeStr: function (type, clas){ getLeaderTypeStr: function (type, clas) {
if (type == 2) { if (type == 2) {
return "领兼地" return "领兼地"
} else if (type == 1 && clas == 0) { } else if (type == 1 && clas == 0) {
...@@ -3341,7 +3371,7 @@ ...@@ -3341,7 +3371,7 @@
return "临时领队" return "临时领队"
} }
}, },
gourlTip(path,id){ gourlTip(path, id) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -3350,7 +3380,7 @@ ...@@ -3350,7 +3380,7 @@
} }
}); });
}, },
goUrlHappy(item){ goUrlHappy(item) {
this.$router.push({ this.$router.push({
name: "HappyPassbook", name: "HappyPassbook",
query: { query: {
...@@ -3359,24 +3389,22 @@ ...@@ -3359,24 +3389,22 @@
} }
}); });
}, },
getRedBag(item){ getRedBag(item) {
let msg={ let msg = {
CustomerId:item.CustomerId, CustomerId: item.CustomerId,
pageIndex: 1, pageIndex: 1,
pageSize: 4, pageSize: 4,
}; };
if(item.CustomerId){ if (item.CustomerId) {
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => { this.apipost('customer_post_GetC_BigRedEnvelopeInfoList', msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData; this.redBagList = res.data.data.pageData;
} else { } else {}
} }, err => {})
}, err => { } else {
}) this.redBagList = [];
}else{
this.redBagList =[];
} }
}, },
closeShouSunDialog() { closeShouSunDialog() {
this.shousunDialog = false; this.shousunDialog = false;
...@@ -3390,7 +3418,7 @@ ...@@ -3390,7 +3418,7 @@
}) })
}, },
FyongLossOk: function () { FyongLossOk: function () {
if(this.fanyongMsg.UnionExtraMoney===""){ if (this.fanyongMsg.UnionExtraMoney === "") {
this.Error('请输入额外返佣金额'); this.Error('请输入额外返佣金额');
return; return;
} }
...@@ -3467,17 +3495,16 @@ ...@@ -3467,17 +3495,16 @@
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.IsUnion = res.data.data.IsUnion this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder; this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
this.addObj = res.data.data.modelPrice; this.addObj = res.data.data.modelPrice;
let x = res.data.data.model; let x = res.data.data.model;
this.addMsg = x; this.addMsg = x;
this.addObj.OrderId = x.OrderId; this.addObj.OrderId = x.OrderId;
this.addObj.OpSetLossMoney = x.OpSetLossMoney; this.addObj.OpSetLossMoney = x.OpSetLossMoney;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr; this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid); this.getScenicRefund(obj.TCID, obj.OrderId);
this.getPlatformAccount(obj.PlatformAccountTypeId, obj.PlatformAccount); this.getPlatformAccount(obj.PlatformAccountTypeId, obj.PlatformAccount);
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
...@@ -3497,7 +3524,7 @@ ...@@ -3497,7 +3524,7 @@
} }
this.addMsg.BabyNum = x.BabyNum.toString(); this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString(); this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderBackScenicList=x.OrderBackScenicList; this.addMsg.OrderBackScenicList = x.OrderBackScenicList;
this.addMsg.GroupTypeNeedHouse = String(x.GroupTypeNeedHouse) this.addMsg.GroupTypeNeedHouse = String(x.GroupTypeNeedHouse)
this.IsChildrenTour = x.IsChildrenTour; this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount; this.IsBirdDiscount = x.IsBirdDiscount;
...@@ -3591,7 +3618,7 @@ ...@@ -3591,7 +3618,7 @@
}, },
err => {} 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); this.getDdlyList(this.addMsg.CustomerType);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -3885,19 +3912,17 @@ ...@@ -3885,19 +3912,17 @@
this.getTotalPrice(); this.getTotalPrice();
this.getTicheng(); this.getTicheng();
}, },
getScenicRefund(TCID) { getScenicRefund(TCID, OrderId) {
this.OrderId = OrderId;
let msg = {
TCID: TCID,
OrderId: OrderId
}
this.apipost( this.apipost(
"sellorder_get_GetScenicRefundList", { "sellorder_get_GetScenicRefundList", msg,
TCID
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.ScenicRefundList = res.data.data; this.ScenicRefundList = res.data.data;
this.ScenicRefundList.forEach(item => {
item["ScenicName"] =
item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
});
this.ScenicRefundMethods();
} }
}, },
err => {} err => {}
...@@ -4039,7 +4064,6 @@ ...@@ -4039,7 +4064,6 @@
if (this.addMsg.GroupType == 4) { if (this.addMsg.GroupType == 4) {
ChirdNum = 0 ChirdNum = 0
} }
console.log(ChirdNum)
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1 this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
this.addMsg.VisaNum = this.addMsg.VisaNum =
Number(this.addMsg.AirticketNum) + Number(this.addMsg.AirticketNum) +
...@@ -4081,7 +4105,7 @@ ...@@ -4081,7 +4105,7 @@
this.addMsg.Unit_Price = this.addMsg.TC_Price this.addMsg.Unit_Price = this.addMsg.TC_Price
return 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.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price this.addMsg.Unit_Price = this.addMsg.TC_Price
return return
...@@ -4141,10 +4165,11 @@ ...@@ -4141,10 +4165,11 @@
(Number(this.stratPrice) + Number(this.returnPrice)); (Number(this.stratPrice) + Number(this.returnPrice));
let dandijie let dandijie
if (this.addMsg.GroupType == 4) { 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 * (
ertong = 0 Number(this.addMsg.ChirdNoNeedBedNum))
ertongbed = 0 ertong = 0
zafeiqianzhen = 0 ertongbed = 0
zafeiqianzhen = 0
} else { } else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
} }
...@@ -4204,10 +4229,11 @@ ...@@ -4204,10 +4229,11 @@
(Number(this.stratPrice) + Number(this.returnPrice)); (Number(this.stratPrice) + Number(this.returnPrice));
let dandijie let dandijie
if (this.addMsg.GroupType == 4) { 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 * (
ertong = 0 Number(this.addMsg.ChirdNoNeedBedNum))
ertongbed = 0 ertong = 0
zafeiqianzhen = 0 ertongbed = 0
zafeiqianzhen = 0
} else { } else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
} }
...@@ -4449,9 +4475,9 @@ ...@@ -4449,9 +4475,9 @@
this.$message.warning("儿童占床数量不足！"); this.$message.warning("儿童占床数量不足！");
return; return;
} }
} }
if (this.userId == this.createByInfo) { if (this.userId == this.createByInfo) {
if (this.addMsg.CommissionSharePeople == "-1") { if (this.addMsg.CommissionSharePeople == "-1") {
...@@ -4633,12 +4659,12 @@ ...@@ -4633,12 +4659,12 @@
); );
} }
}, },
getKhmdList(id, lineId, employeeId,CustomerId) { getKhmdList(id, lineId, employeeId, CustomerId) {
var qMsg = { var qMsg = {
typeId: id, typeId: id,
lineId: lineId, lineId: lineId,
EmoloyeeId: employeeId, EmoloyeeId: employeeId,
customerId:CustomerId customerId: CustomerId
}; };
this.apipost( this.apipost(
"app_today_visit_GetNewOrderMyCustomerList", "app_today_visit_GetNewOrderMyCustomerList",
...@@ -4725,7 +4751,6 @@ ...@@ -4725,7 +4751,6 @@
IsTravelMoney: 1 IsTravelMoney: 1
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.orderList = res.data.data; this.orderList = res.data.data;
} }
...@@ -4747,7 +4772,6 @@ ...@@ -4747,7 +4772,6 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.OrderDataList = res.data.data; this.OrderDataList = res.data.data;
console.log(" this.OrderDataList ", this.OrderDataList )
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
} }
}, },
...@@ -4762,8 +4786,8 @@ ...@@ -4762,8 +4786,8 @@
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
}, },
//员工
getEmployee() { getEmployee() {
//员工
this.apipost( this.apipost(
"admin_get_EmployeeGetList", "admin_get_EmployeeGetList",
this.employeeMsg, this.employeeMsg,
...@@ -5086,7 +5110,7 @@ ...@@ -5086,7 +5110,7 @@
query: { query: {
id: id, id: id,
OutBranchId: OutBranchId, OutBranchId: OutBranchId,
IsHaveAuth:true, IsHaveAuth: true,
blank: "y", blank: "y",
tab: "团队收支明细" tab: "团队收支明细"
} }
...@@ -5109,23 +5133,23 @@ ...@@ -5109,23 +5133,23 @@
}, },
//跳转至领取合同 //跳转至领取合同
goContract(item){ goContract(item) {
if(item.ContractNum){ if (item.ContractNum) {
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: 'ElectronicContract', name: 'ElectronicContract',
query: { query: {
TCID: item.TCID, TCID: item.TCID,
orderID:item.OrderId, orderID: item.OrderId,
blank: 'y' blank: 'y'
} }
}) })
window.open(routeData.href, '_blank') window.open(routeData.href, '_blank')
}else{ } else {
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: 'TravelContract', name: 'TravelContract',
query: { query: {
TCID: item.TCID, TCID: item.TCID,
orderID:item.OrderId, orderID: item.OrderId,
blank: 'y' blank: 'y'
} }
}) })
...@@ -5220,16 +5244,6 @@ ...@@ -5220,16 +5244,6 @@
OrderId: item.OrderId, OrderId: item.OrderId,
IsLeaderUseSeat: this.ConfigData.Config.IsLeaderUseSeat 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) { 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