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' }"
/>
@@ -118,13 +117,6 @@
-
-
-
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):
"""
确认