Skip to content

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

页面修改

parent d4b78b0b
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 87 deletions
src/components/school/student/stufollowlistNew.vue
View file @ dbeeb58b
......@@ -59,6 +59,7 @@
cursor: pointer;
color: #2961FE;
}
</style>
<template>
<div class="stufollowlist">
......@@ -66,77 +67,88 @@
<table class="po_content singeRowTable" ref="table" style="border:1px solid #E6E6E6;" cellspacing="0"
cellpadding="0" v-loading="loading">
<tr>
<th width="120" style="min-width: 110px;z-index: 999;">学生</th>
<th width="120" style="min-width: 110px;">报名日期</th>
<th width="120" style="min-width: 110px;">职业</th>
<th width="80" style="min-width: 80px;">目的</th>
<th width="100" style="min-width: 100px;">班主任</th>
<th width="200" style="min-width: 200px;">课程名称</th>
<th width="80" style="min-width: 80px;">初报级别</th>
<th width="80" style="min-width: 80px;">金额</th>
<th width="200" style="min-width: 80px;">基本情况</th>
<th width="200" style="min-width: 200px;">续费课程</th>
<th width="80" style="min-width: 80px;" >续费级别</th>
<th width="80" style="min-width: 80px;">续费金额</th>
<th width="100" style="min-width: 100px;">负责人</th>
<th width="120" style="min-width: 110px;z-index: 999;">学生</th>
<th width="120" style="min-width: 110px;">报名日期</th>
<th width="120" style="min-width: 110px;">职业</th>
<th width="80" style="min-width: 80px;">目的</th>
<th width="100" style="min-width: 100px;">班主任</th>
<th width="200" style="min-width: 200px;">课程名称</th>
<th width="80" style="min-width: 80px;">初报级别</th>
<th width="80" style="min-width: 80px;">金额</th>
<th width="200" style="min-width: 80px;">基本情况</th>
<th width="200" style="min-width: 200px;">续费课程</th>
<th width="80" style="min-width: 80px;">续费级别</th>
<th width="80" style="min-width: 80px;">续费金额</th>
<th width="100" style="min-width: 100px;">负责人</th>
</tr>
<template v-if='dataObj&&dataObj.RList && dataObj.RList.length>0'>
<tr v-for=" ( item , index ) in dataObj.RList " :key="index">
<td style=" border: 1px solid #d2d2d2;">
<div class="text-blue cursor-pointer" @click="getStuRight(item)">
{{item.StuName }}
{{item.StuName }}
</div>
</td>
<td>
<span>{{ item.CreateTime }}</span>
{{ item.CreateTime }}
</td>
<td>
<span >{{item.StuProfession}}</span>
{{item.StuProfession}}
</td>
<td>
<span>{{ item.StuPurposeName }}</span>
{{ item.StuPurposeName }}
</td>
<td>
<span v-html="getTeacherManager(item)"></span>
</td>
<td>
<span>{{ item.CourseName }}</span>
{{ item.CourseName }}
</td>
<td>
{{ item.CourseRateName?item.CourseRateName:'-' }}
</td>
<td>
<span>{{ item.CourseRateName?item.CourseRateName:'-' }}</span>
{{ item.PreferPrice }}
</td>
<td>
<span>{{ item.PreferPrice }}</span>
<template v-if="item.FollowList&&item.FollowList.length>0">
<template v-for="(sItem,fIndex) in item.FollowList">
<template v-if="fIndex<=1">
<div style="border-bottom:1px dashed #d1d1d1;text-align:left;padding:5px 5px;" :key="fIndex+10000">
<font style="font-weight:bold;">{{sItem.CreateTime}}：</font>{{sItem.Remark}}
</div>
</template>
<template v-else>
<div style="border-bottom:1px dashed #d1d1d1;text-align:left;padding:5px 5px;" :key="fIndex+20000"
v-if="item.IsShowFollowAll">
<font style="font-weight:bold;">{{sItem.CreateTime}}：</font>{{sItem.Remark}}
</div>
</template>
</template>
<a style="color:blue;cursor:pointer;" v-if="item.FollowList.length>2"
@click="item.IsShowFollowAll=!item.IsShowFollowAll">{{!item.IsShowFollowAll?"展开":"收起"}}</a>
</template>
</td>
<td >
<div v-if="item.FollowList&&item.FollowList.length>0" v-for="(sItem,sIndex) in item.FollowList" style="border-bottom:1px dashed #d1d1d1;"
:key="sIndex">
<div> <div v-html="sItem.Remark"></div> <span>{{sItem.CreateTime}}</span></div>
</div>
</td>
<td>
<div v-for="(sItem,sIndex) in item.RenewOrderList" style="border-bottom:1px dashed #d1d1d1;"
:key="sIndex">
<span>{{sItem.CourseName}}</span>
</div>
:key="sIndex+30000">
<span>{{sItem.CourseName}}</span>
</div>
</td>
<td>
<div v-for="(sItem,sIndex) in item.RenewOrderList" style="border-bottom:1px dashed #d1d1d1;"
:key="sIndex">
<span>{{ sItem.CourseRateName?sItem.CourseRateName:'-' }}</span>
</div>
:key="sIndex+40000">
<span>{{ sItem.CourseRateName?sItem.CourseRateName:'-' }}</span>
</div>
</td>
<td>
<div v-for="(sItem,sIndex) in item.RenewOrderList" style="border-bottom:1px dashed #d1d1d1;"
:key="sIndex">
<span>{{sItem.PreferPrice}}</span>
</div>
:key="sIndex+50000">
<span>{{sItem.PreferPrice}}</span>
</div>
</td>
<td>
<span>{{ item.CreateByName?item.CreateByName:'-' }}</span>
{{ item.CreateByName?item.CreateByName:'-' }}
</td>
</tr>
</template>
</table>
......@@ -206,22 +218,11 @@
}
},
methods: {
//刷新表格
refreshTable() {
this.$emit("success");
},
getCurseManager(row) {
let managerName = "<span class='text-grey-4'>暂未推送</span>";
if (row.AssistList && row.AssistList.length > 0) {
row.AssistList.forEach(y => {
if (y.AssistType == 2) {
managerName = `<span class='text-dark'>${y.AssistName}</span>`;
}
});
}
return managerName;
},
getTeacherManager(row) {
let managerName = "<span class='text-grey-4'>暂无</span>";
if (row.AssistList && row.AssistList.length > 0) {
......@@ -233,25 +234,6 @@
}
return managerName;
},
lookgengduo(obj, time) { //跟进备注
//计算时间 月底日期
let Month = time.split('-')[0] + '-' + time.split('-')[1] + '-01'
let date = new Date(Month);
let currentMonth = date.getMonth();
let nextMonth = ++currentMonth;
let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
let oneDay = 1000 * 60 * 60 * 24;
let endDate = new Date(nextMonthFirstDay - oneDay)
let endMonth = time.split('-')[0] + '-' + time.split('-')[1] + '-' + endDate.getDate()
if (obj) {
this.stuOption = obj;
this.stuOption.STime = Month;
this.stuOption.ETime = endMonth;
this.BelongType = obj.BelongType;
}
this.isShowStuFU = true;
},
//点击学生姓名弹出
getStuRight(obj) {
if (obj) {
......@@ -265,18 +247,7 @@
this.isShowStuRight = false;
this.isShowStuFU = false
},
getxuyue(index) {
let obj = {
IntroductionNum: 0,
RenewNum: 0
};
this.dataObj.MonthList.forEach(x => {
if (x.MonthNum == index + 1) {
obj = x
}
})
return obj
},
}
};
</script>
\ No newline at end of file
</script>
src/pages/teacher/teacherTrack.vue
View file @ dbeeb58b
......@@ -47,6 +47,7 @@
height: 40px;
background-color: rgb(238, 238, 239);
}
</style>
<template>
<div class="page-body studentTracking">
......@@ -280,7 +281,7 @@
StuSourceId: '',
StuPurpose: '', //学习目的
HeadTeacherId: '', //老师
QueryTpye: 2,//老师查询
QueryTpye: 2, //老师查询
AdvisorStatus: "", //当前状态
},
loading: false,
......@@ -614,10 +615,9 @@
GetStudentFollowUpPageNewList(msg).then(res => {
this.loading = false;
this.RListlength = res.Data.PageData && res.Data.PageData.MaxMonth ? res.Data.PageData.MaxMonth : 1;
this.dataList = res.Data.PageData;
var pageData = res.Data.PageData;
this.dataList = pageData;
this.PageCount = res.Data.PageCount;
})
.catch(() => {
this.loading = false;
......@@ -649,9 +649,11 @@
},
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
<style scoped>
/deep/.el-input__inner,
......@@ -678,4 +680,5 @@
.roatImg {
transform: rotate(180deg);
}
</style>
\ No newline at end of file
</style>
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