This commit is contained in:
zhoutianchi
2026-01-15 11:23:00 +08:00
parent f8b618a13a
commit 8bdd7985d3
24 changed files with 215 additions and 212 deletions

View File

@@ -40,10 +40,10 @@
<el-select v-model="dataForm.wishMajorOne" filterable placeholder="请选择拟报专业1" size="small" style="width: 100%">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' | '+item.xz+'年 | '+item.zydm"
:value="item.zydm"
:disabled="isDisable(item.zydm)"
:key="item.majorCode"
:label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode"
:value="item.majorCode"
:disabled="isDisable(item.majorCode)"
>
</el-option>
</el-select>
@@ -52,10 +52,10 @@
<el-select v-model="dataForm.wishMajorTwo" filterable placeholder="请选择拟报专业2" size="small" style="width: 100%">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' | '+item.xz+'年 | '+item.zydm"
:value="item.zydm"
:disabled="isDisable(item.zydm)"
:key="item.majorCode"
:label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode"
:value="item.majorCode"
:disabled="isDisable(item.majorCode)"
>
</el-option>
</el-select>
@@ -64,10 +64,10 @@
<el-select v-model="dataForm.wishMajorThree" filterable placeholder="请选择拟报专业3" size="small" style="width: 100%">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' | '+item.xz+'年 | '+item.zydm"
:value="item.zydm"
:disabled="isDisable(item.zydm)"
:key="item.majorCode"
:label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode"
:value="item.majorCode"
:disabled="isDisable(item.majorCode)"
>
</el-option>
</el-select>
@@ -76,9 +76,9 @@
<el-select v-model="dataForm.confirmedMajor" filterable placeholder="请选择录取专业" size="small" style="width: 100%">
<el-option
v-for="item in planMajorEduList"
:key="item.zydm"
:label="item.zymc+' | '+item.xz+'年 | '+item.zydm"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' | '+item.learnYear+'年 | '+item.majorCode"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -151,10 +151,10 @@ const dataRule = {
/**
* 判断拟报专业是否已经占用,占用不可选
*/
const isDisable = (zydm: string) => {
if (zydm == dataForm.wishMajorOne
|| zydm == dataForm.wishMajorTwo
|| zydm == dataForm.wishMajorThree
const isDisable = (majorCode: string) => {
if (majorCode == dataForm.wishMajorOne
|| majorCode == dataForm.wishMajorTwo
|| majorCode == dataForm.wishMajorThree
) {
return true
} else {
@@ -262,7 +262,7 @@ const dataFormSubmit = () => {
// 初始化方法
const init = (id: string | null, groupId: string, batchNo: string) => {
dataForm.id = id || ""
dataForm.id = id || null
dataForm.batchNo = batchNo
dataForm.groupId = groupId
visible.value = true