|
@@ -185,7 +185,7 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="学年" prop="academicYear" width="180">
|
|
<el-table-column label="学年" prop="academicYear" width="180">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.academicYear?scope.row.academicYear:'-'}}
|
|
|
|
|
|
|
+ {{scope.row.gradeNumber?scope.row.gradeNumber:'-'}}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" width="140" align="center" v-if="!showType">
|
|
<el-table-column label="操作" width="140" align="center" v-if="!showType">
|
|
@@ -212,9 +212,9 @@
|
|
|
{{scope.row.account?scope.row.account:'-'}}
|
|
{{scope.row.account?scope.row.account:'-'}}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="专业" prop="disciplineName" width="200">
|
|
|
|
|
|
|
+ <el-table-column label="专业" prop="majorName" width="200">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.disciplineName?scope.row.disciplineName:'-'}}
|
|
|
|
|
|
|
+ {{scope.row.majorName?scope.row.majorName:'-'}}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="学院" prop="deptName" width="180">
|
|
<el-table-column label="学院" prop="deptName" width="180">
|
|
@@ -222,7 +222,7 @@
|
|
|
{{scope.row.deptName?scope.row.deptName:'-'}}
|
|
{{scope.row.deptName?scope.row.deptName:'-'}}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="学年" prop="academicYear" width="180">
|
|
|
|
|
|
|
+ <el-table-column label="学年" prop="gradeNumber" width="180">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
{{scope.row.academicYear?scope.row.academicYear:'-'}}
|
|
{{scope.row.academicYear?scope.row.academicYear:'-'}}
|
|
|
</template>
|
|
</template>
|