Merge remote-tracking branch 'origin/master'

apps/account/views.py

@@ -299,7 +299,6 @@ class StoreTreeView(APIView):
                         'checked': checked,
                         'field': 'store_{}'.format(store['id']),
                     }
-                    agent_item['checked'] = checked
                     agent_item['children'].append(store_item)
             store_data.append(general_agent_item)
 

apps/customer/urls.py

@@ -6,7 +6,7 @@ from .views import *
 
 urlpatterns = [
     url(r'^dict/$', ReportCustomerDictView.as_view()),
-    url(r'^get_user/$', UserDictView.as_view()),
+    url(r'^get_user/$', UserDictView.as_view()), # 客户报备审核、重新分配客户加载用户
     url(r'^stage_count/$', StageCountView.as_view()), # 客户阶段提醒
     url(r'^list_count/$', ListCountView.as_view()),
 

apps/customer/views.py

@@ -282,7 +282,7 @@ class NewCustomerViewSet(CustomModelViewSet):
                     for project in projects:
                         order.project.add(project.id)
                 # 创建订单流程,保存图片
-                user = self.request.user
+                user = request.user
                 operation = u'更新进度为：{}'.format(order.stage_progress.name)
                 progress_details = ProgressDetails.objects.create(order=order, user=user, operation=operation,
                                                                   notes=notes)

uis/views/index.html

@@ -100,16 +100,16 @@
                                 <a lay-href="report_check/index.html">报备审核</a>
                             </dd>
                             <dd data-name="nav" data-permission="customer.view_new_customer">
-                                <a lay-href="customer/index.html">潜客跟踪</a>
+                                <a lay-href="customer/index.html">客户跟踪</a>
                             </dd>
                             <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>
+                                <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>
+                                <a lay-href="order/dispatch_process_index.html">进度审核</a>
                             </dd>
                         </dl>
                     </li>