Merge branch 'yang-logistic-fix' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	resources/views/package/menu.blade.php

resources/views/control/panel.blade.php

@@ -500,23 +500,25 @@
                     _this.totalOrders.partPacking += item.partPacking;
                     _this.totalOrders.sowComplete += item.sowComplete;
                 });
-                this.initOrderCountingRecords();
-                this.orderCountingRecordsChart = echarts.init(document.getElementById('orderCountingRecords'));
-                this.initOrderCountingRecordsChart();
+                if (this.orderCountingRecords[0]!=null) {
+                    this.initOrderCountingRecords();
+                    this.orderCountingRecordsChart = echarts.init(document.getElementById('orderCountingRecords'));
+                    this.initOrderCountingRecordsChart();
+                }
 
                 this.logisticsCountingRecordsChart = echarts.init(document.getElementById('logisticsCountingRecords'));
                 this.initLogisticsCountingRecordsChart();
 
                 this.warehouseCountingRecordsChart = echarts.init(document.getElementById('warehouseCountingRecords'));
                 this.initWarehouseCountingRecordsChart();
-
+                @can('人事管理-临时工报表-可见全部组')
                 this.initLaborReportsCountingRecords();
                 this.laborReportsCountingRecordsChart = echarts.init(document.getElementById('laborReportsCountingRecords'));
                 this.initLaborReportsCountingRecordsChart();
 
                 this.laborReportsUserGroupsCountChart = echarts.init(document.getElementById('laborReportsUserGroupsCount'));
                 this.initLaborReportsUserGroupsCountChart();
-
+                @endcan
             },
             methods: {
                 switchDataPanel_forOrderCountingRecords(fromUnit, toUnit) {

resources/views/package/menu.blade.php

@@ -6,9 +6,9 @@
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('package/weigh/index')}}" :class="{active:isActive('weigh',2)}">称重管理</a>
                 </li>@endcan
-                @can('称重管理-查询')
+            @can('称重管理-快递')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('package/logistic?default_date=ture&logistic_id=&owner_id=')}}" :class="{active:isActive('logistic',2)}">快递</a>
+                    <a class="nav-link" href="{{url('package/logistic')}}" :class="{active:isActive('logistic',2)}">快递</a>
                 </li>@endcan
             @can('称重管理-查看异常')
             <li class="nav-item">