From f17537923704270e712c323e184843390846cbe3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 17 Mar 2021 09:46:37 +0800
Subject: [PATCH] report

---
 client/src/views/supervision/report.vue | 91 +++++++++++++++++--------
 1 file changed, 63 insertions(+), 28 deletions(-)

diff --git a/client/src/views/supervision/report.vue b/client/src/views/supervision/report.vue
index 9cb65d6..aad5598 100644
--- a/client/src/views/supervision/report.vue
+++ b/client/src/views/supervision/report.vue
@@ -3,11 +3,24 @@
   <div class="app-container">
    
   
-    <el-card
+    <div
     style="margin-top: 10px"
     >
     <el-tabs v-model="activeName">
     <el-tab-pane label="待上报" name="first" lazy>
+    </el-tab-pane>
+     <el-tab-pane label="已上报" name="three" lazy>
+      </el-tab-pane>
+     <el-tab-pane label="待整改" name="secord" lazy>
+      </el-tab-pane>
+       <el-tab-pane label="已确认" name="fore" lazy>
+      </el-tab-pane>
+      
+
+    
+  </el-tabs>
+   
+</div>
      <el-table
                   v-loading="listLoading"
                   :data="recordList"
@@ -30,43 +43,52 @@
                   </el-table-column>
                   <el-table-column label="上报情况">
                     <template slot-scope="scope"
-                      >{{ scope.row.up_user }}/{{ scope.row.up_date }}</template
+                      v-if="scope.row.up_user_">{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template
                     >
                   </el-table-column>
                     <el-table-column align="center" label="操作">
                     <template slot-scope="scope">
                       <el-button
-                        v-if="scope.row.state == '待上报'"
+                        v-if="scope.row.state == '待上报' && checkPermission(['record_update'])"
                         type="primary"
-                        :disabled="!checkPermission(['record_update'])"
                         size="small"
                         @click="handleUpdate(scope)"
                         >编辑</el-button
                       >
                       <el-button
-                        v-if="scope.row.state == '已提交'"
+                        v-if="scope.row.state == '待上报' && checkPermission(['record_up'])"
+                        type="primary"
+                        size="small"
+                        @click="handleUp(scope)"
+                        >上报</el-button
+                      >
+                      <el-button
+                        v-if="scope.row.state == '已提交' && checkPermission(['record_confirm'])"
                         type="primary"
-                        :disabled="!checkPermission(['record_confirm'])"
                         size="small"
                         @click="handleConfirm(scope)"
                         >确认</el-button
                       >
                       <el-button
-                        v-if="scope.state == '已提交'"
-                        :disabled="!checkPermission(['record_reject'])"
+                        v-if="scope.state == '已提交' && checkPermission(['record_reject'])"
                         type="danger"
                         size="small"
                         @click="handleReject(scope)"
                         >驳回</el-button
                       >
+                      <el-button
+                        v-if="checkPermission(['record_view'])"
+                        size="small"
+                        @click="handleView(scope)"
+                        >查看</el-button
+                      >
                     </template>
                   </el-table-column>
                 
                 </el-table>
-
-  <el-dialog
+                  <el-dialog
       :visible.sync="dialogVisible"
-      title="初始化任务"
+      title="主动上报"
       :close-on-click-modal="false"
     >
       <taskinit ref="taskinit" @handleChose="chooseComplete"></taskinit>
@@ -74,21 +96,6 @@
     <el-drawer title="记录" :visible.sync="drawer" :with-header="false">
       <recorddo ref="recorddo" :data="data" @handleDo="handleDo" v-if="drawer"></recorddo>
     </el-drawer>
-
-    </el-tab-pane>
-     <el-tab-pane label="已上报" name="three" lazy>
-      </el-tab-pane>
-     <el-tab-pane label="待整改" name="secord" lazy>
-      </el-tab-pane>
-       <el-tab-pane label="已确认" name="fore" lazy>
-      </el-tab-pane>
-      
-
-    
-  </el-tabs>
-   
-</el-card>
-
   </div>
 </template>
 <script>
@@ -132,10 +139,38 @@ export default {
       };
       this.drawer = true;
     },
-      handleDo(data){
+    handleUp(scope) {
+      this.data = {
+        action: "up",
+        record: scope.row,
+      };
+      this.drawer = true;
+    },
+    handleDo(data){
       this.drawer = false
       this.getRecordList()
-    }
+    },
+    handleView(scope) {
+      this.data = {
+        action: "view",
+        record: scope.row,
+      };
+      this.drawer = true;
+    },
+    handleReject(scope) {
+      this.data = {
+        action: "reject",
+        record: scope.row,
+      };
+      this.drawer = true;
+    },
+    handleConfirm(scope) {
+      this.data = {
+        action: "reject",
+        record: scope.row,
+      };
+      this.drawer = true;
+    },
   },
 };
 </script>