Skip to content

C
confucius
Commit b77fbbb0 authored by Mac's avatar Mac
Browse files
Options

同行修改

parent 99dff991
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 83 deletions
src/api/sale/peemanagement.js
View file @ b77fbbb0
...@@ -234,6 +234,17 @@ export function getCustomerCommissionPassbook(data) { ...@@ -234,6 +234,17 @@ export function getCustomerCommissionPassbook(data) {
}) })
} }
/** /**
* 同行详情里 返佣/幸福存折统计
*
*/
export function getCustomerCommissionStat(data) {
return request({
url: '/CustomerCommission/GetCustomerCommissionStat',
method: 'post',
data
})
}
/**
* 同业转交 * 同业转交
* *
*/ */
......
src/components/sale/b2bcustomerinfo/passbook.vue
View file @ b77fbbb0
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
<div class="row wrap q-gutter-xs q-my-xs"> <div class="row wrap q-gutter-xs q-my-xs">
<div class="stics"> <div class="stics">
<span class="stics-name">累计</span> <span class="stics-name">累计</span>
<span>{{ data.TotalMoney }}</span> <span>{{ data.SttlementMoney }}</span>
</div> </div>
<div class=" stics"> <div class=" stics">
<span class="stics-name">已提现</span> <span class="stics-name">已提现</span>
<span style="color: #F72E52">{{ data.RemitMoney }}</span> <span style="color: #F72E52">{{ data.CashOutMoney }}</span>
</div> </div>
<div class=" stics"> <div class=" stics">
<span class="stics-name">可提现</span> <span class="stics-name">可提现</span>
<span style="color:#2961FE;">{{ data.SurplusMoney }}</span> <span style="color:#2961FE;">{{ data.CanCashOutMoney }}</span>
</div> </div>
<div class=" stics"> <div class=" stics">
<span class="stics-name">未结算</span> <span class="stics-name">未结算</span>
<span>{{ data.NotSettlementMoney }}</span> <span>{{ data.UnSettlementMoney }}</span>
</div> </div>
</div> </div>
<q-tabs <q-tabs
...@@ -62,8 +62,12 @@ ...@@ -62,8 +62,12 @@
<script> <script>
import { import {
getCustomerCommissionPassbook, getCustomerCommissionPassbook,
getCustomerCommissionStat,
GetCustomerBalanceDetailPage GetCustomerBalanceDetailPage
} from "../../../api/sale/peemanagement"; } from "../../../api/sale/peemanagement";
import {
getCommissionStatistics,
} from '../../../api/finance/index'
import withdraw from './withdraw' import withdraw from './withdraw'
export default { export default {
components:{ components:{
...@@ -79,12 +83,20 @@ export default { ...@@ -79,12 +83,20 @@ export default {
return { return {
loading: false, loading: false,
msg: { msg: {
CustomerId: 0,
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
rowsPerPage: 10, rowsPerPage: 10,
RebateType: 2,
Description: "" BatchId:0,
SchoolId:'-1',
Status:'-2',
OrderSourceType:0,
OrderSourceId:0,
Q_SelectNormal:0,
CommissionType:2,
ClassId:0,
OrderId:'',
}, },
pageCount: 0, pageCount: 0,
data:{}, data:{},
...@@ -155,22 +167,23 @@ export default { ...@@ -155,22 +167,23 @@ export default {
methods: { methods: {
getData() { getData() {
const msg = { const msg = {
CustomerId: this.Id, OrderSourceType:2,
Type: 2,// 1返佣 2幸福存折 OrderSourceId: this.Id,
CommissionType: 2,// 1返佣 2幸福存折
}; };
getCustomerCommissionPassbook(msg).then(res => { getCustomerCommissionStat(msg).then(res => {
this.data=res.Data this.data=res.Data
}); });
}, },
//获取数据 //获取数据
getList() { getList() {
this.msg.CustomerId=this.Id this.msg.OrderSourceId=this.Id
this.loading = true; this.loading = true;
GetCustomerBalanceDetailPage(this.msg) getCommissionStatistics(this.msg)
.then(res => { .then(res => {
this.loading = false; this.loading = false;
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData.List;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
} }
}) })
......
src/components/sale/b2bcustomerinfo/rakeback.vue
View file @ b77fbbb0
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
<div class="row wrap q-gutter-xs q-my-xs "> <div class="row wrap q-gutter-xs q-my-xs ">
<div class="stics"> <div class="stics">
<span class="stics-name">累计</span> <span class="stics-name">累计</span>
<span>{{ data.TotalMoney }}</span> <span>{{ data.SttlementMoney }}</span>
</div> </div>
<div class=" stics"> <div class=" stics">
<span class="stics-name">已提现</span> <span class="stics-name">已提现</span>
<span style="color: #F72E52">{{ data.RemitMoney }}</span> <span style="color: #F72E52">{{ data.CashOutMoney }}</span>
</div> </div>
<div class=" stics"> <div class=" stics">
<span class="stics-name">可提现</span> <span class="stics-name">可提现</span>
<span style="color:#2961FE;">{{ data.SurplusMoney }}</span> <span style="color:#2961FE;">{{ data.CanCashOutMoney }}</span>
</div> </div>
<div class=" stics"> <div class=" stics">
<span class="stics-name">未结算</span> <span class="stics-name">未结算</span>
<span>{{ data.NotSettlementMoney }}</span> <span>{{ data.UnSettlementMoney }}</span>
</div> </div>
</div> </div>
<q-tabs <q-tabs
...@@ -62,8 +62,12 @@ ...@@ -62,8 +62,12 @@
<script> <script>
import { import {
getCustomerCommissionPassbook, getCustomerCommissionPassbook,
getCustomerCommissionStat,
GetCustomerBalanceDetailPage GetCustomerBalanceDetailPage
} from "../../../api/sale/peemanagement"; } from "../../../api/sale/peemanagement";
import {
getCommissionStatistics,
} from '../../../api/finance/index'
import withdraw from './withdraw' import withdraw from './withdraw'
export default { export default {
components:{ components:{
...@@ -80,12 +84,19 @@ export default { ...@@ -80,12 +84,19 @@ export default {
return { return {
loading: false, loading: false,
msg: { msg: {
CustomerId: 0,
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
rowsPerPage: 10, rowsPerPage: 10,
RebateType: 1,
Description: "" BatchId:0,
SchoolId:'-1',
Status:'-2',
OrderSourceType:0,
OrderSourceId:0,
Q_SelectNormal:0,
CommissionType:1,
ClassId:0,
OrderId:'',
}, },
pageCount: 0, pageCount: 0,
data: {}, data: {},
...@@ -156,22 +167,23 @@ export default { ...@@ -156,22 +167,23 @@ export default {
methods: { methods: {
getData() { getData() {
const msg = { const msg = {
CustomerId: this.Id, OrderSourceType:2,
Type: 1, OrderSourceId: this.Id,
CommissionType: 1,
}; };
getCustomerCommissionPassbook(msg).then(res => { getCustomerCommissionStat(msg).then(res => {
this.data = res.Data; this.data = res.Data;
}); });
}, },
//获取数据 //获取数据
getList() { getList() {
this.msg.CustomerId=this.Id this.msg.OrderSourceId=this.Id
this.loading = true; this.loading = true;
GetCustomerBalanceDetailPage(this.msg) getCommissionStatistics(this.msg)
.then(res => { .then(res => {
this.loading = false; this.loading = false;
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData.List;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
} }
}) })
......
src/pages/financial/returnPassbook/PassbookperiodsList.vue
View file @ b77fbbb0
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
scCommission(){//生成提成 scCommission(){//生成提成
if(this.loading1 == false){ if(this.loading1 == false){
this.loading1= true; this.loading1= true;
setUserReturnCommission({type:1}).then(res => { setUserReturnCommission({type:2}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
icon: 'iconfont icon-chenggong', icon: 'iconfont icon-chenggong',
......
src/pages/financial/returnPassbook/returnpassbookStatistics.vue
View file @ b77fbbb0
...@@ -266,22 +266,10 @@ ...@@ -266,22 +266,10 @@
{{getOrderSourceType(scope.row.OrderSourceType)}} {{getOrderSourceType(scope.row.OrderSourceType)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="UserType" label="类型">
<template slot-scope="scope">
<span v-if="scope.row.UserType == 1">市场</span>
<span v-if="scope.row.UserType == 2">顾问</span>
<span v-if="scope.row.UserType == 3">教师</span>
</template>
</el-table-column>
<el-table-column prop="UserName" label="人员"></el-table-column> <el-table-column prop="UserName" label="人员"></el-table-column>
<el-table-column prop="Status" label="状态">
<template slot-scope="scope"> <el-table-column prop="ClassNo" label="班号"></el-table-column>
<span v-if="scope.row.Status == -1">不返佣</span>
<span v-if="scope.row.Status == 0">待返佣</span>
<span v-if="scope.row.Status == 1">已返佣到账户</span>
<span v-if="scope.row.Status == 2">佣金已提现</span>
</template>
</el-table-column>
<el-table-column width="170" prop="ClassName" label="班级信息"> <el-table-column width="170" prop="ClassName" label="班级信息">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
...@@ -292,10 +280,6 @@ ...@@ -292,10 +280,6 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ClassNo" label="班号"></el-table-column>
<el-table-column prop="StuName" label="学生"></el-table-column>
<el-table-column prop="OrderId" label="订单号"> <el-table-column prop="OrderId" label="订单号">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
...@@ -304,11 +288,29 @@ ...@@ -304,11 +288,29 @@
>{{ scope.row.OrderId }}</div> >{{ scope.row.OrderId }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="StuName" label="学生"></el-table-column>
<el-table-column prop="CommissionType" label="类型">
<template slot-scope="scope">
<span v-if="scope.row.CommissionType == 1">返佣</span>
<span v-if="scope.row.CommissionType == 2">幸福存折</span>
</template>
</el-table-column>
<el-table-column width="130" prop="CommissionMoeny" label="返佣/存折金额"> <el-table-column width="130" prop="CommissionMoeny" label="返佣/存折金额">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.CommissionMoeny ? scope.row.CommissionMoeny : '-' }}</div> <div>{{ scope.row.CommissionMoeny ? scope.row.CommissionMoeny : '-' }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Status" label="状态">
<template slot-scope="scope">
<span v-if="scope.row.Status == -1">不返佣</span>
<span v-if="scope.row.Status == 0">待返佣</span>
<span v-if="scope.row.Status == 1">已返佣到账户</span>
<span v-if="scope.row.Status == 2">佣金已提现</span>
</template>
</el-table-column>
<el-table-column prop="BatchName" label="期数"></el-table-column> <el-table-column prop="BatchName" label="期数"></el-table-column>
<el-table-column prop="Remark" width="200" label="备注"></el-table-column> <el-table-column prop="Remark" width="200" label="备注"></el-table-column>
...@@ -402,8 +404,6 @@ export default { ...@@ -402,8 +404,6 @@ export default {
see_tcdetailed: false, see_tcdetailed: false,
schoolList: [], schoolList: [],
DeptList: [], // 部门下拉 DeptList: [], // 部门下拉
PersionList: [], //员工列表
AllemployeeList: [], //所有员工
PeriodsList: [],//周期列表 PeriodsList: [],//周期列表
TotalCommission: 0, TotalCommission: 0,
ChangeLog: '', ChangeLog: '',
...@@ -446,9 +446,7 @@ export default { ...@@ -446,9 +446,7 @@ export default {
this.getList() this.getList()
this.setClass() this.setClass()
this.getBranchList() this.getBranchList()
this.getEmployee();
this.getPeriodList() this.getPeriodList()
this.getCustomFrom()//来源 this.getCustomFrom()//来源
this.getEmployeeList() this.getEmployeeList()
this.getStudentDorpDown() this.getStudentDorpDown()
...@@ -627,17 +625,7 @@ export default { ...@@ -627,17 +625,7 @@ export default {
}, },
//筛选员工
filterFn2(val, update) {
update(() => {
if (val === '') {
this.PersionList = JSON.parse(JSON.stringify(this.AllemployeeList))
} else {
const needle = val.toLowerCase()
this.PersionList = this.AllemployeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1)
}
})
},
//获取学员下拉信息 //获取学员下拉信息
getStudentList() { getStudentList() {
var qMsg = { var qMsg = {
...@@ -663,26 +651,7 @@ export default { ...@@ -663,26 +651,7 @@ export default {
} }
}) })
}, },
//获取员工列表
getEmployee() {
var qMsg = {
EmployeeName: ""
}
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
let obj = {
EmployeeName: '不限',
Id: 0
}
res.Data.unshift(obj)
var jsonData = res.Data;
if (jsonData && jsonData.length > 0) {
this.AllemployeeList = JSON.parse(JSON.stringify(jsonData));
this.PersionList = JSON.parse(JSON.stringify(jsonData));;
}
}
})
},
getPeriodList() {//获取周期下拉列表 getPeriodList() {//获取周期下拉列表
getCommissionPeriodsList({}).then(res => { getCommissionPeriodsList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -699,7 +668,14 @@ export default { ...@@ -699,7 +668,14 @@ export default {
}, },
tcexport() {//导出 tcexport() {//导出
var msg = JSON.parse(JSON.stringify(this.msg)); var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/SellAchievements/GetSellAchievementsStatisticsToExcel", msg, "业绩提成统计.xls") let text = '用户返佣/存折明细.xls'
if(msg.CommissionType==1){
text = '用户返佣.xls'
}
if(msg.CommissionType==2){
text = '幸福存折明细.xls'
}
EduDownLoad("/CustomerCommission/GetCommissionStatisticsToExcel", msg, text)
}, },
goUrlclass(path, Names) {//班级 goUrlclass(path, Names) {//班级
let Name = encodeURI(Names) let Name = encodeURI(Names)
......
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