Подправил интерфейс реестра, вывод на печать, добавил уборку станка из сменки
All checks were successful
Deploy MES Core / deploy (push) Successful in 12s
All checks were successful
Deploy MES Core / deploy (push) Successful in 12s
This commit is contained in:
@@ -19,7 +19,14 @@
|
||||
{% for wi in workitems %}
|
||||
<tr class="workitem-row" data-href="{% url 'workitem_detail' wi.id %}">
|
||||
<td class="small">{{ wi.date|date:"d.m.y" }}</td>
|
||||
<td><span class="text-accent fw-bold">{{ wi.deal.number|default:"-" }}</span></td>
|
||||
<td>
|
||||
<span
|
||||
class="text-accent fw-bold"
|
||||
title="{% if wi.deal.description %}{{ wi.deal.description|striptags }}{% endif %}{% if wi.deal.company %}{% if wi.deal.description %} · {% endif %}{{ wi.deal.company.name }}{% endif %}{% if wi.deal.due_date %}{% if wi.deal.description or wi.deal.company %} · {% endif %}до {{ wi.deal.due_date|date:'d.m.Y' }}{% endif %}"
|
||||
>
|
||||
{{ wi.deal.number|default:"-" }}
|
||||
</span>
|
||||
</td>
|
||||
<td>
|
||||
{% if wi.machine %}
|
||||
<span class="badge bg-dark border border-secondary">{{ wi.workshop.name|default:"—" }}/{{ wi.machine.name }}</span>
|
||||
@@ -33,7 +40,10 @@
|
||||
{{ wi.operation.name|default:wi.stage|default:"—" }}
|
||||
</td>
|
||||
<td class="fw-bold">
|
||||
{{ wi.entity.drawing_number|default:"—" }} {{ wi.entity.name }}
|
||||
{% if wi.entity.drawing_number %}
|
||||
{{ wi.entity.drawing_number }}
|
||||
{% endif %}
|
||||
{{ wi.entity.name }}
|
||||
</td>
|
||||
<td class="small text-muted">
|
||||
{% if wi.entity.planned_material %}
|
||||
|
||||
@@ -56,7 +56,6 @@
|
||||
<th style="width:160px;">Материал</th>
|
||||
<th style="width:80px;" class="center">План</th>
|
||||
<th style="width:80px;" class="center">Факт</th>
|
||||
<th style="width:90px;">Статус</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -75,7 +74,6 @@
|
||||
</td>
|
||||
<td class="center">{{ wi.quantity_plan }}</td>
|
||||
<td class="center">{{ wi.quantity_done }}</td>
|
||||
<td>{{ wi.status|default:"planned" }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
||||
Reference in New Issue
Block a user