From b8ebb0a049fce418ec99408b6b3303ea6e412870 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 18 Mar 2021 11:05:31 +0800
Subject: [PATCH] tijiaoziliao

---
 client/src/views/supervision/record.vue | 18 ++++++++++++------
 client/src/views/supervision/report.vue |  9 ++++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue
index f4e5313..46248c1 100644
--- a/client/src/views/supervision/record.vue
+++ b/client/src/views/supervision/record.vue
@@ -85,7 +85,7 @@
         <template  slot-scope="scope" >{{ scope.row.up_date }}</template>
       </el-table-column>
       <el-table-column label="上报人" >
-        <template slot-scope="scope">{{ scope.row.up_user }}</template>
+        <template slot-scope="scope" v-if="scope.row.up_user">{{ scope.row.up_user_.name }}</template>
       </el-table-column>
       <el-table-column  sortable label="截止时间">
         <template slot-scope="scope">{{ scope.row.end_date }}</template>
@@ -103,12 +103,18 @@
         <template slot-scope="scope" >{{ scope.row.belong_dept_.name }}</template>
       </el-table-column>
        <el-table-column label="记录状态">
-        <template slot-scope="scope">{{ scope.row.state }}</template>
-      </el-table-column>
-       <el-table-column label="是否适用">
         <template slot-scope="scope">
-           <el-tag type="success" v-if="scope.row.is_yes">是</el-tag>
-          <el-tag type="danger" v-else>否</el-tag></template>
+                      <el-tag type="danger" v-if="scope.row.state == '待上报'">{{ scope.row.state }}</el-tag>
+                      <el-tag type="warning" v-else-if="scope.row.state == '待整改'">{{ scope.row.state }}</el-tag>
+                      <el-tag type="success" v-else-if="scope.row.state == '已确认'">{{ scope.row.state }}</el-tag>
+                      <el-tag v-else-if="scope.row.state == '已上报'">{{ scope.row.state }}</el-tag>
+                    </template>
+      </el-table-column>
+       <el-table-column label="上报文件">
+         
+        <template slot-scope="scope" v-if="scope.row.files">
+           <el-link v-if="scope.row.files.length>1">有{{scope.row.files.length}}个文件</el-link>
+       </template>
       </el-table-column>
     </el-table>
      <pagination
diff --git a/client/src/views/supervision/report.vue b/client/src/views/supervision/report.vue
index 9e33158..a788f56 100644
--- a/client/src/views/supervision/report.vue
+++ b/client/src/views/supervision/report.vue
@@ -66,9 +66,12 @@
                     }}</template>
                   </el-table-column>
                   <el-table-column label="状态">
-                    <template slot-scope="scope">{{
-                      scope.row.state
-                    }}</template>
+                  <template slot-scope="scope">
+                      <el-tag type="danger" v-if="scope.row.state == '待上报'">{{ scope.row.state }}</el-tag>
+                      <el-tag type="warning" v-else-if="scope.row.state == '待整改'">{{ scope.row.state }}</el-tag>
+                      <el-tag type="success" v-else-if="scope.row.state == '已确认'">{{ scope.row.state }}</el-tag>
+                      <el-tag v-else-if="scope.row.state == '已上报'">{{ scope.row.state }}</el-tag>
+                    </template>
                   </el-table-column>
                   <el-table-column label="上报情况">
                     <template slot-scope="scope"