diff --git a/apps/mtm/views.py b/apps/mtm/views.py index 0c6c4abd..ab416985 100644 --- a/apps/mtm/views.py +++ b/apps/mtm/views.py @@ -6,7 +6,7 @@ from apps.mtm.models import Material, Mgroup, Shift, Team from apps.mtm.serializers import MaterialSerializer, MgroupSerializer, ShiftSerializer, TeamSerializer # Create your views here. -class MaterialViewSet(ListModelMixin, CustomGenericViewSet): +class MaterialViewSet(CustomModelViewSet): """ list:产品 @@ -25,6 +25,7 @@ class ShiftViewSet(ListModelMixin, CustomGenericViewSet): 班次 """ + perms_map = {'get': '*'} queryset = Shift.objects.all() serializer_class = ShiftSerializer search_fields = ['name'] diff --git a/apps/qm/admin.py b/apps/qm/admin.py index 8c38f3f3..5b55e21b 100644 --- a/apps/qm/admin.py +++ b/apps/qm/admin.py @@ -1,3 +1,7 @@ from django.contrib import admin - +from apps.qm.models import TestItem # Register your models here. +@admin.register(TestItem) +class TestItemAdmin(admin.ModelAdmin): + date_hierarchy = 'create_time' + list_display = ('id', 'name') \ No newline at end of file diff --git a/apps/qm/views.py b/apps/qm/views.py index 76233863..e8595feb 100644 --- a/apps/qm/views.py +++ b/apps/qm/views.py @@ -15,6 +15,7 @@ class TestItemViewSet(ListModelMixin, CustomGenericViewSet): 质检项目 """ + perms_map = {'get': '*'} queryset = TestItem.objects.all() serializer_class = TestItemSerializer filterset_fields = [] @@ -26,6 +27,7 @@ class QuaStatViewSet(ListModelMixin, CreateModelMixin, CustomGenericViewSet): 质量分析报告 """ + perms_map = {'get': '*', 'post': 'quastat.create'} queryset = QuaStat.objects.all() serializer_class = QuaStatSerializer filterset_fields = ['type', 'year', 'month', 'day', 'material', 'testitem', 'belong_dept', 'sflog'] @@ -45,5 +47,6 @@ class QuaStatSfLogViewSet(CreateModelMixin, CustomGenericViewSet): 值班-质量分析 """ + perms_map = {'get': '*', 'post': 'quastat.create'} queryset = QuaStat.objects.all() serializer_class = QuaStatSfLogSerializer \ No newline at end of file diff --git a/apps/utils/viewsets.py b/apps/utils/viewsets.py index af0b24c8..3afb66ec 100755 --- a/apps/utils/viewsets.py +++ b/apps/utils/viewsets.py @@ -24,7 +24,7 @@ class CustomGenericViewSet(MyLoggingMixin, GenericViewSet): """ 增强的GenericViewSet """ - perms_map = {} # 权限标识 + perms_map = {'get': '*'} # 权限标识 throttle_classes = [UserRateThrottle] logging_methods = ['POST', 'PUT', 'PATCH', 'DELETE'] ordering_fields = '__all__' diff --git a/apps/wpm/views.py b/apps/wpm/views.py index c9748fcb..2f69f998 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -16,6 +16,7 @@ class StLogViewSet(ListModelMixin, CustomGenericViewSet): 停机记录 """ + perms_map = {'get': '*'} queryset = StLog.objects.all() serializer_class = StLogSerializer select_related_fields = ['mgroup'] @@ -59,6 +60,7 @@ class StSfLogViewSet(ListModelMixin, UpdateModelMixin, CustomGenericViewSet): 值班停机关系 """ + perms_map = {'get': '*', 'put': 'sflog.update'} queryset = StSfLog.objects.all() serializer_class = StSfLogSerializer select_related_fields = ['stlog', 'sflog']