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

@@ -46,9 +46,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>
@@ -57,9 +57,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>
@@ -411,7 +411,7 @@
<br/>
<div v-if="scope.row.auditStatus==20">
录取专业:
{{ getMajorLabelWithYears(planMajorList, scope.row.confirmedMajor, { key: 'zydm', value: 'zymc' }) }}<br/>
{{ getMajorLabelWithYears(planMajorList, scope.row.confirmedMajor, { key: 'majorCode', value: 'majorName' }) }}<br/>
</div>
<div v-if="scope.row.auditStatus==20">
录取时间:{{ dateFormat(scope.row.auditTime, "yyyy-MM-dd HH:mm:ss") }}