From 7060b1099246d834efe11115b59b06a70ddeeb83 Mon Sep 17 00:00:00 2001
From: newpanjing <newpanjing@163.com>
Date: Mon, 20 May 2019 12:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db.sqlite3                | Bin 192512 -> 204800 bytes
 demo/admin.py             |  15 +++++++++
 demo/models.py            |  20 +++++++++++-
 simpleui_demo/settings.py |  62 +++++++++++++++++++-------------------
 4 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/db.sqlite3 b/db.sqlite3
index de7fa48ec8c0c5c2b4a6b2c734fb312fcaf51f5c..d597e746f3610bf02aae2485aa4602ef7e8deb39 100644
GIT binary patch
delta 6646
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
XCue@elDjgAQvVX0$DL%fGgSE-@5Ni3

delta 1943
zcmeHI`)?Fg6rOu#m)+U9_nh56C@rPkwF`wl*exh64{KM@lvi69C`MFXZ4tAS4T7RE
zP@sqc0b~sq6$Ozf1)_x|OhB6~CTb9Ekw6fP4-gPcAdo1DV#GU^tiSpPILWz_^PPJh
zbIzADZ7JUNqq(WSuUgZzkdhK5x{@bfEgPO)tqslZbSjO}ZFOonbXyGAzj!72{B`wH
z{R+wU3mf-D6E1Hk8Sv+OlF_^a&VB|39CVce^btKvZ_qkAMOD;9fn*@;q(mUpH?$_h
zs}Er<^IK=P&TXE#sCn+fMNLF|w7#tA>DjIG7S5dAv|xVg%-F(t%W01{E71}PvS4Ce
zsFoRtQ=!uSIUbeRpeY(%r{i>vx@ZTr&<iw$)+K#yBPlWEf&G0AifVL?&e9k3F>R-{
z^gK0FRN1R25v@O<2SrK3)i7QaevT(go;U+JMjy@XXxGFz=LPe!=Ve#BQGz=i?a7EY
z=1A^tTIq19w86=%MMAU;NS4e$*C)%32Q@rMwNyl#$-=X=0RK`Ex1l4bPiBeECV%pq
zWf%Ou@JN5Sa#Y2AqlQ-wt-5!3)v)C8?IXi_kjfLT6Lt;XVY2*(GqZG`_KI}Xu$8i*
zi6yN32)k5ZXU%|=COxxQ0qNcPG^O0qG&4sT<e2SnRJFs=krN8Bm*&eCw?eUO*#=}C
z*a~Zzz9M6SESSv_`gm84{Nhbm;#gHz>$1jfgD&0LIFBu<(%0}F%e8|MQ*|6Rt)6}C
zK3!iU8ZB36FIdB6Ll<*eGrCwuh930nl&%xZt~%<mcAjH%va{Ue*62LFOYN%3pU}fp
zOl~#r8z}ew#kiGqhvfy9o7bt5hERVJcn5FdPk0(X$HTZ6-@=W!0-wQVoQ~shG?rr_
z`cN0YiJ!$;aa?qX55+sG>#NPvVzHPjq9P)~qEPsRi~q@Q^2_{Neu96>kMIxqF8(^-
zz*q65d;y=sr}IfX!bk8@?&n4}_n3FgU(KJ?M6Wun?So*1vry=T?DAV1E_J<k>4S}r
zdh}d&wPWAKBd<<(>cpBGtshI_ZDy@6ha{5^h2Zz)m`jVPm7bzG^f)zA15KcDRIMmJ
zjLK*b`6-XG2+2)=f8s5?fxqBI{2sr-llUcmhABLP2k`^kjXQB0Zoy5s7Ta+dF2zL{
z!xo%{kKt6T!&-b0GqC{2;0O$32?o`$?I$_d-za=eoiTXSp&Lxq$(W;2W>&*JR-_uL
zn6>Nyc*&oydH=Z|qT6&!oD{S8b>7A^%pK-XPs;Ldf~Z?gd>{M}^U2Y#L77YqhJNzs
z`!E<{-ZYXey`|uj)mI=7;v|nHV4Uo{0%Z`#UL~~$gskg;LWl|5D<V@JPzo`gR)nni
z1qvW;rX7^GC#`T<zt^t9NIP)Zz1NQC?nP?$sd#Z$uS3l>m9A%>GROO*kur!m?|NUe
zb34+Z3^}nI?t!?TPG`ukx}gZ-kVc$xQV$eEjHSJt^6egG$WuL#X)l@~6V*{N@K78a
zULE;B>1u-kiu{V#1J}a^Jr|U{Sc$zu?YBLuqW|0c-`hOEYyW6~)Kb&5GMliLHwDje
zY3_p2(w@0mO0b++b=|O=*)thhqmJ^z_c|fGB?XSY2A`qP78<D*$~3h!mI$3E`3yCr
z2p5ghOs!DM3`Cd_am&+(V4|p-YHB{scNe<fg0T>vVl!f_JdvyOK9%7S6%}Fm^&aRC
z@#wz>XJz=_iYj@22jrWv22;zeC<;UjLq1XrmGW3WT`{{peH-Otxw;~1T^cEe8I$E7
dn;|5_`@xX4d3q5%HA!yTtiJLe<f|hP{2R*tIn)3E

diff --git a/demo/admin.py b/demo/admin.py
index 78af62b..6f5a825 100644
--- a/demo/admin.py
+++ b/demo/admin.py
@@ -1,4 +1,6 @@
 from django.contrib import admin
+from django.urls import reverse
+
 from .models import *
 
 
@@ -17,6 +19,19 @@ class DepartmentAdmin(admin.ModelAdmin):
     actions_on_top = True
 
 
+@admin.register(Title)
+class TitleAdmin(admin.ModelAdmin):
+    # 要显示的字段
+    list_display = ('id', 'name')
+
+    # 需要搜索的字段
+    search_fields = ('name',)
+
+    # 分页显示，一页的数量
+    list_per_page = 10
+
+
+
 @admin.register(Employe)
 class EmployeAdmin(admin.ModelAdmin):
     list_display = ('id', 'name', 'gender', 'idCard', 'phone', 'birthday', 'department', 'enable', 'create_time')
diff --git a/demo/models.py b/demo/models.py
index 3c49dcf..d5650bf 100644
--- a/demo/models.py
+++ b/demo/models.py
@@ -1,7 +1,8 @@
 from django.db import models
 
-
 # Create your models here.
+from django.urls import reverse
+
 
 class Department(models.Model):
     name = models.CharField(max_length=128, verbose_name='部门名', help_text='一个部门的名字应该唯一', unique=True, db_index=True)
@@ -15,6 +16,20 @@ class Department(models.Model):
         return self.name
 
 
+class Title(models.Model):
+    name = models.CharField(max_length=128, verbose_name='职务', null=True, blank=True)
+
+    class Meta:
+        verbose_name = '职务'
+        verbose_name_plural = '职务管理'
+
+    def get_absolute_url(self):
+        return reverse('title-detail-view', args=(self.name,))
+
+    def __str__(self):
+        return self.name
+
+
 class Employe(models.Model):
     name = models.CharField(max_length=128, verbose_name='名称', help_text='员工的名字', null=False, blank=False,
                             db_index=True)
@@ -36,6 +51,9 @@ class Employe(models.Model):
     department = models.ForeignKey(Department, on_delete=models.SET_NULL, blank=False, null=True, verbose_name='部门',
                                    db_index=True)
 
+    title = models.ForeignKey(Title, on_delete=models.SET_NULL, blank=False, null=True, verbose_name='职务',
+                              db_index=True)
+
     enable = models.BooleanField(verbose_name='状态', default=True)
     create_time = models.DateTimeField(verbose_name='创建时间', auto_now=True)
 
diff --git a/simpleui_demo/settings.py b/simpleui_demo/settings.py
index fb88ef8..7cf2adf 100644
--- a/simpleui_demo/settings.py
+++ b/simpleui_demo/settings.py
@@ -29,8 +29,8 @@ ALLOWED_HOSTS = ['*', ]
 # Application definition
 
 INSTALLED_APPS = [
-    'import_export',
     'simpleui',
+    'import_export',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -153,36 +153,36 @@ STATIC_ROOT = os.path.join(BASE_DIR, "static")
 SIMPLEUI_ANALYSIS = True
 
 # 自定义simpleui 菜单
-# SIMPLEUI_CONFIG = {
-#     # 在自定义菜单的基础上保留系统模块
-#     'system_keep': False,
-#     'menus': [{
-#         'name': 'Simpleui',
-#         'icon': 'fas fa-code',
-#         'url': 'https://gitee.com/tompeppa/simpleui'
-#     }, {
-#         'app': 'auth',
-#         'name': '权限认证',
-#         'icon': 'fas fa-user-shield',
-#         'models': [{
-#             'name': '用户',
-#             'icon': 'fa fa-user',
-#             'url': 'auth/user/'
-#         }]
-#     }, {
-#         'name': '测试',
-#         'icon': 'fa fa-file',
-#         'models': [{
-#             'name': 'Baidu',
-#             'url': 'http://baidu.com',
-#             'icon': 'far fa-surprise'
-#         }, {
-#             'name': '内网穿透',
-#             'url': 'https://www.wezoz.com',
-#             'icon': 'fab fa-github'
-#         }]
-#     }]
-# }
+SIMPLEUI_CONFIG = {
+    # 在自定义菜单的基础上保留系统模块
+    'system_keep': True,
+    'menus': [{
+        'name': 'Simpleui',
+        'icon': 'fas fa-code',
+        'url': 'https://gitee.com/tompeppa/simpleui'
+    }, {
+        'app': 'auth',
+        'name': '权限认证',
+        'icon': 'fas fa-user-shield',
+        'models': [{
+            'name': '用户',
+            'icon': 'fa fa-user',
+            'url': 'auth/user/'
+        }]
+    }, {
+        'name': '测试',
+        'icon': 'fa fa-file',
+        'models': [{
+            'name': 'Baidu',
+            'url': 'http://baidu.com',
+            'icon': 'far fa-surprise'
+        }, {
+            'name': '内网穿透',
+            'url': 'https://www.wezoz.com',
+            'icon': 'fab fa-github'
+        }]
+    }]
+}
 
 # 是否显示默认图标，默认=True
 # SIMPLEUI_DEFAULT_ICON = False
-- 
GitLab