wushaodong hace 4 años
padre
commit
dcc88d7131
Se han modificado 2 ficheros con 31 adiciones y 63 borrados
  1. 22 46
      apps/account/views.py
  2. 9 17
      uis/views/index.html

+ 22 - 46
apps/account/views.py

@@ -248,56 +248,32 @@ class StoreTreeView(APIView):
         id = request.GET.get('id')
         store_data = []
 
-        # 查询用户的代理商和管理的门店
-        user = User.objects.filter(id=id).first()
-        general_agents = GeneralAgent.objects.filter()
+        # 查询当前用户的代理商和管理的门店
         agents = Agent.objects.filter()
-        stores = Store.objects.filter()
-        manage_user = ManageStoreUser.objects.filter(manage_user_id=user.id)
-        if not user.is_superuser:
-            general_agents = GeneralAgent.objects.filter(id=user.general_agent_id)
-            if user.agent:
-                agents = Agent.objects.filter(id=user.agent_id,
-                                              general_agent_id=user.general_agent_id)
-                if user.store:
-                    if not manage_user:
-                        raise CustomError(u'无门店管理权限!')
-                    stores = Store.objects.filter(id=user.store_id, id__in=user.get_manager_range(),
-                                                  check_user__isnull=False, enable=True)
-        general_agents = general_agents.values('id', 'name')
-        for general_agent in general_agents:
-            general_agent_item = {
-                'title': general_agent['name'],
-                'id': general_agent['id'],
-                'field': 'general_agent',
+        if not request.user.is_superuser:
+            agents = agents.filter(id=request.user.agent_id)
+        agents = agents.values('id', 'name')
+        for agent in agents:
+            item = {
+                'title': agent['name'],
+                'id': agent['id'],
+                'field': 'agent',
                 'children': [],
             }
-            if not user.agent:
-                agents = Agent.objects.filter(general_agent_id=general_agent['id'])
-            agents = agents.values('id', 'name')
-            for agent in agents:
-                agent_item = {
-                    'title': agent['name'],
-                    'id': agent['id'],
-                    'field': 'agent',
-                    'children': [],
+            stores = Store.objects.filter(agent_id=agent['id'], id__in=request.user.get_manager_range(),
+                                          check_user__isnull=False, enable=True).values('id', 'name')
+            for store in stores:
+                manage_store = ManageStoreUser.objects.filter(manage_user_id=id, store_id=store['id']).first()
+                checked = manage_store and True or False
+                store_item = {
+                    'title': store['name'],
+                    'id': store['id'],
+                    'checked': checked,
+                    'field': 'store_{}'.format(store['id']),
                 }
-                general_agent_item['children'].append(agent_item)
-                if not user.store:
-                    stores = Store.objects.filter(agent_id=agent['id'], check_user__isnull=False, enable=True)
-                stores = stores.values('id', 'name')
-                for store in stores:
-                    manage_store = ManageStoreUser.objects.filter(manage_user_id=id, store_id=store['id']).first()
-                    checked = manage_store and True or False
-                    store_item = {
-                        'title': store['name'],
-                        'id': store['id'],
-                        'checked': checked,
-                        'field': 'store_{}'.format(store['id']),
-                    }
-                    agent_item['checked'] = checked
-                    agent_item['children'].append(store_item)
-            store_data.append(general_agent_item)
+                item['checked'] = checked
+                item['children'].append(store_item)
+            store_data.append(item)
 
         return response_ok(store_data)
 

+ 9 - 17
uis/views/index.html

@@ -9,7 +9,7 @@
           content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
-    <link rel="shortcut icon" href="/static/imgs/favicon.ico" />
+    <link rel="shortcut icon" href="/static/imgs/favicon.ico"/>
 </head>
 <body class="layui-layout-body">
 
@@ -88,9 +88,9 @@
                         </dl>
                     </li>
                     <li data-name="set" class="layui-nav-item">
-                        <a href="javascript:;" lay-tips="潜客作业" lay-direction="2">
+                        <a href="javascript:;" lay-tips="客户服务管理" lay-direction="2">
                             <i class="layui-icon layui-icon-set"></i>
-                            <cite>潜客作业</cite>
+                            <cite>客户服务管理</cite>
                         </a>
                         <dl class="layui-nav-child">
                             <dd data-name="nav" data-permission="customer.view_report_customer">
@@ -105,22 +105,14 @@
                             <dd data-name="nav" data-permission="customer.check_review">
                                 <a lay-href="customer/check_index.html">跟踪审核</a>
                             </dd>
+                            <dd data-name="nav" data-permission="order.view_order">
+                                <a lay-href="order/index.html">订单管理</a>
+                            </dd>
+                            <dd data-name="nav" data-permission="order.order_process_dispatch">
+                                <a lay-href="order/dispatch_process_index.html">进度分配</a>
+                            </dd>
                         </dl>
                     </li>
-                    <li data-name="set" class="layui-nav-item">
-                      <a href="javascript:;" lay-tips="订单作业" lay-direction="2">
-                          <i class="layui-icon layui-icon-set"></i>
-                          <cite>订单作业</cite>
-                      </a>
-                      <dl class="layui-nav-child">
-                          <dd data-name="nav" data-permission="order.view_order">
-                              <a lay-href="order/index.html">订单管理</a>
-                          </dd>
-                          <dd data-name="nav" data-permission="order.order_process_dispatch">
-                              <a lay-href="order/dispatch_process_index.html">进度分配</a>
-                          </dd>
-                      </dl>
-                  </li>
                 </ul>
             </div>
         </div>