Merge remote-tracking branch 'origin/master'

# Conflicts:
#	uis/views/customer/index.html

apps/account/views.py

@@ -284,6 +284,7 @@ class EmployeeTreeView(APIView):
                     }
                     general_agent_item['children'].append(general_agent_user_item)
                 employee_data.append(general_agent_item)
+
         agents = agents.values('id', 'name')
         for agent in agents:
             agent_item = {
@@ -300,7 +301,7 @@ class EmployeeTreeView(APIView):
                     'field': 'agent_user',
                 }
                 agent_item['children'].append(agent_user_item)
-            stores = stores.values('id', 'name')
+            stores = stores.filter(agent_id=agent['id'], enable=True).values('id', 'name')
             for store in stores:
                 store_item = {
                     'title': store['name'],

uis/views/account/login.html

@@ -117,6 +117,7 @@
         ,data: obj.field
         ,type: 'post'
         ,done: function(res){
+            console.log(res.data, "oppppppp")
 
           //请求成功后，写入 access_token
           layui.data(setter.tableName, {
@@ -135,6 +136,10 @@
             key: 'permissions'
             ,value: res.data.permissions
           });
+          layui.data(setter.tableName, {
+            key: 'manager_stores'
+            ,value: res.data.manager_stores
+          });
 
           //登入成功的提示与跳转
           layer.msg('登入成功', {

uis/views/customer/index.html

@@ -144,6 +144,8 @@
             , tree = layui.tree
             , admin = layui.admin;
 
+        var store_id, field;
+
         admin.req({
             url: '/customer/dict/',
             done: function (res) {
@@ -229,31 +231,37 @@
             , height: 'full-108'
         });
 
-         admin.req({
-            url: '/account/employee_tree2/'
-            , done: function (res) {
-                tree.render({
-                   elem: '#id_tree'  //绑定元素
-                  ,onlyIconControl: true
-                  ,data: res.data
-                  //点击菜单时触发
-                  ,click: function(obj) {
-                     //节点高亮
-                    var nodes = document.getElementsByClassName("layui-tree-txt");
-                    for(var i=0;i<nodes.length;i++){
-                        if(nodes[i].innerHTML === obj.data.title){
-                            nodes[i].style.color = "#009688";
-                            nodes[i].style.fontWeight= "bold";
-                        }else{
-                            nodes[i].style.color= "#555";
-                            nodes[i].style.fontWeight= "normal";
+        var manager_stores = layui.data(layui.setter.tableName)['manager_stores'];
+        if(parseInt(manager_stores) !== 0){
+            admin.req({
+                url: '/account/employee_tree/'
+                , done: function (res) {
+                    tree.render({
+                       elem: '#id_tree'  //绑定元素
+                      ,onlyIconControl: true
+                      ,data: res.data
+                      //点击菜单时触发
+                      ,click: function(obj) {
+                         //节点高亮
+                        var nodes = document.getElementsByClassName("layui-tree-txt");
+                        for(var i=0;i<nodes.length;i++){
+                            if(nodes[i].innerHTML === obj.data.title){
+                                nodes[i].style.color = "#009688";
+                                nodes[i].style.fontWeight= "bold";
+                            }else{
+                                nodes[i].style.color= "#555";
+                                nodes[i].style.fontWeight= "normal";
+                            }
                         }
-                    }
-                    console.log(obj.data, "oppppp")
-                  }
-                });
-            }
-        });
+                        store_id = obj.data.id;
+                        field = obj.data.field;
+                      }
+                    });
+                }
+            });
+        }else{
+            $('#id_tree').hide()
+        }
 
         function createFollowReport(customer_id, stage_progress_sort) {
             layer.open({
@@ -358,13 +366,18 @@
             let tool_event = obj.event;
             let params = {};
             params['stage_progress'] = data.stage_id;
+            let url = '/customer/new_customer/'
+            if(field && store_id){
+                url = `/customer/new_customer/?type=${field}&id=${store_id}`
+            }
             if(tool_event === 'today'){
                 params['today'] = 'today';
             }else if(tool_event === 'overdue'){
                 params['overdue'] = 'overdue';
             };
             table.reload('customer_datagrid', {
-                where: params
+                url
+                , where: params
                 , page: {curr: 1}
             });
         });