|
@@ -45,7 +45,7 @@
|
|
|
<el-option label="在读" value="NORMAL"></el-option>
|
|
|
<el-option label="沉睡" value="SLEEPY"></el-option>
|
|
|
<el-option label="流失" value="LOST"></el-option>
|
|
|
- <el-option label="暂停" value="PAUSE"></el-option>
|
|
|
+ <el-option label="暂停" value="PAUSE"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="feedbackType">
|
|
@@ -99,6 +99,38 @@
|
|
|
<el-option label="否" :value="false"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item prop="wornFlag">
|
|
|
+ <el-select
|
|
|
+ class="multiple"
|
|
|
+ filterable
|
|
|
+ v-model.trim="searchForm.wornFlag"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择是否预警"
|
|
|
+ >
|
|
|
+ <el-option label="是" :value="true"></el-option>
|
|
|
+ <el-option label="否" :value="false"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="subCourseMinNum">
|
|
|
+ <el-input-number
|
|
|
+ class="number-input"
|
|
|
+ :controls="false"
|
|
|
+ :precision="0"
|
|
|
+ :min="0"
|
|
|
+ v-model="searchForm.subCourseMinNum"
|
|
|
+ placeholder="请输入剩余课时最小数"
|
|
|
+ ></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="subCourseMaxNum">
|
|
|
+ <el-input-number
|
|
|
+ class="number-input"
|
|
|
+ :controls="false"
|
|
|
+ :precision="0"
|
|
|
+ v-model="searchForm.subCourseMaxNum"
|
|
|
+ :min="searchForm.subCourseMinNum"
|
|
|
+ placeholder="请输入剩余课时最大数"
|
|
|
+ ></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item prop="timer">
|
|
|
<el-date-picker
|
|
|
v-model.trim="searchForm.timer"
|
|
@@ -292,7 +324,7 @@
|
|
|
<el-table-column align="center" prop="organName" label="学员状态">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- {{scope.row.studentBasicInfo.studentStatus}}
|
|
|
+ {{ scope.row.studentBasicInfo.studentStatus }}
|
|
|
<!-- <p
|
|
|
v-if="
|
|
|
(scope.row.noScheduleNum || scope.row.subCourseNum) &&
|
|
@@ -385,7 +417,7 @@
|
|
|
:studentId="activeRow.userId"
|
|
|
:studentName="activeRow.studentBasicInfo.userName"
|
|
|
:groupType="groupType"
|
|
|
- @getList='getList'
|
|
|
+ @getList="getList"
|
|
|
/>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
@@ -419,7 +451,7 @@ export default {
|
|
|
teacherId: "",
|
|
|
musicDirectorId: "",
|
|
|
courseConsumerError: "",
|
|
|
- timer:[],
|
|
|
+ timer: [],
|
|
|
},
|
|
|
tableList: [],
|
|
|
feedbackTypeList,
|
|
@@ -453,7 +485,7 @@ export default {
|
|
|
},
|
|
|
async getList() {
|
|
|
const { timer, ...rest } = this.searchForm;
|
|
|
- console.log(timer)
|
|
|
+ console.log(timer);
|
|
|
try {
|
|
|
let obj = {
|
|
|
groupType: this.groupType,
|
|
@@ -541,4 +573,10 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+.number-input {
|
|
|
+ width: 180px!important;
|
|
|
+ /deep/ .el-input__inner {
|
|
|
+ text-align: left;
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|