Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-08-17 b1ce8351ff501e333e63f696a51e24f61eaf2cf5

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

 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

 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>

 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