ANG YU 5 лет назад
Родитель
Сommit
8b0678b778
2 измененных файлов с 7 добавлено и 6 удалено
  1. 7 5
      resources/views/control/panel.blade.php
  2. 0 1
      resources/views/package/menu.blade.php

+ 7 - 5
resources/views/control/panel.blade.php

@@ -489,23 +489,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) {

+ 0 - 1
resources/views/package/menu.blade.php

@@ -6,7 +6,6 @@
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('package/weigh/index')}}" :class="{active:isActive('weigh',2)}">称重管理</a>
                 </li>@endcan
-                {{--TODO 权限修改--}}
             @can('称重管理-快递')
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('package/logistic')}}" :class="{active:isActive('logistic',2)}">快递</a>