.....

apps/activity/models.py

@@ -16,7 +16,7 @@ class Activity(models.Model):
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'创建人', editable=False, on_delete=models.PROTECT)
     create_time = models.DateTimeField(verbose_name=u"添加时间", auto_now_add=True, editable=False)
 
-    is_deleted = models.BooleanField(verbose_name="删除", default=False)
+    delete = models.BooleanField(verbose_name=u"删除", default=False, editable=False)
 
     class Meta:
         db_table = "activity"

apps/activity/views.py

@@ -17,7 +17,7 @@ from .models import Activity
 
 
 class ActivityViewSet(CustomModelViewSet):
-    queryset = Activity.objects.filter(is_deleted=False)
+    queryset = Activity.objects.filter(delete=False)
     serializer_class = ActivitySerializer
 
     def filter_queryset(self, queryset):
@@ -36,7 +36,7 @@ class ActivityViewSet(CustomModelViewSet):
         由于layui上传文件使用的是post方法，且不能改为put方法，所以不能通过重写update来实现更新实例
         '''
         obj = self.get_object()
-        if obj.is_deleted:
+        if obj.delete:
             raise CustomError(u'该活动已删除，禁止操作！')
 
         with transaction.atomic():
@@ -51,7 +51,7 @@ class ActivityViewSet(CustomModelViewSet):
     def destroy(self, request, *args, **kwargs):
         with transaction.atomic():
             instance = self.get_object()
-            instance.is_deleted = True
+            instance.delete = True
             instance.save()
             tenant_log(self.request.user, BizLog.DELETE, u'删除活动[%s]，id=%d' % (instance.title, instance.id))
         return response_ok()

apps/product/models.py

@@ -19,7 +19,7 @@ class Product(models.Model):
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'创建人', editable=False, on_delete=models.PROTECT)
     create_time = models.DateTimeField(verbose_name=u"添加时间", auto_now_add=True, editable=False)
 
-    is_deleted = models.BooleanField(verbose_name="删除", default=False)
+    delete = models.BooleanField(verbose_name=u"删除", default=False, editable=False)
 
     class Meta:
         db_table = "product"

apps/product/views.py

@@ -16,7 +16,7 @@ from .models import *
 
 
 class ProductViewSet(CustomModelViewSet):
-    queryset = Product.objects.filter(is_deleted=False)
+    queryset = Product.objects.filter(delete=False)
     serializer_class = ProductSerializer
 
     def filter_queryset(self, queryset):
@@ -33,7 +33,7 @@ class ProductViewSet(CustomModelViewSet):
     def update_obj(self, request, pk):
         '''由于layui上传文件使用的是post方法，且不能改为put方法，所以不能通过重写update来实现更新实例'''
         obj = self.get_object()
-        if obj.is_deleted:
+        if obj.delete:
             raise CustomError(u"该商品已删除，禁止修改！")
         with transaction.atomic():
             serializer = self.get_serializer(obj, data=request.data)
@@ -48,14 +48,14 @@ class ProductViewSet(CustomModelViewSet):
         with transaction.atomic():
             instance = self.get_object()
             tenant_log(self.request.user, BizLog.DELETE, u'删除商品[%s]，id=%d' % (instance.name, instance.id))
-            instance.is_deleted = True
+            instance.delete = True
             instance.save()
         return response_ok()
 
     @action(methods=['post'], detail=True)
     def upload_images(self, request, pk):
         instance = self.get_object()
-        if instance.is_deleted:
+        if instance.delete:
             raise CustomError(u"该商品已删除，禁止修改！")
         images = request.FILES.get('images', None)
 

uis/views/activity/index.html

@@ -99,7 +99,7 @@
       var data = obj.data;
       table.editdata = data;
         if(obj.event === 'edit'){
-            if (data.is_deleted) {
+            if (data.delete) {
                 layer.msg('该活动已删除，禁止修改！');
                 return;
             }

uis/views/product/index.html

@@ -122,7 +122,7 @@
       var data = obj.data;
       table.editdata = data;
         if(obj.event === 'edit'){
-            if (data.is_deleted) {
+            if (data.delete) {
                 layer.msg('该商品已删除，禁止修改！');
                 return;
             }