Commit 40c0bc3e authored by 黄奎's avatar 黄奎

页面修改

parent 76c544f0
This diff is collapsed.
...@@ -276,7 +276,6 @@ ...@@ -276,7 +276,6 @@
this.msg.ClassId = this.setingObj.ClassId; this.msg.ClassId = this.setingObj.ClassId;
this.msg.TeacherId = this.setingObj.Teacher_Id; this.msg.TeacherId = this.setingObj.Teacher_Id;
GetClassPlanLogPageList(this.msg).then(res => { GetClassPlanLogPageList(this.msg).then(res => {
console.log("res,", res.Data)
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
......
...@@ -246,7 +246,6 @@ ...@@ -246,7 +246,6 @@
getSchoolDropdown({}).then(res => { getSchoolDropdown({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.schoolOptions = res.Data; this.schoolOptions = res.Data;
console.log(this.schoolOptions,'schoolOptions');
} }
}) })
}, },
......
...@@ -456,7 +456,6 @@ ...@@ -456,7 +456,6 @@
GetSelectClassOrderList(qMsg).then(res => { GetSelectClassOrderList(qMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.beforeOrderList = res.Data; this.beforeOrderList = res.Data;
console.log(res, '前置数据');
} }
}) })
}, },
......
...@@ -192,11 +192,9 @@ ...@@ -192,11 +192,9 @@
}, },
//子组件选中传值 //子组件选中传值
getchildInfo(obj){ getchildInfo(obj){
console.log(obj,'来了');
this.addMsg.TeacherId = obj.TeacherId; this.addMsg.TeacherId = obj.TeacherId;
this.addMsg.ClassRoomId = obj.ClassRoomId; this.addMsg.ClassRoomId = obj.ClassRoomId;
this.addMsg.ReserveClassId = obj.ReserveClassId; this.addMsg.ReserveClassId = obj.ReserveClassId;
} }
} }
} }
......
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
//获取课程系列分页列表 //获取课程系列分页列表
getList() { getList() {
GetReserveClassPage(this.msg).then(res => { GetReserveClassPage(this.msg).then(res => {
console.log(res,'数据');
if(res.Code==1){ if(res.Code==1){
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
......
...@@ -223,7 +223,6 @@ ...@@ -223,7 +223,6 @@
uploadFile(files) { uploadFile(files) {
UploadSelfFile('studentIcon', files, res => { UploadSelfFile('studentIcon', files, res => {
if (res.Code == 1) { if (res.Code == 1) {
console.log(211,res)
this.objOption.RoomPicList.push(res.FileUrl); this.objOption.RoomPicList.push(res.FileUrl);
} }
}) })
...@@ -236,17 +235,7 @@ ...@@ -236,17 +235,7 @@
} }
</script> </script>
<style> <style>
/* .avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 143px;
height: 82px;
line-height: 82px;
text-align: center;
} */
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
......
...@@ -239,8 +239,6 @@ import ActiveTypeForm from '../../components/activity/activeType-from' ...@@ -239,8 +239,6 @@ import ActiveTypeForm from '../../components/activity/activeType-from'
this.data = res.data.data.pageData; this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount; this.pageCount = res.data.data.pageCount;
} }
console.log(257,res)
}) })
}, },
delType(item){ delType(item){
......
...@@ -422,8 +422,6 @@ import ActiveForm from '../../components/activity/active-from' ...@@ -422,8 +422,6 @@ import ActiveForm from '../../components/activity/active-from'
this.data = res.data.data.pageData; this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount; this.pageCount = res.data.data.pageCount;
} }
console.log(257,res)
}) })
}, },
delActive(item){ delActive(item){
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
methods:{ methods:{
showNav(val,id){ showNav(val,id){
this.schoolId=id this.schoolId=id
console.log(id)
}, },
chooseNav(i){ chooseNav(i){
this.currentNav=i.RoomId this.currentNav=i.RoomId
......
...@@ -204,7 +204,6 @@ var lunarCalendar = { ...@@ -204,7 +204,6 @@ var lunarCalendar = {
var objDate = new Date(); var objDate = new Date();
var endDate = new Date(); var endDate = new Date();
if (dateStr) { if (dateStr) {
console.log(dateStr)
let d = Date.parse(dateStr) let d = Date.parse(dateStr)
let res = new Date(d); let res = new Date(d);
...@@ -216,15 +215,6 @@ var lunarCalendar = { ...@@ -216,15 +215,6 @@ var lunarCalendar = {
endDate.setDate(endDate.getDate() + dayNum); endDate.setDate(endDate.getDate() + dayNum);
// let x1 = objDate.getTime();
// console.log(211, x1, objDate)
// let x2 = endDate.getTime();
// console.log(222, x2, endDate)
// let x = x2 - x1
// console.log(x1 == x2, x, 'time');
//修正ymd参数 //修正ymd参数
var m = objDate.getMonth() + 1, d = objDate.getDate(); var m = objDate.getMonth() + 1, d = objDate.getDate();
var totalMonthDay = lunarCalendar.solarDays(yearStr, m); var totalMonthDay = lunarCalendar.solarDays(yearStr, m);
......
...@@ -398,7 +398,6 @@ export default { ...@@ -398,7 +398,6 @@ export default {
this.QStartDate = data[0].CurrentDate; this.QStartDate = data[0].CurrentDate;
this.QEndDate = data[data.length - 1].CurrentDate; this.QEndDate = data[data.length - 1].CurrentDate;
this.Calendar = this.CalendarDataArray.slice(0,7); this.Calendar = this.CalendarDataArray.slice(0,7);
console.log("初始化",this.Calendar)
}, },
//左侧点击 //左侧点击
...@@ -445,45 +444,18 @@ export default { ...@@ -445,45 +444,18 @@ export default {
this.msg.EndDate = d.Format("yyyy-MM-dd"); this.msg.EndDate = d.Format("yyyy-MM-dd");
}, },
getDayInfo(Y, M, D) { getDayInfo(Y, M, D) {
console.log(148,Y, M, D)
// let StartDate = Y + "-" + M + "-" + D;
// let msg = {
// StartDate: StartDate
// };
// this.apipost(
// "ticketcoupons_get_GetTicketCouponsSummaryDay",
// msg,
// res => {
// if (res.data.resultCode == 1) {
// this.dayList = res.data.data;
// }
// },
// null
// );
}, },
getOffSet(index){ getOffSet(index){
let el=document.getElementsByClassName('el-timeline-item')[index] let el=document.getElementsByClassName('el-timeline-item')[index]
let top=el.getBoundingClientRect().top let top=el.getBoundingClientRect().top
return top return top
}, },
// timeDifference(startTime,endTime){
// var start1=startTime.split(":");
// var startAll=parseInt(start1[0]*60)+parseInt(start1[1]);
// var end1=endTime.split(":");
// var endAll=parseInt(end1[0]*60)+parseInt(end1[1]);
// let res=Math.ceil((endAll-startAll)/15)
// console.log("时间差===",res);
// return res
// }
}, },
mounted() { mounted() {
this.initData(); this.initData();
this.getEndDay(); this.getEndDay();
// this.getList();
let nowDate = new Date().Format("yyyy-MM-dd"); let nowDate = new Date().Format("yyyy-MM-dd");
this.nowYear = nowDate.split("-")[0]; this.nowYear = nowDate.split("-")[0];
this.nowMonth = parseInt(nowDate.split("-")[1]); this.nowMonth = parseInt(nowDate.split("-")[1]);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{{details.ErrorTitle}} {{details.ErrorTitle}}
</div> </div>
<img class="img-head-close" src="../../../assets/images/classroom/close.png" mode="" @click="hideDialog"/> <img class="img-head-close" src="../../../assets/images/classroom/close.png" mode="" @click="hideDialog" />
</div> </div>
<div class="info-box"> <div class="info-box">
<div class="user-info"> <div class="user-info">
...@@ -46,52 +46,47 @@ ...@@ -46,52 +46,47 @@
</template> </template>
<script> <script>
import {getClassRoomLogDetail} from '../../../api/classroom/index'; import {
getClassRoomLogDetail
} from '../../../api/classroom/index';
export default { export default {
props: { props: {
classroomId:{ classroomId: {
type:[Number,String] type: [Number, String]
}, },
}, },
watch:{ watch: {
classroomId(val,oldVal){ classroomId(val, oldVal) {
if(val!==oldVal){ if (val !== oldVal) {
this.getClassRoomDetail(val) this.getClassRoomDetail(val)
} }
}, },
}, },
components: { components: {
}, },
data() { data() {
return { return {
persistent: false, persistent: false,
details:{} details: {}
} }
}, },
methods: { methods: {
getClassRoomDetail(id){ getClassRoomDetail(id) {
getClassRoomLogDetail({ID:id}).then((res)=>{ getClassRoomLogDetail({
console.log(51,res) ID: id
if(res.Code===1){ }).then((res) => {
this.details=res.Data if (res.Code === 1) {
this.details = res.Data
} }
}) })
}, },
changeShow(){ changeShow() {
this.persistent=true this.persistent = true
}, },
hideDialog(){ hideDialog() {
this.$refs.historyDialog.hide() this.$refs.historyDialog.hide()
} }
}, },
} }
...@@ -138,13 +133,15 @@ ...@@ -138,13 +133,15 @@
font-size: 12px; font-size: 12px;
color: #2961FE; color: #2961FE;
} }
.con{
.con {
box-sizing: border-box; box-sizing: border-box;
width: 500px; width: 500px;
height: 1080px; height: 1080px;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 0px 76px 0px rgba(2, 44, 66, 0.2); box-shadow: 0px 0px 76px 0px rgba(2, 44, 66, 0.2);
.header{
.header {
width: 500px; width: 500px;
height: 56px; height: 56px;
background-color: #F0F5FB; background-color: #F0F5FB;
...@@ -152,7 +149,8 @@ ...@@ -152,7 +149,8 @@
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
.img-head{
.img-head {
width: 35px; width: 35px;
height: 35px; height: 35px;
// border-radius: 50%; // border-radius: 50%;
...@@ -160,12 +158,14 @@ ...@@ -160,12 +158,14 @@
margin-right: 10px; margin-right: 10px;
object-fit: fill; object-fit: fill;
} }
.head-title{
.head-title {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow:ellipsis; text-overflow: ellipsis;
} }
.img-head-close{
.img-head-close {
width: 15px; width: 15px;
height: 15px; height: 15px;
margin-right: 10px; margin-right: 10px;
...@@ -175,54 +175,65 @@ ...@@ -175,54 +175,65 @@
right: 15px; right: 15px;
} }
} }
.info-box{
.info-box {
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 20px;
.user-info{
.user-info {
height: 100px; height: 100px;
border-bottom: 1px solid #E2E2E2; border-bottom: 1px solid #E2E2E2;
font-size: 12px; font-size: 12px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
.user-item{
.user-item {
display: flex; display: flex;
margin-top: 20px; margin-top: 20px;
.user-label{
.user-label {
width: 100px; width: 100px;
color: #999999; color: #999999;
} }
.user-con{
.user-con {
color: #111111; color: #111111;
} }
} }
} }
.use{
.use {
padding: 30px 0; padding: 30px 0;
border-bottom: 1px solid #E2E2E2; border-bottom: 1px solid #E2E2E2;
.use-title{
.use-title {
font-size: 12px; font-size: 12px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
margin-bottom: 20px; margin-bottom: 20px;
} }
.use-con{
.use-con {
font-size: 12px; font-size: 12px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
} }
.img-con{
.img-con {
display: flex; display: flex;
.classroom-img-item{
.classroom-img-item {
display: flex; display: flex;
width: 145px; width: 145px;
height: 80px; height: 80px;
border-radius: 4px; border-radius: 4px;
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
.classroom-img{
.classroom-img {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -235,4 +246,5 @@ ...@@ -235,4 +246,5 @@
} }
} }
</style> </style>
...@@ -336,8 +336,7 @@ ...@@ -336,8 +336,7 @@
"cover":cover, "cover":cover,
"playauth":auth, "playauth":auth,
}, function (player) { }, function (player) {
console.log(321,player)
console.log("The player is created");
} }
); );
}, },
......
...@@ -128,14 +128,14 @@ ...@@ -128,14 +128,14 @@
}, },
//选择校区教室导航 //选择校区教室导航
successNav(val){ successNav(val){
console.log(114,val)
this.msg.RoomId=val.RoomId this.msg.RoomId=val.RoomId
this.msg.SchoolId=val.schoolId this.msg.SchoolId=val.schoolId
this.getClassRoomTimeList(); this.getClassRoomTimeList();
this.$forceUpdate() this.$forceUpdate()
}, },
dateChoose(value, reason, details){ dateChoose(value, reason, details){
// console.log(112,this.dateModel)
}, },
//获取结束日期 //获取结束日期
getEndTime(date){ getEndTime(date){
......
...@@ -419,7 +419,6 @@ ...@@ -419,7 +419,6 @@
} }
} }
}) })
console.log()
return Str; return Str;
}, },
//跳转至备课 //跳转至备课
......
...@@ -4,17 +4,23 @@ ...@@ -4,17 +4,23 @@
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; */ /* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.CommissionDetail .text-bottom{
height: 32px;line-height: 32px; margin-bottom: 10px; .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; background-color: #47BF8C;
} }
.CommissionDetail ._icon_btn i { .CommissionDetail ._icon_btn i {
width: 26px; width: 26px;
height: 26px; height: 26px;
...@@ -27,13 +33,14 @@ ...@@ -27,13 +33,14 @@
cursor: pointer; cursor: pointer;
outline: none; outline: none;
} }
.CommissionDetail .el-table td,.el-table th{
.CommissionDetail .el-table td,
.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">
...@@ -54,33 +61,31 @@ ...@@ -54,33 +61,31 @@
<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 class="col-3"> <div class="col-3">
<q-btn  color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/> <q-btn  color="primary"  size="11px"  label="返回"  @click="goreturn"  style="margin-left:10px" />
</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="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler">
v-loading = 'loading' </el-table-column>
<el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler">
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" </el-table-column>
border <el-table-column prop="UserName" label="销售" :filters='UserNamelist' :filter-method="filterHandler">
style="width: 100%"> </el-table-column>
<el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler"></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 prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column> </el-table-column>
<el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney">
</el-table-column>
<el-table-column prop="CommissionMoney" label="最终提成" sortable :sort-method="CommissionMoney"> </el-table-column> <el-table-column prop="CommissionMoney" label="最终提成" sortable :sort-method="CommissionMoney"> </el-table-column>
<!-- <el-table-column prop="Periods" label="周期"> </el-table-column> --> <!-- <el-table-column prop="Periods" label="周期"> </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 class="iconfont icon-sousuo" <i class="iconfont icon-sousuo" @click="goUrl('userCommissionDetails',scope.row.UserId)"></i>
@click="goUrl('userCommissionDetails',scope.row.UserId)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
...@@ -89,12 +94,12 @@ ...@@ -89,12 +94,12 @@
</template> </template>
</div> </div>
</template> </template>
<script> <script>
import { import {
GetClassTypePageList, GetClassTypePageList,
} from '../../api/system/index'; } from '../../api/system/index';
import{ import {
getSellCommissionUserList, getSellCommissionUserList,
} from '../../api/finance/index' } from '../../api/finance/index'
import { import {
...@@ -113,51 +118,48 @@ ...@@ -113,51 +118,48 @@
msg: { msg: {
PeriodId: 0, PeriodId: 0,
UserId: 0, UserId: 0,
ClassId:0, ClassId: 0,
OrderId:'', OrderId: '',
School_Id:'-1', School_Id: '-1',
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
listData:{}, listData: {},
tableData:[], tableData: [],
company:[], company: [],
department:[], department: [],
ClassList:[], ClassList: [],
allClassList:[], allClassList: [],
see_tcdetailed:false, see_tcdetailed: false,
SchoolNamelist:[], SchoolNamelist: [],
DeptNamelist:[], DeptNamelist: [],
UserNamelist:[], UserNamelist: [],
} }
}, },
created() { created() {
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x=>{//判断权限 userinfo.ActionMenuList.map(x => { //判断权限
if(x.FunctionCode == "see_tcdetailed"){//判断是否可以查看其他明细 if (x.FunctionCode == "see_tcdetailed") { //判断是否可以查看其他明细
this.see_tcdetailed = true; this.see_tcdetailed = true;
} }
}) })
if(this.see_tcdetailed == false){ if (this.see_tcdetailed == false) {
console.log(userinfo)
this.msg.UserId = userinfo.Id this.msg.UserId = userinfo.Id
} }
}, },
mounted() { mounted() {
console.log(this.$route.query) if (this.$route.query && this.$route.query.id) {
if(this.$route.query && this.$route.query.id){
this.msg.PeriodId = this.$route.query.id this.msg.PeriodId = this.$route.query.id
} }
if(this.$route.query && this.$route.query.School_Id){ if (this.$route.query && this.$route.query.School_Id) {
this.msg.School_Id = this.$route.query.School_Id this.msg.School_Id = this.$route.query.School_Id
} }
this.getList() this.getList()
this.setClass() this.setClass()
}, },
methods: { methods: {
getList() {
getList(){ if (this.msg)
if(this.msg)
this.loading = true; this.loading = true;
getSellCommissionUserList(this.msg).then(res => { getSellCommissionUserList(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -166,10 +168,19 @@ ...@@ -166,10 +168,19 @@
this.SchoolNamelist = []; this.SchoolNamelist = [];
this.DeptNamelist = []; this.DeptNamelist = [];
this.UserNamelist = []; this.UserNamelist = [];
this.tableData.forEach(x=>{ this.tableData.forEach(x => {
let obj = {text: x.SchoolName, value: x.SchoolName} let obj = {
let obj2 = {text: x.DeptName, value: x.DeptName} text: x.SchoolName,
let obj3 = {text: x.UserName, value: x.UserName} value: x.SchoolName
}
let obj2 = {
text: x.DeptName,
value: x.DeptName
}
let obj3 = {
text: x.UserName,
value: x.UserName
}
this.SchoolNamelist.push(obj) this.SchoolNamelist.push(obj)
this.DeptNamelist.push(obj2) this.DeptNamelist.push(obj2)
this.UserNamelist.push(obj3) this.UserNamelist.push(obj3)
...@@ -180,7 +191,7 @@ ...@@ -180,7 +191,7 @@
} }
}) })
}, },
unique(arr,Name){//数组去重 unique(arr, Name) { //数组去重
const res = new Map(); const res = new Map();
return arr.filter( return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1) (list) => !res.has(list.text) && res.set(list.text, 1)
...@@ -214,12 +225,12 @@ ...@@ -214,12 +225,12 @@
}) })
}, },
goUrl(path, id ) { goUrl(path, id) {
this.$router.push({ this.$router.push({
path: '/financial/' + path, path: '/financial/' + path,
query: { query: {
userId: id, userId: id,
preriodId:this.$route.query.id, preriodId: this.$route.query.id,
blank: 'y', blank: 'y',
} }
}) })
...@@ -228,29 +239,27 @@ ...@@ -228,29 +239,27 @@
const property = column['property']; const property = column['property'];
return row[property] === value; return row[property] === value;
}, },
StudentCount(a,b,c){ StudentCount(a, b, c) {
console.log(a,b,c)
return a.StudentCount - b.StudentCount; return a.StudentCount - b.StudentCount;
}, },
CurrentPeriodMoney(a,b){ CurrentPeriodMoney(a, b) {
return a.CurrentPeriodMoney - b.CurrentPeriodMoney; return a.CurrentPeriodMoney - b.CurrentPeriodMoney;
}, },
CurrentExtraMoney(a,b){ CurrentExtraMoney(a, b) {
return a.CurrentExtraMoney - b.CurrentExtraMoney; return a.CurrentExtraMoney - b.CurrentExtraMoney;
}, },
CommissionMoney(a,b){ CommissionMoney(a, b) {
return a.CommissionMoney - b.CommissionMoney; return a.CommissionMoney - b.CommissionMoney;
}, },
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
...@@ -4,17 +4,23 @@ ...@@ -4,17 +4,23 @@
padding: 18px 0 0 16px; padding: 18px 0 0 16px;
text-align: right; text-align: right;
} }
.cycleOrderList .border-bottom { .cycleOrderList .border-bottom {
/* border-bottom: 1px dashed #EEE; */ /* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.cycleOrderList .text-bottom{
height: 32px;line-height: 32px; margin-bottom: 10px; .cycleOrderList .text-bottom {
height: 32px;
line-height: 32px;
margin-bottom: 10px;
} }
.cycleOrderList ._icon_btn i.icon-sousuo { .cycleOrderList ._icon_btn i.icon-sousuo {
background-color: #47BF8C; background-color: #47BF8C;
} }
.cycleOrderList ._icon_btn i { .cycleOrderList ._icon_btn i {
width: 30px; width: 30px;
height: 30px; height: 30px;
...@@ -27,42 +33,41 @@ ...@@ -27,42 +33,41 @@
cursor: pointer; cursor: pointer;
outline: none; outline: none;
} }
.cycleOrderList .el-table td,.el-table th{
.cycleOrderList .el-table td,
.el-table th {
padding: 5px 0; padding: 5px 0;
} }
</style>
</style> <template>
<template>
<div class="page-body cycleOrderList"> <div class="page-body cycleOrderList">
<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-btn  color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/> <q-btn  color="primary"  size="11px"  label="返回"  @click="goreturn"  style="margin-left:10px" />
</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="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler">
v-loading = 'loading' </el-table-column>
<el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler">
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" </el-table-column>
border <el-table-column prop="UserName" label="销售" :filters='UserNamelist' :filter-method="filterHandler">
style="width: 100%"> </el-table-column>
<el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column> <el-table-column width='170' prop="ClassName" label="班级信息">
<el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler"></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="班级信息" >
<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>
<div>学生数量:{{scope.row.StudentCount}}</div> <div>学生数量:{{scope.row.StudentCount}}</div>
</template> </template>
</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;" >{{scope.row.OrderId}} </div> <div style="cursor: pointer;">{{scope.row.OrderId}} </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -109,12 +114,12 @@ ...@@ -109,12 +114,12 @@
</template> </template>
</div> </div>
</template> </template>
<script> <script>
import { import {
GetClassTypePageList, GetClassTypePageList,
} from '../../api/system/index'; } from '../../api/system/index';
import{ import {
getSellCommissionForOrderList, getSellCommissionForOrderList,
} from '../../api/finance/index' } from '../../api/finance/index'
import { import {
...@@ -133,38 +138,38 @@ ...@@ -133,38 +138,38 @@
msg: { msg: {
PeriodId: 0, PeriodId: 0,
UserId: 0, UserId: 0,
ClassId:0, ClassId: 0,
OrderId:'', OrderId: '',
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
listData:{}, listData: {},
tableData:[], tableData: [],
company:[], company: [],
department:[], department: [],
ClassList:[], ClassList: [],
allClassList:[], allClassList: [],
SchoolNamelist:[], SchoolNamelist: [],
DeptNamelist:[], DeptNamelist: [],
UserNamelist:[], UserNamelist: [],
see_tcdetailed:false, see_tcdetailed: false,
} }
}, },
created() { created() {
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x=>{//判断权限 userinfo.ActionMenuList.map(x => { //判断权限
if(x.FunctionCode == "see_tcdetailed"){//判断是否可以查看其他明细 if (x.FunctionCode == "see_tcdetailed") { //判断是否可以查看其他明细
this.see_tcdetailed = true; this.see_tcdetailed = true;
} }
}) })
if(this.see_tcdetailed == false){ if (this.see_tcdetailed == false) {
this.msg.UserId = userinfo.Id this.msg.UserId = userinfo.Id
} }
}, },
mounted() { mounted() {
if(this.$route.query && this.$route.query.OrderId){ if (this.$route.query && this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId this.msg.OrderId = this.$route.query.OrderId
} }
...@@ -173,8 +178,8 @@ ...@@ -173,8 +178,8 @@
}, },
methods: { methods: {
getList(){ getList() {
if(this.msg) if (this.msg)
this.loading = true; this.loading = true;
getSellCommissionForOrderList(this.msg).then(res => { getSellCommissionForOrderList(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -184,10 +189,19 @@ ...@@ -184,10 +189,19 @@
this.SchoolNamelist = []; this.SchoolNamelist = [];
this.DeptNamelist = []; this.DeptNamelist = [];
this.UserNamelist = []; this.UserNamelist = [];
this.tableData.forEach(x=>{ this.tableData.forEach(x => {
let obj = {text: x.SchoolName, value: x.SchoolName} let obj = {
let obj2 = {text: x.DeptName, value: x.DeptName} text: x.SchoolName,
let obj3 = {text: x.UserName, value: x.UserName} value: x.SchoolName
}
let obj2 = {
text: x.DeptName,
value: x.DeptName
}
let obj3 = {
text: x.UserName,
value: x.UserName
}
this.SchoolNamelist.push(obj) this.SchoolNamelist.push(obj)
this.DeptNamelist.push(obj2) this.DeptNamelist.push(obj2)
this.UserNamelist.push(obj3) this.UserNamelist.push(obj3)
...@@ -198,7 +212,7 @@ ...@@ -198,7 +212,7 @@
} }
}) })
}, },
unique(arr,Name){//数组去重 unique(arr, Name) { //数组去重
const res = new Map(); const res = new Map();
return arr.filter( return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1) (list) => !res.has(list.text) && res.set(list.text, 1)
...@@ -232,7 +246,7 @@ ...@@ -232,7 +246,7 @@
}) })
}, },
goUrl(path, id ) { goUrl(path, id) {
this.$router.push({ this.$router.push({
path: '/financial/' + path, path: '/financial/' + path,
query: { query: {
...@@ -246,11 +260,10 @@ ...@@ -246,11 +260,10 @@
const property = column['property']; const property = column['property'];
return row[property] === value; return row[property] === value;
}, },
StudentCount(a,b){ StudentCount(a, b) {
console.log(a,b)
return a.StudentCount - b.StudentCount; return a.StudentCount - b.StudentCount;
}, },
goreturn(){ goreturn() {
this.$router.go(-1); this.$router.go(-1);
} }
...@@ -259,9 +272,8 @@ ...@@ -259,9 +272,8 @@
}, },
} }
</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
...@@ -2532,7 +2532,6 @@ ...@@ -2532,7 +2532,6 @@
}) })
}, },
getAccountListtype(AccountId){ getAccountListtype(AccountId){
console.log(AccountId)
this.accountList2.map(x=>{ this.accountList2.map(x=>{
if(x.ID == AccountId){ if(x.ID == AccountId){
this.FinanceTrabeMsg.Type = x.BankType this.FinanceTrabeMsg.Type = x.BankType
......
This diff is collapsed.
...@@ -4,17 +4,23 @@ ...@@ -4,17 +4,23 @@
padding: 18px 0 0 16px; padding: 18px 0 0 16px;
text-align: right; text-align: right;
} }
.userCommissionDetails .border-bottom { .userCommissionDetails .border-bottom {
/* border-bottom: 1px dashed #EEE; */ /* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.userCommissionDetails .text-bottom{
height: 32px;line-height: 32px; margin-bottom: 10px; .userCommissionDetails .text-bottom {
height: 32px;
line-height: 32px;
margin-bottom: 10px;
} }
.userCommissionDetails ._icon_btn i.icon-sousuo { .userCommissionDetails ._icon_btn i.icon-sousuo {
background-color: #47BF8C; background-color: #47BF8C;
} }
.userCommissionDetails ._icon_btn i { .userCommissionDetails ._icon_btn i {
width: 30px; width: 30px;
height: 30px; height: 30px;
...@@ -27,23 +33,24 @@ ...@@ -27,23 +33,24 @@
cursor: pointer; cursor: pointer;
outline: none; outline: none;
} }
.userCommissionDetails .el-table td,.el-table th{
.userCommissionDetails .el-table td,
.el-table th {
padding: 5px 0; padding: 5px 0;
} }
</style>
</style> <template>
<template>
<div class="page-body userCommissionDetails"> <div class="page-body userCommissionDetails">
<div class="page-search row items-center"> <div class="page-search row items-center">
<div style="margin-right: 10px;"> <div style="margin-right: 10px;">
<q-btn color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/> <q-btn 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"> <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
emit-value map-options @filter="filterFn"> map-options @filter="filterFn">
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey"> <q-item-section class="text-grey">
...@@ -58,27 +65,23 @@ ...@@ -58,27 +65,23 @@
</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="SchoolName" label="校区"></el-table-column>
v-loading = 'loading' <el-table-column prop="DeptName" label="部门"></el-table-column>
<el-table-column prop="UserName" label="销售"> </el-table-column>
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" <el-table-column width='170' prop="ClassName" label="班级信息">
border
style="width: 100%">
<el-table-column prop="SchoolName" label="校区" ></el-table-column>
<el-table-column prop="DeptName" label="部门" ></el-table-column>
<el-table-column prop="UserName" label="销售" > </el-table-column>
<el-table-column width='170' prop="ClassName" label="班级信息" >
<template slot-scope="scope"> <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>
<div>学生数量:{{scope.row.StudentCount}}</div> <div>学生数量:{{scope.row.StudentCount}}</div>
</template> </template>
</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;text-decoration: underline;" @click='goorderUrl(scope.row.OrderId)'>
{{scope.row.OrderId}} </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -123,12 +126,12 @@ ...@@ -123,12 +126,12 @@
</template> </template>
</div> </div>
</template> </template>
<script> <script>
import { import {
GetClassTypePageList, GetClassTypePageList,
} from '../../api/system/index'; } from '../../api/system/index';
import{ import {
getSellCommissionUserDetailList, getSellCommissionUserDetailList,
} from '../../api/finance/index' } from '../../api/finance/index'
import { import {
...@@ -147,25 +150,25 @@ ...@@ -147,25 +150,25 @@
msg: { msg: {
PeriodId: 0, PeriodId: 0,
UserId: 0, UserId: 0,
ClassId:0, ClassId: 0,
OrderId:'', OrderId: '',
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
listData:{}, listData: {},
tableData:[], tableData: [],
company:[], company: [],
department:[], department: [],
ClassList:[], ClassList: [],
allClassList:[], allClassList: [],
} }
}, },
created() {}, created() {},
mounted() { mounted() {
if(this.$route.query && this.$route.query.userId){ if (this.$route.query && this.$route.query.userId) {
this.msg.UserId = this.$route.query.userId this.msg.UserId = this.$route.query.userId
} }
if(this.$route.query && this.$route.query.preriodId){ if (this.$route.query && this.$route.query.preriodId) {
this.msg.PeriodId = this.$route.query.preriodId this.msg.PeriodId = this.$route.query.preriodId
} }
this.getList() this.getList()
...@@ -173,8 +176,8 @@ ...@@ -173,8 +176,8 @@
}, },
methods: { methods: {
getList(){ getList() {
if(this.msg) if (this.msg)
this.loading = true; this.loading = true;
getSellCommissionUserDetailList(this.msg).then(res => { getSellCommissionUserDetailList(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -211,7 +214,7 @@ ...@@ -211,7 +214,7 @@
}) })
}, },
goUrl(path, id ) { goUrl(path, id) {
this.$router.push({ this.$router.push({
path: '/financial/' + path, path: '/financial/' + path,
query: { query: {
...@@ -225,30 +228,25 @@ ...@@ -225,30 +228,25 @@
const property = column['property']; const property = column['property'];
return row[property] === value; return row[property] === value;
}, },
StudentCount(a,b){ StudentCount(a, b) {
console.log(a,b)
return a.StudentCount - b.StudentCount; return a.StudentCount - b.StudentCount;
}, },
goorderUrl(id){ goorderUrl(id) {
console.log(id)
this.$router.push({ this.$router.push({
path: '/financial/cycleOrderList' , path: '/financial/cycleOrderList',
query: { query: {
OrderId: id, OrderId: id,
blank: 'y', blank: 'y',
} }
}) })
}, },
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
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