Ver código fonte

更新进度

wushaodong 4 anos atrás
pai
commit
89b91c6cff
3 arquivos alterados com 13 adições e 8 exclusões
  1. 6 6
      apps/customer/views.py
  2. 5 0
      apps/order/views.py
  3. 2 2
      uis/views/order/index.html

+ 6 - 6
apps/customer/views.py

@@ -157,11 +157,6 @@ class NewCustomerViewSet(CustomModelViewSet):
         f = NewCustomerFilter(self.request.GET, queryset=queryset)
         return f.qs
 
-    def perform_update(self, serializer):
-        super(NewCustomerViewSet, self).perform_update(serializer)
-        instance = serializer.instance
-        validated_data = serializer.validated_data
-
     def paginate_queryset(self, queryset):
         if self.paginator is None or self.request.GET.get('export'):
             return None
@@ -261,7 +256,12 @@ class NewCustomerViewSet(CustomModelViewSet):
                     projects = instance.project.all()
                     for project in projects:
                         ser.project.add(project.id)
-                # TODO 订单流程
+                # TODO 创建订单流程,保存图片
+                for i in range(6):
+                    print(33333333, i)
+                    file = request.data.get('file{}'.format(i))
+                    print(22222222222, file)
+
         except ValidationError as e:
             traceback.print_exc()
             return response_error('数据格式有误')

+ 5 - 0
apps/order/views.py

@@ -56,3 +56,8 @@ class OrderViewSet(CustomModelViewSet):
         queryset = queryset.filter()
         f = OrderFilter(self.request.GET, queryset=queryset)
         return f.qs
+
+    def paginate_queryset(self, queryset):
+        if self.paginator is None or self.request.GET.get('export'):
+            return None
+        return self.paginator.paginate_queryset(queryset, self.request, view=self)

+ 2 - 2
uis/views/order/index.html

@@ -131,16 +131,16 @@
             elem: '#order_datagrid'
             , url: '/order/'
             , cols: [[
-                {field: 'no', title: '单号', width: 110}
+                {field: 'no', title: '单号', width: 180}
                 , {field: 'name', title: '客户名称', width: 110}
                 , {field: 'tel', title: '客户电话', width: 120}
                 , {field: 'address', title: '地址', width: 200}
                 , {field: 'village', title: '小区', width: 200}
                 , {field: 'project_text', title: '项目', width: 120}
+                , {field: 'status_text', title: "订单状态", width: 150}
                 , {field: 'stage_progress_text', title: '当前进度', width: 100}
                 , {field: 'service_user_text', title: '服务人员', width: 150}
                 , {field: 'create_time_f', title: "下单时间", width: 150}
-                , {field: 'status_text', title: "订单状态", width: 150}
                 , {width: 150, align: 'center', fixed: 'right', toolbar: '#order-operate-bar'}
             ]]
             , page: true