Skip to content

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

修改

parent 505ae0f1
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 18 deletions
src/api/finance/index.js
View file @ d909499c
......@@ -129,7 +129,7 @@ export function setSellCommissionInfo(data) {
});
}
// 财务工作台 获取周期提成 周期列表
// 财务工作台 获取周期提成 提成统计
export function getSellCommissionStatistics(data) {
return request({
url: '/SellCommission/GetSellCommissionStatistics',
......@@ -138,4 +138,14 @@ export function getSellCommissionStatistics(data) {
});
}
// 财务工作台 获取周期提成 周期列表下拉选择
export function getSellCommissionPeriodsList(data) {
return request({
url: '/SellCommission/GetSellCommissionPeriodsList',
method: 'post',
data
});
}
src/pages/financial/CommissionDetail.vue
View file @ d909499c
......@@ -69,7 +69,7 @@
style="width: 100%">
<el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="UserName" label="用户" :filters='UserNamelist' :filter-method="filterHandler"> </el-table-column>
<el-table-column prop="UserName" label="销售" :filters='UserNamelist' :filter-method="filterHandler"> </el-table-column>
<el-table-column prop="StudentCount" label="学生数量" sortable :sort-method="StudentCount"> </el-table-column>
<el-table-column prop="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney"> </el-table-column>
<el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column>
......
src/pages/financial/cycleList.vue
View file @ d909499c
......@@ -47,8 +47,8 @@
labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"></selectTree>
</div>
<q-select @input="resetSearch" filled stack-label option-value="Id" option-label="EmployeeName" use-input
v-model="msg.UserId" ref="DeptTier" :options="PersionList" label="发布人" :dense="false"
class="col-3 q-pr-lg" emit-value map-options @filter="filterFn" clearable @clear="getList">
v-model="msg.UserId" ref="DeptTier" :options="PersionList" label="销售" :dense="false"
class="col-3 q-pr-lg" emit-value map-options @filter="filterFn2" >
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
......@@ -71,8 +71,26 @@
</q-select>
</div>
</div>
</div>
</div>
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select filled stack-label @input="resetSearch()" option-value="Id"
option-label="Name" v-model="msg.PeriodId" :options="PeriodsList" label="周期"
:dense="false" emit-value map-options />
</div>
<div class="col-3">
<q-input filled v-model="msg.OrderId" @keyup.enter.native="resetSearch()" label="订单号" />
</div>
</div>
</div>
<div class="page-search row items-center" style="justify-content: space-between;">
<span style="font-size: 20px;font-weight: 400;">提成统计</span>
<q-btn  color="primary" size="11px" label="导出" @click="tcexport" style="margin-left:10px"/>
</div>
<template >
<el-table
ref="filterTable"
......@@ -84,7 +102,7 @@
style="width: 100%">
<el-table-column prop="SchoolName" label="校区" ></el-table-column>
<el-table-column prop="DeptName" label="部门" ></el-table-column>
<el-table-column prop="UserName" label="用户" > </el-table-column>
<el-table-column prop="UserName" label="销售" > </el-table-column>
<el-table-column width='170' prop="ClassName" label="班级信息" >
<template slot-scope="scope">
<div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
......@@ -150,20 +168,24 @@
import {
getSchoolDropdown
} from '../../api/school/index'
import {
queryEmployee
} from '../../api/users/user'
import {
getDeptTree
} from '../../api/system/dept.js'
import {
GetClassTypePageList,
} from '../../api/system/index';
import{
getSellCommissionStatistics,
getSellCommissionPeriodsList
} from '../../api/finance/index'
import {
getClassDropDownList,
} from "../../api/school/index";
import selectTree from '../../components/common/select-tree'
import {
EduDownLoad,
} from '../../api/common/common';
export default {
meta: {
title: "订单提成查询"
......@@ -196,13 +218,12 @@
ClassList:[],
allClassList:[],
returnString: [], //默认岗位
see_tcdetailed:false,
schoolList:[],
DeptList: [], // 部门下拉
PersionList:[],
PersionList: [], //员工列表
AllemployeeList: [], //所有员工
PeriodsList:[],//周期列表
}
},
created() {
......@@ -225,12 +246,14 @@
this.setClass()
this.getBranchList()
this.getDepartList(0);
this.getEmployee();
this.getPeriodList()
},
methods: {
resetSearch() {
this.msg.pageIndex = 1;
this.msg.PageIndex = 1;
this.getList()
},
getList(){
......@@ -297,6 +320,9 @@
},
//获取部门下拉数据
getDepartList(id) {
if(id==-1){
id = 0
}
let msg = {
School_Id: id
}
......@@ -318,6 +344,55 @@
}
this.resetSearch();
},
//筛选员工
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)
}
})
},
//获取员工列表
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(){//获取周期下拉列表
getSellCommissionPeriodsList({}).then(res => {
if (res.Code == 1) {
this.PeriodsList = res.Data
let obj = {
Name: '不限',
Id: 0
}
this.PeriodsList.unshift(obj)
}
})
},
tcexport(){//导出
// var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/SellCommission/GetSellCommissionStatisticsToExcel", {}, "提成统计.xls")
}
},
}
......
src/pages/financial/cycleOrderList.vue
View file @ d909499c
......@@ -53,7 +53,7 @@
style="width: 100%">
<el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="UserName" label="用户" :filters='UserNamelist' :filter-method="filterHandler"> </el-table-column>
<el-table-column prop="UserName" label="销售" :filters='UserNamelist' :filter-method="filterHandler"> </el-table-column>
<el-table-column width='170' prop="ClassName" label="班级信息" >
<template slot-scope="scope">
<div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
......
src/pages/financial/userCommissionDetails.vue
View file @ d909499c
......@@ -69,7 +69,7 @@
style="width: 100%">
<el-table-column prop="SchoolName" label="校区" ></el-table-column>
<el-table-column prop="DeptName" label="部门" ></el-table-column>
<el-table-column prop="UserName" label="用户" > </el-table-column>
<el-table-column prop="UserName" label="销售" > </el-table-column>
<el-table-column width='170' prop="ClassName" label="班级信息" >
<template slot-scope="scope">
<div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
......
src/router/routes.js
View file @ d909499c
......@@ -263,7 +263,7 @@ const routes = [{
import("pages/financial/cycleOrderList.vue")
},
{
path: "/financial/cycleList", //周期列表
path: "/financial/cycleList", //销售提成统计
component: () =>
import("pages/financial/cycleList.vue")
},
......
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