diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index 4e12865..8bf106b 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -25,8 +25,8 @@ class RecordMixin(): `request.user` or `request.auth` is accessed. """ user = request.user - if request.method == 'GET': - print(json.dumps(request.query_params), request.method, request.path) + # if request.method == 'GET': + # print(json.dumps(request.query_params), request.method, request.path) class CMAViewSet(RecordMixin, ModelViewSet): """ @@ -39,7 +39,7 @@ class CMAViewSet(RecordMixin, ModelViewSet): search_fields = ['bzbh', 'bzmc', 'sszx', 'xmmc', 'glzz', 'dlmc'] filterset_fields = ['sszx', 'type', 'glzz'] ordering_fields = ['sszx', 'dlxh', 'lbxh', 'xmxh'] - ordering = ['create_time'] + ordering = ['create_time', 'xmxh'] @action(methods=['get'], detail=False,url_name='cma_group_by', perms_map = {'*':'*'}) def group(self, request, pk=None): @@ -222,7 +222,7 @@ class QualificationotherViewSet(PageOrNot,ModelViewSet): class InspectionViewSet(ModelViewSet): """ - CNAS检测能力:增删改查 + 检验能力:增删改查 """ perms_map = {'get': '*', 'post': 'inspection_create', 'put': 'inspection_update', 'delete': 'inspection_delete'} @@ -230,7 +230,7 @@ class InspectionViewSet(ModelViewSet): serializer_class = InspectionSerializer search_fields = ['dlmc', 'jydx', 'dxxh','jyxmmc','jybz','sszx','sm'] ordering_fields = ['dlmc'] - ordering = ['create_time'] + ordering = ['create_time', 'xmxh'] filterset_fields = ['sszx'] @action(methods=['post'], detail=False, url_path='deletes', url_name='inspection_deletes', perms_map = {'post':'inspection_deletes'}) def deletes(self, request):