account/admin.py

@@ -14,8 +14,8 @@ class UserInfoAdmin(admin.ModelAdmin):

                 
              

                 
              

                 class AdministratorInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('admin_id', 'phone', 'password', 'encryption', 'name', 'point_id', 'point_name', 'user_status', 'status', 'created_at', 'updated_at')
              

                -    list_filter = ('user_status', 'status', 'point_name')
              

                +    list_display = ('point_id', 'point_name', 'admin_id', 'phone', 'password', 'encryption', 'name', 'user_status', 'status', 'created_at', 'updated_at')
              

                +    list_filter = ('point_name', 'user_status', 'status')
              

                     readonly_fields = ('encryption', 'point_name')
              

                 
              

                     def save_model(self, request, obj, form, change):
              

account/models.py

@@ -77,6 +77,9 @@ class AdministratorInfo(BaseModelMixin):

                         (DELETED, '已删除'),
              

                     )
              

                 
              

                +    point_id = models.CharField(_('point_id'), max_length=32, blank=True, null=True, help_text='隔离点唯一标识', db_index=True)
              

                +    point_name = models.CharField(_('point_name'), max_length=255, blank=True, null=True, help_text='隔离点名称', db_index=True)
              

                +
              

                     admin_id = ShortUUIDField(_('admin_id'), max_length=32, blank=True, null=True, help_text='管理员唯一标识', db_index=True, unique=True)
              

                 
              

                     phone = models.CharField(_('phone'), max_length=11, blank=True, null=True, help_text='管理员电话', db_index=True)
              
@@ -85,9 +88,6 @@ class AdministratorInfo(BaseModelMixin):

                 
              

                     name = models.CharField(_('name'), max_length=255, blank=True, null=True, help_text='管理员姓名')
              

                 
              

                -    point_id = models.CharField(_('point_id'), max_length=32, blank=True, null=True, help_text='隔离点唯一标识', db_index=True)
              

                -    point_name = models.CharField(_('point_name'), max_length=255, blank=True, null=True, help_text='隔离点名称')
              

                -
              

                     user_status = models.IntegerField(_('user_status'), choices=USER_STATUS_TUPLE, default=ACTIVATED, help_text='管理员状态', db_index=True)
              

                 
              

                     class Meta:
              
@@ -100,8 +100,8 @@ class AdministratorInfo(BaseModelMixin):

                     @property
              

                     def data(self):
              

                         return {
              

                -            'admin_id': self.admin_id,
              

                -            'name': self.name,
              

                             'point_id': self.point_id,
              

                             'point_name': self.point_name,
              

                +            'admin_id': self.admin_id,
              

                +            'name': self.name,
              

                         }