|
@@ -12,13 +12,13 @@
|
|
<el-input
|
|
<el-input
|
|
clearable
|
|
clearable
|
|
placeholder="学生姓名/编号"
|
|
placeholder="学生姓名/编号"
|
|
- @keyup.enter.native="
|
|
|
|
- (e) => {
|
|
|
|
- e.target.blur();
|
|
|
|
- $refs.searchForm.save();
|
|
|
|
- onSearch();
|
|
|
|
- }
|
|
|
|
- "
|
|
|
|
|
|
+ @keyup.enter.native="
|
|
|
|
+ e => {
|
|
|
|
+ e.target.blur();
|
|
|
|
+ $refs.searchForm.save();
|
|
|
|
+ onSearch();
|
|
|
|
+ }
|
|
|
|
+ "
|
|
v-model.trim="searchForm.search"
|
|
v-model.trim="searchForm.search"
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -69,7 +69,11 @@
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item prop="teacherId">
|
|
<el-form-item prop="teacherId">
|
|
- <remote-search :commit="'setTeachers'" v-model="searchForm.teacherId" :isForzenWithQueryCondition="true"/>
|
|
|
|
|
|
+ <remote-search
|
|
|
|
+ :commit="'setTeachers'"
|
|
|
|
+ v-model="searchForm.teacherId"
|
|
|
|
+ :isForzenWithQueryCondition="true"
|
|
|
|
+ />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item prop="musicDirectorId">
|
|
<el-form-item prop="musicDirectorId">
|
|
<remote-search
|
|
<remote-search
|
|
@@ -130,7 +134,7 @@
|
|
start-placeholder="第一次课开始时间"
|
|
start-placeholder="第一次课开始时间"
|
|
end-placeholder="第一次课结束时间"
|
|
end-placeholder="第一次课结束时间"
|
|
:picker-options="{
|
|
:picker-options="{
|
|
- firstDayOfWeek: 1,
|
|
|
|
|
|
+ firstDayOfWeek: 1
|
|
}"
|
|
}"
|
|
></el-date-picker>
|
|
></el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -145,7 +149,7 @@
|
|
start-placeholder="最后回访开始日期"
|
|
start-placeholder="最后回访开始日期"
|
|
end-placeholder="最后回访结束日期"
|
|
end-placeholder="最后回访结束日期"
|
|
:picker-options="{
|
|
:picker-options="{
|
|
- firstDayOfWeek: 1,
|
|
|
|
|
|
+ firstDayOfWeek: 1
|
|
}"
|
|
}"
|
|
>
|
|
>
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
@@ -301,7 +305,7 @@
|
|
>
|
|
>
|
|
{{
|
|
{{
|
|
scope.row.studentBasicInfo &&
|
|
scope.row.studentBasicInfo &&
|
|
- scope.row.studentBasicInfo.userName
|
|
|
|
|
|
+ scope.row.studentBasicInfo.userName
|
|
}}<br />
|
|
}}<br />
|
|
{{
|
|
{{
|
|
scope.row.studentBasicInfo && scope.row.studentBasicInfo.userId
|
|
scope.row.studentBasicInfo && scope.row.studentBasicInfo.userId
|
|
@@ -330,7 +334,9 @@
|
|
<el-table-column align="center" prop="organName" label="学员状态">
|
|
<el-table-column align="center" prop="organName" label="学员状态">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<div>
|
|
<div>
|
|
- {{ scope.row.studentBasicInfo.studentStatus | feedbackTypeFilter}}
|
|
|
|
|
|
+ {{
|
|
|
|
+ scope.row.studentBasicInfo.studentStatus | feedbackTypeFilter
|
|
|
|
+ }}
|
|
<!-- <p
|
|
<!-- <p
|
|
v-if="
|
|
v-if="
|
|
(scope.row.noScheduleNum || scope.row.subCourseNum) &&
|
|
(scope.row.noScheduleNum || scope.row.subCourseNum) &&
|
|
@@ -377,7 +383,7 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" prop="totalCourseNum" label="总课时">
|
|
<el-table-column align="center" prop="totalCourseNum" label="总课时">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- {{ parseInt(scope.row.totalCourseNum+scope.row.noScheduleNum) }}节
|
|
|
|
|
|
+ {{ parseInt(scope.row.totalCourseNum + scope.row.noScheduleNum) }}节
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" prop="overCourseNum" label="已完成课时">
|
|
<el-table-column align="center" prop="overCourseNum" label="已完成课时">
|
|
@@ -395,7 +401,12 @@
|
|
{{ scope.row.preCourseFee | moneyFormat }}元
|
|
{{ scope.row.preCourseFee | moneyFormat }}元
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="center" width="180px" label="操作" v-if="groupType=='VIP'">
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="center"
|
|
|
|
+ width="180px"
|
|
|
|
+ label="操作"
|
|
|
|
+ v-if="groupType == 'VIP'"
|
|
|
|
+ >
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-button type="text" @click="recordVisit(scope.row)"
|
|
<el-button type="text" @click="recordVisit(scope.row)"
|
|
>回访记录</el-button
|
|
>回访记录</el-button
|
|
@@ -445,7 +456,7 @@ export default {
|
|
inject: ["organId", "isSearch"],
|
|
inject: ["organId", "isSearch"],
|
|
components: {
|
|
components: {
|
|
pagination,
|
|
pagination,
|
|
- visiList,
|
|
|
|
|
|
+ visiList
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -459,7 +470,7 @@ export default {
|
|
musicDirectorId: "",
|
|
musicDirectorId: "",
|
|
courseConsumerError: "",
|
|
courseConsumerError: "",
|
|
timer: [],
|
|
timer: [],
|
|
- lastTimer: [],
|
|
|
|
|
|
+ lastTimer: []
|
|
},
|
|
},
|
|
tableList: [],
|
|
tableList: [],
|
|
feedbackTypeList,
|
|
feedbackTypeList,
|
|
@@ -468,21 +479,21 @@ export default {
|
|
limit: 10, // 限制显示条数
|
|
limit: 10, // 限制显示条数
|
|
page: 1, // 当前页
|
|
page: 1, // 当前页
|
|
total: 0, // 总条数
|
|
total: 0, // 总条数
|
|
- page_size: [10, 20, 40, 50], // 选择限制显示条数
|
|
|
|
|
|
+ page_size: [10, 20, 40, 50] // 选择限制显示条数
|
|
},
|
|
},
|
|
visitVisiable: false,
|
|
visitVisiable: false,
|
|
activeRow: null,
|
|
activeRow: null,
|
|
- flag: false,
|
|
|
|
|
|
+ flag: false
|
|
};
|
|
};
|
|
},
|
|
},
|
|
async mounted() {
|
|
async mounted() {
|
|
this.$store.dispatch("setBranchs");
|
|
this.$store.dispatch("setBranchs");
|
|
this.$store.dispatch("setTeachers");
|
|
this.$store.dispatch("setTeachers");
|
|
- if(this.$route.query.subCourseMaxNum){
|
|
|
|
- this.searchForm.subCourseMaxNum = this.$route.query.subCourseMaxNum
|
|
|
|
|
|
+ if (this.$route.query.subCourseMaxNum) {
|
|
|
|
+ this.searchForm.subCourseMaxNum = this.$route.query.subCourseMaxNum;
|
|
}
|
|
}
|
|
- if(this.$route.query.studentStatus){
|
|
|
|
- this.searchForm.studentStatus = this.$route.query.studentStatus
|
|
|
|
|
|
+ if (this.$route.query.studentStatus) {
|
|
|
|
+ this.searchForm.studentStatus = this.$route.query.studentStatus;
|
|
}
|
|
}
|
|
|
|
|
|
await this.getList();
|
|
await this.getList();
|
|
@@ -508,10 +519,10 @@ export default {
|
|
...getTimes(lastTimer, ["lastVisitStartTime", "lastVisitEndTime"]),
|
|
...getTimes(lastTimer, ["lastVisitStartTime", "lastVisitEndTime"]),
|
|
rows: this.pageInfo.limit,
|
|
rows: this.pageInfo.limit,
|
|
page: this.pageInfo.page,
|
|
page: this.pageInfo.page,
|
|
- organId: this.organIds,
|
|
|
|
|
|
+ organId: this.organIds
|
|
};
|
|
};
|
|
let res = await queryPage({
|
|
let res = await queryPage({
|
|
- ...obj,
|
|
|
|
|
|
+ ...obj
|
|
});
|
|
});
|
|
this.tableList = res.data.rows || [];
|
|
this.tableList = res.data.rows || [];
|
|
this.pageInfo.total = res.data.total;
|
|
this.pageInfo.total = res.data.total;
|
|
@@ -522,13 +533,13 @@ export default {
|
|
gotoStudent(search) {
|
|
gotoStudent(search) {
|
|
this.$router.push({
|
|
this.$router.push({
|
|
name: "studentList",
|
|
name: "studentList",
|
|
- params: { search: search },
|
|
|
|
|
|
+ params: { search: search }
|
|
});
|
|
});
|
|
},
|
|
},
|
|
gototeacher(search) {
|
|
gototeacher(search) {
|
|
this.$router.push({
|
|
this.$router.push({
|
|
name: "teacherList",
|
|
name: "teacherList",
|
|
- params: { search: search },
|
|
|
|
|
|
+ params: { search: search }
|
|
});
|
|
});
|
|
},
|
|
},
|
|
recordVisit(row) {
|
|
recordVisit(row) {
|
|
@@ -536,7 +547,6 @@ export default {
|
|
this.visitVisiable = true;
|
|
this.visitVisiable = true;
|
|
},
|
|
},
|
|
smallStudentExport() {
|
|
smallStudentExport() {
|
|
-
|
|
|
|
const { timer, ...rest } = this.searchForm;
|
|
const { timer, ...rest } = this.searchForm;
|
|
let str = "";
|
|
let str = "";
|
|
if (this.groupType === "PRACTICE") {
|
|
if (this.groupType === "PRACTICE") {
|
|
@@ -544,12 +554,13 @@ export default {
|
|
} else if (this.groupType === "VIP") {
|
|
} else if (this.groupType === "VIP") {
|
|
str = "VIP课";
|
|
str = "VIP课";
|
|
} else {
|
|
} else {
|
|
- str = "乐理课";
|
|
|
|
|
|
+ str = "小组课";
|
|
}
|
|
}
|
|
Export(
|
|
Export(
|
|
this,
|
|
this,
|
|
{
|
|
{
|
|
- url: "/api-web/studentStatistics/exportStudentSmallClassStatisticsSum",
|
|
|
|
|
|
+ url:
|
|
|
|
+ "/api-web/studentStatistics/exportStudentSmallClassStatisticsSum",
|
|
fileName: `${str}学员管理.xls`,
|
|
fileName: `${str}学员管理.xls`,
|
|
method: "post",
|
|
method: "post",
|
|
params: qs.stringify(
|
|
params: qs.stringify(
|
|
@@ -558,17 +569,17 @@ export default {
|
|
...rest,
|
|
...rest,
|
|
...getTimes(timer, [
|
|
...getTimes(timer, [
|
|
"firstCourseStartTime",
|
|
"firstCourseStartTime",
|
|
- "firstCourseEndTime",
|
|
|
|
|
|
+ "firstCourseEndTime"
|
|
]),
|
|
]),
|
|
rows: this.pageInfo.limit,
|
|
rows: this.pageInfo.limit,
|
|
page: this.pageInfo.page,
|
|
page: this.pageInfo.page,
|
|
- organId: this.organIds,
|
|
|
|
|
|
+ organId: this.organIds
|
|
})
|
|
})
|
|
- ),
|
|
|
|
|
|
+ )
|
|
},
|
|
},
|
|
`您确定导出${str}学员管理?`
|
|
`您确定导出${str}学员管理?`
|
|
);
|
|
);
|
|
- },
|
|
|
|
|
|
+ }
|
|
},
|
|
},
|
|
|
|
|
|
computed: {
|
|
computed: {
|
|
@@ -584,9 +595,9 @@ export default {
|
|
this.flag = flag;
|
|
this.flag = flag;
|
|
|
|
|
|
return flag;
|
|
return flag;
|
|
- },
|
|
|
|
- },
|
|
|
|
- },
|
|
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|
|
|
|
|
|
@@ -596,7 +607,7 @@ export default {
|
|
margin-bottom: 20px;
|
|
margin-bottom: 20px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-::v-deep .el-card__body .statistic {
|
|
|
|
|
|
+::v-deep .el-card__body .statistic {
|
|
margin-bottom: 15px;
|
|
margin-bottom: 15px;
|
|
padding: 0;
|
|
padding: 0;
|
|
}
|
|
}
|
|
@@ -610,7 +621,7 @@ export default {
|
|
}
|
|
}
|
|
.number-input {
|
|
.number-input {
|
|
width: 180px !important;
|
|
width: 180px !important;
|
|
- ::v-deep .el-input__inner {
|
|
|
|
|
|
+ ::v-deep .el-input__inner {
|
|
text-align: left;
|
|
text-align: left;
|
|
}
|
|
}
|
|
}
|
|
}
|