From 610becb715814dcbc6dadec5d44b1b70e7630cbe Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 18 Mar 2021 10:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervision/report.vue | 11 +----------
 server/apps/supervision/views.py        |  9 +++++----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/client/src/views/supervision/report.vue b/client/src/views/supervision/report.vue
index 5930681..9e33158 100644
--- a/client/src/views/supervision/report.vue
+++ b/client/src/views/supervision/report.vue
@@ -17,7 +17,6 @@
       :props="{ key : 'id' , label: 'name' }"
     />
   <span slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
         <el-button type="primary" @click="contentup()">确认</el-button>
       
   </span>
@@ -118,13 +117,6 @@
                 </el-table>
 </el-card>
      
-                  <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"
@@ -254,10 +246,9 @@ export default {
       console.log(this.contents)
          if(this.contents.length>0){
            
-          
              createself({contents:this.contents}
         ).then((res) => {
-          alert(1)
+          this.centerDialogVisible = false
         });
         }else{
             this.$message.error('请选择清单!')
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 9f47b4b..0fcc8ba 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -122,6 +122,7 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView
     @action(methods=['get'], detail=False, perms_map = {'get':'*'})
     def todos(self, request, *args, **kwargs):
         dept = request.user.belong_dept
+        objs = Record.objects.filter(is_deleted=False, belong_dept=dept)
         toup = Record.objects.filter(is_deleted=False, belong_dept=dept, state='待上报').count()
         tozg = Record.objects.filter(is_delete=False,belong_dept=dept,state='待整改').count()
         return Response({'toup':toup, 'tozg':tozg})
@@ -132,7 +133,7 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView
         instance.save()
         return Response(status=status.HTTP_200_OK)
     
-    @action(methods=['post'], detail=False, perms_map = {'post':'record_creates'})
+    @action(methods=['post'], detail=False, perms_map = {'post':'record_createself'})
     def createself(self, request, *args, **kwargs):
         contents = request.data['contents']
         rlist = []
@@ -142,7 +143,7 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView
         Record.objects.bulk_create(rlist)
         return Response(status=status.HTTP_200_OK)
         
-    @action(methods=['put'], detail=True, perms_map = {'post':'record_up'})
+    @action(methods=['put'], detail=True, perms_map = {'put':'record_up'})
     def up(self, request, *args, **kwargs):
         """
         上报
@@ -165,7 +166,7 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView
             return Response(status=status.HTTP_200_OK)
         return Response('记录状态错误', status=status.HTTP_400_BAD_REQUEST)
     
-    @action(methods=['put'], detail=True, perms_map = {'post':'record_reject'})
+    @action(methods=['put'], detail=True, perms_map = {'put':'record_reject'})
     def reject(self, request, *args, **kwargs):
         """
         驳回
@@ -183,7 +184,7 @@ class RecordViewSet(RbacFilterSet, PageOrNot, CreateUpdateCustomMixin, ModelView
                 return Response('请填写备注', status=status.HTTP_400_BAD_REQUEST)
         return Response('记录状态错误', status=status.HTTP_400_BAD_REQUEST)
     
-    @action(methods=['put'], detail=True, perms_map = {'post':'record_confirm'})
+    @action(methods=['put'], detail=True, perms_map = {'put':'record_confirm'})
     def confirm(self, request, *args, **kwargs):
         """
         确认