diff --git a/backend/dvadmin/system/views/dept.py b/backend/dvadmin/system/views/dept.py index 31982f5..8239c85 100644 --- a/backend/dvadmin/system/views/dept.py +++ b/backend/dvadmin/system/views/dept.py @@ -37,6 +37,17 @@ class DeptSerializer(CustomModelSerializer): read_only_fields = ["id"] +class DeptImportSerializer(CustomModelSerializer): + """ + 部门-导入-序列化器 + """ + + class Meta: + model = Dept + fields = '__all__' + read_only_fields = ["id"] + + class DeptInitSerializer(CustomModelSerializer): """ 递归深度获取数信息(用于生成初始化json文件) @@ -113,8 +124,12 @@ class DeptViewSet(CustomModelViewSet): update_serializer_class = DeptCreateUpdateSerializer filter_fields = ['name', 'id', 'parent'] search_fields = [] - # extra_filter_backends = [] + import_serializer_class = DeptImportSerializer + import_field_dict = { + "name": "部门名称", + "key": "部门标识", + } def list(self, request, *args, **kwargs): # 如果懒加载,则只返回父级 diff --git a/backend/dvadmin/utils/import_export_mixin.py b/backend/dvadmin/utils/import_export_mixin.py index 9346661..39913fb 100644 --- a/backend/dvadmin/utils/import_export_mixin.py +++ b/backend/dvadmin/utils/import_export_mixin.py @@ -155,9 +155,6 @@ class ImportSerializerMixin: else: filter_dic = {i: ele.get(i) for i in list(set(unique_list)) if ele.get(i) is not None} instance = filter_dic and queryset.filter(**filter_dic).first() - print(unique_list) - print(filter_dic) - print(instance) if instance and not updateSupport: continue if not filter_dic: diff --git a/web/src/views/system/dept/index.vue b/web/src/views/system/dept/index.vue index 1e935e8..b479d48 100644 --- a/web/src/views/system/dept/index.vue +++ b/web/src/views/system/dept/index.vue @@ -16,6 +16,11 @@ @click="addRow" > 新增 + 导入 +