From f4cd37a8b01e8404fb94ca02fb400ae604067d54 Mon Sep 17 00:00:00 2001
From: Lx <935448346@qq.com>
Date: Wed, 18 Jun 2025 17:23:29 +0800
Subject: [PATCH] 0618

---
 .../drivingSchool/StudentScoreInput/index.vue | 22 +++++++++++++++++--
 src/views/drivingSchool/student/index.vue     |  5 ++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/views/drivingSchool/StudentScoreInput/index.vue b/src/views/drivingSchool/StudentScoreInput/index.vue
index d7897f8..0b19200 100644
--- a/src/views/drivingSchool/StudentScoreInput/index.vue
+++ b/src/views/drivingSchool/StudentScoreInput/index.vue
@@ -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"
diff --git a/src/views/drivingSchool/student/index.vue b/src/views/drivingSchool/student/index.vue
index 6602dcc..1c0f55f 100644
--- a/src/views/drivingSchool/student/index.vue
+++ b/src/views/drivingSchool/student/index.vue
@@ -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; // 如果找不到则显示原值