...

apps/api/admin/views.py

@@ -15,8 +15,8 @@ class AdminUserLoginView(ObtainJSONWebToken):
 
     def post(self, request, *args, **kwargs):
 
-        if not checkLicence():
-            raise CustomError(u'授权失败！')
+        #if not checkLicence():
+        #    raise CustomError(u'授权失败！')
 
         try:
             ser = self.serializer_class(data=request.data)

apps/staff/filters.py

@@ -8,12 +8,13 @@ User = get_user_model()
 
 class UserFilter(django_filters.FilterSet):
     username = django_filters.CharFilter(field_name='username', lookup_expr='icontains')
+    name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
     is_active = django_filters.CharFilter(field_name='is_active')
     department = django_filters.CharFilter(field_name='department_id')
 
     class Meta:
         model = User
-        fields = ['username', 'is_active', 'type', ]
+        fields = ['username', 'name', 'is_active', 'type', ]
 
 class DepartmentFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')

uis/admin/user/edit.html

@@ -41,7 +41,7 @@
                 </div>
 
                   <div class="layui-col-lg6">
-                  <label class="layui-form-label"><font color='red' size="4">*</font>账号：</label>
+                  <label class="layui-form-label"><font color='red' size="4">*</font>用户名：</label>
                   <div class="layui-input-block">
                     <input type="text" name="username" lay-verify="required" placeholder="请输入用户名" autocomplete="off" class="layui-input">
                   </div>

uis/admin/user/index.html

@@ -72,12 +72,19 @@
             </div>
 
             <div class="layui-col-xs12 layui-col-sm12">
-                <label class="layui-form-label">登录账号：</label>
+                <label class="layui-form-label">用户名：</label>
                 <div class="layui-input-block">
                     <input type="text" name="username" autocomplete="off" class="layui-input">
                 </div>
             </div>
 
+              <div class="layui-col-xs12 layui-col-sm12">
+                <label class="layui-form-label">姓名：</label>
+                <div class="layui-input-block">
+                    <input type="text" name="name" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+
 
           </div>
           <div class="layui-form-item" style="display: none">
@@ -107,7 +114,7 @@
       ,url: '/admin/user/'
       ,cols: [[
         {field:'name', title:'姓名',width: 100}
-        ,{field:'username', title:'登录账号',width: 200}
+        ,{field:'username', title:'用户名',width: 200}
         ,{field:'department_text', title:'所属部门', width:300}
         ,{field:'type_text', title:'类型', width:90}
         ,{field:'status_text', title:'启用', width:90}