Skip to content

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

页面修改

parent d7f42936
Expand all 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 @@
this.RoleListData = res.Data;
});
},
//筛选员工
filterEmployee(val, update, abort) {
update(() => {
......
src/pages/financial/returnPassbook/PassbookperiodsList.vue
View file @ 59ddc3a7
......@@ -4,20 +4,26 @@
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 .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 {
width: 26px;
height: 26px;
......@@ -30,90 +36,62 @@
cursor: pointer;
outline: none;
}
.ReturnperiodsList .el-table td,.el-table th{
.ReturnperiodsList .el-table td,
.el-table th {
padding: 5px 0;
}
</style>
<template>
</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 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 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"/>
<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>
</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>
<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>
<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 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>
</template>
<script>
import {
getSchoolDropdown
} from '../../../api/school/index'
import{
import {
getCommissionPeriodsPageList,
setSellCommissionRule,
setUserReturnCommission,
......@@ -130,52 +108,49 @@
return {
loading: false,
loading1: false,
value2:'',
value2: '',
//列表数据参数
msg: {
PageIndex: 1,
PageSize: 15,
SchoolId:'-1',
Month:'',
CommissionType:2,
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,
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"){//判断是否有生成的权限
userinfo.ActionMenuList.map(x => { //判断权限
if (x.FunctionCode == "SAGenerate_Commission") { //判断是否有生成的权限
this.isgenerate = true;
}
if(x.FunctionCode == "SACommission_maker"){//判断是否有制单的权限
if (x.FunctionCode == "SACommission_maker") { //判断是否有制单的权限
this.iscMaker = true;
}
})
var myDate=new Date();
myDate.setMonth(myDate.getMonth()-1);
// this.msg.Month = myDate.getFullYear() + "-" + (myDate.getMonth()+1)
var myDate = new Date();
myDate.setMonth(myDate.getMonth() - 1);
},
mounted() {
this.getList();//获取提成周期列表
// this.getBranchList()
this.getList(); //获取提成周期列表
},
methods: {
getList(){
getList() {
this.loading = true;
getCommissionPeriodsPageList(this.msg).then(res => {
if (res.Code == 1) {
......@@ -185,10 +160,12 @@
}
})
},
scCommission(){//生成提成
if(this.loading1 == false){
this.loading1= true;
setUserReturnCommission({type:2}).then(res => {
scCommission() { //生成提成
if (this.loading1 == false) {
this.loading1 = true;
setUserReturnCommission({
type: 2
}).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
......@@ -199,20 +176,20 @@
})
this.getList()
}
this.loading1= false;
}).catch(err=>{
this.loading1= false;
this.loading1 = false;
}).catch(err => {
this.loading1 = false;
})
}
},
getBranchList(){//获取校区
getBranchList() { //获取校区
getSchoolDropdown({}).then(res => {
this.CompanyList = res.Data;
}).catch(() => {
})
},
goUrl(id ) {
goUrl(id) {
this.$router.push({
path: '/financial/returnPassbook/ReturnUserList',
query: {
......@@ -222,16 +199,13 @@
}
})
},
handleCurrentChanges(val){
this.msg.PageIndex= val;
handleCurrentChanges(val) {
this.msg.PageIndex = val;
this.getList()
},
},
}
</script>
<style lang="sass">
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
</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