Skip to content

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

销售提成模块修改样式

parent 7e976ef1
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 26 deletions
src/pages/financial/CommissionDetail.vue
View file @ fd112c9c
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div class="page-body CommissionDetail"> <div class="page-body CommissionDetail">
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <!-- <div class="col-3">
<q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList" <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" option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false"
emit-value map-options @filter="filterFn"> emit-value map-options @filter="filterFn">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input filled v-model="msg.OrderId" @keyup.enter.native="getList()" label="订单号" /> <q-input filled v-model="msg.OrderId" @keyup.enter.native="getList()" label="订单号" />
</div> </div> -->
</div> </div>
</div> </div>
<template > <template >
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
:data="tableData" :data="tableData"
border border
style="width: 100%"> style="width: 100%">
<el-table-column prop="SchoolName" label="校区" ></el-table-column> <el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="DeptName" label="部门" ></el-table-column> <el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="UserName" label="用户" > </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="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="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney"> </el-table-column>
<el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column> <el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column>
...@@ -118,7 +118,10 @@ ...@@ -118,7 +118,10 @@
department:[], department:[],
ClassList:[], ClassList:[],
allClassList:[], allClassList:[],
see_tcdetailed:false see_tcdetailed:false,
SchoolNamelist:[],
DeptNamelist:[],
UserNamelist:[],
} }
}, },
created() { created() {
...@@ -148,10 +151,30 @@ ...@@ -148,10 +151,30 @@
this.loading = true; this.loading = true;
getSellCommissionUserList(this.msg).then(res => { getSellCommissionUserList(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.tableData = res.Data this.tableData = res.Data;
this.SchoolNamelist = [];
this.DeptNamelist = [];
this.UserNamelist = [];
this.tableData.forEach(x=>{
let obj = {text: x.SchoolName, value: x.SchoolName}
let obj2 = {text: x.DeptName, value: x.DeptName}
let obj3 = {text: x.UserName, value: x.UserName}
this.SchoolNamelist.push(obj)
this.DeptNamelist.push(obj2)
this.UserNamelist.push(obj3)
})
this.SchoolNamelist = this.unique(this.SchoolNamelist)
this.DeptNamelist = this.unique(this.DeptNamelist)
this.UserNamelist = this.unique(this.UserNamelist)
} }
}) })
}, },
unique(arr,Name){//数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
);
},
//选择班级 //选择班级
setClass(item) { setClass(item) {
this.isShowClass = true; this.isShowClass = true;
......
src/pages/financial/cycleOrderList.vue
View file @ fd112c9c
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
:data="tableData" :data="tableData"
border border
style="width: 100%"> style="width: 100%">
<el-table-column prop="SchoolName" label="校区" ></el-table-column> <el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="DeptName" label="部门" ></el-table-column> <el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="UserName" label="用户" > </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="班级信息" > <el-table-column width='170' prop="ClassName" label="班级信息" >
<template slot-scope="scope"> <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.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
...@@ -59,13 +59,13 @@ ...@@ -59,13 +59,13 @@
</el-table-column> </el-table-column>
<el-table-column prop="OrderId" label="订单号" > <el-table-column prop="OrderId" label="订单号" >
<template slot-scope="scope"> <template slot-scope="scope">
<div style="cursor: pointer;text-decoration: underline;" @click='goorderUrl(scope.row.OrderId)'>{{scope.row.OrderId}} </div> <div style="cursor: pointer;" >{{scope.row.OrderId}} </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息"> <el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息">
<template slot-scope="scope"> <template slot-scope="scope">
<div>应发:{{scope.row.TotalCommissionMoney}}</div> <div style="color: rgb(255, 156, 0);">应发:{{scope.row.TotalCommissionMoney}}</div>
<div>额外奖励:{{scope.row.OtherMoney}}</div> <div>额外奖励:{{scope.row.OtherMoney}}</div>
<div>额外扣除:{{scope.row.BackMoney}}</div> <div>额外扣除:{{scope.row.BackMoney}}</div>
<div>累计已发:{{scope.row.GiveOutMoney}}</div> <div>累计已发:{{scope.row.GiveOutMoney}}</div>
...@@ -86,16 +86,22 @@ ...@@ -86,16 +86,22 @@
</el-table-column> </el-table-column>
<el-table-column width='160' prop="CurrentPeriodMoney" label="当期发放信息"> <el-table-column width='160' prop="CurrentPeriodMoney" label="当期发放信息">
<template slot-scope="scope"> <template slot-scope="scope">
<div>应发:{{scope.row.CurrentPeriodMoney}}</div> <div style="color: rgb(255, 156, 0);">应发:{{scope.row.CurrentPeriodMoney}}</div>
<div>额外奖励:{{scope.row.CurrentExtraMoney}}</div> <div>额外奖励:{{scope.row.CurrentExtraMoney}}</div>
<div>抵扣:{{scope.row.DeductionMoney}}</div> <div>抵扣:{{scope.row.DeductionMoney}}</div>
<div>奖励抵扣:{{scope.row.DeductionExtraMoney}}</div> <div>奖励抵扣:{{scope.row.DeductionExtraMoney}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="YFMoney" label="最终发放"> </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 width='85' prop="Periods" label="期数"> </el-table-column>
<el-table-column prop="Remark" label="备注"> </el-table-column> <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
</el-table> </el-table>
</template> </template>
...@@ -135,6 +141,10 @@ ...@@ -135,6 +141,10 @@
department:[], department:[],
ClassList:[], ClassList:[],
allClassList:[], allClassList:[],
SchoolNamelist:[],
DeptNamelist:[],
UserNamelist:[],
} }
}, },
created() {}, created() {},
...@@ -154,9 +164,29 @@ ...@@ -154,9 +164,29 @@
getSellCommissionForOrderList(this.msg).then(res => { getSellCommissionForOrderList(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.tableData = res.Data this.tableData = res.Data
this.SchoolNamelist = [];
this.DeptNamelist = [];
this.UserNamelist = [];
this.tableData.forEach(x=>{
let obj = {text: x.SchoolName, value: x.SchoolName}
let obj2 = {text: x.DeptName, value: x.DeptName}
let obj3 = {text: x.UserName, value: x.UserName}
this.SchoolNamelist.push(obj)
this.DeptNamelist.push(obj2)
this.UserNamelist.push(obj3)
})
this.SchoolNamelist = this.unique(this.SchoolNamelist)
this.DeptNamelist = this.unique(this.DeptNamelist)
this.UserNamelist = this.unique(this.UserNamelist)
} }
}) })
}, },
unique(arr,Name){//数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
);
},
//选择班级 //选择班级
setClass(item) { setClass(item) {
this.isShowClass = true; this.isShowClass = true;
...@@ -203,6 +233,7 @@ ...@@ -203,6 +233,7 @@
console.log(a,b) console.log(a,b)
return a.StudentCount - b.StudentCount; return a.StudentCount - b.StudentCount;
}, },
}, },
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ fd112c9c
...@@ -825,6 +825,8 @@ ...@@ -825,6 +825,8 @@
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材采购:{{GetDetail.ReFinanceId}}</span> @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材采购:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==33" <span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==33"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材出库:{{GetDetail.ReFinanceId}}</span> @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材出库:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==39"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 销售提成:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17" <span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17"
...@@ -2153,6 +2155,8 @@ ...@@ -2153,6 +2155,8 @@
tempStr = '/financial/financalDocument/SuppliesProcurementDetail?id='+ID; tempStr = '/financial/financalDocument/SuppliesProcurementDetail?id='+ID;
}else if(OtherType==33){ }else if(OtherType==33){
tempStr = '/financial/financalDocument/InAndOutDdetails?id='+ID; tempStr = '/financial/financalDocument/InAndOutDdetails?id='+ID;
}else if(OtherType==39){
tempStr = '/financial/CommissionDetail?id='+ID;
} }
this.$router.push({ this.$router.push({
......
src/pages/financial/salesCommission.vue
View file @ fd112c9c
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</el-table> </el-table>
<div style="margin-top: 10px;text-align: center;"> <div style="margin-top: 10px;text-align: center;">
<el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper" :current-page.sync="msg.PageSize" <el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper" :current-page.sync="msg.PageIndex"
:page-size="msg.PageSize" :total='total'> :page-size="msg.PageSize" :total='total'>
</el-pagination> </el-pagination>
</div> </div>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
//列表数据参数 //列表数据参数
msg: { msg: {
PageIndex: 1, PageIndex: 1,
PageSize: 20, PageSize: 15,
Name:'', Name:'',
SchoolId:'-1' SchoolId:'-1'
}, },
...@@ -236,20 +236,20 @@ ...@@ -236,20 +236,20 @@
generalFinancacls(item) { generalFinancacls(item) {
if(this.msg.SchoolId == -1){ if(this.msg.SchoolId == -1){
if(item.SumPrice>0){ if(item.SumPrice>0){
this.tishi(item.SumPrice) this.tishi(item.SumPrice,item.Id)
}else{ }else{
this.$message.error('提成总金额为0') this.$message.error('提成总金额为0')
} }
}else{ }else{
if(item.SchooldCommission>0){ if(item.SchooldCommission>0){
this.goaddFinancial(item.SchooldCommission) this.goaddFinancial(item.SchooldCommission,item.Id)
}else{ }else{
this.$message.error('校区提成总金额为0') this.$message.error('校区提成总金额为0')
} }
} }
}, },
goaddFinancial(Money){ goaddFinancial(Money,Id){
let School_Id = 0; let School_Id = 0;
let obj = { let obj = {
...@@ -258,6 +258,9 @@ ...@@ -258,6 +258,9 @@
CurrencyId: 21, CurrencyId: 21,
XSTC: 1, XSTC: 1,
School_Id:this.msg.SchoolId == -1?0:this.msg.SchoolId, School_Id:this.msg.SchoolId == -1?0:this.msg.SchoolId,
OtherType:39,
ReFinanceId:Id,
ReFinanceId2:this.msg.SchoolId
} }
let query = { let query = {
blank: "y", blank: "y",
...@@ -274,7 +277,7 @@ ...@@ -274,7 +277,7 @@
query query
}); });
}, },
tishi(Money){ tishi(Money,Id){
let that = this let that = this
this.$q.dialog({ this.$q.dialog({
title: "销售制单", title: "销售制单",
...@@ -290,7 +293,7 @@ ...@@ -290,7 +293,7 @@
focus: true focus: true
} }
}).onOk(() => { }).onOk(() => {
this.goaddFinancial(Money) this.goaddFinancial(Money,Id)
}); });
}, },
handleCurrentChanges(val){ handleCurrentChanges(val){
......
src/pages/financial/userCommissionDetails.vue
View file @ fd112c9c
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-table-column> </el-table-column>
<el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息"> <el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息">
<template slot-scope="scope"> <template slot-scope="scope">
<div>应发:{{scope.row.TotalCommissionMoney}}</div> <div style="color: rgb(255, 156, 0);">应发:{{scope.row.TotalCommissionMoney}}</div>
<div>额外奖励:{{scope.row.OtherMoney}}</div> <div>额外奖励:{{scope.row.OtherMoney}}</div>
<div>额外扣除:{{scope.row.BackMoney}}</div> <div>额外扣除:{{scope.row.BackMoney}}</div>
<div>累计已发:{{scope.row.GiveOutMoney}}</div> <div>累计已发:{{scope.row.GiveOutMoney}}</div>
...@@ -99,16 +99,20 @@ ...@@ -99,16 +99,20 @@
</el-table-column> </el-table-column>
<el-table-column width='160' prop="CurrentPeriodMoney" label="当期发放信息"> <el-table-column width='160' prop="CurrentPeriodMoney" label="当期发放信息">
<template slot-scope="scope"> <template slot-scope="scope">
<div>应发:{{scope.row.CurrentPeriodMoney}}</div> <div style="color: rgb(255, 156, 0);">应发:{{scope.row.CurrentPeriodMoney}}</div>
<div>额外奖励:{{scope.row.CurrentExtraMoney}}</div> <div>额外奖励:{{scope.row.CurrentExtraMoney}}</div>
<div>抵扣:{{scope.row.DeductionMoney}}</div> <div>抵扣:{{scope.row.DeductionMoney}}</div>
<div>奖励抵扣:{{scope.row.DeductionExtraMoney}}</div> <div>奖励抵扣:{{scope.row.DeductionExtraMoney}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="YFMoney" label="最终发放"> </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 width='85' prop="Periods" label="期数"> </el-table-column>
<el-table-column prop="Remark" label="备注"> </el-table-column> <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
</el-table> </el-table>
</template> </template>
......
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