Sfoglia il codice sorgente

小程序派单,消息

wushaodong 4 anni fa
parent
commit
4ab05e6980

+ 1 - 2
apps/tenant/inspection_order/views.py

@@ -4,7 +4,7 @@ from rest_framework.decorators import action
 from utils import response_error, response_ok
 from utils.custom_modelviewset import CustomModelViewSet
 from utils.exceptions import CustomError
-from utils.permission import IsTenantUser, permission_required
+from utils.permission import IsTenantUser
 from .models import InspectionOrder
 from .filters import InspectionOrderFilter
 from .serializers import InspectionOrderSerializer
@@ -15,7 +15,6 @@ class InspectionOrderViewSet(CustomModelViewSet):
     queryset = InspectionOrder.objects.filter()
     serializer_class = InspectionOrderSerializer
 
-    @permission_required('inspection_order.browse_inspection_order')
     def filter_queryset(self, queryset):
         queryset = queryset.filter(tenant=self.request.user.employee.tenant)
         f = InspectionOrderFilter(self.request.GET, queryset=queryset)

+ 0 - 1
apps/wxapp/inspection_order/views.py

@@ -12,7 +12,6 @@ from apps.upload.models import Upload
 from .serializers import InspectionOrderSerializer, InspectionOrderListSerializer, InspectionOrderDetailSerializer
 from apps.log.models import BizLog
 from apps.tenant import tenant_log
-from utils.permission import IsTenantUser, permission_required
 
 
 class InspectionOrderDetailView(generics.RetrieveAPIView):

+ 2 - 2
apps/wxapp/repair_order/views.py

@@ -7,7 +7,7 @@ from rest_framework.decorators import action
 from utils import response_ok, response_error
 from utils.custom_modelviewset import CustomModelViewSet
 from utils.exceptions import CustomError
-from utils.permission import IsTenantUser, permission_required, isLogin, IsEmployee
+from utils.permission import isLogin, IsEmployee
 from apps.tenant.repair_order.models import RepairOrder, RepairOrderRecord, RepairOrderComment, RepairOrderFinish
 from apps.tenant.repair_order.filters import RepairOrderFilter
 from apps.upload.models import Upload
@@ -51,7 +51,7 @@ class RepairOrderCountView(APIView):
             })
         queryset = RepairOrder.objects.filter(delete=False, tenant=self.request.user.employee.tenant)
         return response_ok({
-            'NOT_CHECKED_COUNT': queryset.filter(status=settings.NOT_CHECKED).count(),
+            'NOT_CHECKED_COUNT': queryset.filter(status__lte=settings.CHECKED).count(),
             'CHECKED_COUNT': queryset.filter(status=settings.CHECKED).count()
         })
 

+ 1 - 1
uis/tenant/banner/index.html

@@ -108,7 +108,7 @@
             elem: '#datagrid'
             , url: '/tenant/poster/'
             , cols: [[
-                {field: 'title', title: '标题', width: 100}
+                {field: 'title', title: '标题', width: 150}
                 ,{field: 'content', title: '内容', width: 280}
                 ,{field: 'location_text', title: '位置', width: 100}
                 ,{field: 'create_user_name', title: '添加人', width: 100}