初始化

apps/account/models.py

@@ -85,10 +85,8 @@ class User(AbstractBaseUser, PermissionsMixin):
     username = models.CharField(max_length=30, verbose_name=u'账号', unique=True, db_index=True,error_messages={'unique': u'已存在'})
     tel = models.CharField(max_length=15, verbose_name=u"手机号码", null=True, blank=True)
     gender = models.PositiveSmallIntegerField(choices=settings.GENDER_CHOICES, verbose_name=u"性别",null=True,blank=True)
-    ID_card = models.CharField(max_length=18, verbose_name=u"身份证号", null=True, blank=True)
     address = models.CharField(max_length=500, verbose_name=u"家庭住址", null=True, blank=True)
     #department = models.ForeignKey('Department', verbose_name=u"所属部门", null=True, blank=True, on_delete=models.PROTECT)
-    title = models.CharField(max_length=20, verbose_name=u"工作岗位", null=True, blank=True)
     date_joined = models.DateTimeField(verbose_name=u'注册时间', default=timezone.now, null=True)
     enabled = models.BooleanField(verbose_name=u"在用", default=True)
 
@@ -119,9 +117,3 @@ class User(AbstractBaseUser, PermissionsMixin):
         db_table = "auth_user"
         verbose_name = u"人员管理"
         ordering = ('-id',)
-        default_permissions = ()
-        permissions = (
-            ("view_user", u"浏览"),
-            ("add_user", u"添加"),
-            ("delete_user", u"删除"),
-        )

apps/activity/models.py

@@ -66,6 +66,7 @@ class Order(models.Model):
     )
     branch = models.ForeignKey(Branch, verbose_name=u"门店", on_delete=models.PROTECT)
     activity = models.ForeignKey(Activity, verbose_name=u"活动", on_delete=models.PROTECT)
+    member = models.ForeignKey(Member, verbose_name=u"会员", on_delete=models.PROTECT)
     amount = models.FloatField(verbose_name=u"费用", default=0)
     status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, verbose_name=u"状态", default=DEFAULT, editable=False)
     model = models.CharField(max_length=200, verbose_name=u"车型", null=True, blank=True)

apps/foundation/models.py

@@ -10,68 +10,62 @@ from apps.exceptions import CustomError
 from libs.utils import strftime, strfdate
 #from managers import OptionManager
 
-class Option(models.Model):
-    PAYMENT_MODE = 0
-    MATERIAL_MODE = 1
-    CONSUMABLE_MODE = 2
-    GOODS_MODE = 3
-    QUALITY_REQUEST = 4
-    PAYMENT_ACCOUNT = 5
-    SALE_MESSAGE = 6
-
-    TYPE_CHOICES = (
-        (PAYMENT_MODE, u'付款方式'),
-        (MATERIAL_MODE, u'原料类别'),
-        (CONSUMABLE_MODE, u'耗材类别'),
-        (GOODS_MODE, u'成品类别'),
-        (QUALITY_REQUEST, u'质量要求'),
-        (PAYMENT_ACCOUNT, u'银行账户'),
-        (SALE_MESSAGE, u'发货信息'),
-    )
-
-    type = models.PositiveSmallIntegerField(choices=TYPE_CHOICES, verbose_name=u"类别")
-    name = models.CharField(max_length=100, verbose_name=u"名称")
-    notes = models.CharField(max_length=500, verbose_name=u"备注",blank=True,null=True)
-    enabled = models.BooleanField(verbose_name=u"在用", default=True)
-
-    #objects = OptionManager()
-
-    @staticmethod
-    def getTypeText(type):
-        return Option.TYPE_CHOICES[type][1]
-
-    @staticmethod
-    def getById(id):
-        try:
-            id = int(id)
-        except:
-            raise CustomError(u'无效的自定义项ID')
-
-        instance = Option.objects.filter(pk=id).first()
-        if not instance:
-            raise CustomError(u'未找到相应的自定义项')
-        return instance
-
-    @staticmethod
-    def getByName(name, type):
-        option = Option.objects.filter(name=name,type=type).first()
-        if not option:
-            raise CustomError(u'未找到[%s]为[%s]的自定义项' % (Option.getTypeText(type),name))
-        return option
-
-    class Meta:
-        db_table = "system_option"
-        verbose_name = u"自定义项管理"
-        ordering = ('-id', )
-        index_together = (
-            'name',
-        )
-        default_permissions = ()
-        permissions = (
-            ("view_option", u"浏览"),
-            ("add_option", u"添加"),
-            ("delete_option", u"删除"),
-        )
+# class Option(models.Model):
+#     PAYMENT_MODE = 0
+#     MATERIAL_MODE = 1
+#     CONSUMABLE_MODE = 2
+#     GOODS_MODE = 3
+#     QUALITY_REQUEST = 4
+#     PAYMENT_ACCOUNT = 5
+#     SALE_MESSAGE = 6
+#
+#     TYPE_CHOICES = (
+#         (PAYMENT_MODE, u'付款方式'),
+#         (MATERIAL_MODE, u'原料类别'),
+#         (CONSUMABLE_MODE, u'耗材类别'),
+#         (GOODS_MODE, u'成品类别'),
+#         (QUALITY_REQUEST, u'质量要求'),
+#         (PAYMENT_ACCOUNT, u'银行账户'),
+#         (SALE_MESSAGE, u'发货信息'),
+#     )
+#
+#     type = models.PositiveSmallIntegerField(choices=TYPE_CHOICES, verbose_name=u"类别")
+#     name = models.CharField(max_length=100, verbose_name=u"名称")
+#     notes = models.CharField(max_length=500, verbose_name=u"备注",blank=True,null=True)
+#     enabled = models.BooleanField(verbose_name=u"在用", default=True)
+#
+#     #objects = OptionManager()
+#
+#     @staticmethod
+#     def getTypeText(type):
+#         return Option.TYPE_CHOICES[type][1]
+#
+#     @staticmethod
+#     def getById(id):
+#         try:
+#             id = int(id)
+#         except:
+#             raise CustomError(u'无效的自定义项ID')
+#
+#         instance = Option.objects.filter(pk=id).first()
+#         if not instance:
+#             raise CustomError(u'未找到相应的自定义项')
+#         return instance
+#
+#     @staticmethod
+#     def getByName(name, type):
+#         option = Option.objects.filter(name=name,type=type).first()
+#         if not option:
+#             raise CustomError(u'未找到[%s]为[%s]的自定义项' % (Option.getTypeText(type),name))
+#         return option
+#
+#     class Meta:
+#         db_table = "system_option"
+#         verbose_name = u"自定义项管理"
+#         ordering = ('-id', )
+#         index_together = (
+#             'name',
+#         )
 
 class BizLogManager(models.Manager):
     def addnew(self, user, type, description, data=None):
@@ -116,10 +110,4 @@ class BizLog(models.Model):
     class Meta:
         db_table = "system_log"
         ordering = ['-id']
-        verbose_name = u"权限管理"
-        default_permissions = ()
-        permissions = (
-            ("view_group", u"浏览"),
-            ("add_group", u"添加"),
-            ("delete_group", u"删除"),
-        )
+        verbose_name = u"日志管理"