v.2.15
Добавлен журнал заказов Добавлены отчеты: по переносам, по объединениям, по разбиениям
This commit is contained in:
@@ -28,8 +28,8 @@
|
||||
<th>ID</th>
|
||||
<th>Открыта</th>
|
||||
<th>Закрыта</th>
|
||||
<th>Выручка, BYN</th>
|
||||
<th style="width: 80px">
|
||||
<th>Итог</th>
|
||||
<th>
|
||||
<i class="material-icons"></i>
|
||||
</th>
|
||||
</tr>
|
||||
@@ -47,7 +47,7 @@
|
||||
</td>
|
||||
<td>{{ shift.sum | curr}}</td>
|
||||
<td>
|
||||
<div class="dropdown inline" style="margin-top: -5px; position: absolute;">
|
||||
<div class="dropdown inline" style="margin-top: -5px; position: relative;">
|
||||
<button class="btn white dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="padding: 0.2rem 0.4rem">
|
||||
<i class="material-icons"></i>
|
||||
</button>
|
||||
@@ -57,6 +57,10 @@
|
||||
<a class="dropdown-item" ng-click="reportDelete(shift)">По удалениям</a>
|
||||
<a class="dropdown-item" ng-click="reportStaff(shift)">По персоналу</a>
|
||||
<a class="dropdown-item" ng-click="reportPay(shift)">По отделам</a>
|
||||
<!-- <a class="dropdown-item" ng-click="reportOrders(shift)">По заказам</a> -->
|
||||
<a class="dropdown-item" ng-click="reportMerged(shift)">По объединениям</a>
|
||||
<a class="dropdown-item" ng-click="reportSliced(shift)">По разбиениям</a>
|
||||
<a class="dropdown-item" ng-click="reportMoved(shift)">По переносам</a>
|
||||
<a class="dropdown-item" ng-click="reportOut(shift)">По внешним заказам</a>
|
||||
<a class="dropdown-item" ng-click="restoreShift(shift)">Восстановить смену</a>
|
||||
<a class="dropdown-item" ng-if="delete_shift_value > 0" ng-click="deleteShift(shift)">Удалить смену</a>
|
||||
@@ -119,6 +123,18 @@
|
||||
<div ui-include="'../views/shifts/reimport.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="report-merge" data-backdrop="true">
|
||||
<div ui-include="'../views/reports/items/merge.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="report-move" data-backdrop="true">
|
||||
<div ui-include="'../views/reports/items/move.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="report-slice" data-backdrop="true">
|
||||
<div ui-include="'../views/reports/items/slice.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="preload-modal" data-backdrop="true">
|
||||
<div ui-include="'../views/shifts/preload.html'"></div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user