zhangsq 7 mesiacov pred
rodič
commit
362c1f0f27

+ 4 - 0
src/api/sys/orgApi.js

@@ -49,5 +49,9 @@ export default {
 	// 获取用户选择器
 	orgUserSelector(data) {
 		return request('userSelector', data, 'get')
+	},
+	// 获取学院下拉
+	collegeOptions(data) {
+		return request('queryList', data, 'get')
 	}
 }

+ 23 - 4
src/views/course/major/form.vue

@@ -7,14 +7,21 @@
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-			<a-form-item label="院系名称:" name="majorName">
+			<a-form-item label="专业名称:" name="majorName">
 				<a-input v-model:value="formData.majorName" placeholder="请输入院系名称" allow-clear />
 			</a-form-item>
-			<a-form-item label="院系编码:" name="majorCode">
+			<a-form-item label="专业编码:" name="majorCode">
 				<a-input v-model:value="formData.majorCode" placeholder="请输入院系编码" allow-clear />
 			</a-form-item>
-			<a-form-item label="学院id:" name="collegeId">
-				<a-input v-model:value="formData.collegeId" placeholder="请输入学院id" allow-clear />
+			<a-form-item label="学院:" name="collegeId">
+				<!-- <a-input v-model:value="formData.collegeId" placeholder="请输入学院id" allow-clear /> -->
+				<a-select
+					v-model:value="formData.collegeId"
+					:size="size"
+					placeholder="请选择学院"
+					:fieldNames="{ label: 'name', value: 'id' }"
+					:options="collegeOptions"
+				></a-select>
 			</a-form-item>
 		</a-form>
 		<template #footer>
@@ -28,6 +35,8 @@
 	import { cloneDeep } from 'lodash-es'
 	import { required } from '@/utils/formRules'
 	import majorApi from '@/api/course/majorApi'
+	import orgApi from '@/api/sys/orgApi'
+	import tool from '@/utils/tool'
 	// 抽屉状态
 	const visible = ref(false)
 	const emit = defineEmits({ successful: null })
@@ -35,6 +44,8 @@
 	// 表单数据
 	const formData = ref({})
 	const submitLoading = ref(false)
+	const collegeOptions = ref([])
+	// const collegeOptions = tool.dictList('COLLEGE')
 
 	// 打开抽屉
 	const onOpen = (record) => {
@@ -52,6 +63,7 @@
 	}
 	// 默认要校验的
 	const formRules = {}
+
 	// 验证并提交数据
 	const onSubmit = () => {
 		formRef.value.validate().then(() => {
@@ -68,6 +80,13 @@
 				})
 		})
 	}
+	const getCollegeOptions = () => {
+		orgApi.collegeOptions().then((res) => {
+			// console.log(res, 'resresresres')
+			collegeOptions.value = res
+		})
+	}
+	getCollegeOptions()
 	// 抛出函数
 	defineExpose({
 		onOpen

+ 3 - 3
src/views/course/major/index.vue

@@ -43,15 +43,15 @@
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 	const columns = [
 		{
-			title: '院系名称',
+			title: '专业名称',
 			dataIndex: 'majorName'
 		},
 		{
-			title: '院系编码',
+			title: '专业编码',
 			dataIndex: 'majorCode'
 		},
 		{
-			title: '学院id',
+			title: '学院',
 			dataIndex: 'collegeId'
 		},
 		{