Merge remote-tracking branch 'origin/master'

uis/views/customer/index.html

@@ -84,46 +84,45 @@
         <div class="layui-card-body" pad15>
             <div class="layui-row layui-col-space15">
                 <div class="layui-col-md12">
-                    <div class="LAY-btns" style="margin-bottom: 10px;">
-                        <div style="float: left">
-                            <button class="layui-btn" id="btn_list"><i
-                                    class="layui-icon layui-icon-download-circle"></i>导出
-                            </button>
-                        </div>
-                        <form class="layui-form" lay-filter="query-form-element">
-                            <div class="seach_items">
-                                <button class="layui-btn" lay-submit lay-filter="query-form-element"><i
-                                        class="layui-icon layui-icon-search"></i>查询
-                                </button>
-                            </div>
-                            <div class="seach_items">
-                                <input type="text" name="tel" autocomplete="off" class="layui-input"
-                                       placeholder="电话"/>
-                            </div>
-                            <div class="seach_items">
-                                <input type="text" name="name" autocomplete="off" class="layui-input"
-                                       placeholder="姓名"/>
-                            </div>
-                            <div class="seach_items">
-                                <select name="source" id="id_source" style="width: 40px;">
-                                    <option value="">请选择来源</option>
-                                </select>
-                            </div>
-                            <div class="seach_items">
-                                <select name="project" id="id_project" style="width: 40px;">
-                                    <option value="">请选择项目</option>
-                                </select>
-                            </div>
-                        </form>
-                        <div style="clear: both;"></div>
-                    </div>
-
                     <div class="tableContent">
                         <div style="width: 345px">
                             <div class="treeContent demo-tree" id="id_tree"></div>
                             <table id="customer_log" lay-filter="customer-operate-log"></table>
                         </div>
                         <div style="width: calc(100% - 360px)">
+                            <div class="LAY-btns" style="margin-bottom: 10px;">
+                                <div style="float: left">
+                                    <button class="layui-btn" id="btn_list"><i
+                                            class="layui-icon layui-icon-download-circle"></i>导出
+                                    </button>
+                                </div>
+                                <form class="layui-form" lay-filter="query-form-element">
+                                    <div class="seach_items">
+                                        <button class="layui-btn" lay-submit lay-filter="query-form-element"><i
+                                                class="layui-icon layui-icon-search"></i>查询
+                                        </button>
+                                    </div>
+                                    <div class="seach_items">
+                                        <input type="text" name="tel" autocomplete="off" class="layui-input"
+                                               placeholder="电话"/>
+                                    </div>
+                                    <div class="seach_items">
+                                        <input type="text" name="name" autocomplete="off" class="layui-input"
+                                               placeholder="姓名"/>
+                                    </div>
+                                    <div class="seach_items">
+                                        <select name="source" id="id_source" style="width: 40px;">
+                                            <option value="">请选择来源</option>
+                                        </select>
+                                    </div>
+                                    <div class="seach_items">
+                                        <select name="project" id="id_project" style="width: 40px;">
+                                            <option value="">请选择项目</option>
+                                        </select>
+                                    </div>
+                                </form>
+                                <div style="clear: both;"></div>
+                            </div>
                             <table id="customer_datagrid" lay-filter="customer-operate"></table>
                         </div>
                     </div>
@@ -234,19 +233,23 @@
             url: '/account/employee_tree/'
             , done: function (res) {
                 tree.render({
-                    elem: '#id_tree'  //绑定元素
-                   ,onlyIconControl: true
+                   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)
+                        if(nodes[i].innerHTML === obj.data.title){
                             nodes[i].style.color = "#009688";
-                        else
+                            nodes[i].style.fontWeight= "bold";
+                        }else{
                             nodes[i].style.color= "#555";
+                            nodes[i].style.fontWeight= "normal";
+                        }
                     }
+                    console.log(obj.data, "oppppp")
                   }
                 });
             }