|
@@ -81,10 +81,12 @@
|
|
|
<round-score-query :setting-model="settingModel" :group-model-index="groupModelIndex"
|
|
|
:group-model="groupModel" :default-group-id="scoreQueryGroupId"></round-score-query>
|
|
|
</el-dialog>
|
|
|
+ <choose-subject-dialog ref="chooseDialog"></choose-subject-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+import ChooseSubjectDialog from '@/views/system/user/profile/components/choose-subject-dialog'
|
|
|
import selectTranslateMixin from '@/components/Cache/modules/mx-select-translate-mixin'
|
|
|
import RoundScoreQuery from '@/views/permission/components/round-score-query'
|
|
|
import FacultyForms from '@/views/permission/components/steps/fauclty/faculty-forms'
|
|
@@ -93,7 +95,7 @@ import { calculateFaculties, generateFaculties } from '@/api/webApi/selection'
|
|
|
import FacultyResult from '@/views/permission/components/steps/fauclty/faculty-result'
|
|
|
|
|
|
export default {
|
|
|
- components: { FacultyResult, FacultyForms, RoundScoreQuery },
|
|
|
+ components: { FacultyResult, FacultyForms, RoundScoreQuery,ChooseSubjectDialog },
|
|
|
mixins: [selectTranslateMixin, RoundModelConvert],
|
|
|
name: 'round-setting-group',
|
|
|
props: {
|
|
@@ -271,10 +273,18 @@ export default {
|
|
|
}))
|
|
|
},
|
|
|
handleView(row, key) {
|
|
|
+ console.log(row,key)
|
|
|
if (key == 'scoreQuery') {
|
|
|
this.scoreQueryGroupId = row.groupId
|
|
|
this.scoreQueryVisible = true
|
|
|
}
|
|
|
+
|
|
|
+ if(key == 'majorQuery') {
|
|
|
+ // 打开选科弹窗
|
|
|
+ const course0 = this.translateCourse0(row.groupId)
|
|
|
+ const course1 = this.translateCourse1(row.groupId)
|
|
|
+ this.$refs.chooseDialog.open(course0, course1)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|