|
|
@@ -12,7 +12,7 @@
|
|
|
<Radio label="school">{{ $t('survey.form.schoolClass') }}</Radio>
|
|
|
</RadioGroup> -->
|
|
|
<div v-if="!qnFormEdit && curQnItem" class="vote-class">
|
|
|
- <span v-for="item in curQnItem.classes" class="vote-class-item">{{ getTargetName(item) }}</span>
|
|
|
+ <span v-for="item in classIds" class="vote-class-item">{{ getTargetName(item) }}</span>
|
|
|
</div>
|
|
|
<!-- <Select multiple v-model="qnForm.classes" :class="!qnFormEdit ? 'qn-form-disabled':''"
|
|
|
:placeholder="$t('survey.form.targetPlace')" v-else>
|
|
|
@@ -20,8 +20,8 @@
|
|
|
:key="index">{{ item.name }}</Option>
|
|
|
</Select> -->
|
|
|
<div v-else>
|
|
|
- <BaseClassSelect :classes="classNameArr" @onChange="onTargetChange" v-if="getCurScope === 'school'"></BaseClassSelect>
|
|
|
- <BaseClassSelectPri ref="classSelectRef" @onChange="onTargetChange" v-else></BaseClassSelectPri>
|
|
|
+ <BaseClassSelect :classes="classNameArr" @onChange="onTargetChange" ref="classSelectRef" v-if="getCurScope === 'school'"></BaseClassSelect>
|
|
|
+ <BaseClassSelectPri :classes="classNameArr" ref="classSelectRef" @onChange="onTargetChange" v-else></BaseClassSelectPri>
|
|
|
</div>
|
|
|
</FormItem>
|
|
|
|
|
|
@@ -122,6 +122,7 @@
|
|
|
code: "",
|
|
|
name: "",
|
|
|
classes: [],
|
|
|
+ stuLists:[],
|
|
|
startTime: 0,
|
|
|
endTime: 0,
|
|
|
resource: []
|
|
|
@@ -166,7 +167,8 @@
|
|
|
let data = _this.qnForm.startTime ? _this.qnForm.startTime : Date.now()
|
|
|
return data && data > date.valueOf() + 86400000
|
|
|
}
|
|
|
- }
|
|
|
+ },
|
|
|
+ classIds:[]
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -207,9 +209,11 @@
|
|
|
return new Promise((resolve, reject) => {
|
|
|
this.$refs[name].validate((valid) => {
|
|
|
if (valid && this.getSimpleText(this.qnForm.description) && this.qnForm.classes.length) {
|
|
|
+ console.log('1111111111')
|
|
|
let params = JSON.parse(JSON.stringify(this.defaultParams))
|
|
|
let target = []
|
|
|
- let isPersonal = this.$route.name === 'personalVote' && this.$refs.classSelectRef.evaluationInfo.scope === 'private'
|
|
|
+ let classSelectScope = this.$refs.classSelectRef.evaluationInfo.scope
|
|
|
+ let isPersonal = this.$route.name === 'personalVote' && classSelectScope === 'private'
|
|
|
params.code = this.getCurCode
|
|
|
// 如果个人问卷的班级是校本班级 那么也要把scope置为school
|
|
|
params.scope = isPersonal ? 'private' : 'school'
|
|
|
@@ -223,7 +227,6 @@
|
|
|
params.creatorId = this.$store.state.userInfo.TEAMModelId
|
|
|
params.school = params.scope === 'school' ? this.$store.state.userInfo
|
|
|
.schoolCode : null
|
|
|
-
|
|
|
// 如果是编辑状态 则直接复制ID 如果是新增 则直接赋值新ID
|
|
|
if (this.isEdit && this.editInfo.id && this.editInfo.code) {
|
|
|
params.id = this.editInfo.id
|
|
|
@@ -231,7 +234,11 @@
|
|
|
} else {
|
|
|
params.id = this.$tools.guid()
|
|
|
}
|
|
|
- params.classes = this.qnForm.classes
|
|
|
+ if(classSelectScope === 'school'){
|
|
|
+ params.classes = this.qnForm.classes
|
|
|
+ }else{
|
|
|
+ params.stuLists = this.qnForm.classes
|
|
|
+ }
|
|
|
console.log(params)
|
|
|
resolve(params)
|
|
|
} else {
|
|
|
@@ -311,12 +318,14 @@
|
|
|
// if (!this.classRooms.length) {
|
|
|
// this.classRooms = await this.getClassrooms(this.userInfo.TEAMModelId)
|
|
|
// }
|
|
|
- if(item.classes.length){
|
|
|
- this.classNameArr = await this.getClassNameByIds(item.classes)
|
|
|
+ if(item.id){
|
|
|
+ this.classNameArr = item.classes.length ? await this.getClassNameByIds(item.classes) : await this.getClassNameByIds(item.stuLists)
|
|
|
+ this.classIds = item.classes.length ? item.classes : item.stuLists
|
|
|
}
|
|
|
+
|
|
|
this.qnForm = {
|
|
|
name: item.name,
|
|
|
- classes: item.classes || [],
|
|
|
+ classes: this.classIds || [],
|
|
|
startTime: item.startTime ? new Date(item.startTime) : '',
|
|
|
endTime: item.endTime ? new Date(item.endTime) : '',
|
|
|
description: item.description,
|
CrazyIter_Bin