Merge remote-tracking branch 'origin/master'

uis/views/dashboard/home.html

@@ -93,17 +93,6 @@
                             </ul>
                          </div>
                     </div>
-                    <!-- 统计图表 -->
-                    <div class="layui-col-md8">
-                        <div style="padding-top: 20px" class="layui-card">
-                            <div id="chart1" style="height:400px;"></div>
-                        </div>
-                    </div>
-                    <div class="layui-col-md4">
-                        <div style="padding-top: 20px" class="layui-card">
-                            <div id="chart2" style="height:400px"></div>
-                        </div>
-                    </div>
                </div>
             </div>
         </div>
@@ -114,26 +103,10 @@
               base: '../../layuiadmin/' //静态资源所在路径
             }).extend({
               index: 'lib/index', //主入口模块
-            }).use(['index', 'home','echarts'], function() {
+            }).use(['index', 'home'], function() {
                 var $ = layui.$
                 ,admin = layui.admin
-                ,echarts = layui.echarts
                 ,xData = [];
-                var chart1 = echarts.init($('#chart1')[0]);
-                var chart2 = echarts.init($('#chart2')[0]);
-            //echarts容器自适应大小
-            var setContain = () => {
-                var chartDom1 = document.getElementById("chart1");
-                var chartDom2 = document.getElementById("chart2");
-                var md8Dom = $(".layui-col-md8");
-                var md4Dom = $(".layui-col-md4");
-                chartDom1.style.width = md8Dom.clientWidth + 'px';
-                chartDom1.style.height = md8Dom.clientHeight + 'px';
-                chartDom2.style.width = md4Dom.clientWidth + 'px';
-                chartDom2.style.height = md4Dom.clientHeight + 'px';
-            };
-            // 设置echarts的容器大小
-            setContain();
 
          admin.req({
             url: '/account/statistics/'
@@ -144,153 +117,6 @@
                 $('#general_report').html(res.data.general_report);
             }
         });
-         //设置饼图数据
-        //  admin.req({
-        //     url: '/tenant/repair_order/statistics/repair_type/'
-        //     ,type: 'get'
-        //     , done: function (res) {
-        //         if(res.data && res.data.length > 0){
-        //             res.data.forEach(item=>{
-        //                 xData.push(item.name)
-        //             })
-        //         }
-        //         var option2 = {
-        //         title: {
-        //                 text: '报修类型占比',
-        //                 x: 'center' //标题居中
-        //             },
-        //             tooltip: {
-        //                 // trigger: 'item' //悬浮显示对比
-        //             },
-        //             legend: {
-        //                 orient: 'vertical', //类型垂直,默认水平
-        //                 x:'left',      //可设定图例在左、右、居中
-        //                 y:'top',     //可设定图例在上、下、居中
-        //                 padding:[5,0,0,20],
-        //                 data: xData
-        //             },
-        //             series: [{
-        //                 type: 'pie', //饼状
-        //                 radius: '60%', //圆的大小
-        //                 center: ['50%', '50%'], //居中
-        //                 data: res.data
-        //              }]
-        //     };
-        //     chart2.setOption(option2);
-        //     }
-        // });
-         // 柱状图和折线图
-         // admin.req({
-         //    url: "/tenant/repair_order/statistics/repair_order/"
-         //    ,type: 'get'
-         //    , done: function (res) {
-         //    var option1 = {
-         //          title: {
-         //              text: '报修趋势统计',
-         //              x: 'center',
-         //              itemGap:20
-         //          },
-         //          tooltip: {
-         //              trigger: 'axis',
-         //              axisPointer: {
-         //                  type: 'cross',
-         //                  crossStyle: {
-         //                      color: '#999'
-         //                  }
-         //              }
-         //          },
-         //          toolbox: {
-         //              feature: {
-         //                  dataView: {show: true, readOnly: false},
-         //                  magicType: {show: true, type: ['line', 'bar']},
-         //                  restore: {show: true},
-         //                  saveAsImage: {show: true}
-         //              }
-         //          },
-         //          legend: {
-         //              data:['报修量','完工量'],
-         //              padding:[30,0,0,0]
-         //          },
-         //          xAxis: [
-         //              {
-         //                  type: 'category',
-         //                  data: res.data.order_mouth,
-         //                  axisPointer: {
-         //                      type: 'shadow'
-         //                  },
-         //                  axisLine: {
-         //                      lineStyle: {
-         //                          color: '#009688', // 颜色
-         //                      }
-         //                  }
-         //              }
-         //          ],
-         //          yAxis: [
-         //              {
-         //                  type: 'value',
-         //                  name: '报修量',
-         //                  min: 0,
-         //                  axisLabel: {
-         //                      formatter: '{value} '
-         //                  },
-         //                  axisLine: {
-         //                      lineStyle: {
-         //                          color: '#009688', // 颜色
-         //                      }
-         //                  }
-         //              },
-         //              {
-         //                  type: 'value',
-         //                  name: '完工量',
-         //                  min: 0,
-         //                  axisLabel: {
-         //                      formatter: '{value} '
-         //                  },
-         //                  axisLine: {
-         //                      lineStyle: {
-         //                          color: '#009688', // 颜色
-         //                      }
-         //                  }
-         //              }
-         //          ],
-         //          series: [
-         //              {
-         //                  name:'报修量',
-         //                  type:'bar',
-         //                  itemStyle: {
-         //                      normal: {
-         //                          color: "#FFB800",
-         //                          lineStyle: {
-         //                              color: "#FFB800"
-         //                          }
-         //                      }
-         //                  },
-         //                  data: res.data.repair_counts
-         //              },
-         //              {
-         //                  name:'完工量',
-         //                  type:'line',
-         //                  yAxisIndex: 1,
-         //                  itemStyle: {
-         //                      normal: {
-         //                          color: "#1E9FFF",
-         //                          lineStyle: {
-         //                              color: "#1E9FFF"
-         //                          }
-         //                      }
-         //                  },
-         //                  data:res.data.finish_counts
-         //              }
-         //          ]
-         //      };
-         //        chart1.setOption(option1);
-         //    }
-         // });
-        //  window.onresize = function () {//用于使chart自适应高度和宽度
-        //         setContain();//重置容器高宽
-        //         chart1.resize();
-        //         chart2.resize();
-        //     };
         })
     </script>
 </body>

uis/views/employee/index.html

@@ -75,6 +75,11 @@
                                data-permission="account.manager_store"
                                lay-event="manage_range">管理门店</a>
                         </div>
+                        <div class="layui-btn-group">
+                            <a class="layui-btn layui-btn-xs layui-btn-normal"
+                               data-permission="account.manager_store"
+                               lay-event="office_range">任职门店</a>
+                        </div>
                     </script>
                 </div>
             </div>
@@ -110,7 +115,7 @@
                 , {field: 'status_text', title: '状态', width: 80}
                 , {field: 'check_user_text', title: '入职审核人', width: 120}
                 , {field: 'date_joined', title: '入职时间', width: 180}
-                , {width: 250, align: 'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}
+                , {width: 330, align: 'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}
             ]]
             , page: true
             , height: 'full-108'
@@ -198,6 +203,21 @@
                     btn2: function (index, layero) {
                         layer.close(index);//关闭当前按钮
                     },
+                    content: 'manage_range.html?id=' + data.id + '&type=manage'
+                });
+            }else if(obj.event === 'office_range'){
+                layer.open({
+                    type: 2,
+                    title: '任职门店',
+                    shadeClose: true,
+                    area: ['650px', '80%'],
+                    btn: ['保存', '取消'],
+                    yes: function (index, dom) {
+                        layui.submitChild();
+                    },
+                    btn2: function (index, layero) {
+                        layer.close(index);//关闭当前按钮
+                    },
                     content: 'manage_range.html?id=' + data.id
                 });
             }

uis/views/employee/manage_range.html

@@ -46,8 +46,11 @@
             , formSelects = layui.formSelects;
 
         var id = layui.view.getParameterByName('id');
+        var type = layui.view.getParameterByName('type');
+
+        var urlTree = type === 'manage' ? '/account/store/tree/?id=' + id : '/account/office_store/?id=' + id;
         admin.req({
-            url: '/account/store/tree/?id=' + id
+            url: urlTree
             , done: function (res) {
                 tree.render({
                     elem: '#id_store'
@@ -65,9 +68,9 @@
                     stores.push(data.field[key])
                 }
             }
-
+            var url = type === 'manage' ? '/account/employee/' + id + '/branch/' : '/account/employee/' + id + '/office/';
             admin.req({
-                url: '/account/employee/' + id + '/branch/'
+                url
                 , data: {stores:JSON.stringify(stores)}
                 , type: 'post'
                 , done: function (res) {

uis/views/index.html

@@ -10,6 +10,12 @@
     <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"/>
+    <style>
+        .position_badge{
+            position: absolute;
+            right: 70px;
+        }
+    </style>
 </head>
 <body class="layui-layout-body">
 
@@ -98,18 +104,21 @@
                             </dd>
                             <dd data-name="nav" data-permission="customer.check_report_customer">
                                 <a lay-href="report_check/index.html">报备审核</a>
+                                <span id="report_customer_count" class="layui-badge position_badge"></span>
                             </dd>
                             <dd data-name="nav" data-permission="customer.view_new_customer">
                                 <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>
+                                <span id="review_count" class="layui-badge position_badge"></span>
                             </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>
+                                <span id="order_count" class="layui-badge position_badge"></span>
                             </dd>
                         </dl>
                     </li>
@@ -161,6 +170,7 @@
         index: 'lib/index' //主入口模块
     }).use('index', function () {
         var $ = layui.$;
+        var admin = layui.admin;
         var name = layui.data(layui.setter.tableName)['name'];
         $('#id_username').html(name);
 
@@ -168,6 +178,21 @@
             location.href = '/views/account/login.html'; //没有用户，跳转到登录
         }
 
+        admin.req({
+            url: '/customer/list_count/',
+            type: 'get',
+            done: function (res) {
+                let tempObj = res.data;
+                for(let key in tempObj){
+                    if(tempObj[key] === 0){
+                        $('#' + key).hide()
+                    }else{
+                        $('#' + key).append(tempObj[key]);
+                    }
+                }
+            }
+        });
+
 
         var permissions = layui.data(layui.setter.tableName)['permissions'];
         $('#LAY-system-side-muen .layui-nav-child dd').each(function () {