From 507a09de1c7860ee81825ee7719fbb1b89f9014e Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 17 Mar 2021 09:25:16 +0800
Subject: [PATCH] cailiaobaosong

---
 client/src/views/supervision/record.vue |   2 +-
 client/src/views/supervision/report.vue | 150 +++++++++++++++++-------
 server/apps/supervision/filters.py      |   4 +-
 3 files changed, 111 insertions(+), 45 deletions(-)

diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue
index b4c6a13..48408e7 100644
--- a/client/src/views/supervision/record.vue
+++ b/client/src/views/supervision/record.vue
@@ -100,7 +100,7 @@
       </el-table-column>
        
          <el-table-column label="上报单位">
-        <template slot-scope="scope">{{ scope.row.dept_.name }}</template>
+        <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>
diff --git a/client/src/views/supervision/report.vue b/client/src/views/supervision/report.vue
index 47372a2..9cb65d6 100644
--- a/client/src/views/supervision/report.vue
+++ b/client/src/views/supervision/report.vue
@@ -2,46 +2,79 @@
 
   <div class="app-container">
    
-   <div>
-            <el-input
-              placeholder="材料名称"
-              style="width: 200px"
-              class="filter-item"
-            />
-             <el-input
-              placeholder="上报时间"
-              style="width: 200px"
-              class="filter-item"
-            />
-             <el-input
-              placeholder="记录状态"
-              style="width: 200px"
-              class="filter-item"
-            />
-             <el-input
-              placeholder="所属部门"
-              style="width: 200px"
-              class="filter-item"
-            />
-            <el-button
-              class="filter-item"
-              type="primary"
-              icon="el-icon-search"
-              >搜索</el-button
-            >
-            <el-button
-              class="filter-item"
-              style="margin-left: 10px"
-              type="primary"
-              icon="el-icon-refresh-left"
-              >刷新重置</el-button
-            >
-          </div>
+  
     <el-card
     style="margin-top: 10px"
     >
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName">
     <el-tab-pane label="待上报" name="first" lazy>
+     <el-table
+                  v-loading="listLoading"
+                  :data="recordList"
+                  border
+                  fit
+                  stripe
+                  highlight-current-row
+                  max-height="600px"
+                >
+                  <el-table-column label="序号" type="index" align="center" />
+                  <el-table-column label="单位">
+                    <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"
+                      >{{ scope.row.up_user }}/{{ 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 == '待上报'"
+                        type="primary"
+                        :disabled="!checkPermission(['record_update'])"
+                        size="small"
+                        @click="handleUpdate(scope)"
+                        >编辑</el-button
+                      >
+                      <el-button
+                        v-if="scope.row.state == '已提交'"
+                        type="primary"
+                        :disabled="!checkPermission(['record_confirm'])"
+                        size="small"
+                        @click="handleConfirm(scope)"
+                        >确认</el-button
+                      >
+                      <el-button
+                        v-if="scope.state == '已提交'"
+                        :disabled="!checkPermission(['record_reject'])"
+                        type="danger"
+                        size="small"
+                        @click="handleReject(scope)"
+                        >驳回</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                
+                </el-table>
+
+  <el-dialog
+      :visible.sync="dialogVisible"
+      title="初始化任务"
+      :close-on-click-modal="false"
+    >
+      <taskinit ref="taskinit" @handleChose="chooseComplete"></taskinit>
+    </el-dialog>
+    <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>
@@ -55,21 +88,54 @@
   </el-tabs>
    
 </el-card>
+
   </div>
 </template>
 <script>
-import Recorddo from "@/views/supervision/recorddo"
+
+
+import { getRecordList } from "@/api/record";
+import Pagination from "@/components/Pagination";
+import taskinit from "@/views/supervision/taskinit";
+import checkPermission from "@/utils/permission";
+import recorddo from "@/views/supervision/recorddo";
 export default {
-  components: { Recorddo },
+  components: { Pagination, taskinit, recorddo },
   data() {
     return {
+      dialogVisible: false,
+      activeName: "first",
+      contents: [],
+      depts: [],
+      listLoading: false,
+      recordList: [],
+      now: {},
+      drawer: false,
     };
   },
-  computed: {},
+  created() {
+    this.getRecordList();
+  },
   methods: {
-   
-   
-    
+   checkPermission,
+    getRecordList(){
+      
+      getRecordList().then((res) => {
+        this.listLoading = false;
+        this.recordList = res.data.results;
+      });
+    },
+    handleUpdate(scope) {
+      this.data = {
+        action: "update",
+        record: scope.row,
+      };
+      this.drawer = true;
+    },
+      handleDo(data){
+      this.drawer = false
+      this.getRecordList()
+    }
   },
 };
 </script>
diff --git a/server/apps/supervision/filters.py b/server/apps/supervision/filters.py
index 27e768e..b3416b7 100644
--- a/server/apps/supervision/filters.py
+++ b/server/apps/supervision/filters.py
@@ -6,8 +6,8 @@ class RecordFilter(filters.FilterSet):
     date_lt = filters.DateFilter(field_name='up_date',lookup_expr="lt")
     date_gt = filters.DateFilter(field_name='up_date',lookup_expr="gt")
     belong_dept=filters.NumberFilter(field_name='belong_dept')
-    content_name = filters.CharFilter(field_name='content',lookup_expr='icontains')
+    content_name = filters.CharFilter(field_name='content__name')
     state = filters.CharFilter(field_name='state',lookup_expr='icontains')
     class Meta:
         model = Record
-        fields = ['up_date','content','belong_dept','state', 'task']
+        fields = ['up_date','content__name','belong_dept','state', 'task']