v.2.30
Добавлен расширенный отчет по реализации Добавлен монитор активности
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-toggle="modal" data-target="#items-deleted" ng-click="returnModal('deleted')">
|
||||
<button type="button" class="close" data-toggle="modal" ng-click="backModal('items-deleted', 'get-more-deleted')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<h5 class="modal-title">Подробнее об удалениях в заказе № {{ order.code }}</h5>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-toggle="modal" data-target="#items-discount" ng-click="returnModal('discount')">
|
||||
<button type="button" class="close" data-toggle="modal" ng-click="backModal('items-discount', 'get-more-discount')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<h5 class="modal-title">Подробнее о заказе № {{ order.title }}</h5>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-toggle="modal" data-target="#items-guests" ng-click="returnModal('guests')">
|
||||
<button type="button" class="close" data-toggle="modal" ng-click="backModal('items-guests', 'get-more-guests')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<h5 class="modal-title">{{ order.title }}</h5>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-toggle="modal" data-target="#items-staff" ng-click="returnModal('staff')">
|
||||
<button type="button" class="close" data-toggle="modal" ng-click="backModal('items-staff', 'get-more-staff')">
|
||||
<i class="material-icons md-24">arrow_back</i>
|
||||
</button>
|
||||
<h5 class="modal-title">{{ order.title }}</h5>
|
||||
|
||||
@@ -79,22 +79,22 @@
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Действие</th>
|
||||
<th>Персонал</th>
|
||||
<th>Время</th>
|
||||
<th>Группа</th>
|
||||
<th>Место</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Действие</th>
|
||||
<th>Персонал</th>
|
||||
<th>Время</th>
|
||||
<th>Группа</th>
|
||||
<th>Место</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="action in actions.actions">
|
||||
<td>{{ action.action }}</td>
|
||||
<td>{{ action.who }}</td>
|
||||
<td>{{ action.time }}</td>
|
||||
<td>{{ action.workgroup }}</td>
|
||||
<td>{{ action.workcode }}</td>
|
||||
</tr>
|
||||
<tr ng-repeat="action in actions.actions">
|
||||
<td>{{ action.action }}</td>
|
||||
<td>{{ action.who }}</td>
|
||||
<td>{{ action.time }}</td>
|
||||
<td>{{ action.workgroup }}</td>
|
||||
<td>{{ action.workcode }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -108,16 +108,16 @@
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="item in sliced_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
<tr ng-repeat="item in sliced_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -134,16 +134,16 @@
|
||||
<div class="table-responsive">
|
||||
<table class="table m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Наименование</th>
|
||||
<th>Количество</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="item in merged_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
<tr ng-repeat="item in merged_order_item.items">
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.count }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</div>
|
||||
|
||||
<div ng-if="moreData.deleted_orders.length == 0">
|
||||
<div class="text-muted">Удаленных позиций нет</div>
|
||||
<div class="text-muted">Удаленных товаров нет</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
41
web/views/dashboard/items/more-total-bak.html
Normal file
41
web/views/dashboard/items/more-total-bak.html
Normal file
@@ -0,0 +1,41 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h5 class="modal-title">{{ moreData.title }}</h5>
|
||||
</div>
|
||||
<div class="modal-body p-lg">
|
||||
<div class="table-responsive" ng-if="moreData.orders.length > 0">
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Заказ №</th>
|
||||
<th>Открыт</th>
|
||||
<th>Закрыт</th>
|
||||
<th class="text-right">Итого, BYN</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr ng-repeat="order in moreData.orders" ng-click="getTotalItems(order)">
|
||||
<td>{{ order.number }}</td>
|
||||
<td>{{ order.opened }}</td>
|
||||
<td>{{ getClosedDate(order.closed) }}</td>
|
||||
<td class="text-right">{{ order.sum | curr }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-left" colspan="3">Всего: {{ moreData.count }} {{ GetCountTotalOrders(moreData.count) }}</th>
|
||||
<th class="text-right">Итого: {{ moreData.sum | curr }} BYN</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div ng-if="moreData.orders.length == 0">
|
||||
<div class="text-muted">Закрытых заказов нет</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -37,4 +37,5 @@
|
||||
<div class="text-muted">Закрытых заказов нет</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user