From e663b7e82792c14918edfe05fcf1f16ecd3195c7 Mon Sep 17 00:00:00 2001
From: zhangyan <lenovo@example.com>
Date: Wed, 17 Jun 2026 17:38:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=BA=E5=B9=B4=E6=9C=88=E6=97=A5=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E9=85=8D=E6=AF=94=E7=A7=A4=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- clean-veg-ratio-scale/01: 任务截止时间从 HH:MM 改为 YYYY-MM-DD HH:MM
- ratio-scale/01: 期望到货→任务截止时间，格式改为年月日时间
- ratio-scale/02: 订单信息区增加内供/外售订单类型标签，去掉任务号

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../clean-veg-ratio-scale/01-accept.html      | 46 +++++++++----------
 .../clean-veg-ratio-scale/doc/CHANGELOG.md    |  7 +++
 .../ratio-scale/01-packing-tasks.html         | 10 ++--
 .../ratio-scale/02-weighing-packing.html      | 15 ++++--
 .../ratio-scale/doc/CHANGELOG.md              |  9 ++++
 5 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/other-module/canteen-device/clean-veg-ratio-scale/01-accept.html b/other-module/canteen-device/clean-veg-ratio-scale/01-accept.html
index cdeaa06..68a05d7 100644
--- a/other-module/canteen-device/clean-veg-ratio-scale/01-accept.html
+++ b/other-module/canteen-device/clean-veg-ratio-scale/01-accept.html
@@ -368,33 +368,33 @@
   <script>
     // ---- 模拟数据（累计模式） ----
     var mockFoods = [
-      { name: '土豆丝', size: '35mm*1mm*1mm', shape: '长条', blade: '平刀', target: 5.0, processed: 3.2, arrivalTime: '08:30', icon: '\u{1F954}' },
-      { name: '胡萝卜丝', size: '20mm*1mm*1mm', shape: '细丝', blade: '平刀', target: 2.0, processed: 1.5, arrivalTime: '09:15', icon: '\u{1F955}' },
-      { name: '黄瓜片', size: '30mm*30mm*3mm', shape: '圆片', blade: '平刀', target: 4.0, processed: 2.8, arrivalTime: '10:00', icon: '\u{1F952}' }
+      { name: '土豆丝', size: '35mm*1mm*1mm', shape: '长条', blade: '平刀', target: 5.0, processed: 3.2, arrivalTime: '2026-06-17 08:30', icon: '\u{1F954}' },
+      { name: '胡萝卜丝', size: '20mm*1mm*1mm', shape: '细丝', blade: '平刀', target: 2.0, processed: 1.5, arrivalTime: '2026-06-17 09:15', icon: '\u{1F955}' },
+      { name: '黄瓜片', size: '30mm*30mm*3mm', shape: '圆片', blade: '平刀', target: 4.0, processed: 2.8, arrivalTime: '2026-06-17 10:00', icon: '\u{1F952}' }
     ];
 
     // 净菜食材数据库（供搜索用）
     var foodDatabase = [
-      { name: '土豆丝', size: '35mm*1mm*1mm', shape: '长条', blade: '平刀', arrivalTime: '08:30', icon: '\u{1F954}' },
-      { name: '土豆块', size: '20mm*20mm*20mm', shape: '方丁', blade: '平刀', arrivalTime: '08:30', icon: '\u{1F954}' },
-      { name: '土豆片', size: '30mm*30mm*3mm', shape: '圆片', blade: '平刀', arrivalTime: '08:30', icon: '\u{1F954}' },
-      { name: '胡萝卜丝', size: '20mm*1mm*1mm', shape: '细丝', blade: '平刀', arrivalTime: '09:15', icon: '\u{1F955}' },
-      { name: '胡萝卜片', size: '25mm*25mm*2mm', shape: '圆片', blade: '平刀', arrivalTime: '09:15', icon: '\u{1F955}' },
-      { name: '黄瓜片', size: '30mm*30mm*3mm', shape: '圆片', blade: '平刀', arrivalTime: '10:00', icon: '\u{1F952}' },
-      { name: '黄瓜条', size: '40mm*8mm*8mm', shape: '长条', blade: '平刀', arrivalTime: '10:00', icon: '\u{1F952}' },
-      { name: '大白菜段', size: '50mm*30mm*30mm', shape: '宽段', blade: '平刀', arrivalTime: '10:30', icon: '\u{1F96C}' },
-      { name: '大白菜丝', size: '30mm*2mm*2mm', shape: '细丝', blade: '平刀', arrivalTime: '10:30', icon: '\u{1F96C}' },
-      { name: '西红柿块', size: '25mm*25mm*20mm', shape: '楔形块', blade: '平刀', arrivalTime: '11:00', icon: '\u{1F345}' },
-      { name: '西红柿片', size: '30mm*30mm*5mm', shape: '圆片', blade: '平刀', arrivalTime: '11:00', icon: '\u{1F345}' },
-      { name: '青椒丝', size: '30mm*3mm*3mm', shape: '长条', blade: '平刀', arrivalTime: '11:30', icon: '\u{1FAD1}' },
-      { name: '青椒块', size: '20mm*20mm*20mm', shape: '方丁', blade: '平刀', arrivalTime: '11:30', icon: '\u{1FAD1}' },
-      { name: '洋葱丝', size: '30mm*2mm*2mm', shape: '细丝', blade: '平刀', arrivalTime: '13:00', icon: '\u{1F9C5}' },
-      { name: '洋葱块', size: '15mm*15mm*15mm', shape: '方丁', blade: '平刀', arrivalTime: '13:00', icon: '\u{1F9C5}' },
-      { name: '芹菜段', size: '40mm*10mm*10mm', shape: '宽段', blade: '平刀', arrivalTime: '13:30', icon: '\u{1F96C}' },
-      { name: '芹菜丝', size: '30mm*2mm*2mm', shape: '细丝', blade: '平刀', arrivalTime: '13:30', icon: '\u{1F96C}' },
-      { name: '莲藕片', size: '35mm*35mm*3mm', shape: '圆片', blade: '平刀', arrivalTime: '14:00', icon: '\u{1FAD1}' },
-      { name: '莴笋丝', size: '30mm*2mm*2mm', shape: '细丝', blade: '平刀', arrivalTime: '14:00', icon: '\u{1F96C}' },
-      { name: '豆角段', size: '40mm*10mm*10mm', shape: '宽段', blade: '平刀', arrivalTime: '14:30', icon: '\u{1FAD8}' }
+      { name: '土豆丝', size: '35mm*1mm*1mm', shape: '长条', blade: '平刀', arrivalTime: '2026-06-17 08:30', icon: '\u{1F954}' },
+      { name: '土豆块', size: '20mm*20mm*20mm', shape: '方丁', blade: '平刀', arrivalTime: '2026-06-17 08:30', icon: '\u{1F954}' },
+      { name: '土豆片', size: '30mm*30mm*3mm', shape: '圆片', blade: '平刀', arrivalTime: '2026-06-17 08:30', icon: '\u{1F954}' },
+      { name: '胡萝卜丝', size: '20mm*1mm*1mm', shape: '细丝', blade: '平刀', arrivalTime: '2026-06-17 09:15', icon: '\u{1F955}' },
+      { name: '胡萝卜片', size: '25mm*25mm*2mm', shape: '圆片', blade: '平刀', arrivalTime: '2026-06-17 09:15', icon: '\u{1F955}' },
+      { name: '黄瓜片', size: '30mm*30mm*3mm', shape: '圆片', blade: '平刀', arrivalTime: '2026-06-17 10:00', icon: '\u{1F952}' },
+      { name: '黄瓜条', size: '40mm*8mm*8mm', shape: '长条', blade: '平刀', arrivalTime: '2026-06-17 10:00', icon: '\u{1F952}' },
+      { name: '大白菜段', size: '50mm*30mm*30mm', shape: '宽段', blade: '平刀', arrivalTime: '2026-06-17 10:30', icon: '\u{1F96C}' },
+      { name: '大白菜丝', size: '30mm*2mm*2mm', shape: '细丝', blade: '平刀', arrivalTime: '2026-06-17 10:30', icon: '\u{1F96C}' },
+      { name: '西红柿块', size: '25mm*25mm*20mm', shape: '楔形块', blade: '平刀', arrivalTime: '2026-06-17 11:00', icon: '\u{1F345}' },
+      { name: '西红柿片', size: '30mm*30mm*5mm', shape: '圆片', blade: '平刀', arrivalTime: '2026-06-17 11:00', icon: '\u{1F345}' },
+      { name: '青椒丝', size: '30mm*3mm*3mm', shape: '长条', blade: '平刀', arrivalTime: '2026-06-17 11:30', icon: '\u{1FAD1}' },
+      { name: '青椒块', size: '20mm*20mm*20mm', shape: '方丁', blade: '平刀', arrivalTime: '2026-06-17 11:30', icon: '\u{1FAD1}' },
+      { name: '洋葱丝', size: '30mm*2mm*2mm', shape: '细丝', blade: '平刀', arrivalTime: '2026-06-17 13:00', icon: '\u{1F9C5}' },
+      { name: '洋葱块', size: '15mm*15mm*15mm', shape: '方丁', blade: '平刀', arrivalTime: '2026-06-17 13:00', icon: '\u{1F9C5}' },
+      { name: '芹菜段', size: '40mm*10mm*10mm', shape: '宽段', blade: '平刀', arrivalTime: '2026-06-17 13:30', icon: '\u{1F96C}' },
+      { name: '芹菜丝', size: '30mm*2mm*2mm', shape: '细丝', blade: '平刀', arrivalTime: '2026-06-17 13:30', icon: '\u{1F96C}' },
+      { name: '莲藕片', size: '35mm*35mm*3mm', shape: '圆片', blade: '平刀', arrivalTime: '2026-06-17 14:00', icon: '\u{1FAD1}' },
+      { name: '莴笋丝', size: '30mm*2mm*2mm', shape: '细丝', blade: '平刀', arrivalTime: '2026-06-17 14:00', icon: '\u{1F96C}' },
+      { name: '豆角段', size: '40mm*10mm*10mm', shape: '宽段', blade: '平刀', arrivalTime: '2026-06-17 14:30', icon: '\u{1FAD8}' }
     ];
 
     var currentUser = null;
diff --git a/other-module/canteen-device/clean-veg-ratio-scale/doc/CHANGELOG.md b/other-module/canteen-device/clean-veg-ratio-scale/doc/CHANGELOG.md
index 32ba946..3b3cec2 100644
--- a/other-module/canteen-device/clean-veg-ratio-scale/doc/CHANGELOG.md
+++ b/other-module/canteen-device/clean-veg-ratio-scale/doc/CHANGELOG.md
@@ -1,5 +1,12 @@
 # 净菜加工秤 CHANGELOG
 
+## [2026-06-17] refactor: 任务截止时间格式改为年月日时间
+
+### 调整
+- **01-accept.html**：所有 `arrivalTime` 字段格式从 `HH:MM` 改为 `YYYY-MM-DD HH:MM`（如 `2026-06-17 08:30`）
+
+---
+
 ## [2026-06-17] refactor: 去掉保存/保存并继续/刷新按钮
 
 ### 删除
diff --git a/other-module/canteen-device/ratio-scale/01-packing-tasks.html b/other-module/canteen-device/ratio-scale/01-packing-tasks.html
index eedc091..fd99ab4 100644
--- a/other-module/canteen-device/ratio-scale/01-packing-tasks.html
+++ b/other-module/canteen-device/ratio-scale/01-packing-tasks.html
@@ -174,7 +174,7 @@
       {
         orderNo: 'PO-20260616-001',
         orderType: 'internal',
-        expectedArrival: '11:30',
+        expectedArrival: '2026-06-17 11:30',
         taskNo: 'T-001',
         mealPacks: [
           { type: '净菜包', packName: '土豆丝', packSize: 3, packSpec: '500g', notes: '', ingredients: [
@@ -191,7 +191,7 @@
       {
         orderNo: 'PO-20260616-002',
         orderType: 'external',
-        expectedArrival: '12:00',
+        expectedArrival: '2026-06-17 12:00',
         taskNo: 'T-002',
         mealPacks: [
           { type: '净菜包', packName: '白菜丝', packSize: 2, packSpec: '1000g', notes: '', ingredients: [
@@ -205,7 +205,7 @@
       {
         orderNo: 'PO-20260616-003',
         orderType: 'internal',
-        expectedArrival: '14:30',
+        expectedArrival: '2026-06-17 14:30',
         taskNo: 'T-003',
         mealPacks: [
           { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: '真空包装', notes: '', ingredients: [
@@ -216,7 +216,7 @@
       {
         orderNo: 'PO-20260616-004',
         orderType: 'external',
-        expectedArrival: '16:00',
+        expectedArrival: '2026-06-17 16:00',
         taskNo: 'T-004',
         mealPacks: [
           { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 5, packSpec: '盒装', notes: '', ingredients: [
@@ -267,7 +267,7 @@
         header.innerHTML =
           '<span class="task-card__order-info"><span class="task-card__order-info__label">订单号:</span><span class="task-card__order-info__value">' + order.orderNo + '</span></span>' +
           '<span class="order-type-tag ' + orderTypeCls + '">' + orderTypeLabel + '</span>' +
-          '<span class="task-card__arrival">&#x23F0; 期望到货：<span class="task-card__arrival__time">' + order.expectedArrival + '</span></span>' +
+          '<span class="task-card__arrival">&#x23F0; 任务截止时间：<span class="task-card__arrival__time">' + order.expectedArrival + '</span></span>' +
           '<span class="task-card__status"><span class="status-badge ' + (orderAllDone ? 'status-badge--done' : 'status-badge--pending') + '">' + (orderAllDone ? '已完成' : '待配比') + '</span></span>' +
           (orderAllDone
             ? ''
diff --git a/other-module/canteen-device/ratio-scale/02-weighing-packing.html b/other-module/canteen-device/ratio-scale/02-weighing-packing.html
index cc0f858..9d469d8 100644
--- a/other-module/canteen-device/ratio-scale/02-weighing-packing.html
+++ b/other-module/canteen-device/ratio-scale/02-weighing-packing.html
@@ -193,6 +193,9 @@
     .task-card__item-value--purple { color: #722ed1; }
     .task-card__item-value--green { color: #52c41a; }
     .task-card__item-value--yellow { color: #faad14; }
+    .order-type-tag { font-size: 10px; padding: 2px 6px; border-radius: 3px; font-weight: 500; white-space: nowrap; flex-shrink: 0; }
+    .order-type-tag--internal { background: rgba(74,144,217,0.15); color: #4a90d9; }
+    .order-type-tag--external { background: rgba(250,140,22,0.15); color: #fa8c16; }
 
     /* 净菜清单卡片 */
     .item-list {
@@ -412,8 +415,8 @@
             <div class="task-card__item-value task-card__item-value--blue" id="taskOrder">--</div>
           </div>
           <div class="task-card__item">
-            <div class="task-card__item-label">任务号</div>
-            <div class="task-card__item-value" id="taskNo">--</div>
+            <div class="task-card__item-label">订单类型</div>
+            <div class="task-card__item-value" id="taskOrderType">--</div>
           </div>
           <div class="task-card__item">
             <div class="task-card__item-label">打包份数</div>
@@ -496,6 +499,7 @@
     var taskData = {
       'T-001': {
         orderNo: 'PO-20260616-001',
+        orderType: 'internal',
         mealPacks: [
           { type: '净菜包', packName: '土豆丝', packSize: 3, packSpec: '500g', ingredients: [
             { name: '土豆丝', icon: '&#x1F954;', weightPerPack: 500, weighed: 750 }
@@ -515,6 +519,7 @@
       },
       'T-002': {
         orderNo: 'PO-20260616-002',
+        orderType: 'external',
         mealPacks: [
           { type: '净菜包', packName: '白菜丝', packSize: 2, packSpec: '1000g', ingredients: [
             { name: '白菜丝', icon: '&#x1F96C;', weightPerPack: 1000, weighed: 0 }
@@ -577,7 +582,11 @@
 
       /* 设置页面信息 */
       document.getElementById('taskOrder').textContent = task.orderNo;
-      document.getElementById('taskNo').textContent = taskNo;
+      /* 订单类型标签 */
+      var orderTypeEl = document.getElementById('taskOrderType');
+      var orderTypeLabel = task.orderType === 'internal' ? '内供订单' : '外售订单';
+      var orderTypeCls = task.orderType === 'internal' ? 'order-type-tag--internal' : 'order-type-tag--external';
+      orderTypeEl.innerHTML = '<span class="order-type-tag ' + orderTypeCls + '">' + orderTypeLabel + '</span>';
       /* 打包份数：每个食材项对应其所属包的 packSize，累加所有食材 */
       var totalPacks = 0;
       task.mealPacks.forEach(function(pack) {
diff --git a/other-module/canteen-device/ratio-scale/doc/CHANGELOG.md b/other-module/canteen-device/ratio-scale/doc/CHANGELOG.md
index a387cdb..1cfa5d3 100644
--- a/other-module/canteen-device/ratio-scale/doc/CHANGELOG.md
+++ b/other-module/canteen-device/ratio-scale/doc/CHANGELOG.md
@@ -1,5 +1,14 @@
 # 净菜配比秤 CHANGELOG
 
+## [1.3.2] - 2026-06-17
+
+### 调整
+- **列表页（01）**：「期望到货」→「任务截止时间」，时间格式改为年月日时间（`2026-06-17 HH:MM`）
+- **列表页（01）**：已完成订单不再显示「全部完成」按钮
+- **称重打包页（02）**：订单信息区新增订单类型标签（内供/外售），移除「任务号」字段
+
+---
+
 ## [1.3.1] - 2026-06-17
 
 ### 新增