Skip to content

C
confucius
Commit 59ddc3a7 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent d7f42936
Hide whitespace changes
Inline Side-by-side
Showing with 609 additions and 741 deletions
src/components/school/student/student-Assit.vue
View file @ 59ddc3a7
......@@ -176,7 +176,6 @@
this.RoleListData = res.Data;
});
},
//筛选员工
filterEmployee(val, update, abort) {
update(() => {
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ 59ddc3a7
......@@ -771,19 +771,14 @@
cursor: pointer;
text-decoration: underline;
}
</style>
<template>
<div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail">
<div class="_none_print">
<p class="_tit">
{{GetDetail.FinanceName}}
<span
:class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span>
<span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span>
</p>
<div style="width: 890px;position: relative;text-align: right;">
<span
......@@ -796,10 +791,8 @@
</span>
<span v-show="huijiShow" class="_Printing"
@click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">凭证打印</span>
<!-- <span v-show="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" class="_Printing" @click="goPrintPage2(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">会计合并打印</span>-->
<span class="_Printing" style="margin-left:10px;"
@click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
</div>
<div class="_conten">
<my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID"
......@@ -808,7 +801,7 @@
:color="colorSon"></my-RVB-Bill>
<my-GZ-Bill v-else-if="GetDetail.Type===7" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon">
</my-GZ-Bill>
<div class="_explain">
<p>附加说明： <span class="fr" v-if="GetDetail.ComplainID > 0"
@click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)">
......@@ -830,7 +823,8 @@
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 销售提成:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==26"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教师课时:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==40 || GetDetail.OtherType==41"
<span class="fr" style="text-decoration: underline;cursor: pointer;"
v-if="GetDetail.OtherType==40 || GetDetail.OtherType==41"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育活动:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==42 "
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 活动提成:{{GetDetail.ReFinanceId}}</span>
......@@ -843,19 +837,24 @@
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==51 "
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 员工人头奖励:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==49 "
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 佣金/存折:{{GetDetail.ReFinanceId}}</span>
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 佣金/存折:{{GetDetail.ReFinanceId}}</span>
<template v-if="GetDetail.RelevanceFrId">
<span class="fr" style="margin-right:10px;">
相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
{{sItem}}</span>
相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)"
style="text-decoration:underline;cursor:pointer;margin-right:5px;">
{{sItem}}</span>
</span>
</template>
<template v-if="GetDetail.OtherType==28">
<span class="fr" v-if="GetDetail&&GetDetail.ReFinanceId" style="text-decoration: underline;cursor: pointer;color:red;"
@click="goTuikuanDetail('/user/billquery',GetDetail.ReFinanceId)" title="点击查看退款申请单"> 退款申请单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" v-if="GetDetail&&GetDetail.ReFinanceId2" style="text-decoration: underline;cursor: pointer;margin-right:20px;color:red;"
@click="goTuikuanDetail('/courseRefund',GetDetail.ReFinanceId2)" title="点击查看退款协议"> 退款协议:{{GetDetail.ReFinanceId2}}</span>
<span class="fr" v-if="GetDetail&&GetDetail.ReFinanceId"
style="text-decoration: underline;cursor: pointer;color:red;"
@click="goTuikuanDetail('/user/billquery',GetDetail.ReFinanceId)" title="点击查看退款申请单">
退款申请单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" v-if="GetDetail&&GetDetail.ReFinanceId2"
style="text-decoration: underline;cursor: pointer;margin-right:20px;color:red;"
@click="goTuikuanDetail('/courseRefund',GetDetail.ReFinanceId2)" title="点击查看退款协议">
退款协议:{{GetDetail.ReFinanceId2}}</span>
</template>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17"
@click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
......@@ -971,7 +970,8 @@
<div>
<p v-if="GetDetail.Type!==7">费用归属部门：<span class="_font_bold">{{GetDetail.DepartName}}</span></p>
<div style="display:flex;">
<div style="margin-right:20px;text-decoration:underline;cursor:pointer;" v-if="GetDetail.OtherType==53" @click="goFinDetail(GetDetail)">
<div style="margin-right:20px;text-decoration:underline;cursor:pointer;" v-if="GetDetail.OtherType==53"
@click="goFinDetail(GetDetail)">
单据详情
</div>
<el-popover popper-class="detailsIT_Journal" width="250" trigger="click">
......@@ -996,19 +996,23 @@
</el-popover>
</div>
</div>
<div lass="_explain" v-if="GetDetail.Type==2 && GetDetail.InvoiceType>0" style="flex-direction: column;align-items: flex-start;">
<div style="color: #1273BC;">发票说明：</div>
<div style="display:flex">
<p >发票类型：<p style='font-weight: bold;'>{{GetDetail.InvoiceTypeName}}</p> </p>
<p v-if="GetDetail.InvoiceType == 3" style="margin-left:30px">发票金额： <p style='font-weight: bold;' v-if="GetDetail.InvoiceType == 3">{{GetDetail.InvoiceMoney}}元</p></p>
</div>
<div>
发票备注：{{GetDetail.InvoiceRemark == null || GetDetail.InvoiceRemark==''?'无':GetDetail.InvoiceRemark}}
</div>
<div lass="_explain" v-if="GetDetail.Type==2 && GetDetail.InvoiceType>0"
style="flex-direction: column;align-items: flex-start;">
<div style="color: #1273BC;">发票说明：</div>
<div style="display:flex">
<p>发票类型：<p style='font-weight: bold;'>{{GetDetail.InvoiceTypeName}}</p>
</p>
<p v-if="GetDetail.InvoiceType == 3" style="margin-left:30px">发票金额： <p style='font-weight: bold;'
v-if="GetDetail.InvoiceType == 3">{{GetDetail.InvoiceMoney}}元</p>
</p>
</div>
<div>
发票备注：{{GetDetail.InvoiceRemark == null || GetDetail.InvoiceRemark==''?'无':GetDetail.InvoiceRemark}}
</div>
</div>
</div>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail"
:isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
<!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"/> -->
......@@ -1090,15 +1094,15 @@
</div>
</div>
<div v-if="ConfigInfo && ConfigInfo.Enable==1 && getreceipt() && ishowSJ ">
<p class="_splic" >
<p class="_splic">
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
</p>
<div class="_tit _tit2 w890px ConfigInfoStyle">
<mySJModule :FrID='ID' :GetDetail="GetDetail" @gbError='getSJstate'></mySJModule>
<mySJModule :FrID='ID' :GetDetail="GetDetail" @gbError='getSJstate'></mySJModule>
</div>
</div>
<p class="_splic">
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
</p>
......@@ -1382,7 +1386,7 @@
</div>
</template>
</el-dialog>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass">
</classinfo-form>
......@@ -1409,7 +1413,7 @@
import czBillModule from "../components/czBillModule.vue";
import mySJModule from "../components/mySJModule.vue";
import {
UploadSelfFile
} from '../../../api/common/common'
......@@ -1503,8 +1507,8 @@
isShowviewQuo: false, //是否显示预览报价单
rId: 0,
showbohui: false, //5-10新加
ConfigInfo:null,//收据配置数据
ishowSJ:true,//收据是否显示
ConfigInfo: null, //收据配置数据
ishowSJ: true, //收据是否显示
}
},
components: {
......@@ -2195,42 +2199,45 @@
},
})
},
goassets2(ID,OtherType){
goassets2(ID, OtherType) {
var tempStr = ''
if(OtherType==31){
tempStr = '/financial/financalDocument/PropertyProcurementDetails?id='+ID;
}else if(OtherType==32){
tempStr = '/financial/financalDocument/SuppliesProcurementDetail?id='+ID;
}else if(OtherType==33){
tempStr = '/financial/financalDocument/InAndOutDdetails?id='+ID;
}else if(OtherType==39){
tempStr = '/financial/userCommissionDetails?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
}else if(OtherType==26){
tempStr = '/course/rewardDetailed?TeacherIds='+this.GetDetail.EduCommissionEmp+'&Id='+ID;
}else if(OtherType==40 || OtherType== 41){
tempStr = '/sale/activityList?Id='+ID;
}else if(OtherType==42){
tempStr = '/financial/reportform/activityCommissionDetails?id='+ID +'&UserIds='+this.GetDetail.EduCommissionEmp;
}else if(OtherType==44){
tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId='+ID;
}else if(OtherType==47){
tempStr = '/financial/contribution/CommissionUserDetailList?TeacherIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
}else if(OtherType==50){
tempStr = '/financial/market/AchievementsUserDetailList?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
}else if(OtherType==51){
tempStr = '/financial/market/empBonusDetail?Id='+ID;
}else if(OtherType==49){
tempStr = '/financial/returnPassbook/returnpassbookStatistics?UnionCashOutId='+ID;
if (OtherType == 31) {
tempStr = '/financial/financalDocument/PropertyProcurementDetails?id=' + ID;
} else if (OtherType == 32) {
tempStr = '/financial/financalDocument/SuppliesProcurementDetail?id=' + ID;
} else if (OtherType == 33) {
tempStr = '/financial/financalDocument/InAndOutDdetails?id=' + ID;
} else if (OtherType == 39) {
tempStr = '/financial/userCommissionDetails?UserIds=' + this.GetDetail.EduCommissionEmp + '&preriodId=' + ID;
} else if (OtherType == 26) {
tempStr = '/course/rewardDetailed?TeacherIds=' + this.GetDetail.EduCommissionEmp + '&Id=' + ID;
} else if (OtherType == 40 || OtherType == 41) {
tempStr = '/sale/activityList?Id=' + ID;
} else if (OtherType == 42) {
tempStr = '/financial/reportform/activityCommissionDetails?id=' + ID + '&UserIds=' + this.GetDetail
.EduCommissionEmp;
} else if (OtherType == 44) {
tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId=' + ID;
} else if (OtherType == 47) {
tempStr = '/financial/contribution/CommissionUserDetailList?TeacherIds=' + this.GetDetail.EduCommissionEmp +
'&preriodId=' + ID;
} else if (OtherType == 50) {
tempStr = '/financial/market/AchievementsUserDetailList?UserIds=' + this.GetDetail.EduCommissionEmp +
'&preriodId=' + ID;
} else if (OtherType == 51) {
tempStr = '/financial/market/empBonusDetail?Id=' + ID;
} else if (OtherType == 49) {
tempStr = '/financial/returnPassbook/returnpassbookStatistics?UnionCashOutId=' + ID;
}
this.$router.push({
path: tempStr
});
this.$router.push({
path: tempStr
});
},
//跳转到退款协议
goTuikuanDetail(path,Id){
this.OpenNewUrl(path,{
Id:Id
goTuikuanDetail(path, Id) {
this.OpenNewUrl(path, {
Id: Id
})
},
lookbreakage(ID) {
......@@ -2275,7 +2282,7 @@
query: {
'ClassId': item.ClassId,
'School_Id': item.School_Id,
'ClassName': encodeURI(item.ClassName) ,
'ClassName': encodeURI(item.ClassName),
}
})
......@@ -2314,38 +2321,38 @@
}
},
//数组字符串转数组
getRelevanArr(Relevance){
getRelevanArr(Relevance) {
var Arr = [];
if(Relevance){
if (Relevance) {
Arr = Relevance.split(',');
}
return Arr;
},
//跳转
goFinancal(item){
goFinancal(item) {
this.OpenNewUrl('/financial/financalDocument/FinancialDocumentsDetail', {
"id": item
});
},
getReceiptif(){
getReceiptif() {
getReceiptConfigInfo({}).then(res => {
if (res.Code == 1) {
this.ConfigInfo = res.Data;
}
})
},
getreceipt(){
if(this.ConfigInfo.TempleteIds.indexOf(this.GetDetail.TemplateId)!=-1){
getreceipt() {
if (this.ConfigInfo.TempleteIds.indexOf(this.GetDetail.TemplateId) != -1) {
return true
}else{
} else {
return false
}
},
getSJstate(){
getSJstate() {
this.ishowSJ = false
},
//跳转至详情
goFinDetail(obj){
goFinDetail(obj) {
this.$router.push({
path: '/financial/returnPassbook/ReturnUserList',
query: {
......@@ -2355,15 +2362,13 @@
}
})
}
},
mounted() {
this.GetAuth();
this.userInfo = this.getLocalStorage();
this.qjGroupId = this.QjGroupId();
this.Financial_post_GetDetail(this.ID)
this.getReceiptif()//获取收据配置
this.getReceiptif() //获取收据配置
this.queryMsg.FinanceId = this.$route.query.id;
if (this.$route.query.Conditon) {
this.returnCode = this.$route.query.Conditon;
......@@ -2371,5 +2376,4 @@
this.getTuikuan();
}
}
</script>
</script>
\ No newline at end of file
src/pages/financial/returnPassbook/PassbookperiodsList.vue
View file @ 59ddc3a7
<style>
.baseSet_Title {
width: 120px !important;
padding: 18px 0 0 16px;
text-align: right;
}
.ReturnperiodsList .border-bottom {
/* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px;
margin-bottom: 5px;
}
.ReturnperiodsList .text-bottom{
height: 32px;line-height: 32px; margin-bottom: 10px;
}
.ReturnperiodsList ._icon_btn i.icon-sousuo {
.baseSet_Title {
width: 120px !important;
padding: 18px 0 0 16px;
text-align: right;
}
.ReturnperiodsList .border-bottom {
padding-bottom: 5px;
margin-bottom: 5px;
}
.ReturnperiodsList .text-bottom {
height: 32px;
line-height: 32px;
margin-bottom: 10px;
}
.ReturnperiodsList ._icon_btn i.icon-sousuo {
background-color: #47BF8C;
}
.ReturnperiodsList ._icon_btn .icon-add{
.ReturnperiodsList ._icon_btn .icon-add {
background-color: #47BF8C;
}
.ReturnperiodsList ._icon_btn i {
.ReturnperiodsList ._icon_btn i {
width: 26px;
height: 26px;
display: inline-block;
......@@ -30,208 +36,176 @@
cursor: pointer;
outline: none;
}
.ReturnperiodsList .el-table td,.el-table th{
.ReturnperiodsList .el-table td,
.el-table th {
padding: 5px 0;
}
</style>
<template>
<div class="page-body ReturnperiodsList">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<!-- <div style="margin-right: 20px;" v-if='iscMaker==true'>
<div class="block">
<span style="margin-right: 5px;">校区</span>
<el-select v-model="msg.SchoolId" filterable @change="handleCurrentChanges(1)">
<el-option value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'></el-option>
</el-select>
</div>
</div> -->
<div style="display:flex;justify-content: space-between;width: 100%;align-items: center;" >
<div class="block" style="display:flex;">
<span style="margin-right: 5px;">月份筛选</span>
<el-date-picker
v-model="msg.Month"
value-format="yyyy-MM"
type="month"
placeholder="选择月"
@change="handleCurrentChanges(1)"
>
</el-date-picker>
</div>
<div v-if='isgenerate==true'>
<q-btn :loading="loading1" color="primary" size="11px" label="生成幸福存折" @click="scCommission" style="height:28px"/>
<div style="font-size: 10px;color: #666;">*默认生成上月幸福存折</div>
</div>
</div>
</div>
</style>
<template>
<div class="page-body ReturnperiodsList">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div style="display:flex;justify-content: space-between;width: 100%;align-items: center;">
<div class="block" style="display:flex;">
<span style="margin-right: 5px;">月份筛选</span>
<el-date-picker v-model="msg.Month" value-format="yyyy-MM" type="month" placeholder="选择月"
@change="handleCurrentChanges(1)">
</el-date-picker>
</div>
<div v-if='isgenerate==true'>
<q-btn :loading="loading1"  color="primary"  size="11px"  label="生成幸福存折"  @click="scCommission"
 style="height:28px" />
<div style="font-size: 10px;color: #666;">*默认生成上月幸福存折</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="Id" label="ID" ></el-table-column> -->
<el-table-column prop="BatchName" label="周期" ></el-table-column>
<el-table-column prop="TotalMoney" label="累计金额" > </el-table-column>
<el-table-column prop="CreateByName" label="创建人" > </el-table-column>
<el-table-column prop="CreateDate" label="创建时间" > </el-table-column>
<el-table-column label="操作" >
<template slot-scope="scope">
<div class="_icon_btn">
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo"
@click="goUrl(scope.row.Id)"></i>
</el-tooltip>
</div>
</template>
</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>
</div>
</template>
<script>
import {
getSchoolDropdown
} from '../../../api/school/index'
import{
getCommissionPeriodsPageList,
setSellCommissionRule,
setUserReturnCommission,
getSellAchievementsSendEmployeeList,
setSellAchievementsSendEmployee
} from '../../../api/finance/index'
export default {
meta: {
title: "幸福存折期数列表"
},
props: {},
components: {},
data() {
return {
loading: false,
loading1: false,
value2:'',
//列表数据参数
msg: {
PageIndex: 1,
PageSize: 15,
SchoolId:'-1',
Month:'',
CommissionType:2,
},
pageCount: 0,
persistent: false,
listData:{},
tableData:[],
total:0,
CompanyList:[],
isgenerate:false,//是否有生成的权限
iscMaker:false,//是否有制单的权限
SendEmployeeList:[],//可发放提成的用户列表
costmode:false,
multipleSelection:[],
totalAmount:0,//选中的金额总额
CheckID:0,
<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="BatchName" label="周期"></el-table-column>
<el-table-column prop="TotalMoney" label="累计金额"> </el-table-column>
<el-table-column prop="CreateByName" label="创建人"> </el-table-column>
<el-table-column prop="CreateDate" label="创建时间"> </el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div class="_icon_btn">
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i>
</el-tooltip>
</div>
</template>
</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 {
getCommissionPeriodsPageList,
setSellCommissionRule,
setUserReturnCommission,
getSellAchievementsSendEmployeeList,
setSellAchievementsSendEmployee
} from '../../../api/finance/index'
export default {
meta: {
title: "幸福存折期数列表"
},
props: {},
components: {},
data() {
return {
loading: false,
loading1: false,
value2: '',
//列表数据参数
msg: {
PageIndex: 1,
PageSize: 15,
SchoolId: '-1',
Month: '',
CommissionType: 2,
},
pageCount: 0,
persistent: false,
listData: {},
tableData: [],
total: 0,
CompanyList: [],
isgenerate: false, //是否有生成的权限
iscMaker: false, //是否有制单的权限
SendEmployeeList: [], //可发放提成的用户列表
costmode: false,
multipleSelection: [],
totalAmount: 0, //选中的金额总额
CheckID: 0,
}
},
created() {
let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x => { //判断权限
if (x.FunctionCode == "SAGenerate_Commission") { //判断是否有生成的权限
this.isgenerate = true;
}
},
created() {
let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x=>{//判断权限
if(x.FunctionCode == "SAGenerate_Commission"){//判断是否有生成的权限
this.isgenerate = true;
}
if(x.FunctionCode == "SACommission_maker"){//判断是否有制单的权限
this.iscMaker = true;
if (x.FunctionCode == "SACommission_maker") { //判断是否有制单的权限
this.iscMaker = true;
}
})
var myDate = new Date();
myDate.setMonth(myDate.getMonth() - 1);
},
mounted() {
this.getList(); //获取提成周期列表
},
methods: {
getList() {
this.loading = true;
getCommissionPeriodsPageList(this.msg).then(res => {
if (res.Code == 1) {
this.loading = false;
this.tableData = res.Data.PageData
this.total = res.Data.Count
}
})
var myDate=new Date();
myDate.setMonth(myDate.getMonth()-1);
// this.msg.Month = myDate.getFullYear() + "-" + (myDate.getMonth()+1)
},
mounted() {
this.getList();//获取提成周期列表
// this.getBranchList()
scCommission() { //生成提成
if (this.loading1 == false) {
this.loading1 = true;
setUserReturnCommission({
type: 2
}).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '生成提成成功',
position: 'top'
})
this.getList()
}
this.loading1 = false;
}).catch(err => {
this.loading1 = false;
})
}
},
methods: {
getList(){
this.loading = true;
getCommissionPeriodsPageList(this.msg).then(res => {
if (res.Code == 1) {
this.loading = false;
this.tableData = res.Data.PageData
this.total = res.Data.Count
}
})
},
scCommission(){//生成提成
if(this.loading1 == false){
this.loading1= true;
setUserReturnCommission({type:2}).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '生成提成成功',
position: 'top'
})
this.getList()
}
this.loading1= false;
}).catch(err=>{
this.loading1= false;
})
}
},
getBranchList(){//获取校区
getSchoolDropdown({}).then(res => {
this.CompanyList = res.Data;
}).catch(() => {
getBranchList() { //获取校区
getSchoolDropdown({}).then(res => {
this.CompanyList = res.Data;
}).catch(() => {
})
},
goUrl(id ) {
this.$router.push({
path: '/financial/returnPassbook/ReturnUserList',
query: {
"id": id,
"CommissionType": 2,
blank: 'y',
}
})
},
handleCurrentChanges(val){
this.msg.PageIndex= val;
this.getList()
},
})
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
goUrl(id) {
this.$router.push({
path: '/financial/returnPassbook/ReturnUserList',
query: {
"id": id,
"CommissionType": 2,
blank: 'y',
}
})
},
handleCurrentChanges(val) {
this.msg.PageIndex = val;
this.getList()
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
src/pages/financial/returnPassbook/ReturnUserList.vue
View file @ 59ddc3a7
<style>
.baseSet_Title {
.baseSet_Title {
width: 120px !important;
padding: 18px 0 0 16px;
text-align: right;
}
}
.CommissionDetail .border-bottom {
/* border-bottom: 1px dashed #EEE; */
.CommissionDetail .border-bottom {
padding-bottom: 5px;
margin-bottom: 5px;
}
}
.CommissionDetail .text-bottom {
.CommissionDetail .text-bottom {
height: 32px;
line-height: 32px;
margin-bottom: 10px;
}
}
.CommissionDetail ._icon_btn i.icon-sousuo {
.CommissionDetail ._icon_btn i.icon-sousuo {
background-color: #47bf8c;
}
}
.CommissionDetail ._icon_btn i {
.CommissionDetail ._icon_btn i {
width: 26px;
height: 26px;
display: inline-block;
......@@ -32,473 +31,365 @@
margin-right: 10px;
cursor: pointer;
outline: none;
}
}
.CommissionDetail .el-table td,
.el-table th {
.CommissionDetail .el-table td,
.el-table th {
padding: 5px 0;
}
}
</style>
<template>
<div class="page-body CommissionDetail">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div style="margin-right: 10px;">
<q-btn
color="primary"
size="11px"
label="返回"
@click="goreturn"
style="margin-left:10px"
/>
</div>
<div class="col row wrap q-mr-lg q-col-gutter-md">
<!-- <div class="col-3">
<q-select
filled
stack-label
use-input
input-debounce="0"
option-value="SId"
@input="getList"
option-label="SName"
v-model="msg.SchoolId"
:options="CompanyList"
label="校区"
:dense="false"
emit-value
map-options
></q-select>
</div> -->
<!-- <div class="col-3">
<q-select
filled
stack-label
input-debounce="0"
option-value="Id"
@input="getList"
option-label="Name"
v-model="msg.Status"
:options="StatusList"
label="状态"
:dense="false"
emit-value
map-options
></q-select>
</div> -->
<div class="col-3">
<q-select
filled
stack-label
input-debounce="0"
option-value="Id"
@input="getlaiyuan"
option-label="Name"
v-model="msg.OrderSourceType"
:options="customFromList"
label="来源"
dense
emit-value
map-options
></q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3">
<q-select
filled
stack-label
clearable
v-model="msg.OrderSourceId"
:dense="false"
:options="myEmployeeList"
use-input
@input="getList"
label="人员"
@filter="filterEmployee"
option-label="EmployeeName"
option-value="Id"
emit-value
map-options
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 2">
<q-select
filled
stack-label
v-model="msg.OrderSourceId"
clearable
:dense="false"
:options="customList"
use-input
@input="getList"
label="关联同行"
@filter="filterFn"
option-label="CustomerName"
option-value="CustomerId"
emit-value
map-options
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 4">
<q-select
filled
clearable
stack-label
v-model="msg.OrderSourceId"
:dense="false"
:options="InvitationList"
use-input
@input="getList"
label="转介人"
@filter="filterFnStudent"
option-label="StuName"
option-value="StuId"
emit-value
map-options
>
<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>
<div class="page-body CommissionDetail">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div style="margin-right: 10px;">
<q-btn color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px" />
</div>
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select filled stack-label input-debounce="0" option-value="Id" @input="getlaiyuan" option-label="Name"
v-model="msg.OrderSourceType" :options="customFromList" label="来源" dense emit-value map-options>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3">
<q-select filled stack-label clearable v-model="msg.OrderSourceId" :dense="false" :options="myEmployeeList"
use-input @input="getList" label="人员" @filter="filterEmployee" option-label="EmployeeName"
option-value="Id" emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 2">
<q-select filled stack-label v-model="msg.OrderSourceId" clearable :dense="false" :options="customList"
use-input @input="getList" label="关联同行" @filter="filterFn" option-label="CustomerName"
option-value="CustomerId" emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 4">
<q-select filled clearable stack-label v-model="msg.OrderSourceId" :dense="false" :options="InvitationList"
use-input @input="getList" label="转介人" @filter="filterFnStudent" option-label="StuName"
option-value="StuId" emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</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="UserName"
label="人员"
:filters="UserNamelist"
:filter-method="filterHandler"
></el-table-column>
<el-table-column prop="OrderSourceType" label="类型">
<template slot-scope="scope">
{{getOrderSourceType(scope.row.OrderSourceType)}}
</template>
</el-table-column>
<el-table-column
prop="StudentCount"
label="学生数量"
sortable
:sort-method="StudentCount"
></el-table-column>
<el-table-column
prop="CommissionMoeny"
label="提成金额"
sortable
:sort-method="CommissionMoeny"
></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div class="_icon_btn">
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i
class="iconfont icon-sousuo"
@click="goUrl('returnPassbook/returnpassbookStatistics', scope.row)"
></i>
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table>
</template>
</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="UserName" label="人员" :filters="UserNamelist" :filter-method="filterHandler">
</el-table-column>
<el-table-column prop="OrderSourceType" label="类型">
<template slot-scope="scope">
{{getOrderSourceType(scope.row.OrderSourceType)}}
</template>
</el-table-column>
<el-table-column prop="StudentCount" label="学生数量" sortable :sort-method="StudentCount"></el-table-column>
<el-table-column prop="CommissionMoeny" label="提成金额" sortable :sort-method="CommissionMoeny"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div class="_icon_btn">
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo"
@click="goUrl('returnPassbook/returnpassbookStatistics', scope.row)"></i>
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table>
</template>
</div>
</template>
<script>
import {
<script>
import {
GetClassTypePageList,
} from '../../../api/system/index';
import {
} from '../../../api/system/index';
import {
GetStudentList,
} from '../../../api/course/class';
import {
} from '../../../api/course/class';
import {
getCommissionUserList,
} from '../../../api/finance/index'
import {
} from '../../../api/finance/index'
import {
getSchoolDropdown,
getStudentDorpDownList
} from "../../../api/school/index";
import {
} from "../../../api/school/index";
import {
queryEmployee
} from '../../../api/users/user'
import {
} from '../../../api/users/user'
import {
CreateTypeList,
GetCustomerList
} from '../../../api/sale/sale'
export default {
} from '../../../api/sale/sale'
export default {
meta: {
title: "销售提成详情"
title: "销售提成详情"
},
props: {},
components: {},
data() {
return {
loading: false,
//列表数据参数
msg: {
BatchId: 0,
SchoolId: '-1',
Status: '-2',
OrderSourceType: '-1',
OrderSourceId: 0,
Q_SelectNormal: '2',
UserDept:0
},
pageCount: 0,
persistent: false,
tableData: [],
CompanyList: [],
StatusList: [
{ Id: '-2', Name: '不限' }, { Id: '-1', Name: '不返佣' }, { Id: '0', Name: '待返佣' }, { Id: '1', Name: '已返佣到账户' }, { Id: '2', Name: '佣金已提现' },
],
see_tcdetailed: false,
customFromList: [],
UserNamelist: [],
employeeList: [],
myEmployeeList: [],
return {
loading: false,
//列表数据参数
msg: {
BatchId: 0,
SchoolId: '-1',
Status: '-2',
OrderSourceType: '-1',
OrderSourceId: 0,
Q_SelectNormal: '2',
UserDept: 0
},
pageCount: 0,
persistent: false,
tableData: [],
CompanyList: [],
StatusList: [{
Id: '-2',
Name: '不限'
}, {
Id: '-1',
Name: '不返佣'
}, {
Id: '0',
Name: '待返佣'
}, {
Id: '1',
Name: '已返佣到账户'
}, {
Id: '2',
Name: '佣金已提现'
}, ],
see_tcdetailed: false,
customFromList: [],
UserNamelist: [],
employeeList: [],
myEmployeeList: [],
TransListData: [], //转介人数据
MyTransListData: [],
customList: [], //同行列表
allCustomList: [], //所有同行列表
InvitationList: [], //学员下拉数据
AllInvitationList: [],
}
},
created() {
TransListData: [], //转介人数据
MyTransListData: [],
customList: [], //同行列表
allCustomList: [], //所有同行列表
InvitationList: [], //学员下拉数据
AllInvitationList: [],
}
},
created() {},
mounted() {
if (this.$route.query && this.$route.query.id) {
this.msg.BatchId = this.$route.query.id
}
if (this.$route.query.ReFinanceId2){
this.msg.UserDept = this.$route.query.ReFinanceId2;
}
this.getList()
this.getBranchList()
this.getCustomFrom()
this.getEmployeeList()
this.getStudentDorpDown()
this.GetCustomerList()
this.getStudentList();//学员下拉
console.log("this.$route.query", this.$route.query)
if (this.$route.query && this.$route.query.id) {
this.msg.BatchId = this.$route.query.id
}
if (this.$route.query.ReFinanceId2) {
this.msg.UserDept = this.$route.query.ReFinanceId2;
}
this.getList()
this.getBranchList()
this.getCustomFrom()
this.getEmployeeList()
this.getStudentDorpDown()
this.GetCustomerList()
this.getStudentList(); //学员下拉
},
methods: {
getList() {
this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderSourceId == ''|| msg.OrderSourceId==null) {
msg.OrderSourceId = 0
}
getCommissionUserList(msg).then(res => {
if (res.Code == 1) {
this.loading = false;
this.tableData = res.Data;
this.UserNamelist = [];
this.tableData.forEach(x => {
let obj3 = {
text: x.UserName,
value: x.UserName
}
this.UserNamelist.push(obj3)
})
this.UserNamelist = this.unique(this.UserNamelist)
}
})
},
getlaiyuan() {
if (this.msg.OrderSourceType == -1) {
this.msg.OrderSourceId = 0
} else {
this.msg.OrderSourceId = ''
}
this.getList()
},
getBranchList() {//获取校区
getSchoolDropdown({}).then(res => {
let obj = {
SName: '不限',
SId: '-1'
}
this.CompanyList = res.Data;
this.CompanyList.unshift(obj);
}).catch(() => {
getList() {
this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderSourceId == '' || msg.OrderSourceId == null) {
msg.OrderSourceId = 0
}
getCommissionUserList(msg).then(res => {
if (res.Code == 1) {
this.loading = false;
this.tableData = res.Data;
this.UserNamelist = [];
this.tableData.forEach(x => {
let obj3 = {
text: x.UserName,
value: x.UserName
}
this.UserNamelist.push(obj3)
})
},
//获取客户来源
getCustomFrom() {
CreateTypeList({}).then(res => {
if (res.Code == 1) {
let obj = {
Name: '不限',
Id: '-1'
}
this.customFromList = res.Data;
this.customFromList.unshift(obj);
this.UserNamelist = this.unique(this.UserNamelist)
}
})
},
getlaiyuan() {
if (this.msg.OrderSourceType == -1) {
this.msg.OrderSourceId = 0
} else {
this.msg.OrderSourceId = ''
}
this.getList()
},
getBranchList() { //获取校区
getSchoolDropdown({}).then(res => {
let obj = {
SName: '不限',
SId: '-1'
}
this.CompanyList = res.Data;
this.CompanyList.unshift(obj);
}).catch(() => {
}
})
},
getOrderSourceType(Id){
let Name = ''
this.customFromList.forEach(x=>{
if(x.Id == Id){
Name = x.Name
}
})
return Name
},
//筛选转介人
filterStudent(val, update, abort) {
update(() => {
this.MyTransListData = this.TransListData.filter(
v => v.StuName.indexOf(val) > -1
);
});
},
unique(arr, Name) { //数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
);
},
//筛选员工
filterEmployee(val, update, abort) {
update(() => {
this.myEmployeeList = this.employeeList.filter(
v => v.EmployeeName.indexOf(val) > -1
);
});
},
//获取员工列表
getEmployeeList() {
queryEmployee({
IsLeave: 1
}).then(res => {
this.employeeList = res.Data;
this.myEmployeeList = res.Data;
})
},
//获取转介人下拉
getStudentDorpDown() {
getStudentDorpDownList().then(res => {
if (res.Code == 1) {
this.TransListData = res.Data;
this.MyTransListData = res.Data;
}
})
},
//获取客户下拉数据
GetCustomerList() {
let msg = {
QCreateBy: 0
})
},
//获取客户来源
getCustomFrom() {
CreateTypeList({}).then(res => {
if (res.Code == 1) {
let obj = {
Name: '不限',
Id: '-1'
}
GetCustomerList(msg).then(res => {
if (res.Code == 1) {
this.customList = res.Data;
this.allCustomList = res.Data;
}
})
},
//筛选客户
filterFn(val, update) {
update(() => {
if (val === "") {
this.customList = JSON.parse(JSON.stringify(this.allCustomList));
} else {
const needle = val.toLowerCase();
this.customList = this.allCustomList.filter(
(v) => v.CustomerName.toLowerCase().indexOf(needle) > -1
);
}
});
},
//获取学员下拉信息
getStudentList() {
var qMsg = {
SchoolId: this.msg.SchoolId
};
GetStudentList(qMsg).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
if (jsonData && jsonData.length > 0) {
this.AllInvitationList = JSON.parse(JSON.stringify(jsonData));
this.InvitationList = JSON.parse(JSON.stringify(jsonData));
}
}
})
},
filterFnStudent(val, update) {
update(() => {
if (val === '') {
this.InvitationList = JSON.parse(JSON.stringify(this.AllInvitationList))
} else {
const needle = val.toLowerCase()
this.InvitationList = this.AllInvitationList.filter(v => v.StuName.toLowerCase().indexOf(needle) > -1)
}
})
},
goUrl(path, row) {
this.$router.push({
path: '/financial/' + path,
query: {
preriodId: this.$route.query.id,
CommissionType: this.$route.query.CommissionType,
OrderSourceType:row.OrderSourceType,
OrderSourceId:row.OrderSourceId,
blank: 'y',
}
})
},
filterHandler(value, row, column) {
const property = column['property'];
return row[property] === value;
},
StudentCount(a, b, c) {
return a.StudentCount - b.StudentCount;
},
CommissionMoeny(a, b) {
return a.CommissionMoeny - b.CommissionMoeny;
},
goreturn() {
this.$router.go(-1);
this.customFromList = res.Data;
this.customFromList.unshift(obj);
}
})
},
getOrderSourceType(Id) {
let Name = ''
this.customFromList.forEach(x => {
if (x.Id == Id) {
Name = x.Name
}
})
return Name
},
//筛选转介人
filterStudent(val, update, abort) {
update(() => {
this.MyTransListData = this.TransListData.filter(
v => v.StuName.indexOf(val) > -1
);
});
},
unique(arr, Name) { //数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
);
},
//筛选员工
filterEmployee(val, update, abort) {
update(() => {
this.myEmployeeList = this.employeeList.filter(
v => v.EmployeeName.indexOf(val) > -1
);
});
},
//获取员工列表
getEmployeeList() {
queryEmployee({
IsLeave: 1
}).then(res => {
this.employeeList = res.Data;
this.myEmployeeList = res.Data;
})
},
//获取转介人下拉
getStudentDorpDown() {
getStudentDorpDownList().then(res => {
if (res.Code == 1) {
this.TransListData = res.Data;
this.MyTransListData = res.Data;
}
})
},
//获取客户下拉数据
GetCustomerList() {
let msg = {
QCreateBy: 0
}
GetCustomerList(msg).then(res => {
if (res.Code == 1) {
this.customList = res.Data;
this.allCustomList = res.Data;
}
})
},
//筛选客户
filterFn(val, update) {
update(() => {
if (val === "") {
this.customList = JSON.parse(JSON.stringify(this.allCustomList));
} else {
const needle = val.toLowerCase();
this.customList = this.allCustomList.filter(
(v) => v.CustomerName.toLowerCase().indexOf(needle) > -1
);
}
});
},
//获取学员下拉信息
getStudentList() {
var qMsg = {
SchoolId: this.msg.SchoolId
};
GetStudentList(qMsg).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
if (jsonData && jsonData.length > 0) {
this.AllInvitationList = JSON.parse(JSON.stringify(jsonData));
this.InvitationList = JSON.parse(JSON.stringify(jsonData));
}
}
})
},
filterFnStudent(val, update) {
update(() => {
if (val === '') {
this.InvitationList = JSON.parse(JSON.stringify(this.AllInvitationList))
} else {
const needle = val.toLowerCase()
this.InvitationList = this.AllInvitationList.filter(v => v.StuName.toLowerCase().indexOf(needle) > -1)
}
})
},
goUrl(path, row) {
this.$router.push({
path: '/financial/' + path,
query: {
preriodId: this.$route.query.id,
CommissionType: this.$route.query.CommissionType,
OrderSourceType: row.OrderSourceType,
OrderSourceId: row.OrderSourceId,
blank: 'y',
}
})
},
filterHandler(value, row, column) {
const property = column['property'];
return row[property] === value;
},
StudentCount(a, b, c) {
return a.StudentCount - b.StudentCount;
},
CommissionMoeny(a, b) {
return a.CommissionMoeny - b.CommissionMoeny;
},
goreturn() {
this.$router.go(-1);
}
},
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
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