Skip to content

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

页面修改

parent d7f42936
Show 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 @@ ...@@ -176,7 +176,6 @@
this.RoleListData = res.Data; this.RoleListData = res.Data;
}); });
}, },
//筛选员工 //筛选员工
filterEmployee(val, update, abort) { filterEmployee(val, update, abort) {
update(() => { update(() => {
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ 59ddc3a7
...@@ -771,19 +771,14 @@ ...@@ -771,19 +771,14 @@
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
} }
</style> </style>
<template> <template>
<div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail"> <div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail">
<div class="_none_print"> <div class="_none_print">
<p class="_tit"> <p class="_tit">
{{GetDetail.FinanceName}} {{GetDetail.FinanceName}}
<span <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span>
:class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span>
</p> </p>
<div style="width: 890px;position: relative;text-align: right;"> <div style="width: 890px;position: relative;text-align: right;">
<span <span
...@@ -796,10 +791,8 @@ ...@@ -796,10 +791,8 @@
</span> </span>
<span v-show="huijiShow" class="_Printing" <span v-show="huijiShow" class="_Printing"
@click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">凭证打印</span> @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;" <span class="_Printing" style="margin-left:10px;"
@click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span> @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
</div> </div>
<div class="_conten"> <div class="_conten">
<my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" <my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID"
...@@ -830,7 +823,8 @@ ...@@ -830,7 +823,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==26" <span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==26"
@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==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> @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育活动:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==42 " <span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==42 "
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 活动提成:{{GetDetail.ReFinanceId}}</span> @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 活动提成:{{GetDetail.ReFinanceId}}</span>
...@@ -847,15 +841,20 @@ ...@@ -847,15 +841,20 @@
<template v-if="GetDetail.RelevanceFrId"> <template v-if="GetDetail.RelevanceFrId">
<span class="fr" style="margin-right:10px;"> <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;"> 相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)"
style="text-decoration:underline;cursor:pointer;margin-right:5px;">
{{sItem}}</span> {{sItem}}</span>
</span> </span>
</template> </template>
<template v-if="GetDetail.OtherType==28"> <template v-if="GetDetail.OtherType==28">
<span class="fr" v-if="GetDetail&&GetDetail.ReFinanceId" style="text-decoration: underline;cursor: pointer;color:red;" <span class="fr" v-if="GetDetail&&GetDetail.ReFinanceId"
@click="goTuikuanDetail('/user/billquery',GetDetail.ReFinanceId)" title="点击查看退款申请单"> 退款申请单:{{GetDetail.ReFinanceId}}</span> style="text-decoration: underline;cursor: pointer;color:red;"
<span class="fr" v-if="GetDetail&&GetDetail.ReFinanceId2" style="text-decoration: underline;cursor: pointer;margin-right:20px;color:red;" @click="goTuikuanDetail('/user/billquery',GetDetail.ReFinanceId)" title="点击查看退款申请单">
@click="goTuikuanDetail('/courseRefund',GetDetail.ReFinanceId2)" title="点击查看退款协议"> 退款协议:{{GetDetail.ReFinanceId2}}</span> 退款申请单:{{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> </template>
<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"
@click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span> @click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
...@@ -971,7 +970,8 @@ ...@@ -971,7 +970,8 @@
<div> <div>
<p v-if="GetDetail.Type!==7">费用归属部门：<span class="_font_bold">{{GetDetail.DepartName}}</span></p> <p v-if="GetDetail.Type!==7">费用归属部门：<span class="_font_bold">{{GetDetail.DepartName}}</span></p>
<div style="display:flex;"> <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> </div>
<el-popover popper-class="detailsIT_Journal" width="250" trigger="click"> <el-popover popper-class="detailsIT_Journal" width="250" trigger="click">
...@@ -996,11 +996,15 @@ ...@@ -996,11 +996,15 @@
</el-popover> </el-popover>
</div> </div>
</div> </div>
<div lass="_explain" v-if="GetDetail.Type==2 && GetDetail.InvoiceType>0" style="flex-direction: column;align-items: flex-start;"> <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="color: #1273BC;">发票说明：</div>
<div style="display:flex"> <div style="display:flex">
<p >发票类型：<p style='font-weight: bold;'>{{GetDetail.InvoiceTypeName}}</p> </p> <p>发票类型：<p style='font-weight: bold;'>{{GetDetail.InvoiceTypeName}}</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> </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>
<div> <div>
发票备注：{{GetDetail.InvoiceRemark == null || GetDetail.InvoiceRemark==''?'无':GetDetail.InvoiceRemark}} 发票备注：{{GetDetail.InvoiceRemark == null || GetDetail.InvoiceRemark==''?'无':GetDetail.InvoiceRemark}}
...@@ -1090,7 +1094,7 @@ ...@@ -1090,7 +1094,7 @@
</div> </div>
</div> </div>
<div v-if="ConfigInfo && ConfigInfo.Enable==1 && getreceipt() && ishowSJ "> <div v-if="ConfigInfo && ConfigInfo.Enable==1 && getreceipt() && ishowSJ ">
<p class="_splic" > <p class="_splic">
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
</p> </p>
<div class="_tit _tit2 w890px ConfigInfoStyle"> <div class="_tit _tit2 w890px ConfigInfoStyle">
...@@ -1503,8 +1507,8 @@ ...@@ -1503,8 +1507,8 @@
isShowviewQuo: false, //是否显示预览报价单 isShowviewQuo: false, //是否显示预览报价单
rId: 0, rId: 0,
showbohui: false, //5-10新加 showbohui: false, //5-10新加
ConfigInfo:null,//收据配置数据 ConfigInfo: null, //收据配置数据
ishowSJ:true,//收据是否显示 ishowSJ: true, //收据是否显示
} }
}, },
components: { components: {
...@@ -2195,32 +2199,35 @@ ...@@ -2195,32 +2199,35 @@
}, },
}) })
}, },
goassets2(ID,OtherType){ goassets2(ID, OtherType) {
var tempStr = '' var tempStr = ''
if(OtherType==31){ if (OtherType == 31) {
tempStr = '/financial/financalDocument/PropertyProcurementDetails?id='+ID; tempStr = '/financial/financalDocument/PropertyProcurementDetails?id=' + ID;
}else if(OtherType==32){ } else if (OtherType == 32) {
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){ } else if (OtherType == 39) {
tempStr = '/financial/userCommissionDetails?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID; tempStr = '/financial/userCommissionDetails?UserIds=' + this.GetDetail.EduCommissionEmp + '&preriodId=' + ID;
}else if(OtherType==26){ } else if (OtherType == 26) {
tempStr = '/course/rewardDetailed?TeacherIds='+this.GetDetail.EduCommissionEmp+'&Id='+ID; tempStr = '/course/rewardDetailed?TeacherIds=' + this.GetDetail.EduCommissionEmp + '&Id=' + ID;
}else if(OtherType==40 || OtherType== 41){ } else if (OtherType == 40 || OtherType == 41) {
tempStr = '/sale/activityList?Id='+ID; tempStr = '/sale/activityList?Id=' + ID;
}else if(OtherType==42){ } else if (OtherType == 42) {
tempStr = '/financial/reportform/activityCommissionDetails?id='+ID +'&UserIds='+this.GetDetail.EduCommissionEmp; tempStr = '/financial/reportform/activityCommissionDetails?id=' + ID + '&UserIds=' + this.GetDetail
}else if(OtherType==44){ .EduCommissionEmp;
tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId='+ID; } else if (OtherType == 44) {
}else if(OtherType==47){ tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId=' + ID;
tempStr = '/financial/contribution/CommissionUserDetailList?TeacherIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID; } else if (OtherType == 47) {
}else if(OtherType==50){ tempStr = '/financial/contribution/CommissionUserDetailList?TeacherIds=' + this.GetDetail.EduCommissionEmp +
tempStr = '/financial/market/AchievementsUserDetailList?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID; '&preriodId=' + ID;
}else if(OtherType==51){ } else if (OtherType == 50) {
tempStr = '/financial/market/empBonusDetail?Id='+ID; tempStr = '/financial/market/AchievementsUserDetailList?UserIds=' + this.GetDetail.EduCommissionEmp +
}else if(OtherType==49){ '&preriodId=' + ID;
tempStr = '/financial/returnPassbook/returnpassbookStatistics?UnionCashOutId='+ID; } else if (OtherType == 51) {
tempStr = '/financial/market/empBonusDetail?Id=' + ID;
} else if (OtherType == 49) {
tempStr = '/financial/returnPassbook/returnpassbookStatistics?UnionCashOutId=' + ID;
} }
this.$router.push({ this.$router.push({
...@@ -2228,9 +2235,9 @@ ...@@ -2228,9 +2235,9 @@
}); });
}, },
//跳转到退款协议 //跳转到退款协议
goTuikuanDetail(path,Id){ goTuikuanDetail(path, Id) {
this.OpenNewUrl(path,{ this.OpenNewUrl(path, {
Id:Id Id: Id
}) })
}, },
lookbreakage(ID) { lookbreakage(ID) {
...@@ -2275,7 +2282,7 @@ ...@@ -2275,7 +2282,7 @@
query: { query: {
'ClassId': item.ClassId, 'ClassId': item.ClassId,
'School_Id': item.School_Id, 'School_Id': item.School_Id,
'ClassName': encodeURI(item.ClassName) , 'ClassName': encodeURI(item.ClassName),
} }
}) })
...@@ -2314,38 +2321,38 @@ ...@@ -2314,38 +2321,38 @@
} }
}, },
//数组字符串转数组 //数组字符串转数组
getRelevanArr(Relevance){ getRelevanArr(Relevance) {
var Arr = []; var Arr = [];
if(Relevance){ if (Relevance) {
Arr = Relevance.split(','); Arr = Relevance.split(',');
} }
return Arr; return Arr;
}, },
//跳转 //跳转
goFinancal(item){ goFinancal(item) {
this.OpenNewUrl('/financial/financalDocument/FinancialDocumentsDetail', { this.OpenNewUrl('/financial/financalDocument/FinancialDocumentsDetail', {
"id": item "id": item
}); });
}, },
getReceiptif(){ getReceiptif() {
getReceiptConfigInfo({}).then(res => { getReceiptConfigInfo({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.ConfigInfo = res.Data; this.ConfigInfo = res.Data;
} }
}) })
}, },
getreceipt(){ getreceipt() {
if(this.ConfigInfo.TempleteIds.indexOf(this.GetDetail.TemplateId)!=-1){ if (this.ConfigInfo.TempleteIds.indexOf(this.GetDetail.TemplateId) != -1) {
return true return true
}else{ } else {
return false return false
} }
}, },
getSJstate(){ getSJstate() {
this.ishowSJ = false this.ishowSJ = false
}, },
//跳转至详情 //跳转至详情
goFinDetail(obj){ goFinDetail(obj) {
this.$router.push({ this.$router.push({
path: '/financial/returnPassbook/ReturnUserList', path: '/financial/returnPassbook/ReturnUserList',
query: { query: {
...@@ -2355,15 +2362,13 @@ ...@@ -2355,15 +2362,13 @@
} }
}) })
} }
}, },
mounted() { mounted() {
this.GetAuth(); this.GetAuth();
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.qjGroupId = this.QjGroupId(); this.qjGroupId = this.QjGroupId();
this.Financial_post_GetDetail(this.ID) this.Financial_post_GetDetail(this.ID)
this.getReceiptif()//获取收据配置 this.getReceiptif() //获取收据配置
this.queryMsg.FinanceId = this.$route.query.id; this.queryMsg.FinanceId = this.$route.query.id;
if (this.$route.query.Conditon) { if (this.$route.query.Conditon) {
this.returnCode = this.$route.query.Conditon; this.returnCode = this.$route.query.Conditon;
...@@ -2371,5 +2376,4 @@ ...@@ -2371,5 +2376,4 @@
this.getTuikuan(); this.getTuikuan();
} }
} }
</script> </script>
\ No newline at end of file
src/pages/financial/returnPassbook/PassbookperiodsList.vue
View file @ 59ddc3a7
...@@ -4,20 +4,26 @@ ...@@ -4,20 +4,26 @@
padding: 18px 0 0 16px; padding: 18px 0 0 16px;
text-align: right; text-align: right;
} }
.ReturnperiodsList .border-bottom { .ReturnperiodsList .border-bottom {
/* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.ReturnperiodsList .text-bottom{
height: 32px;line-height: 32px; margin-bottom: 10px; .ReturnperiodsList .text-bottom {
height: 32px;
line-height: 32px;
margin-bottom: 10px;
} }
.ReturnperiodsList ._icon_btn i.icon-sousuo { .ReturnperiodsList ._icon_btn i.icon-sousuo {
background-color: #47BF8C; background-color: #47BF8C;
} }
.ReturnperiodsList ._icon_btn .icon-add{
.ReturnperiodsList ._icon_btn .icon-add {
background-color: #47BF8C; background-color: #47BF8C;
} }
.ReturnperiodsList ._icon_btn i { .ReturnperiodsList ._icon_btn i {
width: 26px; width: 26px;
height: 26px; height: 26px;
...@@ -30,90 +36,62 @@ ...@@ -30,90 +36,62 @@
cursor: pointer; cursor: pointer;
outline: none; outline: none;
} }
.ReturnperiodsList .el-table td,.el-table th{
.ReturnperiodsList .el-table td,
.el-table th {
padding: 5px 0; padding: 5px 0;
} }
</style>
<template>
</style>
<template>
<div class="page-body ReturnperiodsList"> <div class="page-body ReturnperiodsList">
<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 style="margin-right: 20px;" v-if='iscMaker==true'> <div style="display:flex;justify-content: space-between;width: 100%;align-items: center;">
<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;"> <div class="block" style="display:flex;">
<span style="margin-right: 5px;">月份筛选</span> <span style="margin-right: 5px;">月份筛选</span>
<el-date-picker <el-date-picker v-model="msg.Month" value-format="yyyy-MM" type="month" placeholder="选择月"
v-model="msg.Month" @change="handleCurrentChanges(1)">
value-format="yyyy-MM"
type="month"
placeholder="选择月"
@change="handleCurrentChanges(1)"
>
</el-date-picker> </el-date-picker>
</div> </div>
<div v-if='isgenerate==true'> <div v-if='isgenerate==true'>
<q-btn :loading="loading1" color="primary" size="11px" label="生成幸福存折" @click="scCommission" style="height:28px"/> <q-btn :loading="loading1"  color="primary"  size="11px"  label="生成幸福存折"  @click="scCommission"
 style="height:28px" />
<div style="font-size: 10px;color: #666;">*默认生成上月幸福存折</div> <div style="font-size: 10px;color: #666;">*默认生成上月幸福存折</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<template > <template>
<el-table <el-table ref="filterTable" :data="tableData" v-loading='loading'
ref="filterTable" :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
:data="tableData" <el-table-column prop="BatchName" label="周期"></el-table-column>
v-loading = 'loading' <el-table-column prop="TotalMoney" label="累计金额"> </el-table-column>
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" <el-table-column prop="CreateByName" label="创建人"> </el-table-column>
border <el-table-column prop="CreateDate" label="创建时间"> </el-table-column>
style="width: 100%"> <el-table-column label="操作">
<!-- <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"> <template slot-scope="scope">
<div class="_icon_btn"> <div class="_icon_btn">
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" <i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i>
@click="goUrl(scope.row.Id)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</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.PageIndex" <el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper"
:page-size="msg.PageSize" :total='total'> :current-page.sync="msg.PageIndex" :page-size="msg.PageSize" :total='total'>
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
</div> </div>
</template> </template>
<script> <script>
import { import {
getSchoolDropdown getSchoolDropdown
} from '../../../api/school/index' } from '../../../api/school/index'
import{ import {
getCommissionPeriodsPageList, getCommissionPeriodsPageList,
setSellCommissionRule, setSellCommissionRule,
setUserReturnCommission, setUserReturnCommission,
...@@ -130,52 +108,49 @@ ...@@ -130,52 +108,49 @@
return { return {
loading: false, loading: false,
loading1: false, loading1: false,
value2:'', value2: '',
//列表数据参数 //列表数据参数
msg: { msg: {
PageIndex: 1, PageIndex: 1,
PageSize: 15, PageSize: 15,
SchoolId:'-1', SchoolId: '-1',
Month:'', Month: '',
CommissionType:2, CommissionType: 2,
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
listData:{}, listData: {},
tableData:[], tableData: [],
total:0, total: 0,
CompanyList:[], CompanyList: [],
isgenerate:false,//是否有生成的权限 isgenerate: false, //是否有生成的权限
iscMaker:false,//是否有制单的权限 iscMaker: false, //是否有制单的权限
SendEmployeeList:[],//可发放提成的用户列表 SendEmployeeList: [], //可发放提成的用户列表
costmode:false, costmode: false,
multipleSelection:[], multipleSelection: [],
totalAmount:0,//选中的金额总额 totalAmount: 0, //选中的金额总额
CheckID:0, CheckID: 0,
} }
}, },
created() { created() {
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x=>{//判断权限 userinfo.ActionMenuList.map(x => { //判断权限
if(x.FunctionCode == "SAGenerate_Commission"){//判断是否有生成的权限 if (x.FunctionCode == "SAGenerate_Commission") { //判断是否有生成的权限
this.isgenerate = true; this.isgenerate = true;
} }
if(x.FunctionCode == "SACommission_maker"){//判断是否有制单的权限 if (x.FunctionCode == "SACommission_maker") { //判断是否有制单的权限
this.iscMaker = true; this.iscMaker = true;
} }
}) })
var myDate=new Date(); var myDate = new Date();
myDate.setMonth(myDate.getMonth()-1); myDate.setMonth(myDate.getMonth() - 1);
// this.msg.Month = myDate.getFullYear() + "-" + (myDate.getMonth()+1)
}, },
mounted() { mounted() {
this.getList();//获取提成周期列表 this.getList(); //获取提成周期列表
// this.getBranchList()
}, },
methods: { methods: {
getList(){ getList() {
this.loading = true; this.loading = true;
getCommissionPeriodsPageList(this.msg).then(res => { getCommissionPeriodsPageList(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -185,10 +160,12 @@ ...@@ -185,10 +160,12 @@
} }
}) })
}, },
scCommission(){//生成提成 scCommission() { //生成提成
if(this.loading1 == false){ if (this.loading1 == false) {
this.loading1= true; this.loading1 = true;
setUserReturnCommission({type:2}).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',
...@@ -199,20 +176,20 @@ ...@@ -199,20 +176,20 @@
}) })
this.getList() this.getList()
} }
this.loading1= false; this.loading1 = false;
}).catch(err=>{ }).catch(err => {
this.loading1= false; this.loading1 = false;
}) })
} }
}, },
getBranchList(){//获取校区 getBranchList() { //获取校区
getSchoolDropdown({}).then(res => { getSchoolDropdown({}).then(res => {
this.CompanyList = res.Data; this.CompanyList = res.Data;
}).catch(() => { }).catch(() => {
}) })
}, },
goUrl(id ) { goUrl(id) {
this.$router.push({ this.$router.push({
path: '/financial/returnPassbook/ReturnUserList', path: '/financial/returnPassbook/ReturnUserList',
query: { query: {
...@@ -222,16 +199,13 @@ ...@@ -222,16 +199,13 @@
} }
}) })
}, },
handleCurrentChanges(val){ handleCurrentChanges(val) {
this.msg.PageIndex= val; this.msg.PageIndex = val;
this.getList() this.getList()
}, },
}, },
} }
</script>
</script> <style lang="sass">
<style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style>
</style> \ No newline at end of file
\ No newline at end of file
src/pages/financial/returnPassbook/ReturnUserList.vue
View file @ 59ddc3a7
<style> <style>
.baseSet_Title { .baseSet_Title {
width: 120px !important; width: 120px !important;
padding: 18px 0 0 16px; padding: 18px 0 0 16px;
text-align: right; text-align: right;
} }
.CommissionDetail .border-bottom { .CommissionDetail .border-bottom {
/* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.CommissionDetail .text-bottom { .CommissionDetail .text-bottom {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.CommissionDetail ._icon_btn i.icon-sousuo { .CommissionDetail ._icon_btn i.icon-sousuo {
background-color: #47bf8c; background-color: #47bf8c;
} }
.CommissionDetail ._icon_btn i { .CommissionDetail ._icon_btn i {
width: 26px; width: 26px;
height: 26px; height: 26px;
display: inline-block; display: inline-block;
...@@ -32,93 +31,30 @@ ...@@ -32,93 +31,30 @@
margin-right: 10px; margin-right: 10px;
cursor: pointer; cursor: pointer;
outline: none; outline: none;
} }
.CommissionDetail .el-table td, .CommissionDetail .el-table td,
.el-table th { .el-table th {
padding: 5px 0; padding: 5px 0;
} }
</style> </style>
<template> <template>
<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 style="margin-right: 10px;"> <div style="margin-right: 10px;">
<q-btn <q-btn color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px" />
color="primary"
size="11px"
label="返回"
@click="goreturn"
style="margin-left:10px"
/>
</div> </div>
<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">
<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"> <div class="col-3">
<q-select <q-select filled stack-label input-debounce="0" option-value="Id" @input="getlaiyuan" option-label="Name"
filled v-model="msg.OrderSourceType" :options="customFromList" label="来源" dense emit-value map-options>
stack-label </q-select>
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>
<div class="col-3" v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3"> <div class="col-3" v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3">
<q-select <q-select filled stack-label clearable v-model="msg.OrderSourceId" :dense="false" :options="myEmployeeList"
filled use-input @input="getList" label="人员" @filter="filterEmployee" option-label="EmployeeName"
stack-label option-value="Id" emit-value map-options>
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> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section> <q-item-section class="text-grey">未找到相关数据</q-item-section>
...@@ -127,22 +63,9 @@ ...@@ -127,22 +63,9 @@
</q-select> </q-select>
</div> </div>
<div class="col-3" v-if="msg.OrderSourceType == 2"> <div class="col-3" v-if="msg.OrderSourceType == 2">
<q-select <q-select filled stack-label v-model="msg.OrderSourceId" clearable :dense="false" :options="customList"
filled use-input @input="getList" label="关联同行" @filter="filterFn" option-label="CustomerName"
stack-label option-value="CustomerId" emit-value map-options>
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> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section> <q-item-section class="text-grey">未找到相关数据</q-item-section>
...@@ -151,22 +74,9 @@ ...@@ -151,22 +74,9 @@
</q-select> </q-select>
</div> </div>
<div class="col-3" v-if="msg.OrderSourceType == 4"> <div class="col-3" v-if="msg.OrderSourceType == 4">
<q-select <q-select filled clearable stack-label v-model="msg.OrderSourceId" :dense="false" :options="InvitationList"
filled use-input @input="getList" label="转介人" @filter="filterFnStudent" option-label="StuName"
clearable option-value="StuId" emit-value map-options>
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> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey">未找到相关数据</q-item-section> <q-item-section class="text-grey">未找到相关数据</q-item-section>
...@@ -178,46 +88,24 @@ ...@@ -178,46 +88,24 @@
</div> </div>
</div> </div>
<template> <template>
<el-table <el-table ref="filterTable" :data="tableData" v-loading="loading"
ref="filterTable" :header-cell-style="{ backgroundColor: '#f5f6f7', color: '#a8a8b3' }" border style="width: 100%">
: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="SchoolName" label="校区"></el-table-column>
<el-table-column <el-table-column prop="UserName" label="人员" :filters="UserNamelist" :filter-method="filterHandler">
prop="UserName" </el-table-column>
label="人员"
:filters="UserNamelist"
:filter-method="filterHandler"
></el-table-column>
<el-table-column prop="OrderSourceType" label="类型"> <el-table-column prop="OrderSourceType" label="类型">
<template slot-scope="scope"> <template slot-scope="scope">
{{getOrderSourceType(scope.row.OrderSourceType)}} {{getOrderSourceType(scope.row.OrderSourceType)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="StudentCount" label="学生数量" sortable :sort-method="StudentCount"></el-table-column>
prop="StudentCount" <el-table-column prop="CommissionMoeny" label="提成金额" sortable :sort-method="CommissionMoeny"></el-table-column>
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="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="_icon_btn"> <div class="_icon_btn">
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
<i <i class="iconfont icon-sousuo"
class="iconfont icon-sousuo" @click="goUrl('returnPassbook/returnpassbookStatistics', scope.row)"></i>
@click="goUrl('returnPassbook/returnpassbookStatistics', scope.row)"
></i>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
...@@ -226,29 +114,29 @@ ...@@ -226,29 +114,29 @@
</template> </template>
</div> </div>
</template> </template>
<script> <script>
import { import {
GetClassTypePageList, GetClassTypePageList,
} from '../../../api/system/index'; } from '../../../api/system/index';
import { import {
GetStudentList, GetStudentList,
} from '../../../api/course/class'; } from '../../../api/course/class';
import { import {
getCommissionUserList, getCommissionUserList,
} from '../../../api/finance/index' } from '../../../api/finance/index'
import { import {
getSchoolDropdown, getSchoolDropdown,
getStudentDorpDownList getStudentDorpDownList
} from "../../../api/school/index"; } from "../../../api/school/index";
import { import {
queryEmployee queryEmployee
} from '../../../api/users/user' } from '../../../api/users/user'
import { import {
CreateTypeList, CreateTypeList,
GetCustomerList GetCustomerList
} from '../../../api/sale/sale' } from '../../../api/sale/sale'
export default { export default {
meta: { meta: {
title: "销售提成详情" title: "销售提成详情"
}, },
...@@ -265,15 +153,28 @@ export default { ...@@ -265,15 +153,28 @@ export default {
OrderSourceType: '-1', OrderSourceType: '-1',
OrderSourceId: 0, OrderSourceId: 0,
Q_SelectNormal: '2', Q_SelectNormal: '2',
UserDept:0 UserDept: 0
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
tableData: [], tableData: [],
CompanyList: [], CompanyList: [],
StatusList: [ StatusList: [{
{ Id: '-2', Name: '不限' }, { Id: '-1', Name: '不返佣' }, { Id: '0', Name: '待返佣' }, { Id: '1', Name: '已返佣到账户' }, { Id: '2', Name: '佣金已提现' }, Id: '-2',
], Name: '不限'
}, {
Id: '-1',
Name: '不返佣'
}, {
Id: '0',
Name: '待返佣'
}, {
Id: '1',
Name: '已返佣到账户'
}, {
Id: '2',
Name: '佣金已提现'
}, ],
see_tcdetailed: false, see_tcdetailed: false,
customFromList: [], customFromList: [],
UserNamelist: [], UserNamelist: [],
...@@ -288,13 +189,13 @@ export default { ...@@ -288,13 +189,13 @@ export default {
AllInvitationList: [], AllInvitationList: [],
} }
}, },
created() { created() {},
},
mounted() { mounted() {
console.log("this.$route.query", this.$route.query)
if (this.$route.query && this.$route.query.id) { if (this.$route.query && this.$route.query.id) {
this.msg.BatchId = this.$route.query.id this.msg.BatchId = this.$route.query.id
} }
if (this.$route.query.ReFinanceId2){ if (this.$route.query.ReFinanceId2) {
this.msg.UserDept = this.$route.query.ReFinanceId2; this.msg.UserDept = this.$route.query.ReFinanceId2;
} }
this.getList() this.getList()
...@@ -303,21 +204,20 @@ export default { ...@@ -303,21 +204,20 @@ export default {
this.getEmployeeList() this.getEmployeeList()
this.getStudentDorpDown() this.getStudentDorpDown()
this.GetCustomerList() this.GetCustomerList()
this.getStudentList();//学员下拉 this.getStudentList(); //学员下拉
}, },
methods: { methods: {
getList() { getList() {
this.loading = true; this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg)) let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderSourceId == ''|| msg.OrderSourceId==null) { if (msg.OrderSourceId == '' || msg.OrderSourceId == null) {
msg.OrderSourceId = 0 msg.OrderSourceId = 0
} }
getCommissionUserList(msg).then(res => { getCommissionUserList(msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.loading = false; this.loading = false;
this.tableData = res.Data; this.tableData = res.Data;
this.UserNamelist = []; this.UserNamelist = [];
this.tableData.forEach(x => { this.tableData.forEach(x => {
let obj3 = { let obj3 = {
...@@ -333,13 +233,12 @@ export default { ...@@ -333,13 +233,12 @@ export default {
getlaiyuan() { getlaiyuan() {
if (this.msg.OrderSourceType == -1) { if (this.msg.OrderSourceType == -1) {
this.msg.OrderSourceId = 0 this.msg.OrderSourceId = 0
} else { } else {
this.msg.OrderSourceId = '' this.msg.OrderSourceId = ''
} }
this.getList() this.getList()
}, },
getBranchList() {//获取校区 getBranchList() { //获取校区
getSchoolDropdown({}).then(res => { getSchoolDropdown({}).then(res => {
let obj = { let obj = {
SName: '不限', SName: '不限',
...@@ -361,14 +260,13 @@ export default { ...@@ -361,14 +260,13 @@ export default {
} }
this.customFromList = res.Data; this.customFromList = res.Data;
this.customFromList.unshift(obj); this.customFromList.unshift(obj);
} }
}) })
}, },
getOrderSourceType(Id){ getOrderSourceType(Id) {
let Name = '' let Name = ''
this.customFromList.forEach(x=>{ this.customFromList.forEach(x => {
if(x.Id == Id){ if (x.Id == Id) {
Name = x.Name Name = x.Name
} }
}) })
...@@ -464,17 +362,14 @@ export default { ...@@ -464,17 +362,14 @@ export default {
} }
}) })
}, },
goUrl(path, row) { goUrl(path, row) {
this.$router.push({ this.$router.push({
path: '/financial/' + path, path: '/financial/' + path,
query: { query: {
preriodId: this.$route.query.id, preriodId: this.$route.query.id,
CommissionType: this.$route.query.CommissionType, CommissionType: this.$route.query.CommissionType,
OrderSourceType:row.OrderSourceType, OrderSourceType: row.OrderSourceType,
OrderSourceId:row.OrderSourceId, OrderSourceId: row.OrderSourceId,
blank: 'y', blank: 'y',
} }
}) })
...@@ -492,13 +387,9 @@ export default { ...@@ -492,13 +387,9 @@ export default {
goreturn() { goreturn() {
this.$router.go(-1); this.$router.go(-1);
} }
}, },
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass')
@import url('~assets/css/table.sass')
</style> </style>
\ No newline at end of file
\ 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