Skip to content

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

Save

parents d8a14edc 6d846b9e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 870 additions and 66 deletions
src/components/FinancialModule/TradeCommission/CommissionRule.vue
View file @ a647cf5b
<template>
<div class="page_FProcessManagement">
<ul class="_nav clearfix">
<li style="color: red;"></li>
<li style="color: red;">注：门票不计入人头奖励</li>
<!-- <button class="hollowFixedBtn" style="right: 185px;" @click="clickTheRules(1)">提成限制</button>
<button class="normalBtn" style="position: absolute; right: 90px;top: 9px;" @click="clickTheRules()">提成规则</button> -->
<input type="button" class="hollowFixedBtn" value="新增" @click="AddMsg"/>
......
src/components/FinancialModule/TradeCommission/TicketCommission.vue
View file @ a647cf5b
......@@ -174,14 +174,9 @@
this.msg.pageIndex = val;
this.getList();
},
goUrl(path, id,type) {
goUrl(path, id) {
let title = ''
if(type==1){
title = '当期利润差额'
}else{
title = '期数详情'
}
title = '提成明细'
this.$router.push({
path: path,
query: {
......@@ -220,12 +215,17 @@
"sellcommission_SetTYSaleCommissionSend", { Month: this.Month },
res => {
this.btnLoading = false;
if (res.data.resultCode == 1) {
this.handleCurrentChange(1);
this.Success('报表生成成功')
} else {
this.Error(res.data.message);
this.$confirm(res.data.message, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {})
.catch(() => {});
}
}
);
......
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ a647cf5b
......@@ -72,7 +72,7 @@
<li>
<em>部门</em>
<el-select filterable v-model='msg.RB_Department_Id'
@change='getEmployee();handleCurrentChange(1)' :disabled="disabled">
@change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
......@@ -120,8 +120,9 @@
<el-row :gutter="20">
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<div class="groupTourOrder_count_item HT_total">
<div>
<div style="display: flex;justify-content: space-between;">
<span>统计</span>
<span style="color: red;">注：门票不计入人头奖励</span>
</div>
<p style="margin-top: 10px;">
<span>总人数：
......@@ -148,14 +149,14 @@
<th style="width: 100px;">部门</th>
<th style="width: 100px;">姓名</th>
<th style="width: 100px;">线路</th>
<th style="width: 100px;">是否欧洲订单</th>
<th style="width: 100px;">是否欧洲</th>
<th style="width: 100px;">订单人数</th>
<th style="width: 100px;">团队总人数</th>
<th style="width: 100px;">团队利润</th>
<th style="width: 100px;">提成方式</th>
<th style="width: 100px;">提成比例</th>
<th style="width: 100px;">当月利润</th>
<th style="width: 100px;">团队利润</th>
<th style="width: 100px;">当月利润/业绩</th>
<th style="width: 100px;">提成金额</th>
<th style="width: 100px;">期数</th>
<th width='200'>备注</th>
......@@ -170,13 +171,13 @@
<td>{{item.DeptName?item.DeptName:'-'}}</td>
<td>{{item.UserName}}</td>
<td>{{item.LineName}}</td>
<td>{{item.IsEurope==1?'是':'否'}}</td>
<td>{{item.PeopleNum}}</td>
<td>{{item.TCGuestNum}}</td>
<td>{{item.IsEurope==1?'是':''}}</td>
<td>{{item.TCProfit?item.TCProfit:'-'}}</td>
<td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
<td>{{item.TCGuestNum?item.TCGuestNum:'-'}}</td>
<td>{{item.Way==1?'销售额':'利润比'}}</td>
<td>{{item.Rate?item.Rate+'%':'-'}}</td>
<td>{{item.OrderProfit}}</td>
<td>{{item.TCProfit}}</td>
<td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
<td>{{item.Periods}}</td>
<td>{{item.Description?item.Description:'-'}}</td>
......@@ -189,23 +190,14 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
<!-- 查看生成比例 -->
<el-dialog custom-class='w1006' title="员工生成比例" :visible.sync="outerVisible" center>
<inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
<button class="normalBtn" type="primary" @click="outerVisible = false">确定</button>
</div>
</el-dialog>
</div>
</template>
<script>
import inAccordanceWith from "../ImpressionTicketing/inAccordanceWithDialog"
import moment from "moment"
export default {
components:{
inAccordanceWith
},
data() {
return {
......@@ -259,16 +251,20 @@
disabled:true
}
},
created(){
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
this.GetCommissionPeroidsList()//期数
this.getEmployee() //人员
this.getDepartment()
this.getCompany()
this.GetOrderTypeEnumList()
this.GetCommissionPeroidsList()//期数
},
mounted() {
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
this.getEmployee() //人员
this.getDepartment()
this.getCompany()
this.GetOrderTypeEnumList()
this.GetCommissionPeroidsList()//期数
let ActionMenuCode = userInfo.ActionMenuCode;
// 判断是否销售
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) {
......@@ -282,7 +278,7 @@
}
}
this.msg.PeriodId = this.$route.query&&this.$route.query.PeriodId>0?Number(this.$route.query.PeriodId):-1
this.msg.PeriodId = this.$route.query&&this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.OrderId = this.$route.query&&this.$route.query.OrderId?this.$route.query.OrderId:''
this.msg.OutBranchId = this.$route.query&&this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.UserId = this.$route.query&&this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
......@@ -290,13 +286,14 @@
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
this.disabled = false;
this.msg.OutBranchId = -1
this.msg.RB_Branch_Id = -1
// this.msg.RB_Department_Id = -1
this.msg.UserId = -1
}else{
this.disabled = true;
this.msg.OutBranchId = -1
this.msg.RB_Branch_Id = -1
this.msg.RB_Department_Id = -1
}
this.getList()
},
methods: {
GetOrderTypeEnumList() {
......@@ -493,6 +490,10 @@
"sellcommission_GetTYSaleCommissionPeriodsList",{},res => {
if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){
this.msg.PeriodId = this.PeroidsList[0].Id
}
this.getList()
} else {
this.Error(res.data.message);
}
......
src/components/FinancialModule/TradeCommission/TicketUserDetails.vue
View file @ a647cf5b
......@@ -164,7 +164,7 @@
<li>
<em>部门</em>
<el-select filterable size="mini" v-model='msg.RB_Department_Id'
@change='getEmployee();handleCurrentChange(1)' :disabled="disabled">
@change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
......@@ -233,23 +233,14 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
<!-- 查看生成比例 -->
<el-dialog custom-class='w1006' title="员工生成比例" :visible.sync="outerVisible" center>
<inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
<button class="normalBtn" type="primary" @click="outerVisible = false">确定</button>
</div>
</el-dialog>
</div>
</template>
<script>
import inAccordanceWith from "../ImpressionTicketing/inAccordanceWithDialog"
import moment from "moment"
export default {
components:{
inAccordanceWith
},
data() {
return {
......@@ -295,32 +286,36 @@
disabled:true
}
},
mounted() {
created(){
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
this.GetCommissionPeroidsList()//期数
this.getEmployee()//人员
this.getDepartment()
this.getCompany()
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.PeriodId = this.$route.query&&this.$route.query.PeriodId>0?Number(this.$route.query.PeriodId):-1
this.msg.OutBranchId = this.$route.query&&this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.UserId = this.$route.query&&this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.OutBranchId = this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
this.disabled = false;
}else{
this.disabled = true;
this.msg.OutBranchId = -1
this.msg.RB_Branch_Id = -1
this.msg.RB_Department_Id = -1
// this.msg.RB_Department_Id = -1
this.msg.UserId = -1
}else{
this.disabled = true;
}
this.getList()
this.getEmployee()//人员
this.getDepartment()
this.getCompany()
this.GetCommissionPeroidsList()//期数
},
methods: {
getDepartment() {
......@@ -395,6 +390,10 @@
"sellcommission_GetTYSaleCommissionPeriodsList",{},res => {
if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){
this.msg.PeriodId = this.PeroidsList[0].Id
}
this.getList()
} else {
this.Error(res.data.message);
}
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ a647cf5b
......@@ -610,6 +610,14 @@
</span>
</template>
</el-table-column>
<el-table-column v-if="item.commissionMoney&&item.commissionMoney>0" label="提成" style="background:#EAEAEA">
<template slot-scope="scope">
<commissionDialog :objNew="scope.row"></commissionDialog>
<!-- <span class="cursor-pointer" :class="{'cF1416C':scope.row.commissionMoney>0}" @click="DetailsOfRoyalty(item)">
￥<span class="fz15 fbold">{{ moneyFormat(scope.row.commissionMoney) }}</span>
</span> -->
</template>
</el-table-column>
<template slot="append" >
<div class="row justify-sb" style="padding:10px;">
<div class="cF1416C flex-g" style="min-width: 300px;" >
......@@ -862,11 +870,14 @@
</template>
<script>
import offset from '../../public/offset.vue';
import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
export default {
components: { offset },
components: { offset,commissionDialog },
props: ["OrderList", "pagesTitle"],
data() {
return {
isCommissionDialog: false,
objNew:{},
queryObj:null,
cdState: false,
copyId: 0,
......@@ -964,6 +975,9 @@ export default {
}
},
methods: {
DetailsOfRoyalty(){
},
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
setTimeout(()=>{
......
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