From 64a8fab6119d88e340336dca52354f50e313b887 Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Tue, 6 Nov 2018 12:42:31 +0800
Subject: [PATCH] user management

---
 .idea/workspace.xml                           | 333 ++++++++-------
 apps/system/__pycache__/forms.cpython-36.pyc  | Bin 873 -> 3593 bytes
 apps/system/__pycache__/urls.cpython-36.pyc   | Bin 785 -> 1480 bytes
 .../views_structure.cpython-36.pyc            | Bin 3625 -> 3625 bytes
 .../__pycache__/views_user.cpython-36.pyc     | Bin 1989 -> 8010 bytes
 apps/system/forms.py                          | 104 +++++
 apps/system/urls.py                           |  13 +-
 apps/system/views_user.py                     | 178 +++++++-
 db.sqlite3                                    | Bin 208896 -> 208896 bytes
 templates/base-static.html                    |   4 +-
 templates/system/users/passwd_change.html     |  95 +++++
 templates/system/users/user.html              | 396 ++++++++++++++++++
 templates/system/users/user_create.html       | 202 +++++++++
 templates/system/users/user_detail.html       | 192 +++++++++
 14 files changed, 1351 insertions(+), 166 deletions(-)
 create mode 100644 templates/system/users/passwd_change.html
 create mode 100644 templates/system/users/user.html
 create mode 100644 templates/system/users/user_create.html
 create mode 100644 templates/system/users/user_detail.html

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 221c89b..5737775 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/apps/system/forms.py" afterPath="$PROJECT_DIR$/apps/system/forms.py" />
       <change beforePath="$PROJECT_DIR$/apps/system/urls.py" afterPath="$PROJECT_DIR$/apps/system/urls.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/views_structure.py" afterPath="$PROJECT_DIR$/apps/system/views_structure.py" />
+      <change beforePath="$PROJECT_DIR$/apps/system/views_user.py" afterPath="$PROJECT_DIR$/apps/system/views_user.py" />
       <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
-      <change beforePath="$PROJECT_DIR$/templates/system/structure/structure.html" afterPath="$PROJECT_DIR$/templates/system/structure/structure.html" />
+      <change beforePath="$PROJECT_DIR$/templates/base-static.html" afterPath="$PROJECT_DIR$/templates/base-static.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -20,54 +21,60 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="views_structure.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
+      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1122">
-              <caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="88" selection-end-column="77" />
+            <state relative-caret-position="425">
+              <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
               <folding>
-                <element signature="e#83#94#0" expanded="true" />
+                <element signature="e#0#37#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/models.py">
+      <file leaf-file-name="views_user.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
-              <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="298">
+              <caret line="76" column="0" lean-forward="false" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+              <folding>
+                <element signature="e#78#87#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
+        <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+            <state relative-caret-position="629">
+              <caret line="37" column="5" lean-forward="false" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
+              <folding>
+                <element signature="e#633#665#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="user.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/templates/system/users/user.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-4537">
+              <caret line="103" column="25" lean-forward="true" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="structure_user.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/system/structure/structure_user.html">
+      <file leaf-file-name="forms.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="258">
-              <caret line="72" column="0" lean-forward="false" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="structure.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4046">
-              <caret line="238" column="22" lean-forward="false" selection-start-line="238" selection-start-column="22" selection-end-line="238" selection-end-column="22" />
-              <folding />
+            <state relative-caret-position="83">
+              <caret line="96" column="0" lean-forward="false" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" />
+              <folding>
+                <element signature="e#73#82#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -82,6 +89,12 @@
       </list>
     </option>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>reverse</find>
+      <find>OA</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -92,21 +105,26 @@
         <option value="$PROJECT_DIR$/templates/head-footer.html" />
         <option value="$PROJECT_DIR$/apps/system/models.py" />
         <option value="$PROJECT_DIR$/apps/system/mixin.py" />
-        <option value="$PROJECT_DIR$/apps/system/views_user.py" />
         <option value="$PROJECT_DIR$/templates/system/system.html" />
         <option value="$PROJECT_DIR$/sandboxMP/urls.py" />
         <option value="$PROJECT_DIR$/templates/system/system_index.html" />
         <option value="$PROJECT_DIR$/apps/system/views.py" />
         <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
-        <option value="$PROJECT_DIR$/apps/system/forms.py" />
         <option value="$PROJECT_DIR$/apps/system/tests.py" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure_create.html" />
-        <option value="$PROJECT_DIR$/apps/system/urls.py" />
         <option value="$PROJECT_DIR$/templates/system/structure/strueture_users.html" />
         <option value="$PROJECT_DIR$/templates/system/structure/strueture_user.html" />
         <option value="$PROJECT_DIR$/apps/system/views_structure.py" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure.html" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure_user.html" />
+        <option value="$PROJECT_DIR$/templates/system/users/user_create.html" />
+        <option value="$PROJECT_DIR$/templates/system/users/user_detail.html" />
+        <option value="$PROJECT_DIR$/templates/base-static.html" />
+        <option value="$PROJECT_DIR$/apps/system/forms.py" />
+        <option value="$PROJECT_DIR$/templates/system/users/passwd_change.html" />
+        <option value="$PROJECT_DIR$/apps/system/urls.py" />
+        <option value="$PROJECT_DIR$/apps/system/views_user.py" />
+        <option value="$PROJECT_DIR$/templates/system/users/user.html" />
       </list>
     </option>
   </component>
@@ -116,11 +134,11 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="-8" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1448" />
     <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1056" />
+    <option name="width" value="1456" />
+    <option name="height" value="876" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -167,12 +185,6 @@
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
               <item name="apps" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="apps" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
@@ -189,7 +201,7 @@
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
               <item name="system" type="462c0819:PsiDirectoryNode" />
-              <item name="structure" type="462c0819:PsiDirectoryNode" />
+              <item name="users" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -201,7 +213,7 @@
   <component name="PropertiesComponent">
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-    <property name="last_opened_file_path" value="D:/PycharmProject/sandboxOA" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
   </component>
@@ -217,11 +229,11 @@
       <recent name="D:\ProjectFile\sandboxMP\apps" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\ProjectFile\sandboxMP\templates\system\users" />
       <recent name="D:\ProjectFile\sandboxMP\templates\system\structure" />
       <recent name="D:\ProjectFile\sandboxMP\apps\system" />
       <recent name="D:\ProjectFile\sandboxMP\templates\system" />
       <recent name="D:\ProjectFile\sandboxMP\media" />
-      <recent name="D:\ProjectFile\sandboxMP\static" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -287,23 +299,23 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
+    <frame x="-1448" y="-8" width="1456" height="876" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26985854" sideWeight="0.5021322" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19565217" sideWeight="0.4978678" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24591948" sideWeight="0.4978678" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Mongo Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17590618" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2012894" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18656716" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21650879" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39934713" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -322,60 +334,11 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="12" />
+      <option name="time" value="20" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="29" column="63" lean-forward="false" selection-start-line="29" selection-start-column="63" selection-end-line="29" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="20" column="6" lean-forward="false" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/users/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/bootstrap/js/npm.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1420">
@@ -531,13 +494,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1420">
-          <caret line="94" column="22" lean-forward="true" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/base-layer.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="476">
@@ -587,13 +543,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="652">
-          <caret line="49" column="23" lean-forward="true" selection-start-line="49" selection-start-column="23" selection-end-line="49" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/tests.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="51">
@@ -601,13 +550,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/detail.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1156">
-          <caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/apps/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -623,28 +565,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="16" column="43" lean-forward="false" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="37" column="5" lean-forward="true" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/base.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="175">
@@ -652,13 +572,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
+    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure_user.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1122">
-          <caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="88" selection-end-column="77" />
-          <folding>
-            <element signature="e#83#94#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-15">
+          <caret line="29" column="95" lean-forward="true" selection-start-line="29" selection-start-column="95" selection-end-line="29" selection-end-column="95" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="238" column="22" lean-forward="false" selection-start-line="238" selection-start-column="22" selection-end-line="238" selection-end-column="22" />
         </state>
       </provider>
     </entry>
@@ -670,18 +594,117 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
+    <entry file="file://$PROJECT_DIR$/static/plugins/datatables/dataTables.const-1.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4046">
-          <caret line="238" column="22" lean-forward="false" selection-start-line="238" selection-start-column="22" selection-end-line="238" selection-end-column="22" />
+        <state relative-caret-position="68">
+          <caret line="4" column="8" lean-forward="false" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="541">
+          <caret line="88" column="77" lean-forward="true" selection-start-line="88" selection-start-column="77" selection-end-line="88" selection-end-column="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/detail.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="40" column="31" lean-forward="false" selection-start-line="40" selection-start-column="23" selection-end-line="40" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/urls/resolvers.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="220" column="33" lean-forward="true" selection-start-line="220" selection-start-column="33" selection-end-line="220" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/users/user_create.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1396">
+          <caret line="129" column="26" lean-forward="false" selection-start-line="129" selection-start-column="26" selection-end-line="129" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1598">
+          <caret line="94" column="22" lean-forward="true" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure_user.html">
+    <entry file="file://$PROJECT_DIR$/templates/base-static.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="72" column="0" lean-forward="false" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        <state relative-caret-position="238">
+          <caret line="14" column="73" lean-forward="true" selection-start-line="14" selection-start-column="73" selection-end-line="14" selection-end-column="73" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/users/user_detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="967">
+          <caret line="191" column="14" lean-forward="false" selection-start-line="191" selection-start-column="14" selection-end-line="191" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/users/passwd_change.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="459">
+          <caret line="90" column="0" lean-forward="true" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#37#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="83">
+          <caret line="96" column="0" lean-forward="false" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" />
+          <folding>
+            <element signature="e#73#82#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="298">
+          <caret line="76" column="0" lean-forward="false" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+          <folding>
+            <element signature="e#78#87#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="629">
+          <caret line="37" column="5" lean-forward="false" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
+          <folding>
+            <element signature="e#633#665#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/users/user.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4537">
+          <caret line="103" column="25" lean-forward="true" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
           <folding />
         </state>
       </provider>
diff --git a/apps/system/__pycache__/forms.cpython-36.pyc b/apps/system/__pycache__/forms.cpython-36.pyc
index 31e3e4dce97c4739fbbfc251a6753742f4b68b38..a4f30b7a1c3933ccb250cb74b67e45a6a9aad059 100644
GIT binary patch
literal 3593
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

delta 416
zcmZusu};H447HQH%cW`qY9%IqAQMAZgqUDz7q&1}^0lH$h;&!x4zMuyFPPvr_=Fo_
z%EZWuoiZTQll)}AXFvO%Pdl@njz)v;*Z12m1o(tMPjP<95d;VbYiO`S1WG8alP0ZF
zgliy0`UyxoT&u^l(##mjn8}zi%w%M5pv*gVffA!$w!R4+Z<8v2`#>}W7rxkaIGt!t
zbB-YEEsoLa-C6RowbCMj9|(vVb<>ioqgmd$nu6cEh}vgI(xPT=vykl9PoY2IYF;Y;
z&r#?@7XFxpVj~s_gT<bhmo^$&FYZ^Z7do2$masoeUGX2id?n^Hxv{Us=+K5}&w2Qv
Pb{8@c48stI=~({&{{c(C

diff --git a/apps/system/__pycache__/urls.cpython-36.pyc b/apps/system/__pycache__/urls.cpython-36.pyc
index 9fb0b4984cdc03c4c5884b1c58bbffd48085a19a..c7b32f50d61f32fc8a29417570b1d9cb399bf5f2 100644
GIT binary patch
literal 1480
zcmZvcOK;Oa5XaY!6Q_AJ?>>1`kRp*rf*V2zseu!qN>zI>ks>F%Y8}~0wChmnD`!3k
zU&$vVPW=j8V0L!x7(=3Lc7F4p+1=T(U)1ZB<KI6%xg|n=lFX+A^EdDlBZCl1sNs{q
zaE!ooOoLF97W_hBITp?>zZjI9QeZna*hQzz3|eB=eCsQrHZ6ZEfW5^^^9quRCRHF+
zBsERyKx#;~HE95;BWY^V0<w*ytx1R3^9GWxCOsfcBs-ey0%;-H(_|k=8_9tthd??=
z?r3rsNEgXHP3{BfA$g$5Lm)dy9%=Fz$S#s2NiG}C9({5~`cH3VdHZH;t=#Y`wmF-~
z$t~2E^o_W3b|XR-TzKpnG>y;jFD4@7>sh$wEUqZ97L3Owfzp`7MSpqeEg;%jxB-ir
zQ&)JiVH!1z8b}5yiFWgn8E0<DhS5$=IZ%$Mmk;ng5e}nnUM}&!*(vkcf3qt`w4cxJ
zQaX``97cQj6%toeRY6KtQ8H;H=SPRyrar$U1KeRd6Pp~pwMmhjIxC|rbUl9<Wo3#*
zS=o9;v5;ArV$oq{(UmL2^^()c?8;qSLg5cGtLL15<xfhP&9AGN-3D8@Qy<c1Wr{_e
z%r>YelupGCutFMs?C-}_I*08okJsE6+=Le81sLKYwjnP{uq6k0ZxC)vSJ_>yCbA7<
z+Z7Y3bLwYF|6WM5lbR>kbO>81d=DLz(~Yow5Vlj@^K-aO$>MT4tI1iCAl{bNW({SJ
z@ES1={pWaJXtz)GrJUfMY&4toRgSk<T=X~O8Y5Lj1XU;%JkTNI3-O)s16de3{CYNe
zIX>mfIh%#=JfDq)yP(tMmk+07sF)b5hj}aueZ0Df%ddhZUHj~{d@qP27@B6yXqr}`
MX|$8Cna(u%1J2^$X8-^I

delta 267
zcmX@XJ&{etn3tF9-=cHT-<TK}9y1^TE+E?hh>PbjOjOaRXJklWjbcw_Okqo9$>L~c
zNMTRm=w$}-IaArPIKd)ZP!VpR2p3p{2P(n~6yXMo@IgiRfg(I$5do-(AW(!CEFuIF
zNoR}VOA!uc&=h$Ia@6EPMpYrkTl{62spZA-#U(|h$t9&lsf)KTGBW#V@=umvQDNf%
zsw-lf?9Ngy%3WHNQ;=9vl3J8kypo|v03;(YIf2zdObEynVB%rqVPatxU=)Hv078{I
Ao&W#<

diff --git a/apps/system/__pycache__/views_structure.cpython-36.pyc b/apps/system/__pycache__/views_structure.cpython-36.pyc
index 1c7ea392102af2438c049624b5eb778e782bfcf1..a931d6aad8e20de7c0f1349d6495c06ca8a96f5b 100644
GIT binary patch
delta 16
XcmZ1}vr>lLn3tE!RpI<bb|pRlB$EUM

delta 16
XcmZ1}vr>lLn3tF9_tJA4*_HSJET#oN

diff --git a/apps/system/__pycache__/views_user.cpython-36.pyc b/apps/system/__pycache__/views_user.cpython-36.pyc
index 56743c9313b9a72e06e75e2ebbe7fab756814607..9009685f0d7568c67a607f011cb998e48f27d1af 100644
GIT binary patch
literal 8010
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
LSC3TZs&l^w<75oz

delta 890
zcmah{J8#rL5cc|gw(op->n@z2IfPTB0E7gJqNJihX=tLQh>qLk&d5GTvreEv5emP6
zZBtOd51`;DfDjcDom;9j6o`(787Jg&5)!s{_M7)NV}IHF7$4ngHiQ0~&yPO1hVk9F
z^f-vO@Tk`)gdtdF<cu>$*v!n_;#Q5V%+4L|)Y#74+~Z#Eb3bqJMs0JlAP;$n*cDzD
z<xSqKv7fc_nD4~QxNnGt2woW?kg>FmZQe#pC?d2(s9Ssv^`>Z{-m3L^5kEAN_9+rG
z5>~k&Cqe=uTmN7^X6eZ6bx`#{9!gO1l$`}O9u%W=qTicc{c>ShpLnY}wsu*p$JPd$
z)9<Y9wK<H0cviGYjZlzXnJ9b{BE7xR(TV-GZ=)eGp@|o?NKDh~Oe(pef7;*Jvi{`U
za91hjivHysyLGofzi_*EY28&LReOVBnIdca90pKnpoWP*tzU&8MGA6Q?v({}^;h?5
zcZC9H`&RaTp~{|ac=xvE$-O{gkwo3LKbuk~*L;`IK}S({-}GHrs%Jg%cJC0Y!~zem
zGjcu|{xke-z2;v#`WJ^O<7xZrSn(#Fzl$b)Ct2Wa@pLd573*qTKsh`pRlS(1b8bFN
z<ukQDk`oE(aQ*Q>Nw6@p3eWxSxGeX<*1vn5Bii-Zf@zS8kORmR&_I>*q<~yOfS5aZ
u`aGRLNICQq0PO~d)un}B(69WBybuSO+@vOohK?A$i!3tnw&vY7>-_<rYp3x5

diff --git a/apps/system/forms.py b/apps/system/forms.py
index 68a4737..58cb4c0 100644
--- a/apps/system/forms.py
+++ b/apps/system/forms.py
@@ -2,9 +2,14 @@
 # @Author : RobbieHan
 # @File   : forms.py
 
+import re
 from django import forms
+from django.contrib.auth import get_user_model
+
 from .models import Structure
 
+User = get_user_model()
+
 
 class LoginForm(forms.Form):
     username = forms.CharField(required=True, error_messages={"requeired": "请填写用户名"})
@@ -15,3 +20,102 @@ class StructureForm(forms.ModelForm):
     class Meta:
         model = Structure
         fields = ['type', 'name', 'parent']
+
+
+class UserCreateForm(forms.ModelForm):
+    password = forms.CharField(
+        required=True,
+        min_length=6,
+        max_length=20,
+        error_messages={
+            "required": "密码不能为空",
+            "min_length": "密码长度最少6位数",
+        }
+    )
+
+    confirm_password = forms.CharField(
+        required=True,
+        min_length=6,
+        max_length=20,
+        error_messages={
+            "required": "确认密码不能为空",
+            "min_length": "密码长度最少6位数",
+        }
+    )
+
+    class Meta:
+        model = User
+        fields = [
+            'name', 'gender', 'birthday', 'username', 'mobile', 'email',
+            'department', 'post', 'superior', 'is_active', 'roles', 'password'
+        ]
+
+        error_messages = {
+            "name": {"required": "姓名不能为空"},
+            "username": {"required": "用户名不能为空"},
+            "email": {"required": "邮箱不能为空"},
+            "mobile": {
+                "required": "手机号码不能为空",
+                "max_length": "输入有效的手机号码",
+                "min_length": "输入有效的手机号码"
+            }
+         }
+
+    def clean(self):
+        cleaned_data = super(UserCreateForm, self).clean()
+        username = cleaned_data.get("username")
+        mobile = cleaned_data.get("mobile", "")
+        email = cleaned_data.get("email")
+        password = cleaned_data.get("password")
+        confirm_password = cleaned_data.get("confirm_password")
+
+        if User.objects.filter(username=username).count():
+            raise forms.ValidationError('用户名：{}已存在'.format(username))
+
+        if password != confirm_password:
+            raise forms.ValidationError("两次密码输入不一致")
+
+        if User.objects.filter(mobile=mobile).count():
+            raise forms.ValidationError('手机号码：{}已存在'.format(mobile))
+
+        REGEX_MOBILE = "^1[3578]\d{9}$|^147\d{8}$|^176\d{8}$"
+        if not re.match(REGEX_MOBILE, mobile):
+            raise forms.ValidationError("手机号码非法")
+
+        if User.objects.filter(email=email).count():
+            raise forms.ValidationError('邮箱：{}已存在'.format(email))
+
+
+class UserUpdateForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = [
+            'name', 'gender', 'birthday', 'username', 'mobile', 'email',
+            'department', 'post', 'superior', 'is_active', 'roles'
+        ]
+
+
+class PasswordChangeForm(forms.Form):
+
+    password = forms.CharField(
+        required=True,
+        min_length=6,
+        max_length=20,
+        error_messages={
+            "required": u"密码不能为空"
+        })
+
+    confirm_password = forms.CharField(
+        required=True,
+        min_length=6,
+        max_length=20,
+        error_messages={
+            "required": u"确认密码不能为空"
+        })
+
+    def clean(self):
+        cleaned_data = super(PasswordChangeForm, self).clean()
+        password = cleaned_data.get("password")
+        confirm_password = cleaned_data.get("confirm_password")
+        if password != confirm_password:
+            raise forms.ValidationError("两次密码输入不一致")
\ No newline at end of file
diff --git a/apps/system/urls.py b/apps/system/urls.py
index 4d680ee..7f45c89 100644
--- a/apps/system/urls.py
+++ b/apps/system/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path, re_path
 
 from .views import SystemView
-from . import views_structure
+from . import views_structure, views_user
 
 app_name = 'system'
 
@@ -12,5 +12,14 @@ urlpatterns = [
     path('basic/structure/list/', views_structure.StructureListView.as_view(), name='basic-structure-list'),
     path('basic/structure/delete/', views_structure.StructureDeleteView.as_view(), name='basic-structure-delete'),
     path('basic/structure/add_user/', views_structure.Structure2UserView.as_view(), name='basic-structure-add_user'),
-]
 
+    path('basic/user/', views_user.UserView.as_view(), name='basic-user'),
+    path('basic/user/list/', views_user.UserListView.as_view(), name='basic-user-list'),
+    path('basic/user/create/', views_user.UserCreateView.as_view(), name='basic-user-create'),
+    path('basic/user/detail/', views_user.UserDetailView.as_view(), name='basic-user-detail'),
+    path('basic/user/update/', views_user.UserUpdateView.as_view(), name='basic-user-update'),
+    path('basic/user/password_change/', views_user.PasswordChangeView.as_view(), name='basic-user-password_change'),
+    path('basic/user/delete/', views_user.UserDeleteView.as_view(), name='basic-user-delete'),
+    path('basic/user/enable/', views_user.UserEnableView.as_view(), name='basic-user-enable'),
+    path('basic/user/disable/', views_user.UserDisableView.as_view(), name='basic-user-disable'),
+]
diff --git a/apps/system/views_user.py b/apps/system/views_user.py
index 3e8999b..d575a31 100644
--- a/apps/system/views_user.py
+++ b/apps/system/views_user.py
@@ -2,14 +2,23 @@
 # @Author : RobbieHan
 # @File   : views_user.py
 
-from django.shortcuts import render
-from django.views.generic.base import View
-from django.http import HttpResponseRedirect
-from django.contrib.auth import authenticate, login, logout
-from django.urls import reverse
+import re
+import json
 
-from .forms import LoginForm
+from django.shortcuts import render, HttpResponse
+from django.views.generic.base import View, TemplateView
+from django.http import HttpResponseRedirect
+from django.contrib.auth import authenticate, login, logout, get_user_model
+from django.urls import reverse
+from django.contrib.auth.hashers import make_password
+from django.shortcuts import get_object_or_404
+from django.db.models import Q
+
+from .forms import LoginForm, UserCreateForm, UserUpdateForm, PasswordChangeForm
 from .mixin import LoginRequiredMixin
+from .models import Structure, Role
+
+User = get_user_model()
 
 
 class IndexView(LoginRequiredMixin, View):
@@ -51,4 +60,159 @@ class LogoutView(View):
 
     def get(self, request):
         logout(request)
-        return HttpResponseRedirect(reverse('login'))
\ No newline at end of file
+        return HttpResponseRedirect(reverse('login'))
+
+
+class UserView(LoginRequiredMixin, TemplateView):
+    template_name = 'system/users/user.html'
+
+
+class UserListView(LoginRequiredMixin, View):
+    def get(self, request):
+        fields = ['id', 'name', 'gender', 'mobile', 'email', 'department__name', 'post', 'superior__name', 'is_active']
+        filters = dict()
+        if 'select' in request.GET and request.GET['select']:
+            filters['is_active'] = request.GET['select']
+        ret = dict(data=list(User.objects.filter(**filters).values(*fields)))
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserCreateView(LoginRequiredMixin, View):
+    """
+    添加用户
+    """
+
+    def get(self, request):
+        users = User.objects.exclude(username='admin')
+        structures = Structure.objects.values()
+        roles = Role.objects.values()
+
+        ret = {
+            'users': users,
+            'structures': structures,
+            'roles': roles,
+        }
+        return render(request, 'system/users/user_create.html', ret)
+
+    def post(self, request):
+        user_create_form = UserCreateForm(request.POST)
+        if user_create_form.is_valid():
+            new_user = user_create_form.save(commit=False)
+            new_user.password = make_password(user_create_form.cleaned_data['password'])
+            new_user.save()
+            user_create_form.save_m2m()
+            ret = {'status': 'success'}
+        else:
+            pattern = '<li>.*?<ul class=.*?><li>(.*?)</li>'
+            errors = str(user_create_form.errors)
+            user_create_form_errors = re.findall(pattern, errors)
+            ret = {
+                'status': 'fail',
+                'user_create_form_errors': user_create_form_errors[0]
+            }
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserDetailView(LoginRequiredMixin, View):
+
+    def get(self, request):
+        user = get_object_or_404(User, pk=int(request.GET['id']))
+        users = User.objects.exclude(Q(id=int(request.GET['id'])) | Q(username='admin'))
+        structures = Structure.objects.values()
+        roles = Role.objects.values()
+        user_roles = user.roles.values()
+        ret = {
+            'user': user,
+            'structures': structures,
+            'users': users,
+            'roles': roles,
+            'user_roles': user_roles
+        }
+        return render(request, 'system/users/user_detail.html', ret)
+
+
+class UserUpdateView(LoginRequiredMixin, View):
+
+    def post(self, request):
+        if 'id' in request.POST and request.POST['id']:
+            user = get_object_or_404(User, pk=int(request.POST['id']))
+        else:
+            user = get_object_or_404(User, pk=int(request.user.id))
+        user_update_form = UserUpdateForm(request.POST, instance=user)
+        if user_update_form.is_valid():
+            user_update_form.save()
+            ret = {"status": "success"}
+        else:
+            ret = {"status": "fail", "message": user_update_form.errors}
+        return HttpResponse(json.dumps(ret), content_type="application/json")
+
+
+class PasswordChangeView(LoginRequiredMixin, View):
+
+    def get(self, request):
+        ret = dict()
+        if 'id' in request.GET and request.GET['id']:
+            user = get_object_or_404(User, pk=int(request.GET.get('id')))
+            ret['user'] = user
+        return render(request, 'system/users/passwd_change.html', ret)
+
+    def post(self, request):
+        if 'id' in request.POST and request.POST['id']:
+            user = get_object_or_404(User, pk=int(request.POST['id']))
+            form = PasswordChangeForm(request.POST)
+            if form.is_valid():
+                new_password = request.POST['password']
+                user.set_password(new_password)
+                user.save()
+                ret = {'status': 'success'}
+            else:
+                pattern = '<li>.*?<ul class=.*?><li>(.*?)</li>'
+                errors = str(form.errors)
+                password_change_form_errors = re.findall(pattern, errors)
+                ret = {
+                    'status': 'fail',
+                    'password_change_form_errors': password_change_form_errors[0]
+                }
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserDeleteView(LoginRequiredMixin, View):
+    """
+    删除数据：支持删除单条记录和批量删除
+    """
+
+    def post(self, request):
+        ret = dict(result=False)
+        if 'id' in request.POST and request.POST['id']:
+            id_list = map(int, request.POST['id'].split(','))
+            User.objects.filter(id__in=id_list).delete()
+            ret['result'] = True
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserEnableView(LoginRequiredMixin, View):
+    """
+    启用用户：单个或批量启用
+    """
+
+    def post(self, request):
+        if 'id' in request.POST and request.POST['id']:
+            id_nums = request.POST.get('id')
+            queryset = User.objects.extra(where=["id IN(" + id_nums + ")"])
+            queryset.filter(is_active=False).update(is_active=True)
+            ret = {'result': 'True'}
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class UserDisableView(LoginRequiredMixin, View):
+    """
+    启用用户：单个或批量启用
+    """
+
+    def post(self, request):
+        if 'id' in request.POST and request.POST['id']:
+            id_nums = request.POST.get('id')
+            queryset = User.objects.extra(where=["id IN(" + id_nums + ")"])
+            queryset.filter(is_active=True).update(is_active=False)
+            ret = {'result': 'True'}
+        return HttpResponse(json.dumps(ret), content_type='application/json')
\ No newline at end of file
diff --git a/db.sqlite3 b/db.sqlite3
index 08338da7e71fdd95be10d298f14eb48fee4371d6..1977f0d0d286436798d80db6eadafc798e6cfcae 100644
GIT binary patch
delta 1238
zcmah|&u`mQ9Jgb4YD$tfgtm?jkyOipX=?2E{3CX%qGe4RrOZy+xk(&NTAjpk?EH?C
zF3lxv>EN&f+mHw+B&JE+CQvmhu^Sw@?1(fD0f9E)52%nPf!k`U&?fdhym$D1^?9Ek
z-?usPY>qs)&f>${@66-FZ`SVmeIH{dfa(HYfJfjVP<KxT65!0~69mNV4ZEY)u61p_
z-E22XW>qIYZBeI5@Bo|q@Ful)lfu_WZvYN+d2e98wD-pDbYR0f*pkUp*w%S$eA??B
zACJC0ed?S@VK~;zSBfQc%`R(*<AV^<P6boTg~d*)xhNaye6Vz7^}3++6wT(dD{L=Y
zP0NfaF2%FTg~Y-oWEyHap=Z~t_9{D9?rL?TYB~p^p)dpC49y21jIaYXf`kw!Ajoll
zJly&1yZcZS#2HA>AXw9?Iuv*gvW)Y*aEx)$*6PK4qZcYPYGzF{bgHPAv~IN%vYH0D
zbrnBQ6m?H}y>55ZkNuybE7sCVTIp+*Sc)kJMWL#z;^pKAZJzHJv;CBUSgND-T3U(W
z>hbK7nNXyXk(0!QxfepX0AeDv7-7W_O|vwQh7bHM|CuNEzkG7*qu+0Tekg+xp4adv
zzw5mLhG9P*+J1KHec~v9b4~#6=%hoJqMY_C14wf;TQg$eex7RvW8tKkrBaqbGs##y
zg|eo>v2BsDmpd0O&nK4WRV!_-GV6?O&y}@$xluP-P6P+Uv&RuIe1zdcEJ6b0`eogy
zAMxcmUf@L`Ot%~Pys3)<cM<Z;D;=M3*t)<|4D5rayKk;N22;RCOykFSk>kXqTPxPg
z`ou22_K*K=^W?XW@V~)ZBuNsun>+&8$G|hN?*RM-#z+Fg$-QR-*Z8J~@GN4!@4Y+D
z6>@f#_gvkcCB~$kv1rH8#a2NmYBifJ<#iL5+hVs?r>*sTrAimWvQlAl)+I}=rOR@B
zfzBy%H5V)NWVBRHW)hsFtTK{PtR*uNlH)2&#tLXS@)Dm6Hl$busY(ImEU7OcwWszI
z*QK~@Ib*DB6_BK)Ejg3ekYhzNmsxNEP}xMCez6r$Jl+Zz<~W45XI+P+TTQ0ZZnVPH
zQj4$fOdggSJTkh1L7Tlgi#o~7O69Asy#zi5g#gV&ARS>*$oT<GnA@Jk4>5)#KM~mb
z(??9<69l+}fuF%1xZ_y20}??(!e3_$aWM2cBE!di;=BWY4+Fn~AHY2a{xdN5E)m6_
Tul~y-iT|`;;y?U_BK-dX)5c?p

delta 522
zcmZp8z|-)6XM!|i#Y7or#)^#zi{$yXGO+O%GV#yjzreqnzkRcSf+zpP0Devhc4l)9
zVHRfX$%Xo2ETU}8hRxmj+q?A{%N}qtFfcIkn=<g5ZdO##=C5z`U=(F&)O6$&=jG+(
zbmV0a<+apjU}Pvr%1%i$iZ9McG%__)F*Gs&0u^VciXdYPPsh|8cSn^>qx53WAm=D!
zr=WbVs^qMYg7UKTq^Kk>3!_R)kJO-~+@R9bs)FDk3j<pt149d4LjzqS0|i54D?=kI
zBXd17Gh;IYM#JgX<e21Hauah>r}N4)X>f6Y9r&Gr|NCaagtz=$9L(aJi7C06d0d+r
z6aLFDDiD}dz{1AJ|C@pTH&DfUenAEX7G_3H7Kp|_4E%q<!puN(w*RST;%MMu;%#Bz
zI|L*c81#U?F5%T^vSwoSZDDmZ$hF8a$TZ9?FiKA}GB7nP$|}l8&oE3cugEVmFVDB!
zzJ`~Xg;C1D7~yPla|2TogC=W6umRH_$TKT!f5pcv#mK?Lzny`9JO3S^^{e?+RG57k
p2^l~Awmh>YP~Tw&{zv?Wf%>-d%gHf2GD3pOP#4qQ=@0dp<pDnDiX{L5

diff --git a/templates/base-static.html b/templates/base-static.html
index f5e53b1..7e4b9a3 100644
--- a/templates/base-static.html
+++ b/templates/base-static.html
@@ -8,7 +8,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>SandBoxOA</title>
+  <title>SandBoxMP</title>
   <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
   <link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
   <link rel="stylesheet" href="{% static 'plugins/font-awesome/css/font-awesome.min.css' %}">
@@ -52,7 +52,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
               <div class="menu-info">
                 <h4 class="control-sidebar-subheading">SandBox</h4>
 
-                <p>沙盒协同办公平台</p>
+                <p>沙盒运维管理平台</p>
               </div>
             </a>
           </li>
diff --git a/templates/system/users/passwd_change.html b/templates/system/users/passwd_change.html
new file mode 100644
index 0000000..4519f84
--- /dev/null
+++ b/templates/system/users/passwd_change.html
@@ -0,0 +1,95 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+{% endblock %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ user.id }}"/>
+            <input type="hidden" name='user' value="save"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>基本信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">姓名</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="name" type="text" readonly="readonly"
+                                   value="{{ user.name }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">用户名</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control" name="username" readonly="readonly"
+                                   value="{{ user.username }}"/>
+                        </div>
+                    </div>
+
+                        <h4>密码信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="password" type="password" value=""/>
+                        </div>
+                        <label class="col-sm-2 control-label">确认密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="confirm_password" type="password" value=""/>
+                        </div>
+                    </div>
+
+                </fieldset>
+
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">确定</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/combo-select/jquery.combo.select.js' %}"></script>
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:basic-user-password_change' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.status == 'success') {
+                        layer.alert('密码修改成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll();
+                        });
+                    } else if (msg.status == 'fail') {
+                        layer.alert(msg.password_change_form_errors, {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        })
+
+
+    </script>
+
+{% endblock %}
diff --git a/templates/system/users/user.html b/templates/system/users/user.html
new file mode 100644
index 0000000..93176a6
--- /dev/null
+++ b/templates/system/users/user.html
@@ -0,0 +1,396 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}
+<link rel="stylesheet" href="{% static 'plugins/datatables/jquery.dataTables.min.css' %}">
+<link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+{% endblock %}
+
+{% block content %}
+
+    <!-- Main content -->
+  <section class="content">
+
+    <div id="devlist">
+        <div class="box box-primary" id="liebiao">
+            <div class="box-header">
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnRefresh" class="btn btn-default">
+                        <i class="glyphicon glyphicon-repeat"></i>刷新
+                    </button>
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnCreate" class="btn btn-default">
+                        <i class="glyphicon glyphicon-plus"></i>新增
+                    </button>
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnDelete" class="btn btn-default">
+                        <i class="glyphicon glyphicon-trash"></i>删除
+                    </button>
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnEnable" class="btn btn-default">
+                        <i class="glyphicon glyphicon-ok-circle"></i>启用
+                    </button>
+                    <button type="button" id="btnDisable" class="btn btn-default">
+                        <i class="glyphicon glyphicon-ban-circle"></i>禁用
+                    </button>
+                </div>
+                <div class="btn-group pull-right">
+                    <form class="form-inline">
+                        <div class="form-group">
+                            <label>用户状态：</label>
+                            <select id="select" name="select" class="form-control">
+                                <option style='text-align:center' value=''>-----所有-----</option>
+                                <option value="True">启用</option>
+                                <option value="False">禁用</option>
+                            </select>
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <div class="box-body">
+                <table id="dtbList" class="display" cellspacing="0" width="100%">
+                    <thead>
+                    <tr valign="middle">
+                        <th><input type="checkbox" id="checkAll"></th>
+                        <th>ID</th>
+                        <th>姓名</th>
+                        <th>性别</th>
+                        <th>手机</th>
+                        <th>邮箱</th>
+                        <th>部门</th>
+                        <th>职位</th>
+                        <th>上级</th>
+                        <th>状态</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
+                <br> <br>
+            </div>
+        </div>
+    </div>
+  </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+{% block javascripts %}
+<script src="{% static 'plugins/datatables/jquery.dataTables.min.js' %}"></script>
+<script src="{% static 'plugins/datatables/dataTables.const.js' %}"></script>
+<script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+
+<script type="text/javascript">
+    var oDataTable = null;
+    $(function () {
+        oDataTable = initTable();
+
+        function initTable() {
+            var oTable = $('#dtbList').DataTable($.extend(true, {},
+                DATATABLES_CONSTANT.DATA_TABLES.DEFAULT_OPTION,
+                {
+                    ajax: {
+                        "url": "{% url 'system:basic-user-list' %}",
+                        "data": function (d) {
+                            d.select = $("#select").val();
+                        }
+                    },
+                    columns: [
+                        DATATABLES_CONSTANT.DATA_TABLES.COLUMN.CHECKBOX,
+                        {
+                            data: "id",
+                            width: "5%",
+                        },
+                        {
+                            data: "name",//parent
+                            width: "10%",
+                        },
+                        {
+                            data: "gender",
+                            width: "10%",
+                            render: function (data, type, row, meta) {
+                                if (data == 'male') {
+                                    return "男";
+                                } else {
+                                    return "女";
+                                }
+                            }
+                        },
+                        {
+                            data: "mobile",
+                        },
+                        {
+                            data: "email",
+                        },
+                        {
+                            data: "department__name",
+                        },
+
+                        {
+                            data: "post",
+                        },
+                        {
+                            data: "superior__name",
+                        },
+                        {
+                            data: "is_active",
+                            render: function (data) {
+                                if (data == true) {
+                                    return "启用";
+                                } else {
+                                    return "禁用";
+                                }
+                            }
+                        },
+                        {
+                            data: "id",
+                            width: "12%",
+                            bSortable: "false",
+                            render: function (data, type, row, meta) {
+                                var ret = "";
+                                var ret = "<button title='详情-编辑' onclick='doUpdate("
+                                    + data + ")'><i class='glyphicon glyphicon-pencil'></i></button>";
+                                ret = ret + "<button name='btnChangepasswd' title='修改密码' onclick='doChangepasswd("
+                                    + data + ")'><i class='glyphicon glyphicon-asterisk'></i></button>";
+                                ret = ret + "<button name='btnConfig' title='删除' onclick='doDelete("
+                                    + data + ")'><i class='glyphicon glyphicon-trash'></i></button>";
+                                return ret;
+                            }
+                        }],
+                    "order": [
+                        [2, 'desc']
+                    ],
+                }));
+            return oTable;
+        }
+    });
+</script>
+<script type="text/javascript">
+    $("#btnCreate").click(function () {
+        var div = layer.open({
+            type: 2,
+            title: '新增',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '720px'],
+            content: '/system/basic/user/create',
+            end: function () {
+                //关闭时做的事情
+                oDataTable.ajax.reload();
+            }
+        });
+        layer.full(div)
+    });
+
+            // 跳转到用户详情页面
+    function doUpdate(id) {
+        var div = layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '650px'],
+            content: ["{% url 'system:basic-user-detail' %}" + '?id=' + id, 'no'],
+            end: function () {
+                oDataTable.ajax.reload();
+            }
+        });
+        layer.full(div)
+    }
+
+    function doChangepasswd(id) {
+    layer.open({
+        type: 2,
+        title: '编辑',
+        shadeClose: false,
+        maxmin: true,
+        area: ['850px', '350px'],
+        content: ["{% url 'system:basic-user-password_change' %}" + '?id=' + id, 'no'],
+        end: function () {
+            oDataTable.ajax.reload();
+        }
+    });
+}
+
+//checkbox全选
+$("#checkAll").on("click", function () {
+    if ($(this).prop("checked") === true) {
+        $("input[name='checkList']").prop("checked", $(this).prop("checked"));
+        $('#example tbody tr').addClass('selected');
+    } else {
+        $("input[name='checkList']").prop("checked", false);
+        $('#example tbody tr').removeClass('selected');
+    }
+});
+
+//批量删除
+$("#btnDelete").click(function () {
+    if ($("input[name='checkList']:checked").length == 0) {
+        layer.msg("请选择要删除的记录");
+        return;
+    }
+
+    var arrId = new Array();
+    $("input[name='checkList']:checked").each(function () {
+        //alert($(this).val());
+        arrId.push($(this).val());
+    });
+
+    sId = arrId.join(',');
+
+    layer.alert('确定删除吗？', {
+        title: '提示'
+        , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+        , time: 0 //不自动关闭
+        , btn: ['YES', 'NO']
+        , yes: function (index) {
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "{% url 'system:basic-user-delete' %}",
+                data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert("操作成功");
+                        oDataTable.ajax.reload();
+                    } else {
+                        //alert(msg.message);
+                        layer.alert("操作失败");
+                    }
+                    return;
+                }
+            });
+        }
+    });
+});
+
+//批量启用
+$("#btnEnable").click(function () {
+    if ($("input[name='checkList']:checked").length == 0) {
+        layer.msg("请选择要启用的用户");
+        return;
+    }
+
+    var arrId = new Array();
+    $("input[name='checkList']:checked").each(function () {
+        //alert($(this).val());
+        arrId.push($(this).val());
+    });
+
+    sId = arrId.join(',');
+
+    layer.alert('确定启用吗？', {
+        title: '提示'
+        , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+        , time: 0 //不自动关闭
+        , btn: ['YES', 'NO']
+        , yes: function (index) {
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "{% url 'system:basic-user-enable' %}",
+                data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert("启用用户成功", {icon: 1});
+                        oDataTable.ajax.reload();
+                    } else {
+                        //alert(msg.message);
+                        layer.alert("启用用户失败", {icon: 5});
+                    }
+                    return;
+                }
+            });
+        }
+    });
+});
+
+//批量禁用
+$("#btnDisable").click(function () {
+    if ($("input[name='checkList']:checked").length == 0) {
+        layer.msg("请选择要禁用的用户");
+        return;
+    }
+
+    var arrId = new Array();
+    $("input[name='checkList']:checked").each(function () {
+        //alert($(this).val());
+        arrId.push($(this).val());
+    });
+
+    sId = arrId.join(',');
+
+    layer.alert('确定禁用吗？', {
+        title: '提示'
+        , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+        , time: 0 //不自动关闭
+        , btn: ['YES', 'NO']
+        , yes: function (index) {
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "{% url 'system:basic-user-disable' %}",
+                data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert("禁用用户成功", {icon: 1});
+                        oDataTable.ajax.reload();
+                    } else {
+                        //alert(msg.message);
+                        layer.alert("禁用用户失败", {icon: 5});
+                    }
+                    return;
+                }
+            });
+        }
+    });
+});
+
+//删除单个用户
+function doDelete(id) {
+    layer.alert('确定删除吗？', {
+        title: '提示'
+        , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+        , time: 0 //不自动关闭
+        , btn: ['YES', 'NO']
+        , yes: function (index) {
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "{% url 'system:basic-user-delete' %}",
+                data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},  //防止post数据时报 csrf_token 403
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('删除成功', {icon: 1});
+                        oDataTable.ajax.reload();
+                    } else {
+                        //alert(msg.message);
+                        layer.alert('删除失败', {icon: 5});
+                    }
+                    return;
+                }
+            });
+        }
+    });
+
+}
+
+$("#select").change(function () {
+    //alert($("#select").val())
+    oDataTable.ajax.reload();
+});
+
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/system/users/user_create.html b/templates/system/users/user_create.html
new file mode 100644
index 0000000..b414269
--- /dev/null
+++ b/templates/system/users/user_create.html
@@ -0,0 +1,202 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+    <link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap-datetimepicker.min.css' %}">
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ user.id }}"/>
+            <input type="hidden" name='user' value="save"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>基本信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">姓名</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="name" type="text" value=""/>
+                        </div>
+                        <label class="col-sm-2 control-label">性别</label>
+                        <div class="col-sm-3">
+                            <select class="form-control" name="gender">
+                                <option value="male">男</option>
+                                <option value="famale">女</option>
+                            </select>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">生日</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control pull-right form_datetime" name="birthday"/>
+                        </div>
+                        <label class="col-sm-2 control-label">用户名</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control" name="username"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">状态</label>
+                        <div class="col-sm-6">
+                            <label class="control-label">
+                                <input type="radio" class="minimal" name="is_active" value="True" checked>启用
+                            </label>
+                            <label class="control-label">
+                                <input type="radio" class="minimal" name="is_active" value="False">禁用
+                            </label>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4>密码信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="password" type="password" value=""/>
+                        </div>
+                        <label class="col-sm-2 control-label">确认密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="confirm_password" type="password" value=""/>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4>联系信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">手机</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="mobile" type="text"/>
+                        </div>
+                        <label class="col-sm-2 control-label">邮箱</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="email" type="text"/>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4>职员信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">入职日期</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control pull-right form_datetime" name="joined_date"/>
+                        </div>
+                        <label class="col-sm-2 control-label">部门</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" style="width:100%;" name="department">
+                                <option value="">--部门--</option>
+                                {% for structure in structures %}
+                                    <option value="{{ structure.id }}">{{ structure.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">岗位</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="post" type="text"/>
+                        </div>
+                        <label class="col-sm-2 control-label">上级</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" style="width:100%;" name="superior">
+                                <option value="">--上级--</option>
+                                {% for user in users %}
+                                    <option value="{{ user.id }}">{{ user.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">所属角色组</label>
+                        <div class="col-sm-6">
+                            {% for role in roles %}
+                                <label class="control-label">
+                                    <input type="checkbox" class="minimal" name="roles" value="{{ role.id }}"
+                                           {% if role in user_roles %}checked{% endif %}>
+                                    {{ role.name }}
+                                </label>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </fieldset>
+
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:basic-user-create' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.status == 'success') {
+                        layer.alert('用户添加成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else if (msg.status == 'fail') {
+                        layer.alert(msg.user_create_form_errors, {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        })
+
+        /*input 时间输入选择*/
+        $(".form_datetime").datetimepicker({
+            language: 'zh',
+            minView: 'month', //选择范围只到日期，不选择时分
+            //weekStart: 1,
+            //todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            //startView: 2,
+            forceParse: 0,
+            showMeridian: 1,
+            format: 'yyyy-mm-dd'
+        }).on('changeDate', function (ev) {
+            $(this).datetimepicker('hide');
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+    </script>
+
+{% endblock %}
diff --git a/templates/system/users/user_detail.html b/templates/system/users/user_detail.html
new file mode 100644
index 0000000..b39431e
--- /dev/null
+++ b/templates/system/users/user_detail.html
@@ -0,0 +1,192 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap-datetimepicker.min.css' %}">
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ user.id }}"/>
+            <input type="hidden" name='user' value="save"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>基本信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">姓名</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="name" type="text" value="{{ user.name }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">性别</label>
+                        <div class="col-sm-3">
+                            <select class="form-control" name="gender">
+                                <option value={{ user.gender }}> {{ user.get_gender_display }} </option>
+                                <option value="male">男</option>
+                                <option value="famale">女</option>
+                            </select>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">生日</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control pull-right form_datetime" name="birthday"
+                                   value="{{ user.birthday|date:"Y-m-d" }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">用户名</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control" name="username" readonly="readonly"
+                                   value="{{ user.username }}"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">状态</label>
+                        <div class="col-sm-6">
+                            <label class="control-label">
+                                <input type="radio" class="minimal" name="is_active" value="True"
+                                       {% ifequal user.is_active True %}checked{% endifequal %}>启用
+                            </label>
+                            <label class="control-label">
+                                <input type="radio" class="minimal" name="is_active" value="False"
+                                       {% ifequal user.is_active False %}checked{% endifequal %}>禁用
+                            </label>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4 clase="">联系信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">手机</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="mobile" readonly="readonly" type="text"
+                                   value="{{ user.mobile }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">邮箱</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="email" type="text" value="{{ user.email }}"/>
+                        </div>
+                    </div>
+                    <legend>
+                        <h4>职员信息</h4>
+                    </legend>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">入职日期</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control pull-right form_datetime" name="joined_date"
+                                   value="{{ user.joined_date|date:"Y-m-d" }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">部门</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" style="width:100%;" name="department">
+                                <option value="{{ user.department.id }}">{{ user.department.name|default:"--部门--" }}</option>
+                                {% for structure in structures %}
+                                    <option value="{{ structure.id }}">{{ structure.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">岗位</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="post" type="text"
+                                   value="{{ user.post|default_if_none:"" }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">上级</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" style="width:100%;" name="superior">
+                                <option value="{{ user.superior.id }}">{{ user.superior.name|default:"--上级--" }}</option>
+                                {% for user in users %}
+                                    <option value="{{ user.id }}">{{ user.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">所属角色组</label>
+                        <div class="col-sm-6">
+                            {% for role in roles %}
+                                <label class="control-label">
+                                    <input type="checkbox" class="minimal" name="roles" value="{{ role.id }}"
+                                           {% if role in user_roles %}checked{% endif %}>
+                                    {{ role.name }}
+                                </label>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </fieldset>
+
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        })
+
+        /*input 时间输入选择*/
+        $(".form_datetime").datetimepicker({
+            language: 'zh',
+            minView: 'month',
+            //weekStart: 1,
+            //todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            //startView: 2,
+            forceParse: 0,
+            showMeridian: 1,
+            format: 'yyyy-mm-dd'
+        }).on('changeDate', function (ev) {
+            $(this).datetimepicker('hide');
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:basic-user-update' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.status == 'success') {
+                        layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else if (msg.status == 'fail') {
+                        layer.alert('数据保存失败', {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+            });
+    </script>
+{% endblock %}