dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xyc 2025-06-19 09:28:20 +08:00
commit 827ff4994b
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/drivingSchool/StudentScoreInput/index.vue
View File

@ -69,8 +69,26 @@
</el-table-column>-->
<el-table-column label="操作" width="120" align="center" class-name="small-padding fixed-width">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" :disabled="scope.row.status === '2' && scope.row.examStatus === '1'" @click="openForm(scope.row.id, 'input')">成绩录入</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" :disabled="!(scope.row.status === '2' && scope.row.examStatus === '1')" @click="openForm(scope.row.id, 'edit')">成绩修改</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-edit" :disabled="scope.row.status === '2' && scope.row.examStatus === '1' && scope.row.examScore" @click="openForm(scope.row.id, 'input')">成绩录入</el-button>-->
<!-- <el-button size="mini" type="text" icon="el-icon-edit" :disabled="!(scope.row.status === '2' && scope.row.examStatus === '1')" @click="openForm(scope.row.id, 'edit')">成绩修改</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-edit"
:disabled="scope.row.status === '2' && scope.row.examStatus === '1' && scope.row.examScore != null"
@click="openForm(scope.row.id, 'input')"
>
成绩录入
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
:disabled="!(scope.row.status === '2' && scope.row.examStatus === '1' && scope.row.examScore != null)"
@click="openForm(scope.row.id, 'edit')"
>
成绩修改
</el-button>
<el-button
size="mini"
type="text"

5
src/views/drivingSchool/student/index.vue
View File

@ -33,7 +33,7 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="姓名" align="center" prop="name"/>
<el-table-column label="年龄" align="center" prop="age"/>
<el-table-column label="性别" align="center" prop="sex"/>
<el-table-column label="性别" align="center" prop="sex" :formatter="formatSex"/>
<el-table-column label="联系电话" align="center" prop="phone"/>
<el-table-column label="身份证号" align="center" prop="idCard"/>
<el-table-column label="工作单位" align="center" prop="workName"/>
@ -145,6 +145,9 @@ export default {
} catch {
}
},
formatSex(row, column, cellValue) {
return cellValue === '0' ? '男' : cellValue === '1' ? '女' : '未知';
},
formatChannel(row) {
const channel = this.channelList.find(item => item.value === row.source);
return channel ? channel.label : row.source; // 如果找不到则显示原值