Skip to content

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

新增周期列表

parent 26b05aa4
Show whitespace changes
Inline Side-by-side
Showing with 352 additions and 20 deletions
src/api/finance/index.js
View file @ c672ecce
......@@ -129,4 +129,13 @@ export function setSellCommissionInfo(data) {
});
}
// 财务工作台 获取周期提成 周期列表
export function getSellCommissionStatistics(data) {
return request({
url: '/SellCommission/GetSellCommissionStatistics',
method: 'post',
data
});
}
src/components/sale/orderlist.vue
View file @ c672ecce
......@@ -100,12 +100,10 @@
报价单：<span class="order_OfferId" @click="goQuotation(item.OfferId)"
style="font-size:14px;">{{item.OfferId}}</span>
</div>
<div style="color:red" v-if="item.YFCommissionMoney>0">应发提成：{{item.YFCommissionMoney}}</div>
<template v-if="item.IsCommissionGive==1">
<div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>提成：{{item.CommissionMoney}}</div>
<div style="color:red" v-if="item.YFCommissionMoney>0">应发提成：{{item.YFCommissionMoney}}</div>
<div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>已发提成：{{item.CommissionMoney}}</div>
<div style="color:red" v-if="item.ExtraCommissionMoney>0">额外奖励实发：{{item.ExtraCommissionMoney}}</div>
</template>
<template>
<div style="color:red;" v-if="item.ExtraRewardMoney>0">额外奖励：{{item.ExtraRewardMoney}}</div>
<div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div>
<div style="color:red" v-if="item.CommissionBack>0">补交提成：{{item.CommissionBack}}</div>
......@@ -212,11 +210,11 @@
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="AuthorityObj.isShowCommissionEdit&&item.IsCommissionGive==1">
<!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowCommissionEdit&&item.IsCommissionGive==1">
<q-item-section @click="upDateMoney(item,1)">
<q-item-label>修改提成</q-item-label>
</q-item-section>
</q-item>
</q-item> -->
<q-item clickable v-close-popup v-if="AuthorityObj.isShowRewardEdit&&isShowReward">
<q-item-section @click="upDateMoney(item,2)">
<q-item-label>额外奖励</q-item-label>
......@@ -1291,11 +1289,8 @@
});
},
gourltx(OrderId){
this.$router.push({
path: '/financial/cycleOrderList',
query: {
OrderId:OrderId
}
this.OpenNewUrl("/financial/cycleOrderList", {
OrderId: OrderId
});
}
}
......
src/pages/financial/cycleList.vue 0 → 100644
View file @ c672ecce
<style>
.baseSet_Title {
width: 120px !important;
padding: 18px 0 0 16px;
text-align: right;
}
.cycleOrderList .border-bottom {
/* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px;
margin-bottom: 5px;
}
.cycleOrderList .text-bottom{
height: 32px;line-height: 32px; margin-bottom: 10px;
}
.cycleOrderList ._icon_btn i.icon-sousuo {
background-color: #47BF8C;
}
.cycleOrderList ._icon_btn i {
width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
outline: none;
}
.cycleOrderList .el-table td,.el-table th{
padding: 5px 0;
}
</style>
<template>
<div class="page-body cycleOrderList">
<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="getDepartList(msg.SchoolId),resetSearch()" option-value="SId"
option-label="SName" v-model="msg.SchoolId" ref="SchoolId" :options="schoolList" label="校区"
:dense="false" emit-value map-options />
</div>
<div class="col-3">
<selectTree :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="false"
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">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
未找到相关数据
</q-item-section>
</q-item>
</template>
</q-select>
<div class="col-3">
<q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList"
option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false"
emit-value map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
未找到相关数据
</q-item-section>
</q-item>
</template>
</q-select>
</div>
</div>
</div>
<template >
<el-table
ref="filterTable"
:data="tableData"
v-loading = 'loading'
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}"
border
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 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>
<div>学生数量:{{scope.row.StudentCount}}人</div>
</template>
</el-table-column>
<el-table-column prop="OrderId" label="订单号" >
<template slot-scope="scope">
<div style="cursor: pointer;" >{{scope.row.OrderId}} </div>
</template>
</el-table-column>
<el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息">
<template slot-scope="scope">
<div style="color: rgb(255, 156, 0);">应发:{{scope.row.TotalCommissionMoney}}</div>
<div>额外奖励:{{scope.row.OtherMoney}}</div>
<div>额外扣除:{{scope.row.BackMoney}}</div>
<div>累计已发:{{scope.row.GiveOutMoney}}</div>
</template>
</el-table-column>
<el-table-column prop="IsFirstCommission" label="首次发放">
<template slot-scope="scope">
<div>{{scope.row.IsFirstCommission==1?'是':'否'}}</div>
</template>
</el-table-column>
<el-table-column prop="TotalHours" label="总课时"> </el-table-column>
<el-table-column width='110' prop="TotalLearn" label="已学习课时"> </el-table-column>
<el-table-column width='110' prop="CurrentHours" label="当期消费课时">
<template slot-scope="scope">
<div>{{scope.row.CurrentHours>=0 ?scope.row.CurrentHours:'-'}}</div>
</template>
</el-table-column>
<el-table-column width='160' prop="CurrentPeriodMoney" label="当期发放信息">
<template slot-scope="scope">
<div style="color: rgb(255, 156, 0);">应发:{{scope.row.CurrentPeriodMoney}}</div>
<div>额外奖励:{{scope.row.CurrentExtraMoney}}</div>
<div>抵扣:{{scope.row.DeductionMoney}}</div>
<div>奖励抵扣:{{scope.row.DeductionExtraMoney}}</div>
</template>
</el-table-column>
<el-table-column prop="YFMoney" label="最终发放">
<template slot-scope="scope">
<div style="color: rgb(233, 82, 82);">{{scope.row.YFMoney}}</div>
</template>
</el-table-column>
<el-table-column width='85' prop="Periods" label="期数"> </el-table-column>
<el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
</el-table>
<div style="margin-top: 10px;text-align: center;">
<el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper" :current-page.sync="msg.PageIndex"
:page-size="msg.PageSize" :total='total'>
</el-pagination>
</div>
</template>
</div>
</template>
<script>
import {
getSchoolDropdown
} from '../../api/school/index'
import {
getDeptTree
} from '../../api/system/dept.js'
import {
GetClassTypePageList,
} from '../../api/system/index';
import{
getSellCommissionStatistics,
} from '../../api/finance/index'
import {
getClassDropDownList,
} from "../../api/school/index";
import selectTree from '../../components/common/select-tree'
export default {
meta: {
title: "订单提成查询"
},
props: {},
components: {
selectTree
},
data() {
return {
loading: false,
//列表数据参数
msg: {
PageIndex:1,
PageSize:10,
SchoolId:'-1',
Depart_Id:0,
PeriodId: 0,
UserId: 0,
ClassId:0,
OrderId:'',
},
pageCount: 0,
persistent: false,
listData:{},
tableData:[],
total:0,
company:[],
department:[],
ClassList:[],
allClassList:[],
returnString: [], //默认岗位
see_tcdetailed:false,
schoolList:[],
DeptList: [], // 部门下拉
PersionList:[],
}
},
created() {
let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x=>{//判断权限
if(x.FunctionCode == "see_tcdetailed"){//判断是否可以查看其他明细
this.see_tcdetailed = true;
}
})
if(this.see_tcdetailed == false){
this.msg.UserId = userinfo.Id
}
},
mounted() {
if(this.$route.query && this.$route.query.OrderId){
this.msg.OrderId = this.$route.query.OrderId
}
this.getList()
this.setClass()
this.getBranchList()
this.getDepartList(0);
},
methods: {
resetSearch() {
this.msg.pageIndex = 1;
this.getList()
},
getList(){
if(this.msg)
this.loading = true;
getSellCommissionStatistics(this.msg).then(res => {
if (res.Code == 1) {
this.loading = false;
this.tableData = res.Data.PageData.List
this.total = res.Data.Count
}
})
},
unique(arr,Name){//数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
);
},
handleCurrentChanges(val){
this.msg.PageIndex= val;
this.getList()
},
//选择班级
setClass(item) {
this.isShowClass = true;
getClassDropDownList({
CourseId: 0,
IsAddDefault: 1, //添加默认选项
}).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
if (jsonData && jsonData.length > 0) {
this.ClassList = JSON.parse(JSON.stringify(jsonData));
this.allClassList = JSON.parse(JSON.stringify(jsonData));;
}
}
});
},
//筛选员工
filterFn(val, update) {
update(() => {
if (val === '') {
this.ClassList = JSON.parse(JSON.stringify(this.allClassList))
} else {
const needle = val.toLowerCase()
this.ClassList = this.allClassList.filter(v => v.ClassName.toLowerCase().indexOf(needle) > -1)
}
})
},
getBranchList(){//获取校区
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
var obj = {
SName: '全部',
SId: '-1'
}
this.schoolList.unshift(obj);
}).catch(() => {
})
},
//获取部门下拉数据
getDepartList(id) {
let msg = {
School_Id: id
}
getDeptTree(msg).then(res => {
if (res.Code == 1) {
this.DeptList = res.Data;
}
})
},
getChild(deptArray) {
var tempStr = "";
if (deptArray && deptArray != '') {
tempStr = deptArray;
}
if (tempStr) {
this.msg.Depart_Id = tempStr;
} else {
this.msg.Depart_Id = 0;
}
this.resetSearch();
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
src/pages/financial/salesCommission.vue
View file @ c672ecce
......@@ -185,7 +185,6 @@
getSellCommissionPeriodsPageList(this.msg).then(res => {
if (res.Code == 1) {
this.loading = false;
this.tableData = res.Data.PageData
this.total = res.Data.Count
}
......@@ -228,13 +227,9 @@
})
},
gocaiwuxiangq(id){
this.$router.push({
path: '/financial/financalDocument/FinancialDocumentsDetail',
query: {
"id": id,
blank: 'y',
}
})
this.OpenNewUrl("/financial/financalDocument/FinancialDocumentsDetail", {
id: id
});
},
generalFinancacls(item) {
if(this.msg.SchoolId == -1){
......
src/router/routes.js
View file @ c672ecce
......@@ -262,7 +262,11 @@ const routes = [{
component: () =>
import("pages/financial/cycleOrderList.vue")
},
{
path: "/financial/cycleList", //周期列表
component: () =>
import("pages/financial/cycleList.vue")
},
{
path: "/financial/TeamRevenueReport", //营收报表
......
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