From e76bf592632323d67958eff6ff77925a4b4f559c Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Mon, 25 May 2020 02:02:25 +0800
Subject: [PATCH] =?UTF-8?q?[feat][V]:=E5=AE=8C=E5=96=84=E5=B9=B6=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/teacher/myApplyRecord.vue       | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/element-vue/src/pages/teacher/myApplyRecord.vue b/element-vue/src/pages/teacher/myApplyRecord.vue
index 0996d19..e6a316c 100644
--- a/element-vue/src/pages/teacher/myApplyRecord.vue
+++ b/element-vue/src/pages/teacher/myApplyRecord.vue
@@ -12,12 +12,27 @@
                 </el-header>
                 <el-table :data="tableData" border ref="mar" height="500px">
                     <el-table-column prop="position" label="实验室地点"></el-table-column>
-                    <el-table-column prop="name" label="实验室名称"></el-table-column>
-                    <el-table-column prop="class" label="授课班级"></el-table-column>
+                    <el-table-column prop="lab_name" label="实验室名称"></el-table-column>
+                    <el-table-column prop="classes" label="授课班级"></el-table-column>
                     <el-table-column prop="population" label="人数"></el-table-column>
                     <el-table-column prop="course_name" label="课程名称"></el-table-column>
-                    <el-table-column prop="course_name" label="申请时间段"></el-table-column>
-                    <el-table-column prop="status" label="状态"></el-table-column>
+                    <el-table-column label="申请时间段" align="center">
+                        <template slot-scope="scope">
+                            {{parseInt(scope.row.year)}}-{{parseInt(scope.row.year)+1}}学年<br>
+                            第{{scope.row.semester}}学期<br>
+                            周{{scope.row.day}}第{{scope.row.time}}节课<br>
+                            共{{scope.row.week}}周
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status" label="状态" align="center">
+                        <template slot-scope="scope">
+                            <el-tag
+                                    :type="scope.row.status === 0 ? 'primary' : scope.row.status ===2 ? 'success': 'warning'" disable-transitions>
+                                {{scope.row.status ===0 ? '正在审核' :
+                                scope.row.status ===2 ? '审核通过': '审核失败'}}
+                            </el-tag>
+                        </template>
+                    </el-table-column>
                 </el-table>
             </el-main>