feat: 调整

This commit is contained in:
Czw996 2022-03-07 16:16:33 +08:00
parent 1bcf407f91
commit c59290b8e1
3 changed files with 2 additions and 25 deletions

View file

@ -2,5 +2,4 @@ from django.contrib import admin
from apps.data.models import *
admin.site.register([Warehouse, ClientCategory, Client, SupplierCategory, Supplier,
Account, ChargeItem])
admin.site.register([Warehouse, Client, Supplier, Account, ChargeItem])

View file

@ -140,16 +140,6 @@ class ClientImportSerializer(BaseSerializer):
fields = ['number', 'name', 'level', 'category_name', 'contact', 'phone',
'email', 'address', 'remark', 'order', 'is_active', 'initial_arrears_amount']
def validate(self, attrs):
if category_name := attrs.pop('category_name', None):
client_category = ClientCategory.objects.filter(name=category_name, team=self.team).first()
if not client_category:
raise ValidationError(f'客户分类[{category_name}]不存在')
attrs['category'] = client_category
return super().validate(attrs)
class SupplierSerializer(BaseSerializer):
class Meta:
@ -220,16 +210,6 @@ class SupplierImportSerializer(BaseSerializer):
fields = ['number', 'name', 'category_name', 'contact', 'phone', 'email', 'address',
'bank_account', 'bank_name', 'remark', 'order', 'is_active', 'initial_arrears_amount']
def validate(self, attrs):
if category_name := attrs.pop('category_name', None):
supplier_category = SupplierCategory.objects.filter(name=category_name, team=self.team).first()
if not supplier_category:
raise ValidationError(f'供应商分类[{category_name}]不存在')
attrs['category'] = supplier_category
return super().validate(attrs)
class AccountSerializer(BaseSerializer):
type_display = CharField(source='get_type_display', read_only=True, label='账户类型')

View file

@ -14,8 +14,6 @@ ClientOptionPermission = BasePermission
SupplierOptionPermission = BasePermission
AccountOptionPermission = BasePermission
ChargeItemOptionPermission = BasePermission
ClientCategoryOptionPermission = BasePermission
SupplierCategoryOptionPermission = BasePermission
# Goods
GoodsCategoryOptionPermission = BasePermission
@ -38,7 +36,7 @@ SupplierArrearsOptionPermission = BasePermission
__all__ = [
'RoleOptionPermission', 'UserOptionPermission',
'WarehouseOptionPermission', 'ClientOptionPermission', 'SupplierOptionPermission', 'AccountOptionPermission',
'ChargeItemOptionPermission', 'ClientCategoryOptionPermission', 'SupplierCategoryOptionPermission',
'ChargeItemOptionPermission',
'GoodsCategoryOptionPermission', 'GoodsUnitOptionPermission', 'GoodsOptionPermission',
'BatchOptionPermission', 'InventoryOptionPermission',
'PurchaseOrderOptionPermission',