|
@@ -50,6 +50,7 @@
|
|
|
@reset="onReSet"
|
|
|
@submit="search"
|
|
|
:model="searchForm"
|
|
|
+ save-key='/forecastName'
|
|
|
ref="searchForm"
|
|
|
>
|
|
|
<el-form-item prop="name">
|
|
@@ -77,7 +78,7 @@
|
|
|
placeholder="老师推荐声部"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in selects.subjects"
|
|
|
+ v-for="item in subjectList"
|
|
|
:value="item.id"
|
|
|
:label="item.name"
|
|
|
:key="item.id"
|
|
@@ -187,7 +188,7 @@
|
|
|
: null
|
|
|
}}
|
|
|
{{
|
|
|
- !scope.row.teacherRecommandSubjectId &&
|
|
|
+ scope.row.teacherRecommandSubjectId==-1 &&
|
|
|
!scope.row.teacherRecommandSubjectName
|
|
|
? "无"
|
|
|
: null
|
|
@@ -297,6 +298,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<pagination
|
|
|
+ save-key='/forecastName'
|
|
|
sync
|
|
|
:total.sync="pageInfo.total"
|
|
|
:page.sync="pageInfo.page"
|
|
@@ -473,11 +475,14 @@ export default {
|
|
|
},
|
|
|
preLookVisible: false,
|
|
|
sysMsg:'',
|
|
|
+ subjectList:[]
|
|
|
};
|
|
|
},
|
|
|
async mounted() {
|
|
|
- this.$store.dispatch("setSubjects");
|
|
|
+ await this.$store.dispatch("setSubjects");
|
|
|
// 获取短信推送模板
|
|
|
+ this.subjectList = [...this.selects.subjects]
|
|
|
+this.subjectList.push({id:-1,name:'无'})
|
|
|
const rus = await getSysMessageConfig({
|
|
|
type: "STUDENT_SMS_IM_MUSIC_GROUP_PARENT_MEETING_NOTICE",
|
|
|
});
|