From 03d3cefa00da632fb4208d085ca853d2a85797e0 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 17:06:18 +0800
Subject: [PATCH] 成绩管理修改

---
 src/views/trainApply/index.vue            |    2 +-
 src/views/trainExam/singleperformance.vue |    9 +++++++++
 src/views/exam/singleperformance.vue      |    9 +++++++++
 3 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/src/views/exam/singleperformance.vue b/src/views/exam/singleperformance.vue
index 2ae7205..6528b4e 100644
--- a/src/views/exam/singleperformance.vue
+++ b/src/views/exam/singleperformance.vue
@@ -30,6 +30,15 @@
             <template slot-scope="{ row }" slot="learnGrade">
               {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
             </template>
+            <template slot-scope="{ row }" slot="theoryGrade">
+              {{ row.learnGrade == -1 ? "" : row.theoryGrade }}
+            </template>
+            <template slot-scope="{ row }" slot="allGrade">
+              {{ row.learnGrade == -1 ? "" : row.allGrade }}
+            </template>
+            <template slot-scope="{ row }" slot="qualified">
+              {{ row.learnGrade == -1 ? "" : row.qualified == 0?"合格":row.qualified==1?"不合格":'' }}
+            </template>
 
             <template slot-scope="{ row }" slot="menu">
               <el-button
diff --git a/src/views/trainApply/index.vue b/src/views/trainApply/index.vue
index f5bc5e0..758fc16 100644
--- a/src/views/trainApply/index.vue
+++ b/src/views/trainApply/index.vue
@@ -63,7 +63,7 @@
                             :type="type"
                             size="small"
                             icon="el-icon-receiving"
-                            :disabled="row.cancel==2"
+                            :disabled="row.candidateNo==''"
                             @click="handlePrint(row)"
                             >准考证打印
                             </el-button>
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index 1489bdb..f972c91 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -30,6 +30,15 @@
             <template slot-scope="{ row }" slot="learnGrade">
               {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
             </template>
+            <template slot-scope="{ row }" slot="theoryGrade">
+              {{ row.learnGrade == -1 ? "" : row.theoryGrade }}
+            </template>
+            <template slot-scope="{ row }" slot="allGrade">
+              {{ row.learnGrade == -1 ? "" : row.allGrade }}
+            </template>
+            <template slot-scope="{ row }" slot="qualified">
+              {{ row.learnGrade == -1 ? "" : row.qualified == 0?"合格":row.qualified==1?"不合格":'' }}
+            </template>
 
             <template slot-scope="{ row }" slot="menu">
               <el-button

--
Gitblit v1.9.3