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

@@ -34,9 +34,9 @@
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="请选择录取专业" size="small" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+'('+item.xz+'年制)'"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+'('+item.learnYear+'年制)'"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -45,9 +45,9 @@
<el-select v-model="dataForm.wishMajorOne" filterable clearable placeholder="请选择录取专业" size="small" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+'('+item.xz+'年制)'"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+'('+item.learnYear+'年制)'"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -245,7 +245,7 @@
align="center"
label="录取专业">
<template #default="scope" >
<span v-if="scope.row.auditStatus==20">{{getLabelValueByPropes2(planMajorList,scope.row.confirmedMajor,{'key':'zydm','value':'zymc'})}}</span>
<span v-if="scope.row.auditStatus==20">{{getLabelValueByPropes2(planMajorList,scope.row.confirmedMajor,{'key':'majorCode','value':'majorName'})}}</span>
</template>
</el-table-column>
<el-table-column