release v1.2
This commit is contained in:
+5
-16
@@ -6771,19 +6771,7 @@ function renderOrdersTab(tabId, tabData) {
|
|||||||
statusCell = `<span class="badge bg-${statusClass}">${statusText}</span>`;
|
statusCell = `<span class="badge bg-${statusClass}">${statusText}</span>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Рендерим комментарий исполнителя
|
// Рендерим строку
|
||||||
let commentCell;
|
|
||||||
if (fullAccess && (order.status === 'new' || order.status === 'working')) {
|
|
||||||
commentCell = `
|
|
||||||
<textarea class="form-control form-control-sm executor-comment"
|
|
||||||
data-order-id="${order.id}"
|
|
||||||
rows="2"
|
|
||||||
placeholder="Введите комментарий...">${order.executor_comment || ''}</textarea>
|
|
||||||
`;
|
|
||||||
} else {
|
|
||||||
commentCell = `<small class="text-muted">${order.executor_comment || 'Нет комментария'}</small>`;
|
|
||||||
}
|
|
||||||
|
|
||||||
return `
|
return `
|
||||||
<tr data-order-id="${order.id}">
|
<tr data-order-id="${order.id}">
|
||||||
<td class="align-middle">
|
<td class="align-middle">
|
||||||
@@ -6796,16 +6784,17 @@ function renderOrdersTab(tabId, tabData) {
|
|||||||
<small class="text-muted">${order.updated_at}</small>
|
<small class="text-muted">${order.updated_at}</small>
|
||||||
</td>
|
</td>
|
||||||
<td class="align-middle">${order.executor_id ? (userMap[order.executor_id] || `Пользователь ${order.executor_id}`) : '-'}</td>
|
<td class="align-middle">${order.executor_id ? (userMap[order.executor_id] || `Пользователь ${order.executor_id}`) : '-'}</td>
|
||||||
<td class="align-middle">${commentCell}</td>
|
<td class="align-middle"><textarea class="form-control form-control-sm executor-comment"
|
||||||
|
data-order-id="${order.id}"
|
||||||
|
rows="2"
|
||||||
|
placeholder="Введите комментарий...">${order.executor_comment || ''}</textarea></td>
|
||||||
${fullAccess ? `
|
${fullAccess ? `
|
||||||
<td class="align-middle text-center">
|
<td class="align-middle text-center">
|
||||||
${fullAccess && (order.status === 'new' || order.status === 'working') ? `
|
|
||||||
<button class="btn btn-sm btn-success save-row-btn"
|
<button class="btn btn-sm btn-success save-row-btn"
|
||||||
data-order-id="${order.id}"
|
data-order-id="${order.id}"
|
||||||
disabled>
|
disabled>
|
||||||
<i class="bi bi-save"></i>
|
<i class="bi bi-save"></i>
|
||||||
</button>
|
</button>
|
||||||
` : '☑️'}
|
|
||||||
</td>
|
</td>
|
||||||
`: ''}
|
`: ''}
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user