基础数据 权限

apps/account/models.py

@@ -78,6 +78,7 @@ class User(AbstractBaseUser, PermissionsMixin):
             ('add_user', u'添加'),
             ('delete_user', u'删除'),
             ('check_user', u'入职审核'),
+            ('manager_store', u'管理门店'),
         ]
 
     def __unicode__(self):

apps/account/serializers.py

@@ -81,6 +81,8 @@ class EmployeeSerializer(serializers.ModelSerializer):
         # 代理商添加的账号，默认就是操作人所在的代理商
         user = self.context['request'].user
         validated_data['create_user'] = user
+        validated_data['check_user'] = user
+        validated_data['status'] = User.INSERVICE
         instance = super(EmployeeSerializer, self).create(validated_data)
         instance.set_password(validated_data['password'])
         instance.save()

apps/account/urls.py

@@ -5,9 +5,10 @@ from apps.account.views import *
 urlpatterns = [
     url(r'^login/$', LoginView.as_view()),
     url(r'^token_refresh/$', RefreshTokenView.as_view()),
-    url(r'^permission/dict/$', PermissionDictView.as_view()),
-    url(r'^permission/all/$', PermissionsListView.as_view()),
-    url(r'^store/tree/$', StoreTreeView.as_view()),
+
+    url(r'^permission/dict/$', PermissionDictView.as_view()), # 人员管理，编辑，权限组
+    url(r'^permission/all/$', PermissionsListView.as_view()), # 权限管理，编辑，加载所有权限
+    url(r'^store/tree/$', StoreTreeView.as_view()), # 人员管理，管理门店，加载门店
 ]
 
 router = SimpleRouter()

apps/account/views.py

@@ -83,6 +83,7 @@ class EmployeeViewSet(CustomModelViewSet):
                               u'删除账号[%s]，id=%d' % (instance.username, instance.id))
         super(EmployeeViewSet, self).perform_destroy(instance)
 
+    @permission_required('account.check_user')
     @action(methods=['post'], detail=True)
     def join(self, request, pk):
         try:
@@ -98,6 +99,7 @@ class EmployeeViewSet(CustomModelViewSet):
             traceback.print_exc()
             return response_error(u'入职失败')
 
+    @permission_required('account.manager_store')
     @action(methods=['post'], detail=True)
     def branch(self, request, pk):
         data = json.loads(request.POST.get('sotres'))
@@ -159,6 +161,7 @@ class GroupsViewSet(CustomModelViewSet):
 class PermissionsListView(APIView):
     permission_classes = [isLogin, ]
 
+    @permission_required('account.manager_permissions')
     def get(self, request):
         rows = Permission.objects.all().exclude(name__startswith='Can')
         perms_menus = PermissionMenu()
@@ -180,6 +183,8 @@ class PermissionsListView(APIView):
 
 class PermissionDictView(APIView):
     permission_classes = [isLogin, ]
+
+    @permission_required('account.manager_store')
     def get(self, request):
         rows = Group.objects.filter()
         print()
@@ -193,6 +198,7 @@ class PermissionDictView(APIView):
 class StoreTreeView(APIView):
     permission_classes = [isLogin, ]
 
+    @permission_required('account.manager_store')
     def get(self, request):
         id = request.GET.get('id')
         store_data = []

apps/option/models.py

@@ -36,7 +36,7 @@ class Option(models.Model):
         permissions = [
             ('browse_option', u'查看'),
             ('add_option', u'添加'),
-            ('delete_option', u'删除'),
+            # ('delete_option', u'删除'),
         ]
 
     @staticmethod

uis/views/agent/index.html

@@ -58,7 +58,7 @@
                 <div class="layui-col-md12">
                     <div class="LAY-btns" style="margin-bottom: 10px;">
                         <div style="float: left">
-                            <button class="layui-btn" id="agent_add"><i
+                            <button class="layui-btn" id="agent_add" data-permission="agent.add_agent"><i
                                     class="layui-icon layui-icon-add-circle"></i>添加
                             </button>
                         </div>
@@ -79,11 +79,11 @@
 
                     <script type="text/html" id="agent-operate-bar">
                         <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-xs" lay-event="agent_edit"
+                            <a class="layui-btn layui-btn-xs" lay-event="agent_edit" data-permission="agent.add_agent"
                             >修改</a>
                         </div>
                         <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="agent_del"
+                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="agent_del" data-permission="agent.delete_agent"
                             >删除</a>
                         </div>
                     </script>
@@ -116,7 +116,7 @@
                 , {field: 'create_user_text', title: '添加人', width: 100}
                 , {field: 'create_time', title: '添加时间', width: 180}
                 , {field: 'notes', title: '备注', width: 200}
-                , {width: 150, align: 'center', fixed: 'right', toolbar: '#customer-operate-bar'}
+                , {width: 150, align: 'center', fixed: 'right', toolbar: '#agent-operate-bar'}
             ]]
             , page: true
             , height: 'full-108'

uis/views/employee/index.html

@@ -27,7 +27,8 @@
                 <div class="layui-col-md12">
                     <div class="LAY-btns" style="margin-bottom: 10px;">
                         <div style="float:left; margin-right: 5px; margin-top: 5px;">
-                            <button class="layui-btn" id="btn_add"><i class="layui-icon layui-icon-add-circle"></i>添加
+                            <button class="layui-btn" id="btn_add" data-permission="account.add_user">
+                                <i class="layui-icon layui-icon-add-circle"></i>添加
                             </button>
                         </div>
 
@@ -63,15 +64,15 @@
                         </div>
                         <div class="layui-btn-group">
                             <a class="layui-btn layui-btn-xs" lay-event="edit"
-                               data-permission="account.add_employee">修改</a>
+                               data-permission="account.add_user">修改</a>
                         </div>
                         <div class="layui-btn-group">
                             <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete"
-                               data-permission="account.delete_employee">删除</a>
+                               data-permission="account.delete_user">删除</a>
                         </div>
                         <div class="layui-btn-group">
                             <a class="layui-btn layui-btn-xs layui-btn-warm"
-                               data-permission="account.add_employee"
+                               data-permission="account.manager_store"
                                lay-event="manage_range">管理门店</a>
                         </div>
                     </script>

uis/views/option/index.html

@@ -58,7 +58,8 @@
                 <div class="layui-col-md12">
                     <div class="LAY-btns" style="margin-bottom: 10px;">
                         <div style="float:left; margin-right: 5px; margin-top: 5px;">
-                            <button class="layui-btn" id="btn_add"><i class="layui-icon layui-icon-add-circle"></i>添加
+                            <button class="layui-btn" id="btn_add" data-permission="option.add_option">
+                                <i class="layui-icon layui-icon-add-circle"></i>添加
                             </button>
                         </div>
 
@@ -91,7 +92,7 @@
 
                     <script type="text/html" id="datagrid-operate-bar">
                         <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-xs" lay-event="edit">修改</a>
+                            <a class="layui-btn layui-btn-xs" lay-event="edit" data-permission="option.add_option">修改</a>
                         </div>
                     </script>
                 </div>

uis/views/store/index.html

@@ -59,7 +59,7 @@
                     <div class="LAY-btns" style="margin-bottom: 10px;">
                         <div style="float: left">
                             <button class="layui-btn" id="store_add"><i
-                                    class="layui-icon layui-icon-add-circle"></i>添加
+                                    class="layui-icon layui-icon-add-circle" data-permission="agent.add_store"></i>添加
                             </button>
                         </div>
                         <form class="layui-form" lay-filter="query-form-element1">
@@ -79,11 +79,11 @@
 
                     <script type="text/html" id="store-operate-bar">
                         <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-xs" lay-event="store_edit"
+                            <a class="layui-btn layui-btn-xs" lay-event="store_edit" data-permission="agent.add_store"
                             >修改</a>
                         </div>
                         <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="store_del"
+                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="store_del" data-permission="agent.delete_store"
                             >删除</a>
                         </div>
                     </script>