diff --git a/other-module/canteen-device/raw-veg-processing-scale/02-batch-weighing.html b/other-module/canteen-device/raw-veg-processing-scale/02-batch-weighing.html index 002f37e..cf5330b 100644 --- a/other-module/canteen-device/raw-veg-processing-scale/02-batch-weighing.html +++ b/other-module/canteen-device/raw-veg-processing-scale/02-batch-weighing.html @@ -225,6 +225,19 @@ } .batch-list__title { font-size: 14px; font-weight: 600; color: rgba(255,255,255,0.8); } .batch-list__count { font-size: 12px; color: rgba(255,255,255,0.4); } + /* 表头 */ + .batch-list__columns { + display: flex; align-items: center; padding: 0 12px 8px; + border-bottom: 1px solid rgba(255,255,255,0.08); + } + .batch-col { + font-size: 11px; color: rgba(255,255,255,0.4); white-space: nowrap; + } + .batch-col--name { flex: 1; } + .batch-col--required { width: 70px; text-align: right; } + .batch-col--actual { width: 70px; text-align: right; } + .batch-col--status { width: 60px; text-align: center; } + .batch-list { flex: 1; overflow-y: auto; display: flex; flex-direction: column; gap: 6px; scrollbar-width: thin; scrollbar-color: rgba(255,255,255,0.1) transparent; @@ -244,11 +257,6 @@ border: 1px dashed rgba(250,173,22,0.2); } .batch-item--pending .batch-item__name { color: rgba(255,255,255,0.6); } - .batch-item__status { - font-size: 11px; font-weight: 500; white-space: nowrap; min-width: 48px; text-align: center; - } - .batch-item__status--pending { color: #faad14; } - .batch-item__status--done { color: #52c41a; } @keyframes slideIn { from { opacity: 0; transform: translateX(20px); } to { opacity: 1; transform: translateX(0); } @@ -263,13 +271,20 @@ .batch-item__trace { font-size: 11px; color: rgba(74,144,217,0.8); font-family: "Courier New", monospace; } - .batch-item__weight { - font-size: 14px; font-weight: 600; color: #52c41a; white-space: nowrap; + .batch-item__actual { + font-size: 14px; font-weight: 600; color: #52c41a; white-space: nowrap; width: 70px; text-align: right; + } + .batch-item__actual--pending { + color: rgba(255,255,255,0.2); } .batch-item__required { - font-size: 12px; color: rgba(255,255,255,0.5); white-space: nowrap; - min-width: 70px; text-align: right; + font-size: 13px; color: rgba(255,255,255,0.6); white-space: nowrap; width: 70px; text-align: right; } + .batch-item__status { + font-size: 11px; font-weight: 500; white-space: nowrap; width: 60px; text-align: center; + } + .batch-item__status--pending { color: #faad14; } + .batch-item__status--done { color: #52c41a; } .batch-item__del { width: 26px; height: 26px; border-radius: 6px; border: none; cursor: pointer; font-size: 12px; display: flex; align-items: center; justify-content: center; @@ -418,6 +433,13 @@ 本批次清单 共 0 条 + +
+ 食材名称 + 应取量 + 实取量 + 状态 +
📭
@@ -834,14 +856,12 @@ var el = document.createElement('div'); el.className = 'batch-item' + (item.done ? '' : ' batch-item--pending'); + var requiredHtml = item.requiredWeight !== null ? item.requiredWeight.toFixed(1) + '斤' : '--'; + var actualHtml = item.done ? item.weight.toFixed(2) + '斤' : '--'; var statusHtml = item.done - ? '✓ ' + item.weight.toFixed(2) + '斤' + ? '已完成' : '待称重'; - var weightHtml = item.done - ? '
+' + item.weight.toFixed(2) + '斤
' - : '
--
'; - var traceHtml = item.trace ? '
' + item.trace + '
' : ''; @@ -852,8 +872,8 @@ '
' + item.name + '
' + traceHtml + '
' + - '
应 ' + (item.requiredWeight !== null ? item.requiredWeight.toFixed(1) + '斤' : '--') + '
' + - weightHtml + + '
' + requiredHtml + '
' + + '
' + actualHtml + '
' + statusHtml; list.appendChild(el);