diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
index 176c375..209e512 100644
--- a/src/api/system/tenant/index.ts
+++ b/src/api/system/tenant/index.ts
@@ -13,6 +13,7 @@ export interface TenantVO {
expireTime: Date
accountCount: number
createTime: Date
+ tenantSpecialtyPointsVOList: any
}
export interface TenantPageReqVO extends PageParam {
@@ -36,6 +37,11 @@ export const getTenantPage = (params: TenantPageReqVO) => {
return request.get({ url: '/system/tenant/page', params })
}
+// 查询租户对应专业授权列表
+export const getTenantSpecialty = (id: number) => {
+ return request.get({ url: '/system/tenant/get-id-by-specialty?id=' + id })
+}
+
// 查询租户详情
export const getTenant = (id: number) => {
return request.get({ url: '/system/tenant/get?id=' + id })
diff --git a/src/views/exam/specialty/SpecialtyForm.vue b/src/views/exam/specialty/SpecialtyForm.vue
index e36c3f1..fcd06c1 100644
--- a/src/views/exam/specialty/SpecialtyForm.vue
+++ b/src/views/exam/specialty/SpecialtyForm.vue
@@ -10,12 +10,12 @@
@@ -73,7 +73,7 @@ const formRules = reactive({
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
-const deptTree = ref() // 树形结构
+const specialtyTree = ref() // 树形结构
const userList = ref([]) // 用户列表
/** 打开弹窗 */
@@ -142,10 +142,10 @@ const resetForm = () => {
/** 获得专业-课程-题型树 */
const getTree = async () => {
- deptTree.value = []
+ specialtyTree.value = []
const data = await SpecialtyApi.getSpecialtyPage()
let dept: Tree = { id: 0, name: '专业-课程-题型', children: [] }
dept.children = handleTree(data)
- deptTree.value.push(dept)
+ specialtyTree.value.push(dept)
}
diff --git a/src/views/system/tenant/Demo03CourseForm.vue b/src/views/system/tenant/Demo03CourseForm.vue
new file mode 100644
index 0000000..138cfda
--- /dev/null
+++ b/src/views/system/tenant/Demo03CourseForm.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ —
+
+
+
+
+
+ + 添加课程
+
+
+
diff --git a/src/views/system/tenant/TenantForm.vue b/src/views/system/tenant/TenantForm.vue
index 205a2cf..1a4dff9 100644
--- a/src/views/system/tenant/TenantForm.vue
+++ b/src/views/system/tenant/TenantForm.vue
@@ -69,6 +69,12 @@
+
+
+
+
+
+
确 定
取 消
@@ -80,6 +86,7 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as TenantApi from '@/api/system/tenant'
import { CommonStatusEnum } from '@/utils/constants'
import * as TenantPackageApi from '@/api/system/tenantPackage'
+import Demo03CourseForm from "@/views/system/tenant/Demo03CourseForm.vue";
defineOptions({ name: 'SystemTenantForm' })
@@ -117,6 +124,10 @@ const formRules = reactive({
const formRef = ref() // 表单 Ref
const packageList = ref([] as TenantPackageApi.TenantPackageVO[]) // 租户套餐
+/** 子表的表单 */
+const subTabsName = ref('demo03Course')
+const demo03CourseFormRef = ref()
+
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
@@ -144,10 +155,20 @@ const submitForm = async () => {
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
+ // 校验子表单
+ // 校验子表单
+ try {
+ await demo03CourseFormRef.value.validate()
+ } catch (e) {
+ subTabsName.value = 'demo03Course'
+ return
+ }
// 提交请求
formLoading.value = true
try {
const data = formData.value as unknown as TenantApi.TenantVO
+ // 拼接子表的数据
+ data.tenantSpecialtyPointsVOList = demo03CourseFormRef.value.getData()
if (formType.value === 'create') {
await TenantApi.createTenant(data)
message.success(t('common.createSuccess'))