Статус выполнеия задания на деталь, мастер может менять станки
All checks were successful
Deploy MES Core / deploy (push) Successful in 9s

This commit is contained in:
2026-04-02 08:21:09 +03:00
parent d0289f6aec
commit 7cb00792ca
4 changed files with 79 additions and 11 deletions

View File

@@ -25,7 +25,15 @@
<div class="row g-3 mb-4 border-bottom border-secondary pb-3 text-body">
<div class="col-md-4">
<small class="text-muted d-block">Станок</small>
<strong>{{ item.machine.name }}</strong>
{% if user_role == 'master' %}
<select name="machine" class="form-select border-secondary">
{% for m in machines %}
<option value="{{ m.id }}" {% if item.machine.id == m.id %}selected{% endif %}>{{ m.name }}</option>
{% endfor %}
</select>
{% else %}
<strong>{{ item.machine.name }}</strong>
{% endif %}
</div>
<div class="col-md-4">
<small class="text-muted d-block">Материал</small>

View File

@@ -4,7 +4,7 @@
<div class="card shadow border-secondary">
<div class="card-header border-secondary py-3 d-flex justify-content-between align-items-center">
<div class="d-flex align-items-center gap-3">
<h3 class="text-accent mb-0"><i class="bi bi-kanban me-2"></i>Сделки</h3>
<h3 class="text-accent mb-0"><i class="bi bi-briefcase me-2"></i>Сделки</h3>
<form method="get" class="d-flex align-items-center gap-2">
<span class="small text-muted">Сделки:</span>
<div class="d-flex flex-wrap gap-1">

View File

@@ -34,10 +34,10 @@
<th>Деталь</th>
<th>Материал</th>
<th>Размер</th>
<th class="text-center">Надо</th>
<th class="text-center">Сделано</th>
<th class="text-center">В плане</th>
<th style="width: 160px;">Прогресс</th>
<th class="text-center">Надо / Сделано / В плане</th>
<th class="text-center">Осталось</th>
<th class="text-center">Файлы</th>
<th class="text-end">Действия</th>
</tr>
</thead>
@@ -47,10 +47,30 @@
<td class="fw-bold">{{ t.drawing_name|default:"Б/ч" }}</td>
<td class="small text-muted">{{ t.material.full_name|default:t.material.name }}</td>
<td class="small">{{ t.size_value }}</td>
<td class="text-center">{{ t.quantity_ordered }}</td>
<td class="text-center">{{ t.done_qty }}</td>
<td class="text-center">{{ t.planned_qty }}</td>
<td>
<div class="progress bg-secondary-subtle border border-secondary sf-progress" style="height: 10px;" data-done-width="{{ t.done_width }}" data-plan-width="{{ t.plan_width }}" title="Сделано: {{ t.done_pct }}% · В плане: {{ t.plan_pct }}%">
<div class="progress-bar bg-success sf-progress-done"></div>
<div class="progress-bar bg-warning sf-progress-plan"></div>
</div>
</td>
<td class="text-center">
<span class="text-info fw-bold">{{ t.quantity_ordered }}</span> /
<span class="text-success">{{ t.done_qty }}</span> /
<span class="text-warning">{{ t.planned_qty }}</span>
</td>
<td class="text-center">{{ t.remaining_qty }}</td>
<td class="text-center">
{% if t.drawing_file %}
<a href="{{ t.drawing_file.url }}" target="_blank" class="btn btn-sm btn-outline-info p-1 stop-prop" title="DXF/IGES">
<i class="bi bi-file-earmark-code"></i>
</a>
{% endif %}
{% if t.extra_drawing %}
<a href="{{ t.extra_drawing.url }}" target="_blank" class="btn btn-sm btn-outline-danger p-1 stop-prop" title="Чертеж PDF">
<i class="bi bi-file-pdf"></i>
</a>
{% endif %}
</td>
<td class="text-end">
<button
type="button"
@@ -116,12 +136,21 @@
document.addEventListener('DOMContentLoaded', function () {
document.querySelectorAll('tr.task-row[data-href]').forEach(function (row) {
row.addEventListener('click', function (e) {
if (e.target && e.target.closest('button')) return;
if (e.target && (e.target.closest('button') || e.target.closest('.stop-prop'))) return;
const href = row.getAttribute('data-href');
if (href) window.location.href = href;
});
});
document.querySelectorAll('.sf-progress').forEach(function (el) {
const done = parseInt(el.getAttribute('data-done-width') || '0', 10) || 0;
const plan = parseInt(el.getAttribute('data-plan-width') || '0', 10) || 0;
const doneEl = el.querySelector('.sf-progress-done');
const planEl = el.querySelector('.sf-progress-plan');
if (doneEl) doneEl.style.width = `${done}%`;
if (planEl) planEl.style.width = `${plan}%`;
});
const modal = document.getElementById('addToPlanModal');
if (!modal) return;