From c59290b8e1bf3696cd4d22c852d6535661077293 Mon Sep 17 00:00:00 2001
From: Czw996 <459749926@qq.com>
Date: Mon, 7 Mar 2022 16:16:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/data/admin.py         |  3 +--
 apps/data/serializers.py   | 20 --------------------
 apps/option/permissions.py |  4 +---
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/apps/data/admin.py b/apps/data/admin.py
index 2b6d447..4849a08 100644
--- a/apps/data/admin.py
+++ b/apps/data/admin.py
@@ -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])
diff --git a/apps/data/serializers.py b/apps/data/serializers.py
index f5b3876..f8a788b 100644
--- a/apps/data/serializers.py
+++ b/apps/data/serializers.py
@@ -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='账户类型')
diff --git a/apps/option/permissions.py b/apps/option/permissions.py
index ec913ac..d90171f 100644
--- a/apps/option/permissions.py
+++ b/apps/option/permissions.py
@@ -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',