Skip to content

S
SuperMan
Commit ae22c6d1 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents cccf0ec0 9fd2141f
Show whitespace changes
Inline Side-by-side
Showing with 1896 additions and 1796 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ ae22c6d1
......@@ -1721,6 +1721,16 @@ export default {
tab: "国内销售提成详情"
}
});
}else if(GetDetail.OtherType==69){//跳转台湾提成的三级详情
this.$router.push({
name: 'domesticCommissiondetailsTW',
query: {
PeriodId:GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y",
tab: "台湾销售提成详情"
}
});
}else{
this.$router.push({
name: 'CommissionDetail',
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ ae22c6d1
......@@ -1182,6 +1182,16 @@ export default {
tab: "国内销售提成详情"
}
});
}else if(GetDetail.OtherType==69){//跳转台湾提成的三级详情
this.$router.push({
name: 'domesticCommissiondetailsTW',
query: {
PeriodId:GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y",
tab: "台湾销售提成详情"
}
});
}else{
this.$router.push({
name: 'CommissionDetail',
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ ae22c6d1
......@@ -168,7 +168,10 @@
<span slot="reference" class="_flow_chart">{{$t('fnc.liuchengtu')}}</span>
</el-popover>
<p class="rb_tit">{{BillName}}
(<el-select filterable v-model='msg.RB_Branch_Id' ref='CostTypeId' @change="admin_get_DepartmentGetList(msg.RB_Branch_Id)" class="w120 _border_b_1">
(<el-select filterable v-model='msg.RB_Branch_Id' ref='CostTypeId'
@change="admin_get_DepartmentGetList(msg.RB_Branch_Id)"
class="w120 _border_b_1"
:disabled="orderObj&&orderObj.Rate?true:false">
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
......@@ -336,7 +339,9 @@
<el-input v-model="da.UnitPrice" @input="chages($event)" type="text" :disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td>
<td height="26px">
<el-select filterable :disabled="detailCurrDis || (daIn === 0 && XSTC)" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
<el-select filterable :disabled="detailCurrDis || (daIn === 0 && XSTC)"
v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')"
@change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
<el-option v-for='item in coinGetList'
:label='item.Name'
:value='item.ID'
......@@ -583,6 +588,7 @@ import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
export default {
data(){
return{
yballPriceTo: 0,//原币合计
maxmoneyData:0,
detailCurrDis:false,
Description:"",
......@@ -892,6 +898,7 @@ export default {
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
},
AddFinancial(z){ //保存
if(z){
this.msg.Status = 0;
}else{
......@@ -930,6 +937,18 @@ export default {
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2?this.orderObj.ReFinanceId2:0;
this.msg.ECOrderList = this.orderObj.ECOrderList?this.orderObj.ECOrderList:[];
}
// 台湾提成汇率
if(this.orderObj&&this.orderObj.Rate&&this.orderObj.Money){
let yballPrice = 0
this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
yballPrice += Number(yballPrice+item.UnitPriceTo)
})
this.yballPriceTo = yballPrice
if(this.orderObj.Money!=this.yballPriceTo){
this.Error(`原币总金额必须等于${this.orderObj.Money}！`)
return
}
}
if(this.commissionObj){
this.msg.OtherType = this.commissionObj.OtherType?this.commissionObj.OtherType:0;
this.msg.ReFinanceId = this.commissionObj.PeroidsId?this.commissionObj.PeroidsId:0;
......@@ -1025,6 +1044,8 @@ export default {
this.msg.OtherType=this.czmsg.OtherType;
this.msg.ReTCID=this.czmsg.ReTCID;
}
console.log(this.msg,'====--------')
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
//清除旅客名单数据
......@@ -1065,7 +1086,6 @@ export default {
this.$set(this.msg.detailList,i,this.msg.detailList[i]);
},
addList(t,i){ // 添加
let list ={};
if(t==2&&i){
list = JSON.parse(JSON.stringify(this.msg.detailList[i-1]));
......@@ -1127,7 +1147,13 @@ export default {
if(t==2&&i){
numberC = parseFloat(this.msg.detailList[i-1].Number);
price = parseFloat(this.msg.detailList[i-1].UnitPrice);
// 台湾提成汇率
if(this.orderObj&&this.orderObj.Rate){
rate = parseFloat(this.orderObj.Rate);
}else{
rate = parseFloat(this.msg.detailList[i-1].Rate);
}
if(price==0){
price='';
this.msg.detailList[i-1].UnitPrice='';
......@@ -1146,7 +1172,12 @@ export default {
}else{
numberC = parseFloat(this.detailList.Number);
price = parseFloat(this.detailList.UnitPrice);
// 台湾提成汇率
if(this.orderObj&&this.orderObj.Rate){
rate = parseFloat(this.orderObj.Rate);
}else{
rate = parseFloat(this.detailList.Rate);
}
if(price==0){
price='';
this.detailList.UnitPrice='';
......@@ -1201,7 +1232,6 @@ export default {
this.msg.detailList[index].currenName = x.Name;
}
}
this.$forceUpdate();
}
})
......@@ -1329,15 +1359,25 @@ export default {
this.coinGetList.forEach(x=>{
if(x.ID==this.detailList.CurrencyId){
this.detailList.currenName = x.Name
// 台湾提成汇率
if(this.orderObj&&this.orderObj.Rate){
this.detailList.Rate = this.orderObj.Rate
}else{
this.detailList.Rate = x.Rate
}
}
this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
if(item.CurrencyId==x.ID){
item.currenName = x.Name
// 台湾提成汇率
if(this.orderObj&&this.orderObj.Rate){
item.Rate = this.orderObj.Rate
}else{
item.Rate = x.Rate
}
numberC = parseFloat(item.Number);
}
price = parseFloat(item.UnitPrice);
rate = parseFloat(item.Rate);
if(price==0){
......@@ -1397,6 +1437,9 @@ export default {
// }
if (!this.orderObj && id > 0) {
this.msg.RB_Branch_Id = this.msg.RB_Branch_Id
}else if(this.orderObj&&this.orderObj.OutBranchId!=''){
// 台湾提成公司
this.msg.RB_Branch_Id = this.orderObj.OutBranchId;
} else {
this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
}
......@@ -1408,6 +1451,8 @@ export default {
} else if(this.$route.query.companyID){
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
}
this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
this.msg.PayDate = this.msg.PayDate ;
this.msg.detailList=[];
......@@ -1415,6 +1460,7 @@ export default {
this.financeinfo_post_GetClientAccountListEdit(data.ClientType);
this.Financial_post_GetCostTypeList(data.TemplateId,2);
let allPrice = 0
let yballPrice = 0
data.DetailList.forEach(x=>{
// 20190815 新增领款单据重新生成自动带上计算后的金额
x.UnitPrice = this.$route.query.dijieEditMoney ? this.$route.query.dijieEditMoney : x.UnitPrice
......@@ -1443,6 +1489,7 @@ export default {
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
this.allPriceTocalc =Math.round(this.allPrice* 100) / 100
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
this.BillName = data.CompanyName;
this.BillSonName = data.FinanceName;
......@@ -1521,6 +1568,7 @@ export default {
this.loading=false;
this.$message.error(res.data.message);
}
}, err => {})
},
admin_get_DepartmentGetList(Bid, T){
......@@ -1555,6 +1603,11 @@ export default {
}else {
this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage().RB_Department_Id;
}
// 台湾提成公司
if(this.orderObj&&this.orderObj.OutBranchId!=''){
this.msg.RB_Branch_Id = this.orderObj.OutBranchId;
}
}
}, err => {})
},
......@@ -1618,7 +1671,7 @@ export default {
}, err => {})
}
if(this.msg.RB_Branch_Id){
if(this.msg.RB_Branch_Id!=''){
this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id)
}
}, err => {})
......@@ -1737,6 +1790,7 @@ export default {
this.tradeObj = JSON.parse(this.$route.query.tradeObj);
} else{
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
}
this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
......@@ -1759,9 +1813,12 @@ export default {
this.coinGetList = res.data.data;
}
}, err => {})
},
mounted(){
// 付款单新增或修改 获取最大金额
if((this.$route.query.type && this.$route.query.type==2) || (this.$route.query.Type && this.$route.query.Type==2)){
this.MaxMoney();
......@@ -1771,7 +1828,13 @@ export default {
this.EmployeeId=userInfo.EmployeeId;
this.emplyeeName=userInfo.emName;
this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
// 台湾提成公司
if(this.orderObj&&this.orderObj.OutBranchId!=''){
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj.OutBranchId;
}else{
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
}
this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id;
this.IsUploadPic = this.$route.query.IsUploadPic;
this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
......@@ -1811,7 +1874,6 @@ export default {
}
this.getCompany();
// this.admin_get_DepartmentGetList();
},
......
src/components/FinancialModule/domesticCommissionTW.vue
View file @ ae22c6d1
......@@ -65,7 +65,7 @@
<th>总提成</th>
<th>所属公司提成</th>
<th>财务单据</th>
<th width="150">汇率</th>
<th width="280">汇率</th>
<th>操作信息</th>
<th>操作</th>
</tr>
......@@ -91,16 +91,16 @@
<div
:style="{'border-top': y!=0? '1px solid #eeee':''}"
style="text-align: left;">
<span style="cursor: pointer;">
<span v-if="x.OutBranchName">{{x.OutBranchName}}：</span>
<span>
{{x.Rate?x.Rate:'未设汇率'}}
</span>
<span style="color: #6E6E6E;">{{x.CurrencyName}}</span>
</div>
<div style="flex-shrink: 0;justify-content: end;align-items: flex-end;"
v-if="y==item.CurrencyRateList.length-1">
<i v-if="item.FinanceIdList.length==0"
class="el-icon-edit"
v-if="y==item.CurrencyRateList.length-1&&isRateAuthoTW&&item.FinanceIdList.length==0">
<i class="el-icon-edit"
style="color: #409eff;cursor: pointer;" @click="editRate(item)"></i>
</div>
</div>
......@@ -116,7 +116,7 @@
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
<el-tooltip v-if="cMaker==true&&item.BranchCommission>0&&item.CurrencyRateList[0].Rate>0" class="item" effect="dark" content="制单" placement="top">
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
<el-button @click="YijianZD(item)" type="danger" class="CM_look"
icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
</div>
......@@ -208,6 +208,7 @@
btnLoading: false,
BranchList:[],
cMaker:false,//是否可以制单
isRateAuthoTW: false,//是否可以修改汇率
}
},
mounted() {
......@@ -220,6 +221,9 @@
if (ActionMenuCode.indexOf('home_DCommissionZD') != -1) {
this.cMaker = true;
}
if (ActionMenuCode.indexOf('isRateAuthoTW') != -1){
this.isRateAuthoTW = true
}
this.getList();
this.getCompanyList()
......@@ -377,7 +381,8 @@
XSTC: 1,
OtherType:69,
ReFinanceId:item.Id,
Rate: item.CurrencyRateList[0].Rate
Rate: item.CurrencyRateList[0].Rate,
OutBranchId: this.msg.OutBranchId
}
let query = {
blank: "y",
......
src/components/FinancialModule/domesticCommissiondetailsTW.vue
View file @ ae22c6d1
......@@ -218,6 +218,9 @@
if (this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
}
if (this.$route.query.OutBranchId && this.$route.query.OutBranchId!='') {
this.msg.OutBranchId = Number(this.$route.query.OutBranchId)
}
}
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
......
src/components/FinancialModule/platOrderquery.vue
View file @ ae22c6d1
......@@ -241,8 +241,10 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<!-- <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
<!-- <p v-if='item.commissionMoney' style="color:red">
{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}{{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">
{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
<div>
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>
......
src/components/SalesModule/enrollTotalForAirUnion.vue
View file @ ae22c6d1
......@@ -109,7 +109,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;">
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span
style="color:#e95252">{{item.extraRewardMoney}}</span></div>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ ae22c6d1
......@@ -1841,7 +1841,7 @@
isUpdateOrder
">
<p v-if="item.commissionMoney" style="color: red">
提成：{{ item.commissionMoney }}
提成：{{ item.commissionMoney }} {{ item.commissionCurrency }}
</p>
<p v-else-if="item.latestCommissionMoney" style="color: red">
提成：{{ item.latestCommissionMoney }}
......@@ -2688,7 +2688,7 @@
isUpdateOrder
">
<p v-if="item.commissionMoney" style="color: red">
提成：{{ item.commissionMoney }}
提成：{{ item.commissionMoney }} {{item.CommissionCurrency}}
</p>
<p v-else-if="item.latestCommissionMoney" style="color: red">
提成：{{ item.latestCommissionMoney }}
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ ae22c6d1
......@@ -1569,7 +1569,7 @@
<p>下单时间：{{item.createDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<template v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
</template>
</td>
......
src/components/SalesModule/planeTourOrder.vue
View file @ ae22c6d1
......@@ -1178,7 +1178,7 @@
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.Commission')}}：{{item.commissionMoney}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.Commission')}}：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p>
</td>
<td>
......
src/components/SalesVisa/VisaShouSun.vue
View file @ ae22c6d1
......@@ -129,7 +129,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ ae22c6d1
......@@ -147,8 +147,10 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<!-- <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
<!-- <p v-if='item.commissionMoney' style="color:red">
{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">
{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
<div>
<div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
<p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>
......
src/components/Ticketing/TicketShouSun.vue
View file @ ae22c6d1
......@@ -129,7 +129,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ ae22c6d1
......@@ -255,8 +255,13 @@
</div>
<div class="Team_Incontent" style="margin-bottom:0;">
<div class="TeamExpectList">
<template v-for="subItem in DataList.ExpectedCutList">
<div style="margin-bottom:5px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
<template v-for="(subItem,index) in DataList.ExpectedCutList">
<div style="margin-bottom:5px;">{{subItem.BranchName}} <template>￥</template>{{subItem.expectedCut}}
<span style="margin-left: 5px;font-size: 10px;" v-if="subItem.CurrencyName">{{subItem.CurrencyName}}</span>
<span style="font-size: 10px;color: #ff9c00;margin-left: 5px;" v-if="subItem.StandardMoney">
结算{{subItem.StandardMoney}}{{DataList.TeamBalance.StandardCurrencyName}}
</span>
</div>
</template>
</div>
</div>
......
src/components/administrative/ConfirmationAdui.vue
View file @ ae22c6d1
......@@ -119,7 +119,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>
......
src/components/dmc/manager/dmcShouSun.vue
View file @ ae22c6d1
......@@ -142,7 +142,8 @@
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.Commission')}}：{{item.commissionMoney}}
<p v-if='item.commissionMoney' style="color:red">
{{$t('salesModule.Commission')}}：{{item.commissionMoney}}{{item.commissionCurrency}}
</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">
{{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p>
......
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