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
Expand all 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()
......
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