lyh 1 год назад
Родитель
Сommit
bcd1964d6f

+ 7 - 0
apps/images/models.py

@@ -110,6 +110,13 @@ class Images(models.Model):
     def get_path(self):
         return '%s%s%s' % (settings.SERVER_DOMAIN, settings.MEDIA_URL, self.picture)
 
+    @staticmethod
+    def batch_remove(ids):
+        for id in ids:
+            instance = Images.objects.filter(id=id).first()
+            if instance:
+                instance.del_images()
+
     # @staticmethod
     # def downLoadFace(customer, url):
     #     save_path = customer_face_file + str(customer.user.id) + '/'

+ 1 - 1
apps/usedvehicle/models.py

@@ -44,7 +44,7 @@ class UsedVehicle(models.Model):
 
 class UsedVehicleImg(models.Model):
     main = models.ForeignKey(UsedVehicle, verbose_name=u'车型', on_delete=models.PROTECT)
-    img = models.ForeignKey(Images, verbose_name=u'图片', on_delete=models.PROTECT)
+    img = models.ForeignKey(Images, verbose_name=u'图片', on_delete=models.PROTECT, blank=True, null=True)
 
     class Meta:
         db_table = 'usedvehicle_img'

+ 13 - 2
apps/usedvehicle/views.py

@@ -38,8 +38,19 @@ class UsedVehicleViewSet(CustomModelViewSet):
     def destroy(self, request, *args, **kwargs):
         with transaction.atomic():
             instance = self.get_object()
+            old_thumbnail = instance.thumbnail
+            images_rows = UsedVehicleImg.objects.filter(main=instance)
+            for images_row in images_rows:
+                old_image = images_row.img
+                images_row.img = None
+                images_row.save()
+                if old_image:
+                    old_image.del_images()
+            UsedVehicleImg.objects.filter(main=instance).delete()
             tenant_log(self.request.user, BizLog.DELETE, u'删除二手车[%s],id=%d' % (instance.number, instance.id))
             instance.delete()
+            if old_thumbnail:
+                old_thumbnail.del_images()
         return response_ok()
 
     @action(methods=['post'], detail=True)
@@ -85,8 +96,8 @@ class UsedVehicleViewSet(CustomModelViewSet):
             raise CustomError(u'未找到上传文件!')
 
         with transaction.atomic():
-            image = Images.objects.employee_addnew(request.user.employee, Images.USEDVEHICLE_FILE, image)
-            UsedVehicleImg.objects.create(vehicle_model=vehicle, img=image)
+            image = Images.objects.employee_addnew(request.user, Images.USEDVEHICLE_FILE, image)
+            UsedVehicleImg.objects.create(main=vehicle, img=image)
             tenant_log(request.user, BizLog.DELETE,
                        u'二手车[%s]上传图片,id=%d' % (vehicle.number, vehicle.id))
 

+ 4 - 4
uis/views/usedvehicle/edit.html

@@ -86,21 +86,21 @@
                   </div>
                 </div>
                 <div>
-                  <label class="layui-form-label">座位数:</label>
+                  <label class="layui-form-label"><font color='red' size="4">*</font>座位数:</label>
                   <div class="layui-input-block">
-                    <input type="text" name="seat_count" lay-verify="intGeZ" placeholder="请输入座位数" autocomplete="off" class="layui-input">
+                    <input type="text" name="seat_count" lay-verify="required|intGeZ" placeholder="请输入座位数" autocomplete="off" class="layui-input">
                   </div>
                 </div>
                 <div>
                   <label class="layui-form-label">上牌日期:</label>
                   <div class="layui-input-block">
-                    <input id="plate_date" type="text" name="plate_date" placeholder="请输入上牌日期" autocomplete="off" class="layui-input" lay-verify="required">
+                    <input id="plate_date" type="text" name="plate_date" placeholder="请输入上牌日期" autocomplete="off" class="layui-input">
                   </div>
                 </div>
                 <div>
                   <label class="layui-form-label">出厂日期:</label>
                   <div class="layui-input-block">
-                    <input id="factory_date" type="text" name="factory_date" placeholder="请输入出厂日期" autocomplete="off" class="layui-input" lay-verify="required">
+                    <input id="factory_date" type="text" name="factory_date" placeholder="请输入出厂日期" autocomplete="off" class="layui-input" >
                   </div>
                 </div>
                 <div>

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

@@ -59,7 +59,7 @@
                     <a class="layui-btn layui-btn-xs" lay-event="edit">修改</a>
                     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sale">售出</a>
-                    <a class="layui-btn layui-btn-xs" lay-event="sale">售出</a>
+                    <a class="layui-btn layui-btn-xs" lay-event="upload">车辆图片</a>
                 </div>
             </script>
           </div>
@@ -116,7 +116,7 @@
        ,{field:'oil_type', title:'燃油类型',width: 100}
        ,{field:'mileage', title:'车辆里程',width: 100}
        ,{field:'notes', title:'备注',width: 150}
-        ,{width:180, align:'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}
+        ,{width:200, align:'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}
       ]]
       ,page: true
       ,height: 'full-108'