Skip to content

S
SuperMan
Commit 96e39d39 authored by wuchun's avatar wuchun
Browse files
Options

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

parents cdde2c8c 41678455
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 38 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 96e39d39
...@@ -845,11 +845,13 @@ ...@@ -845,11 +845,13 @@
<span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
<!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 --> <!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 -->
<span <span
v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48 || GetDetail.OtherType==63 v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48
|| GetDetail.OtherType==64 || GetDetail.OtherType==69 || GetDetail.OtherType==70 || GetDetail.OtherType==63 || GetDetail.OtherType==64 || GetDetail.OtherType==69
|| GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==70 || GetDetail.OtherType==72 || GetDetail.OtherType==76
|| GetDetail.OtherType==78)) || GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==78))
|| ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)" || ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64&&GetDetail.OtherType!=55&&GetDetail.OtherType!=56
&&GetDetail.OtherType!=57)"
@click="GoRoyaltyUrl(GetDetail)" @click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情 提成详情
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 96e39d39
...@@ -867,12 +867,14 @@ ...@@ -867,12 +867,14 @@
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66 && GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=74&& GetDetail.OtherType!=75)|| && GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=74&& GetDetail.OtherType!=75)||
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) --> ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) -->
<span <span
v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48 || GetDetail.OtherType==63 v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48
|| GetDetail.OtherType==64 || GetDetail.OtherType==69 || GetDetail.OtherType==70 || GetDetail.OtherType==63 || GetDetail.OtherType==64 || GetDetail.OtherType==69
|| GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==70 || GetDetail.OtherType==72 || GetDetail.OtherType==76
|| GetDetail.OtherType==78)) || GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==78))
|| ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)" || ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64&&GetDetail.OtherType!=55&&GetDetail.OtherType!=56
&&GetDetail.OtherType!=57)"
@click="GoRoyaltyUrl(GetDetail)" @click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情 提成详情
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue
View file @ 96e39d39
...@@ -65,15 +65,41 @@ ...@@ -65,15 +65,41 @@
:value="item.Id"></el-option> :value="item.Id"></el-option>
</el-select> </el-select>
</li> </li>
<li>
<em>提成方式</em>
<el-select v-model="msg.Way" size="mini" @change="handleCurrentChange(1)" filterable>
<el-option label="不限" :value="0"></el-option>
<el-option v-for="(item,index) in wayList" :key="item.index" :label="item.Name"
:value="item.Id"></el-option>
</el-select>
</li>
</ul> </ul>
</div> </div>
<div style="display: flex;align-items: center;height: 50px;justify-content: space-between;"> <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<!-- 统计版块 -->
<div class="groupTourOrder_count" v-if="Statistics">
<div class="groupTourOrder_count_item HT_total">
<p>
<span>销售额：
{{Statistics.SaleMoney}}
</span>
<span>利润：
<span :style="{'color': Statistics.ProfitMoney>0?'red':''}">{{Statistics.ProfitMoney}}</span>
</span>
<span>提成：
<span style="color:#3a7cf7">{{Statistics.Commission}}</span>
</span>
<!-- <span>订单数：
<span>{{Statistics.OrderNum}}</span>
</span> -->
</p>
</div>
</div>
</div> </div>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;"> style="margin-top: 10px;">
<tr> <tr>
...@@ -170,6 +196,10 @@ ...@@ -170,6 +196,10 @@
}, },
data() { data() {
return { return {
wayList:[
{Name:'销售额',Id:1},
{Name:'利润',Id:2},
],
OrderTypeList:[], OrderTypeList:[],
objNew:{}, objNew:{},
outerVisible:false, outerVisible:false,
...@@ -181,7 +211,8 @@ ...@@ -181,7 +211,8 @@
PeriodsId: -1, PeriodsId: -1,
EmpType: '-1', EmpType: '-1',
OrderId:'', OrderId:'',
OrderType: -1 OrderType: -1,
Way: 0
}, },
loading: false, loading: false,
//数据源 //数据源
...@@ -200,22 +231,17 @@ ...@@ -200,22 +231,17 @@
S_CheckBranchOrder:false, S_CheckBranchOrder:false,
S_CheckAllOrder:false, S_CheckAllOrder:false,
disabled: true, disabled: true,
Statistics:null,
} }
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.GetOrderTypeEnumList()
this.getEmployee() //人员 this.getEmployee() //人员
this.GetCommissionPeroidsList()//期数 this.GetCommissionPeroidsList()//期数
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
if (this.$route.query) { //不大于0的话用默认值 this.msg.PeriodsId = this.$route.query.PeriodsId?Number(this.$route.query.PeriodsId):-1
if (this.$route.query.PeriodsId && this.$route.query.PeriodsId > 0) { this.msg.EmpType = this.$route.query.EmpType?this.$route.query.EmpType:'-1'
this.msg.PeriodsId = Number(this.$route.query.PeriodsId) this.msg.EmpId = this.$route.query.EmpId?this.$route.query.EmpId:-1
}
if (this.$route.query.EmpType) {
this.msg.EmpType = this.$route.query.EmpType
}
}
// 判断是否销售 // 判断是否销售
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) { if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) {
this.S_CheckBranchOrder = true this.S_CheckBranchOrder = true
...@@ -230,8 +256,18 @@ ...@@ -230,8 +256,18 @@
}else{ }else{
this.disabled = true; this.disabled = true;
} }
this.GetOrderTypeEnumList()
}, },
methods: { methods: {
GetCommissionOrder(msg){
this.crmapipost("/api/Commission/GetCommissionOrderDetialStat", msg, (res) => {
if (res.data.resultCode == 1) {
this.Statistics = res.data.data;
} else {
this.$message.error(res.data.message);
}
});
},
GetOrderTypeEnumList() { GetOrderTypeEnumList() {
this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => { this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -334,6 +370,7 @@ ...@@ -334,6 +370,7 @@
if (msg.OrderId == '') { if (msg.OrderId == '') {
msg.OrderId = 0 msg.OrderId = 0
} }
this.GetCommissionOrder(msg)
this.loading = true; this.loading = true;
this.crmapipost( this.crmapipost(
"/api/Commission/GetCommissionOrderDetialPageList", "/api/Commission/GetCommissionOrderDetialPageList",
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue
View file @ 96e39d39
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.relative-position{ .relative-position{
flex: 1; flex: 1;
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
} }
.sanjiao { .sanjiao {
width: 0; width: 0;
...@@ -161,10 +161,10 @@ ...@@ -161,10 +161,10 @@
</div> </div>
<div style="display: flex;align-items: center;height: 50px;justify-content: space-between;"> <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
</div> </div>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -196,11 +196,11 @@ ...@@ -196,11 +196,11 @@
<td>{{item.PostName?item.PostName:'-'}}</td> <td>{{item.PostName?item.PostName:'-'}}</td>
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
<td> <td>
<span @click="item.ProfitMoney>0?clickUrl(item,1):''" <span @click="item.ProfitMoney>0?clickUrl(item,1,2):''"
:class="item.ProfitMoney>0&&item.EmName!='微途'?'clickCp':''">{{item.ProfitMoney?item.ProfitMoney:'-'}}</span> :class="item.ProfitMoney>0&&item.EmName!='微途'?'clickCp':''">{{item.ProfitMoney?item.ProfitMoney:'-'}}</span>
</td> </td>
<td> <td>
<span @click="item.SalesMoney>0?clickUrl(item,1):''" <span @click="item.SalesMoney>0?clickUrl(item,1,1):''"
:class="item.SalesMoney>0&&item.EmName!='微途'?'clickCp':''">{{item.SalesMoney?item.SalesMoney:'-'}}</span> :class="item.SalesMoney>0&&item.EmName!='微途'?'clickCp':''">{{item.SalesMoney?item.SalesMoney:'-'}}</span>
</td> </td>
<td> <td>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
<inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith> <inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp; <button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
<button class="normalBtn" type="primary" @click="outerVisible = false">确定</button> <button class="normalBtn" type="primary" @click="outerVisible = false">确定</button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -291,9 +291,7 @@ ...@@ -291,9 +291,7 @@
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
if (this.$route.query && this.$route.query.PeriodsId) { this.msg.PeriodsId = this.$route.query.PeriodsId?Number(this.$route.query.PeriodsId):-1
this.msg.PeriodsId = Number(this.$route.query.PeriodsId)
}
if (this.$route.query && this.$route.query.EmpIds) { if (this.$route.query && this.$route.query.EmpIds) {
this.msg.EmpIds = this.$route.query.EmpIds this.msg.EmpIds = this.$route.query.EmpIds
} }
...@@ -302,15 +300,27 @@ ...@@ -302,15 +300,27 @@
this.GetCommissionPeroidsList()//期数 this.GetCommissionPeroidsList()//期数
}, },
methods: { methods: {
clickUrl(item,type){ clickUrl(item,type,Way){
if(type==2){//线索 if(type==2){//线索
this.clueManagement(item) this.clueManagement(item)
}else{//当月利润成交订单 }else{//当月利润成交订单
this.planeTicketOrder(item) this.planeTicketOrder(item,Way)
} }
}, },
// crm核算统计 // crm核算统计
planeTicketOrder(item){ planeTicketOrder(item,Way){
this.$router.push({
name: 'ImpressionTicketDetails',
query: {
EmpType: item.EmpType,
PeriodsId: item.PeriodsId,//item.Month
EmName: item.EmName,
EmpId: item.EmpId,
blank: "y",
tab: "提成详情"
}
});
return
let data = [ let data = [
{ {
path: "planeTicketOrder", path: "planeTicketOrder",
...@@ -393,7 +403,7 @@ ...@@ -393,7 +403,7 @@
query: { query: {
PeriodsId: this.$route.query.PeriodsId, PeriodsId: this.$route.query.PeriodsId,
EmpType:this.msg.EmpType, EmpType:this.msg.EmpType,
EmpId: item.EmpId, EmpId: item.EmpId,
blank: 'y', blank: 'y',
tab: '票务提现详情' tab: '票务提现详情'
} }
...@@ -424,4 +434,4 @@ ...@@ -424,4 +434,4 @@
} }
} }
</script> </script>
\ No newline at end of file
src/components/FinancialModule/OpCommission/OpComPersonDetails.vue
View file @ 96e39d39
...@@ -353,6 +353,9 @@ ...@@ -353,6 +353,9 @@
}); });
}, },
clickUrl(row){ clickUrl(row){
if(row.OrderType==1||row.OrderType==6){
return this.goTuanDetails(row)
}
this.$router.push({ this.$router.push({
name: 'erpCustomerOrderDayOP', name: 'erpCustomerOrderDayOP',
query: { query: {
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 96e39d39
...@@ -478,6 +478,10 @@ ...@@ -478,6 +478,10 @@
<span>{{$t('Airticket.Air_StartTime')}}</span> <span>{{$t('Airticket.Air_StartTime')}}</span>
{{item.StartDate}} {{item.StartDate}}
</p> </p>
<p class="travelnowrap">
<span>结团日期</span>
<span class="go_date">{{item.OutGroupAuditDate}}</span>
</p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('Operation.Op_teamNotice')}}</span> <span>{{$t('Operation.Op_teamNotice')}}</span>
{{item.OutNotice==1?"OK":"暂定"}} {{item.OutNotice==1?"OK":"暂定"}}
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 96e39d39
...@@ -442,6 +442,10 @@ ...@@ -442,6 +442,10 @@
<span>{{$t('Airticket.Air_StartTime')}}</span> <span>{{$t('Airticket.Air_StartTime')}}</span>
<span class="go_date">{{item.StartDate}}</span> <span class="go_date">{{item.StartDate}}</span>
</p> </p>
<p class="travelnowrap">
<span>结团日期</span>
<span class="go_date">{{item.OutGroupAuditDate}}</span>
</p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('Operation.Op_teamNotice')}}</span> <span>{{$t('Operation.Op_teamNotice')}}</span>
{{item.OutNotice==1?'OK':$t('visa.v_zanding')}} {{item.OutNotice==1?'OK':$t('visa.v_zanding')}}
......
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