瀏覽代碼

检修单详情

hujingpei 4 年之前
父節點
當前提交
4e9abb0c39
共有 3 個文件被更改,包括 12 次插入6 次删除
  1. 3 3
      apps/wxapp/inspection_order/urls.py
  2. 8 1
      apps/wxapp/inspection_order/views.py
  3. 1 2
      apps/wxapp/repair_order/urls.py

+ 3 - 3
apps/wxapp/inspection_order/urls.py

@@ -2,11 +2,11 @@
 from django.conf.urls import url
 from rest_framework.routers import SimpleRouter
 
-from .views import InspectionOrderViewSet, InspectionOrderAllView, InspectionOrderDetailView
+from .views import InspectionOrderViewSet, InspectionOrderAllView
 
 urlpatterns = [
-    url(r'^all/$', InspectionOrderAllView.as_view()),  #
-    url(r'^(?P<pk>[0-9]+)/$', InspectionOrderDetailView.as_view()),
+    url(r'^all/$', InspectionOrderAllView.as_view()),
+    # url(r'^(?P<pk>[0-9]+)/$', InspectionOrderDetailView.as_view()),
 ]
 
 router = SimpleRouter()

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

@@ -9,12 +9,13 @@ from utils.permission import IsTenantUser, isLogin
 from apps.tenant.inspection_order.models import InspectionOrder
 from apps.tenant.inspection_order.filters import InspectionOrderFilter
 from apps.upload.models import Upload
-from .serializers import InspectionOrderSerializer, InspectionOrderListSerializer, InspectionOrderDetailSerializer
+from .serializers import InspectionOrderSerializer, InspectionOrderListSerializer,InspectionOrderDetailSerializer
 from apps.log.models import BizLog
 from apps.tenant import tenant_log
 
 
 class InspectionOrderDetailView(generics.RetrieveAPIView):
+    # 检修工单详情,已不用。
     permission_classes = [isLogin, ]
     queryset = InspectionOrder.objects.filter()
     serializer_class = InspectionOrderDetailSerializer
@@ -50,6 +51,12 @@ class InspectionOrderViewSet(CustomModelViewSet):
         f = InspectionOrderFilter(self.request.GET, queryset=queryset)
         return f.qs
 
+    def retrieve(self, request, *args, **kwargs):
+        # 巡检工单详情
+        instance = self.get_object()
+        serializer = InspectionOrderDetailSerializer(instance)
+        return response_ok(serializer.data)
+
     def perform_create(self, serializer):
         super(InspectionOrderViewSet, self).perform_create(serializer)
         instance = serializer.instance

+ 1 - 2
apps/wxapp/repair_order/urls.py

@@ -2,8 +2,7 @@
 from django.conf.urls import url
 from rest_framework.routers import SimpleRouter
 
-from .views import RepairOrderViewSet, DispatchRepairOrderView, RepairOrderAllView, RepairOrderDetailView, \
-    RepairOrderMineView, RepairOrderCountView
+from .views import RepairOrderViewSet, DispatchRepairOrderView, RepairOrderAllView, RepairOrderMineView, RepairOrderCountView
 
 urlpatterns = [
     url(r'^dispatch/$', DispatchRepairOrderView.as_view()),  # 我的派单