diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f07f988..e812634 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,21 +4,29 @@ <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> a328e88122d80e72999261759f2594796f8da35b +======= + +>>>>>>> 1-rbac - + +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1-rbac >>>>>>> a328e88122d80e72999261759f2594796f8da35b +======= + +>>>>>>> 1-rbac + + + reverse + OA + + @@ -136,21 +179,26 @@ @@ -161,10 +209,14 @@ DEFINITION_ORDER +<<<<<<< HEAD @@ -211,12 +263,6 @@ - - - - - - @@ -233,7 +279,7 @@ - + + +
+
+ +

基本信息

+ +
+ +
+ +
+ +
+ +
+
+ +

密码信息

+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+
+ + +
+
+ + + + +{% endblock %} + +{% block javascripts %} + + + + +{% 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 %} + + +{% endblock %} + +{% block content %} + + +
+ +
+
+
+
+ +
+
 
+
+ +
+
 
+
+ +
+
 
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
ID姓名性别手机邮箱部门职位上级状态操作
+

+
+
+
+
+ + + +{% endblock %} + +{% block javascripts %} + + + + + + +{% 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 %} + + + +{% endblock %} + +{% block main %} +
+
+ {% csrf_token %} + + +
+
+ +

基本信息

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ + +
+
+ +

密码信息

+ +
+ +
+ +
+ +
+ +
+
+ +

联系信息

+ +
+ +
+ +
+ +
+ +
+
+ +

职员信息

+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ {% for role in roles %} + + {% endfor %} +
+
+
+ +
+
+
+ + +
+
+ +
+
+ +{% endblock %} + +{% block javascripts %} + + + + +{% 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 %} + + +{% endblock %} + +{% block main %} +
+
+ {% csrf_token %} + + +
+
+ +

基本信息

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ + +
+
+ +

联系信息

+ +
+ +
+ +
+ +
+ +
+
+ +

职员信息

+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ {% for role in roles %} + + {% endfor %} +
+
+
+ +
+
+
+ + +
+
+ +
+
+ +{% endblock %} + +{% block javascripts %} + + + +{% endblock %}