Skip to content

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

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

parents e33e2e74 a4ee3ee3
Show whitespace changes
Inline Side-by-side
Showing with 397 additions and 245 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 0a044525
......@@ -303,6 +303,7 @@
<p class="_tit">{{GetDetail.FinanceName}} <span style="color: red;" v-if="GetDetail.Status==4">已作废</span></p>
<div class="_conten">
<template v-if="!otherTable">
<!-- 付款 -->
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4 && showModel">
<my-Bill :ID="FrID" :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template>
......@@ -2259,6 +2260,7 @@ export default {
}
this.chongJudge(data)
this.GetDetail = data;
this.showModel = true
this.FrID = data.FrID
this.ChongDiMsg.Types = ''
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 0a044525
......@@ -326,6 +326,7 @@
</div>
</template>
<script>
import { connect } from 'net';
export default {
props:["ID","width","color","isPrintPage","name","OrderSource"], //接收参数 ID width color
data(){
......@@ -398,10 +399,36 @@ export default {
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
data.AuditSteps.reverse()
this.GetDetail = data;
console.log(this.GetDetail)
this.loading=false
this.$set(this.$data,"GetDetail",data);
console.log(this.GetDetail)
// console.log("sdfsaoifsjapof ",this.GetDetail)
let status=false;
if(this.GetDetail.DetailList && this.GetDetail.DetailList.length>0 && this.GetDetail.TCIDList.length>0){
this.GetDetail.DetailList.forEach(item=>{
if(item.CostTypeName=="地接费（领取）"){
status=true;
}
})
if(status){
// console.log("this.GetDetail.DetailList[0].Remark",this.GetDetail.DetailList[0].Remark)
this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{
if(res.data.resultCode==1){
// console.log("res.data.data",res.data.data);
if(res.data.data.length>0){
this.GetDetail.DetailList[0].Remark+="刷卡:"
res.data.data.forEach(item=>{
this.GetDetail.DetailList[0].Remark+=`${item.Name}，`;
})
}
}else{
this.Error(res.data.message)
}
},err=>{})
}
}
}
}, err => {})
},
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 0a044525
......@@ -205,7 +205,7 @@
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option>
<el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67'></el-option>
<el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67||msg.TemplateId===74'></el-option>
</el-select>
<el-select v-if="!showDisable" filterable v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 0a044525
......@@ -731,6 +731,11 @@
Name: subItem.NewHotelName,
ID: subItem.NewHotelId
});
//默认成日元
if(subItem.CurrencyId==0)
{
subItem.CurrencyId=3;
}
this.calculationPrice(subItem);
subItem.OrderDetailsList.forEach((x, index1) => {
x.HouseTypeCount = x.HouseTypeCount.toString();
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 0a044525
......@@ -236,7 +236,7 @@
</td>
<td style="white-space:nowrap; ">
<span v-if="childItem.HouseType != 5">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</span>
<span v-else>
{{subItem.PayStyle === 1 && subItem.DMCPayType == 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
......@@ -354,7 +354,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}} -->
</td>
</tr>
</table>
......@@ -403,7 +402,7 @@
</p>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
{{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
<td>
{{childItem.DiscountPrice}}%
......@@ -436,7 +435,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}} -->
</td>
</tr>
</table>
......@@ -512,7 +510,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}} -->
</td>
</tr>
</table>
......@@ -565,7 +562,7 @@
<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
</br></span>
</td>
<td style="padding: 5px 20px;" >
<td style="padding: 5px 20px;">
<div style="margin:10px 0" v-for="cur in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<p style="padding-left:20px;display:inline-block">
......@@ -582,11 +579,14 @@
</td>
<td>
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)" :style="{'color': subItem.Status == 3 ? 'red' : ''}">
@click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)"
:style="{'color': subItem.Status == 3 ? 'red' : ''}">
{{subItem.FinanceId}}({{subItem.Status == 3 ? '驳回' : subItem.Status == 2 ? '通过' : '审核中'}})</span>&nbsp;&nbsp;
<span v-if="subItem.Status == 3" class="cursorpointer text-decoration" @click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)" style="color: red;">重新发起</span>&nbsp;&nbsp;<span
class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)"
v-if="subItem.IsPublic === 4">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration"
<span v-if="subItem.Status == 3" class="cursorpointer text-decoration"
@click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)"
style="color: red;">重新发起</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('Application', subItem.FinanceId)" v-if="subItem.IsPublic === 4">申请书</span>
&nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
</td>
<td width="80" class="_zhidan">
......@@ -610,7 +610,8 @@
</th>
<th :colspan="1" width="200">
<div v-for="item in nav" style="margin: 10px 0;">
<input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn" @click="ZhuiJiaTuanKuan(item.OutBranchId)">
<input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn"
@click="ZhuiJiaTuanKuan(item.OutBranchId)">
</div>
</th>
</tr>
......@@ -626,7 +627,7 @@
</tr>
<tr class="_item_list" v-for="(item,index) in zhuijiaList">
<td class="Bill_par">
<span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)" class="text_d PingFangSC" >{{item.FrID}}</span>
<span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)" class="text_d PingFangSC">{{item.FrID}}</span>
</td>
<td>{{item.BranchName}}</td>
<td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
......@@ -653,10 +654,9 @@
</template>
</td>
<td>
<p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span>
<p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span
class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span>
</p>
<!-- <p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span
class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span></p> -->
</td>
<td>
<template v-if='item.Type===1'>
......@@ -686,7 +686,6 @@
</el-carousel-item>
</el-carousel>
</div>
</div>
</template>
......@@ -740,9 +739,9 @@
},
methods: {
// 20190815 新增领款单据重新生成自动带上计算后的金额
goFncEditUrl(url, crId, frId){
goFncEditUrl(url, crId, frId) {
let obj = {}
this.CurrencyListMoney.map(x=>{
this.CurrencyListMoney.map(x => {
if (x.CurrencyId == crId) {
obj = x
}
......@@ -750,13 +749,13 @@
let price = obj.money * 0.95
let calcPrice = 0
if (crId == 1) { //人民币
calcPrice = parseInt(price/1000) > 0 ? parseInt(price/1000) * 1000 : parseInt(price)
calcPrice = parseInt(price / 1000) > 0 ? parseInt(price / 1000) * 1000 : parseInt(price)
} else { // 其他
calcPrice = parseInt(price/10000) > 0 ? parseInt(price/10000) * 10000 : parseInt(price)
calcPrice = parseInt(price / 10000) > 0 ? parseInt(price / 10000) * 10000 : parseInt(price)
}
this.$router.push({
name: url,
query:{
query: {
"FrID": frId,
"blank": 'y',
"edit": true,
......@@ -838,7 +837,8 @@
Obj: {},
SourceID: 0,
TCIDList: TCIDARR,
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$routequery.id,
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this
.$routequery.id,
OtherType: 1
}
this.$router.push({
......@@ -1025,7 +1025,7 @@
if (obj.TaxType == 2) {
coefficient = 1 + 0.08;
}
if (obj.PayStyle === 1) {
if (obj.PayStyle === 1 || obj.PayStyle === 11) {
if (index == 4 && obj.DMCPayType !== 1) {
totalPrice += 0;
} else {
......@@ -1044,7 +1044,7 @@
obj.forEach(x => {
totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
})
if (sObj.PayStyle !== 1) {
if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11)) {
totalPrice = 0
}
return this.moneyFormat(totalPrice)
......@@ -1191,7 +1191,6 @@
this.apipost('dmcstatistics_post_GetNewPlanTotalPrice_V2', {
TCIDs: this.$route.query.id
}, res => {
// console.log("111",res);
if (res.data.resultCode == 1) {
this.TotalNav = res.data.data;
this.getNav();
......
src/components/SalesModule/CustomerCertification.vue
View file @ 0a044525
......@@ -6,10 +6,10 @@
class="ownScrollbarStyle"
@click.stop
>
<div class="title">实名认证详情</div>
<div class="title" style="background:#fff">实名认证详情</div>
<div class="list">
<div class="itemAnswer" v-show="answerDetailList.length>0">
<div class="item" v-for="item in answerDetailList">
<div class="itemAnswer" v-show="answerDetailList.length>0" style="padding:0">
<div class="item" v-for="item in answerDetailList" style="margin:0">
<div class="topMsg">
<!-- <img v-if="!item.photo" src="../../assets/img/litheader.png">
<img v-if="item.photo" :onerror="defaultImg" :src="item.photo"> -->
......
src/components/SalesModule/customerApproval.vue
View file @ 0a044525
......@@ -18,7 +18,7 @@
.customerApprovalLayercontentDiv .item .topMsg>img{float: left; margin-right: 13px;}
.customerApprovalLayercontentDiv .item .bottomMsg{padding: 15px 0;}
.customerApprovalLayercontentDiv .item .bottomMsg .pImg{margin-top: 10px;}
.customerApprovalLayercontentDiv .item .bottomMsg .pImg img{cursor: pointer;}
.customerApprovalLayercontentDiv .item .bottomMsg .pImg img{cursor: pointer;height: 100px;}
.customerApprovalLayercontentDiv .answerItem{ overflow: hidden; padding: 15px 0;}
.customerApprovalLayercontentDiv .answerItem>img{float: left;width: 28px; height: 28px; border-radius: 14px;margin-right: 10px;}
.customerApprovalLayercontentBtn{position: fixed; bottom: 0; background: #f5f5f5; width:420px; height:70px; line-height: 70px; text-align: right; padding: 0 20px;}
......@@ -43,6 +43,9 @@
</el-carousel-item>
</el-carousel>
</div>
<viewer :images="picObj" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="item in picObj" :src="item" :key="item">
</viewer>
<div :class="{customerApprovalLayer:showlayer}" @click="closeLayer">
......@@ -223,6 +226,7 @@
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
</template>
......@@ -230,6 +234,10 @@
export default {
data(){
return{
imageOptions:{
navbar:false,
title:false
},
lastVisitObj:{},
meta:'',
isOk:-1,
......@@ -262,6 +270,9 @@
}
},
methods:{
inited (viewer){
this.$viewer = viewer
},
saveApproval(){
if(this.addMsg.AdviceStatus==1)
{
......@@ -283,9 +294,11 @@
this.dspNone = true;
},
getPic(obj, index) {
this.initialIndex = index;
this.picObj = obj;
this.dspNone = false;
this.$viewer.show()
// this.initialIndex = index;
//
// this.dspNone = false;
},
getDetail(obj){
this.meta=obj.customerName
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 0a044525
......@@ -1513,7 +1513,7 @@
</tr>
<tr v-for="item in ScenicRefundList">
<td>
<el-checkbox :checked="item.IsChecked" @change="getGOScenic(item)"></el-checkbox>
<el-checkbox :checked="item.IsChecked" @change="getGOScenic(item),getGOScenictWO(),getTotalPrice()"></el-checkbox>
</td>
<td>
{{item.CouponsName}}
......@@ -1522,12 +1522,11 @@
{{item.RefundMoney}}
</td>
<td>
<el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item)" @change="getGOScenictWO"
<el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item),getTotalPrice()" @change="getGOScenictWO"
v-model="item.Number"></el-input>
</td>
<td>
<el-input class="w80" @keyup.native="checkPrice(item,'BackMoney')" @change="getGOScenictWO"
v-model="item.BackMoney"></el-input>
{{item.BackMoney}}
</td>
</tr>
</table>
......@@ -3697,6 +3696,8 @@
this.Error('不能超过总人数');
item.Number=0;
}
//默认算好退款金额
item.BackMoney=item.Number*item.RefundMoney;
},
platformOrderMethods() {
if (this.addMsg.PlatformOrder == "") {
......@@ -4314,7 +4315,13 @@
} else {
this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney;
}
if(this.ScenicRefundList.length>0&&this.ScenicRefundList!=null){
this.ScenicRefundList.forEach(x=>{
if(x.IsChecked){
this.addMsg.PreferPrice=this.addMsg.PreferPrice-x.BackMoney;
}
})
}
this.getTicheng();
if (!t) {
this.getTypePrice2()
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 0a044525
......@@ -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,85 @@
margin: 0 20px 5px 0;
width: 100%;
}
.GO_Contract{
color:blue;
.GO_Contract {
color: blue;
display: block;
cursor: pointer;
width:60px;
width: 60px;
}
.RegistrationList .leftSetInfo,.RegistrationList .GO_TPright{
float:left;
}
.RegistrationList .GO_Title{
display: inline-block;
margin-top: 10px;
padding-right:10px;
font-size:12px;
width: 90px;
text-align: right;
}
._TravelPricePopover .GOScenicDiv{
width: 500px;
max-height: 400px;
overflow: auto;
}
._TravelPricePopover table{
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
margin: 0 20px 5px 0;
width: 100%;
}
._TravelPricePopover table ._color_666{
background-color: #ededed;
color: #666666;
padding: 5px;
}
._TravelPricePopover table td{
background-color: #ffffff;
padding: 9px 0;
color: #333333;
text-align: center;
border: 1px solid #d2d2d2;
}
._TravelPricePopover table td._d_name {
background-color: #ededed;
}
.RegistrationList .SimulateDrop-box {
width: 230px;
min-height: 34px;
position: relative;
padding: 5px 21px 5px 6px;
float: left;
margin-top: 4px;
border: 1px solid #d1d1d1;
}
.RegistrationList .GO_SimulaDrop{
position: absolute;
right:10px;
top:5px;
color:#d1d1d1;
}
.RegistrationList .SD_flight {
display: inline-block;
height: 24px;
margin: 0 3px 3px 0;
overflow: hidden;
max-width: 200px;
white-space: nowrap;
text-overflow: ellipsis;
font-size:12px;
padding: 0 8px;
line-height: 22px;
background-color: #f0f2f5;
}
</style>
<template>
......@@ -1225,7 +1302,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 +1318,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 +1342,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>
......@@ -1427,14 +1505,47 @@
<el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
</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-col :span="8">
<div class="clearfix">
<div class="leftSetInfo">
<span class="GO_Title">可退景点</span>
</div>
<div class="GO_TPright clearfix">
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div class="GOScenicDiv">
<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>
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in ScenicRefundList"
v-if="subItem.IsChecked">{{subItem.CouponsName}}</span>
<i class="iconfont icon-arrow-down GO_SimulaDrop"></i>
</div>
</el-popover>
</div>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
......@@ -1687,10 +1798,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 +1817,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 +1893,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 +2198,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 +2207,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 +2222,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 +2563,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 +2649,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 +2785,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 +2848,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 +2986,8 @@
export default {
data() {
return {
redBagList:[],
HightUnitPrice: "0",
redBagList: [],
IsHaveAuth: 0, //是否有权限
// 修改应收总额
Ysze: false,
......@@ -2883,10 +3005,10 @@
LossMoney: 0,
},
//联运返佣msg
fanyongMsg:{
IsBackStatus:'',
UnionExtraMoney:'',
OrderId:0
fanyongMsg: {
IsBackStatus: '',
UnionExtraMoney: '',
OrderId: 0
},
FyongLoading: false,
pickerOptions0: {
......@@ -3085,15 +3207,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 +3402,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 +3423,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 +3434,7 @@
}, err => {})
},
// 20190807 新增追加团款
ZhuiJiaTuanKuan(orderID){
ZhuiJiaTuanKuan(orderID) {
this.zhuijiaShow = true
this.zhuijiaMsg = {
OrderId: orderID,
......@@ -3327,10 +3442,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 +3456,7 @@
return "临时领队"
}
},
gourlTip(path,id){
gourlTip(path, id) {
this.$router.push({
name: path,
query: {
......@@ -3350,7 +3465,7 @@
}
});
},
goUrlHappy(item){
goUrlHappy(item) {
this.$router.push({
name: "HappyPassbook",
query: {
......@@ -3359,22 +3474,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 +3503,7 @@
})
},
FyongLossOk: function () {
if(this.fanyongMsg.UnionExtraMoney===""){
if (this.fanyongMsg.UnionExtraMoney === "") {
this.Error('请输入额外返佣金额');
return;
}
......@@ -3467,17 +3580,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 +3609,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 +3703,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 +3997,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 +4149,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 +4190,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 +4250,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 +4314,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 +4744,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 +4836,6 @@
IsTravelMoney: 1
},
res => {
if (res.data.resultCode == 1) {
this.orderList = res.data.data;
}
......@@ -4747,7 +4857,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 +4871,8 @@
this.msg.pageIndex = 1;
this.currentPage = 1;
},
getEmployee() {
//员工
getEmployee() {
this.apipost(
"admin_get_EmployeeGetList",
this.employeeMsg,
......@@ -5086,7 +5195,7 @@
query: {
id: id,
OutBranchId: OutBranchId,
IsHaveAuth:true,
IsHaveAuth: true,
blank: "y",
tab: "团队收支明细"
}
......@@ -5109,23 +5218,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 +5329,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