diff --git a/db.sqlite3 b/db.sqlite3 index d597e746f3610bf02aae2485aa4602ef7e8deb39..1a43367b6a534a1fe24cf2c2c516f67b88dc516f 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/demo/admin.py b/demo/admin.py index 6f5a825b9d971bcb9d5861279587523acb363a06..c4e812844543e29a0cf66e8114e5721d86ee1bc5 100644 --- a/demo/admin.py +++ b/demo/admin.py @@ -19,6 +19,10 @@ class DepartmentAdmin(admin.ModelAdmin): actions_on_top = True +class ImageInline(admin.TabularInline): + model = Image + + @admin.register(Title) class TitleAdmin(admin.ModelAdmin): # 要显示的字段 @@ -29,7 +33,9 @@ class TitleAdmin(admin.ModelAdmin): # 分页显示,一页的数量 list_per_page = 10 - + inlines = [ + ImageInline, + ] @admin.register(Employe) @@ -37,7 +43,7 @@ class EmployeAdmin(admin.ModelAdmin): list_display = ('id', 'name', 'gender', 'idCard', 'phone', 'birthday', 'department', 'enable', 'create_time') search_fields = ('name', 'enable') list_per_page = 10 - + raw_id_fields = ('department', 'title') list_filter = ('department', 'create_time', 'birthday', 'time', 'enable', 'gender') list_display_links = ('name', 'idCard') diff --git a/demo/models.py b/demo/models.py index d5650bf04f4e28810a563654886c1785e7c87d1e..b72c04373111181ce3393b7ce46f12fce1609bc5 100644 --- a/demo/models.py +++ b/demo/models.py @@ -30,6 +30,18 @@ class Title(models.Model): return self.name +class Image(models.Model): + image = models.ImageField(verbose_name='图片') + title = models.ForeignKey(Title, on_delete=models.SET_NULL, blank=False, null=True, ) + + class Meta: + verbose_name = '图片' + verbose_name_plural = '图片管理' + + def __str__(self): + return self.image.path + + class Employe(models.Model): name = models.CharField(max_length=128, verbose_name='名称', help_text='员工的名字', null=False, blank=False, db_index=True) diff --git a/finance/admin.py b/finance/admin.py index b6d9a8e9a531d97c0c08bcf0be02ea0d21e723af..f9e078d8646bfbc3fdd398afd1d0f37e50f12454 100644 --- a/finance/admin.py +++ b/finance/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin from finance.models import * from import_export import resources -from import_export.admin import ImportExportModelAdmin +from import_export.admin import ImportExportModelAdmin, ImportExportActionModelAdmin class ProxyResource(resources.ModelResource): @@ -13,7 +13,8 @@ class ProxyResource(resources.ModelResource): # Register your models here. @admin.register(Record) # class RecordAdmin(admin.ModelAdmin): -class RecordAdmin(ImportExportModelAdmin): +# class RecordAdmin(ImportExportModelAdmin): +class RecordAdmin(ImportExportActionModelAdmin): resource_class = ProxyResource diff --git a/requirements.txt b/requirements.txt index 0a339ca4ef668c60edbe2b59fca6726b8850c88e..07976d48082d8a825050d8cae610e9536d705e9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ Django==2.2 django-import-export==1.2.0 -django-simpleui \ No newline at end of file +django-simpleui +Pillow \ No newline at end of file