|
@@ -30,7 +30,7 @@
|
|
<evaluation-empty v-else-if="!queryParams.roundId" shadow title="当前学年没有班主任选班数据"></evaluation-empty>
|
|
<evaluation-empty v-else-if="!queryParams.roundId" shadow title="当前学年没有班主任选班数据"></evaluation-empty>
|
|
</el-card>
|
|
</el-card>
|
|
<choose-master-teacher ref="chooseMasterTeacher"></choose-master-teacher>
|
|
<choose-master-teacher ref="chooseMasterTeacher"></choose-master-teacher>
|
|
- <choose-class ref="chooseClass" :year="queryParams.year"></choose-class>
|
|
|
|
|
|
+ <choose-class ref="chooseClass" :year="queryParams.year" :headteacherSettings="headteacherSettings"></choose-class>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<script>
|
|
<script>
|
|
@@ -101,8 +101,14 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- keepAll() {
|
|
|
|
|
|
+ async keepAll() {
|
|
|
|
+ if(Object.keys(this.headteacherSettings).length > 0) {
|
|
|
|
+ await this.$confirm(`一键维持原班级会覆盖您之前的设置,是否继续?`)
|
|
|
|
+ }else {
|
|
|
|
+ await this.$confirm(`是否一键维持原班级?`)
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ // 维持原班级
|
|
},
|
|
},
|
|
getHeadteacherSettings() {
|
|
getHeadteacherSettings() {
|
|
getHeadteacherDispatchSettings().then(res => {
|
|
getHeadteacherDispatchSettings().then(res => {
|
|
@@ -112,7 +118,7 @@ export default {
|
|
},
|
|
},
|
|
send() {
|
|
send() {
|
|
const isSend = this.rows.filter(item => {
|
|
const isSend = this.rows.filter(item => {
|
|
- return item.newMasterId != 0
|
|
|
|
|
|
+ return item.newClassId != 0
|
|
}).length == this.rows.length
|
|
}).length == this.rows.length
|
|
console.log(isSend)
|
|
console.log(isSend)
|
|
if(!isSend) {
|
|
if(!isSend) {
|