Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/decorate

apps/customer/views.py

@@ -261,15 +261,14 @@ class NewCustomerViewSet(CustomModelViewSet):
                     projects = instance.project.all()
                     for project in projects:
                         ser.project.add(project.id)
-                # TODO 创建订单流程,保存图片
+                # 创建订单流程,保存图片
                 user = self.request.user
                 operation = u'更新进度为：{}'.format(order.stage_progress.name)
                 progress_details = ProgressDetails.objects.create(order=order, user=user, operation=operation, notes=notes)
-
                 for i in range(6):
                     file = request.data.get('file{}'.format(i))
                     if file:
-                        upload = Upload.objects._addnew(user.store, progress_details, user, file)
+                        upload = Upload.objects._addnew(instance.store, progress_details, user, file)
                         if not upload:
                             return response_error('上传失败，请重新上传！')
 

apps/order/serializers.py

@@ -27,10 +27,9 @@ class OrderSerializer(serializers.ModelSerializer):
 
 class ProgressDetailsSerializer(serializers.ModelSerializer):
     user_text = serializers.CharField(source='user.name', read_only=True)
-    operation_time_f = serializers.DateTimeField(source='create_time', format=settings.SHORT_DATETIME_FORMAT,
+    operation_time_f = serializers.DateTimeField(source='operation_time', format=settings.SHORT_DATETIME_FORMAT,
                                                  read_only=True)
 
-
     class Meta:
         model = ProgressDetails
         fields = '__all__'

uis/views/order/detail.html

@@ -85,7 +85,7 @@
             , table = layui.table
             , laytpl = layui.laytpl
 
-        var id = layui.view.getParameterByName('id');
+        var order_id = layui.view.getParameterByName('order_id');
         editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
         var data = editdata;
         var getTpl = demo.innerHTML
@@ -95,10 +95,10 @@
         });
         table.render({
             elem: '#customer_datagrid'
-            , url: '/order/get_details/?order_id=' + id
+            , url: '/order/get_details/?order_id=' + order_id
             , cols: [[
                 {field: 'operation', title: "操作", width: 200}
-                , {field: 'operation_time', title: '操作时间', width: 150}
+                , {field: 'operation_time_f', title: '操作时间', width: 150}
                 , {field: 'notes', title: '备注', width: 200}
                 , {field: 'user_text', title: '操作人', width: 120}
                 , {width: 100, align: 'center', fixed: 'right', toolbar: '#customer-operate-bar'}
@@ -119,7 +119,7 @@
                     btn1: function (index, layero) {
                         layer.close(index);//关闭当前按钮
                     },
-                    content: 'imgsInfo.html?progress_details_id=' + data.progress_details_id
+                    content: 'imgsInfo.html?id=' + data.id
                 });
             }
         });

uis/views/order/imgsInfo.html

@@ -56,11 +56,11 @@
             , admin = layui.admin
             , formSelects = layui.formSelects
             , form = layui.form;
-        var progress_details_id = layui.view.getParameterByName('progress_details_id');
+        var id = layui.view.getParameterByName('id');
 
         table.render({
             elem: '#customer_datagrid_imgs'
-            , url: '/order/get_files/?progeree_details_id=' + progress_details_id
+            , url: '/order/get_files/?id=' + id
             , cols: [[
                 {field: 'create_time_f', title: "上传时间", width: 220}
                 , {field: 'file_size', title: '文件大小', width: 120}
@@ -74,7 +74,7 @@
             var data = obj.data;
             if (obj.event === 'order_search') {
                 var newPage=window.open();
-                newPage.document.write("<img src="+data.url+" />")
+                newPage.document.write("<img src="+data.picture+" />")
             }
         });
     });

uis/views/order/index.html

@@ -179,7 +179,7 @@
                 btn1: function (index, layero) {
                     layer.close(index);//关闭当前按钮
                 },
-                content: 'detail.html?id=' + data.id
+                content: 'detail.html?order_id=' + data.id
             });
             }else if(obj.event === "order_update"){
                 // 更新进度