diff --git a/.claude/memory/MEMORY.md b/.claude/memory/MEMORY.md
index f385f44..f9f0397 100644
--- a/.claude/memory/MEMORY.md
+++ b/.claude/memory/MEMORY.md
@@ -1,11 +1,11 @@
-_Last synced: 2026-07-23 | Base commit: `ea8239d`_
+_Last synced: 2026-07-24 | Base commit: `1e7c5a1`_
 
 # 记忆索引
 | 文件 | 描述 | 类型 | 最后更新 |
 |------|------|------|----------|
 | project_overview.md | 项目技术栈、架构与模块结构 | project | 2026-05-14 |
-| project_progress.md | 各模块原型开发进度 | project | 2026-07-23 |
+| project_progress.md | 各模块原型开发进度 | project | 2026-07-24 |
 | decisions.md | 关键设计决策与架构约定 | project | 2026-06-15 |
 | feedback.md | 协作规范与用户纠正记录 | feedback | 2026-06-15 |
 | user_profile.md | 用户角色与偏好 | user | 2026-04-21 |
-| lint_report.md | 记忆健康检查报告 | lint | 2026-06-26 |
+| lint_report.md | 记忆健康检查报告 | lint | 2026-07-24 |
diff --git a/.claude/memory/lint_report.md b/.claude/memory/lint_report.md
index 9066104..6ba220f 100644
--- a/.claude/memory/lint_report.md
+++ b/.claude/memory/lint_report.md
@@ -2,12 +2,12 @@
 name: 记忆健康检查报告
 description: memory-lint 最新一次执行的检查结果与待处理项
 type: lint
-last_updated: 2026-07-23
+last_updated: 2026-07-24
 ---
 
 # 记忆健康检查报告
 
-> _执行时间: 2026-07-23 | Base commit: `ea8239d` | Last synced: 2026-07-23_
+> _执行时间: 2026-07-24 | Base commit: `1e7c5a1` | Last synced: 2026-07-24_
 
 ## 健康概览
 
@@ -35,22 +35,22 @@ last_updated: 2026-07-23
 
 ### [ERROR] 严重过期 — user_profile.md
 
-- **文件**：`user_profile.md`（last_updated: 2026-04-21，距今 93 天，超过 90 天 ERROR 阈值）
+- **文件**：`user_profile.md`（last_updated: 2026-04-21，距今 94 天，超过 90 天 ERROR 阈值）
 - **建议**：确认用户角色/偏好是否有变化，执行 `/memory-update` 更新。
 
 ### [WARN] 过期 — project_overview.md
 
-- **文件**：`project_overview.md`（last_updated: 2026-05-14，距今 70 天）
+- **文件**：`project_overview.md`（last_updated: 2026-05-14，距今 71 天）
 - **建议**：确认技术栈、三端架构描述是否需要更新。
 
 ### [WARN] 过期 — decisions.md
 
-- **文件**：`decisions.md`（last_updated: 2026-06-15，距今 38 天）
+- **文件**：`decisions.md`（last_updated: 2026-06-15，距今 39 天）
 - **建议**：确认是否有新增关键决策需要记录。
 
 ### [WARN] 过期 — feedback.md
 
-- **文件**：`feedback.md`（last_updated: 2026-06-15，距今 38 天）
+- **文件**：`feedback.md`（last_updated: 2026-06-15，距今 39 天）
 - **建议**：确认是否有新的协作规范需要记录。
 
 ---
diff --git a/.claude/memory/project_progress.md b/.claude/memory/project_progress.md
index 815ab41..70b30a6 100644
--- a/.claude/memory/project_progress.md
+++ b/.claude/memory/project_progress.md
@@ -16,7 +16,7 @@
 - `health-consult/` — 健康咨询（32 页）✅
 - `emergency-medical/` — 应急就医（25+ 页）✅
 - `health-checkup/` — 健康体检（20+ 页）✅
-- `weight-management/` — 体重管理（23 页）✅
+- `weight-management/` — 体重管理（25 页）✅
   - `weight-main.html` — 体重管理主页（三态切换/英雄区/三态卡片/吃动平衡/体重记录/排行榜/推荐视频）
   - `goal-commitment.html` — 目标承诺签订（活动/个人双类型+URL参数状态同步）
   - `goal-management.html` — 目标管理（7种状态多卡片显隐+自我/活动目标切换）
@@ -38,6 +38,8 @@
   - `weight-history.html` — 体重记录历史
   - `weight-ranking.html` — 排行榜
   - `weight-report.html` — 体重报告
+  - `eat-checkin-v2.html` — 饮食打卡v2（重构版）
+  - `weight-main-v2.html` — 体重管理主页v2（重构版）
 - `health-monitor/` — 健康监测（20+ 页）🔨 设计中
   - `wearable/` — 穿戴设备监测（16 页：血氧/心率/压力/体温/步数/运动/睡眠/血压/心电+告警）
   - `weight/` — 体重监测（3 页，已独立为 `weight-management/` 模块）
@@ -85,10 +87,11 @@
 Web 管理端和员工端 APP 的其余模块（系统管理、运动管理、健康评估、知识普及、健康数据、心脑血管/糖尿病/癌症预防等）均为待开发状态。
 
 ## 总计
-- 已完成/设计中：561+ 个 HTML 原型页面
+- 已完成/设计中：563+ 个 HTML 原型页面
 - 覆盖模块：18 个（含三端+其他终端）
 
 ## 近期里程碑
+- 2026-07-24：营养管理后台净菜订单/外售功能增强——prod-clean-order 新增订单类型列/筛选、加工类型重命名、食谱快速创建订单弹窗（选日期→展示餐次菜品→勾选+人数→汇总表）；sup-clean-external 新增预定配送时间列/表单字段/详情抽屉；小程序 eat-nutrition 膳食宝塔重构（饮水移至塔基+横排极矮样式+食物分类明细列表）；体重管理新增 eat-checkin-v2 饮食打卡v2 和 weight-main-v2 体重管理主页v2。
 - 2026-07-23：营养管理后台与小程序多项增强——后台：场所新增/编辑页重构（营业时段/场所图片/资质证照 5 卡片区）、食材与餐品总库新增分类管理弹窗（树形增删改查）、食材新增/编辑页支持从已有食材复制；小程序：净菜包订单按状态差异化展示（待配送/配送中/已完成）、履约信息时间选择器重构为日期+时段联动下拉面板、新增收货地址管理页 me-address.html、健康档案移除营养目标分区；同步更新 CHANGELOG 及导航页。
 - 2026-07-21：导航页 popover 事件冒泡回归再次修复（同一根因第二次出现）——0603113 提交将 popover 重构为延迟渲染模式（首次点击"X 页"才动态构建 DOM），但 `togglePop` 函数内 `insertAdjacentHTML` 模板漏加 `onclick="event.stopPropagation()"`，导致同样的双 tab 打开回归。修复方式：在延迟构建模板中补上 stopPropagation（commit f671764）。系统性教训：嵌套 onclick 结构中子容器的 stopPropagation 在代码重构时极易遗漏，后续涉及 popover/弹层 DOM 创建位置变更时需检查事件冒泡拦截。
 - 2026-07-20：导航页 popover 事件冒泡回归修复——8a96ead 提交重构 popover 关闭逻辑时误删 `<div class="page-popover">` 上的 `onclick="event.stopPropagation()"`，导致 popover 内 `<a>` 点击事件冒泡到父级 `module-card` 触发 `window.open` 打开模块入口页，与 `<a>` 默认跳转叠加造成点击"页面总览"等列表项时同时打开两个 tab。修复方式：恢复 popover 容器上的 stopPropagation，与新版本 document click 监听器（靠 `closest` 判断）兼容（commit 5c518cb）。
diff --git a/CLAUDE.md b/CLAUDE.md
index b31fcc6..84ef9bf 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,4 +1,4 @@
-<!-- Last updated: 2026-07-23 | Commit: ea8239d -->
+<!-- Last updated: 2026-07-24 | Commit: 1e7c5a1 -->
 # 项目约束
 
 本项目所有工作必须严格遵守 `项目背景.md` 中定义的全部规范，包括：
diff --git a/other-module/mini-program/nutrition/me-order-detail.html b/other-module/mini-program/nutrition/me-order-detail.html
index 7d87387..6d1b348 100644
--- a/other-module/mini-program/nutrition/me-order-detail.html
+++ b/other-module/mini-program/nutrition/me-order-detail.html
@@ -27,6 +27,7 @@
     .oh-top { display: flex; justify-content: space-between; align-items: flex-start; margin-bottom: 10px; }
     .oh-date { font-size: 15px; font-weight: 700; color: #333; margin-bottom: 3px; }
     .oh-id { font-size: 11px; color: #999; }
+    .oh-order-time { font-size: 11px; color: #999; margin-top: 2px; }
     .oh-badge { font-size: 12px; padding: 3px 10px; border-radius: 12px; background: #f6ffed; color: #52c41a; font-weight: 600; }
     .oh-stats { display: flex; gap: 0; padding: 10px 0; border-top: 0.5px solid #f5f5f5; border-bottom: 0.5px solid #f5f5f5; }
     .oh-stat { flex: 1; text-align: center; }
@@ -116,6 +117,7 @@
           <div>
             <div class="oh-date">2026-04-28 午餐</div>
             <div class="oh-id">NM-20260428-001</div>
+            <div class="oh-order-time">下单时间：2026-04-28 11:32:15</div>
           </div>
           <span class="oh-badge">✅ 已完成</span>
         </div>
@@ -273,10 +275,26 @@
           </div>
         </div>
         <!-- 营养建议 -->
-        <div class="advice-card" style="margin:0">
+        <div class="advice-card" style="margin:0 0 12px;">
           <div class="advice-title">营养建议</div>
           <div class="advice-text">⚠ 本餐脂肪摄入偏高，建议下次适当减少荤菜；蔬菜摄入量不足，建议增加一份绿叶菜。</div>
         </div>
+        <!-- 支付信息 -->
+        <div class="sec-card" style="margin:0;">
+          <div class="sec-title">📋 支付信息</div>
+          <div class="info-row">
+            <span class="ir-label">支付方式</span>
+            <span class="ir-value">💳 微信支付</span>
+          </div>
+          <div class="info-row">
+            <span class="ir-label">支付流水号</span>
+            <span class="ir-value" style="font-family:monospace;font-size:11px;">4200002564202604281132180015</span>
+          </div>
+          <div class="info-row">
+            <span class="ir-label">支付时间</span>
+            <span class="ir-value">2026-04-28 11:32:18</span>
+          </div>
+        </div>
       </div>
     </div>
     <div class="home-indicator"></div>
@@ -288,7 +306,8 @@
     return m ? decodeURIComponent(m[1]) : '';
   }
 
-  var type = getQuery('type') === 'clean' ? 'clean' : 'meal';
+  var rawType = getQuery('type');
+  var type = (rawType === 'clean' || rawType === 'line') ? rawType : 'meal';
   /* 净菜包订单状态：delivering=待配送 / shipped=已发货 / done=已完成；缺省按待配送处理 */
   var rawStatus = getQuery('status');
   var status = ['delivering', 'shipped', 'done'].indexOf(rawStatus) >= 0 ? rawStatus : 'delivering';
@@ -296,7 +315,100 @@
   /* 是否展示食材来源与溯源按钮：仅 已发货 / 已完成 可见 */
   var showTrace = status === 'shipped' || status === 'done';
 
-  if (type === 'clean') {
+  if (type === 'line') {
+    /* ========== 餐线订单详情 ========== */
+    var payMap = { alipay: '支付宝', wechat: '微信支付', cash: '现金' };
+    var payMethod = payMap[getQuery('pay')] || '微信支付';
+
+    /* 订单头部 */
+    document.getElementById('orderHeader').innerHTML =
+        '<div class="oh-top">'
+      +   '<div>'
+      +     '<div class="oh-date">2026-05-14 午餐</div>'
+      +     '<div class="oh-id">XL-20260514-001</div>'
+      +     '<div class="oh-order-time">下单时间：2026-05-14 11:58:32</div>'
+      +   '</div>'
+      +   '<span class="oh-badge" style="background:#f6ffed;color:#52c41a;">✅ 已完成</span>'
+      + '</div>'
+      + '<div class="oh-stats">'
+      +   '<div class="oh-stat"><div class="sv" style="color:#fa8c16">85</div><div class="sl">营养评分</div></div>'
+      +   '<div class="oh-stat"><div class="sv" style="color:#f5222d">¥32.50</div><div class="sl">消费金额</div></div>'
+      +   '<div class="oh-stat"><div class="sv" style="color:#1677ff">3</div><div class="sl">菜品数</div></div>'
+      +   '<div class="oh-stat"><div class="sv" style="color:#555">505</div><div class="sl">总热量kcal</div></div>'
+      + '</div>';
+
+    /* 菜品明细：克重计量 + 食材来源溯源 */
+    document.getElementById('dishSection').innerHTML =
+        '<div class="dish-sec-title">菜品明细 · 食材 · 溯源</div>'
+      /* 清蒸鱼 */
+      + '<div class="dish-card">'
+      +   '<div class="dish-head">'
+      +     '<div class="dish-icon">🐟</div>'
+      +     '<div class="dish-info">'
+      +       '<div class="dish-name-row"><span class="dish-name">清蒸鱼</span></div>'
+      +       '<div class="dish-meta">185g · 142kcal</div>'
+      +     '</div>'
+      +     '<span class="dish-price">¥18.00</span>'
+      +   '</div>'
+      +   '<div class="ing-section">'
+      +     '<div class="ing-label">食材来源</div>'
+      +     '<div class="ing-row"><div class="ing-dot"></div><div class="ing-info"><div class="ing-name">草鱼 120g</div><div class="ing-code">ST-EX-HS01-SF-CAYO-060K-20260414-001</div></div><span class="ing-ok">✅合格</span><a class="ing-trace" href="trace-detail.html">🔗溯源</a></div>'
+      +     '<div class="ing-row"><div class="ing-dot"></div><div class="ing-info"><div class="ing-name">葱丝 15g</div><div class="ing-code">NC-PROC-CGSI-20260422-01</div></div><span class="ing-ok">✅合格</span><a class="ing-trace" href="trace-detail.html">🔗溯源</a></div>'
+      +     '<div class="ing-row"><div class="ing-dot"></div><div class="ing-info"><div class="ing-name">姜丝 10g</div><div class="ing-code">NC-PROC-JIAS-20260422-01</div></div><span class="ing-ok">✅合格</span><a class="ing-trace" href="trace-detail.html">🔗溯源</a></div>'
+      +   '</div>'
+      + '</div>'
+      /* 炒时蔬 */
+      + '<div class="dish-card">'
+      +   '<div class="dish-head">'
+      +     '<div class="dish-icon">🥬</div>'
+      +     '<div class="dish-info">'
+      +       '<div class="dish-name-row"><span class="dish-name">炒时蔬</span></div>'
+      +       '<div class="dish-meta">120g · 68kcal</div>'
+      +     '</div>'
+      +     '<span class="dish-price">¥8.00</span>'
+      +   '</div>'
+      +   '<div class="ing-section">'
+      +     '<div class="ing-label">食材来源</div>'
+      +     '<div class="ing-row"><div class="ing-dot"></div><div class="ing-info"><div class="ing-name">西兰花 100g</div><div class="ing-code">ST-EX-LY01-VG-XLHU-080K-20260416-001</div></div><span class="ing-ok">✅合格</span><a class="ing-trace" href="trace-detail.html">🔗溯源</a></div>'
+      +     '<div class="ing-row"><div class="ing-dot"></div><div class="ing-info"><div class="ing-name">蒜末 5g</div><div class="ing-code">ST-EX-LY02-VG-SUAN-010K-20260418-001</div></div><span class="ing-ok">✅合格</span><a class="ing-trace" href="trace-detail.html">🔗溯源</a></div>'
+      +   '</div>'
+      + '</div>'
+      /* 米饭 */
+      + '<div class="dish-card">'
+      +   '<div class="dish-head">'
+      +     '<div class="dish-icon">🍚</div>'
+      +     '<div class="dish-info">'
+      +       '<div class="dish-name-row"><span class="dish-name">米饭</span></div>'
+      +       '<div class="dish-meta">200g · 232kcal</div>'
+      +     '</div>'
+      +     '<span class="dish-price">¥2.00</span>'
+      +   '</div>'
+      +   '<div class="ing-section">'
+      +     '<div class="ing-label">食材来源</div>'
+      +     '<div class="ing-row"><div class="ing-dot"></div><div class="ing-info"><div class="ing-name">大米 200g</div><div class="ing-code">ST-EX-LY02-DG-DAMI-1000-20260413-001</div></div><span class="ing-ok">✅合格</span><a class="ing-trace" href="trace-detail.html">🔗溯源</a></div>'
+      +   '</div>'
+      + '</div>'
+      /* 支付信息 */
+      + '<div class="sec-card" style="margin:12px 0 0;">'
+      +   '<div class="sec-title">📋 支付信息</div>'
+      +   '<div class="info-row">'
+      +     '<span class="ir-label">支付方式</span>'
+      +     '<span class="ir-value">💳 ' + payMethod + '</span>'
+      +   '</div>'
+      +   '<div class="info-row">'
+      +     '<span class="ir-label">支付流水号</span>'
+      +     '<span class="ir-value" style="font-family:monospace;font-size:11px;">' + (payMethod === '支付宝' ? '2026051422001416320500123456' : payMethod === '微信支付' ? '4200002564202605141132180012' : 'CASH-20260514-0003') + '</span>'
+      +   '</div>'
+      +   '<div class="info-row">'
+      +     '<span class="ir-label">支付时间</span>'
+      +     '<span class="ir-value">2026-05-14 11:58:35</span>'
+      +   '</div>'
+      +   '<div class="info-row">'
+      +     '<span class="ir-label">取餐餐线</span>'
+      +     '<span class="ir-value">A区中餐线</span>'
+      +   '</div>'
+      + '</div>';
+  } else if (type === 'clean') {
     /* 状态徽标：文案与配色随 status 切换 */
     var badgeMap = {
       delivering: { text: '🚚 待配送', bg: '#e6f4ff', color: '#1677ff' },
@@ -311,6 +423,7 @@
       +   '<div>'
       +     '<div class="oh-date">2026-04-29 午餐时段配送</div>'
       +     '<div class="oh-id">CL-20260428-017</div>'
+  +     '<div class="oh-order-time">下单时间：2026-04-28 14:23:08</div>'
       +   '</div>'
       +   '<span class="oh-badge" style="background:' + b.bg + ';color:' + b.color + ';">' + b.text + '</span>'
       + '</div>'
@@ -396,9 +509,25 @@
       +   '</div>'
       +   lowFatIng
       + '</div>'
-      + '<div class="advice-card" style="margin:0;">'
+      + '<div class="advice-card" style="margin:0 0 12px;">'
       +   '<div class="advice-title">🍳 烹制提示</div>'
       +   '<div class="advice-text" style="color:#1677ff;">宫保鸡丁净菜包：热锅冷油下鸡丁滑炒至变色，加入配料包翻炒 2 分钟即可出锅；糙米饭需另行准备。</div>'
+      + '</div>'
+      /* 支付信息 */
+      + '<div class="sec-card" style="margin:0;">'
+      +   '<div class="sec-title">📋 支付信息</div>'
+      +   '<div class="info-row">'
+      +     '<span class="ir-label">支付方式</span>'
+      +     '<span class="ir-value">💳 微信支付</span>'
+      +   '</div>'
+      +   '<div class="info-row">'
+      +     '<span class="ir-label">支付流水号</span>'
+      +     '<span class="ir-value" style="font-family:monospace;font-size:11px;">4200002564202604281423080017</span>'
+      +   '</div>'
+      +   '<div class="info-row">'
+      +     '<span class="ir-label">支付时间</span>'
+      +     '<span class="ir-value">2026-04-28 14:23:08</span>'
+      +   '</div>'
       + '</div>';
 
     /* 订单进度时间线：按状态高亮对应节点 */
diff --git a/other-module/mini-program/nutrition/me-orders.html b/other-module/mini-program/nutrition/me-orders.html
index 7f1730c..201fd6e 100644
--- a/other-module/mini-program/nutrition/me-orders.html
+++ b/other-module/mini-program/nutrition/me-orders.html
@@ -30,6 +30,7 @@
     .order-card .type-tag { font-size: 10px; padding: 1px 6px; border-radius: 8px; font-weight: 600; line-height: 16px; }
     .order-card .type-tag.meal { background: #e6f4ff; color: #1677ff; }
     .order-card .type-tag.clean { background: #fff7e6; color: #fa8c16; }
+    .order-card .type-tag.line { background: #e6fffb; color: #13c2c2; }
     .order-card .status { font-size: 12px; color: #52c41a; font-weight: 500; }
     .order-card .status.pending { color: #fa8c16; }
     .order-card .status.shipping { color: #1677ff; }
@@ -40,9 +41,12 @@
       background: #fff7e6; border-radius: 6px; display: flex; align-items: center; gap: 4px;
     }
     .order-card .fulfill-meta.done { color: #52c41a; background: #f6ffed; }
+    .order-card .pay-meta { font-size: 11px; color: #666; margin-bottom: 8px; padding: 4px 8px; background: #f5f5f5; border-radius: 6px; display: flex; align-items: center; gap: 4px; }
     .order-card .card-bottom { display: flex; justify-content: space-between; align-items: center; }
     .order-card .total { font-size: 14px; font-weight: 700; color: #f5222d; }
     .order-card .time { font-size: 11px; color: #999; }
+    .order-tabs .ot { cursor: pointer; }
+    .order-card.hidden { display: none; }
   </style>
 </head>
 <body>
@@ -62,15 +66,15 @@
         <span class="ot">待配送</span>
         <span class="ot">已完成</span>
       </div>
-      <a class="order-card" href="me-order-detail-pending.html">
+      <a class="order-card" href="me-order-detail-pending.html" data-status="pending">
         <div class="card-top">
-          <div class="shop-row"><span class="shop">🍽️ 阳光食堂 · 午餐</span><span class="type-tag meal">餐品</span></div>
+          <div class="shop-row"><span class="shop">🍽️ 阳光食堂 · 午餐</span><span class="type-tag meal">点餐</span></div>
           <span class="status pending">待取餐</span>
         </div>
         <div class="items">低脂鸡胸肉沙拉 ×1、杂粮饭 ×1、紫菜蛋花汤 ×1</div>
         <div class="card-bottom"><span class="total">¥ 28.5</span><span class="time">今天 11:32</span></div>
       </a>
-      <a class="order-card" href="me-order-detail.html?type=clean&status=delivering">
+      <a class="order-card" href="me-order-detail.html?type=clean&status=delivering" data-status="shipping">
         <div class="card-top">
           <div class="shop-row"><span class="shop">🥬 阳光食堂 · 净菜包订单</span><span class="type-tag clean">净菜包</span></div>
           <span class="status shipping">待配送</span>
@@ -79,15 +83,15 @@
         <div class="fulfill-meta">🚚 配送到家 · 明日（4月29日）11:00-12:00</div>
         <div class="card-bottom"><span class="total">¥ 79.0</span><span class="time">今天 14:23 下单</span></div>
       </a>
-      <a class="order-card" href="me-order-detail.html">
+      <a class="order-card" href="me-order-detail.html" data-status="done">
         <div class="card-top">
-          <div class="shop-row"><span class="shop">🍽️ 阳光食堂 · 早餐</span><span class="type-tag meal">餐品</span></div>
+          <div class="shop-row"><span class="shop">🍽️ 阳光食堂 · 早餐</span><span class="type-tag meal">点餐</span></div>
           <span class="status">已完成</span>
         </div>
         <div class="items">全麦三明治 ×1、鲜榨橙汁 ×1</div>
         <div class="card-bottom"><span class="total">¥ 15.0</span><span class="time">今天 07:45</span></div>
       </a>
-      <a class="order-card" href="me-order-detail.html?type=clean&status=done">
+      <a class="order-card" href="me-order-detail.html?type=clean&status=done" data-status="done">
         <div class="card-top">
           <div class="shop-row"><span class="shop">🥬 阳光食堂 · 净菜包订单</span><span class="type-tag clean">净菜包</span></div>
           <span class="status">已完成</span>
@@ -96,16 +100,70 @@
         <div class="fulfill-meta done">🏪 食堂自提 · 已取货</div>
         <div class="card-bottom"><span class="total">¥ 36.0</span><span class="time">昨天 12:15</span></div>
       </a>
-      <a class="order-card" href="me-order-detail.html">
+      <a class="order-card" href="me-order-detail.html" data-status="done">
         <div class="card-top">
-          <div class="shop-row"><span class="shop">🍽️ 健康轻食 · 午餐</span><span class="type-tag meal">餐品</span></div>
+          <div class="shop-row"><span class="shop">🍽️ 健康轻食 · 午餐</span><span class="type-tag meal">点餐</span></div>
           <span class="status">已完成</span>
         </div>
         <div class="items">三文鱼牛油果碗 ×1、蔬菜汁 ×1</div>
         <div class="card-bottom"><span class="total">¥ 42.0</span><span class="time">昨天 12:15</span></div>
       </a>
+      <!-- 餐线订单：始终已完成、克重计量、支付方式见详情页 -->
+      <a class="order-card" href="me-order-detail.html?type=line&pay=alipay" data-status="done">
+        <div class="card-top">
+          <div class="shop-row"><span class="shop">🍽️ 阳光食堂 · 午餐</span><span class="type-tag line">餐线</span></div>
+          <span class="status">已完成</span>
+        </div>
+        <div class="items">清蒸鱼 185g、炒时蔬 120g、米饭 200g</div>
+        <div class="card-bottom"><span class="total">¥ 32.50</span><span class="time">今天 12:05</span></div>
+      </a>
+      <a class="order-card" href="me-order-detail.html?type=line&pay=wechat" data-status="done">
+        <div class="card-top">
+          <div class="shop-row"><span class="shop">🍽️ 阳光食堂 · 早餐</span><span class="type-tag line">餐线</span></div>
+          <span class="status">已完成</span>
+        </div>
+        <div class="items">小米粥 300g、茶叶蛋 60g、花卷 100g</div>
+        <div class="card-bottom"><span class="total">¥ 8.00</span><span class="time">今天 07:30</span></div>
+      </a>
+      <a class="order-card" href="me-order-detail.html?type=line&pay=cash" data-status="done">
+        <div class="card-top">
+          <div class="shop-row"><span class="shop">🥗 健康轻食 · 午餐</span><span class="type-tag line">餐线</span></div>
+          <span class="status">已完成</span>
+        </div>
+        <div class="items">香煎鸡胸 150g、藜麦沙拉 200g、南瓜汤 250ml</div>
+        <div class="card-bottom"><span class="total">¥ 38.00</span><span class="time">昨天 11:50</span></div>
+      </a>
     </div>
     <div class="home-indicator"></div>
   </div>
+<script>
+  /* Tab 切换过滤 */
+  (function() {
+    var tabs = document.querySelectorAll('.order-tabs .ot');
+    var cards = document.querySelectorAll('.order-card');
+    if (!tabs.length || !cards.length) return;
+
+    /* 状态映射：tab 文本 → data-status 值 */
+    var statusMap = { '待取餐': 'pending', '待配送': 'shipping', '已完成': 'done' };
+
+    tabs.forEach(function(tab) {
+      tab.addEventListener('click', function() {
+        /* 切换 active 样式 */
+        tabs.forEach(function(t) { t.classList.remove('active'); });
+        tab.classList.add('active');
+
+        var filter = tab.textContent.trim();
+        cards.forEach(function(card) {
+          if (filter === '全部') {
+            card.classList.remove('hidden');
+          } else {
+            var target = statusMap[filter];
+            card.classList.toggle('hidden', card.getAttribute('data-status') !== target);
+          }
+        });
+      });
+    });
+  })();
+</script>
 </body>
 </html>
diff --git a/web-admin/nutrition/doc/CHANGELOG.md b/web-admin/nutrition/doc/CHANGELOG.md
index 40cb519..02e4a67 100644
--- a/web-admin/nutrition/doc/CHANGELOG.md
+++ b/web-admin/nutrition/doc/CHANGELOG.md
@@ -4,8 +4,19 @@
 
 ### 后台营养管理
 
-- **`prod-clean-order.html`**（净菜订单）：筛选栏新增「订单类型」筛选（内供/外售），表格新增「订单类型」列，外售订单行隐藏删除按钮。新建订单弹窗新增「订单类型」字段（默认「内供」且不可选），原二级「净菜类型」重命名为「加工类型」避免与一级净菜类型混淆。新增「由食谱快速创建订单」按钮与弹窗——选食谱日期后展示当日各餐次（早/午/晚/加餐）菜品列表（数据来源 `din-recipe-mgmt.html`），勾选餐次并输入就餐人数后实时汇总：餐品名称 / 包装规格 / 需求份数 / 需求计量(kg)。详情抽屉、确认收货等 JS 逻辑同步适配新列索引。
-- **`sup-clean-external.html`**（净菜外售）：表格新增「预定配送时间」列，8 条示例数据补充配送时间。新建外售订单弹窗新增「预定配送时间」字段（含必填校验）。详情抽屉新增「预定配送时间」展示，JS 列索引同步适配。
+- **`prod-clean-order.html`**（净菜订单）：数据模型重构为主子表结构（一单多品）。筛选栏新增「订单类型」筛选（内供/外售），订单状态新增「部分完成」选项。表格新增展开箭头——主表展示订单号/订单类型/菜品数/总份数/总计量/订单状态，点击展开显示各菜品明细行（净菜类型/菜品食材/包装规格/份数/计量/行状态）。新增「部分完成」状态（tag-purple），当订单下各菜品状态不一致时自动聚合显示。新建订单弹窗全面重构为动态明细行构建器——支持逐行添加/移除菜品，每行支持净菜包/餐品净菜包切换、食材联动加工类型、餐品联动规格、份数自动计算计量，底部实时汇总预览；原二级「净菜类型」重命名为「加工类型」避免与一级净菜类型混淆。新增「由食谱快速创建订单」按钮与弹窗——选食谱日期后展示当日各餐次菜品列表，勾选餐次并输入就餐人数后实时汇总。确认收货改为行级确认收货（按菜品行逐条确认）。详情抽屉展示订单信息汇总+全部菜品明细列表（餐品净菜包含食材构成展示）。示例数据从 6 行扩展为 8 条订单 17 条明细行。
+- **`sup-clean-external.html`**（净菜外售）：数据模型重构为主子表结构。表格主表展示订单号/客户名称/菜品数/总份数/总计量/订单金额/下单时间/预定配送/物流单号/订单状态，展开显示各菜品明细（净菜类型/菜品食材/包装规格/份数/计量/单价/小计/行状态）。新增「预定配送时间」列。新建外售订单弹窗重构为动态明细行构建器，新增「预定配送时间」字段（含必填校验），支持多菜品添加与金额汇总预览。详情抽屉展示订单明细列表+金额合计。JS 数据模型统一改为主子表。
+- **`sup-clean-internal.html`**（净菜内供）：数据模型重构为主子表结构。表格主表展示申领单号/申领场所/菜品数/总份数/总数量/申领单状态/申领时间/预定配送时间/配送人，展开显示各菜品明细（净菜类型/菜品食材/包装规格/份数/数量/行状态）。新建申领单弹窗重构为动态明细行构建器，支持多菜品添加与汇总预览。详情抽屉展示申领单汇总+明细列表。JS 数据模型统一改为主子表。
+- **`farm-purchase.html`**（采购管理）：采购明细子表新增「验收数量」列，所有示例数据行补充验收数量字段。确认收货弹窗从简单确认框重构为验收明细弹窗——展示食材名称/规格/采购数量/验收数量/备注表格，逐项填写验收数量后方可提交（含全覆盖校验）。已完成的采购单自动预填验收数量。详情抽屉表格同步新增验收数量列。
+- **`prod-proc-cabinet.html`**（净菜进柜）：表头新增「订单菜品」列（区分于原「存放净菜」列语义），数据行同步适配（如土豆行拆分为订单菜品=土豆丝 / 存放净菜=土豆（土豆丝））。空闲行补齐新增列占位。进柜弹窗新增「选择订单菜品」联动回显区域。
+- **`prod-proc-combo.html`**（净菜组配）：表头新增「关联订单」列，数据行关联订单号 CO-001~CO-004，同一订单的多条组配任务以 `order-last` 样式标记末行。任务来源字段从下拉选择改为 tag 展示（餐线/点餐/录入）。
+- **`prod-proc-cook.html`**（按单烹制）：表头新增「关联订单」列，数据行关联订单号并展示该订单下的烹制进度汇总（✓ 已烹齐 / 烹制中 n/m / 待烹制 n/m）。新增 `updateOrderBadge()` / `showCookOrderDetail()` JS 函数支持订单进度动态更新。
+- **`sup-in-clean.html`**（净菜加工）：表头移除「质检结果」列，所有数据行同步移除质检结果字段。新建/编辑弹窗移除质检结果下拉选择。
+
+### 营养管理小程序
+
+- **`me-order-detail.html`**（订单详情）：订单头部新增下单时间显示。餐品/净菜包订单均新增「支付信息」卡片（支付方式/支付流水号/支付时间）。新增 `type=line` 餐线订单详情渲染——展示菜品明细含克重计量、食材来源及溯源链接、支付信息（含取餐餐线），支持支付宝/微信/现金三种支付方式差异化流水号。
+- **`me-orders.html`**（我的订单）：新增 3 条餐线订单卡片（青色「餐线」标签），支持支付宝/微信/现金三种支付方式。所有订单卡片「餐品」标签改为「点餐」。新增 Tab 切换过滤 JS 逻辑——「全部/待取餐/待配送/已完成」点击联动卡片显隐，所有订单卡片补充 `data-status` 属性。
 
 ## [2026-07-23]
 
@@ -20,9 +31,9 @@
 
 ### 营养管理小程序
 
-- **`eat-order.html`**（订餐页）：净菜包菜品名称去掉「净菜包」后缀；菜品图标、名称、描述区域点击可跳转至菜品详情页。
+- **`eat-order.html`**（订餐页）：新增净菜包购买链路全流程（涉及下单、购物车、订单结算、订单详情、我的订单等页面），增加点击餐品查看详情的操作。
 - **`eat-order-confirm.html`**（订单确认页 · 净菜包）：期望配送时间由 chip 单选改为日期+时段联动下拉面板，左侧日期卡片右侧时段列表；取货方式切换时时间标签文案联动（期望配送时间 ↔ 自提时间）。
-- **`me-health.html`**（健康档案）：移除「营养目标」分区及其编辑弹窗。
+- **`me-health.html`**（健康档案）：健康档案重构页面整体重构对齐后台用户十维档案。
 - **`me-home.html`**（我的主页）：菜单列表新增「收货地址」入口，指向新增的 `me-address.html`。
 - **`me-address.html`**（收货地址 · 新增页面）：支持地址卡片列表展示、编辑/删除/设为默认操作，含内联编辑表单。
 - **`me-order-detail.html`**（订单详情 · 净菜包）：按订单状态（待配送/配送中/已完成）差异化渲染——头部徽标文案与配色联动，待配送状态仅展示食材明细+主辅材角色标签，已发货/已完成展示食材来源及溯源按钮；订单进度时间线改为动态渲染，按状态高亮对应节点。
diff --git a/web-admin/nutrition/farm-purchase.html b/web-admin/nutrition/farm-purchase.html
index 8b518f0..58cbeca 100644
--- a/web-admin/nutrition/farm-purchase.html
+++ b/web-admin/nutrition/farm-purchase.html
@@ -98,6 +98,7 @@ tbody tr:hover{background:#F8FBFF;}
 .sub-table th{background:#F0F5FF;padding:10px 14px;font-size:var(--font-xs);color:var(--text-secondary);font-weight:500;border-bottom:1px solid #e8e8e8;}
 .sub-table td{padding:10px 14px;font-size:var(--font-xs);border-bottom:1px solid #f0f0f0;background:#fff;}
 .sub-table tr:last-child td{border-bottom:none;}
+.sub-table input.receive-qty-input:focus{border-color:var(--primary);outline:none;box-shadow:0 0 0 2px rgba(24,144,255,0.15);}
 .sub-table__footer{display:flex;justify-content:flex-end;padding:8px 14px;background:#F0F5FF;font-size:var(--font-xs);color:var(--text-secondary);font-weight:500;}
 /* 操作列 */
 thead th:last-child,tbody td.td-actions{position:sticky;right:0;background:#fff;box-shadow:-4px 0 8px rgba(0,0,0,0.04);z-index:2;white-space:nowrap;}
@@ -303,10 +304,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           <tr class="detail-row" id="detail-1">
             <td colspan="11">
               <table class="sub-table">
-                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>备注</th></tr></thead>
+                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>验收数量</th><th>备注</th></tr></thead>
                 <tbody>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-XLHU-080K-20260416-001</td><td>西兰花</td><td>蔬菜类</td><td>80</td><td>散装(kg)</td><td>¥4.5</td><td>¥360</td><td>—</td></tr>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-QCAI-120K-20260416-002</td><td>芹菜</td><td>蔬菜类</td><td>120</td><td>散装(kg)</td><td>¥2.5</td><td>¥300</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-XLHU-080K-20260416-001</td><td>西兰花</td><td>蔬菜类</td><td>80</td><td>散装(kg)</td><td>¥4.5</td><td>¥360</td><td>—</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-QCAI-120K-20260416-002</td><td>芹菜</td><td>蔬菜类</td><td>120</td><td>散装(kg)</td><td>¥2.5</td><td>¥300</td><td>—</td><td>—</td></tr>
                 </tbody>
               </table>
               <div class="sub-table__footer">合计：2 种食材，200 kg，¥660</div>
@@ -329,11 +330,11 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           <tr class="detail-row" id="detail-2">
             <td colspan="11">
               <table class="sub-table">
-                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>备注</th></tr></thead>
+                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>验收数量</th><th>备注</th></tr></thead>
                 <tbody>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-BOCA-050K-20260415-002</td><td>菠菜</td><td>蔬菜类</td><td>50</td><td>散装(kg)</td><td>¥2.5</td><td>¥125</td><td>—</td></tr>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-BCAI-080K-20260415-003</td><td>白菜</td><td>蔬菜类</td><td>80</td><td>散装(kg)</td><td>¥1.8</td><td>¥144</td><td>—</td></tr>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-HLUB-120K-20260415-004</td><td>胡萝卜</td><td>蔬菜类</td><td>120</td><td>散装(kg)</td><td>¥1.8</td><td>¥216</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-BOCA-050K-20260415-002</td><td>菠菜</td><td>蔬菜类</td><td>50</td><td>散装(kg)</td><td>¥2.5</td><td>¥125</td><td>—</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-BCAI-080K-20260415-003</td><td>白菜</td><td>蔬菜类</td><td>80</td><td>散装(kg)</td><td>¥1.8</td><td>¥144</td><td>—</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-HLUB-120K-20260415-004</td><td>胡萝卜</td><td>蔬菜类</td><td>120</td><td>散装(kg)</td><td>¥1.8</td><td>¥216</td><td>—</td><td>—</td></tr>
                 </tbody>
               </table>
               <div class="sub-table__footer">合计：3 种食材，250 kg，¥485</div>
@@ -356,10 +357,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           <tr class="detail-row" id="detail-3">
             <td colspan="11">
               <table class="sub-table">
-                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>备注</th></tr></thead>
+                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>验收数量</th><th>备注</th></tr></thead>
                 <tbody>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-XR01-MT-ZLRJ-080K-20260415-005</td><td>猪里脊</td><td>肉禽类</td><td>80</td><td>25kg/件</td><td>¥28</td><td>¥2,240</td><td>需冷链运输</td></tr>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-XR01-MT-ZWUA-240K-20260415-006</td><td>猪五花</td><td>肉禽类</td><td>240</td><td>25kg/件</td><td>¥26</td><td>¥6,240</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-XR01-MT-ZLRJ-080K-20260415-005</td><td>猪里脊</td><td>肉禽类</td><td>80</td><td>25kg/件</td><td>¥28</td><td>¥2,240</td><td>—</td><td>需冷链运输</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-XR01-MT-ZWUA-240K-20260415-006</td><td>猪五花</td><td>肉禽类</td><td>240</td><td>25kg/件</td><td>¥26</td><td>¥6,240</td><td>—</td><td>—</td></tr>
                 </tbody>
               </table>
               <div class="sub-table__footer">合计：2 种食材，320 kg，¥8,480</div>
@@ -382,11 +383,11 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           <tr class="detail-row" id="detail-4">
             <td colspan="11">
               <table class="sub-table">
-                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>备注</th></tr></thead>
+                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>验收数量</th><th>备注</th></tr></thead>
                 <tbody>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-HS01-SF-CAYO-060K-20260414-001</td><td>草鱼</td><td>水产类</td><td>60</td><td>散装(kg)</td><td>¥18</td><td>¥1,080</td><td>活鲜运输</td></tr>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-HS01-SF-JIYU-080K-20260414-002</td><td>鲫鱼</td><td>水产类</td><td>80</td><td>散装(kg)</td><td>¥16</td><td>¥1,280</td><td>—</td></tr>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-HS01-SF-XIAA-050K-20260414-003</td><td>虾</td><td>水产类</td><td>50</td><td>散装(kg)</td><td>¥30</td><td>¥1,500</td><td>冰鲜</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-HS01-SF-CAYO-060K-20260414-001</td><td>草鱼</td><td>水产类</td><td>60</td><td>散装(kg)</td><td>¥18</td><td>¥1,080</td><td>60</td><td>活鲜运输</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-HS01-SF-JIYU-080K-20260414-002</td><td>鲫鱼</td><td>水产类</td><td>80</td><td>散装(kg)</td><td>¥16</td><td>¥1,280</td><td>80</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-HS01-SF-XIAA-050K-20260414-003</td><td>虾</td><td>水产类</td><td>50</td><td>散装(kg)</td><td>¥30</td><td>¥1,500</td><td>—</td><td>冰鲜</td></tr>
                 </tbody>
               </table>
               <div class="sub-table__footer">合计：3 种食材，190 kg，¥3,860</div>
@@ -409,10 +410,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           <tr class="detail-row" id="detail-5">
             <td colspan="11">
               <table class="sub-table">
-                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>备注</th></tr></thead>
+                <thead><tr><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>验收数量</th><th>备注</th></tr></thead>
                 <tbody>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY02-DG-DAMI-1000-20260413-001</td><td>大米</td><td>粮油类</td><td>1000</td><td>20kg/箱</td><td>¥3.5</td><td>¥3,500</td><td>东北五常大米</td></tr>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY02-DG-HSYO-168K-20260413-002</td><td>花生油</td><td>粮油类</td><td>168</td><td>5L/桶</td><td>¥16</td><td>¥2,688</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY02-DG-DAMI-1000-20260413-001</td><td>大米</td><td>粮油类</td><td>1000</td><td>20kg/箱</td><td>¥3.5</td><td>¥3,500</td><td>—</td><td>东北五常大米</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY02-DG-HSYO-168K-20260413-002</td><td>花生油</td><td>粮油类</td><td>168</td><td>5L/桶</td><td>¥16</td><td>¥2,688</td><td>—</td><td>—</td></tr>
                 </tbody>
               </table>
               <div class="sub-table__footer">合计：2 种食材，1168 kg，¥6,188</div>
@@ -498,7 +499,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
     <div class="drawer-section-title">食材明细</div>
     <div style="padding:12px 24px 20px;">
       <table class="sub-table" id="drawerItemsTable">
-        <thead><tr><th>序号</th><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>备注</th></tr></thead>
+        <thead><tr><th>序号</th><th>溯源码</th><th>食材名称</th><th>食材分类</th><th>采购数量</th><th>规格</th><th>单价</th><th>小计金额</th><th>验收数量</th><th>备注</th></tr></thead>
         <tbody id="drawerItemsBody"></tbody>
       </table>
     </div>
@@ -601,17 +602,22 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
   </div>
 </div>
 
-<!-- 确认收货弹窗 -->
+<!-- 确认收货验收弹窗 -->
 <div class="modal-overlay" id="receiveModal" style="display:none;">
-  <div class="modal" style="width:400px;">
+  <div class="modal" style="width:680px;">
     <div class="modal-header">
-      <span class="modal-title">确认收货</span>
+      <span class="modal-title">确认收货 — 验收明细</span>
       <span class="modal-close" onclick="closeReceiveModal()">&times;</span>
     </div>
-    <div class="modal-body" style="text-align:center;padding:32px 24px;">
-      <div style="font-size:40px;margin-bottom:12px;">📦</div>
-      <p style="font-size:var(--font-base);color:var(--text-primary);margin-bottom:8px;">确认收货采购单 <strong id="receiveOrderNo">—</strong> ？</p>
-      <p style="font-size:var(--font-sm);color:var(--text-secondary);">确认后订单将变为已完成状态，请确保食材已验收无误</p>
+    <div class="modal-body" style="padding:24px;">
+      <p style="font-size:var(--font-sm);color:var(--text-primary);margin-bottom:4px;">采购单号：<strong id="receiveOrderNo">—</strong></p>
+      <p style="font-size:var(--font-xs);color:var(--text-secondary);margin-bottom:16px;">请逐项填写验收数量，确认无误后再提交收货</p>
+      <table class="sub-table" style="width:100%;">
+        <thead>
+          <tr><th style="width:40px;">序号</th><th>食材名称</th><th>规格</th><th style="width:90px;">采购数量</th><th style="width:110px;">验收数量</th><th>备注</th></tr>
+        </thead>
+        <tbody id="receiveItemsBody"></tbody>
+      </table>
     </div>
     <div class="modal-footer">
       <button class="btn btn-default" onclick="closeReceiveModal()">取消</button>
@@ -643,41 +649,41 @@ var orders = [
     supplier:'绿源蔬菜配送', supplierContact:'李明', supplierPhone:'138-9912-3456',
     date:'2026-04-16', arrival:'2026-04-17', source:'食谱搭配', status:'待接单', total:'¥660',
     items:[
-      {trace:'ST-EX-LY01-VG-XLHU-080K-20260416-001',name:'西兰花',cat:'蔬菜类',qty:80,spec:'散装(kg)',price:4.5,subtotal:'¥360',remark:'—'},
-      {trace:'ST-EX-LY01-VG-QCAI-120K-20260416-002',name:'芹菜',cat:'蔬菜类',qty:120,spec:'散装(kg)',price:2.5,subtotal:'¥300',remark:'—'}
+      {trace:'ST-EX-LY01-VG-XLHU-080K-20260416-001',name:'西兰花',cat:'蔬菜类',qty:80,spec:'散装(kg)',price:4.5,subtotal:'¥360',acceptedQty:'—',remark:'—'},
+      {trace:'ST-EX-LY01-VG-QCAI-120K-20260416-002',name:'芹菜',cat:'蔬菜类',qty:120,spec:'散装(kg)',price:2.5,subtotal:'¥300',acceptedQty:'—',remark:'—'}
     ]},
   { no:'PO-20260415-001', canteen:'一号场所', canteenContact:'王建国', canteenPhone:'029-8812-3001',
     supplier:'绿源蔬菜配送', supplierContact:'李明', supplierPhone:'138-9912-3456',
     date:'2026-04-15', arrival:'2026-04-16', source:'食谱搭配', status:'待发货', total:'¥485',
     items:[
-      {trace:'ST-EX-LY01-VG-BOCA-050K-20260415-002',name:'菠菜',cat:'蔬菜类',qty:50,spec:'散装(kg)',price:2.5,subtotal:'¥125',remark:'—'},
-      {trace:'ST-EX-LY01-VG-BCAI-080K-20260415-003',name:'白菜',cat:'蔬菜类',qty:80,spec:'散装(kg)',price:1.8,subtotal:'¥144',remark:'—'},
-      {trace:'ST-EX-LY01-VG-HLUB-120K-20260415-004',name:'胡萝卜',cat:'蔬菜类',qty:120,spec:'散装(kg)',price:1.8,subtotal:'¥216',remark:'—'}
+      {trace:'ST-EX-LY01-VG-BOCA-050K-20260415-002',name:'菠菜',cat:'蔬菜类',qty:50,spec:'散装(kg)',price:2.5,subtotal:'¥125',acceptedQty:'—',remark:'—'},
+      {trace:'ST-EX-LY01-VG-BCAI-080K-20260415-003',name:'白菜',cat:'蔬菜类',qty:80,spec:'散装(kg)',price:1.8,subtotal:'¥144',acceptedQty:'—',remark:'—'},
+      {trace:'ST-EX-LY01-VG-HLUB-120K-20260415-004',name:'胡萝卜',cat:'蔬菜类',qty:120,spec:'散装(kg)',price:1.8,subtotal:'¥216',acceptedQty:'—',remark:'—'}
     ]},
   { no:'PO-20260415-002', canteen:'一号场所', canteenContact:'王建国', canteenPhone:'029-8812-3001',
     supplier:'鲜肉直供公司', supplierContact:'张伟', supplierPhone:'139-0088-7654',
     date:'2026-04-15', arrival:'2026-04-16', source:'食谱搭配', status:'待收货', total:'¥8,480',
     deliveryMethod:'供应商自送', deliveryPerson:'张伟', deliveryPhone:'139-0088-7654', deliveryETA:'2026-04-16 14:00',
     items:[
-      {trace:'ST-EX-XR01-MT-ZLRJ-080K-20260415-005',name:'猪里脊',cat:'肉禽类',qty:80,spec:'25kg/件',price:28,subtotal:'¥2,240',remark:'需冷链运输'},
-      {trace:'ST-EX-XR01-MT-ZWUA-240K-20260415-006',name:'猪五花',cat:'肉禽类',qty:240,spec:'25kg/件',price:26,subtotal:'¥6,240',remark:'—'}
+      {trace:'ST-EX-XR01-MT-ZLRJ-080K-20260415-005',name:'猪里脊',cat:'肉禽类',qty:80,spec:'25kg/件',price:28,subtotal:'¥2,240',acceptedQty:'—',remark:'需冷链运输'},
+      {trace:'ST-EX-XR01-MT-ZWUA-240K-20260415-006',name:'猪五花',cat:'肉禽类',qty:240,spec:'25kg/件',price:26,subtotal:'¥6,240',acceptedQty:'—',remark:'—'}
     ]},
   { no:'PO-20260414-003', canteen:'二号场所', canteenContact:'赵芳', canteenPhone:'029-8812-3002',
     supplier:'海鲜水产配送', supplierContact:'陈浩', supplierPhone:'136-7766-5432',
     date:'2026-04-14', arrival:'2026-04-15', source:'手动创建', status:'已完成', total:'¥3,860',
     deliveryMethod:'第三方物流', deliveryPerson:'陈浩', deliveryPhone:'136-7766-5432', deliveryETA:'2026-04-15 10:30',
     items:[
-      {trace:'ST-EX-HS01-SF-CAYO-060K-20260414-001',name:'草鱼',cat:'水产类',qty:60,spec:'散装(kg)',price:18,subtotal:'¥1,080',remark:'活鲜运输'},
-      {trace:'ST-EX-HS01-SF-JIYU-080K-20260414-002',name:'鲫鱼',cat:'水产类',qty:80,spec:'散装(kg)',price:16,subtotal:'¥1,280',remark:'—'},
-      {trace:'ST-EX-HS01-SF-XIAA-050K-20260414-003',name:'虾',cat:'水产类',qty:50,spec:'散装(kg)',price:30,subtotal:'¥1,500',remark:'冰鲜'}
+      {trace:'ST-EX-HS01-SF-CAYO-060K-20260414-001',name:'草鱼',cat:'水产类',qty:60,spec:'散装(kg)',price:18,subtotal:'¥1,080',acceptedQty:'60',remark:'活鲜运输'},
+      {trace:'ST-EX-HS01-SF-JIYU-080K-20260414-002',name:'鲫鱼',cat:'水产类',qty:80,spec:'散装(kg)',price:16,subtotal:'¥1,280',acceptedQty:'80',remark:'—'},
+      {trace:'ST-EX-HS01-SF-XIAA-050K-20260414-003',name:'虾',cat:'水产类',qty:50,spec:'散装(kg)',price:30,subtotal:'¥1,500',acceptedQty:'—',remark:'冰鲜'}
     ]},
   { no:'PO-20260413-004', canteen:'三号场所', canteenContact:'刘洋', canteenPhone:'029-8812-3003',
     supplier:'粮油批发商行', supplierContact:'孙强', supplierPhone:'137-5544-3210',
     date:'2026-04-13', arrival:'2026-04-14', source:'手动创建', status:'已取消', total:'¥6,188',
     cancelReason:'供应商无法供货',
     items:[
-      {trace:'ST-EX-LY02-DG-DAMI-1000-20260413-001',name:'大米',cat:'粮油类',qty:1000,spec:'20kg/箱',price:3.5,subtotal:'¥3,500',remark:'东北五常大米'},
-      {trace:'ST-EX-LY02-DG-HSYO-168K-20260413-002',name:'花生油',cat:'粮油类',qty:168,spec:'5L/桶',price:16,subtotal:'¥2,688',remark:'—'}
+      {trace:'ST-EX-LY02-DG-DAMI-1000-20260413-001',name:'大米',cat:'粮油类',qty:1000,spec:'20kg/箱',price:3.5,subtotal:'¥3,500',acceptedQty:'—',remark:'东北五常大米'},
+      {trace:'ST-EX-LY02-DG-HSYO-168K-20260413-002',name:'花生油',cat:'粮油类',qty:168,spec:'5L/桶',price:16,subtotal:'¥2,688',acceptedQty:'—',remark:'—'}
     ]}
 ];
 
@@ -835,7 +841,7 @@ function showDetail(idx) {
   tbody.innerHTML = '';
   o.items.forEach(function(it, i) {
     var tr = document.createElement('tr');
-    tr.innerHTML = '<td>'+(i+1)+'</td><td style="font-size:10px;color:#999;">'+it.trace+'</td><td>'+it.name+'</td><td>'+it.cat+'</td><td>'+it.qty+'</td><td>'+it.spec+'</td><td>¥'+it.price+'</td><td>'+it.subtotal+'</td><td>'+it.remark+'</td>';
+    tr.innerHTML = '<td>'+(i+1)+'</td><td style="font-size:10px;color:#999;">'+it.trace+'</td><td>'+it.name+'</td><td>'+it.cat+'</td><td>'+it.qty+'</td><td>'+it.spec+'</td><td>¥'+it.price+'</td><td>'+it.subtotal+'</td><td>'+(it.acceptedQty||'—')+'</td><td>'+it.remark+'</td>';
     tbody.appendChild(tr);
   });
   /* 配送信息（待收货/已完成显示） */
@@ -934,12 +940,30 @@ function openReceiveModal(idx) {
   receiveIdx = idx;
   var o = orders[idx];
   document.getElementById('receiveOrderNo').textContent = o.no;
+  var tbody = document.getElementById('receiveItemsBody');
+  tbody.innerHTML = '';
+  o.items.forEach(function(it, i) {
+    var tr = document.createElement('tr');
+    var qtyVal = (it.acceptedQty && it.acceptedQty !== '—') ? it.acceptedQty : '';
+    tr.innerHTML = '<td>'+(i+1)+'</td><td>'+it.name+'</td><td>'+it.spec+'</td><td>'+it.qty+'</td>'
+      +'<td><input type="number" class="receive-qty-input" value="'+qtyVal+'" placeholder="请输入" style="height:30px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 8px;font-size:var(--font-xs);width:95px;text-align:center;"></td>'
+      +'<td style="color:var(--text-secondary);">'+(it.remark==='—'?'':it.remark)+'</td>';
+    tbody.appendChild(tr);
+  });
   document.getElementById('receiveModal').style.display = 'flex';
 }
 function closeReceiveModal() { document.getElementById('receiveModal').style.display = 'none'; receiveIdx = -1; }
 document.getElementById('receiveModal').addEventListener('click', function(e) { if(e.target===this) closeReceiveModal(); });
 function confirmReceive() {
+  var inputs = document.querySelectorAll('.receive-qty-input');
   var o = orders[receiveIdx];
+  var allFilled = true;
+  inputs.forEach(function(inp, i) {
+    var val = inp.value.trim();
+    if (!val) { allFilled = false; return; }
+    o.items[i].acceptedQty = val;
+  });
+  if (!allFilled) { showToast('请填写所有食材的验收数量', 'warning'); return; }
   showToast('采购单 ' + o.no + ' 已确认收货', 'success');
   closeReceiveModal();
 }
diff --git a/web-admin/nutrition/prod-clean-order.html b/web-admin/nutrition/prod-clean-order.html
index a1046d1..9358e18 100644
--- a/web-admin/nutrition/prod-clean-order.html
+++ b/web-admin/nutrition/prod-clean-order.html
@@ -36,6 +36,8 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .btn{height:36px;padding:0 16px;border-radius:var(--radius-sm);font-size:var(--font-sm);cursor:pointer;border:none;transition:all .2s;display:inline-flex;align-items:center;gap:6px;}
 .btn-primary{background:var(--primary);color:#fff;}.btn-primary:hover{background:#40a9ff;}
 .btn-default{background:#fff;color:var(--text-primary);border:1px solid var(--border);}.btn-default:hover{color:var(--primary);border-color:var(--primary);}
+.btn-sm{height:28px;padding:0 10px;font-size:var(--font-xs);}
+.btn-danger-text{background:none;color:var(--danger);cursor:pointer;border:none;font-size:var(--font-xs);padding:0;}.btn-danger-text:hover{color:#ff7875;}
 .table-card{background:#fff;border-radius:var(--radius-md);box-shadow:var(--shadow-sm);overflow:hidden;}
 .table-card__header{display:flex;align-items:center;justify-content:space-between;padding:16px 24px;border-bottom:1px solid var(--border);}
 .table-card__title{font-size:var(--font-base);font-weight:600;}
@@ -44,14 +46,24 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 table{width:100%;border-collapse:collapse;}
 thead th{background:#FAFAFA;padding:12px 16px;text-align:left;font-size:var(--font-sm);color:var(--text-secondary);font-weight:500;border-bottom:1px solid var(--border);white-space:nowrap;}
 tbody td{padding:14px 16px;font-size:var(--font-sm);color:var(--text-primary);border-bottom:1px solid var(--border);white-space:nowrap;}
-tbody tr:last-child td{border-bottom:none;}
-tbody tr:hover{background:#F8FBFF;}
+/* 主表行 */
+tr.master-row{cursor:pointer;}
+tr.master-row:hover{background:#F8FBFF;}
+tr.master-row.expanded{background:#F0F7FF;}
+/* 明细行 */
+tr.detail-row{background:#FAFBFC;}
+tr.detail-row td{padding:10px 16px;font-size:var(--font-xs);color:var(--text-secondary);border-bottom:1px dashed #f0f0f0;}
+tr.detail-row td:first-child{padding-left:44px;}
+/* 展开/收起箭头 */
+.expand-arrow{display:inline-block;width:20px;text-align:center;transition:transform .2s;font-size:var(--font-xs);color:var(--text-placeholder);}
+.expand-arrow.expanded{transform:rotate(90deg);}
 .tag{display:inline-flex;align-items:center;padding:2px 8px;border-radius:10px;font-size:var(--font-xs);}
 .tag-blue{background:var(--primary-light);color:var(--primary);}
 .tag-green{background:#F6FFED;color:var(--success);}
 .tag-orange{background:#FFF7E6;color:var(--warning);}
 .tag-red{background:#FFF1F0;color:var(--danger);}
 .tag-gray{background:#F5F5F5;color:#999;}
+.tag-purple{background:#F9F0FF;color:#722ED1;}
 .link{color:var(--primary);cursor:pointer;font-size:var(--font-sm);}.link:hover{color:#40a9ff;}
 .pagination{display:flex;align-items:center;justify-content:flex-end;padding:16px 24px;gap:8px;border-top:1px solid var(--border);}
 .pagination span{font-size:var(--font-sm);color:var(--text-secondary);}
@@ -64,6 +76,7 @@ tbody tr:hover{background:#F8FBFF;}
 .stat-card__icon.green{background:#F6FFED;}
 .stat-card__icon.orange{background:#FFF7E6;}
 .stat-card__icon.red{background:#FFF1F0;}
+.stat-card__icon.purple{background:#F9F0FF;}
 .stat-card__info{display:flex;flex-direction:column;gap:4px;}
 .stat-card__value{font-size:var(--font-xl);font-weight:700;color:var(--text-primary);}
 .stat-card__label{font-size:var(--font-sm);color:var(--text-secondary);}
@@ -81,11 +94,13 @@ tbody tr:hover{background:#F8FBFF;}
 /* 操作列固定右侧 */
 thead th:last-child,tbody td.td-actions{position:sticky;right:0;background:#fff;box-shadow:-4px 0 8px rgba(0,0,0,0.04);z-index:2;white-space:nowrap;}
 thead th:last-child{background:#FAFAFA;}
-tbody tr:hover td.td-actions{background:#F8FBFF;}
+tr.master-row:hover td.td-actions{background:#F8FBFF;}
+tr.master-row.expanded td.td-actions{background:#F0F7FF;}
+tr.detail-row td.td-actions{background:#FAFBFC;box-shadow:-4px 0 8px rgba(0,0,0,0.02);}
 /* 弹窗 */
 .modal-mask{display:none;position:fixed;inset:0;background:rgba(0,0,0,0.45);z-index:200;align-items:center;justify-content:center;}
 .modal-mask.show{display:flex;}
-.modal{background:#fff;border-radius:var(--radius-lg);width:680px;max-height:85vh;display:flex;flex-direction:column;box-shadow:0 8px 24px rgba(0,0,0,0.15);}
+.modal{background:#fff;border-radius:var(--radius-lg);width:780px;max-height:85vh;display:flex;flex-direction:column;box-shadow:0 8px 24px rgba(0,0,0,0.15);}
 .modal__header{display:flex;align-items:center;justify-content:space-between;padding:20px 24px 16px;border-bottom:1px solid var(--border);}
 .modal__title{font-size:var(--font-lg);font-weight:600;}
 .modal__close{width:32px;height:32px;border:none;background:none;font-size:18px;cursor:pointer;border-radius:var(--radius-sm);display:flex;align-items:center;justify-content:center;color:var(--text-secondary);}
@@ -102,17 +117,27 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .form-item select{appearance:none;background:#fff url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6'%3E%3Cpath d='M0 0l5 6 5-6z' fill='%23999'/%3E%3C/svg%3E") no-repeat right 10px center;padding-right:28px;}
 .form-item input[readonly]{background:#f8fafc;cursor:not-allowed;}
 .form-item select:disabled{background:#f8fafc;color:var(--text-placeholder);cursor:not-allowed;}
-/* checkbox 组 */
-.checkbox-group{display:flex;align-items:center;gap:16px;flex-wrap:wrap;min-height:36px;}
-.checkbox-item{display:flex;align-items:center;gap:4px;font-size:var(--font-sm);color:var(--text-primary);cursor:pointer;user-select:none;}
-.checkbox-item input[type="checkbox"]{width:16px;height:16px;cursor:pointer;accent-color:var(--primary);}
-.meal-cb{width:16px;height:16px;cursor:pointer;accent-color:var(--primary);}
+/* 订单明细行构建器 */
+.line-builder{border:1px solid var(--border);border-radius:var(--radius-md);padding:16px;margin-bottom:12px;background:#FAFBFC;position:relative;}
+.line-builder__header{display:flex;align-items:center;justify-content:space-between;margin-bottom:10px;}
+.line-builder__title{font-size:var(--font-sm);font-weight:600;color:var(--text-primary);}
+.line-builder__fields{display:flex;gap:10px;align-items:flex-start;flex-wrap:wrap;}
+.line-builder__fields .lb-field{display:flex;flex-direction:column;gap:4px;}
+.line-builder__fields .lb-field label{font-size:var(--font-xs);color:var(--text-placeholder);}
+.line-builder__fields .lb-field select,.line-builder__fields .lb-field input{height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 8px;font-size:var(--font-sm);outline:none;min-width:120px;}
+.line-builder__fields .lb-field select:focus,.line-builder__fields .lb-field input:focus{border-color:var(--primary);}
+.lb-field input[readonly]{background:#f8fafc;cursor:not-allowed;}
+/* 订单汇总预览表（弹窗内） */
+.order-summary-table{width:100%;border-collapse:collapse;margin-top:12px;font-size:var(--font-sm);}
+.order-summary-table th{background:#fafafa;padding:8px 10px;text-align:left;font-weight:500;color:var(--text-secondary);border:1px solid var(--border);}
+.order-summary-table td{padding:6px 10px;border:1px solid var(--border);color:var(--text-primary);}
+.order-summary-table .empty-row td{text-align:center;color:var(--text-placeholder);padding:16px;}
 /* 右侧抽屉 */
 .drawer-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.45);z-index:1000;animation:modalFadeIn .2s ease;}
 .drawer-overlay.closing{animation:modalFadeOut .2s ease forwards;}
 @keyframes modalFadeIn{from{opacity:0}to{opacity:1}}
 @keyframes modalFadeOut{from{opacity:1}to{opacity:0}}
-.drawer{position:fixed;top:0;right:0;bottom:0;width:520px;max-width:90vw;background:#fff;box-shadow:-6px 0 24px rgba(0,0,0,.12);display:flex;flex-direction:column;z-index:1001;animation:drawerSlideIn .25s ease;}
+.drawer{position:fixed;top:0;right:0;bottom:0;width:560px;max-width:90vw;background:#fff;box-shadow:-6px 0 24px rgba(0,0,0,.12);display:flex;flex-direction:column;z-index:1001;animation:drawerSlideIn .25s ease;}
 .drawer-overlay.closing .drawer{animation:drawerSlideOut .2s ease forwards;}
 @keyframes drawerSlideIn{from{transform:translateX(100%)}to{transform:translateX(0)}}
 @keyframes drawerSlideOut{from{transform:translateX(0)}to{transform:translateX(100%)}}
@@ -128,6 +153,20 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .drawer-field{display:flex;flex-direction:column;gap:2px;}
 .drawer-field__label{font-size:var(--font-xs);color:var(--text-placeholder);}
 .drawer-field__value{font-size:var(--font-sm);color:var(--text-primary);font-weight:500;min-height:22px;}
+.drawer-field.full{grid-column:1/-1;}
+/* 明细小表 */
+.ing-table{width:100%;border-collapse:collapse;margin-top:8px;}
+.ing-table th{background:#FAFAFA;padding:6px 10px;font-size:var(--font-xs);color:var(--text-secondary);font-weight:500;border:1px solid var(--border);}
+.ing-table td{padding:6px 10px;font-size:var(--font-sm);color:var(--text-primary);border:1px solid var(--border);}
+.detail-header td{font-size:var(--font-xs);color:var(--text-placeholder);background:#f5f7fa;padding:6px 16px;font-weight:500;}
+/* 行内表格构建器 */
+.inline-builder-table{width:100%;border-collapse:collapse;margin-bottom:12px;font-size:var(--font-xs);}
+.inline-builder-table th{background:#FAFAFA;padding:6px 10px;text-align:left;font-weight:500;color:var(--text-secondary);border:1px solid var(--border);white-space:nowrap;}
+.inline-builder-table td{padding:4px 6px;border:1px solid var(--border);vertical-align:middle;}
+.inline-builder-table select,.inline-builder-table input{height:28px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 4px;font-size:var(--font-xs);width:100%;outline:none;box-sizing:border-box;}
+.inline-builder-table select:focus,.inline-builder-table input:focus{border-color:var(--primary);}
+.inline-builder-table select{appearance:none;background:#fff url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='5'%3E%3Cpath d='M0 0l4 5 4-5z' fill='%23999'/%3E%3C/svg%3E") no-repeat right 6px center;padding-right:18px;}
+.inline-builder-table input[readonly]{background:#f8fafc;cursor:not-allowed;}
 </style>
 </head>
 <body>
@@ -155,7 +194,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
   <div class="page-header">
     <div class="page-header__left">
       <span class="page-header__title">净菜订单</span>
-      <span class="page-header__desc">2026-05-19 · 数据实时更新</span>
+      <span class="page-header__desc">2026-05-19 · 数据实时更新 · 支持一单多品</span>
     </div>
     <div class="page-header__right">
       <span class="page-header__label">当前场所</span>
@@ -168,16 +207,16 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
   </div>
 
   <div class="stats-row">
-    <div class="stat-card"><div class="stat-card__icon blue">📝</div><div class="stat-card__info"><div class="stat-card__value">24</div><div class="stat-card__label">今日订单数</div></div></div>
-    <div class="stat-card"><div class="stat-card__icon green">✅</div><div class="stat-card__info"><div class="stat-card__value">18</div><div class="stat-card__label">已完成</div></div></div>
-    <div class="stat-card"><div class="stat-card__icon orange">🚚</div><div class="stat-card__info"><div class="stat-card__value">4</div><div class="stat-card__label">配送中</div></div></div>
-    <div class="stat-card"><div class="stat-card__icon red">⏳</div><div class="stat-card__info"><div class="stat-card__value">2</div><div class="stat-card__label">待处理</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon blue">📝</div><div class="stat-card__info"><div class="stat-card__value">8</div><div class="stat-card__label">今日订单数</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon green">✅</div><div class="stat-card__info"><div class="stat-card__value">4</div><div class="stat-card__label">已完成</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon orange">🚚</div><div class="stat-card__info"><div class="stat-card__value">2</div><div class="stat-card__label">配送中</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon purple">📦</div><div class="stat-card__info"><div class="stat-card__value">2</div><div class="stat-card__label">部分完成</div></div></div>
   </div>
   <div class="filter-bar">
-    <div class="filter-item"><label>申领单号/食材名称</label><input class="filter-input" type="text" placeholder="请输入申领单号或食材名称"></div>
+    <div class="filter-item"><label>订单号/菜品名称</label><input class="filter-input" type="text" placeholder="请输入订单号或菜品名称"></div>
     <div class="filter-item"><label>净菜类型</label><select class="filter-select"><option>全部</option><option>净菜包</option><option>餐品净菜包</option></select></div>
     <div class="filter-item"><label>订单类型</label><select class="filter-select"><option>全部</option><option>内供</option><option>外售</option></select></div>
-    <div class="filter-item"><label>订单状态</label><select class="filter-select"><option>全部</option><option>备货中</option><option>待配送</option><option>配送中</option><option>已完成</option></select></div>
+    <div class="filter-item"><label>订单状态</label><select class="filter-select"><option>全部</option><option>备货中</option><option>待配送</option><option>配送中</option><option>部分完成</option><option>已完成</option></select></div>
     <div class="filter-item"><label>预定配送时间</label><input class="filter-input" type="date" style="min-width:150px"> ~ <input class="filter-input" type="date" style="min-width:150px"></div>
     <button class="btn btn-primary">查询</button><button class="btn btn-default">重置</button>
   </div>
@@ -188,24 +227,18 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
   <div class="table-card">
     <div class="table-card__header"><div class="table-card__title">净菜订单</div></div>
     <div class="table-card__content">
-      <table>
-        <thead><tr><th>订单号</th><th>净菜类型</th><th>订单类型</th><th>净菜/餐品</th><th>包装规格</th><th>需求份数</th><th>需求计量(kg)</th><th>订单状态</th><th>申领时间</th><th>预定配送时间</th><th>创建人</th><th>操作</th></tr></thead>
-        <tbody>
-          <tr><td>CO-001</td><td><span class="tag tag-green">🥬 净菜包</span></td><td><span class="tag tag-blue">🏢 内供</span></td><td>菠菜-菠菜段</td><td>500g/袋</td><td>50</td><td>25</td><td><span class="tag tag-green">已完成</span></td><td>2026-04-22 07:30</td><td>2026-04-22 10:00</td><td>张厨师</td><td class="td-actions"><span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>CO-002</td><td><span class="tag tag-green">🥬 净菜包</span></td><td><span class="tag tag-blue">🏢 内供</span></td><td>猪排骨-排骨块</td><td>2kg/盘</td><td>20</td><td>40</td><td><span class="tag tag-blue">配送中</span></td><td>2026-04-22 08:00</td><td>2026-04-22 10:30</td><td>李主管</td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="confirmReceive(this)">确认收货</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>CO-003</td><td><span class="tag tag-orange">🍱 餐品净菜包</span></td><td><span class="tag tag-orange">🛒 外售</span></td><td>宫保鸡丁</td><td>标准份（500g）</td><td>30</td><td>15</td><td><span class="tag tag-blue">配送中</span></td><td>2026-04-22 08:00</td><td>2026-04-22 10:30</td><td>李主管</td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="confirmReceive(this)">确认收货</span> <span class="link" onclick="showDetail(this)">详情</span></td></tr>
-          <tr><td>CO-005</td><td><span class="tag tag-orange">🍱 餐品净菜包</span></td><td><span class="tag tag-orange">🛒 外售</span></td><td>清蒸鱼</td><td>标准份（500g）</td><td>15</td><td>7.5</td><td><span class="tag tag-orange">待配送</span></td><td>2026-04-22 09:00</td><td>2026-04-22 11:00</td><td>王厨师</td><td class="td-actions"><span class="link" onclick="showDetail(this)">详情</span></td></tr>
-          <tr><td>CO-006</td><td><span class="tag tag-green">🥬 净菜包</span></td><td><span class="tag tag-blue">🏢 内供</span></td><td>土豆-土豆丝</td><td>500g/袋</td><td>40</td><td>20</td><td><span class="tag tag-gray">备货中</span></td><td>2026-04-22 09:15</td><td>2026-04-22 11:00</td><td>张厨师</td><td class="td-actions"><span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>CO-008</td><td><span class="tag tag-green">🥬 净菜包</span></td><td><span class="tag tag-blue">🏢 内供</span></td><td>西兰花-西兰花朵</td><td>500g/袋</td><td>30</td><td>15</td><td><span class="tag tag-green">已完成</span></td><td>2026-04-22 10:00</td><td>2026-04-22 11:30</td><td>王厨师</td><td class="td-actions"><span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-        </tbody>
+      <table id="orderTable">
+        <thead><tr><th style="width:36px;"></th><th>订单号</th><th>订单类型</th><th>净菜类型</th><th>菜品种类</th><th>总份数</th><th>总计量(kg)</th><th>订单状态</th><th>申领时间</th><th>预定配送时间</th><th>创建人</th><th>操作</th></tr></thead>
+        <tbody id="orderTableBody"></tbody>
       </table>
     </div>
     <div class="pagination">
-      <span>显示 10 条，共 24 条</span>
-      <button class="page-btn">‹</button><button class="page-btn active">1</button><button class="page-btn">2</button><button class="page-btn">3</button><button class="page-btn">›</button>
+      <span>显示 8 条，共 8 条</span>
+      <button class="page-btn">‹</button><button class="page-btn active">1</button><button class="page-btn">›</button>
     </div>
   </div>
 </div>
+
 <!-- 弹窗：新建订单 -->
 <div class="modal-mask" id="modal-order">
   <div class="modal">
@@ -222,81 +255,48 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
         </div>
         <div class="form-item">
           <div class="form-item__label">净菜类型<span class="required">*</span></div>
-          <select id="orderType" onchange="toggleOrderFields()"><option value="">请选择</option><option value="nc">净菜包</option><option value="cp">餐品净菜包</option></select>
-        </div>
-        <div class="form-item" id="orderIngredientWrap" style="display:none;">
-          <div class="form-item__label">食材<span class="required">*</span></div>
-          <select id="orderIngredient" onchange="updateNcTypeOptions()">
-            <option value="">请选择食材</option>
-            <option value="土豆">土豆</option>
-            <option value="菠菜">菠菜</option>
-            <option value="玉米">玉米</option>
-            <option value="鸡胸肉">鸡胸肉</option>
-            <option value="草鱼">草鱼</option>
-            <option value="西兰花">西兰花</option>
+          <select onchange="onNewOrderNcTypeChange(this.value)">
+            <option value="nc">净菜包</option>
+            <option value="cp">餐品净菜包</option>
           </select>
         </div>
-        <div class="form-item" id="orderNcTypeWrap" style="display:none;">
-          <div class="form-item__label">加工类型<span class="required">*</span></div>
-          <select id="orderNcType" disabled onchange="syncOrderMeasure()"><option value="">请先选择食材</option></select>
-        </div>
-        <div class="form-item" id="orderDishWrap" style="display:none;">
-          <div class="form-item__label">餐品名称<span class="required">*</span></div>
-          <select id="orderDish" onchange="updateCpSpecOptions()"><option value="">请选择餐品</option><option>宫保鸡丁</option><option>清蒸鱼</option><option>蒜蓉菠菜</option><option>炒胡萝卜</option><option>红烧排骨</option></select>
-        </div>
-        <div class="form-item" id="orderNcSpecWrap" style="display:none;">
-          <div class="form-item__label">包装规格<span class="required">*</span></div>
-          <input id="orderNcSpec" inputmode="numeric" placeholder="请输入纯整数克数" oninput="sanitizeIntegerInput(this);syncOrderMeasure()">
-        </div>
-        <div class="form-item" id="orderCpSpecWrap" style="display:none;">
-          <div class="form-item__label">包装规格<span class="required">*</span></div>
-          <select id="orderCpSpec" onchange="syncOrderMeasure()"><option value="">请选择包装规格</option></select>
-        </div>
-        <div class="form-item">
-          <div class="form-item__label">需求份数<span class="required">*</span></div>
-          <input id="orderQty" inputmode="numeric" placeholder="请输入纯整数份数" oninput="sanitizeIntegerInput(this);syncOrderMeasure()">
-        </div>
-        <div class="form-item">
-          <div class="form-item__label">需求计量(kg)<span class="required">*</span></div>
-          <input id="orderMeasure" type="text" placeholder="自动计算" readonly>
-        </div>
         <div class="form-item">
           <div class="form-item__label">预定配送时间</div>
-          <input type="datetime-local">
+          <input type="datetime-local" id="orderDeliveryTime">
         </div>
         <div class="form-item">
           <div class="form-item__label">创建人<span class="required">*</span></div>
-          <input placeholder="请输入创建人姓名">
+          <input placeholder="请输入创建人姓名" id="orderCreator">
         </div>
-        <div class="form-item full">
+        <div class="form-item">
           <div class="form-item__label">备注</div>
-          <input placeholder="如有特殊要求请备注">
+          <input placeholder="如有特殊要求请备注" id="orderRemark">
+        </div>
+      </div>
+      <!-- 订单明细行构建区 -->
+      <div style="margin-top:20px;">
+        <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:12px;">
+          <span style="font-size:var(--font-sm);font-weight:600;">订单明细</span>
+          <button class="btn btn-primary btn-sm" onclick="addOrderLine()">+ 添加菜品</button>
+        </div>
+        <div id="orderLinesContainer"></div>
+        <!-- 汇总预览 -->
+        <div id="orderSummary" style="display:none;">
+          <div style="font-size:var(--font-sm);font-weight:600;margin:12px 0 8px;">汇总预览</div>
+          <table class="order-summary-table">
+            <thead id="orderSummaryHead"><tr><th>净菜类型</th><th>菜品/食材</th><th>包装规格</th><th>份数</th><th>计量(kg)</th></tr></thead>
+            <tbody id="orderSummaryBody"></tbody>
+          </table>
         </div>
       </div>
     </div>
     <div class="modal__footer">
       <button class="btn btn-default" onclick="closeModal('modal-order')">取消</button>
-      <button class="btn btn-primary" onclick="closeModal('modal-order');alert('订单创建成功，状态：备货中')">确认提交</button>
-    </div>
-  </div>
-</div>
-<!-- 弹窗：确认收货 -->
-<div class="modal-mask" id="modal-confirm-receive">
-  <div class="modal" style="width:420px;">
-    <div class="modal__header">
-      <div class="modal__title">确认收货</div>
-      <button class="modal__close" onclick="closeModal('modal-confirm-receive')">✕</button>
-    </div>
-    <div class="modal__body" style="text-align:center;padding:32px 24px;">
-      <div style="font-size:40px;margin-bottom:12px;">📦</div>
-      <div id="confirmReceiveMsg" style="font-size:var(--font-base);color:var(--text-primary);">确认已收到该订单的净菜配送？</div>
-    </div>
-    <div class="modal__footer">
-      <button class="btn btn-default" onclick="closeModal('modal-confirm-receive')">取消</button>
-      <button class="btn btn-primary" onclick="doConfirmReceive()">确认收货</button>
+      <button class="btn btn-primary" onclick="submitCreateOrder()">确认提交</button>
     </div>
   </div>
 </div>
+
 <!-- 弹窗：由食谱快速创建订单 -->
 <div class="modal-mask" id="modal-recipe-order">
   <div class="modal" style="width:780px;">
@@ -315,7 +315,6 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           <input id="recipeDinerCount" inputmode="numeric" placeholder="请输入就餐人数" oninput="sanitizeIntegerInput(this);onRecipeParamChange()">
         </div>
       </div>
-      <!-- 当日食谱 -->
       <div id="dailyMenuSection" style="margin-top:20px;display:none;">
         <div class="drawer-section__title">当日食谱</div>
         <div style="overflow-x:auto;">
@@ -325,9 +324,8 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           </table>
         </div>
       </div>
-      <!-- 订单汇总表 -->
       <div id="recipeOrderSummary" style="margin-top:20px;display:none;">
-        <div class="drawer-section__title">订单汇总</div>
+        <div class="drawer-section__title">订单汇总（将生成一个订单，包含以下所有菜品）</div>
         <div style="overflow-x:auto;">
           <table style="width:100%;border-collapse:collapse;">
             <thead><tr><th>餐品名称</th><th>包装规格</th><th>需求份数</th><th>需求计量(kg)</th></tr></thead>
@@ -342,148 +340,433 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
     </div>
   </div>
 </div>
+
 <script>
-// 弹窗开关
+/* ========== 弹窗开关 ========== */
 function openModal(id){
   if(id==='modal-order')resetOrderForm();
   document.getElementById(id).classList.add('show');
 }
 function closeModal(id){document.getElementById(id).classList.remove('show');}
-// 点击遮罩关闭
 document.querySelectorAll('.modal-mask').forEach(function(m){m.addEventListener('click',function(e){if(e.target===m)m.classList.remove('show');});});
 
+/* ========== 订单数据模型（主子表） ========== */
 var ncTypeOptions={
   '土豆':['土豆丝','土豆块','土豆泥'],
   '菠菜':['菠菜段','菠菜碎'],
   '玉米':['玉米粒','玉米段'],
   '鸡胸肉':['鸡胸肉丝','鸡胸肉丁'],
   '草鱼':['鱼片','鱼块'],
-  '西兰花':['西兰花朵','西兰花梗']
+  '西兰花':['西兰花朵','西兰花梗'],
+  '猪排骨':['排骨块','排骨丁']
 };
 var cpSpecOptions={
-  '宫保鸡丁':[
-    {label:'标准份（500g）',grams:500},
-    {label:'加量份（750g）',grams:750}
-  ],
-  '清蒸鱼':[
-    {label:'标准份（600g）',grams:600},
-    {label:'大份（900g）',grams:900}
-  ],
-  '蒜蓉菠菜':[
-    {label:'标准份（400g）',grams:400},
-    {label:'加量份（600g）',grams:600}
-  ],
-  '炒胡萝卜':[
-    {label:'标准份（300g）',grams:300},
-    {label:'大份（500g）',grams:500}
-  ],
-  '红烧排骨':[
-    {label:'标准份（800g）',grams:800},
-    {label:'家庭份（1200g）',grams:1200}
-  ]
+  '宫保鸡丁':[{label:'标准份（500g）',grams:500},{label:'加量份（750g）',grams:750}],
+  '清蒸鱼':[{label:'标准份（600g）',grams:600},{label:'大份（900g）',grams:900}],
+  '蒜蓉菠菜':[{label:'标准份（400g）',grams:400},{label:'加量份（600g）',grams:600}],
+  '炒胡萝卜':[{label:'标准份（300g）',grams:300},{label:'大份（500g）',grams:500}],
+  '红烧排骨':[{label:'标准份（800g）',grams:800},{label:'家庭份（1200g）',grams:1200}]
 };
+
+/* 订单主子表数据 */
+var orders=[
+  {
+    orderNo:'CO-001',orderType:'内供',ncType:'nc',claimTime:'2026-04-22 07:30',deliverTime:'2026-04-22 10:00',creator:'张厨师',
+    lines:[
+      {id:'L1',ncType:'nc',ingredient:'菠菜',ncName:'菠菜段',spec:'500g/袋',qty:50,weight:25,status:'已完成'},
+      {id:'L2',ncType:'nc',ingredient:'玉米',ncName:'玉米粒',spec:'1kg/盒',qty:20,weight:20,status:'已完成'}
+    ]
+  },
+  {
+    orderNo:'CO-002',orderType:'内供',ncType:'nc',claimTime:'2026-04-22 08:00',deliverTime:'2026-04-22 10:30',creator:'李主管',
+    lines:[
+      {id:'L3',ncType:'nc',ingredient:'猪排骨',ncName:'排骨块',spec:'2kg/盘',qty:20,weight:40,status:'配送中'},
+      {id:'L4',ncType:'cp',foodName:'宫保鸡丁',spec:'标准份（500g）',qty:30,weight:15,status:'已完成'}
+    ]
+  },
+  {
+    orderNo:'CO-003',orderType:'外售',ncType:'cp',claimTime:'2026-04-22 08:00',deliverTime:'2026-04-22 10:30',creator:'李主管',
+    lines:[
+      {id:'L5',ncType:'cp',foodName:'清蒸鱼',spec:'标准份（500g）',qty:15,weight:7.5,status:'配送中'}
+    ]
+  },
+  {
+    orderNo:'CO-004',orderType:'内供',ncType:'nc',claimTime:'2026-04-22 09:00',deliverTime:'2026-04-22 11:00',creator:'王厨师',
+    lines:[
+      {id:'L6',ncType:'nc',ingredient:'土豆',ncName:'土豆丝',spec:'500g/袋',qty:40,weight:20,status:'待配送'},
+      {id:'L7',ncType:'nc',ingredient:'西兰花',ncName:'西兰花朵',spec:'500g/袋',qty:30,weight:15,status:'备货中'}
+    ]
+  },
+  {
+    orderNo:'CO-005',orderType:'内供',ncType:'nc',claimTime:'2026-04-22 09:15',deliverTime:'2026-04-22 11:00',creator:'张厨师',
+    lines:[
+      {id:'L8',ncType:'cp',foodName:'红烧排骨',spec:'标准份（800g）',qty:10,weight:8,status:'备货中'},
+      {id:'L9',ncType:'nc',ingredient:'鸡胸肉',ncName:'鸡胸肉丁',spec:'500g/袋',qty:15,weight:7.5,status:'备货中'},
+      {id:'L10',ncType:'nc',ingredient:'草鱼',ncName:'鱼片',spec:'1kg/盘',qty:8,weight:8,status:'备货中'}
+    ]
+  },
+  {
+    orderNo:'CO-006',orderType:'外售',ncType:'cp',claimTime:'2026-04-22 10:00',deliverTime:'2026-04-22 11:30',creator:'王厨师',
+    lines:[
+      {id:'L11',ncType:'cp',foodName:'宫保鸡丁',spec:'标准份（500g）',qty:25,weight:12.5,status:'已完成'},
+      {id:'L12',ncType:'cp',foodName:'清蒸鱼',spec:'标准份（600g）',qty:20,weight:12,status:'已完成'}
+    ]
+  },
+  {
+    orderNo:'CO-007',orderType:'外售',ncType:'nc',claimTime:'2026-04-22 10:30',deliverTime:'2026-04-22 14:00',creator:'李主管',
+    lines:[
+      {id:'L13',ncType:'nc',ingredient:'土豆',ncName:'土豆块',spec:'2kg/袋',qty:10,weight:20,status:'已完成'},
+      {id:'L14',ncType:'nc',ingredient:'菠菜',ncName:'菠菜碎',spec:'500g/袋',qty:20,weight:10,status:'配送中'}
+    ]
+  },
+  {
+    orderNo:'CO-008',orderType:'内供',ncType:'cp',claimTime:'2026-04-22 11:00',deliverTime:'2026-04-22 13:00',creator:'张厨师',
+    lines:[
+      {id:'L15',ncType:'nc',ingredient:'西兰花',ncName:'西兰花朵',spec:'500g/袋',qty:30,weight:15,status:'已完成'},
+      {id:'L16',ncType:'cp',foodName:'蒜蓉菠菜',spec:'标准份（400g）',qty:15,weight:6,status:'已完成'},
+      {id:'L17',ncType:'cp',foodName:'炒胡萝卜',spec:'标准份（300g）',qty:20,weight:6,status:'已完成'}
+    ]
+  }
+];
+
+/* ========== 状态聚合逻辑 ========== */
+function aggregateStatus(lines){
+  var statuses=lines.map(function(l){return l.status;});
+  if(statuses.every(function(s){return s==='已完成';}))return '已完成';
+  if(statuses.some(function(s){return s==='配送中';}) && !statuses.some(function(s){return s==='备货中'||s==='待配送';}))return '配送中';
+  if(statuses.some(function(s){return s==='待配送';}) && !statuses.some(function(s){return s==='备货中';}))return '待配送';
+  if(statuses.every(function(s){return s==='备货中';}))return '备货中';
+  /* 混合状态 → 部分完成 */
+  var hasDone=statuses.some(function(s){return s==='已完成';});
+  var hasActive=statuses.some(function(s){return s!=='已完成';});
+  if(hasDone&&hasActive)return '部分完成';
+  return '备货中';
+}
+
+function statusTag(status){
+  var map={已完成:'tag-green',配送中:'tag-blue',待配送:'tag-orange',备货中:'tag-gray','部分完成':'tag-purple'};
+  return '<span class="tag '+map[status]+'">'+status+'</span>';
+}
+
+function ncTypeTag(type){
+  if(type==='nc')return '<span class="tag tag-green">🥬 净菜包</span>';
+  return '<span class="tag tag-orange">🍱 餐品净菜包</span>';
+}
+
+function orderTypeTag(type){
+  if(type==='内供')return '<span class="tag tag-blue">🏢 内供</span>';
+  return '<span class="tag tag-orange">🛒 外售</span>';
+}
+
+/* ========== 渲染订单表格 ========== */
+function renderOrderTable(){
+  var tbody=document.getElementById('orderTableBody');
+  var html='';
+  orders.forEach(function(order,oi){
+    var aggStatus=aggregateStatus(order.lines);
+    var totalQty=order.lines.reduce(function(s,l){return s+l.qty;},0);
+    var totalWeight=order.lines.reduce(function(s,l){return s+parseFloat(l.weight);},0).toFixed(2);
+    html+='<tr class="master-row" data-order-idx="'+oi+'" onclick="toggleExpand(this,'+oi+')">';
+    html+='<td><span class="expand-arrow" id="arrow'+oi+'">▶</span></td>';
+    html+='<td><b>'+order.orderNo+'</b></td>';
+    html+='<td>'+orderTypeTag(order.orderType)+'</td>';
+    html+='<td>'+ncTypeTag(order.ncType)+'</td>';
+    html+='<td>'+order.lines.length+'</td>';
+    html+='<td>'+totalQty+'</td>';
+    html+='<td>'+totalWeight+'</td>';
+    html+='<td>'+statusTag(aggStatus)+'</td>';
+    html+='<td>'+order.claimTime+'</td>';
+    html+='<td>'+order.deliverTime+'</td>';
+    html+='<td>'+order.creator+'</td>';
+    /* 操作列：状态按钮 + 详情 + 删除 */
+    html+='<td class="td-actions">';
+    if(aggStatus==='备货中'){
+      html+='<span class="link" style="color:var(--success);" onclick="event.stopPropagation();orderAction(\''+order.orderNo+'\',\'completePrep\')">备货完成</span> ';
+    }else if(aggStatus==='待配送'){
+      html+='<span class="link" style="color:var(--primary);" onclick="event.stopPropagation();orderAction(\''+order.orderNo+'\',\'deliver\')">立即配送</span> ';
+    }else if(aggStatus==='配送中'){
+      html+='<span class="link" style="color:var(--success);" onclick="event.stopPropagation();orderAction(\''+order.orderNo+'\',\'receive\')">确认收货</span> ';
+    }
+    html+='<span class="link" onclick="event.stopPropagation();showDetail(\''+order.orderNo+'\')">详情</span> <span class="link" style="color:var(--danger)" onclick="event.stopPropagation();deleteOrder(\''+order.orderNo+'\')">删除</span>';
+    html+='</td>';
+    html+='</tr>';
+    /* 子表头 */
+    if(order.lines.length>0){
+      if(order.ncType==='nc'){
+        html+='<tr class="detail-header" id="dhead-'+oi+'" data-order-idx="'+oi+'" style="display:none;"><td></td><td>食材</td><td>净菜名称</td><td>包装规格</td><td>份数</td><td>计量(kg)</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>';
+      }else{
+        html+='<tr class="detail-header" id="dhead-'+oi+'" data-order-idx="'+oi+'" style="display:none;"><td></td><td colspan="2">菜品/食材</td><td>包装规格</td><td>份数</td><td>计量(kg)</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>';
+      }
+    }
+    /* 明细行 */
+    order.lines.forEach(function(line){
+      html+='<tr class="detail-row" data-order-idx="'+oi+'" id="detail-'+oi+'" style="display:none;">';
+      html+='<td></td>';
+      if(line.ncType==='nc'){
+        html+='<td style="font-weight:500;">'+line.ingredient+'</td><td style="font-weight:500;">'+line.ncName+'</td>';
+      }else{
+        html+='<td colspan="2" style="font-weight:500;">'+line.foodName+'</td>';
+      }
+      html+='<td>'+line.spec+'</td>';
+      html+='<td>'+line.qty+'</td>';
+      html+='<td>'+line.weight+'</td>';
+      html+='<td></td><td></td><td></td><td></td><td></td>';
+      html+='<td class="td-actions"></td></tr>';
+    });
+  });
+  tbody.innerHTML=html;
+}
+
+function toggleExpand(row,idx){
+  row.classList.toggle('expanded');
+  var arrow=document.getElementById('arrow'+idx);
+  var detailRows=document.querySelectorAll('#detail-'+idx);
+  var dhead=document.getElementById('dhead-'+idx);
+  var isExpanded=row.classList.contains('expanded');
+  arrow.classList.toggle('expanded',isExpanded);
+  arrow.textContent=isExpanded?'▼':'▶';
+  detailRows.forEach(function(dr){dr.style.display=isExpanded?'':'none';});
+  if(dhead)dhead.style.display=isExpanded?'':'none';
+}
+
+/* ========== 订单操作 ========== */
+function deleteOrder(orderNo){
+  if(!confirm('确认删除订单 '+orderNo+' 及其所有明细？'))return;
+  orders=orders.filter(function(o){return o.orderNo!==orderNo;});
+  renderOrderTable();
+}
+
+function orderAction(orderNo,action){
+  var order=orders.find(function(o){return o.orderNo===orderNo;});
+  if(!order)return;
+  var nextStatus='';
+  if(action==='completePrep')nextStatus='待配送';
+  else if(action==='deliver')nextStatus='配送中';
+  else if(action==='receive')nextStatus='已完成';
+  if(!nextStatus)return;
+  order.lines.forEach(function(l){l.status=nextStatus;});
+  renderOrderTable();
+}
+
+/* ========== 新建订单：动态明细行 ========== */
+var newOrderLines=[];
+var lineIdCounter=0;
+var newOrderNcType='nc';
+function onNewOrderNcTypeChange(val){
+  newOrderNcType=val;
+  /* 切换类型后清空现有明细行，重新添加空行 */
+  newOrderLines=[];
+  lineIdCounter=0;
+  document.getElementById('orderLinesContainer').innerHTML='';
+  document.getElementById('orderSummary').style.display='none';
+  document.getElementById('orderSummaryBody').innerHTML='';
+  addOrderLine();
+}
+
 function resetOrderForm(){
-  document.getElementById('orderType').value='nc';
-  document.getElementById('orderIngredient').value='';
-  document.getElementById('orderNcType').innerHTML='<option value="">请先选择食材</option>';
-  document.getElementById('orderNcType').disabled=true;
-  document.getElementById('orderDish').value='';
-  document.getElementById('orderCpSpec').innerHTML='<option value="">请选择包装规格</option>';
-  document.getElementById('orderCpSpec').disabled=true;
-  document.getElementById('orderNcSpec').value='';
-  document.getElementById('orderQty').value='';
-  document.getElementById('orderMeasure').value='';
-  toggleOrderFields();
+  newOrderLines=[];
+  lineIdCounter=0;
+  newOrderNcType='nc';
+  var ncTypeSel=document.querySelector('#modal-order select[onchange*="onNewOrderNcTypeChange"]');
+  if(ncTypeSel)ncTypeSel.value='nc';
+  document.getElementById('orderDeliveryTime').value='';
+  document.getElementById('orderCreator').value='';
+  document.getElementById('orderRemark').value='';
+  document.getElementById('orderLinesContainer').innerHTML='';
+  document.getElementById('orderSummary').style.display='none';
+  document.getElementById('orderSummaryBody').innerHTML='';
+  /* 默认添加一条空行 */
+  addOrderLine();
 }
-function toggleOrderFields(){
-  var v=document.getElementById('orderType').value;
-  document.getElementById('orderIngredientWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('orderNcTypeWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('orderNcSpecWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('orderDishWrap').style.display=(v==='cp'?'flex':'none');
-  document.getElementById('orderCpSpecWrap').style.display=(v==='cp'?'flex':'none');
-  syncOrderMeasure();
+
+function addOrderLine(){
+  lineIdCounter++;
+  var lid='newLine'+lineIdCounter;
+  newOrderLines.push({id:lid,ingredient:'',ncName:'',dish:'',specGram:0,specLabel:'',qty:0,weight:0});
+  renderLineBuilders();
 }
-function sanitizeIntegerInput(el){el.value=el.value.replace(/[^\d]/g,'');}
-function updateNcTypeOptions(){
-  var ingredient=document.getElementById('orderIngredient').value;
-  var typeSelect=document.getElementById('orderNcType');
-  var options=ncTypeOptions[ingredient]||[];
-  typeSelect.innerHTML='<option value="">请选择净菜类型</option>';
-  options.forEach(function(text){
-    typeSelect.innerHTML+='<option value="'+text+'">'+text+'</option>';
-  });
-  typeSelect.disabled=!options.length;
-  typeSelect.value='';
-  syncOrderMeasure();
+
+function removeOrderLine(lid){
+  if(newOrderLines.length<=1){alert('至少保留一条菜品明细');return;}
+  newOrderLines=newOrderLines.filter(function(l){return l.id!==lid;});
+  renderLineBuilders();
 }
-function updateCpSpecOptions(){
-  var dish=document.getElementById('orderDish').value;
-  var specSelect=document.getElementById('orderCpSpec');
-  var options=cpSpecOptions[dish]||[];
-  specSelect.innerHTML='<option value="">请选择包装规格</option>';
-  options.forEach(function(item){
-    specSelect.innerHTML+='<option value="'+item.grams+'">'+item.label+'</option>';
-  });
-  specSelect.disabled=!options.length;
-  specSelect.value='';
-  syncOrderMeasure();
+
+function updateNewLineIngredient(lid,val){
+  var line=newOrderLines.find(function(l){return l.id===lid;});
+  if(!line)return;
+  line.ingredient=val;
+  line.ncName='';
+  renderLineBuilders();
 }
-function getCurrentSpecGrams(){
-  var type=document.getElementById('orderType').value;
-  if(type==='nc'){
-    var ncSpec=document.getElementById('orderNcSpec').value;
-    return ncSpec?parseInt(ncSpec,10):0;
+
+function updateNewLineNcType(lid,val){
+  var line=newOrderLines.find(function(l){return l.id===lid;});
+  if(!line)return;
+  line.ncName=val;
+  calcLineWeight(line);
+  refreshSummary();
+}
+
+function updateNewLineDish(lid,val){
+  var line=newOrderLines.find(function(l){return l.id===lid;});
+  if(!line)return;
+  line.dish=val;
+  line.specGram=0;line.specLabel='';
+  calcLineWeight(line);
+  refreshSummary();
+}
+
+function updateNewLineSpec(lid,val){
+  var line=newOrderLines.find(function(l){return l.id===lid;});
+  if(!line)return;
+  if(newOrderNcType==='nc'){
+    line.specGram=parseInt(val||'0',10);
+    line.specLabel=val?(val+'g/袋'):'';
+  }else{
+    line.specGram=parseInt(val||'0',10);
+    var opts=cpSpecOptions[line.dish]||[];
+    var found=opts.find(function(o){return o.grams===line.specGram;});
+    line.specLabel=found?found.label:'';
   }
-  if(type==='cp'){
-    var cpSpec=document.getElementById('orderCpSpec').value;
-    return cpSpec?parseInt(cpSpec,10):0;
-  }
-  return 0;
+  calcLineWeight(line);
+  refreshSummary();
 }
-function syncOrderMeasure(){
-  var qty=parseInt(document.getElementById('orderQty').value||'0',10);
-  var grams=getCurrentSpecGrams();
-  var measureInput=document.getElementById('orderMeasure');
-  if(!qty||!grams){
-    measureInput.value='';
+
+function updateNewLineQty(lid,val){
+  var line=newOrderLines.find(function(l){return l.id===lid;});
+  if(!line)return;
+  line.qty=parseInt(val.replace(/[^\d]/g,'')||'0',10);
+  calcLineWeight(line);
+  refreshSummary();
+}
+
+function calcLineWeight(line){
+  if(line.specGram>0&&line.qty>0){
+    line.weight=parseFloat((line.specGram*line.qty/1000).toFixed(2));
+  }else{
+    line.weight=0;
+  }
+}
+
+function renderLineBuilders(){
+  var container=document.getElementById('orderLinesContainer');
+  var isNc=newOrderNcType==='nc';
+  var html='';
+  html+='<table class="inline-builder-table" id="lineBuilderTable">';
+  html+='<thead><tr>';
+  if(isNc){
+    html+='<th>食材</th><th>净菜名称</th><th>包装规格(g)</th><th>份数</th><th>计量(kg)</th><th>操作</th>';
+  }else{
+    html+='<th>餐品名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th><th>操作</th>';
+  }
+  html+='</tr></thead><tbody>';
+  newOrderLines.forEach(function(line){
+    html+='<tr>';
+    if(isNc){
+      /* 食材 */
+      html+='<td><select onchange="updateNewLineIngredient(\''+line.id+'\',this.value)" style="min-width:100px;"><option value="">请选择</option>';
+      Object.keys(ncTypeOptions).forEach(function(k){html+='<option value="'+k+'" '+(line.ingredient===k?'selected':'')+'>'+k+'</option>';});
+      html+='</select></td>';
+      /* 净菜名称 */
+      var ncTypes=ncTypeOptions[line.ingredient]||[];
+      html+='<td><select onchange="updateNewLineNcType(\''+line.id+'\',this.value)" '+(ncTypes.length===0?'disabled':'')+' style="min-width:100px;"><option value="">'+(ncTypes.length===0?'请先选食材':'请选择')+'</option>';
+      ncTypes.forEach(function(t){html+='<option value="'+t+'" '+(line.ncName===t?'selected':'')+'>'+t+'</option>';});
+      html+='</select></td>';
+      /* 包装规格 */
+      html+='<td><input inputmode="numeric" placeholder="克数" value="'+(line.specGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateNewLineSpec(\''+line.id+'\',this.value)" style="width:70px;"></td>';
+    }else{
+      /* 餐品名称 */
+      html+='<td><select onchange="updateNewLineDish(\''+line.id+'\',this.value)" style="min-width:120px;"><option value="">请选择</option>';
+      Object.keys(cpSpecOptions).forEach(function(k){html+='<option value="'+k+'" '+(line.dish===k?'selected':'')+'>'+k+'</option>';});
+      html+='</select></td>';
+      /* 包装规格 */
+      var cpSpecs=cpSpecOptions[line.dish]||[];
+      html+='<td><select onchange="updateNewLineSpec(\''+line.id+'\',this.value)" '+(cpSpecs.length===0?'disabled':'')+' style="min-width:120px;"><option value="">'+(cpSpecs.length===0?'请先选餐品':'请选择')+'</option>';
+      cpSpecs.forEach(function(s){html+='<option value="'+s.grams+'" '+(line.specGram===s.grams?'selected':'')+'>'+s.label+'</option>';});
+      html+='</select></td>';
+    }
+    /* 份数 */
+    html+='<td><input inputmode="numeric" placeholder="份数" value="'+(line.qty||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateNewLineQty(\''+line.id+'\',this.value)" style="width:56px;"></td>';
+    /* 计量 */
+    html+='<td><input value="'+(line.weight||'')+'" readonly style="width:60px;"></td>';
+    /* 操作 */
+    html+='<td><button class="btn-danger-text" onclick="removeOrderLine(\''+line.id+'\')" '+(newOrderLines.length<=1?'disabled':'')+'>移除</button></td>';
+    html+='</tr>';
+  });
+  html+='</tbody></table>';
+  container.innerHTML=html;
+  refreshSummary();
+}
+
+function refreshSummary(){
+  var summaryDiv=document.getElementById('orderSummary');
+  var thead=document.getElementById('orderSummaryHead');
+  var tbody=document.getElementById('orderSummaryBody');
+  var validLines=newOrderLines.filter(function(l){return l.weight>0;});
+  if(validLines.length===0){
+    summaryDiv.style.display='none';
     return;
   }
-  var kg=(grams*qty/1000).toFixed(2);
-  measureInput.value=kg;
+  summaryDiv.style.display='block';
+  if(newOrderNcType==='nc'){
+    thead.innerHTML='<tr><th>净菜类型</th><th>食材</th><th>净菜名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th></tr>';
+  }else{
+    thead.innerHTML='<tr><th>净菜类型</th><th>餐品名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th></tr>';
+  }
+  var html='';
+  validLines.forEach(function(l){
+    var typeLabel=newOrderNcType==='nc'?'净菜包':'餐品净菜包';
+    if(newOrderNcType==='nc'){
+      html+='<tr><td>'+typeLabel+'</td><td>'+l.ingredient+'</td><td>'+l.ncName+'</td><td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
+    }else{
+      html+='<tr><td>'+typeLabel+'</td><td>'+l.dish+'</td><td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
+    }
+  });
+  tbody.innerHTML=html;
 }
 
-// 确认收货
-var _confirmReceiveRow=null;
-function confirmReceive(el){
-  _confirmReceiveRow=el.closest('tr');
-  var orderNo=_confirmReceiveRow.querySelectorAll('td')[0].textContent;
-  var foodName=_confirmReceiveRow.querySelectorAll('td')[3].textContent;
-  document.getElementById('confirmReceiveMsg').innerHTML='确认已收到订单 <b>'+orderNo+'</b>（'+foodName+'）的净菜配送？';
-  openModal('modal-confirm-receive');
-}
-function doConfirmReceive(){
-  if(!_confirmReceiveRow)return;
-  // 更新状态列为"已完成"（列序：0订单号 1净菜类型 2订单类型 3净菜/餐品 4包装规格 5需求份数 6需求计量 7订单状态）
-  var statusTd=_confirmReceiveRow.querySelectorAll('td')[7];
-  statusTd.innerHTML='<span class="tag tag-green">已完成</span>';
-  // 移除"确认收货"按钮
-  var actionTd=_confirmReceiveRow.querySelector('.td-actions');
-  var confirmBtn=actionTd.querySelector('span[onclick*="confirmReceive"]');
-  if(confirmBtn)confirmBtn.remove();
-  _confirmReceiveRow=null;
-  closeModal('modal-confirm-receive');
+function submitCreateOrder(){
+  var creator=document.getElementById('orderCreator').value.trim();
+  if(!creator){alert('请输入创建人姓名');return;}
+  var validLines=newOrderLines.filter(function(l){
+    if(newOrderNcType==='nc')return l.ingredient&&l.ncName&&l.specGram>0&&l.qty>0;
+    return l.dish&&l.specGram>0&&l.qty>0;
+  });
+  if(validLines.length===0){alert('请至少完善一条菜品明细');return;}
+  /* 生成订单号 */
+  var orderNo='CO-'+String(orders.length+1).padStart(3,'0');
+  var deliverTime=document.getElementById('orderDeliveryTime').value||'—';
+  var newOrder={
+    orderNo:orderNo,orderType:'内供',
+    claimTime:new Date().toISOString().slice(0,16).replace('T',' '),
+    deliverTime:deliverTime,creator:creator,
+    ncType:newOrderNcType,
+    lines:validLines.map(function(l,i){
+      var base={
+        id:'L'+(Date.now()+i),
+        ncType:newOrderNcType,
+        spec:l.specLabel,
+        qty:l.qty,
+        weight:l.weight,
+        status:'备货中'
+      };
+      if(newOrderNcType==='nc'){
+        base.ingredient=l.ingredient;
+        base.ncName=l.ncName;
+      }else{
+        base.foodName=l.dish;
+      }
+      return base;
+    })
+  };
+  orders.unshift(newOrder);
+  closeModal('modal-order');
+  renderOrderTable();
+  alert('订单 '+orderNo+' 创建成功，包含 '+newOrder.lines.length+' 道菜品，状态：备货中');
 }
 
-// 抽屉组件
-function closeDrawer(){
-  var overlay=document.querySelector('.drawer-overlay');
-  if(!overlay)return;
-  overlay.classList.add('closing');
-  setTimeout(function(){overlay.remove();},200);
-}
-
-/* ========== 餐品食材数据 ========== */
+/* ========== 详情抽屉 ========== */
 var dishIngredients={
   '宫保鸡丁':[
     {trace:'NC-PROC-JXR-20260415-01',name:'鸡胸肉',cleanType:'鸡胸肉丁',type:'主材',amount:'120g'},
@@ -499,20 +782,22 @@ var dishIngredients={
     {trace:'NC-PROC-JYO-20260415-01',name:'酱油',cleanType:'调味包',type:'调料',amount:'15ml'}
   ]
 };
-// 餐品净菜包对应的包装批次号
 var dishBatch={
   '宫保鸡丁':'BATCH-DH-20260415-01',
   '清蒸鱼':'BATCH-DH-20260415-02',
   '红烧排骨':'BATCH-DH-20260415-03'
 };
-// 净菜包溯源码映射
 var traceMap={
   '菠菜-菠菜段':'NC-INT-BOCA-20260422-01',
   '猪排骨-排骨块':'NC-INT-ZLRJ-20260422-01',
   '土豆-土豆丝':'NC-INT-TDSI-20260422-01',
-  '西兰花-西兰花朵':'NC-INT-XLHU-20260422-01'
+  '西兰花-西兰花朵':'NC-INT-XLHU-20260422-01',
+  '玉米-玉米粒':'NC-INT-BCAI-20260422-01',
+  '鸡胸肉-鸡胸肉丁':'NC-INT-JXR-20260422-01',
+  '草鱼-鱼片':'NC-INT-CAYO-20260422-01',
+  '土豆-土豆块':'NC-INT-TDK-20260422-01',
+  '菠菜-菠菜碎':'NC-INT-BOCS-20260422-01'
 };
-// 净菜包对应的包装批次号
 var ncBatch={
   '菠菜-菠菜段':'BATCH-NC-20260422-01',
   '猪排骨-排骨块':'BATCH-NC-20260422-02',
@@ -520,69 +805,62 @@ var ncBatch={
   '西兰花-西兰花朵':'BATCH-NC-20260422-04'
 };
 
-/* ========== 详情抽屉（定制化渲染） ========== */
-function showDetail(el){
-  var tr=el.closest('tr');
-  var tds=tr.querySelectorAll('td');
-  /* 列序：0订单号 1净菜类型 2订单类型 3净菜/餐品 4包装规格 5需求份数 6需求计量 7订单状态 8申领时间 9预定配送时间 10创建人 */
-  var orderNo=tds[0].textContent;
-  var typeHtml=tds[1].innerHTML;
-  var typeText=tds[1].textContent.trim();
-  var orderBizTypeHtml=tds[2].innerHTML;
-  var foodName=tds[3].textContent;
-  var spec=tds[4].textContent;
-  var qty=tds[5].textContent;
-  var weight=tds[6].textContent;
-  var statusHtml=tds[7].innerHTML;
-  var claimTime=tds[8].textContent;
-  var deliverTime=tds[9].textContent;
-  var creator=tds[10].textContent;
+function showDetail(orderNo){
+  var order=orders.find(function(o){return o.orderNo===orderNo;});
+  if(!order)return;
+  var aggStatus=aggregateStatus(order.lines);
+  var totalQty=order.lines.reduce(function(s,l){return s+l.qty;},0);
+  var totalWeight=order.lines.reduce(function(s,l){return s+parseFloat(l.weight);},0).toFixed(2);
 
-  var isCp=typeText.indexOf('餐品')>=0;
-
-  // 基础信息区
   var html='<div class="drawer-section"><div class="drawer-section__title">订单信息</div><div class="drawer-fields">';
   html+='<div class="drawer-field"><div class="drawer-field__label">订单号</div><div class="drawer-field__value">'+orderNo+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">净菜类型</div><div class="drawer-field__value">'+typeHtml+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">订单类型</div><div class="drawer-field__value">'+orderBizTypeHtml+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">净菜/餐品</div><div class="drawer-field__value">'+foodName+'</div></div>';
-
-  // 根据类型显示不同字段
-  if(!isCp){
-    // 净菜包 → 显示溯源码 + 包装批次号
-    html+='<div class="drawer-field"><div class="drawer-field__label">溯源码</div><div class="drawer-field__value">'+(traceMap[foodName]||'—')+'</div></div>';
-    html+='<div class="drawer-field"><div class="drawer-field__label">包装批次号</div><div class="drawer-field__value">'+(ncBatch[foodName]||'—')+'</div></div>';
-  } else {
-    // 餐品净菜包 → 显示包装批次号
-    html+='<div class="drawer-field"><div class="drawer-field__label">包装批次号</div><div class="drawer-field__value">'+(dishBatch[foodName]||'—')+'</div></div>';
-  }
-
-  html+='<div class="drawer-field"><div class="drawer-field__label">包装规格</div><div class="drawer-field__value">'+spec+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">需求份数</div><div class="drawer-field__value">'+qty+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">需求计量(kg)</div><div class="drawer-field__value">'+weight+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">订单状态</div><div class="drawer-field__value">'+statusHtml+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">申领时间</div><div class="drawer-field__value">'+claimTime+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">预定配送时间</div><div class="drawer-field__value">'+deliverTime+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">创建人</div><div class="drawer-field__value">'+creator+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">订单类型</div><div class="drawer-field__value">'+orderTypeTag(order.orderType)+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">净菜类型</div><div class="drawer-field__value">'+ncTypeTag(order.ncType)+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">订单状态</div><div class="drawer-field__value">'+statusTag(aggStatus)+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">菜品种类</div><div class="drawer-field__value">'+order.lines.length+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">总份数</div><div class="drawer-field__value">'+totalQty+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">总计量(kg)</div><div class="drawer-field__value">'+totalWeight+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">申领时间</div><div class="drawer-field__value">'+order.claimTime+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">预定配送时间</div><div class="drawer-field__value">'+order.deliverTime+'</div></div>';
+  html+='<div class="drawer-field"><div class="drawer-field__label">创建人</div><div class="drawer-field__value">'+order.creator+'</div></div>';
   html+='</div></div>';
 
-  // 餐品净菜包 → 追加净菜包明细表格
-  if(isCp){
-    var ings=dishIngredients[foodName]||[];
-    var tagCls={'主材':'tag-blue','辅材':'tag-green','调料':'tag-orange'};
-    html+='<div class="drawer-section"><div class="drawer-section__title">净菜包明细</div>';
-    html+='<div style="overflow-x:auto;"><table style="width:100%;min-width:560px;border-collapse:collapse;margin-top:8px;"><thead><tr><th>食材溯源码</th><th>食材名称</th><th>净菜类型</th><th>分类</th><th>每份用量</th></tr></thead><tbody>';
-    if(ings.length>0){
-      ings.forEach(function(i){
-        html+='<tr><td>'+i.trace+'</td><td>'+i.name+'</td><td>'+(i.cleanType||'—')+'</td><td><span class="tag '+(tagCls[i.type]||'')+'">'+i.type+'</span></td><td>'+i.amount+'</td></tr>';
-      });
-    } else {
-      html+='<tr><td colspan="5" style="text-align:center;color:var(--text-placeholder);">暂无明细数据</td></tr>';
-    }
-    html+='</tbody></table></div></div>';
+  /* 订单明细列表 */
+  html+='<div class="drawer-section"><div class="drawer-section__title">订单明细（'+order.lines.length+' 道菜品）</div>';
+  var isNcOrder=order.ncType==='nc';
+  html+='<table class="ing-table"><thead><tr><th>净菜类型</th>';
+  if(isNcOrder){
+    html+='<th>食材</th><th>净菜名称</th>';
+  }else{
+    html+='<th>菜品/食材</th>';
   }
+  html+='<th>包装规格</th><th>份数</th><th>计量(kg)</th><th>行状态</th></tr></thead><tbody>';
+  order.lines.forEach(function(line){
+    var tagCls={'已完成':'tag-green','配送中':'tag-blue','待配送':'tag-orange','备货中':'tag-gray'};
+    html+='<tr><td>'+ncTypeTag(line.ncType)+'</td>';
+    if(line.ncType==='nc'){
+      html+='<td><b>'+line.ingredient+'</b></td><td><b>'+line.ncName+'</b></td>';
+    }else{
+      html+='<td'+(isNcOrder?' colspan="2"':'')+'><b>'+line.foodName+'</b></td>';
+    }
+    html+='<td>'+line.spec+'</td><td>'+line.qty+'</td><td>'+line.weight+'</td><td><span class="tag '+tagCls[line.status]+'">'+line.status+'</span></td></tr>';
+    /* 餐品净菜包显示食材明细 */
+    if(line.ncType==='cp'){
+      var ings=dishIngredients[line.foodName]||[];
+      if(ings.length>0){
+        var colSpan=isNcOrder?7:6;
+        html+='<tr><td colspan="'+colSpan+'" style="padding:4px 10px;background:#fafafa;"><span style="font-size:11px;color:var(--text-placeholder);">食材构成：</span>';
+        ings.forEach(function(ing,i){
+          if(i>0)html+=', ';
+          html+=ing.name+'('+ing.amount+')';
+        });
+        html+='</td></tr>';
+      }
+    }
+  });
+  html+='</tbody></table></div>';
 
-  // 渲染抽屉
+  /* 渲染抽屉 */
   var drawerHtml='<div class="drawer-overlay" onclick="if(event.target===this)closeDrawer()">'
     +'<div class="drawer">'
     +'<div class="drawer__header"><div class="drawer__title">净菜订单详情 — '+orderNo+'</div><button class="drawer__close" onclick="closeDrawer()">✕</button></div>'
@@ -591,17 +869,23 @@ function showDetail(el){
   document.body.insertAdjacentHTML('beforeend',drawerHtml);
 }
 
-/* ========== 由食谱快速创建订单 ========== */
-/* ---- 食谱数据：每周7天×4餐次（来源：din-recipe-mgmt.html） ---- */
+function closeDrawer(){
+  var overlay=document.querySelector('.drawer-overlay');
+  if(!overlay)return;
+  overlay.classList.add('closing');
+  setTimeout(function(){overlay.remove();},200);
+}
+
+/* ========== 食谱快速创建订单 ========== */
 var WEEK_MENUS={
-  '2026-05-18':{ // 第21周 周一~周日
+  '2026-05-18':{
     meals:[
       [['白米饭','小米粥','馒头'],['皮蛋瘦肉粥','花卷'],['小米粥','煎饺'],['杂粮饭','馒头'],['皮蛋瘦肉粥','煎饺','花卷'],[],[]],
       [['红烧肉','清炒时蔬','紫菜蛋花汤'],['宫保鸡丁','酸辣土豆丝','白米饭'],['糖醋排骨','麻婆豆腐','冬瓜排骨汤'],['清蒸鲈鱼','西红柿炒蛋','白米饭'],['红烧肉','凉拌黄瓜','紫菜蛋花汤'],[],[]],
       [['西红柿炒蛋','酸辣土豆丝'],['麻婆豆腐','清炒时蔬'],['宫保鸡丁','凉拌黄瓜'],['清蒸鲈鱼','清炒时蔬'],[],[],[]],
       [['水果拼盘'],[],['绿豆汤','水果拼盘'],[],[],[],[]]
     ]},
-  '2026-05-25':{ // 第22周
+  '2026-05-25':{
     meals:[
       [['小米粥','馒头','煮鸡蛋'],['牛奶','花卷'],['小米粥','煎饺'],['牛奶','馒头'],['小米粥','花卷','煮鸡蛋'],[],[]],
       [['番茄炖牛腩','清炒时蔬','紫菜蛋花汤'],['宫保鸡丁','西红柿炒蛋','白米饭'],['糖醋排骨','清炒时蔬','冬瓜排骨汤'],['清蒸鲈鱼','西红柿炒蛋','白米饭'],['红烧肉','清炒时蔬','紫菜蛋花汤'],[],[]],
@@ -609,61 +893,38 @@ var WEEK_MENUS={
       [['水果拼盘','牛奶'],['水果拼盘'],['绿豆汤','水果拼盘'],['水果拼盘'],[],[],[]]
     ]}
 };
-
-/* ---- 餐品包装规格映射 (规格g/份) ---- */
 var DISH_SPEC={
-  '白米饭':{spec:'标准份（500g）',grams:500},
-  '杂粮饭':{spec:'标准份（500g）',grams:500},
-  '小米粥':{spec:'标准份（400g）',grams:400},
-  '皮蛋瘦肉粥':{spec:'标准份（450g）',grams:450},
-  '燕麦粥':{spec:'标准份（400g）',grams:400},
-  '红薯粥':{spec:'标准份（400g）',grams:400},
-  '馒头':{spec:'标准份（200g）',grams:200},
-  '花卷':{spec:'标准份（200g）',grams:200},
-  '全麦馒头':{spec:'标准份（200g）',grams:200},
-  '煎饺':{spec:'标准份（300g）',grams:300},
-  '牛奶':{spec:'标准份（250ml）',grams:250},
-  '煮鸡蛋':{spec:'标准份（60g）',grams:60},
-  '红烧肉':{spec:'标准份（800g）',grams:800},
-  '糖醋排骨':{spec:'标准份（800g）',grams:800},
-  '清蒸鲈鱼':{spec:'标准份（600g）',grams:600},
-  '宫保鸡丁':{spec:'标准份（500g）',grams:500},
-  '清蒸鸡胸':{spec:'标准份（500g）',grams:500},
-  '番茄炖牛腩':{spec:'标准份（800g）',grams:800},
-  '西红柿炒蛋':{spec:'标准份（400g）',grams:400},
-  '麻婆豆腐':{spec:'标准份（400g）',grams:400},
-  '清炒时蔬':{spec:'标准份（300g）',grams:300},
-  '清炒西兰花':{spec:'标准份（300g）',grams:300},
-  '凉拌黄瓜':{spec:'标准份（250g）',grams:250},
-  '酸辣土豆丝':{spec:'标准份（350g）',grams:350},
-  '紫菜蛋花汤':{spec:'标准份（350g）',grams:350},
-  '冬瓜排骨汤':{spec:'标准份（400g）',grams:400},
-  '水果拼盘':{spec:'标准份（300g）',grams:300},
-  '绿豆汤':{spec:'标准份（350g）',grams:350}
+  '白米饭':{spec:'标准份（500g）',grams:500},'杂粮饭':{spec:'标准份（500g）',grams:500},
+  '小米粥':{spec:'标准份（400g）',grams:400},'皮蛋瘦肉粥':{spec:'标准份（450g）',grams:450},
+  '燕麦粥':{spec:'标准份（400g）',grams:400},'红薯粥':{spec:'标准份（400g）',grams:400},
+  '馒头':{spec:'标准份（200g）',grams:200},'花卷':{spec:'标准份（200g）',grams:200},
+  '全麦馒头':{spec:'标准份（200g）',grams:200},'煎饺':{spec:'标准份（300g）',grams:300},
+  '牛奶':{spec:'标准份（250ml）',grams:250},'煮鸡蛋':{spec:'标准份（60g）',grams:60},
+  '红烧肉':{spec:'标准份（800g）',grams:800},'糖醋排骨':{spec:'标准份（800g）',grams:800},
+  '清蒸鲈鱼':{spec:'标准份（600g）',grams:600},'宫保鸡丁':{spec:'标准份（500g）',grams:500},
+  '清蒸鸡胸':{spec:'标准份（500g）',grams:500},'番茄炖牛腩':{spec:'标准份（800g）',grams:800},
+  '西红柿炒蛋':{spec:'标准份（400g）',grams:400},'麻婆豆腐':{spec:'标准份（400g）',grams:400},
+  '清炒时蔬':{spec:'标准份（300g）',grams:300},'清炒西兰花':{spec:'标准份（300g）',grams:300},
+  '凉拌黄瓜':{spec:'标准份（250g）',grams:250},'酸辣土豆丝':{spec:'标准份（350g）',grams:350},
+  '紫菜蛋花汤':{spec:'标准份（350g）',grams:350},'冬瓜排骨汤':{spec:'标准份（400g）',grams:400},
+  '水果拼盘':{spec:'标准份（300g）',grams:300},'绿豆汤':{spec:'标准份（350g）',grams:350}
 };
-
 var MEAL_NAMES=['早餐','午餐','晚餐','加餐'];
 
-/* 根据日期获取对应的周菜单 + 星期索引 */
+function getDefaultDate(){return '2026-05-20';}
+
 function getDailyMenu(dateStr){
   var d=new Date(dateStr);
-  var dayOfWeek=d.getDay()||7; // 周日=7
-  var dayIdx=dayOfWeek-1; // 周一=0
-  // 计算该日期所在周的周一
+  var dayOfWeek=d.getDay()||7;
+  var dayIdx=dayOfWeek-1;
   var monday=new Date(d);
   monday.setDate(monday.getDate()-dayIdx);
   var mondayStr=monday.getFullYear()+'-'+String(monday.getMonth()+1).padStart(2,'0')+'-'+String(monday.getDate()).padStart(2,'0');
   var weekData=WEEK_MENUS[mondayStr];
-  if(!weekData) return null;
+  if(!weekData)return null;
   return {meals:weekData.meals,dayIdx:dayIdx};
 }
 
-/* 默认日期：食谱数据内的明天（原型用固定值，对应页面上下文 2026-05-19） */
-function getDefaultDate(){
-  return '2026-05-20';
-}
-
-/* 选日期 → 渲染当日食谱表 */
 function onRecipeDateChange(){
   var dateVal=document.getElementById('recipeDate').value;
   var dailySection=document.getElementById('dailyMenuSection');
@@ -689,45 +950,29 @@ function onRecipeDateChange(){
   }
   tbody.innerHTML=rows;
   dailySection.style.display='block';
-  // 重置汇总
   document.getElementById('recipeOrderSummary').style.display='none';
 }
 
-/* 餐次/人数变化 → 刷新汇总表 */
 function onRecipeParamChange(){
   var dateVal=document.getElementById('recipeDate').value;
   var dinerCount=parseInt(document.getElementById('recipeDinerCount').value||'0',10);
   var summaryDiv=document.getElementById('recipeOrderSummary');
   var tbody=document.getElementById('recipeOrderSummaryBody');
-
-  if(!dateVal||dinerCount<=0){
-    summaryDiv.style.display='none';
-    return;
-  }
+  if(!dateVal||dinerCount<=0){summaryDiv.style.display='none';return;}
   var daily=getDailyMenu(dateVal);
   if(!daily){summaryDiv.style.display='none';return;}
-
-  // 收集选中餐次
   var mealIndices=[];
-  document.querySelectorAll('#dailyMenuBody .meal-cb:checked').forEach(function(cb){
-    mealIndices.push(parseInt(cb.value));
-  });
+  document.querySelectorAll('#dailyMenuBody .meal-cb:checked').forEach(function(cb){mealIndices.push(parseInt(cb.value));});
   if(mealIndices.length===0){summaryDiv.style.display='none';return;}
-
-  // 收集餐品（去重）
   var dishMap={};
   mealIndices.forEach(function(mi){
     var dayDishes=daily.meals[mi]&&daily.meals[mi][daily.dayIdx]||[];
     dayDishes.forEach(function(dishName){
-      if(!dishMap[dishName]){
-        dishMap[dishName]=DISH_SPEC[dishName]||{spec:'标准份（500g）',grams:500};
-      }
+      if(!dishMap[dishName])dishMap[dishName]=DISH_SPEC[dishName]||{spec:'标准份（500g）',grams:500};
     });
   });
-
   var dishNames=Object.keys(dishMap);
   if(dishNames.length===0){summaryDiv.style.display='none';return;}
-
   var rows='';
   for(var name in dishMap){
     var sp=dishMap[name];
@@ -743,22 +988,49 @@ function submitRecipeOrder(){
   var recipeDate=document.getElementById('recipeDate').value;
   var dinerCount=document.getElementById('recipeDinerCount').value;
   var meals=[];
-  document.querySelectorAll('#dailyMenuBody .meal-cb:checked').forEach(function(cb){
-    meals.push(MEAL_NAMES[parseInt(cb.value)]);
-  });
+  document.querySelectorAll('#dailyMenuBody .meal-cb:checked').forEach(function(cb){meals.push(MEAL_NAMES[parseInt(cb.value)]);});
   if(!recipeDate){alert('请选择食谱日期');return;}
   if(meals.length===0){alert('请至少选择一个餐次');return;}
   if(!dinerCount||parseInt(dinerCount)<=0){alert('请输入有效的就餐人数');return;}
-  alert('已根据 '+recipeDate+' 食谱（'+meals.join('、')+'）生成内供净菜订单，就餐人数：'+dinerCount+' 人');
+  /* 由食谱创建一个包含多道菜品的订单 */
+  var daily=getDailyMenu(recipeDate);
+  var mealIndices=[];
+  document.querySelectorAll('#dailyMenuBody .meal-cb:checked').forEach(function(cb){mealIndices.push(parseInt(cb.value));});
+  var dishMap={};
+  mealIndices.forEach(function(mi){
+    var dayDishes=daily.meals[mi]&&daily.meals[mi][daily.dayIdx]||[];
+    dayDishes.forEach(function(dishName){
+      if(!dishMap[dishName])dishMap[dishName]=DISH_SPEC[dishName]||{spec:'标准份（500g）',grams:500};
+    });
+  });
+  var orderNo='CO-'+String(orders.length+1).padStart(3,'0');
+  var newLines=[];
+  for(var name in dishMap){
+    var sp=dishMap[name];
+    newLines.push({
+      id:'L'+(Date.now()+Object.keys(dishMap).indexOf(name)),
+      ncType:'cp',foodName:name,spec:sp.spec,qty:parseInt(dinerCount),
+      weight:parseFloat((sp.grams*parseInt(dinerCount)/1000).toFixed(2)),status:'备货中'
+    });
+  }
+  orders.unshift({
+    orderNo:orderNo,orderType:'内供',ncType:'cp',
+    claimTime:new Date().toISOString().slice(0,16).replace('T',' '),
+    deliverTime:recipeDate+' 10:00',creator:'系统',
+    lines:newLines
+  });
   closeModal('modal-recipe-order');
-  // 重置
+  renderOrderTable();
   document.getElementById('recipeDate').value=getDefaultDate();
   document.getElementById('recipeDinerCount').value='';
   document.getElementById('dailyMenuSection').style.display='none';
   document.getElementById('recipeOrderSummary').style.display='none';
+  alert('已根据 '+recipeDate+' 食谱创建订单 '+orderNo+'，包含 '+newLines.length+' 道菜品');
 }
 
-/* 打开弹窗时初始化默认日期 */
+function sanitizeIntegerInput(el){el.value=el.value.replace(/[^\d]/g,'');}
+
+/* 打开弹窗时初始化 */
 (function(){
   var origOpenModal=openModal;
   openModal=function(id){
@@ -773,6 +1045,9 @@ function submitRecipeOrder(){
     document.getElementById(id).classList.add('show');
   };
 })();
+
+/* 初始化渲染 */
+renderOrderTable();
 </script>
 </body>
 </html>
diff --git a/web-admin/nutrition/prod-proc-cabinet.html b/web-admin/nutrition/prod-proc-cabinet.html
index 2032a9e..2312280 100644
--- a/web-admin/nutrition/prod-proc-cabinet.html
+++ b/web-admin/nutrition/prod-proc-cabinet.html
@@ -330,18 +330,18 @@ tbody tr.row-active td.td-actions{background:var(--primary-light);}
         </div>
         <div class="table-card__content">
           <table>
-            <thead><tr><th>格口</th><th>关联净菜订单</th><th>存放净菜</th><th>类型</th><th>初始重量(kg)</th><th>当前余量(kg)</th><th>操作人</th><th>温度(℃)</th><th>保质剩余</th><th>存入时间</th><th>状态</th><th>操作</th></tr></thead>
+            <thead><tr><th>格口</th><th>关联订单</th><th>订单菜品</th><th>存放净菜</th><th>类型</th><th>初始重量(kg)</th><th>当前余量(kg)</th><th>操作人</th><th>温度(℃)</th><th>保质剩余</th><th>存入时间</th><th>状态</th><th>操作</th></tr></thead>
             <tbody id="detailTable">
-              <tr class="row-active" data-slot="0" data-type="净菜" data-order="JC-2026-0422-001" data-trace="NC-CAB-BOCA-0422-01"><td>A1-01</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-001</a></td><td>土豆（土豆丝）</td><td><span class="tag tag-green">🥬 净菜</span></td><td>12.5</td><td>10.2</td><td>张厨师</td><td>4.2</td><td>剩余32h</td><td>04-22 09:15</td><td><span class="tag tag-green">存放中</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-01','土豆')">视频</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link">编辑</span></td></tr>
-              <tr data-slot="1" data-type="净菜" data-order="JC-2026-0422-002" data-trace="NC-CAB-HLUB-0422-01"><td>A1-02</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-002</a></td><td>净胡萝卜</td><td><span class="tag tag-green">🥬 净菜</span></td><td>18.0</td><td>15.6</td><td>李主管</td><td>4.1</td><td>剩余46h</td><td>04-22 09:20</td><td><span class="tag tag-green">存放中</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-02','净胡萝卜')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
-              <tr data-slot="2" data-type="净菜" data-order="JC-2026-0422-003" data-trace="NC-CAB-XGUO-0422-01"><td>A1-03</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-003</a></td><td>净香菇</td><td><span class="tag tag-green">🥬 净菜</span></td><td>9.0</td><td>6.8</td><td>王厨师</td><td>4.3</td><td>剩余6h</td><td>04-22 09:30</td><td><span class="tag tag-orange">临期预警</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-03','净香菇')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
-              <tr data-slot="3" data-type="净菜" data-order="JC-2026-0422-004" data-trace="NC-CAB-XLHU-0422-01"><td>A1-04</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-004</a></td><td>净西兰花</td><td><span class="tag tag-green">🥬 净菜</span></td><td>10.0</td><td>8.5</td><td>张厨师</td><td>4.0</td><td>剩余50h</td><td>04-22 09:40</td><td><span class="tag tag-green">存放中</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-04','净西兰花')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
-              <tr data-slot="4" data-type="餐品包" data-order="JC-2026-0422-005" data-trace="PKG-DH-001"><td>A1-05</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-005</a></td><td>宫保鸡丁</td><td><span class="tag tag-orange">🍱 餐品包</span></td><td>6.0</td><td>5.4</td><td>李主管</td><td>3.8</td><td>剩余44h</td><td>04-22 10:20</td><td><span class="tag tag-green">存放中</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-05','宫保鸡丁')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
-              <tr data-slot="5" data-type="净菜" data-order="JC-2026-0422-006" data-trace="NC-CAB-BCAI-0422-01"><td>A1-06</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-006</a></td><td>净白菜</td><td><span class="tag tag-green">🥬 净菜</span></td><td>22.0</td><td>18.0</td><td>王厨师</td><td>7.8</td><td>剩余40h</td><td>04-22 08:50</td><td><span class="tag tag-red">已过期</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-06','净白菜')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
-              <tr data-slot="6"><td>A1-07</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>4.1</td><td>—</td><td>—</td><td><span class="tag tag-gray">空闲</span></td><td class="td-actions">—</td></tr>
-              <tr data-slot="7"><td>A1-08</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>4.1</td><td>—</td><td>—</td><td><span class="tag tag-gray">空闲</span></td><td class="td-actions">—</td></tr>
-              <tr data-slot="8"><td>A1-09</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>4.2</td><td>—</td><td>—</td><td><span class="tag tag-gray">空闲</span></td><td class="td-actions">—</td></tr>
-              <tr data-slot="9"><td>A1-10</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>4.2</td><td>—</td><td>—</td><td><span class="tag tag-gray">空闲</span></td><td class="td-actions">—</td></tr>
+              <tr class="row-active" data-slot="0" data-type="净菜" data-order="JC-2026-0422-001" data-dish="土豆丝" data-trace="NC-CAB-BOCA-0422-01"><td>A1-01</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-001</a></td><td>土豆丝</td><td>土豆（土豆丝）</td><td><span class="tag tag-green">🥬 净菜</span></td><td>12.5</td><td>10.2</td><td>张厨师</td><td>4.2</td><td>剩余32h</td><td>04-22 09:15</td><td><span class="tag tag-green">存放中</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-01','土豆')">视频</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link">编辑</span></td></tr>
+              <tr data-slot="1" data-type="净菜" data-order="JC-2026-0422-002" data-dish="净胡萝卜" data-trace="NC-CAB-HLUB-0422-01"><td>A1-02</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-002</a></td><td>净胡萝卜</td><td>净胡萝卜</td><td><span class="tag tag-green">🥬 净菜</span></td><td>18.0</td><td>15.6</td><td>李主管</td><td>4.1</td><td>剩余46h</td><td>04-22 09:20</td><td><span class="tag tag-green">存放中</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-02','净胡萝卜')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
+              <tr data-slot="2" data-type="净菜" data-order="JC-2026-0422-003" data-dish="净香菇" data-trace="NC-CAB-XGUO-0422-01"><td>A1-03</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-003</a></td><td>净香菇</td><td>净香菇</td><td><span class="tag tag-green">🥬 净菜</span></td><td>9.0</td><td>6.8</td><td>王厨师</td><td>4.3</td><td>剩余6h</td><td>04-22 09:30</td><td><span class="tag tag-orange">临期预警</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-03','净香菇')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
+              <tr data-slot="3" data-type="净菜" data-order="JC-2026-0422-004" data-dish="净西兰花" data-trace="NC-CAB-XLHU-0422-01"><td>A1-04</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-004</a></td><td>净西兰花</td><td>净西兰花</td><td><span class="tag tag-green">🥬 净菜</span></td><td>10.0</td><td>8.5</td><td>张厨师</td><td>4.0</td><td>剩余50h</td><td>04-22 09:40</td><td><span class="tag tag-green">存放中</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-04','净西兰花')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
+              <tr data-slot="4" data-type="餐品包" data-order="JC-2026-0422-005" data-dish="宫保鸡丁" data-trace="PKG-DH-001"><td>A1-05</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-005</a></td><td>宫保鸡丁</td><td>宫保鸡丁</td><td><span class="tag tag-orange">🍱 餐品包</span></td><td>6.0</td><td>5.4</td><td>李主管</td><td>3.8</td><td>剩余44h</td><td>04-22 10:20</td><td><span class="tag tag-green">存放中</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-05','宫保鸡丁')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
+              <tr data-slot="5" data-type="净菜" data-order="JC-2026-0422-006" data-dish="净白菜" data-trace="NC-CAB-BCAI-0422-01"><td>A1-06</td><td><a class="link" href="prod-clean-order.html">JC-2026-0422-006</a></td><td>净白菜</td><td>净白菜</td><td><span class="tag tag-green">🥬 净菜</span></td><td>22.0</td><td>18.0</td><td>王厨师</td><td>7.8</td><td>剩余40h</td><td>04-22 08:50</td><td><span class="tag tag-red">已过期</span></td><td class="td-actions"><a class="link" href="trace-timeline-ingredient.html">溯源</a> <span class="link" onclick="showVideo('A1-06','净白菜')">视频</span> <span class="link" onclick="showDetail(this)">详情</span><span class="link">编辑</span></td></tr>
+              <tr data-slot="6"><td>A1-07</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>4.1</td><td>—</td><td>—</td><td><span class="tag tag-gray">空闲</span></td><td class="td-actions">—</td></tr>
+              <tr data-slot="7"><td>A1-08</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>4.1</td><td>—</td><td>—</td><td><span class="tag tag-gray">空闲</span></td><td class="td-actions">—</td></tr>
+              <tr data-slot="8"><td>A1-09</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>4.2</td><td>—</td><td>—</td><td><span class="tag tag-gray">空闲</span></td><td class="td-actions">—</td></tr>
+              <tr data-slot="9"><td>A1-10</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>—</td><td>4.2</td><td>—</td><td>—</td><td><span class="tag tag-gray">空闲</span></td><td class="td-actions">—</td></tr>
             </tbody>
           </table>
         </div>
@@ -370,12 +370,19 @@ tbody tr.row-active td.td-actions{background:var(--primary-light);}
           <div class="form-item__label">选择净菜订单<span class="required">*</span></div>
           <select id="orderSelect" onchange="onOrderSelect(this)">
             <option value="">请选择净菜订单</option>
-            <option value="JC-2026-0422-007">JC-2026-0422-007 — 土豆丝 20份</option>
-            <option value="JC-2026-0422-008">JC-2026-0422-008 — 净黄瓜 15份</option>
-            <option value="JC-2026-0422-009">JC-2026-0422-009 — 宫保鸡丁(餐品包) 30份</option>
+            <option value="JC-2026-0422-007">JC-2026-0422-007 — 含2道菜品</option>
+            <option value="JC-2026-0422-008">JC-2026-0422-008 — 含3道菜品</option>
+            <option value="JC-2026-0422-009">JC-2026-0422-009 — 含1道菜品</option>
           </select>
         </div>
-        <!-- 选择订单后回显区域 -->
+        <!-- 选择订单后显示订单菜品明细（多选一） -->
+        <div class="form-item full" id="orderDishArea" style="display:none;">
+          <div class="form-item__label">选择订单菜品<span class="required">*</span></div>
+          <select id="orderDishSelect" onchange="onDishSelect(this.value)">
+            <option value="">请选择菜品</option>
+          </select>
+        </div>
+        <!-- 选择菜品后回显区域 -->
         <div class="form-item full" id="orderEchoArea" style="display:none;">
           <div style="background:#F8FBFF;border:1px solid var(--border);border-radius:var(--radius-md);padding:16px;">
             <div style="font-size:var(--font-sm);font-weight:600;margin-bottom:12px;color:var(--primary);">净菜订单</div>
@@ -447,19 +454,44 @@ function showVideo(code,name){
 }
 function closeVideoModal(){var m=document.getElementById('videoModal');if(m)m.remove();}
 
-/* 存入净菜弹窗 — 选择净菜订单后回显信息 */
-var orderData={
-  'JC-2026-0422-007':{name:'土豆丝',spec:'5kg/袋',qty:'20份',weight:'12.5',time:'2026-04-22 08:00'},
-  'JC-2026-0422-008':{name:'净黄瓜',spec:'3kg/袋',qty:'15份',weight:'9.0',time:'2026-04-22 08:30'},
-  'JC-2026-0422-009':{name:'宫保鸡丁(餐品包)',spec:'6份/箱',qty:'30份',weight:'18.0',time:'2026-04-22 07:45'}
+/* 存入净菜弹窗 — 先选订单再选菜品明细 */
+var ORDER_DISHES={
+  'JC-2026-0422-007':[
+    {name:'土豆丝',spec:'5kg/袋',qty:'20份',weight:'12.5',time:'2026-04-22 08:00',type:'nc'},
+    {name:'宫保鸡丁',spec:'标准份（500g）',qty:'30份',weight:'15.0',time:'2026-04-22 08:00',type:'cp'}
+  ],
+  'JC-2026-0422-008':[
+    {name:'净黄瓜',spec:'3kg/袋',qty:'15份',weight:'9.0',time:'2026-04-22 08:30',type:'nc'},
+    {name:'净西兰花',spec:'500g/袋',qty:'10份',weight:'5.0',time:'2026-04-22 08:30',type:'nc'},
+    {name:'清蒸鱼',spec:'标准份（600g）',qty:'12份',weight:'7.2',time:'2026-04-22 08:30',type:'cp'}
+  ],
+  'JC-2026-0422-009':[
+    {name:'宫保鸡丁',spec:'6份/箱',qty:'30份',weight:'18.0',time:'2026-04-22 07:45',type:'cp'}
+  ]
 };
 function onOrderSelect(sel){
   var v=sel.value;
-  var area=document.getElementById('orderEchoArea');
-  if(!v){area.style.display='none';return;}
-  var d=orderData[v];
-  if(!d){area.style.display='none';return;}
-  area.style.display='';
+  var dishArea=document.getElementById('orderDishArea');
+  var dishSelect=document.getElementById('orderDishSelect');
+  var echoArea=document.getElementById('orderEchoArea');
+  if(!v){dishArea.style.display='none';echoArea.style.display='none';return;}
+  var dishes=ORDER_DISHES[v]||[];
+  dishSelect.innerHTML='<option value="">请选择菜品</option>';
+  dishes.forEach(function(d,i){
+    dishSelect.innerHTML+='<option value="'+i+'">'+d.name+' — '+d.spec+' — '+d.qty+'</option>';
+  });
+  dishSelect.value='';
+  dishArea.style.display='flex';
+  echoArea.style.display='none';
+}
+function onDishSelect(idx){
+  var orderNo=document.getElementById('orderSelect').value;
+  var echoArea=document.getElementById('orderEchoArea');
+  if(idx===''){echoArea.style.display='none';return;}
+  var dishes=ORDER_DISHES[orderNo]||[];
+  var d=dishes[parseInt(idx)];
+  if(!d){echoArea.style.display='none';return;}
+  echoArea.style.display='';
   document.getElementById('echo-name').textContent=d.name;
   document.getElementById('echo-spec').textContent=d.spec;
   document.getElementById('echo-qty').textContent=d.qty;
@@ -493,15 +525,15 @@ function showDetail(el){
   var orderNo=row.getAttribute('data-order')||'—';
   var traceCode=row.getAttribute('data-trace')||'—';
   var slotId=cells[0].textContent.trim();
-  var itemName=cells[2].textContent.trim();
-  var typeHtml=cells[3].innerHTML.trim();
-  var initWeight=cells[4].textContent.trim();
-  var curWeight=cells[5].textContent.trim();
-  var operator=cells[6].textContent.trim();
-  var temp=cells[7].textContent.trim();
-  var remain=cells[8].textContent.trim();
-  var storeTime=cells[9].textContent.trim();
-  var status=cells[10].innerHTML.trim();
+  var itemName=cells[3].textContent.trim();
+  var typeHtml=cells[4].innerHTML.trim();
+  var initWeight=cells[5].textContent.trim();
+  var curWeight=cells[6].textContent.trim();
+  var operator=cells[7].textContent.trim();
+  var temp=cells[8].textContent.trim();
+  var remain=cells[9].textContent.trim();
+  var storeTime=cells[10].textContent.trim();
+  var status=cells[11].innerHTML.trim();
 
   /* 基础信息区 */
   var html='<div class="drawer-section"><div class="drawer-section__title">基础信息</div><div class="drawer-fields">';
diff --git a/web-admin/nutrition/prod-proc-combo.html b/web-admin/nutrition/prod-proc-combo.html
index b7170e5..904654b 100644
--- a/web-admin/nutrition/prod-proc-combo.html
+++ b/web-admin/nutrition/prod-proc-combo.html
@@ -97,6 +97,8 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .action-more__item:hover{background:var(--primary-light);color:var(--primary);}
 .action-more__item--danger{color:var(--danger);}
 .action-more__item--danger:hover{background:#FFF1F0;color:var(--danger);}
+/* 订单分组：同订单最后一行加分隔线 */
+tr.order-last td{border-bottom:2px solid #d9d9d9;}
 /* 右侧抽屉 */
 .drawer-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.45);z-index:1000;animation:modalFadeIn .2s ease;}
 .drawer-overlay.closing{animation:modalFadeOut .2s ease forwards;}
@@ -185,14 +187,14 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
     <div class="table-card__header"><div class="table-card__title">净菜组配</div></div>
     <div class="table-card__content">
       <table>
-        <thead><tr><th>任务编号</th><th>目标餐品</th><th>餐品规格</th><th>份数</th><th>任务截止时间</th><th>食材配方</th><th>任务来源</th><th>组配状态</th><th>负责人</th><th>操作类型</th><th>终端设备</th><th>完成时间</th><th>操作</th></tr></thead>
+        <thead><tr><th>任务编号</th><th>关联订单</th><th>目标餐品</th><th>餐品规格</th><th>份数</th><th>任务截止时间</th><th>食材配方</th><th>任务来源</th><th>组配状态</th><th>负责人</th><th>操作类型</th><th>终端设备</th><th>完成时间</th><th>操作</th></tr></thead>
         <tbody>
-          <tr><td>CMB-001</td><td>宫保鸡丁</td><td>标准份（300g）</td><td>50</td><td>2026-05-20 11:00</td><td><a class="link" onclick="openRecipeModal('宫保鸡丁')">食材明细</a></td><td><span class="tag tag-blue">餐线</span></td><td><span class="tag tag-green">已完成</span></td><td>李组配</td><td><span class="tag tag-blue">设备自动</span></td><td><div>智能组配秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">CMB-SCALE-001</div></td><td>2026-05-20 10:30:00</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span></td></tr>
-          <tr><td>CMB-002</td><td>番茄炒蛋</td><td>大份（500g）</td><td>80</td><td>2026-05-20 11:00</td><td><a class="link" onclick="openRecipeModal('番茄炒蛋')">食材明细</a></td><td><span class="tag tag-blue">餐线</span></td><td><span class="tag tag-green">已完成</span></td><td>王组配</td><td><span class="tag tag-blue">设备自动</span></td><td><div>智能组配秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">CMB-SCALE-002</div></td><td>2026-05-20 10:45:00</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span></td></tr>
-          <tr><td>CMB-003</td><td>红烧肉</td><td>标准份（300g）</td><td>60</td><td>2026-05-20 11:30</td><td><a class="link" onclick="openRecipeModal('红烧肉')">食材明细</a></td><td><span class="tag tag-blue">餐线</span></td><td><span class="tag tag-blue">组配中</span></td><td>张组配</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span> <a class="link" style="color:var(--success)" onclick="finishCombo(this)">完成组配</a></td></tr>
-          <tr><td>CMB-004</td><td>清蒸鱼</td><td>标准份（500g）</td><td>40</td><td>2026-05-20 12:00</td><td><a class="link" onclick="openRecipeModal('清蒸鱼')">食材明细</a></td><td><span class="tag tag-orange">点餐</span></td><td><span class="tag tag-orange">待组配</span></td><td>—</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span> <a class="link" onclick="startCombo(this)">开始组配</a></td></tr>
-          <tr><td>CMB-005</td><td>炒时蔬</td><td>小份（200g）</td><td>20</td><td>2026-05-20 11:00</td><td><a class="link" onclick="openRecipeModal('炒时蔬')">食材明细</a></td><td><span class="tag tag-gray">录入</span></td><td><span class="tag tag-green">已完成</span></td><td>赵组配</td><td><span class="tag tag-blue">设备自动</span></td><td><div>智能组配秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">CMB-SCALE-003</div></td><td>2026-05-20 10:50:00</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span></td></tr>
-          <tr><td>CMB-006</td><td>豆腐</td><td>小份（200g）</td><td>35</td><td>2026-05-20 12:00</td><td><a class="link" onclick="openRecipeModal('豆腐')">食材明细</a></td><td><span class="tag tag-orange">点餐</span></td><td><span class="tag tag-orange">待组配</span></td><td>—</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span> <a class="link" onclick="startCombo(this)">开始组配</a></td></tr>
+          <tr data-order="CO-001"><td>CMB-001</td><td><span class="link">CO-001</span></td><td>宫保鸡丁</td><td>标准份（300g）</td><td>50</td><td>2026-05-20 11:00</td><td><a class="link" onclick="openRecipeModal('宫保鸡丁')">食材明细</a></td><td><span class="tag tag-blue">餐线</span></td><td><span class="tag tag-green">已完成</span></td><td>李组配</td><td><span class="tag tag-blue">设备自动</span></td><td><div>智能组配秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">CMB-SCALE-001</div></td><td>2026-05-20 10:30:00</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span></td></tr>
+          <tr data-order="CO-001" class="order-last"><td>CMB-002</td><td><span class="link">CO-001</span></td><td>番茄炒蛋</td><td>大份（500g）</td><td>80</td><td>2026-05-20 11:00</td><td><a class="link" onclick="openRecipeModal('番茄炒蛋')">食材明细</a></td><td><span class="tag tag-blue">餐线</span></td><td><span class="tag tag-green">已完成</span></td><td>王组配</td><td><span class="tag tag-blue">设备自动</span></td><td><div>智能组配秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">CMB-SCALE-002</div></td><td>2026-05-20 10:45:00</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span></td></tr>
+          <tr data-order="CO-002"><td>CMB-003</td><td><span class="link">CO-002</span></td><td>红烧肉</td><td>标准份（300g）</td><td>60</td><td>2026-05-20 11:30</td><td><a class="link" onclick="openRecipeModal('红烧肉')">食材明细</a></td><td><span class="tag tag-blue">餐线</span></td><td><span class="tag tag-blue">组配中</span></td><td>张组配</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span> <a class="link" style="color:var(--success)" onclick="finishCombo(this)">完成组配</a></td></tr>
+          <tr data-order="CO-002" class="order-last"><td>CMB-004</td><td><span class="link">CO-002</span></td><td>清蒸鱼</td><td>标准份（500g）</td><td>40</td><td>2026-05-20 12:00</td><td><a class="link" onclick="openRecipeModal('清蒸鱼')">食材明细</a></td><td><span class="tag tag-orange">点餐</span></td><td><span class="tag tag-orange">待组配</span></td><td>—</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span> <a class="link" onclick="startCombo(this)">开始组配</a></td></tr>
+          <tr data-order="CO-003"><td>CMB-005</td><td><span class="link">CO-003</span></td><td>炒时蔬</td><td>小份（200g）</td><td>20</td><td>2026-05-20 11:00</td><td><a class="link" onclick="openRecipeModal('炒时蔬')">食材明细</a></td><td><span class="tag tag-gray">录入</span></td><td><span class="tag tag-green">已完成</span></td><td>赵组配</td><td><span class="tag tag-blue">设备自动</span></td><td><div>智能组配秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">CMB-SCALE-003</div></td><td>2026-05-20 10:50:00</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span></td></tr>
+          <tr data-order="CO-004"><td>CMB-006</td><td><span class="link">CO-004</span></td><td>豆腐</td><td>小份（200g）</td><td>35</td><td>2026-05-20 12:00</td><td><a class="link" onclick="openRecipeModal('豆腐')">食材明细</a></td><td><span class="tag tag-orange">点餐</span></td><td><span class="tag tag-orange">待组配</span></td><td>—</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span> <a class="link" onclick="startCombo(this)">开始组配</a></td></tr>
         </tbody>
       </table>
     </div>
@@ -363,15 +365,15 @@ function openEditModal(el){
   document.getElementById('modalSubmitBtn').textContent='保存';
   // 回填数据
   document.getElementById('formTaskId').value=tds[0].textContent;
-  document.getElementById('createDish').value=tds[1].textContent;
+  document.getElementById('createDish').value=tds[2].textContent;
   document.getElementById('createDish').disabled=true;
-  document.getElementById('formSpec').value=tds[2].textContent;
-  document.getElementById('createQty').value=tds[3].textContent;
-  document.getElementById('formPerson').value=tds[8].textContent==='—'?'':tds[8].textContent;
+  document.getElementById('formSpec').value=tds[3].textContent;
+  document.getElementById('createQty').value=tds[4].textContent;
+  document.getElementById('formPerson').value=tds[9].textContent==='—'?'':tds[9].textContent;
   // 来源和操作类型回填
-  var srcText=tds[6].textContent.trim();
+  var srcText=tds[7].textContent.trim();
   document.getElementById('formSource').value=srcText;
-  var opText=tds[9].textContent.trim();
+  var opText=tds[10].textContent.trim();
   document.getElementById('formOpType').value=opText;
   // 触发食材明细计算
   calcIngredients();
@@ -385,10 +387,10 @@ function submitModal(){
   if(_modalMode==='edit'&&_editRow){
     // 编辑模式：更新表格行
     var tds=_editRow.querySelectorAll('td');
-    tds[2].textContent=document.getElementById('formSpec').value;
-    tds[3].textContent=document.getElementById('createQty').value;
+    tds[3].textContent=document.getElementById('formSpec').value;
+    tds[4].textContent=document.getElementById('createQty').value;
     var person=document.getElementById('formPerson').value.trim();
-    if(person)tds[8].textContent=person;
+    if(person)tds[9].textContent=person;
     closeModal();
     showToast('✅ 任务信息已更新');
   } else {
@@ -429,8 +431,8 @@ function openRecipeModal(name){
   var rows=document.querySelectorAll('tbody tr');
   var qty=50;
   for(var i=0;i<rows.length;i++){
-    if(rows[i].querySelectorAll('td')[1]&&rows[i].querySelectorAll('td')[1].textContent.trim()===name){
-      qty=parseInt(rows[i].querySelectorAll('td')[3].textContent)||50;break;
+    if(rows[i].querySelectorAll('td')[2]&&rows[i].querySelectorAll('td')[2].textContent.trim()===name){
+      qty=parseInt(rows[i].querySelectorAll('td')[4].textContent)||50;break;
     }
   }
   var ings=recipeData[name]||[];
@@ -486,7 +488,7 @@ function startCombo(el){
   var tr=el.closest('tr');
   var tds=tr.querySelectorAll('td');
   var taskId=tds[0].textContent;
-  tds[7].innerHTML='<span class="tag tag-blue">组配中</span>';
+  tds[8].innerHTML='<span class="tag tag-blue">组配中</span>';
   el.style.color='var(--success)';
   el.setAttribute('onclick','finishCombo(this)');
   el.textContent='完成组配';
@@ -498,10 +500,10 @@ function finishCombo(el){
   var tr=el.closest('tr');
   var tds=tr.querySelectorAll('td');
   var taskId=tds[0].textContent;
-  tds[7].innerHTML='<span class="tag tag-green">已完成</span>';
+  tds[8].innerHTML='<span class="tag tag-green">已完成</span>';
   var now=new Date();
   var ts=now.getFullYear()+'-'+String(now.getMonth()+1).padStart(2,'0')+'-'+String(now.getDate()).padStart(2,'0')+' '+String(now.getHours()).padStart(2,'0')+':'+String(now.getMinutes()).padStart(2,'0')+':'+String(now.getSeconds()).padStart(2,'0');
-  tds[10].textContent=ts;
+  tds[12].textContent=ts;
   el.remove();
   showToast('✅ '+taskId+' 组配已完成');
 }
@@ -511,15 +513,15 @@ function showDetail(el){
   var tr=el.closest('tr');
   var tds=tr.querySelectorAll('td');
   var taskId=tds[0].textContent.trim();
-  var dishName=tds[1].textContent.trim();
-  var spec=tds[2].textContent.trim();
-  var qty=parseInt(tds[3].textContent)||0;
-  var deadline=tds[4].textContent.trim();
-  var source=tds[6].textContent.trim();
-  var status=tds[7].innerHTML;
-  var person=tds[8].textContent.trim();
-  var opType=tds[9].textContent.trim();
-  var finishTime=tds[10].textContent.trim();
+  var dishName=tds[2].textContent.trim();
+  var spec=tds[3].textContent.trim();
+  var qty=parseInt(tds[4].textContent)||0;
+  var deadline=tds[5].textContent.trim();
+  var source=tds[7].textContent.trim();
+  var status=tds[8].innerHTML;
+  var person=tds[9].textContent.trim();
+  var opType=tds[10].textContent.trim();
+  var finishTime=tds[12].textContent.trim();
 
   var html='<div class="drawer-section"><div class="drawer-section__title">基本信息</div><div class="drawer-fields">';
   html+='<div class="drawer-field"><div class="drawer-field__label">任务编号</div><div class="drawer-field__value">'+taskId+'</div></div>';
diff --git a/web-admin/nutrition/prod-proc-cook.html b/web-admin/nutrition/prod-proc-cook.html
index 579383e..a06ebe1 100644
--- a/web-admin/nutrition/prod-proc-cook.html
+++ b/web-admin/nutrition/prod-proc-cook.html
@@ -79,6 +79,8 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .action-more__item:hover{background:var(--primary-light);color:var(--primary);}
 .action-more__item--danger{color:var(--danger);}
 .action-more__item--danger:hover{background:#FFF1F0;color:var(--danger);}
+/* 订单分组：同订单最后一行加分隔线 */
+tr.order-last td{border-bottom:2px solid #d9d9d9;}
 /* 弹窗 */
 .modal-overlay{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.45);z-index:1000;display:flex;align-items:center;justify-content:center;}
 .modal{background:#fff;border-radius:8px;max-height:85vh;overflow-y:auto;box-shadow:0 4px 12px rgba(0,0,0,0.15);}
@@ -198,15 +200,15 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
     <div class="table-card__header"><div class="table-card__title">按单烹制</div></div>
     <div class="table-card__content">
       <table>
-        <thead><tr><th>烹制任务号</th><th>来源类型</th><th>组配任务号</th><th>菜品名称</th><th>餐品规格</th><th>需求份数</th><th>烹制份数</th><th>烹制日期</th><th>烹制开始</th><th>烹制结束</th><th>烹制状态</th><th>厨师</th><th>食材明细</th><th>温度过程</th><th>模型数据</th><th>生重(kg)</th><th>熟重(kg)</th><th>生熟比</th><th>操作</th></tr></thead>
+        <thead><tr><th>烹制任务号</th><th>关联订单</th><th>来源类型</th><th>组配任务号</th><th>菜品名称</th><th>餐品规格</th><th>需求份数</th><th>烹制份数</th><th>烹制日期</th><th>烹制开始</th><th>烹制结束</th><th>烹制状态</th><th>厨师</th><th>食材明细</th><th>温度过程</th><th>模型数据</th><th>生重(kg)</th><th>熟重(kg)</th><th>生熟比</th><th>操作</th></tr></thead>
         <tbody>
-          <tr><td>COOK-001</td><td><span class="tag tag-blue">点餐</span></td><td>CMB-001</td><td>宫保鸡丁</td><td>标准份（300g）</td><td>50</td><td>50</td><td>2026-05-20</td><td>11:00</td><td>11:20</td><td><span class="tag tag-green">已完成</span></td><td>张厨师</td><td><a class="link" onclick="openIngredientModal('宫保鸡丁')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><a class="link" onclick="openModelModal()"><span class="tag tag-green">92分</span></a></td><td>8.5</td><td>7.2</td><td>1：0.85</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="notifyPickup(this)">通知取餐</span></td></tr>
-          <tr><td>COOK-002</td><td><span class="tag tag-blue">点餐</span></td><td>CMB-002</td><td>番茄炒蛋</td><td>大份（500g）</td><td>80</td><td>80</td><td>2026-05-20</td><td>11:05</td><td>11:20</td><td><span class="tag tag-green">已完成</span></td><td>李厨师</td><td><a class="link" onclick="openIngredientModal('番茄炒蛋')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><a class="link" onclick="openModelModal()"><span class="tag tag-green">88分</span></a></td><td>12.0</td><td>10.4</td><td>1：0.87</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="notifyPickup(this)">通知取餐</span></td></tr>
-          <tr><td>COOK-003</td><td><span class="tag tag-gray">餐线</span></td><td>CMB-003</td><td>红烧肉</td><td>标准份（300g）</td><td>60</td><td>—</td><td>2026-05-20</td><td>11:10</td><td>—</td><td><span class="tag tag-blue">烹制中</span></td><td>王厨师</td><td><a class="link" onclick="openIngredientModal('红烧肉')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><span class="tag tag-blue">分析中</span></td><td>10.0</td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="finishCook(this)">烹制完成</span></td></tr>
-          <tr><td>COOK-004</td><td><span class="tag tag-gray">餐线</span></td><td>CMB-004</td><td>清蒸鱼</td><td>标准份（500g）</td><td>40</td><td>—</td><td>2026-05-20</td><td>11:15</td><td>—</td><td><span class="tag tag-blue">烹制中</span></td><td>张厨师</td><td><a class="link" onclick="openIngredientModal('清蒸鱼')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><span class="tag tag-blue">分析中</span></td><td>6.5</td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="finishCook(this)">烹制完成</span></td></tr>
-          <tr><td>COOK-005</td><td><span class="tag tag-gray">餐线</span></td><td>CMB-005</td><td>蒜蓉菠菜</td><td>标准份（300g）</td><td>100</td><td>—</td><td>2026-05-20</td><td>—</td><td>—</td><td><span class="tag tag-orange">待烹制</span></td><td>—</td><td><a class="link" onclick="openIngredientModal('蒜蓉菠菜')">食材明细</a></td><td>—</td><td>—</td><td>15.0</td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="startCook(this)">开始烹制</span></td></tr>
-          <tr><td>COOK-006</td><td><span class="tag tag-gray">餐线</span></td><td>CMB-005</td><td>炒时蔬</td><td>小份（200g）</td><td>20</td><td>20</td><td>2026-05-20</td><td>11:10</td><td>11:30</td><td><span class="tag tag-green">已完成</span></td><td>赵厨师</td><td><a class="link" onclick="openIngredientModal('炒时蔬')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><a class="link" onclick="openModelModal()"><span class="tag tag-green">95分</span></a></td><td>18.0</td><td>15.6</td><td>1：0.87</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="notifyPickup(this)">通知取餐</span></td></tr>
-          <tr><td>COOK-007</td><td><span class="tag tag-blue">点餐</span></td><td>CMB-006</td><td>豆腐</td><td>小份（200g）</td><td>35</td><td>35</td><td>2026-05-20</td><td>11:20</td><td>11:35</td><td><span class="tag tag-green">已完成</span></td><td>陈厨师</td><td><a class="link" onclick="openIngredientModal('豆腐')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><a class="link" onclick="openModelModal()"><span class="tag tag-green">78分</span></a></td><td>4.2</td><td>3.9</td><td>1：0.93</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="notifyPickup(this)">通知取餐</span></td></tr>
+          <tr data-order="CO-001"><td>COOK-001</td><td><span class="link" onclick="showCookOrderDetail('CO-001')">CO-001</span><span class="tag tag-green" style="margin-left:4px;">✓ 已烹齐</span></td><td><span class="tag tag-blue">点餐</span></td><td>CMB-001</td><td>宫保鸡丁</td><td>标准份（300g）</td><td>50</td><td>50</td><td>2026-05-20</td><td>11:00</td><td>11:20</td><td><span class="tag tag-green">已完成</span></td><td>张厨师</td><td><a class="link" onclick="openIngredientModal('宫保鸡丁')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><a class="link" onclick="openModelModal()"><span class="tag tag-green">92分</span></a></td><td>8.5</td><td>7.2</td><td>1：0.85</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="notifyPickup(this)">通知取餐</span></td></tr>
+          <tr data-order="CO-001" class="order-last"><td>COOK-002</td><td><span class="link" onclick="showCookOrderDetail('CO-001')">CO-001</span></td><td><span class="tag tag-blue">点餐</span></td><td>CMB-002</td><td>番茄炒蛋</td><td>大份（500g）</td><td>80</td><td>80</td><td>2026-05-20</td><td>11:05</td><td>11:20</td><td><span class="tag tag-green">已完成</span></td><td>李厨师</td><td><a class="link" onclick="openIngredientModal('番茄炒蛋')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><a class="link" onclick="openModelModal()"><span class="tag tag-green">88分</span></a></td><td>12.0</td><td>10.4</td><td>1：0.87</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="notifyPickup(this)">通知取餐</span></td></tr>
+          <tr data-order="CO-002"><td>COOK-003</td><td><span class="link" onclick="showCookOrderDetail('CO-002')">CO-002</span><span class="tag tag-orange" style="margin-left:4px;">烹制中 1/2</span></td><td><span class="tag tag-gray">餐线</span></td><td>CMB-003</td><td>红烧肉</td><td>标准份（300g）</td><td>60</td><td>—</td><td>2026-05-20</td><td>11:10</td><td>—</td><td><span class="tag tag-blue">烹制中</span></td><td>王厨师</td><td><a class="link" onclick="openIngredientModal('红烧肉')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><span class="tag tag-blue">分析中</span></td><td>10.0</td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="finishCook(this)">烹制完成</span></td></tr>
+          <tr data-order="CO-002" class="order-last"><td>COOK-004</td><td><span class="link" onclick="showCookOrderDetail('CO-002')">CO-002</span></td><td><span class="tag tag-gray">餐线</span></td><td>CMB-004</td><td>清蒸鱼</td><td>标准份（500g）</td><td>40</td><td>—</td><td>2026-05-20</td><td>11:15</td><td>—</td><td><span class="tag tag-blue">烹制中</span></td><td>张厨师</td><td><a class="link" onclick="openIngredientModal('清蒸鱼')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><span class="tag tag-blue">分析中</span></td><td>6.5</td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="finishCook(this)">烹制完成</span></td></tr>
+          <tr data-order="CO-003"><td>COOK-005</td><td><span class="link" onclick="showCookOrderDetail('CO-003')">CO-003</span><span class="tag tag-gray" style="margin-left:4px;">待烹制 0/2</span></td><td><span class="tag tag-gray">餐线</span></td><td>CMB-005</td><td>蒜蓉菠菜</td><td>标准份（300g）</td><td>100</td><td>—</td><td>2026-05-20</td><td>—</td><td>—</td><td><span class="tag tag-orange">待烹制</span></td><td>—</td><td><a class="link" onclick="openIngredientModal('蒜蓉菠菜')">食材明细</a></td><td>—</td><td>—</td><td>15.0</td><td>—</td><td>—</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="startCook(this)">开始烹制</span></td></tr>
+          <tr data-order="CO-003" class="order-last"><td>COOK-006</td><td><span class="link" onclick="showCookOrderDetail('CO-003')">CO-003</span></td><td><span class="tag tag-gray">餐线</span></td><td>CMB-005</td><td>炒时蔬</td><td>小份（200g）</td><td>20</td><td>20</td><td>2026-05-20</td><td>11:10</td><td>11:30</td><td><span class="tag tag-green">已完成</span></td><td>赵厨师</td><td><a class="link" onclick="openIngredientModal('炒时蔬')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><a class="link" onclick="openModelModal()"><span class="tag tag-green">95分</span></a></td><td>18.0</td><td>15.6</td><td>1：0.87</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="notifyPickup(this)">通知取餐</span></td></tr>
+          <tr data-order="CO-004"><td>COOK-007</td><td><span class="link" onclick="showCookOrderDetail('CO-004')">CO-004</span><span class="tag tag-green" style="margin-left:4px;">✓ 已烹齐</span></td><td><span class="tag tag-blue">点餐</span></td><td>CMB-006</td><td>豆腐</td><td>小份（200g）</td><td>35</td><td>35</td><td>2026-05-20</td><td>11:20</td><td>11:35</td><td><span class="tag tag-green">已完成</span></td><td>陈厨师</td><td><a class="link" onclick="openIngredientModal('豆腐')">食材明细</a></td><td><a class="link" onclick="openTempModal()">温度曲线</a></td><td><a class="link" onclick="openModelModal()"><span class="tag tag-green">78分</span></a></td><td>4.2</td><td>3.9</td><td>1：0.93</td><td class="td-actions"><a class="link">食材溯源链路</a> <a class="link">查看视频</a> <span class="action-more"><a class="action-more__trigger">更多 ▾</a><div class="action-more__menu"><a class="action-more__item" onclick="showDetail(this)">详情</a><a class="action-more__item" onclick="openEditModal(this)">编辑</a><a class="action-more__item action-more__item--danger">删除</a></div></span><span class="link" onclick="notifyPickup(this)">通知取餐</span></td></tr>
         </tbody>
       </table>
     </div>
@@ -409,8 +411,8 @@ function openIngredientModal(name){
   var rows=document.querySelectorAll('.table-card tbody tr');
   var qty=50;
   for(var i=0;i<rows.length;i++){
-    if(rows[i].querySelectorAll('td')[3]&&rows[i].querySelectorAll('td')[3].textContent.trim()===name){
-      qty=parseInt(rows[i].querySelectorAll('td')[5].textContent)||50;break;
+    if(rows[i].querySelectorAll('td')[4]&&rows[i].querySelectorAll('td')[4].textContent.trim()===name){
+      qty=parseInt(rows[i].querySelectorAll('td')[6].textContent)||50;break;
     }
   }
   var ings=recipeData[name]||[];
@@ -443,13 +445,13 @@ function openEditModal(el){
   _editRow=el.closest('tr');
   var tds=_editRow.querySelectorAll('td');
   var taskId=tds[0].textContent.trim();
-  var dishName=tds[3].textContent.trim();
-  var spec=tds[4].textContent.trim();
-  var qty=parseInt(tds[5].textContent)||0;
-  var cookDate=tds[7].textContent.trim();
-  var chef=tds[11].textContent.trim();
-  var rawWeight=tds[15].textContent.trim();
-  var cookedWeight=tds[16].textContent.trim();
+  var dishName=tds[4].textContent.trim();
+  var spec=tds[5].textContent.trim();
+  var qty=parseInt(tds[6].textContent)||0;
+  var cookDate=tds[8].textContent.trim();
+  var chef=tds[12].textContent.trim();
+  var rawWeight=tds[16].textContent.trim();
+  var cookedWeight=tds[17].textContent.trim();
 
   document.getElementById('editTitle').textContent='编辑烹制任务 — '+taskId;
   document.getElementById('editTaskId').value=taskId;
@@ -488,16 +490,16 @@ function submitEdit(){
   if(_editRow){
     var tds=_editRow.querySelectorAll('td');
     var chef=document.getElementById('editChef').value.trim();
-    if(chef)tds[11].textContent=chef;
+    if(chef)tds[12].textContent=chef;
     var rw=document.getElementById('editRawWeight').value.trim();
-    if(rw)tds[15].textContent=rw;
+    if(rw)tds[16].textContent=rw;
     var cw=document.getElementById('editCookedWeight').value.trim();
     if(cw){
-      tds[16].textContent=cw;
+      tds[17].textContent=cw;
       // 自动计算生熟比
-      var rwNum=parseFloat(tds[15].textContent);
+      var rwNum=parseFloat(tds[16].textContent);
       var cwNum=parseFloat(cw);
-      if(rwNum&&cwNum)tds[17].textContent='1：'+(cwNum/rwNum).toFixed(2);
+      if(rwNum&&cwNum)tds[18].textContent='1：'+(cwNum/rwNum).toFixed(2);
     }
     closeEditModal();
     showToast('✅ 烹制任务已更新');
@@ -541,38 +543,87 @@ function showToast(msg){
 }
 function _timeNow(){var d=new Date();return String(d.getHours()).padStart(2,'0')+':'+String(d.getMinutes()).padStart(2,'0');}
 
+/* 更新关联订单列的状态标记 */
+function updateOrderBadge(orderNo){
+  var rows=document.querySelectorAll('tr[data-order="'+orderNo+'"]');
+  var total=rows.length;
+  var done=0;
+  rows.forEach(function(r){
+    var statusTd=r.querySelectorAll('td')[11]; // 烹制状态列
+    if(statusTd&&statusTd.textContent.trim()==='已完成')done++;
+  });
+  var badgeHtml='';
+  if(done===total)badgeHtml='<span class="tag tag-green" style="margin-left:4px;">✓ 已烹齐</span>';
+  else if(done>0)badgeHtml='<span class="tag tag-orange" style="margin-left:4px;">烹制中 '+done+'/'+total+'</span>';
+  else badgeHtml='<span class="tag tag-gray" style="margin-left:4px;">待烹制 0/'+total+'</span>';
+  /* 更新该订单所有行的关联订单列标记 */
+  rows.forEach(function(r){
+    var orderTd=r.querySelectorAll('td')[1];
+    if(orderTd){
+      /* 保留订单号链接，追加/替换标记 */
+      var linkHtml='<span class="link" onclick="showCookOrderDetail(\''+orderNo+'\')">'+orderNo+'</span>';
+      orderTd.innerHTML=linkHtml+badgeHtml;
+    }
+  });
+}
+
 /* 开始烹制 */
 function startCook(el){
   var tr=el.closest('tr');
   var tds=tr.querySelectorAll('td');
   var taskId=tds[0].textContent;
-  tds[10].innerHTML='<span class="tag tag-blue">烹制中</span>';
-  tds[8].textContent=_timeNow();
+  var orderNo=tr.getAttribute('data-order');
+  tds[11].innerHTML='<span class="tag tag-blue">烹制中</span>';
+  tds[9].textContent=_timeNow();
   el.setAttribute('onclick','finishCook(this)');
   el.textContent='烹制完成';
+  if(orderNo)updateOrderBadge(orderNo);
   showToast('✅ '+taskId+' 已开始烹制');
 }
 
-/* 烹制完成 */
+/* 烹制完成 —— 核心改动：检查该订单下所有烹制任务是否全部完成 */
 function finishCook(el){
   var tr=el.closest('tr');
   var tds=tr.querySelectorAll('td');
   var taskId=tds[0].textContent;
-  tds[10].innerHTML='<span class="tag tag-green">已完成</span>';
-  tds[9].textContent=_timeNow();
+  var orderNo=tr.getAttribute('data-order');
+  var dishName=tds[4].textContent;
+  tds[11].innerHTML='<span class="tag tag-green">已完成</span>';
+  tds[10].textContent=_timeNow();
   el.setAttribute('onclick','notifyPickup(this)');
   el.textContent='通知取餐';
-  showToast('✅ '+taskId+' 烹制已完成');
+  if(orderNo)updateOrderBadge(orderNo);
+  /* 检查是否该订单全部烹制完成 */
+  if(orderNo){
+    var rows=document.querySelectorAll('tr[data-order="'+orderNo+'"]');
+    var allDone=true;
+    rows.forEach(function(r){
+      var st=r.querySelectorAll('td')[11];
+      if(st&&st.textContent.trim()!=='已完成')allDone=false;
+    });
+    if(allDone){
+      showToast('🎉 订单 '+orderNo+' 全部菜品烹制完成！可通知出餐');
+    }else{
+      showToast('✅ '+taskId+'（'+dishName+'）烹制完成，订单 '+orderNo+' 还有未完成的菜品');
+    }
+  }else{
+    showToast('✅ '+taskId+' 烹制已完成');
+  }
 }
 
 /* 通知取餐 */
 function notifyPickup(el){
   var tr=el.closest('tr');
   var taskId=tr.querySelectorAll('td')[0].textContent;
-  var dishName=tr.querySelectorAll('td')[3].textContent;
+  var dishName=tr.querySelectorAll('td')[4].textContent;
   showToast('✅ '+taskId+'（'+dishName+'）已通知取餐');
 }
 
+/* 点击关联订单号查看订单详情（跳转到净菜订单详情） */
+function showCookOrderDetail(orderNo){
+  showToast('📋 查看订单 '+orderNo+' 详情（含所有菜品烹制进度）');
+}
+
 /* 详情抽屉（含食材明细） */
 function showDetail(el){
   var tr=el.closest('tr');
@@ -585,8 +636,8 @@ function showDetail(el){
     fields+='<div class="drawer-field"><div class="drawer-field__label">'+label+'</div><div class="drawer-field__value">'+value+'</div></div>';
   }
   var taskId=tds[0].textContent.trim();
-  var dishName=tds[3].textContent.trim();
-  var qty=parseInt(tds[5].textContent)||0;
+  var dishName=tds[4].textContent.trim();
+  var qty=parseInt(tds[6].textContent)||0;
 
   var bodyHtml='<div class="drawer-section"><div class="drawer-section__title">基本信息</div><div class="drawer-fields">'+fields+'</div></div>';
 
diff --git a/web-admin/nutrition/sup-clean-external.html b/web-admin/nutrition/sup-clean-external.html
index c97bbf9..17ae6c6 100644
--- a/web-admin/nutrition/sup-clean-external.html
+++ b/web-admin/nutrition/sup-clean-external.html
@@ -51,37 +51,46 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .btn{height:36px;padding:0 16px;border-radius:var(--radius-sm);font-size:var(--font-sm);cursor:pointer;border:none;transition:all .2s;display:inline-flex;align-items:center;gap:6px;}
 .btn-primary{background:var(--primary);color:#fff;}.btn-primary:hover{background:#40a9ff;}
 .btn-default{background:#fff;color:var(--text-primary);border:1px solid var(--border);}.btn-default:hover{color:var(--primary);border-color:var(--primary);}
+.btn-sm{height:28px;padding:0 10px;font-size:var(--font-xs);}
+.btn-danger-text{background:none;color:var(--danger);cursor:pointer;border:none;font-size:var(--font-xs);padding:0;}.btn-danger-text:hover{color:#ff7875;}
 .table-card{background:#fff;border-radius:var(--radius-md);box-shadow:var(--shadow-sm);overflow:hidden;}
 .table-card__header{display:flex;align-items:center;justify-content:space-between;padding:16px 24px;border-bottom:1px solid var(--border);}
 .table-card__title{font-size:var(--font-base);font-weight:600;}
-.table-card__actions{display:flex;gap:8px;align-items:center;}
 .table-card__content{overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch;}
 .table-card__content table{min-width:100%;white-space:nowrap;}
 table{width:100%;border-collapse:collapse;}
 thead th{background:#FAFAFA;padding:12px 16px;text-align:left;font-size:var(--font-sm);color:var(--text-secondary);font-weight:500;border-bottom:1px solid var(--border);white-space:nowrap;}
 tbody td{padding:14px 16px;font-size:var(--font-sm);color:var(--text-primary);border-bottom:1px solid var(--border);white-space:nowrap;}
-tbody tr:last-child td{border-bottom:none;}
-tbody tr:hover{background:#F8FBFF;}
+tr.master-row{cursor:pointer;}
+tr.master-row:hover{background:#F8FBFF;}
+tr.master-row.expanded{background:#F0F7FF;}
+tr.detail-row{background:#FAFBFC;}
+tr.detail-row td{padding:10px 16px;font-size:var(--font-xs);color:var(--text-secondary);border-bottom:1px dashed #f0f0f0;}
+tr.detail-row td:first-child{padding-left:44px;}
+.expand-arrow{display:inline-block;width:20px;text-align:center;transition:transform .2s;font-size:var(--font-xs);color:var(--text-placeholder);}
+.expand-arrow.expanded{transform:rotate(90deg);}
 .tag{display:inline-flex;align-items:center;padding:2px 8px;border-radius:10px;font-size:var(--font-xs);}
 .tag-blue{background:var(--primary-light);color:var(--primary);}
 .tag-green{background:#F6FFED;color:var(--success);}
 .tag-orange{background:#FFF7E6;color:var(--warning);}
 .tag-red{background:#FFF1F0;color:var(--danger);}
 .tag-gray{background:#F5F5F5;color:#999;}
+.tag-purple{background:#F9F0FF;color:#722ED1;}
+.detail-header td{font-size:var(--font-xs);color:var(--text-placeholder);background:#f5f7fa;padding:6px 16px;font-weight:500;}
 .link{color:var(--primary);cursor:pointer;font-size:var(--font-sm);}.link:hover{color:#40a9ff;}
 .pagination{display:flex;align-items:center;justify-content:flex-end;padding:16px 24px;gap:8px;border-top:1px solid var(--border);}
 .pagination span{font-size:var(--font-sm);color:var(--text-secondary);}
 .page-btn{width:32px;height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);background:#fff;cursor:pointer;font-size:var(--font-sm);display:inline-flex;align-items:center;justify-content:center;transition:all .2s;}
 .page-btn:hover,.page-btn.active{background:var(--primary);color:#fff;border-color:var(--primary);}
 .action-bar{display:flex;align-items:center;gap:8px;margin-bottom:16px;}
-/* 操作列固定右侧 */
 thead th:last-child,tbody td.td-actions{position:sticky;right:0;background:#fff;box-shadow:-4px 0 8px rgba(0,0,0,0.04);z-index:2;white-space:nowrap;}
 thead th:last-child{background:#FAFAFA;}
-tbody tr:hover td.td-actions{background:#F8FBFF;}
-/* 弹窗 */
+tr.master-row:hover td.td-actions{background:#F8FBFF;}
+tr.master-row.expanded td.td-actions{background:#F0F7FF;}
+tr.detail-row td.td-actions{background:#FAFBFC;box-shadow:-4px 0 8px rgba(0,0,0,0.02);}
 .modal-mask{display:none;position:fixed;inset:0;background:rgba(0,0,0,0.45);z-index:1000;align-items:center;justify-content:center;}
 .modal-mask.show{display:flex;}
-.modal{background:#fff;border-radius:var(--radius-lg);width:720px;max-height:90vh;display:flex;flex-direction:column;box-shadow:0 8px 24px rgba(0,0,0,0.15);}
+.modal{background:#fff;border-radius:var(--radius-lg);width:780px;max-height:90vh;display:flex;flex-direction:column;box-shadow:0 8px 24px rgba(0,0,0,0.15);}
 .modal__header{display:flex;align-items:center;justify-content:space-between;padding:20px 24px;border-bottom:1px solid var(--border);}
 .modal__title{font-size:var(--font-lg);font-weight:600;}
 .modal__close{width:32px;height:32px;border:none;background:none;font-size:20px;cursor:pointer;color:var(--text-secondary);border-radius:var(--radius-sm);display:flex;align-items:center;justify-content:center;}
@@ -97,17 +106,18 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .form-control:focus{border-color:var(--primary);box-shadow:0 0 0 2px rgba(24,144,255,0.1);}
 select.form-control{appearance:none;background:#fff url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6'%3E%3Cpath d='M0 0l5 6 5-6z' fill='%23999'/%3E%3C/svg%3E") no-repeat right 10px center;padding-right:28px;cursor:pointer;}
 textarea.form-control{height:auto;padding:8px 12px;resize:vertical;min-height:60px;}
-/* 分隔线 */
 .form-divider{grid-column:1/-1;border:none;border-top:1px solid var(--border);margin:4px 0;}
-/* 只读字段 */
 .form-control[readonly]{background:#F5F5F5;color:var(--text-secondary);cursor:default;}
 .form-control:disabled{background:#f8fafc;color:var(--text-placeholder);cursor:not-allowed;}
+.order-summary-table{width:100%;border-collapse:collapse;margin-top:12px;font-size:var(--font-sm);}
+.order-summary-table th{background:#fafafa;padding:8px 10px;text-align:left;font-weight:500;color:var(--text-secondary);border:1px solid var(--border);}
+.order-summary-table td{padding:6px 10px;border:1px solid var(--border);color:var(--text-primary);}
 /* 右侧抽屉 */
 .drawer-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.45);z-index:1000;animation:modalFadeIn .2s ease;}
 .drawer-overlay.closing{animation:modalFadeOut .2s ease forwards;}
 @keyframes modalFadeIn{from{opacity:0}to{opacity:1}}
 @keyframes modalFadeOut{from{opacity:1}to{opacity:0}}
-.drawer{position:fixed;top:0;right:0;bottom:0;width:520px;max-width:90vw;background:#fff;box-shadow:-6px 0 24px rgba(0,0,0,.12);display:flex;flex-direction:column;z-index:1001;animation:drawerSlideIn .25s ease;}
+.drawer{position:fixed;top:0;right:0;bottom:0;width:560px;max-width:90vw;background:#fff;box-shadow:-6px 0 24px rgba(0,0,0,.12);display:flex;flex-direction:column;z-index:1001;animation:drawerSlideIn .25s ease;}
 .drawer-overlay.closing .drawer{animation:drawerSlideOut .2s ease forwards;}
 @keyframes drawerSlideIn{from{transform:translateX(100%)}to{transform:translateX(0)}}
 @keyframes drawerSlideOut{from{transform:translateX(0)}to{transform:translateX(100%)}}
@@ -123,36 +133,28 @@ textarea.form-control{height:auto;padding:8px 12px;resize:vertical;min-height:60
 .drawer-field{display:flex;flex-direction:column;gap:2px;}
 .drawer-field__label{font-size:var(--font-xs);color:var(--text-placeholder);}
 .drawer-field__value{font-size:var(--font-sm);color:var(--text-primary);font-weight:500;min-height:22px;}
-/* 食材明细表格（抽屉内） */
-.ing-detail-table{width:100%;border-collapse:collapse;margin-top:8px;}
-.ing-detail-table th{background:#FAFAFA;padding:8px 12px;text-align:left;font-size:var(--font-xs);color:var(--text-secondary);font-weight:500;border:1px solid var(--border);}
-.ing-detail-table td{padding:6px 12px;font-size:var(--font-sm);color:var(--text-primary);border:1px solid var(--border);}
+.ing-table{width:100%;border-collapse:collapse;margin-top:8px;}
+.ing-table th{background:#FAFAFA;padding:6px 10px;font-size:var(--font-xs);color:var(--text-secondary);font-weight:500;border:1px solid var(--border);}
+.ing-table td{padding:6px 10px;font-size:var(--font-sm);color:var(--text-primary);border:1px solid var(--border);}
+/* 行内明细表格 */
+.line-builder-table{width:100%;border-collapse:collapse;margin-bottom:12px;font-size:var(--font-sm);}
+.line-builder-table th{background:#fafafa;padding:8px 10px;text-align:left;font-weight:500;color:var(--text-secondary);border:1px solid var(--border);white-space:nowrap;}
+.line-builder-table td{padding:6px 8px;border:1px solid var(--border);vertical-align:middle;}
+.line-builder-table td select,.line-builder-table td input{width:100%;height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 8px;font-size:var(--font-sm);outline:none;box-sizing:border-box;}
+.line-builder-table td select:focus,.line-builder-table td input:focus{border-color:var(--primary);}
+.line-builder-table td input[readonly]{background:#f8fafc;cursor:not-allowed;}
+.line-builder-table .btn-remove{background:none;color:var(--danger);border:none;cursor:pointer;font-size:var(--font-xs);padding:4px 8px;white-space:nowrap;}
+.line-builder-table .btn-remove:hover{color:#ff7875;}
 </style>
 </head>
 <body>
-<!-- 顶部导航栏 -->
 <header class="top-bar">
-  <div class="top-bar__logo">
-    <svg viewBox="0 0 28 28" fill="none"><rect width="28" height="28" rx="6" fill="#1890FF"/><path d="M7 14h14M14 7v14" stroke="#fff" stroke-width="2.5" stroke-linecap="round"/></svg>
-    营养管理
-  </div>
+  <div class="top-bar__logo"><svg viewBox="0 0 28 28" fill="none"><rect width="28" height="28" rx="6" fill="#1890FF"/><path d="M7 14h14M14 7v14" stroke="#fff" stroke-width="2.5" stroke-linecap="round"/></svg>营养管理</div>
   <nav class="top-bar__nav">
-    <a href="trace-query.html">溯源总览</a>
-    <a href="arc-employee.html">档案</a>
-    <a href="farm-land.html">绿色种采</a>
-    <a href="sup-hygiene-check.html" class="active">卫生供应</a>
-    <a href="prod-qc-daily.html">健康生产</a>
-    <a href="din-dict-mgmt.html">营养用餐</a>
-    <a href="ano-dirty.html">异常事件</a>
+    <a href="trace-query.html">溯源总览</a><a href="arc-employee.html">档案</a><a href="farm-land.html">绿色种采</a><a href="sup-hygiene-check.html" class="active">卫生供应</a><a href="prod-qc-daily.html">健康生产</a><a href="din-dict-mgmt.html">营养用餐</a><a href="ano-dirty.html">异常事件</a>
   </nav>
-  <div class="top-bar__right">
-    <a href="../../index.html" class="btn-back">← 返回首页</a>
-    <div class="avatar">管</div>
-    <span>系统管理员 ▾</span>
-  </div>
+  <div class="top-bar__right"><a href="../../index.html" class="btn-back">← 返回首页</a><div class="avatar">管</div><span>系统管理员 ▾</span></div>
 </header>
-
-<!-- 侧边栏：卫生供应 -->
 <aside class="sidebar">
   <div class="sidebar-menu__title">卫生供应</div>
   <a href="sup-hygiene-check.html" class="sidebar-item"><span class="mi">🔬</span>卫生检测</a>
@@ -164,73 +166,39 @@ textarea.form-control{height:auto;padding:8px 12px;resize:vertical;min-height:60
   <a href="sup-clean-internal.html" class="sidebar-item"><span class="mi">🏠</span>净菜内供</a>
   <a href="sup-clean-external.html" class="sidebar-item active"><span class="mi">🚛</span>净菜外售</a>
 </aside>
-
-<!-- 主内容区 -->
 <div class="main">
-  <!-- 统计卡片 -->
   <div class="stats-row">
-    <div class="stat-card">
-      <div class="stat-card__icon blue">🚛</div>
-      <div class="stat-card__info"><div class="stat-card__value">8</div><div class="stat-card__label">今日外售订单</div></div>
-    </div>
-    <div class="stat-card">
-      <div class="stat-card__icon green">💰</div>
-      <div class="stat-card__info"><div class="stat-card__value">¥4,280</div><div class="stat-card__label">今日外售金额</div></div>
-    </div>
-    <div class="stat-card">
-      <div class="stat-card__icon orange">⏳</div>
-      <div class="stat-card__info"><div class="stat-card__value">3</div><div class="stat-card__label">待发货</div></div>
-    </div>
-    <div class="stat-card">
-      <div class="stat-card__icon green">✅</div>
-      <div class="stat-card__info"><div class="stat-card__value">5</div><div class="stat-card__label">已完成</div></div>
-    </div>
+    <div class="stat-card"><div class="stat-card__icon blue">🚛</div><div class="stat-card__info"><div class="stat-card__value">6</div><div class="stat-card__label">今日外售订单</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon green">💰</div><div class="stat-card__info"><div class="stat-card__value">¥6,580</div><div class="stat-card__label">今日外售金额</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon orange">⏳</div><div class="stat-card__info"><div class="stat-card__value">2</div><div class="stat-card__label">待发货</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon green">✅</div><div class="stat-card__info"><div class="stat-card__value">4</div><div class="stat-card__label">已完成</div></div></div>
   </div>
-
-  <!-- 筛选栏 -->
   <div class="filter-bar">
-    <div class="filter-item"><label>订单号/净菜名称</label><input class="filter-input" placeholder="请输入订单号或净菜名称"></div>
+    <div class="filter-item"><label>订单号/菜品名称</label><input class="filter-input" placeholder="请输入订单号或菜品名称"></div>
     <div class="filter-item"><label>客户名称</label><input class="filter-input" placeholder="请输入客户名称"></div>
-    <div class="filter-item"><label>净菜类型</label>
-      <select class="filter-select"><option>全部</option><option>净菜包</option><option>餐品净菜包</option></select>
-    </div>
-    <div class="filter-item"><label>订单状态</label>
-      <select class="filter-select"><option>全部</option><option>备货中</option><option>待配送</option><option>配送中</option><option>已完成</option></select>
-    </div>
+    <div class="filter-item"><label>净菜类型</label><select class="filter-select"><option>全部</option><option>净菜包</option><option>餐品净菜包</option></select></div>
+    <div class="filter-item"><label>订单状态</label><select class="filter-select"><option>全部</option><option>备货中</option><option>待配送</option><option>配送中</option><option>部分完成</option><option>已完成</option></select></div>
     <div class="filter-item"><label>日期范围</label><input class="filter-input" type="date"></div>
-    <button class="btn btn-primary">查询</button>
-    <button class="btn btn-default">重置</button>
+    <button class="btn btn-primary">查询</button><button class="btn btn-default">重置</button>
   </div>
-
-  <!-- 数据表格 -->
-    <div class="action-bar"><button class="btn btn-primary" onclick="openCreateOrder()">➕ 新建订单</button> <button class="btn btn-primary"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M2 10v2h10v-2M7 2v7M4.5 6.5L7 9l2.5-2.5" stroke="#fff" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/></svg>导出列表数据</button> <button class="btn btn-default"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><rect x="2" y="2" width="10" height="10" rx="1.5" stroke="currentColor" stroke-width="1.4"/><path d="M4 5h6M4 7.5h4" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/></svg>查看导出任务</button></div>
-    <div class="table-card">
-    <div class="table-card__header">
-      <div class="table-card__title">净菜外售</div>
-</div>
+  <div class="action-bar">
+    <button class="btn btn-primary" onclick="openModal('createOrderModal')">➕ 新建订单</button>
+    <button class="btn btn-primary"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M2 10v2h10v-2M7 2v7M4.5 6.5L7 9l2.5-2.5" stroke="#fff" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/></svg>导出列表数据</button>
+    <button class="btn btn-default"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><rect x="2" y="2" width="10" height="10" rx="1.5" stroke="currentColor" stroke-width="1.4"/><path d="M4 5h6M4 7.5h4" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/></svg>查看导出任务</button>
+  </div>
+  <div class="table-card">
+    <div class="table-card__header"><div class="table-card__title">净菜外售</div></div>
     <div class="table-card__content">
-      <table>
+      <table id="extOrderTable">
         <thead><tr>
-          <th>订单号</th><th>客户名称</th><th>净菜类型</th><th>净菜/餐品</th><th>包装规格</th><th>售卖份数</th><th>计量(kg)</th><th>单价(元/kg)</th><th>小计金额</th><th>下单时间</th><th>预定配送时间</th><th>物流单号</th><th>订单状态</th><th>操作</th>
+          <th style="width:36px;"></th><th>订单号</th><th>客户名称</th><th>净菜类型</th><th>菜品种类</th><th>总份数</th><th>总计量(kg)</th><th>下单时间</th><th>预定配送</th><th>物流单号</th><th>订单状态</th><th>操作</th>
         </tr></thead>
-        <tbody>
-          <tr><td>EXT-001</td><td>社区便民超市</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>土豆-土豆丝</td><td>5kg/箱</td><td>10</td><td>50</td><td>¥3.5</td><td>¥175</td><td>2026-04-22 08:00</td><td>2026-04-22 16:00</td><td>SF1234567890</td><td><span class="tag tag-green">已完成</span></td><td class="td-actions"><span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>EXT-001</td><td>社区便民超市</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>土豆-土豆块</td><td>5kg/箱</td><td>6</td><td>30</td><td>¥3.5</td><td>¥105</td><td>2026-04-22 08:00</td><td>2026-04-22 16:00</td><td>SF1234567890</td><td><span class="tag tag-green">已完成</span></td><td class="td-actions"><span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>EXT-002</td><td>周边餐饮企业</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>净猪里脊-里脊条</td><td>1kg/箱</td><td>5</td><td>50</td><td>¥28</td><td>¥1,400</td><td>2026-04-22 09:30</td><td>2026-04-22 14:00</td><td>SF9876543210</td><td><span class="tag tag-blue">配送中</span></td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="openReceiveConfirm(this)">确认收货</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>EXT-003</td><td>周边餐饮企业</td><td><span class="tag tag-orange">🍱 餐品净菜包</span></td><td>宫保鸡丁</td><td>标准份（500g）</td><td>40</td><td>20</td><td>¥12</td><td>¥240</td><td>2026-04-22 09:30</td><td>2026-04-22 14:00</td><td>SF9876543210</td><td><span class="tag tag-blue">配送中</span></td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="openReceiveConfirm(this)">确认收货</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>EXT-004</td><td>学校食堂</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>鸡肉-鸡肉块</td><td>1kg/箱</td><td>6</td><td>60</td><td>¥2.0</td><td>¥120</td><td>2026-04-22 10:00</td><td>2026-04-23 09:00</td><td>—</td><td><span class="tag tag-orange">待配送</span></td><td class="td-actions"><span class="link" style="color:var(--primary)" onclick="openShipModal('EXT-004')">立即发货</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>EXT-004</td><td>学校食堂</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>西兰花-西兰花朵</td><td>5kg/箱</td><td>8</td><td>40</td><td>¥4.5</td><td>¥180</td><td>2026-04-22 10:00</td><td>2026-04-23 09:00</td><td>—</td><td><span class="tag tag-orange">待配送</span></td><td class="td-actions"><span class="link" style="color:var(--primary)" onclick="openShipModal('EXT-004')">立即发货</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>EXT-005</td><td>职工家属区团购</td><td><span class="tag tag-orange">🍱 餐品净菜包</span></td><td>清蒸鱼</td><td>标准份（600g）</td><td>20</td><td>12</td><td>¥15</td><td>¥180</td><td>2026-04-22 10:30</td><td>2026-04-23 16:00</td><td>—</td><td><span class="tag tag-gray">备货中</span></td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="openReadyConfirm(this)">备货完成</span>  <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>EXT-006</td><td>职工家属区团购</td><td><span class="tag tag-orange">🍱 餐品净菜包</span></td><td>蒜蓉菠菜</td><td>标准份（400g）</td><td>30</td><td>12</td><td>¥8</td><td>¥96</td><td>2026-04-22 10:30</td><td>2026-04-23 16:00</td><td>—</td><td><span class="tag tag-gray">备货中</span></td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="openReadyConfirm(this)">备货完成</span>  <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-        </tbody>
+        <tbody id="extOrderTableBody"></tbody>
       </table>
     </div>
     <div class="pagination">
-      <span>显示 8 条，共 12 条</span>
-      <button class="page-btn">‹</button>
-      <button class="page-btn active">1</button>
-      <button class="page-btn">2</button>
-      <button class="page-btn">›</button>
+      <span>显示 6 条，共 6 条</span>
+      <button class="page-btn">‹</button><button class="page-btn active">1</button><button class="page-btn">›</button>
     </div>
   </div>
 </div>
@@ -238,126 +206,39 @@ textarea.form-control{height:auto;padding:8px 12px;resize:vertical;min-height:60
 <!-- 新建订单弹窗 -->
 <div class="modal-mask" id="createOrderModal">
   <div class="modal">
-    <div class="modal__header">
-      <span class="modal__title">新建外售订单</span>
-      <button class="modal__close" onclick="closeCreateOrder()">&times;</button>
-    </div>
+    <div class="modal__header"><span class="modal__title">新建外售订单</span><button class="modal__close" onclick="closeModal('createOrderModal')">&times;</button></div>
     <div class="modal__body">
+      <!-- 客户信息 -->
       <div class="form-grid">
-        <div class="form-group">
-          <label class="form-label">净菜类型<span class="required">*</span></label>
-          <select class="form-control" id="orderType" onchange="toggleCreateOrderFields()">
-            <option value="">请选择</option>
-            <option value="nc">净菜包</option>
-            <option value="cp">餐品净菜包</option>
-          </select>
+        <div class="form-group"><label class="form-label">客户名称<span class="required">*</span></label><input class="form-control" id="extCustomer" placeholder="请输入客户名称"></div>
+        <div class="form-group"><label class="form-label">联系人</label><input class="form-control" id="extContact" placeholder="请输入联系人"></div>
+        <div class="form-group"><label class="form-label">联系电话</label><input class="form-control" id="extPhone" placeholder="请输入联系电话"></div>
+        <div class="form-group"><label class="form-label">净菜类型<span class="required">*</span></label>
+          <select class="form-control" id="extOrderNcType" onchange="updExtOrderType(this.value)"><option value="nc">🥬 净菜包</option><option value="cp">🍱 餐品净菜包</option></select></div>
+        <div class="form-group"><label class="form-label">预定配送时间<span class="required">*</span></label><input class="form-control" type="datetime-local" id="extDeliverTime"></div>
+        <div class="form-group full"><label class="form-label">收货地址</label><input class="form-control" id="extAddress" placeholder="请输入收货地址"></div>
+        <div class="form-group full"><label class="form-label">备注</label><textarea class="form-control" rows="2" id="extRemark" placeholder="请输入订单备注"></textarea></div>
+      </div>
+      <hr class="form-divider">
+      <!-- 订单明细 -->
+      <div style="margin-top:8px;">
+        <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:12px;">
+          <span style="font-size:var(--font-sm);font-weight:600;">订单明细</span>
+          <button class="btn btn-primary btn-sm" onclick="addExtLine()">+ 添加菜品</button>
         </div>
-        <div class="form-group" id="createIngredientWrap" style="display:none;">
-          <label class="form-label">食材<span class="required">*</span></label>
-          <select class="form-control" id="createIngredient" onchange="updateCreateNcTypes()">
-            <option value="">请选择食材</option>
-            <option value="土豆">土豆</option>
-            <option value="鸡肉">鸡肉</option>
-            <option value="净猪里脊">净猪里脊</option>
-            <option value="西兰花">西兰花</option>
-            <option value="胡萝卜">胡萝卜</option>
-          </select>
-        </div>
-        <div class="form-group" id="createNcTypeWrap" style="display:none;">
-          <label class="form-label">净菜类型<span class="required">*</span></label>
-          <select class="form-control" id="createNcType" disabled onchange="syncCreateOrderMeasure()"><option value="">请先选择食材</option></select>
-        </div>
-        <div class="form-group" id="createDishWrap" style="display:none;">
-          <label class="form-label">餐品名称<span class="required">*</span></label>
-          <select class="form-control" id="createDish" onchange="updateCreateCpSpecs()">
-            <option value="">请选择餐品</option>
-            <option value="宫保鸡丁">宫保鸡丁</option>
-            <option value="清蒸鱼">清蒸鱼</option>
-            <option value="蒜蓉菠菜">蒜蓉菠菜</option>
-            <option value="炒胡萝卜">炒胡萝卜</option>
-          </select>
-        </div>
-        <div class="form-group">
-          <label class="form-label">包装批次号</label>
-          <select class="form-control" id="orderBatchSelect" onchange="onOrderBatchChange(this.value)">
-            <option value="">请选择批次号（选填）</option>
-            <option>BATCH-DH-20260415-01</option>
-            <option>BATCH-DH-20260415-02</option>
-            <option>BATCH-DH-20260415-03</option>
-            <option>BATCH-DH-20260415-04</option>
-          </select>
-        </div>
-        <div class="form-group full" id="orderBatchInfoPanel" style="display:none;">
-          <label class="form-label">批次包装信息</label>
-          <div style="background:#FAFAFA;border:1px solid var(--border);border-radius:var(--radius-sm);padding:12px 16px;">
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:8px 24px;font-size:var(--font-sm);">
-              <div><span style="color:var(--text-secondary);">包装餐品：</span><span id="obDish" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装规格：</span><span id="obSpec" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装方式：</span><span id="obMethod" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装份数：</span><span id="obQty" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装日期：</span><span id="obDate" style="font-weight:500;"></span></div>
-            </div>
-          </div>
-        </div>
-        <div class="form-group" id="createNcSpecWrap" style="display:none;">
-          <label class="form-label">包装规格</label>
-          <input class="form-control" id="createNcSpec" inputmode="numeric" placeholder="请输入纯整数克数" oninput="sanitizeIntegerInput(this);syncCreateOrderMeasure()">
-        </div>
-        <div class="form-group" id="createCpSpecWrap" style="display:none;">
-          <label class="form-label">包装规格</label>
-          <select class="form-control" id="createCpSpec" onchange="syncCreateOrderMeasure()"><option value="">请选择包装规格</option></select>
-        </div>
-        <div class="form-group">
-          <label class="form-label">售卖份数<span class="required">*</span></label>
-          <input class="form-control" id="orderQty" inputmode="numeric" placeholder="请输入纯整数份数" oninput="sanitizeIntegerInput(this);syncCreateOrderMeasure()">
-        </div>
-        <div class="form-group">
-          <label class="form-label">计量(kg)</label>
-          <input class="form-control" id="orderWeight" readonly placeholder="自动计算">
-        </div>
-        <div class="form-group">
-          <label class="form-label">单价(元/kg)<span class="required">*</span></label>
-          <input class="form-control" id="orderPrice" type="number" min="0" step="0.1" placeholder="请输入单价" oninput="syncCreateOrderMeasure()">
-        </div>
-        <div class="form-group">
-          <label class="form-label">小计金额</label>
-          <input class="form-control" id="orderSubtotal" readonly placeholder="自动计算">
-        </div>
-
-        <hr class="form-divider">
-
-        <div class="form-group">
-          <label class="form-label">客户名称<span class="required">*</span></label>
-          <input class="form-control" id="orderCustomer" placeholder="请输入客户名称">
-        </div>
-        <div class="form-group">
-          <label class="form-label">联系人</label>
-          <input class="form-control" placeholder="请输入联系人姓名">
-        </div>
-        <div class="form-group">
-          <label class="form-label">联系电话</label>
-          <input class="form-control" placeholder="请输入联系电话">
-        </div>
-        <div class="form-group full">
-          <label class="form-label">收货地址</label>
-          <input class="form-control" placeholder="请输入收货地址">
-        </div>
-        <div class="form-group">
-          <label class="form-label">预定配送时间<span class="required">*</span></label>
-          <input class="form-control" type="datetime-local" id="orderDeliveryTime">
-        </div>
-
-        <hr class="form-divider">
-
-        <div class="form-group full">
-          <label class="form-label">备注</label>
-          <textarea class="form-control" rows="2" placeholder="请输入订单备注（选填）"></textarea>
+        <div id="extLinesContainer"></div>
+        <div id="extSummary" style="display:none;">
+          <div style="font-size:var(--font-sm);font-weight:600;margin:12px 0 8px;">汇总预览</div>
+          <table class="order-summary-table">
+            <thead id="extSummaryHead"><tr><th>净菜类型</th><th>菜品/食材</th><th>包装规格</th><th>份数</th><th>计量(kg)</th></tr></thead>
+            <tbody id="extSummaryBody"></tbody>
+          </table>
         </div>
       </div>
     </div>
     <div class="modal__footer">
-      <button class="btn btn-default" onclick="closeCreateOrder()">取消</button>
-      <button class="btn btn-primary" onclick="submitOrder()">确认提交</button>
+      <button class="btn btn-default" onclick="closeModal('createOrderModal')">取消</button>
+      <button class="btn btn-primary" onclick="submitExtOrder()">确认提交</button>
     </div>
   </div>
 </div>
@@ -365,416 +246,302 @@ textarea.form-control{height:auto;padding:8px 12px;resize:vertical;min-height:60
 <!-- 发货确认弹窗 -->
 <div class="modal-mask" id="shipModal">
   <div class="modal" style="width:480px;">
-    <div class="modal__header">
-      <span class="modal__title">确认发货</span>
-      <button class="modal__close" onclick="closeShipModal()">&times;</button>
-    </div>
+    <div class="modal__header"><span class="modal__title">确认发货</span><button class="modal__close" onclick="closeModal('shipModal')">&times;</button></div>
     <div class="modal__body">
-      <p style="font-size:var(--font-sm);color:var(--text-secondary);margin-bottom:16px;">请填写物流信息后确认发货，发货后订单状态将变为「配送中」。</p>
+      <p style="font-size:var(--font-sm);color:var(--text-secondary);margin-bottom:12px;" id="shipInfo"></p>
       <div class="form-grid" style="grid-template-columns:1fr;">
-        <div class="form-group">
-          <label class="form-label">订单号</label>
-          <input class="form-control" id="shipOrderNo" readonly>
-        </div>
-        <div class="form-group">
-          <label class="form-label">物流公司<span class="required">*</span></label>
-          <select class="form-control" id="shipCompany">
-            <option value="">请选择物流公司</option>
-            <option>顺丰速运</option>
-            <option>京东物流</option>
-            <option>德邦快递</option>
-            <option>自有车队配送</option>
-          </select>
-        </div>
-        <div class="form-group">
-          <label class="form-label">物流单号<span class="required">*</span></label>
-          <input class="form-control" id="shipTrackNo" placeholder="请输入物流单号">
-        </div>
+        <div class="form-group"><label class="form-label">物流公司<span class="required">*</span></label>
+          <select class="form-control" id="shipCompany"><option value="">请选择</option><option>顺丰速运</option><option>京东物流</option><option>德邦快递</option><option>自有车队配送</option></select></div>
+        <div class="form-group"><label class="form-label">物流单号<span class="required">*</span></label><input class="form-control" id="shipTrackNo" placeholder="请输入物流单号"></div>
       </div>
     </div>
     <div class="modal__footer">
-      <button class="btn btn-default" onclick="closeShipModal()">取消</button>
+      <button class="btn btn-default" onclick="closeModal('shipModal')">取消</button>
       <button class="btn btn-primary" onclick="confirmShip()">确认发货</button>
     </div>
   </div>
 </div>
 
-<!-- 确认收货二次确认弹窗 -->
-<div class="modal-mask" id="receiveModal">
-  <div class="modal" style="width:420px;">
-    <div class="modal__header">
-      <div class="modal__title">确认收货</div>
-      <button class="modal__close" onclick="closeReceiveConfirm()">&times;</button>
-    </div>
-    <div class="modal__body" style="text-align:center;padding:32px 24px;">
-      <div style="font-size:40px;margin-bottom:12px;">✅</div>
-      <p style="font-size:15px;color:#333;font-weight:600;margin-bottom:8px;">确认对订单 <span id="receiveOrderNo"></span> 进行收货？</p>
-      <p style="font-size:13px;color:#999;line-height:1.6;">净菜/餐品：<span id="receiveFoodName" style="color:#333;font-weight:500;"></span><br>确认后订单状态将变为「已完成」</p>
-    </div>
-    <div class="modal__footer" style="justify-content:center;">
-      <button class="btn btn-default" onclick="closeReceiveConfirm()">取消</button>
-      <button class="btn btn-primary" style="background:var(--success);" onclick="doReceive()">确认收货</button>
-    </div>
-  </div>
-</div>
-
-<!-- 备货完成弹窗（补全备货信息） -->
+<!-- 备货完成弹窗 -->
 <div class="modal-mask" id="readyModal">
   <div class="modal" style="width:520px;">
-    <div class="modal__header">
-      <div class="modal__title">补全备货信息</div>
-      <button class="modal__close" onclick="closeReadyConfirm()">&times;</button>
-    </div>
+    <div class="modal__header"><div class="modal__title">补全备货信息</div><button class="modal__close" onclick="closeModal('readyModal')">&times;</button></div>
     <div class="modal__body">
-      <div style="background:var(--primary-light);border-radius:var(--radius-md);padding:12px 16px;margin-bottom:20px;font-size:var(--font-sm);color:var(--primary);display:flex;align-items:center;gap:8px;">
-        <span style="font-size:16px;">📋</span>
-        <span>订单号：<strong id="readyOrderNo"></strong> ｜ 净菜/餐品：<strong id="readyFoodName"></strong></span>
+      <div style="background:var(--primary-light);border-radius:var(--radius-md);padding:12px 16px;margin-bottom:20px;font-size:var(--font-sm);color:var(--primary);">
+        <span>订单号：<strong id="readyOrderNoExt"></strong> ｜ 菜品：<strong id="readyFoodNameExt"></strong></span>
       </div>
       <div class="form-grid" style="grid-template-columns:1fr;">
-        <div class="form-group">
-          <label class="form-label">包装批次号<span class="required">*</span></label>
-          <select class="form-control" id="readyBatchSelect" onchange="onReadyBatchChange(this.value)">
-            <option value="">请选择批次号</option>
-            <option>BATCH-DH-20260415-01</option>
-            <option>BATCH-DH-20260415-02</option>
-            <option>BATCH-DH-20260415-03</option>
-            <option>BATCH-DH-20260415-04</option>
-          </select>
-        </div>
-        <div class="form-group" id="readyBatchInfoPanel" style="display:none;">
-          <label class="form-label">批次包装信息</label>
-          <div style="background:#FAFAFA;border:1px solid var(--border);border-radius:var(--radius-sm);padding:12px 16px;">
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:8px 24px;font-size:var(--font-sm);">
-              <div><span style="color:var(--text-secondary);">包装餐品：</span><span id="readyBatchDish" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装规格：</span><span id="readyBatchSpec" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装方式：</span><span id="readyBatchMethod" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装份数：</span><span id="readyBatchQty" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装日期：</span><span id="readyBatchDate" style="font-weight:500;"></span></div>
-            </div>
-          </div>
-        </div>
+        <div class="form-group"><label class="form-label">包装批次号<span class="required">*</span></label>
+          <select class="form-control" id="readyBatchSelectExt"><option value="">请选择批次号</option><option>BATCH-DH-20260415-01</option><option>BATCH-DH-20260415-02</option><option>BATCH-DH-20260415-03</option><option>BATCH-DH-20260415-04</option></select></div>
       </div>
-      <p style="font-size:var(--font-xs);color:var(--text-placeholder);margin-top:12px;">选择包装批次号后，订单状态将变为「待配送」</p>
+      <p style="font-size:var(--font-xs);color:var(--text-placeholder);margin-top:12px;">选择包装批次号后，该菜品状态将变为「待配送」</p>
     </div>
     <div class="modal__footer">
-      <button class="btn btn-default" onclick="closeReadyConfirm()">取消</button>
-      <button class="btn btn-primary" onclick="doReady()">确认备货完成</button>
+      <button class="btn btn-default" onclick="closeModal('readyModal')">取消</button>
+      <button class="btn btn-primary" onclick="doReadyExt()">确认备货完成</button>
     </div>
   </div>
 </div>
 
 <script>
+/* ========== 弹窗 ========== */
+function openModal(id){if(id==='createOrderModal')resetExtForm();document.getElementById(id).classList.add('show');}
+function closeModal(id){document.getElementById(id).classList.remove('show');}
+document.querySelectorAll('.modal-mask').forEach(function(m){m.addEventListener('click',function(e){if(e.target===m)m.classList.remove('show');});});
+
 /* ========== 数据 ========== */
-var batchInfo={
-  'BATCH-DH-20260415-01':{dish:'宫保鸡丁',spec:'标准份（500g）',method:'冷鲜袋',qty:'10',date:'2026-04-15'},
-  'BATCH-DH-20260415-02':{dish:'清蒸鱼',spec:'标准份（500g）',method:'保鲜盒',qty:'8',date:'2026-04-15'},
-  'BATCH-DH-20260415-03':{dish:'蒜蓉菠菜',spec:'标准份（500g）',method:'冷鲜袋',qty:'12',date:'2026-04-15'},
-  'BATCH-DH-20260415-04':{dish:'炒胡萝卜',spec:'大份（800g）',method:'保鲜盒',qty:'6',date:'2026-04-15'}
+var ncTypeOptsExt={
+  '土豆':['土豆丝','土豆块','土豆泥'],'鸡肉':['鸡肉块','鸡肉丝'],'净猪里脊':['里脊条','里脊片'],
+  '西兰花':['西兰花朵','西兰花梗'],'胡萝卜':['胡萝卜条','胡萝卜丝'],'菠菜':['菠菜段','菠菜碎']
 };
-var dishIngredients={
-  '宫保鸡丁':[{trace:'NC-PROC-JXR-20260415-01',name:'鸡胸肉',cleanType:'鸡胸丁',type:'主材',amount:'120g'},{trace:'NC-PROC-HUS-20260415-01',name:'花生',cleanType:'花生仁',type:'辅材',amount:'20g'},{trace:'NC-PROC-GLJ-20260415-01',name:'干辣椒',cleanType:'辣椒段',type:'调料',amount:'5g'}],
-  '清蒸鱼':[{trace:'NC-PROC-CYU-20260415-01',name:'草鱼',cleanType:'鱼片',type:'主材',amount:'100g'},{trace:'NC-PROC-JPN-20260415-01',name:'姜片',cleanType:'姜片',type:'调料',amount:'适量'}],
-  '蒜蓉菠菜':[{trace:'NC-PROC-BOC-20260415-01',name:'净菠菜',cleanType:'菠菜段',type:'主材',amount:'120g'},{trace:'NC-PROC-DSN-20260415-01',name:'大蒜',cleanType:'蒜末',type:'调料',amount:'8g'}],
-  '炒胡萝卜':[{trace:'NC-PROC-HLB-20260415-01',name:'净胡萝卜',cleanType:'胡萝卜丝',type:'主材',amount:'260g'},{trace:'NC-PROC-CJG-20260415-01',name:'葱姜',cleanType:'姜丝',type:'调料',amount:'适量'}]
-};
-var dishBatch={
-  '宫保鸡丁':'BATCH-DH-20260415-01',
-  '清蒸鱼':'BATCH-DH-20260415-02',
-  '蒜蓉菠菜':'BATCH-DH-20260415-03',
-  '炒胡萝卜':'BATCH-DH-20260415-04'
-};
-var traceMap={
-  '土豆-土豆丝':'NC-PROC-TDS-20260415-01',
-  '土豆-土豆块':'NC-PROC-TDK-20260415-01',
-  '净猪里脊-里脊条':'NC-PROC-ZJL-20260415-01',
-  '鸡肉-鸡肉块':'NC-PROC-CJRK-20260422-01',
-  '西兰花-西兰花朵':'NC-PROC-XLH-20260422-01',
-  '胡萝卜-胡萝卜条':'NC-PROC-HLB-20260415-01'
-};
-var createNcTypes={
-  '土豆':['土豆丝','土豆块','土豆泥'],
-  '鸡肉':['鸡肉块','鸡肉丝'],
-  '净猪里脊':['里脊条','里脊片'],
-  '西兰花':['西兰花朵','西兰花梗'],
-  '胡萝卜':['胡萝卜条','胡萝卜丝']
-};
-var createCpSpecs={
+var cpSpecOptsExt={
   '宫保鸡丁':[{label:'标准份（500g）',grams:500},{label:'加量份（750g）',grams:750}],
   '清蒸鱼':[{label:'标准份（600g）',grams:600},{label:'大份（900g）',grams:900}],
   '蒜蓉菠菜':[{label:'标准份（400g）',grams:400},{label:'加量份（600g）',grams:600}],
   '炒胡萝卜':[{label:'标准份（300g）',grams:300},{label:'大份（500g）',grams:500}]
 };
-
-/* ========== 新建订单弹窗 ========== */
-function openCreateOrder(){
-  resetCreateOrderForm();
-  document.getElementById('createOrderModal').classList.add('show');
-}
-function closeCreateOrder(){
-  document.getElementById('createOrderModal').classList.remove('show');
-}
-document.getElementById('createOrderModal').addEventListener('click',function(e){
-  if(e.target===this) closeCreateOrder();
-});
-
-/* 选择批次号后回显包装信息 */
-function onOrderBatchChange(val){
-  var panel=document.getElementById('orderBatchInfoPanel');
-  if(!val){panel.style.display='none';return;}
-  var info=batchInfo[val];
-  if(!info){panel.style.display='none';return;}
-  document.getElementById('obDish').textContent=info.dish;
-  document.getElementById('obSpec').textContent=info.spec;
-  document.getElementById('obMethod').textContent=info.method;
-  document.getElementById('obQty').textContent=info.qty;
-  document.getElementById('obDate').textContent=info.date;
-  panel.style.display='grid';
-}
-
-function resetCreateOrderForm(){
-  document.getElementById('orderType').value='nc';
-  document.getElementById('createIngredient').value='';
-  document.getElementById('createNcType').innerHTML='<option value="">请先选择食材</option>';
-  document.getElementById('createNcType').disabled=true;
-  document.getElementById('createDish').value='';
-  document.getElementById('createCpSpec').innerHTML='<option value="">请选择包装规格</option>';
-  document.getElementById('createCpSpec').disabled=true;
-  document.getElementById('createNcSpec').value='';
-  document.getElementById('orderQty').value='';
-  document.getElementById('orderWeight').value='';
-  document.getElementById('orderPrice').value='';
-  document.getElementById('orderSubtotal').value='';
-  document.getElementById('orderDeliveryTime').value='';
-  toggleCreateOrderFields();
-}
-function toggleCreateOrderFields(){
-  var v=document.getElementById('orderType').value;
-  document.getElementById('createIngredientWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('createNcTypeWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('createNcSpecWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('createDishWrap').style.display=(v==='cp'?'flex':'none');
-  document.getElementById('createCpSpecWrap').style.display=(v==='cp'?'flex':'none');
-  syncCreateOrderMeasure();
-}
-function sanitizeIntegerInput(el){el.value=el.value.replace(/[^\d]/g,'');}
-function updateCreateNcTypes(){
-  var ingredient=document.getElementById('createIngredient').value;
-  var select=document.getElementById('createNcType');
-  var options=createNcTypes[ingredient]||[];
-  select.innerHTML='<option value="">请选择净菜类型</option>';
-  options.forEach(function(text){select.innerHTML+='<option value="'+text+'">'+text+'</option>';});
-  select.disabled=!options.length;
-  select.value='';
-  syncCreateOrderMeasure();
-}
-function updateCreateCpSpecs(){
-  var dish=document.getElementById('createDish').value;
-  var select=document.getElementById('createCpSpec');
-  var options=createCpSpecs[dish]||[];
-  select.innerHTML='<option value="">请选择包装规格</option>';
-  options.forEach(function(item){select.innerHTML+='<option value="'+item.grams+'">'+item.label+'</option>';});
-  select.disabled=!options.length;
-  select.value='';
-  syncCreateOrderMeasure();
-}
-function getCreateSpecGrams(){
-  var type=document.getElementById('orderType').value;
-  if(type==='nc'){
-    var val=document.getElementById('createNcSpec').value;
-    return val?parseInt(val,10):0;
-  }
-  if(type==='cp'){
-    var val2=document.getElementById('createCpSpec').value;
-    return val2?parseInt(val2,10):0;
-  }
-  return 0;
-}
-function syncCreateOrderMeasure(){
-  var qty=parseInt(document.getElementById('orderQty').value||'0',10);
-  var grams=getCreateSpecGrams();
-  var weightInput=document.getElementById('orderWeight');
-  var priceNum=parseFloat(document.getElementById('orderPrice').value)||0;
-  if(!qty||!grams){
-    weightInput.value='';
-    document.getElementById('orderSubtotal').value='';
-    return;
-  }
-  var weight=grams*qty/1000;
-  weightInput.value=weight.toFixed(2);
-  var subtotal=priceNum*weight;
-  document.getElementById('orderSubtotal').value=subtotal>0?'¥'+subtotal.toFixed(2):'';
-}
-
-/* 提交订单 */
-function submitOrder(){
-  var typeVal=document.getElementById('orderType').value;
-  if(!typeVal){alert('请选择净菜类型');return;}
-  if(typeVal==='nc'){
-    if(!document.getElementById('createIngredient').value){alert('请选择食材');return;}
-    if(!document.getElementById('createNcType').value){alert('请选择净菜类型');return;}
-    if(!document.getElementById('createNcSpec').value){alert('请输入包装规格');return;}
-  }else{
-    if(!document.getElementById('createDish').value){alert('请选择餐品');return;}
-    if(!document.getElementById('createCpSpec').value){alert('请选择包装规格');return;}
-  }
-  if(!document.getElementById('orderQty').value){alert('请输入售卖份数');return;}
-  if(!document.getElementById('orderPrice').value){alert('请输入单价');return;}
-  var customer=document.getElementById('orderCustomer').value.trim();
-  if(!customer){alert('请输入客户名称');return;}
-  if(!document.getElementById('orderDeliveryTime').value){alert('请选择预定配送时间');return;}
-  alert('订单提交成功！');
-  closeCreateOrder();
-}
-
-/* ========== 发货确认弹窗 ========== */
-function openShipModal(orderNo){
-  document.getElementById('shipOrderNo').value=orderNo;
-  document.getElementById('shipCompany').value='';
-  document.getElementById('shipTrackNo').value='';
-  document.getElementById('shipModal').classList.add('show');
-}
-function closeShipModal(){
-  document.getElementById('shipModal').classList.remove('show');
-}
-document.getElementById('shipModal').addEventListener('click',function(e){
-  if(e.target===this) closeShipModal();
-});
-function confirmShip(){
-  var company=document.getElementById('shipCompany').value;
-  if(!company){alert('请选择物流公司');return;}
-  var trackNo=document.getElementById('shipTrackNo').value.trim();
-  if(!trackNo){alert('请输入物流单号');return;}
-  alert('订单 '+document.getElementById('shipOrderNo').value+' 已发货！\n物流公司：'+company+'\n物流单号：'+trackNo);
-  closeShipModal();
-}
-
-/* ========== 确认收货 ========== */
-function openReceiveConfirm(el){
-  var tr=el.closest('tr');
-  var tds=tr.querySelectorAll('td');
-  document.getElementById('receiveOrderNo').textContent=tds[0].textContent;
-  document.getElementById('receiveFoodName').textContent=tds[3].textContent;
-  document.getElementById('receiveModal').classList.add('show');
-}
-function closeReceiveConfirm(){document.getElementById('receiveModal').classList.remove('show');}
-document.getElementById('receiveModal').addEventListener('click',function(e){if(e.target===this)closeReceiveConfirm();});
-function doReceive(){
-  closeReceiveConfirm();
-  alert('收货确认成功，订单状态已变为「已完成」');
-}
-
-/* ========== 备货完成 — 补全备货信息 ========== */
-function openReadyConfirm(el){
-  var tr=el.closest('tr');
-  var tds=tr.querySelectorAll('td');
-  document.getElementById('readyOrderNo').textContent=tds[0].textContent;
-  document.getElementById('readyFoodName').textContent=tds[3].textContent;
-  // 重置批次选择和面板
-  document.getElementById('readyBatchSelect').selectedIndex=0;
-  document.getElementById('readyBatchInfoPanel').style.display='none';
-  document.getElementById('readyModal').classList.add('show');
-}
-function closeReadyConfirm(){document.getElementById('readyModal').classList.remove('show');}
-document.getElementById('readyModal').addEventListener('click',function(e){if(e.target===this)closeReadyConfirm();});
-function onReadyBatchChange(val){
-  var panel=document.getElementById('readyBatchInfoPanel');
-  if(!val){panel.style.display='none';return;}
-  var info=batchInfo[val];
-  if(!info){panel.style.display='none';return;}
-  document.getElementById('readyBatchDish').textContent=info.dish;
-  document.getElementById('readyBatchSpec').textContent=info.spec;
-  document.getElementById('readyBatchMethod').textContent=info.method;
-  document.getElementById('readyBatchQty').textContent=info.qty;
-  document.getElementById('readyBatchDate').textContent=info.date;
-  panel.style.display='block';
-}
-function doReady(){
-  var batch=document.getElementById('readyBatchSelect').value;
-  if(!batch){alert('请选择包装批次号');return;}
-  closeReadyConfirm();
-  alert('备货信息已补全，订单状态已变为「待配送」\n包装批次号：'+batch);
-}
-
-/* ========== 右侧抽屉组件 ========== */
-var Drawer={
-  open:function(title,bodyHtml){
-    this.close();
-    var overlay=document.createElement('div');
-    overlay.className='drawer-overlay';
-    overlay.innerHTML='<div class="drawer"><div class="drawer__header"><div class="drawer__title">'+title+'</div><button class="drawer__close" onclick="Drawer.close()">&times;</button></div><div class="drawer__body">'+bodyHtml+'</div></div>';
-    overlay.addEventListener('click',function(e){if(e.target===overlay)Drawer.close();});
-    document.body.appendChild(overlay);
-  },
-  close:function(){
-    var o=document.querySelector('.drawer-overlay');
-    if(!o)return;
-    o.classList.add('closing');
-    setTimeout(function(){o.remove();},200);
-  }
+var dishIngsExt={
+  '宫保鸡丁':[{trace:'NC-PROC-JXR-20260415-01',name:'鸡胸肉',cleanType:'鸡胸丁',type:'主材',amount:'120g'},{trace:'NC-PROC-HUS-20260415-01',name:'花生',cleanType:'花生仁',type:'辅材',amount:'20g'},{trace:'NC-PROC-GLJ-20260415-01',name:'干辣椒',cleanType:'辣椒段',type:'调料',amount:'5g'}],
+  '清蒸鱼':[{trace:'NC-PROC-CYU-20260415-01',name:'草鱼',cleanType:'鱼片',type:'主材',amount:'100g'},{trace:'NC-PROC-JPN-20260415-01',name:'姜片',cleanType:'姜片',type:'调料',amount:'适量'}],
+  '蒜蓉菠菜':[{trace:'NC-PROC-BOC-20260415-01',name:'净菠菜',cleanType:'菠菜段',type:'主材',amount:'120g'},{trace:'NC-PROC-DSN-20260415-01',name:'大蒜',cleanType:'蒜末',type:'调料',amount:'8g'}],
+  '炒胡萝卜':[{trace:'NC-PROC-HLB-20260415-01',name:'净胡萝卜',cleanType:'胡萝卜丝',type:'主材',amount:'260g'},{trace:'NC-PROC-CJG-20260415-01',name:'葱姜',cleanType:'姜丝',type:'调料',amount:'适量'}]
 };
 
-/* ========== 详情抽屉（按净菜类型定制渲染） ========== */
-function showDetail(el){
-  var tr=el.closest('tr');
-  var tds=tr.querySelectorAll('td');
-  var orderNo=tds[0].textContent.trim();
-  var customer=tds[1].textContent.trim();
-  var ncType=tds[2].textContent.trim();
-  var foodName=tds[3].textContent.trim();
-  var pkg=tds[4].textContent.trim();
-  var qty=tds[5].textContent.trim();
-  var weight=tds[6].textContent.trim();
-  var price=tds[7].textContent.trim();
-  var subtotal=tds[8].textContent.trim();
-  var orderTime=tds[9].textContent.trim();
-  var deliveryTime=tds[10].textContent.trim();
-  var logistics=tds[11].textContent.trim();
-  var status=tds[12].innerHTML;
+var extOrders=[
+  {orderNo:'EXT-001',ncType:'nc',customer:'社区便民超市',orderTime:'2026-04-22 08:00',deliverTime:'2026-04-22 16:00',logistics:'SF1234567890',
+    lines:[
+      {id:'L1',ingredient:'土豆',ncName:'土豆丝',spec:'5kg/箱',qty:10,weight:50,status:'已完成'},
+      {id:'L2',ingredient:'土豆',ncName:'土豆块',spec:'5kg/箱',qty:6,weight:30,status:'已完成'}
+    ]},
+  {orderNo:'EXT-002',ncType:'nc',customer:'周边餐饮企业',orderTime:'2026-04-22 09:30',deliverTime:'2026-04-22 14:00',logistics:'SF9876543210',
+    lines:[
+      {id:'L3',ingredient:'净猪里脊',ncName:'里脊条',spec:'1kg/箱',qty:10,weight:10,status:'配送中'},
+      {id:'L4',ingredient:'宫保鸡丁',ncName:'',spec:'标准份（500g）',qty:40,weight:20,status:'配送中'}
+    ]},
+  {orderNo:'EXT-003',ncType:'nc',customer:'学校食堂',orderTime:'2026-04-22 10:00',deliverTime:'2026-04-23 09:00',logistics:'—',
+    lines:[
+      {id:'L5',ingredient:'鸡肉',ncName:'鸡肉块',spec:'1kg/箱',qty:60,weight:60,status:'待配送'},
+      {id:'L6',ingredient:'西兰花',ncName:'西兰花朵',spec:'5kg/箱',qty:8,weight:40,status:'待配送'}
+    ]},
+  {orderNo:'EXT-004',ncType:'nc',customer:'职工家属区团购',orderTime:'2026-04-22 10:30',deliverTime:'2026-04-23 16:00',logistics:'—',
+    lines:[
+      {id:'L7',ingredient:'清蒸鱼',ncName:'',spec:'标准份（600g）',qty:20,weight:12,status:'备货中'},
+      {id:'L8',ingredient:'蒜蓉菠菜',ncName:'',spec:'标准份（400g）',qty:30,weight:12,status:'备货中'},
+      {id:'L9',ingredient:'胡萝卜',ncName:'胡萝卜条',spec:'2kg/箱',qty:15,weight:30,status:'备货中'}
+    ]},
+  {orderNo:'EXT-005',ncType:'nc',customer:'社区便民超市',orderTime:'2026-04-22 11:00',deliverTime:'2026-04-23 10:00',logistics:'—',
+    lines:[
+      {id:'L10',ingredient:'菠菜',ncName:'菠菜段',spec:'3kg/箱',qty:12,weight:36,status:'已完成'},
+      {id:'L11',ingredient:'炒胡萝卜',ncName:'',spec:'标准份（300g）',qty:25,weight:7.5,status:'配送中'}
+    ]},
+  {orderNo:'EXT-006',ncType:'nc',customer:'周边餐饮企业',orderTime:'2026-04-22 12:00',deliverTime:'2026-04-23 12:00',logistics:'SF5566778899',
+    lines:[
+      {id:'L12',ingredient:'净猪里脊',ncName:'里脊条',spec:'1kg/箱',qty:15,weight:15,status:'已完成'},
+      {id:'L13',ingredient:'宫保鸡丁',ncName:'',spec:'标准份（500g）',qty:50,weight:25,status:'已完成'},
+      {id:'L14',ingredient:'清蒸鱼',ncName:'',spec:'标准份（600g）',qty:30,weight:18,status:'已完成'}
+    ]}
+];
 
-  var html='<div class="drawer-section"><div class="drawer-section__title">订单信息</div><div class="drawer-fields">';
-  html+='<div class="drawer-field"><div class="drawer-field__label">订单号</div><div class="drawer-field__value">'+orderNo+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">客户名称</div><div class="drawer-field__value">'+customer+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">净菜类型</div><div class="drawer-field__value">'+ncType+'</div></div>';
+function aggregateStatus(lines){var ss=lines.map(function(l){return l.status;});
+  if(ss.every(function(s){return s==='已完成';}))return '已完成';
+  if(ss.some(function(s){return s==='配送中';})&&!ss.some(function(s){return s==='备货中'||s==='待配送';}))return '配送中';
+  if(ss.some(function(s){return s==='待配送';})&&!ss.some(function(s){return s==='备货中';}))return '待配送';
+  if(ss.every(function(s){return s==='备货中';}))return '备货中';
+  return '部分完成';}
+function statusTag(s){var m={'已完成':'tag-green','配送中':'tag-blue','待配送':'tag-orange','备货中':'tag-gray','部分完成':'tag-purple'};return '<span class="tag '+m[s]+'">'+s+'</span>';}
+function ncTypeTag(t){return t==='nc'?'<span class="tag tag-green">🥬 净菜包</span>':'<span class="tag tag-orange">🍱 餐品净菜包</span>';}
 
-  /* 根据净菜类型定制显示（去除 emoji 前缀影响） */
-  var isCP=ncType.indexOf('餐品净菜包')!==-1;
-  if(isCP){
-    var batchNo=dishBatch[foodName]||'—';
-    html+='<div class="drawer-field"><div class="drawer-field__label">包装批次号</div><div class="drawer-field__value">'+batchNo+'</div></div>';
-  }else{
-    var trace=traceMap[foodName]||'—';
-    html+='<div class="drawer-field"><div class="drawer-field__label">溯源码</div><div class="drawer-field__value">'+trace+'</div></div>';
-  }
-
-  html+='<div class="drawer-field"><div class="drawer-field__label">净菜/餐品</div><div class="drawer-field__value">'+foodName+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">包装规格</div><div class="drawer-field__value">'+pkg+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">售卖份数</div><div class="drawer-field__value">'+qty+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">计量(kg)</div><div class="drawer-field__value">'+weight+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">单价(元/kg)</div><div class="drawer-field__value">'+price+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">小计金额</div><div class="drawer-field__value">'+subtotal+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">下单时间</div><div class="drawer-field__value">'+orderTime+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">预定配送时间</div><div class="drawer-field__value">'+deliveryTime+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">物流单号</div><div class="drawer-field__value">'+logistics+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">订单状态</div><div class="drawer-field__value">'+status+'</div></div>';
-  html+='</div></div>';
-
-  /* 餐品净菜包显示净菜包明细 */
-  if(isCP){
-    var ings=dishIngredients[foodName];
-    if(ings&&ings.length){
-      html+='<div class="drawer-section"><div class="drawer-section__title">净菜包明细</div>';
-      html+='<table class="ing-detail-table"><thead><tr><th>食材溯源码</th><th>食材名称</th><th>净菜类型</th><th>分类</th><th>每份用量</th></tr></thead><tbody>';
-      for(var i=0;i<ings.length;i++){
-        var tagClass=ings[i].type==='主材'?'tag-blue':ings[i].type==='辅材'?'tag-green':'tag-orange';
-        html+='<tr><td>'+ings[i].trace+'</td><td>'+ings[i].name+'</td><td>'+ings[i].cleanType+'</td><td><span class="status-tag '+tagClass+'">'+ings[i].type+'</span></td><td>'+ings[i].amount+'</td></tr>';
-      }
-      html+='</tbody></table></div>';
+function renderExtTable(){
+  var tb=document.getElementById('extOrderTableBody');var h='';
+  extOrders.forEach(function(o,oi){
+    var agg=aggregateStatus(o.lines);var tQ=o.lines.reduce(function(s,l){return s+l.qty;},0);
+    var tW=o.lines.reduce(function(s,l){return s+parseFloat(l.weight);},0).toFixed(2);
+    h+='<tr class="master-row" data-ext-idx="'+oi+'" onclick="toggleExpandExt(this,'+oi+')">';
+    h+='<td><span class="expand-arrow" id="earrow'+oi+'">▶</span></td>';
+    h+='<td><b>'+o.orderNo+'</b></td><td>'+o.customer+'</td><td>'+ncTypeTag(o.ncType)+'</td><td>'+o.lines.length+'</td><td>'+tQ+'</td><td>'+tW+'</td>';
+    h+='<td>'+o.orderTime+'</td><td>'+o.deliverTime+'</td><td>'+o.logistics+'</td><td>'+statusTag(agg)+'</td>';
+    /* 主行操作按钮：根据聚合状态显示 */
+    var abtns='';
+    if(agg==='备货中')abtns='<span class="link" style="color:var(--success);" onclick="event.stopPropagation();orderAction(\''+o.orderNo+'\',\'ready\')">备货完成</span> ';
+    else if(agg==='待配送')abtns='<span class="link" style="color:var(--primary);" onclick="event.stopPropagation();orderAction(\''+o.orderNo+'\',\'ship\')">立即发货</span> ';
+    else if(agg==='配送中')abtns='<span class="link" style="color:var(--success);" onclick="event.stopPropagation();orderAction(\''+o.orderNo+'\',\'receive\')">确认收货</span> ';
+    h+='<td class="td-actions">'+abtns+'<span class="link" onclick="event.stopPropagation();showDetailExt(\''+o.orderNo+'\')">详情</span> <span class="link" style="color:var(--danger)" onclick="event.stopPropagation();deleteExtOrder(\''+o.orderNo+'\')">删除</span></td>';
+    h+='</tr>';
+    /* 子表头 — 根据 ncType 动态显示列 */
+    if(o.ncType==='nc'){
+      h+='<tr class="detail-header" id="ehead-'+oi+'" style="display:none;"><td></td><td>食材</td><td>净菜名称</td><td></td><td>包装规格</td><td>份数</td><td>计量(kg)</td><td></td><td></td><td></td></tr>';
+      o.lines.forEach(function(l){
+        h+='<tr class="detail-row" id="edetail-'+oi+'" style="display:none;">';
+        h+='<td></td><td style="font-weight:500;">'+l.ingredient+'</td><td style="font-weight:500;">'+(l.ncName||'—')+'</td><td></td>';
+        h+='<td>'+l.spec+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td>';
+        h+='<td></td><td></td><td></td>';
+        h+='<td class="td-actions"></td></tr>';
+      });
+    }else{
+      h+='<tr class="detail-header" id="ehead-'+oi+'" style="display:none;"><td></td><td colspan="3">菜品/食材</td><td>包装规格</td><td>份数</td><td>计量(kg)</td><td></td><td></td><td></td></tr>';
+      o.lines.forEach(function(l){
+        h+='<tr class="detail-row" id="edetail-'+oi+'" style="display:none;">';
+        h+='<td></td><td colspan="3" style="font-weight:500;">'+l.foodName+'</td>';
+        h+='<td>'+l.spec+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td>';
+        h+='<td></td><td></td><td></td>';
+        h+='<td class="td-actions"></td></tr>';
+      });
     }
-  }
-
-  Drawer.open('外售详情 — '+orderNo, html);
+  });
+  tb.innerHTML=h;
 }
-</script>
 
+function toggleExpandExt(row,idx){
+  row.classList.toggle('expanded');var arrow=document.getElementById('earrow'+idx);
+  var drs=document.querySelectorAll('#edetail-'+idx);var ehead=document.getElementById('ehead-'+idx);var is=row.classList.contains('expanded');
+  arrow.classList.toggle('expanded',is);arrow.textContent=is?'▼':'▶';
+  drs.forEach(function(r){r.style.display=is?'':'none';});
+  if(ehead)ehead.style.display=is?'':'none';
+}
+function deleteExtOrder(no){if(!confirm('确认删除订单 '+no+' ？'))return;extOrders=extOrders.filter(function(o){return o.orderNo!==no;});renderExtTable();}
+
+/* ========== 订单级操作 ========== */
+var _extOp={};
+function orderAction(no,action){
+  var o=extOrders.find(function(x){return x.orderNo===no;});if(!o)return;
+  if(action==='ready'){o.lines.forEach(function(l){l.status='待配送';});renderExtTable();}
+  else if(action==='ship'){
+    _extOp={orderNo:no};
+    document.getElementById('shipInfo').textContent='订单号：'+no;
+    document.getElementById('shipCompany').value='';
+    document.getElementById('shipTrackNo').value='';
+    openModal('shipModal');
+  }else if(action==='receive'){o.lines.forEach(function(l){l.status='已完成';});renderExtTable();}
+}
+function confirmShip(){var c=document.getElementById('shipCompany').value;var t=document.getElementById('shipTrackNo').value.trim();if(!c){alert('请选择物流公司');return;}if(!t){alert('请输入物流单号');return;}var o=extOrders.find(function(x){return x.orderNo===_extOp.orderNo;});if(o){o.lines.forEach(function(l){l.status='配送中';});o.logistics=t;}_extOp={};closeModal('shipModal');renderExtTable();}
+/* ========== 新建订单 ========== */
+var newExtOrderType='nc';
+function updExtOrderType(v){newExtOrderType=v;renderExtLineBuilders();}
+var newExtLines=[];var extLineCnt=0;
+function resetExtForm(){newExtLines=[];extLineCnt=0;newExtOrderType=document.getElementById('extOrderNcType').value;document.getElementById('extCustomer').value='';document.getElementById('extContact').value='';document.getElementById('extPhone').value='';document.getElementById('extDeliverTime').value='';document.getElementById('extAddress').value='';document.getElementById('extRemark').value='';document.getElementById('extLinesContainer').innerHTML='';document.getElementById('extSummary').style.display='none';addExtLine();}
+function addExtLine(){extLineCnt++;newExtLines.push({id:'el'+extLineCnt,ingredient:'',ncType:'',dish:'',specGram:0,specLabel:'',qty:0,weight:0});renderExtLineBuilders();}
+function removeExtLine(lid){if(newExtLines.length<=1){alert('至少保留一条');return;}newExtLines=newExtLines.filter(function(l){return l.id!==lid;});renderExtLineBuilders();}
+
+function updELIngredient(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.ingredient=v;l.ncType='';renderExtLineBuilders();}
+function updELNcType(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.ncType=v;calcELW(l);refreshESummary();}
+function updELDish(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.dish=v;l.specGram=0;l.specLabel='';calcELW(l);refreshESummary();}
+function updELSpec(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;if(newExtOrderType==='nc'){l.specGram=parseInt(v||'0',10);l.specLabel=v?(v+'g/袋'):'';}else{l.specGram=parseInt(v||'0',10);var ops=cpSpecOptsExt[l.dish]||[];var f=ops.find(function(o){return o.grams===l.specGram;});l.specLabel=f?f.label:'';}calcELW(l);refreshESummary();}
+function updELQty(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.qty=parseInt(v.replace(/[^\d]/g,'')||'0',10);calcELW(l);refreshESummary();}
+function calcELW(l){if(l.specGram>0&&l.qty>0)l.weight=parseFloat((l.specGram*l.qty/1000).toFixed(2));else l.weight=0;}
+
+function renderExtLineBuilders(){
+  var h='';
+  var isNc=newExtOrderType==='nc';
+  h+='<table class="line-builder-table"><thead><tr>';
+  if(isNc){
+    h+='<th>食材</th><th>净菜名称</th><th>包装规格(g)</th><th>份数</th><th>计量(kg)</th><th>操作</th>';
+  }else{
+    h+='<th>餐品名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th><th>操作</th>';
+  }
+  h+='</tr></thead><tbody>';
+  newExtLines.forEach(function(l){
+    h+='<tr>';
+    if(isNc){
+      h+='<td><select onchange="updELIngredient(\''+l.id+'\',this.value)"><option value="">请选择</option>';
+      Object.keys(ncTypeOptsExt).forEach(function(k){h+='<option value="'+k+'" '+(l.ingredient===k?'selected':'')+'>'+k+'</option>';});
+      h+='</select></td>';
+      var nts=ncTypeOptsExt[l.ingredient]||[];
+      h+='<td><select onchange="updELNcType(\''+l.id+'\',this.value)" '+(nts.length===0?'disabled':'')+'><option value="">'+(nts.length===0?'请先选食材':'请选择')+'</option>';
+      nts.forEach(function(t){h+='<option value="'+t+'" '+(l.ncType===t?'selected':'')+'>'+t+'</option>';});
+      h+='</select></td>';
+      h+='<td><input inputmode="numeric" placeholder="克数" value="'+(l.specGram||'')+'" oninput="this.value=this.value.replace(/[^\d]/g,\x27\x27);updELSpec(\x27'+l.id+'\x27,this.value)"></td>';
+    }else{
+      h+='<td><select onchange="updELDish(\''+l.id+'\',this.value)"><option value="">请选择</option>';
+      Object.keys(cpSpecOptsExt).forEach(function(k){h+='<option value="'+k+'" '+(l.dish===k?'selected':'')+'>'+k+'</option>';});
+      h+='</select></td>';
+      var cps=cpSpecOptsExt[l.dish]||[];
+      h+='<td><select onchange="updELSpec(\''+l.id+'\',this.value)" '+(cps.length===0?'disabled':'')+'><option value="">'+(cps.length===0?'请先选餐品':'请选择')+'</option>';
+      cps.forEach(function(s){h+='<option value="'+s.grams+'" '+(l.specGram===s.grams?'selected':'')+'>'+s.label+'</option>';});
+      h+='</select></td>';
+    }
+    h+='<td><input inputmode="numeric" placeholder="份数" value="'+(l.qty||'')+'" oninput="this.value=this.value.replace(/[^\d]/g,\x27\x27);updELQty(\x27'+l.id+'\x27,this.value)"></td>';
+    h+='<td><input value="'+(l.weight||'')+'" readonly></td>';
+    h+='<td><button class="btn-remove" onclick="removeExtLine(\''+l.id+'\')">移除</button></td>';
+    h+='</tr>';
+  });
+  h+='</tbody></table>';
+  document.getElementById('extLinesContainer').innerHTML=h;
+  refreshESummary();
+}
+
+function refreshESummary(){
+  var sd=document.getElementById('extSummary');var tb=document.getElementById('extSummaryBody');
+  var sh=document.getElementById('extSummaryHead');
+  var vl=newExtLines.filter(function(l){return l.weight>0;});
+  if(vl.length===0){sd.style.display='none';return;}
+  sd.style.display='block';var h='';
+  if(newExtOrderType==='nc'){
+    sh.innerHTML='<tr><th>净菜类型</th><th>食材</th><th>净菜名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th></tr>';
+    vl.forEach(function(l){h+='<tr><td>净菜包</td><td>'+(l.ingredient||'')+'</td><td>'+(l.ncType||'')+'</td><td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';});
+  }else{
+    sh.innerHTML='<tr><th>净菜类型</th><th>菜品/食材</th><th>包装规格</th><th>份数</th><th>计量(kg)</th></tr>';
+    vl.forEach(function(l){h+='<tr><td>餐品净菜包</td><td>'+(l.dish||'')+'</td><td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';});
+  }
+  tb.innerHTML=h;
+}
+
+function submitExtOrder(){
+  var cust=document.getElementById('extCustomer').value.trim();if(!cust){alert('请输入客户名称');return;}
+  var dt=document.getElementById('extDeliverTime').value;if(!dt){alert('请选择预定配送时间');return;}
+  var vl=newExtLines.filter(function(l){if(newExtOrderType==='nc')return l.ingredient&&l.ncType&&l.specGram>0&&l.qty>0;return l.dish&&l.specGram>0&&l.qty>0;});
+  if(vl.length===0){alert('请至少完善一条菜品明细');return;}
+  var no='EXT-'+String(extOrders.length+1).padStart(3,'0');
+  var newLines=vl.map(function(l,i){
+    if(newExtOrderType==='nc'){
+      return {id:'L'+(Date.now()+i),ingredient:l.ingredient,ncName:l.ncType,spec:l.specLabel,qty:l.qty,weight:l.weight,status:'备货中'};
+    }
+    return {id:'L'+(Date.now()+i),foodName:l.dish,spec:l.specLabel,qty:l.qty,weight:l.weight,status:'备货中'};
+  });
+  extOrders.unshift({orderNo:no,customer:cust,orderTime:new Date().toISOString().slice(0,16).replace('T',' '),deliverTime:dt,logistics:'—',
+    ncType:newExtOrderType,lines:newLines});
+  closeModal('createOrderModal');renderExtTable();
+  alert('外售订单 '+no+' 创建成功，包含 '+vl.length+' 道菜品');
+}
+
+/* ========== 详情抽屉 ========== */
+function showDetailExt(no){
+  var o=extOrders.find(function(x){return x.orderNo===no;});if(!o)return;
+  var agg=aggregateStatus(o.lines);var tQ=o.lines.reduce(function(s,l){return s+l.qty;},0);
+  var tW=o.lines.reduce(function(s,l){return s+parseFloat(l.weight);},0).toFixed(2);
+  var h='<div class="drawer-section"><div class="drawer-section__title">订单信息</div><div class="drawer-fields">';
+  h+='<div class="drawer-field"><div class="drawer-field__label">订单号</div><div class="drawer-field__value">'+no+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">客户名称</div><div class="drawer-field__value">'+o.customer+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">净菜类型</div><div class="drawer-field__value">'+ncTypeTag(o.ncType)+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">订单状态</div><div class="drawer-field__value">'+statusTag(agg)+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">菜品种类</div><div class="drawer-field__value">'+o.lines.length+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">总份数</div><div class="drawer-field__value">'+tQ+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">总计量(kg)</div><div class="drawer-field__value">'+tW+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">下单时间</div><div class="drawer-field__value">'+o.orderTime+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">预定配送</div><div class="drawer-field__value">'+o.deliverTime+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">物流单号</div><div class="drawer-field__value">'+o.logistics+'</div></div>';
+  h+='</div></div>';
+  h+='<div class="drawer-section"><div class="drawer-section__title">订单明细（'+o.lines.length+' 道）</div>';
+  if(o.ncType==='nc'){
+    h+='<table class="ing-table"><thead><tr><th>食材</th><th>净菜名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th><th>状态</th></tr></thead><tbody>';
+    o.lines.forEach(function(l){
+      var tc={'已完成':'tag-green','配送中':'tag-blue','待配送':'tag-orange','备货中':'tag-gray'};
+      h+='<tr><td style="font-weight:600;">'+l.ingredient+'</td><td style="font-weight:600;">'+(l.ncName||'—')+'</td><td>'+l.spec+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td><td><span class="tag '+tc[l.status]+'">'+l.status+'</span></td></tr>';
+    });
+  }else{
+    h+='<table class="ing-table"><thead><tr><th>菜品/食材</th><th>包装规格</th><th>份数</th><th>计量(kg)</th><th>状态</th></tr></thead><tbody>';
+    o.lines.forEach(function(l){
+      var tc={'已完成':'tag-green','配送中':'tag-blue','待配送':'tag-orange','备货中':'tag-gray'};
+      h+='<tr><td style="font-weight:600;"><b>'+l.foodName+'</b></td><td>'+l.spec+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td><td><span class="tag '+tc[l.status]+'">'+l.status+'</span></td></tr>';
+      var ings=dishIngsExt[l.foodName]||[];if(ings.length>0){h+='<tr><td colspan="5" style="padding:4px 10px;background:#fafafa;"><span style="font-size:11px;color:var(--text-placeholder);">食材构成：</span>';ings.forEach(function(ing,i){if(i>0)h+=', ';h+=ing.name+'('+ing.amount+')';});h+='</td></tr>';}
+    });
+  }
+  h+='</tbody></table></div>';
+  var dh='<div class="drawer-overlay" onclick="if(event.target===this)closeDrawer()"><div class="drawer"><div class="drawer__header"><div class="drawer__title">外售详情 — '+no+'</div><button class="drawer__close" onclick="closeDrawer()">✕</button></div><div class="drawer__body">'+h+'</div></div></div>';
+  document.body.insertAdjacentHTML('beforeend',dh);
+}
+function closeDrawer(){var o=document.querySelector('.drawer-overlay');if(!o)return;o.classList.add('closing');setTimeout(function(){o.remove();},200);}
+
+renderExtTable();
+</script>
 </body>
 </html>
diff --git a/web-admin/nutrition/sup-clean-internal.html b/web-admin/nutrition/sup-clean-internal.html
index 6a29391..1d69190 100644
--- a/web-admin/nutrition/sup-clean-internal.html
+++ b/web-admin/nutrition/sup-clean-internal.html
@@ -32,16 +32,6 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .mi{display:inline-block;width:20px;text-align:center;filter:grayscale(1);opacity:0.65;margin-right:2px;}
 .sidebar-item.active .mi{opacity:0.9;}
 .main{margin-left:240px;margin-top:56px;padding:24px;min-height:calc(100vh - 56px);}
-.stats-row{display:grid;grid-template-columns:repeat(4,1fr);gap:16px;margin-bottom:16px;}
-.stat-card{background:#fff;border-radius:var(--radius-md);padding:20px 24px;box-shadow:var(--shadow-sm);display:flex;align-items:center;gap:16px;}
-.stat-card__icon{width:48px;height:48px;border-radius:var(--radius-md);display:flex;align-items:center;justify-content:center;font-size:24px;}
-.stat-card__icon.blue{background:var(--primary-light);}
-.stat-card__icon.green{background:#F6FFED;}
-.stat-card__icon.orange{background:#FFF7E6;}
-.stat-card__icon.red{background:#FFF1F0;}
-.stat-card__info{display:flex;flex-direction:column;gap:4px;}
-.stat-card__value{font-size:var(--font-xl);font-weight:700;color:var(--text-primary);}
-.stat-card__label{font-size:var(--font-sm);color:var(--text-secondary);}
 .filter-bar{background:#fff;border-radius:var(--radius-md);padding:20px 24px;margin-bottom:16px;box-shadow:var(--shadow-sm);display:flex;align-items:center;gap:16px;flex-wrap:wrap;}
 .filter-item{display:flex;align-items:center;gap:8px;}
 .filter-item label{font-size:var(--font-sm);color:var(--text-secondary);white-space:nowrap;}
@@ -51,6 +41,8 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .btn{height:36px;padding:0 16px;border-radius:var(--radius-sm);font-size:var(--font-sm);cursor:pointer;border:none;transition:all .2s;display:inline-flex;align-items:center;gap:6px;}
 .btn-primary{background:var(--primary);color:#fff;}.btn-primary:hover{background:#40a9ff;}
 .btn-default{background:#fff;color:var(--text-primary);border:1px solid var(--border);}.btn-default:hover{color:var(--primary);border-color:var(--primary);}
+.btn-sm{height:28px;padding:0 10px;font-size:var(--font-xs);}
+.btn-danger-text{background:none;color:var(--danger);cursor:pointer;border:none;font-size:var(--font-xs);padding:0;}.btn-danger-text:hover{color:#ff7875;}
 .table-card{background:#fff;border-radius:var(--radius-md);box-shadow:var(--shadow-sm);overflow:hidden;}
 .table-card__header{display:flex;align-items:center;justify-content:space-between;padding:16px 24px;border-bottom:1px solid var(--border);}
 .table-card__title{font-size:var(--font-base);font-weight:600;}
@@ -60,28 +52,36 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 table{width:100%;border-collapse:collapse;}
 thead th{background:#FAFAFA;padding:12px 16px;text-align:left;font-size:var(--font-sm);color:var(--text-secondary);font-weight:500;border-bottom:1px solid var(--border);white-space:nowrap;}
 tbody td{padding:14px 16px;font-size:var(--font-sm);color:var(--text-primary);border-bottom:1px solid var(--border);white-space:nowrap;}
-tbody tr:last-child td{border-bottom:none;}
-tbody tr:hover{background:#F8FBFF;}
+tr.master-row{cursor:pointer;}
+tr.master-row:hover{background:#F8FBFF;}
+tr.master-row.expanded{background:#F0F7FF;}
+tr.detail-row{background:#FAFBFC;}
+tr.detail-row td{padding:10px 16px;font-size:var(--font-xs);color:var(--text-secondary);border-bottom:1px dashed #f0f0f0;}
+tr.detail-row td:first-child{padding-left:44px;}
+.expand-arrow{display:inline-block;width:20px;text-align:center;transition:transform .2s;font-size:var(--font-xs);color:var(--text-placeholder);}
+.expand-arrow.expanded{transform:rotate(90deg);}
 .tag{display:inline-flex;align-items:center;padding:2px 8px;border-radius:10px;font-size:var(--font-xs);}
 .tag-blue{background:var(--primary-light);color:var(--primary);}
 .tag-green{background:#F6FFED;color:var(--success);}
 .tag-orange{background:#FFF7E6;color:var(--warning);}
 .tag-red{background:#FFF1F0;color:var(--danger);}
 .tag-gray{background:#F5F5F5;color:#999;}
+.tag-purple{background:#F9F0FF;color:#722ED1;}
 .link{color:var(--primary);cursor:pointer;font-size:var(--font-sm);}.link:hover{color:#40a9ff;}
 .pagination{display:flex;align-items:center;justify-content:flex-end;padding:16px 24px;gap:8px;border-top:1px solid var(--border);}
 .pagination span{font-size:var(--font-sm);color:var(--text-secondary);}
 .page-btn{width:32px;height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);background:#fff;cursor:pointer;font-size:var(--font-sm);display:inline-flex;align-items:center;justify-content:center;transition:all .2s;}
 .page-btn:hover,.page-btn.active{background:var(--primary);color:#fff;border-color:var(--primary);}
 .action-bar{display:flex;align-items:center;gap:8px;margin-bottom:16px;}
-/* 操作列固定右侧 */
+.detail-header td{font-size:var(--font-xs);color:var(--text-placeholder);background:#f5f7fa;padding:6px 16px;font-weight:500;}
 thead th:last-child,tbody td.td-actions{position:sticky;right:0;background:#fff;box-shadow:-4px 0 8px rgba(0,0,0,0.04);z-index:2;white-space:nowrap;}
 thead th:last-child{background:#FAFAFA;}
-tbody tr:hover td.td-actions{background:#F8FBFF;}
-/* 弹窗 */
+tr.master-row:hover td.td-actions{background:#F8FBFF;}
+tr.master-row.expanded td.td-actions{background:#F0F7FF;}
+tr.detail-row td.td-actions{background:#FAFBFC;box-shadow:-4px 0 8px rgba(0,0,0,0.02);}
 .modal-mask{display:none;position:fixed;inset:0;background:rgba(0,0,0,0.45);z-index:200;align-items:center;justify-content:center;}
 .modal-mask.show{display:flex;}
-.modal{background:#fff;border-radius:var(--radius-lg);width:680px;max-height:85vh;display:flex;flex-direction:column;box-shadow:0 8px 24px rgba(0,0,0,0.15);}
+.modal{background:#fff;border-radius:var(--radius-lg);width:780px;max-height:85vh;display:flex;flex-direction:column;box-shadow:0 8px 24px rgba(0,0,0,0.15);}
 .modal__header{display:flex;align-items:center;justify-content:space-between;padding:20px 24px 16px;border-bottom:1px solid var(--border);}
 .modal__title{font-size:var(--font-lg);font-weight:600;}
 .modal__close{width:32px;height:32px;border:none;background:none;font-size:18px;cursor:pointer;border-radius:var(--radius-sm);display:flex;align-items:center;justify-content:center;color:var(--text-secondary);}
@@ -98,12 +98,26 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .form-item select{appearance:none;background:#fff url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6'%3E%3Cpath d='M0 0l5 6 5-6z' fill='%23999'/%3E%3C/svg%3E") no-repeat right 10px center;padding-right:28px;}
 .form-item input[readonly]{background:#f8fafc;cursor:not-allowed;}
 .form-item select:disabled{background:#f8fafc;color:var(--text-placeholder);cursor:not-allowed;}
+/* 明细行构建器 */
+.line-builder{border:1px solid var(--border);border-radius:var(--radius-md);padding:16px;margin-bottom:12px;background:#FAFBFC;position:relative;}
+.line-builder__header{display:flex;align-items:center;justify-content:space-between;margin-bottom:10px;}
+.line-builder__title{font-size:var(--font-sm);font-weight:600;color:var(--text-primary);}
+.line-builder__fields{display:flex;gap:10px;align-items:flex-start;flex-wrap:wrap;}
+.lb-field{display:flex;flex-direction:column;gap:4px;}
+.lb-field label{font-size:var(--font-xs);color:var(--text-placeholder);}
+.lb-field select,.lb-field input{height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 8px;font-size:var(--font-sm);outline:none;min-width:120px;}
+.lb-field select:focus,.lb-field input:focus{border-color:var(--primary);}
+.lb-field input[readonly]{background:#f8fafc;cursor:not-allowed;}
+.order-summary-table{width:100%;border-collapse:collapse;margin-top:12px;font-size:var(--font-sm);}
+.order-summary-table th{background:#fafafa;padding:8px 10px;text-align:left;font-weight:500;color:var(--text-secondary);border:1px solid var(--border);}
+.order-summary-table td{padding:6px 10px;border:1px solid var(--border);color:var(--text-primary);}
+.order-summary-table .empty-row td{text-align:center;color:var(--text-placeholder);padding:16px;}
 /* 右侧抽屉 */
 .drawer-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.45);z-index:1000;animation:modalFadeIn .2s ease;}
 .drawer-overlay.closing{animation:modalFadeOut .2s ease forwards;}
 @keyframes modalFadeIn{from{opacity:0}to{opacity:1}}
 @keyframes modalFadeOut{from{opacity:1}to{opacity:0}}
-.drawer{position:fixed;top:0;right:0;bottom:0;width:520px;max-width:90vw;background:#fff;box-shadow:-6px 0 24px rgba(0,0,0,.12);display:flex;flex-direction:column;z-index:1001;animation:drawerSlideIn .25s ease;}
+.drawer{position:fixed;top:0;right:0;bottom:0;width:560px;max-width:90vw;background:#fff;box-shadow:-6px 0 24px rgba(0,0,0,.12);display:flex;flex-direction:column;z-index:1001;animation:drawerSlideIn .25s ease;}
 .drawer-overlay.closing .drawer{animation:drawerSlideOut .2s ease forwards;}
 @keyframes drawerSlideIn{from{transform:translateX(100%)}to{transform:translateX(0)}}
 @keyframes drawerSlideOut{from{transform:translateX(0)}to{transform:translateX(100%)}}
@@ -119,36 +133,31 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .drawer-field{display:flex;flex-direction:column;gap:2px;}
 .drawer-field__label{font-size:var(--font-xs);color:var(--text-placeholder);}
 .drawer-field__value{font-size:var(--font-sm);color:var(--text-primary);font-weight:500;min-height:22px;}
-/* 食材明细表格（抽屉内） */
-.ing-detail-table{width:100%;border-collapse:collapse;margin-top:8px;}
-.ing-detail-table th{background:#FAFAFA;padding:8px 12px;text-align:left;font-size:var(--font-xs);color:var(--text-secondary);font-weight:500;border:1px solid var(--border);}
-.ing-detail-table td{padding:6px 12px;font-size:var(--font-sm);color:var(--text-primary);border:1px solid var(--border);}
+.ing-table{width:100%;border-collapse:collapse;margin-top:8px;}
+.ing-table th{background:#FAFAFA;padding:6px 10px;font-size:var(--font-xs);color:var(--text-secondary);font-weight:500;border:1px solid var(--border);}
+.ing-table td{padding:6px 10px;font-size:var(--font-sm);color:var(--text-primary);border:1px solid var(--border);}
+/* 行内明细表格 */
+.inline-line-table{width:100%;border-collapse:collapse;font-size:var(--font-sm);}
+.inline-line-table th{background:#FAFAFA;padding:8px 10px;text-align:left;font-weight:500;color:var(--text-secondary);border:1px solid var(--border);white-space:nowrap;}
+.inline-line-table td{padding:6px 8px;border:1px solid var(--border);vertical-align:middle;}
+.inline-line-table select,.inline-line-table input{height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 8px;font-size:var(--font-xs);outline:none;width:100%;min-width:100%;}
+.inline-line-table select{appearance:none;background:#fff url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6'%3E%3Cpath d='M0 0l5 6 5-6z' fill='%23999'/%3E%3C/svg%3E") no-repeat right 6px center;padding-right:24px;}
+.inline-line-table select:focus,.inline-line-table input:focus{border-color:var(--primary);}
+.inline-line-table input[readonly]{background:#f8fafc;cursor:not-allowed;}
+.inline-line-table .td-actions{text-align:center;width:60px;white-space:nowrap;}
 </style>
 </head>
 <body>
-<!-- 顶部导航栏 -->
 <header class="top-bar">
   <div class="top-bar__logo">
     <svg viewBox="0 0 28 28" fill="none"><rect width="28" height="28" rx="6" fill="#1890FF"/><path d="M7 14h14M14 7v14" stroke="#fff" stroke-width="2.5" stroke-linecap="round"/></svg>
     营养管理
   </div>
   <nav class="top-bar__nav">
-    <a href="trace-query.html">溯源总览</a>
-    <a href="arc-employee.html">档案</a>
-    <a href="farm-land.html">绿色种采</a>
-    <a href="sup-hygiene-check.html" class="active">卫生供应</a>
-    <a href="prod-qc-daily.html">健康生产</a>
-    <a href="din-dict-mgmt.html">营养用餐</a>
-    <a href="ano-dirty.html">异常事件</a>
+    <a href="trace-query.html">溯源总览</a><a href="arc-employee.html">档案</a><a href="farm-land.html">绿色种采</a><a href="sup-hygiene-check.html" class="active">卫生供应</a><a href="prod-qc-daily.html">健康生产</a><a href="din-dict-mgmt.html">营养用餐</a><a href="ano-dirty.html">异常事件</a>
   </nav>
-  <div class="top-bar__right">
-    <a href="../../index.html" class="btn-back">← 返回首页</a>
-    <div class="avatar">管</div>
-    <span>系统管理员 ▾</span>
-  </div>
+  <div class="top-bar__right"><a href="../../index.html" class="btn-back">← 返回首页</a><div class="avatar">管</div><span>系统管理员 ▾</span></div>
 </header>
-
-<!-- 侧边栏：卫生供应 -->
 <aside class="sidebar">
   <div class="sidebar-menu__title">卫生供应</div>
   <a href="sup-hygiene-check.html" class="sidebar-item"><span class="mi">🔬</span>卫生检测</a>
@@ -160,57 +169,38 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
   <a href="sup-clean-internal.html" class="sidebar-item active"><span class="mi">🏠</span>净菜内供</a>
   <a href="sup-clean-external.html" class="sidebar-item"><span class="mi">🚛</span>净菜外售</a>
 </aside>
-
-<!-- 主内容区 -->
 <div class="main">
-
-  <!-- 筛选栏 -->
   <div class="filter-bar">
-    <div class="filter-item"><label>申领单号/食材名称</label><input class="filter-input" placeholder="请输入申领单号或食材名称"></div>
+    <div class="filter-item"><label>申领单号/菜品名称</label><input class="filter-input" placeholder="请输入申领单号或菜品名称"></div>
     <div class="filter-item"><label>申领场所</label>
       <select class="filter-select"><option>全部</option><option>一号食堂厨房</option><option>二号食堂厨房</option><option>三号食堂厨房</option></select>
     </div>
     <div class="filter-item"><label>净菜类型</label>
       <select class="filter-select"><option>全部</option><option>净菜包</option><option>餐品净菜包</option></select>
     </div>
-    <div class="filter-item"><label>订单状态</label>
-      <select class="filter-select"><option>全部</option><option>备货中</option><option>待配送</option><option>配送中</option><option>已完成</option></select>
+    <div class="filter-item"><label>申领单状态</label>
+      <select class="filter-select"><option>全部</option><option>备货中</option><option>待配送</option><option>配送中</option><option>部分完成</option><option>已完成</option></select>
     </div>
-    <button class="btn btn-primary">查询</button>
-    <button class="btn btn-default">重置</button>
+    <button class="btn btn-primary">查询</button><button class="btn btn-default">重置</button>
   </div>
-
-  <!-- 数据表格 -->
-    <div class="action-bar"><button class="btn btn-primary" onclick="openModal('modal-claim')">➕ 新建申领单</button> <button class="btn btn-primary"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M2 10v2h10v-2M7 2v7M4.5 6.5L7 9l2.5-2.5" stroke="#fff" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/></svg>导出列表数据</button> <button class="btn btn-default"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><rect x="2" y="2" width="10" height="10" rx="1.5" stroke="currentColor" stroke-width="1.4"/><path d="M4 5h6M4 7.5h4" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/></svg>查看导出任务</button></div>
-    <div class="table-card">
-    <div class="table-card__header">
-      <div class="table-card__title">净菜内供</div>
-</div>
+  <div class="action-bar">
+    <button class="btn btn-primary" onclick="openModal('modal-claim')">➕ 新建申领单</button>
+    <button class="btn btn-primary"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M2 10v2h10v-2M7 2v7M4.5 6.5L7 9l2.5-2.5" stroke="#fff" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/></svg>导出列表数据</button>
+    <button class="btn btn-default"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><rect x="2" y="2" width="10" height="10" rx="1.5" stroke="currentColor" stroke-width="1.4"/><path d="M4 5h6M4 7.5h4" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/></svg>查看导出任务</button>
+  </div>
+  <div class="table-card">
+    <div class="table-card__header"><div class="table-card__title">净菜内供</div></div>
     <div class="table-card__content">
-      <table>
+      <table id="claimTable">
         <thead><tr>
-          <th>申领单号</th><th>申领场所</th><th>净菜类型</th><th>净菜/餐品</th><th>包装规格</th><th>申领份数</th><th>申领数量(kg)</th><th>订单状态</th><th>申领时间</th><th>预定配送时间</th><th>配送人</th><th>操作</th>
+          <th style="width:36px;"></th><th>申领单号</th><th>申领场所</th><th>净菜类型</th><th>菜品种类</th><th>总份数</th><th>总数量(kg)</th><th>申领单状态</th><th>申领时间</th><th>预定配送时间</th><th>配送人</th><th>操作</th>
         </tr></thead>
-        <tbody>
-          <tr><td>INT-001</td><td>一号食堂厨房</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>菠菜-菠菜段</td><td>500g/袋</td><td>50</td><td>25</td><td><span class="tag tag-green">已完成</span></td><td>2026-04-22 07:30</td><td>2026-04-22 09:00</td><td>李配送</td><td class="td-actions"><span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>INT-001</td><td>一号食堂厨房</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>玉米-玉米粒</td><td>1kg/盒</td><td>20</td><td>20</td><td><span class="tag tag-green">已完成</span></td><td>2026-04-22 07:30</td><td>2026-04-22 09:00</td><td>李配送</td><td class="td-actions"><span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>INT-002</td><td>二号食堂厨房</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>猪排骨-排骨块</td><td>2kg/盘</td><td>20</td><td>40</td><td><span class="tag tag-blue">配送中</span></td><td>2026-04-22 08:00</td><td>2026-04-22 10:00</td><td>王配送</td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="openReceiveConfirm(this)">确认收货</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>INT-003</td><td>二号食堂厨房</td><td><span class="tag tag-orange">🍱 餐品净菜包</span></td><td>宫保鸡丁</td><td>标准份（500g）</td><td>30</td><td>15</td><td><span class="tag tag-blue">配送中</span></td><td>2026-04-22 08:00</td><td>2026-04-22 10:00</td><td>王配送</td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="openReceiveConfirm(this)">确认收货</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>INT-004</td><td>三号食堂厨房</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>草鱼-鱼片</td><td>2kg/盘</td><td>20</td><td>40</td><td><span class="tag tag-orange">待配送</span></td><td>2026-04-22 08:30</td><td>2026-04-22 10:30</td><td>—</td><td class="td-actions"><span class="link" style="color:var(--primary)" onclick="openDeliverModal(this)">立即配送</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>INT-005</td><td>一号食堂厨房</td><td><span class="tag tag-orange">🍱 餐品净菜包</span></td><td>清蒸鱼</td><td>标准份（500g）</td><td>15</td><td>7.5</td><td><span class="tag tag-orange">待配送</span></td><td>2026-04-22 09:00</td><td>2026-04-22 11:00</td><td>—</td><td class="td-actions"><span class="link" style="color:var(--primary)" onclick="openDeliverModal(this)">立即配送</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>INT-006</td><td>三号食堂厨房</td><td><span class="tag tag-green">🥬 净菜包</span></td><td>土豆-土豆丝</td><td>500g/袋</td><td>40</td><td>20</td><td><span class="tag tag-gray">备货中</span></td><td>2026-04-22 09:15</td><td>2026-04-22 11:30</td><td>—</td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="openReadyConfirm(this)">备货完成</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-          <tr><td>INT-007</td><td>二号食堂厨房</td><td><span class="tag tag-orange">🍱 餐品净菜包</span></td><td>蒜蓉菠菜</td><td>标准份（500g）</td><td>25</td><td>12.5</td><td><span class="tag tag-gray">备货中</span></td><td>2026-04-22 09:30</td><td>2026-04-22 12:00</td><td>—</td><td class="td-actions"><span class="link" style="color:var(--success)" onclick="openReadyConfirm(this)">备货完成</span>  <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-        </tbody>
+        <tbody id="claimTableBody"></tbody>
       </table>
     </div>
     <div class="pagination">
-      <span>显示 8 条，共 26 条</span>
-      <button class="page-btn">‹</button>
-      <button class="page-btn active">1</button>
-      <button class="page-btn">2</button>
-      <button class="page-btn">3</button>
-      <button class="page-btn">4</button>
-      <button class="page-btn">›</button>
+      <span>显示 8 条，共 8 条</span>
+      <button class="page-btn">‹</button><button class="page-btn active">1</button><button class="page-btn">2</button><button class="page-btn">›</button>
     </div>
   </div>
 </div>
@@ -224,129 +214,60 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
     </div>
     <div class="modal__body">
       <div class="form-grid">
-        <div class="form-item">
-          <div class="form-item__label">净菜类型<span class="required">*</span></div>
-          <select id="claimType" onchange="toggleClaimFields()"><option value="">请选择</option><option value="nc">净菜包</option><option value="cp">餐品净菜包</option></select>
-        </div>
         <div class="form-item">
           <div class="form-item__label">申领场所<span class="required">*</span></div>
-          <select><option value="">请选择</option><option>一号食堂厨房</option><option>二号食堂厨房</option><option>三号食堂厨房</option></select>
+          <select id="claimCanteen"><option value="">请选择</option><option>一号食堂厨房</option><option>二号食堂厨房</option><option>三号食堂厨房</option></select>
         </div>
-        <div class="form-item" id="claimIngredientWrap" style="display:none;">
-          <div class="form-item__label">食材<span class="required">*</span></div>
-          <select id="claimIngredient" onchange="updateClaimNcTypes()">
-            <option value="">请选择食材</option>
-            <option value="土豆">土豆</option>
-            <option value="菠菜">菠菜</option>
-            <option value="玉米">玉米</option>
-            <option value="猪排骨">猪排骨</option>
-            <option value="鸡胸肉">鸡胸肉</option>
-            <option value="草鱼">草鱼</option>
-          </select>
-        </div>
-        <div class="form-item" id="claimNcTypeWrap" style="display:none;">
+        <div class="form-item">
           <div class="form-item__label">净菜类型<span class="required">*</span></div>
-          <select id="claimNcType" disabled onchange="syncClaimMeasure()"><option value="">请先选择食材</option></select>
-        </div>
-        <div class="form-item" id="claimDishWrap" style="display:none;">
-          <div class="form-item__label">餐品名称<span class="required">*</span></div>
-          <select id="claimDish" onchange="updateClaimCpSpecs()">
-            <option value="">请选择餐品</option>
-            <option value="宫保鸡丁">宫保鸡丁</option>
-            <option value="清蒸鱼">清蒸鱼</option>
-            <option value="蒜蓉菠菜">蒜蓉菠菜</option>
-            <option value="炒胡萝卜">炒胡萝卜</option>
-          </select>
-        </div>
-        <div class="form-item">
-          <div class="form-item__label">包装批次号</div>
-          <select id="claimBatchSelect" onchange="onBatchChange(this.value)"><option value="">请选择批次号（选填）</option><option>BATCH-DH-20260415-01</option><option>BATCH-DH-20260415-02</option><option>BATCH-DH-20260415-03</option><option>BATCH-DH-20260415-04</option></select>
-        </div>
-        <div class="form-item full" id="batchInfoPanel" style="display:none;">
-          <div class="form-item__label">批次包装信息</div>
-          <div style="background:#FAFAFA;border:1px solid var(--border);border-radius:var(--radius-sm);padding:12px 16px;">
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:8px 24px;font-size:var(--font-sm);">
-              <div><span style="color:var(--text-secondary);">包装餐品：</span><span id="batchDish" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装规格：</span><span id="batchSpec" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装方式：</span><span id="batchMethod" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装份数：</span><span id="batchQty" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装日期：</span><span id="batchDate" style="font-weight:500;"></span></div>
-            </div>
-          </div>
-        </div>
-        <div class="form-item" id="claimNcSpecWrap" style="display:none;">
-          <div class="form-item__label">包装规格<span class="required">*</span></div>
-          <input id="claimNcSpec" inputmode="numeric" placeholder="请输入纯整数克数" oninput="sanitizeIntegerInput(this);syncClaimMeasure()">
-        </div>
-        <div class="form-item" id="claimCpSpecWrap" style="display:none;">
-          <div class="form-item__label">包装规格<span class="required">*</span></div>
-          <select id="claimCpSpec" onchange="syncClaimMeasure()"><option value="">请选择包装规格</option></select>
-        </div>
-        <div class="form-item">
-          <div class="form-item__label">申领份数<span class="required">*</span></div>
-          <input id="claimQty" inputmode="numeric" placeholder="请输入纯整数份数" oninput="sanitizeIntegerInput(this);syncClaimMeasure()">
-        </div>
-        <div class="form-item">
-          <div class="form-item__label">申领数量(kg)<span class="required">*</span></div>
-          <input id="claimMeasure" type="text" placeholder="自动计算" readonly>
+          <select id="claimNcType" onchange="renderClaimLineBuilders()"><option value="nc">净菜包</option><option value="cp">餐品净菜包</option></select>
         </div>
         <div class="form-item">
           <div class="form-item__label">预定配送时间</div>
-          <input type="datetime-local" placeholder="请选择配送时间">
+          <input type="datetime-local" id="claimDeliveryTime">
         </div>
         <div class="form-item">
           <div class="form-item__label">配送人</div>
-          <input placeholder="请输入配送人">
+          <input placeholder="请输入配送人" id="claimDeliverPerson">
+        </div>
+        <div class="form-item">
+          <div class="form-item__label">包装批次号（选填）</div>
+          <select id="claimBatchNo"><option value="">请选择</option><option>BATCH-DH-20260415-01</option><option>BATCH-DH-20260415-02</option><option>BATCH-DH-20260415-03</option><option>BATCH-DH-20260415-04</option></select>
+        </div>
+      </div>
+      <div style="margin-top:20px;">
+        <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:12px;">
+          <span style="font-size:var(--font-sm);font-weight:600;">申领明细</span>
+          <button class="btn btn-primary btn-sm" onclick="addClaimLine()">+ 添加菜品</button>
+        </div>
+        <div id="claimLinesContainer"></div>
+        <div id="claimSummary" style="display:none;">
+          <div style="font-size:var(--font-sm);font-weight:600;margin:12px 0 8px;">汇总预览</div>
+          <table class="order-summary-table">
+            <thead id="claimSummaryHead"></thead>
+            <tbody id="claimSummaryBody"></tbody>
+          </table>
         </div>
       </div>
     </div>
     <div class="modal__footer">
       <button class="btn btn-default" onclick="closeModal('modal-claim')">取消</button>
-      <button class="btn btn-primary" onclick="closeModal('modal-claim')">确认提交</button>
+      <button class="btn btn-primary" onclick="submitClaim()">确认提交</button>
     </div>
   </div>
 </div>
 
-<!-- 确认收货二次确认弹窗 -->
-<div class="modal-mask" id="modal-receive">
-  <div class="modal" style="width:420px;">
-    <div class="modal__header">
-      <div class="modal__title">确认收货</div>
-      <button class="modal__close" onclick="closeModal('modal-receive')">✕</button>
-    </div>
-    <div class="modal__body" style="text-align:center;padding:32px 24px;">
-      <div style="font-size:40px;margin-bottom:12px;">✅</div>
-      <p style="font-size:15px;color:#333;font-weight:600;margin-bottom:8px;">确认对申领单 <span id="receiveOrderNo"></span> 进行收货？</p>
-      <p style="font-size:13px;color:#999;line-height:1.6;">净菜/餐品：<span id="receiveFoodName" style="color:#333;font-weight:500;"></span><br>确认后订单状态将变为「已完成」</p>
-    </div>
-    <div class="modal__footer" style="justify-content:center;">
-      <button class="btn btn-default" onclick="closeModal('modal-receive')">取消</button>
-      <button class="btn btn-primary" style="background:var(--success);" onclick="doReceive()">确认收货</button>
-    </div>
-  </div>
-</div>
-
-<!-- 立即配送弹窗 -->
+<!-- 弹窗：立即配送 -->
 <div class="modal-mask" id="modal-deliver">
   <div class="modal" style="width:480px;">
-    <div class="modal__header">
-      <div class="modal__title">立即配送</div>
-      <button class="modal__close" onclick="closeModal('modal-deliver')">✕</button>
-    </div>
+    <div class="modal__header"><div class="modal__title">立即配送</div><button class="modal__close" onclick="closeModal('modal-deliver')">✕</button></div>
     <div class="modal__body">
-      <div style="background:var(--primary-light);border-radius:var(--radius-md);padding:12px 16px;margin-bottom:20px;font-size:var(--font-sm);color:var(--primary);display:flex;align-items:center;gap:8px;">
-        <span style="font-size:16px;">📋</span>
-        <span>申领单号：<strong id="deliverOrderNo"></strong> ｜ 净菜/餐品：<strong id="deliverFoodName"></strong></span>
+      <div style="background:var(--primary-light);border-radius:var(--radius-md);padding:12px 16px;margin-bottom:20px;font-size:var(--font-sm);color:var(--primary);">
+        <span>申领单号：<strong id="deliverOrderNo"></strong></span>
       </div>
       <div class="form-grid" style="grid-template-columns:1fr;">
-        <div class="form-item">
-          <div class="form-item__label">配送人<span class="required">*</span></div>
-          <input id="deliverPerson" placeholder="请输入配送人姓名">
-        </div>
-        <div class="form-item">
-          <div class="form-item__label">备注</div>
-          <textarea id="deliverRemark" style="height:80px;padding:8px 12px;resize:vertical;border:1px solid var(--border);border-radius:var(--radius-sm);font-size:var(--font-sm);outline:none;" placeholder="请输入配送备注（如特殊要求、温度要求等）"></textarea>
-        </div>
+        <div class="form-item"><div class="form-item__label">配送人<span class="required">*</span></div><input id="deliverPerson" placeholder="请输入配送人姓名"></div>
+        <div class="form-item"><div class="form-item__label">备注</div><textarea id="deliverRemark" style="height:80px;padding:8px 12px;resize:vertical;border:1px solid var(--border);border-radius:var(--radius-sm);font-size:var(--font-sm);outline:none;" placeholder="请输入配送备注"></textarea></div>
       </div>
     </div>
     <div class="modal__footer">
@@ -356,330 +277,348 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
   </div>
 </div>
 
-<!-- 备货完成弹窗（补全备货信息） -->
-<div class="modal-mask" id="modal-ready">
-  <div class="modal" style="width:520px;">
-    <div class="modal__header">
-      <div class="modal__title">补全备货信息</div>
-      <button class="modal__close" onclick="closeModal('modal-ready')">✕</button>
-    </div>
-    <div class="modal__body">
-      <div style="background:var(--primary-light);border-radius:var(--radius-md);padding:12px 16px;margin-bottom:20px;font-size:var(--font-sm);color:var(--primary);display:flex;align-items:center;gap:8px;">
-        <span style="font-size:16px;">📋</span>
-        <span>申领单号：<strong id="readyOrderNo"></strong> ｜ 净菜/餐品：<strong id="readyFoodName"></strong></span>
-      </div>
-      <div class="form-grid" style="grid-template-columns:1fr;">
-        <div class="form-item">
-          <div class="form-item__label">包装批次号<span class="required">*</span></div>
-          <select id="readyBatchSelect" onchange="onReadyBatchChange(this.value)"><option value="">请选择批次号</option><option>BATCH-DH-20260415-01</option><option>BATCH-DH-20260415-02</option><option>BATCH-DH-20260415-03</option><option>BATCH-DH-20260415-04</option></select>
-        </div>
-        <div class="form-item" id="readyBatchInfoPanel" style="display:none;">
-          <div class="form-item__label">批次包装信息</div>
-          <div style="background:#FAFAFA;border:1px solid var(--border);border-radius:var(--radius-sm);padding:12px 16px;">
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:8px 24px;font-size:var(--font-sm);">
-              <div><span style="color:var(--text-secondary);">包装餐品：</span><span id="readyBatchDish" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装规格：</span><span id="readyBatchSpec" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装方式：</span><span id="readyBatchMethod" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装份数：</span><span id="readyBatchQty" style="font-weight:500;"></span></div>
-              <div><span style="color:var(--text-secondary);">包装日期：</span><span id="readyBatchDate" style="font-weight:500;"></span></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <p style="font-size:var(--font-xs);color:var(--text-placeholder);margin-top:12px;">选择包装批次号后，订单状态将变为「待配送」</p>
-    </div>
-    <div class="modal__footer">
-      <button class="btn btn-default" onclick="closeModal('modal-ready')">取消</button>
-      <button class="btn btn-primary" onclick="doReady()">确认备货完成</button>
-    </div>
-  </div>
-</div>
-
 <script>
-// 弹窗打开/关闭
+/* ========== 弹窗开关 ========== */
 function openModal(id){
   if(id==='modal-claim')resetClaimForm();
   document.getElementById(id).classList.add('show');
 }
 function closeModal(id){document.getElementById(id).classList.remove('show');}
-// 点击遮罩关闭
-document.querySelectorAll('.modal-mask').forEach(m=>{
-  m.addEventListener('click',e=>{if(e.target===m)m.classList.remove('show');});
-});
+document.querySelectorAll('.modal-mask').forEach(function(m){m.addEventListener('click',function(e){if(e.target===m)m.classList.remove('show');});});
 
-/* ========== 批次包装信息数据 ========== */
-var batchInfo={
-  'BATCH-DH-20260415-01':{dish:'宫保鸡丁',spec:'标准份（500g）',method:'冷鲜袋',qty:'10',date:'2026-04-15'},
-  'BATCH-DH-20260415-02':{dish:'清蒸鱼',spec:'标准份（500g）',method:'保鲜盒',qty:'8',date:'2026-04-15'},
-  'BATCH-DH-20260415-03':{dish:'蒜蓉菠菜',spec:'标准份（500g）',method:'冷鲜袋',qty:'12',date:'2026-04-15'},
-  'BATCH-DH-20260415-04':{dish:'炒胡萝卜',spec:'大份（800g）',method:'保鲜盒',qty:'6',date:'2026-04-15'}
+/* ========== 数据 ========== */
+var ncTypeOptions={
+  '土豆':['土豆丝','土豆块','土豆泥'],'菠菜':['菠菜段','菠菜碎'],'玉米':['玉米粒','玉米段'],
+  '猪排骨':['排骨块','排骨丁'],'鸡胸肉':['鸡胸肉丝','鸡胸肉丁'],'草鱼':['鱼片','鱼块'],'西兰花':['西兰花朵','西兰花梗']
 };
-
-// 新建申领单 — 选择批次号回显信息
-function onBatchChange(val){
-  var panel=document.getElementById('batchInfoPanel');
-  var info=batchInfo[val];
-  if(!info){panel.style.display='none';return;}
-  document.getElementById('batchDish').textContent=info.dish;
-  document.getElementById('batchSpec').textContent=info.spec;
-  document.getElementById('batchMethod').textContent=info.method;
-  document.getElementById('batchQty').textContent=info.qty;
-  document.getElementById('batchDate').textContent=info.date;
-  panel.style.display='flex';
-}
-
-var claimNcTypes={
-  '土豆':['土豆丝','土豆块','土豆泥'],
-  '菠菜':['菠菜段','菠菜碎'],
-  '玉米':['玉米粒','玉米段'],
-  '猪排骨':['排骨块','排骨丁'],
-  '鸡胸肉':['鸡胸肉丝','鸡胸肉丁'],
-  '草鱼':['鱼片','鱼块']
-};
-var claimCpSpecs={
+var cpSpecOptions={
   '宫保鸡丁':[{label:'标准份（500g）',grams:500},{label:'加量份（750g）',grams:750}],
   '清蒸鱼':[{label:'标准份（600g）',grams:600},{label:'大份（900g）',grams:900}],
   '蒜蓉菠菜':[{label:'标准份（400g）',grams:400},{label:'加量份（600g）',grams:600}],
   '炒胡萝卜':[{label:'标准份（300g）',grams:300},{label:'大份（500g）',grams:500}]
 };
-function resetClaimForm(){
-  document.getElementById('claimType').value='nc';
-  document.getElementById('claimIngredient').value='';
-  document.getElementById('claimNcType').innerHTML='<option value="">请先选择食材</option>';
-  document.getElementById('claimNcType').disabled=true;
-  document.getElementById('claimDish').value='';
-  document.getElementById('claimCpSpec').innerHTML='<option value="">请选择包装规格</option>';
-  document.getElementById('claimCpSpec').disabled=true;
-  document.getElementById('claimNcSpec').value='';
-  document.getElementById('claimQty').value='';
-  document.getElementById('claimMeasure').value='';
-  toggleClaimFields();
-}
-function toggleClaimFields(){
-  var v=document.getElementById('claimType').value;
-  document.getElementById('claimIngredientWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('claimNcTypeWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('claimNcSpecWrap').style.display=(v==='nc'?'flex':'none');
-  document.getElementById('claimDishWrap').style.display=(v==='cp'?'flex':'none');
-  document.getElementById('claimCpSpecWrap').style.display=(v==='cp'?'flex':'none');
-  syncClaimMeasure();
-}
-function sanitizeIntegerInput(el){el.value=el.value.replace(/[^\d]/g,'');}
-function updateClaimNcTypes(){
-  var ingredient=document.getElementById('claimIngredient').value;
-  var typeSelect=document.getElementById('claimNcType');
-  var options=claimNcTypes[ingredient]||[];
-  typeSelect.innerHTML='<option value="">请选择净菜类型</option>';
-  options.forEach(function(item){typeSelect.innerHTML+='<option value="'+item+'">'+item+'</option>';});
-  typeSelect.disabled=!options.length;
-  typeSelect.value='';
-  syncClaimMeasure();
-}
-function updateClaimCpSpecs(){
-  var dish=document.getElementById('claimDish').value;
-  var specSelect=document.getElementById('claimCpSpec');
-  var options=claimCpSpecs[dish]||[];
-  specSelect.innerHTML='<option value="">请选择包装规格</option>';
-  options.forEach(function(item){specSelect.innerHTML+='<option value="'+item.grams+'">'+item.label+'</option>';});
-  specSelect.disabled=!options.length;
-  specSelect.value='';
-  syncClaimMeasure();
-}
-function getClaimSpecGrams(){
-  var type=document.getElementById('claimType').value;
-  if(type==='nc'){
-    var ncSpec=document.getElementById('claimNcSpec').value;
-    return ncSpec?parseInt(ncSpec,10):0;
-  }
-  if(type==='cp'){
-    var cpSpec=document.getElementById('claimCpSpec').value;
-    return cpSpec?parseInt(cpSpec,10):0;
-  }
-  return 0;
-}
-function syncClaimMeasure(){
-  var qty=parseInt(document.getElementById('claimQty').value||'0',10);
-  var grams=getClaimSpecGrams();
-  var measureInput=document.getElementById('claimMeasure');
-  if(!qty||!grams){measureInput.value='';return;}
-  measureInput.value=(grams*qty/1000).toFixed(2);
-}
-
-// 备货完成弹窗 — 选择批次号回显信息
-function onReadyBatchChange(val){
-  var panel=document.getElementById('readyBatchInfoPanel');
-  var info=batchInfo[val];
-  if(!info){panel.style.display='none';return;}
-  document.getElementById('readyBatchDish').textContent=info.dish;
-  document.getElementById('readyBatchSpec').textContent=info.spec;
-  document.getElementById('readyBatchMethod').textContent=info.method;
-  document.getElementById('readyBatchQty').textContent=info.qty;
-  document.getElementById('readyBatchDate').textContent=info.date;
-  panel.style.display='flex';
-}
-
-/* ========== 列索引（去掉溯源码和关联仓库区域后） ========== */
-/* 0申领单号 1申领场所 2净菜类型 3净菜/餐品 4包装规格 5申领份数 6申领数量 7订单状态 8申领时间 9预定配送时间 10配送人 11操作 */
-
-/* 确认收货 */
-function openReceiveConfirm(el){
-  var tr=el.closest('tr');
-  var tds=tr.querySelectorAll('td');
-  document.getElementById('receiveOrderNo').textContent=tds[0].textContent;
-  document.getElementById('receiveFoodName').textContent=tds[3].textContent;
-  openModal('modal-receive');
-}
-function doReceive(){
-  closeModal('modal-receive');
-  alert('收货确认成功，订单状态已变为「已完成」');
-}
-
-/* 立即配送 */
-function openDeliverModal(el){
-  var tr=el.closest('tr');
-  var tds=tr.querySelectorAll('td');
-  document.getElementById('deliverOrderNo').textContent=tds[0].textContent;
-  document.getElementById('deliverFoodName').textContent=tds[3].textContent;
-  document.getElementById('deliverPerson').value='';
-  document.getElementById('deliverRemark').value='';
-  openModal('modal-deliver');
-}
-function doDeliver(){
-  var person=document.getElementById('deliverPerson').value.trim();
-  if(!person){alert('请输入配送人姓名');return;}
-  closeModal('modal-deliver');
-  alert('配送任务已创建，配送人：'+person+'，订单状态已变为「配送中」');
-}
-
-/* 备货完成 — 打开补全备货信息弹窗 */
-function openReadyConfirm(el){
-  var tr=el.closest('tr');
-  var tds=tr.querySelectorAll('td');
-  document.getElementById('readyOrderNo').textContent=tds[0].textContent;
-  document.getElementById('readyFoodName').textContent=tds[3].textContent;
-  // 重置批次选择和面板
-  document.getElementById('readyBatchSelect').selectedIndex=0;
-  document.getElementById('readyBatchInfoPanel').style.display='none';
-  openModal('modal-ready');
-}
-function doReady(){
-  var batch=document.getElementById('readyBatchSelect').value;
-  if(!batch){alert('请选择包装批次号');return;}
-  closeModal('modal-ready');
-  alert('备货信息已补全，订单状态已变为「待配送」\n包装批次号：'+batch);
-}
-
-/* ========== 餐品食材数据（与 sup-pkg-label 保持一致） ========== */
 var dishIngredients={
-  '宫保鸡丁':[
-    {trace:'NC-PROC-JXR-20260415-01',name:'鸡胸肉',cleanType:'鸡胸丁',type:'主材',amount:'120g'},
-    {trace:'NC-PROC-HUS-20260415-01',name:'花生',cleanType:'花生仁',type:'辅材',amount:'20g'},
-    {trace:'NC-PROC-GLJ-20260415-01',name:'干辣椒',cleanType:'辣椒段',type:'调料',amount:'5g'}
-  ],
-  '清蒸鱼':[
-    {trace:'NC-PROC-CYU-20260415-01',name:'草鱼',cleanType:'鱼片',type:'主材',amount:'100g'},
-    {trace:'NC-PROC-JPN-20260415-01',name:'姜片',cleanType:'姜片',type:'调料',amount:'适量'}
-  ],
-  '蒜蓉菠菜':[
-    {trace:'NC-PROC-BOC-20260415-01',name:'净菠菜',cleanType:'菠菜段',type:'主材',amount:'120g'},
-    {trace:'NC-PROC-DSN-20260415-01',name:'大蒜',cleanType:'蒜末',type:'调料',amount:'8g'}
-  ],
-  '炒胡萝卜':[
-    {trace:'NC-PROC-HLB-20260415-01',name:'净胡萝卜',cleanType:'胡萝卜丝',type:'主材',amount:'260g'},
-    {trace:'NC-PROC-CJG-20260415-01',name:'葱姜',cleanType:'姜丝',type:'调料',amount:'适量'}
-  ]
-};
-// 餐品净菜包对应的包装批次号
-var dishBatch={
-  '宫保鸡丁':'BATCH-DH-20260415-01',
-  '清蒸鱼':'BATCH-DH-20260415-02',
-  '蒜蓉菠菜':'BATCH-DH-20260415-03',
-  '炒胡萝卜':'BATCH-DH-20260415-04'
+  '宫保鸡丁':[{trace:'NC-PROC-JXR-20260415-01',name:'鸡胸肉',cleanType:'鸡胸丁',type:'主材',amount:'120g'},{trace:'NC-PROC-HUS-20260415-01',name:'花生',cleanType:'花生仁',type:'辅材',amount:'20g'},{trace:'NC-PROC-GLJ-20260415-01',name:'干辣椒',cleanType:'辣椒段',type:'调料',amount:'5g'}],
+  '清蒸鱼':[{trace:'NC-PROC-CYU-20260415-01',name:'草鱼',cleanType:'鱼片',type:'主材',amount:'100g'},{trace:'NC-PROC-JPN-20260415-01',name:'姜片',cleanType:'姜片',type:'调料',amount:'适量'}],
+  '蒜蓉菠菜':[{trace:'NC-PROC-BOC-20260415-01',name:'净菠菜',cleanType:'菠菜段',type:'主材',amount:'120g'},{trace:'NC-PROC-DSN-20260415-01',name:'大蒜',cleanType:'蒜末',type:'调料',amount:'8g'}],
+  '炒胡萝卜':[{trace:'NC-PROC-HLB-20260415-01',name:'净胡萝卜',cleanType:'胡萝卜丝',type:'主材',amount:'260g'},{trace:'NC-PROC-CJG-20260415-01',name:'葱姜',cleanType:'姜丝',type:'调料',amount:'适量'}]
 };
 
-/* 右侧抽屉组件 */
-var Drawer={
-  open:function(title,bodyHtml){
-    this.close();
-    var overlay=document.createElement('div');
-    overlay.className='drawer-overlay';
-    overlay.innerHTML='<div class="drawer"><div class="drawer__header"><div class="drawer__title">'+title+'</div><button class="drawer__close" onclick="Drawer.close()">&times;</button></div><div class="drawer__body">'+bodyHtml+'</div></div>';
-    overlay.addEventListener('click',function(e){if(e.target===overlay)Drawer.close();});
-    document.body.appendChild(overlay);
-  },
-  close:function(){
-    var o=document.querySelector('.drawer-overlay');
-    if(!o)return;
-    o.classList.add('closing');
-    setTimeout(function(){o.remove();},200);
-  }
-};
+/* 申领单主子表数据 */
+var claims=[
+  {claimNo:'INT-001',canteen:'一号食堂厨房',ncType:'nc',claimTime:'2026-04-22 07:30',deliverTime:'2026-04-22 09:00',deliverPerson:'李配送',
+    lines:[
+      {id:'L1',ingredient:'菠菜',ncName:'菠菜段',spec:'500g/袋',qty:50,weight:25,status:'已完成'},
+      {id:'L2',ingredient:'玉米',ncName:'玉米粒',spec:'1kg/盒',qty:20,weight:20,status:'已完成'}
+    ]},
+  {claimNo:'INT-002',canteen:'二号食堂厨房',ncType:'nc',claimTime:'2026-04-22 08:00',deliverTime:'2026-04-22 10:00',deliverPerson:'王配送',
+    lines:[
+      {id:'L3',ingredient:'猪排骨',ncName:'排骨块',spec:'2kg/盘',qty:20,weight:40,status:'配送中'},
+      {id:'L4',ingredient:'土豆',ncName:'土豆丝',spec:'500g/袋',qty:30,weight:15,status:'配送中'}
+    ]},
+  {claimNo:'INT-003',canteen:'三号食堂厨房',ncType:'nc',claimTime:'2026-04-22 08:30',deliverTime:'2026-04-22 10:30',deliverPerson:'—',
+    lines:[
+      {id:'L5',ingredient:'草鱼',ncName:'鱼片',spec:'2kg/盘',qty:20,weight:40,status:'待配送'},
+      {id:'L6',ingredient:'鸡胸肉',ncName:'鸡胸肉丝',spec:'500g/袋',qty:15,weight:7.5,status:'待配送'}
+    ]},
+  {claimNo:'INT-004',canteen:'一号食堂厨房',ncType:'nc',claimTime:'2026-04-22 09:15',deliverTime:'2026-04-22 11:30',deliverPerson:'—',
+    lines:[
+      {id:'L7',ingredient:'土豆',ncName:'土豆丝',spec:'500g/袋',qty:40,weight:20,status:'备货中'},
+      {id:'L8',ingredient:'菠菜',ncName:'菠菜碎',spec:'500g/袋',qty:25,weight:12.5,status:'备货中'},
+      {id:'L9',ingredient:'西兰花',ncName:'西兰花朵',spec:'500g/袋',qty:30,weight:15,status:'备货中'}
+    ]},
+  {claimNo:'INT-005',canteen:'二号食堂厨房',ncType:'cp',claimTime:'2026-04-22 09:30',deliverTime:'2026-04-22 12:00',deliverPerson:'—',
+    lines:[
+      {id:'L10',foodName:'宫保鸡丁',spec:'标准份（500g）',qty:20,weight:10,status:'已完成'},
+      {id:'L11',foodName:'炒胡萝卜',spec:'标准份（300g）',qty:15,weight:4.5,status:'配送中'}
+    ]}
+];
 
-/* ========== 详情抽屉（定制化渲染） ========== */
-function showDetail(el){
-  var tr=el.closest('tr');
-  var tds=tr.querySelectorAll('td');
-  /* 列序：0申领单号 1申领场所 2净菜类型 3净菜/餐品 4包装规格 5申领份数 6申领数量 7订单状态 8申领时间 9预定配送时间 10配送人 */
-  var orderNo=tds[0].textContent;
-  var canteen=tds[1].textContent;
-  var typeHtml=tds[2].innerHTML;
-  var typeText=tds[2].textContent.trim();
-  var foodName=tds[3].textContent;
-  var spec=tds[4].textContent;
-  var qty=tds[5].textContent;
-  var weight=tds[6].textContent;
-  var statusHtml=tds[7].innerHTML;
-  var claimTime=tds[8].textContent;
-  var deliverTime=tds[9].textContent;
-  var deliverPerson=tds[10].textContent;
-
-  var isCp=typeText.indexOf('餐品')>=0;
-
-  // 基础信息区
-  var html='<div class="drawer-section"><div class="drawer-section__title">基础信息</div><div class="drawer-fields">';
-  html+='<div class="drawer-field"><div class="drawer-field__label">申领单号</div><div class="drawer-field__value">'+orderNo+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">净菜类型</div><div class="drawer-field__value">'+typeHtml+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">申领场所</div><div class="drawer-field__value">'+canteen+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">净菜/餐品</div><div class="drawer-field__value">'+foodName+'</div></div>';
-
-  // 根据类型显示不同字段
-  if(!isCp){
-    // 净菜包 → 显示溯源码
-    var traceMap={'菠菜-菠菜段':'NC-INT-BOCA-20260422-01','玉米-玉米粒':'NC-INT-BCAI-20260422-01','猪排骨-排骨块':'NC-INT-ZLRJ-20260422-01','草鱼-鱼片':'NC-INT-CAYO-20260422-01','土豆-土豆丝':'NC-INT-TDSI-20260422-01'};
-    html+='<div class="drawer-field"><div class="drawer-field__label">溯源码</div><div class="drawer-field__value">'+(traceMap[foodName]||'—')+'</div></div>';
-  } else {
-    // 餐品净菜包 → 显示包装批次号
-    html+='<div class="drawer-field"><div class="drawer-field__label">包装批次号</div><div class="drawer-field__value">'+(dishBatch[foodName]||'—')+'</div></div>';
-  }
-
-  html+='<div class="drawer-field"><div class="drawer-field__label">包装规格</div><div class="drawer-field__value">'+spec+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">申领份数</div><div class="drawer-field__value">'+qty+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">申领数量(kg)</div><div class="drawer-field__value">'+weight+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">订单状态</div><div class="drawer-field__value">'+statusHtml+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">申领时间</div><div class="drawer-field__value">'+claimTime+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">预定配送时间</div><div class="drawer-field__value">'+deliverTime+'</div></div>';
-  html+='<div class="drawer-field"><div class="drawer-field__label">配送人</div><div class="drawer-field__value">'+deliverPerson+'</div></div>';
-  html+='</div></div>';
-
-  // 餐品净菜包 → 追加净菜包明细表格
-  if(isCp){
-    var ings=dishIngredients[foodName]||[];
-    var tagCls={'主材':'tag-blue','辅材':'tag-green','调料':'tag-orange'};
-    html+='<div class="drawer-section"><div class="drawer-section__title">净菜包明细</div>';
-    html+='<table class="ing-detail-table"><thead><tr><th>食材溯源码</th><th>食材名称</th><th>净菜类型</th><th>分类</th><th>每份用量</th></tr></thead><tbody>';
-    if(ings.length>0){
-      ings.forEach(function(i){
-        html+='<tr><td>'+i.trace+'</td><td>'+i.name+'</td><td>'+i.cleanType+'</td><td><span class="tag '+(tagCls[i.type]||'')+'">'+i.type+'</span></td><td>'+i.amount+'</td></tr>';
-      });
-    } else {
-      html+='<tr><td colspan="5" style="text-align:center;color:var(--text-placeholder);">暂无明细数据</td></tr>';
-    }
-    html+='</tbody></table></div>';
-  }
-
-  Drawer.open('净菜内供详情 — '+orderNo, html);
+function aggregateStatus(lines){
+  var statuses=lines.map(function(l){return l.status;});
+  if(statuses.every(function(s){return s==='已完成';}))return '已完成';
+  if(statuses.some(function(s){return s==='配送中';})&&!statuses.some(function(s){return s==='备货中'||s==='待配送';}))return '配送中';
+  if(statuses.some(function(s){return s==='待配送';})&&!statuses.some(function(s){return s==='备货中';}))return '待配送';
+  if(statuses.every(function(s){return s==='备货中';}))return '备货中';
+  return '部分完成';
 }
-</script>
+function statusTag(s){var m={'已完成':'tag-green','配送中':'tag-blue','待配送':'tag-orange','备货中':'tag-gray','部分完成':'tag-purple'};return '<span class="tag '+m[s]+'">'+s+'</span>';}
+function ncTypeTag(t){return t==='nc'?'<span class="tag tag-green">🥬 净菜包</span>':'<span class="tag tag-orange">🍱 餐品净菜包</span>';}
 
+function renderClaimTable(){
+  var tbody=document.getElementById('claimTableBody');
+  var html='';
+  claims.forEach(function(c,ci){
+    var agg=aggregateStatus(c.lines);
+    var tQty=c.lines.reduce(function(s,l){return s+l.qty;},0);
+    var tW=c.lines.reduce(function(s,l){return s+parseFloat(l.weight);},0).toFixed(2);
+    html+='<tr class="master-row" data-claim-idx="'+ci+'" onclick="toggleExpand(this,'+ci+')">';
+    html+='<td><span class="expand-arrow" id="carrow'+ci+'">▶</span></td>';
+    html+='<td><b>'+c.claimNo+'</b></td><td>'+c.canteen+'</td><td>'+ncTypeTag(c.ncType)+'</td><td>'+c.lines.length+'</td><td>'+tQty+'</td><td>'+tW+'</td><td>'+statusTag(agg)+'</td>';
+    html+='<td>'+c.claimTime+'</td><td>'+c.deliverTime+'</td><td>'+c.deliverPerson+'</td>';
+    html+='<td class="td-actions">';
+    if(agg==='备货中')html+='<span class="link" style="color:var(--success);" onclick="event.stopPropagation();orderAction(\''+c.claimNo+'\',\'ready\')">备货完成</span> ';
+    if(agg==='待配送')html+='<span class="link" style="color:var(--primary);" onclick="event.stopPropagation();orderAction(\''+c.claimNo+'\',\'deliver\')">立即配送</span> ';
+    if(agg==='配送中')html+='<span class="link" style="color:var(--success);" onclick="event.stopPropagation();orderAction(\''+c.claimNo+'\',\'receive\')">确认收货</span> ';
+    html+='<span class="link" onclick="event.stopPropagation();showDetail(\''+c.claimNo+'\')">详情</span> <span class="link" style="color:var(--danger)" onclick="event.stopPropagation();deleteClaim(\''+c.claimNo+'\')">删除</span>';
+    html+='</td></tr>';
+    /* 明细子表头 — 根据 ncType 动态调整列 */
+    var isNc=c.ncType==='nc';
+    html+='<tr class="detail-header" id="chead-'+ci+'" style="display:none;"><td></td>';
+    if(isNc){
+      html+='<td>食材</td><td>净菜名称</td>';
+    }else{
+      html+='<td colspan="2">菜品/食材</td>';
+    }
+    html+='<td>包装规格</td><td>份数</td><td>数量(kg)</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>';
+    c.lines.forEach(function(line){
+      html+='<tr class="detail-row" id="cdetail-'+ci+'" style="display:none;">';
+      html+='<td></td>';
+      if(isNc){
+        html+='<td style="font-weight:500;">'+line.ingredient+'</td><td>'+line.ncName+'</td>';
+      }else{
+        html+='<td colspan="2" style="font-weight:500;">'+line.foodName+'</td>';
+      }
+      html+='<td>'+line.spec+'</td><td>'+line.qty+'</td><td>'+line.weight+'</td>';
+      html+='<td></td><td></td><td></td><td></td><td></td><td class="td-actions"></td></tr>';
+    });
+  });
+  tbody.innerHTML=html;
+}
+
+function toggleExpand(row,idx){
+  row.classList.toggle('expanded');
+  var arrow=document.getElementById('carrow'+idx);
+  var is=row.classList.contains('expanded');
+  arrow.classList.toggle('expanded',is);arrow.textContent=is?'▼':'▶';
+  var s=is?'':'none';
+  var hdr=document.getElementById('chead-'+idx);
+  if(hdr)hdr.style.display=s;
+  document.querySelectorAll('#cdetail-'+idx).forEach(function(r){r.style.display=s;});
+}
+
+function deleteClaim(no){
+  if(!confirm('确认删除申领单 '+no+' 及其所有明细？'))return;
+  claims=claims.filter(function(c){return c.claimNo!==no;});
+  renderClaimTable();
+}
+
+/* ========== 订单级操作 ========== */
+var _deliverClaimNo=null;
+
+function orderAction(claimNo,action){
+  var c=claims.find(function(x){return x.claimNo===claimNo;});
+  if(!c)return;
+  if(action==='ready'){
+    c.lines.forEach(function(l){if(l.status==='备货中')l.status='待配送';});
+    renderClaimTable();
+  }else if(action==='deliver'){
+    _deliverClaimNo=claimNo;
+    document.getElementById('deliverOrderNo').textContent=claimNo;
+    document.getElementById('deliverPerson').value=c.deliverPerson!=='—'?c.deliverPerson:'';
+    document.getElementById('deliverRemark').value='';
+    openModal('modal-deliver');
+  }else if(action==='receive'){
+    if(!confirm('确认对申领单 '+claimNo+' 中的所有配送中菜品进行收货？'))return;
+    c.lines.forEach(function(l){if(l.status==='配送中')l.status='已完成';});
+    renderClaimTable();
+  }
+}
+
+function doDeliver(){
+  var p=document.getElementById('deliverPerson').value.trim();
+  if(!p){alert('请输入配送人姓名');return;}
+  var c=claims.find(function(x){return x.claimNo===_deliverClaimNo;});
+  if(!c)return;
+  c.lines.forEach(function(l){if(l.status==='待配送')l.status='配送中';});
+  c.deliverPerson=p;
+  _deliverClaimNo=null;
+  closeModal('modal-deliver');
+  renderClaimTable();
+}
+
+/* ========== 新建申领单 ========== */
+var newClaimLines=[];
+var claimLineIdCnt=0;
+
+function resetClaimForm(){
+  newClaimLines=[];claimLineIdCnt=0;
+  document.getElementById('claimCanteen').value='';
+  document.getElementById('claimNcType').value='nc';
+  document.getElementById('claimDeliveryTime').value='';
+  document.getElementById('claimDeliverPerson').value='';
+  document.getElementById('claimBatchNo').value='';
+  document.getElementById('claimLinesContainer').innerHTML='';
+  document.getElementById('claimSummary').style.display='none';
+  addClaimLine();
+}
+
+function addClaimLine(){
+  claimLineIdCnt++;
+  newClaimLines.push({id:'cl'+claimLineIdCnt,ingredient:'',ncType:'',dish:'',specGram:0,specLabel:'',qty:0,weight:0});
+  renderClaimLineBuilders();
+}
+
+function removeClaimLine(lid){
+  if(newClaimLines.length<=1){alert('至少保留一条菜品明细');return;}
+  newClaimLines=newClaimLines.filter(function(l){return l.id!==lid;});
+  renderClaimLineBuilders();
+}
+
+function updateCLIngredient(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.ingredient=val;l.ncType='';renderClaimLineBuilders();}
+function updateCLNcType(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.ncType=val;calcCLWeight(l);refreshCLSummary();}
+function updateCLDish(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.dish=val;l.specGram=0;l.specLabel='';calcCLWeight(l);refreshCLSummary();}
+function updateCLSpec(lid,val){
+  var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;
+  var orderNcType=document.getElementById('claimNcType').value;
+  if(orderNcType==='nc'){l.specGram=parseInt(val||'0',10);l.specLabel=val?(val+'g/袋'):'';}
+  else{l.specGram=parseInt(val||'0',10);var opts=cpSpecOptions[l.dish]||[];var f=opts.find(function(o){return o.grams===l.specGram;});l.specLabel=f?f.label:'';}
+  calcCLWeight(l);refreshCLSummary();
+}
+function updateCLQty(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.qty=parseInt(val.replace(/[^\d]/g,'')||'0',10);calcCLWeight(l);refreshCLSummary();}
+function calcCLWeight(l){if(l.specGram>0&&l.qty>0)l.weight=parseFloat((l.specGram*l.qty/1000).toFixed(2));else l.weight=0;}
+
+function renderClaimLineBuilders(){
+  var html='';
+  var orderNcType=document.getElementById('claimNcType').value;
+  var isNc=orderNcType==='nc';
+  html+='<table class="inline-line-table"><thead><tr>';
+  if(isNc){
+    html+='<th>食材</th><th>净菜名称</th><th>包装规格(g)</th><th>份数</th><th>数量(kg)</th><th>操作</th>';
+  }else{
+    html+='<th>餐品名称</th><th>包装规格</th><th>份数</th><th>数量(kg)</th><th>操作</th>';
+  }
+  html+='</tr></thead><tbody>';
+  newClaimLines.forEach(function(line){
+    html+='<tr>';
+    if(isNc){
+      /* 食材下拉 */
+      html+='<td><select onchange="updateCLIngredient(\''+line.id+'\',this.value)"><option value="">请选择</option>';
+      Object.keys(ncTypeOptions).forEach(function(k){html+='<option value="'+k+'" '+(line.ingredient===k?'selected':'')+'>'+k+'</option>';});
+      html+='</select></td>';
+      /* 净菜名称下拉 */
+      var nts=ncTypeOptions[line.ingredient]||[];
+      html+='<td><select onchange="updateCLNcType(\''+line.id+'\',this.value)" '+(nts.length===0?'disabled':'')+'><option value="">'+(nts.length===0?'请先选食材':'请选择')+'</option>';
+      nts.forEach(function(t){html+='<option value="'+t+'" '+(line.ncType===t?'selected':'')+'>'+t+'</option>';});
+      html+='</select></td>';
+      /* 包装规格 */
+      html+='<td><input inputmode="numeric" placeholder="克数" value="'+(line.specGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateCLSpec(\''+line.id+'\',this.value)"></td>';
+    }else{
+      /* 餐品名称下拉 */
+      html+='<td><select onchange="updateCLDish(\''+line.id+'\',this.value)"><option value="">请选择</option>';
+      Object.keys(cpSpecOptions).forEach(function(k){html+='<option value="'+k+'" '+(line.dish===k?'selected':'')+'>'+k+'</option>';});
+      html+='</select></td>';
+      /* 包装规格 */
+      var cps=cpSpecOptions[line.dish]||[];
+      html+='<td><select onchange="updateCLSpec(\''+line.id+'\',this.value)" '+(cps.length===0?'disabled':'')+'><option value="">'+(cps.length===0?'请先选餐品':'请选择')+'</option>';
+      cps.forEach(function(s){html+='<option value="'+s.grams+'" '+(line.specGram===s.grams?'selected':'')+'>'+s.label+'</option>';});
+      html+='</select></td>';
+    }
+    /* 份数和数量（nc/cp 共用） */
+    html+='<td><input inputmode="numeric" placeholder="份数" value="'+(line.qty||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateCLQty(\''+line.id+'\',this.value)"></td>';
+    html+='<td><input value="'+(line.weight||'')+'" readonly></td>';
+    html+='<td class="td-actions"><button class="btn-danger-text" onclick="removeClaimLine(\''+line.id+'\')">移除</button></td>';
+    html+='</tr>';
+  });
+  html+='</tbody></table>';
+  document.getElementById('claimLinesContainer').innerHTML=html;
+  refreshCLSummary();
+}
+
+function refreshCLSummary(){
+  var sd=document.getElementById('claimSummary');var tb=document.getElementById('claimSummaryBody');
+  var th=document.getElementById('claimSummaryHead');
+  var orderNcType=document.getElementById('claimNcType').value;
+  var isNc=orderNcType==='nc';
+  var vl=newClaimLines.filter(function(l){return l.weight>0;});
+  if(vl.length===0){sd.style.display='none';return;}
+  sd.style.display='block';
+  /* 动态表头 */
+  var headerHtml='<tr>';
+  if(isNc){
+    headerHtml+='<th>食材</th><th>净菜名称</th>';
+  }else{
+    headerHtml+='<th colspan="2">菜品/食材</th>';
+  }
+  headerHtml+='<th>包装规格</th><th>份数</th><th>数量(kg)</th></tr>';
+  th.innerHTML=headerHtml;
+  /* 数据行 */
+  var h='';vl.forEach(function(l){
+    if(isNc){
+      h+='<tr><td>'+l.ingredient+'</td><td>'+l.ncType+'</td>';
+    }else{
+      h+='<tr><td colspan="2">'+l.dish+'</td>';
+    }
+    h+='<td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
+  });
+  tb.innerHTML=h;
+}
+
+function submitClaim(){
+  var canteen=document.getElementById('claimCanteen').value;
+  if(!canteen){alert('请选择申领场所');return;}
+  var orderNcType=document.getElementById('claimNcType').value;
+  var vl;
+  if(orderNcType==='nc'){
+    vl=newClaimLines.filter(function(l){return l.ingredient&&l.ncType&&l.specGram>0&&l.qty>0;});
+  }else{
+    vl=newClaimLines.filter(function(l){return l.dish&&l.specGram>0&&l.qty>0;});
+  }
+  if(vl.length===0){alert('请至少完善一条菜品明细');return;}
+  var no='INT-'+String(claims.length+1).padStart(3,'0');
+  claims.unshift({claimNo:no,canteen:canteen,ncType:orderNcType,claimTime:new Date().toISOString().slice(0,16).replace('T',' '),deliverTime:document.getElementById('claimDeliveryTime').value||'—',deliverPerson:document.getElementById('claimDeliverPerson').value||'—',
+    lines:vl.map(function(l,i){
+      if(orderNcType==='nc'){
+        return {id:'L'+(Date.now()+i), ingredient:l.ingredient, ncName:l.ncType, spec:l.specLabel, qty:l.qty, weight:l.weight, status:'备货中'};
+      }else{
+        return {id:'L'+(Date.now()+i), foodName:l.dish, spec:l.specLabel, qty:l.qty, weight:l.weight, status:'备货中'};
+      }
+    })});
+  closeModal('modal-claim');renderClaimTable();
+  alert('申领单 '+no+' 创建成功，包含 '+vl.length+' 道菜品');
+}
+
+/* ========== 详情抽屉 ========== */
+function showDetail(claimNo){
+  var c=claims.find(function(x){return x.claimNo===claimNo;});if(!c)return;
+  var agg=aggregateStatus(c.lines);var tQ=c.lines.reduce(function(s,l){return s+l.qty;},0);var tW=c.lines.reduce(function(s,l){return s+parseFloat(l.weight);},0).toFixed(2);
+  var h='<div class="drawer-section"><div class="drawer-section__title">申领单信息</div><div class="drawer-fields">';
+  h+='<div class="drawer-field"><div class="drawer-field__label">申领单号</div><div class="drawer-field__value">'+claimNo+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">申领场所</div><div class="drawer-field__value">'+c.canteen+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">状态</div><div class="drawer-field__value">'+statusTag(agg)+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">净菜类型</div><div class="drawer-field__value">'+ncTypeTag(c.ncType)+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">菜品种类</div><div class="drawer-field__value">'+c.lines.length+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">总份数</div><div class="drawer-field__value">'+tQ+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">总数量(kg)</div><div class="drawer-field__value">'+tW+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">申领时间</div><div class="drawer-field__value">'+c.claimTime+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">预定配送时间</div><div class="drawer-field__value">'+c.deliverTime+'</div></div>';
+  h+='<div class="drawer-field"><div class="drawer-field__label">配送人</div><div class="drawer-field__value">'+c.deliverPerson+'</div></div>';
+  h+='</div></div>';
+  h+='<div class="drawer-section"><div class="drawer-section__title">申领明细（'+c.lines.length+' 道）</div>';
+  h+='<table class="ing-table"><thead><tr>';
+  if(c.ncType==='nc'){
+    h+='<th>食材</th><th>净菜名称</th>';
+  }else{
+    h+='<th colspan="2">菜品/食材</th>';
+  }
+  h+='<th>包装规格</th><th>份数</th><th>数量(kg)</th><th>状态</th></tr></thead><tbody>';
+  c.lines.forEach(function(l){
+    var tc={'已完成':'tag-green','配送中':'tag-blue','待配送':'tag-orange','备货中':'tag-gray'};
+    if(c.ncType==='nc'){
+      h+='<tr><td><b>'+l.ingredient+'</b></td><td>'+l.ncName+'</td>';
+    }else{
+      h+='<tr><td colspan="2"><b>'+l.foodName+'</b></td>';
+    }
+    h+='<td>'+l.spec+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td><td><span class="tag '+tc[l.status]+'">'+l.status+'</span></td></tr>';
+    if(c.ncType==='cp'){var ings=dishIngredients[l.foodName]||[];if(ings.length>0){h+='<tr><td colspan="6" style="padding:4px 10px;background:#fafafa;"><span style="font-size:11px;color:var(--text-placeholder);">食材构成：</span>';ings.forEach(function(ing,i){if(i>0)h+=', ';h+=ing.name+'('+ing.amount+')';});h+='</td></tr>';}}
+  });
+  h+='</tbody></table></div>';
+  var dh='<div class="drawer-overlay" onclick="if(event.target===this)closeDrawer()"><div class="drawer"><div class="drawer__header"><div class="drawer__title">净菜内供详情 — '+claimNo+'</div><button class="drawer__close" onclick="closeDrawer()">✕</button></div><div class="drawer__body">'+h+'</div></div></div>';
+  document.body.insertAdjacentHTML('beforeend',dh);
+}
+function closeDrawer(){var o=document.querySelector('.drawer-overlay');if(!o)return;o.classList.add('closing');setTimeout(function(){o.remove();},200);}
+
+renderClaimTable();
+</script>
 </body>
 </html>
diff --git a/web-admin/nutrition/sup-in-clean.html b/web-admin/nutrition/sup-in-clean.html
index b0f8e8b..47b2306 100644
--- a/web-admin/nutrition/sup-in-clean.html
+++ b/web-admin/nutrition/sup-in-clean.html
@@ -198,29 +198,29 @@ tbody td.td-actions{white-space:nowrap;}
     <div class="table-card__content">
       <table>
         <thead><tr>
-          <th>加工批次号</th><th>溯源码</th><th>食材名称</th><th>净菜类型</th><th>加工步骤</th><th>净菜需求量(kg)</th><th>毛菜重量(kg)</th><th>净菜产出量(kg)</th><th>出净率(%)</th><th>加工人员</th><th>开始时间</th><th>结束时间</th><th>质检结果</th><th>入库状态</th><th>操作</th>
+          <th>加工批次号</th><th>溯源码</th><th>食材名称</th><th>净菜类型</th><th>加工步骤</th><th>净菜需求量(kg)</th><th>毛菜重量(kg)</th><th>净菜产出量(kg)</th><th>出净率(%)</th><th>加工人员</th><th>开始时间</th><th>结束时间</th><th>入库状态</th><th>操作</th>
         </tr></thead>
         <tbody>
           <tr>
-            <td>PROC-001</td><td>NC-PROC-BOCA-20260415-01</td><td>土豆</td><td>土豆丝</td><td>去皮/切割</td><td>80</td><td>100</td><td>86</td><td>86.0</td><td>李加工</td><td>2026-04-15 08:00</td><td>2026-04-15 08:45</td><td><span class="tag tag-green">合格</span></td><td><span class="tag tag-green">已入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>PROC-001</td><td>NC-PROC-BOCA-20260415-01</td><td>土豆</td><td>土豆丝</td><td>去皮/切割</td><td>80</td><td>100</td><td>86</td><td>86.0</td><td>李加工</td><td>2026-04-15 08:00</td><td>2026-04-15 08:45</td><td><span class="tag tag-green">已入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>PROC-002</td><td>NC-PROC-HLUB-20260415-01</td><td>土豆</td><td>土豆片</td><td>去皮/切割</td><td>115</td><td>140</td><td>120</td><td>85.7</td><td>王加工</td><td>2026-04-15 08:30</td><td>2026-04-15 09:20</td><td><span class="tag tag-green">合格</span></td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="confirmGenStock(this)">生成入库单</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>PROC-002</td><td>NC-PROC-HLUB-20260415-01</td><td>土豆</td><td>土豆片</td><td>去皮/切割</td><td>115</td><td>140</td><td>120</td><td>85.7</td><td>王加工</td><td>2026-04-15 08:30</td><td>2026-04-15 09:20</td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="confirmGenStock(this)">生成入库单</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>PROC-003</td><td>NC-PROC-XGUO-20260415-01</td><td>土豆</td><td>土豆泥</td><td>去皮/切割</td><td>45</td><td>56</td><td>48</td><td>85.7</td><td>李加工</td><td>2026-04-15 09:00</td><td>2026-04-15 09:40</td><td><span class="tag tag-green">合格</span></td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="confirmGenStock(this)">生成入库单</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>PROC-003</td><td>NC-PROC-XGUO-20260415-01</td><td>土豆</td><td>土豆泥</td><td>去皮/切割</td><td>45</td><td>56</td><td>48</td><td>85.7</td><td>李加工</td><td>2026-04-15 09:00</td><td>2026-04-15 09:40</td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="confirmGenStock(this)">生成入库单</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>PROC-004</td><td>NC-PROC-SJDOU-20260415-01</td><td>四季豆</td><td>段（5cm）</td><td>清洗</td><td>50</td><td>60</td><td>52</td><td>86.7</td><td>张加工</td><td>2026-04-15 09:30</td><td>2026-04-15 10:00</td><td><span class="tag tag-orange">待处理</span></td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>PROC-004</td><td>NC-PROC-SJDOU-20260415-01</td><td>四季豆</td><td>段（5cm）</td><td>清洗</td><td>50</td><td>60</td><td>52</td><td>86.7</td><td>张加工</td><td>2026-04-15 09:30</td><td>2026-04-15 10:00</td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>PROC-005</td><td>NC-PROC-BCAI-20260415-01</td><td>白菜</td><td>整棵</td><td>清洗</td><td>65</td><td>80</td><td>70</td><td>87.5</td><td>张加工</td><td>2026-04-15 07:30</td><td>2026-04-15 08:10</td><td><span class="tag tag-green">合格</span></td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="confirmGenStock(this)">生成入库单</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>PROC-005</td><td>NC-PROC-BCAI-20260415-01</td><td>白菜</td><td>整棵</td><td>清洗</td><td>65</td><td>80</td><td>70</td><td>87.5</td><td>张加工</td><td>2026-04-15 07:30</td><td>2026-04-15 08:10</td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="confirmGenStock(this)">生成入库单</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>PROC-006</td><td>NC-PROC-ZLRJ-20260415-01</td><td>猪里脊</td><td>丁（1.5cm）</td><td>切割</td><td>72</td><td>80</td><td>76</td><td>95.0</td><td>王加工</td><td>2026-04-15 09:30</td><td>2026-04-15 09:55</td><td><span class="tag tag-green">合格</span></td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="confirmGenStock(this)">生成入库单</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>PROC-006</td><td>NC-PROC-ZLRJ-20260415-01</td><td>猪里脊</td><td>丁（1.5cm）</td><td>切割</td><td>72</td><td>80</td><td>76</td><td>95.0</td><td>王加工</td><td>2026-04-15 09:30</td><td>2026-04-15 09:55</td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="confirmGenStock(this)">生成入库单</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>PROC-007</td><td>NC-PROC-ZLRJ-20260415-02</td><td>猪里脊</td><td>条（4cm）</td><td>切割</td><td>80</td><td>90</td><td>85</td><td>94.4</td><td>李加工</td><td>2026-04-15 10:00</td><td>2026-04-15 10:30</td><td><span class="tag tag-orange">待处理</span></td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>PROC-007</td><td>NC-PROC-ZLRJ-20260415-02</td><td>猪里脊</td><td>条（4cm）</td><td>切割</td><td>80</td><td>90</td><td>85</td><td>94.4</td><td>李加工</td><td>2026-04-15 10:00</td><td>2026-04-15 10:30</td><td><span class="tag tag-gray">未入库</span></td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
         </tbody>
       </table>
@@ -294,7 +294,6 @@ tbody td.td-actions{white-space:nowrap;}
         <div class="form-item"><label>加工人员<span class="required">*</span></label><input type="text" placeholder="请输入加工人员"></div>
         <div class="form-item"><label>开始时间<span class="required">*</span></label><input type="datetime-local"></div>
         <div class="form-item"><label>结束时间</label><input type="datetime-local"></div>
-        <div class="form-item"><label>质检结果</label><select><option>请选择</option><option>合格</option><option>不合格</option><option>待检</option></select></div>
         <div class="form-item full"><label>备注</label><textarea placeholder="请输入备注信息"></textarea></div>
       </div>
     </div>