From b4dfe31b25eab76d923a9ae0f80fa6fa8f9f3bf6 Mon Sep 17 00:00:00 2001
From: fengpu <18691763612@163.com>
Date: Fri, 14 Aug 2026 19:09:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=AF=9B=E8=8F=9C=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E7=A7=A4PAD=E5=A4=96=E5=A3=B3=E6=94=B9=E9=80=A0=20+=20?=
 =?UTF-8?q?=E5=90=8E=E5=8E=A8=E8=A1=A5=E9=A4=90=E5=B1=8F=E9=A6=96=E7=89=88?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=20+=20=E9=85=8D=E9=80=81H5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=99=8D=E5=99=AA=20+=20=E8=90=A5=E5=85=BB=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E5=BD=95=E5=85=A5=E5=BC=BA=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 毛菜验收秤全页面 PAD 居中外壳(grid方案) + 验收列表动态列(有订单10列/无订单8列) + 返回导航referer统一
- 加工提示屏更名后厨补餐屏并完成首版设计(16格菜品余量监控四态看板 + 补餐/食谱来源标签)
- 配送H5: 移除派单倒计时与异常按钮; 配送中页新增商家联系条/备注展示/清单卡片化
- 营养管理: 餐品库高级搜索+筛选汇总条+操作历史; 食材录入改行内选择器+净菜包毛利率; 食材详情操作历史; 进货明细补金额单价

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .claude/memory/decisions.md                   |  13 +-
 .idea/claudeCodeTabState.xml                  |  44 +-
 other-module/canteen-device/doc/CHANGELOG.md  |  33 +
 other-module/canteen-device/index.html        |   8 +-
 .../processing-prompt-screen/index.html       | 732 +++++++++++++++++-
 .../raw-veg-inspection-scale/00-login.html    |  22 +-
 .../raw-veg-inspection-scale/00-welcome.html  |  25 +-
 .../01-verify-inspection.html                 | 201 +++--
 .../raw-veg-inspection-scale/02-settings.html |  48 +-
 .../03-verify-history.html                    |  24 +-
 .../04-ingredient-sampling.html               |  28 +-
 .../05-sampling-history.html                  |  25 +-
 .../raw-veg-inspection-scale/index.html       | 127 +--
 .../02-dispatch-incoming.html                 |  87 ---
 .../meal-delivery-h5/04-order-detail.html     |   6 -
 .../meal-delivery-h5/05-delivering.html       | 231 +++++-
 .../meal-delivery-h5/doc/CHANGELOG.md         |  15 +
 web-admin/nutrition/din-dish-add.html         | 450 +++++++----
 web-admin/nutrition/din-dish-all.html         | 335 ++++++--
 web-admin/nutrition/din-dish-own.html         | 477 ++++++++++--
 web-admin/nutrition/din-ingredient-add.html   | 329 ++++++--
 web-admin/nutrition/din-ingredient.html       | 228 +++++-
 web-admin/nutrition/doc/CHANGELOG.md          |  25 +
 web-admin/nutrition/farm-purchase.html        |  81 +-
 web-admin/nutrition/sup-in-raw.html           |  27 +-
 25 files changed, 2930 insertions(+), 691 deletions(-)
 create mode 100644 other-module/canteen-device/doc/CHANGELOG.md

diff --git a/.claude/memory/decisions.md b/.claude/memory/decisions.md
index 2db8b2b..48e9c7a 100644
--- a/.claude/memory/decisions.md
+++ b/.claude/memory/decisions.md
@@ -47,12 +47,13 @@
 ```css
 body {
   background: #05080f;             /* 全屏深色画布 */
-  min-height: 100vh; min-width: 1280px;
-  display: flex; align-items: center; justify-content: center;
+  min-height: 760px; min-width: 1320px;  /* PAD(720+40padding)×(1280+40padding) */
+  display: grid; place-items: center;    /* 用 grid 居中,不用 flex(见下文 Why) */
   padding: 20px;
 }
 .device-frame {
   width: 1280px; height: 720px;    /* PAD 横屏逻辑画布 */
+  flex-shrink: 0;                  /* 兜底保护:即使在 flex 容器中也禁止被压缩 */
   border-radius: 24px;             /* 硬件外壳圆角 */
   box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
   overflow: hidden;                /* 防止内容溢出滚动条 */
@@ -67,7 +68,15 @@ body {
 - 所有 1280×720 主屏页面（餐线营养秤、档口营养秤、配比秤、净菜柜、毛菜秤等）均按此模板改造
 - 副屏（如 480×320 双屏小屏）复用现有 `.screen-frame` 并升级阴影/圆角即可，无需新增 `.device-frame`
 - 内部 `height: calc(100vh - X)` 必须改为 `height: calc(100% - X)`，避免视口与外壳尺寸耦合
+- **body 用 `display: grid; place-items: center`,不要用 flex**。2026-08-14 毛菜秤改造严重踩坑:`body { display:flex; justify-content:center; align-items:center; min-width:1280px; padding:20px }` 配合 `.device-frame { width:1280px; flex-shrink:0 }` 时,flex 算法在主轴计算上把 device-frame 的 hypothetical main size 算成 1648px(1280 + 神秘 368px),导致 `justify-content:center` 把 device-frame 反向定位到 offsetLeft=-48,横向滚动条出现,视觉上"完全偏左不居中"。即使 `flex-shrink:0` 也救不了——这只防止压缩,不防止 flex 容器对 item 尺寸的错误估算。改用 grid 后,scrollWidth=1600=viewport、offsetLeft=160 完美居中。**这跟之前 commit 2373704 餐线营养秤的 flex 方案表现不同**,怀疑与 Chromium 版本/页面其他元素 min-content 计算有关,但 grid 方案在所有页面都稳定。
+- **`.device-frame` 仍要加 `flex-shrink: 0`** 作为兜底(虽然 body 已改 grid,但留作子项保护不会出错)
+- **body `min-width` / `min-height` 必须把 padding 算进去**:`min-width: 1320px` (= 1280 + 40 padding),`min-height: 760px` (= 720 + 40 padding)。注意 `* { box-sizing: border-box }` 下 min-width 作用在 border-box,所以 padding 已包含在 1320 内,不会重复加。
 - PAD 内禁止可见滚动条（见 [[feedback.md#PAD 终端页面内禁止可见滚动条]]）
+- **PAD 外壳改造的强制验证步骤**:改造完成后必须用浏览器实测
+  1. `document.querySelector('.device-frame').clientWidth === 1280`
+  2. `document.querySelector('.device-frame').getBoundingClientRect().left === (window.innerWidth - 1280) / 2`(居中验证)
+  3. `document.body.scrollWidth === window.innerWidth`(无横向溢出)
+  不能只靠代码审查。CSS flex/grid 子项宽度行为反直觉,代码看着对但实际塌缩/偏移很常见。
 
 **See Also**：
 - [[feedback.md#PAD 终端页面内禁止可见滚动条]]
diff --git a/.idea/claudeCodeTabState.xml b/.idea/claudeCodeTabState.xml
index b02f633..381792d 100644
--- a/.idea/claudeCodeTabState.xml
+++ b/.idea/claudeCodeTabState.xml
@@ -7,7 +7,7 @@
           <value>
             <TabSessionState>
               <option name="provider" value="claude" />
-              <option name="sessionId" value="fb705978-96d3-4a9f-a6d3-7f4cec5ca220" />
+              <option name="sessionId" value="283fd756-b396-42c1-9c09-92be9e28fc03" />
               <option name="cwd" value="$PROJECT_DIR$" />
               <option name="model" value="claude-opus-4-7[1m]" />
               <option name="permissionMode" value="bypassPermissions" />
@@ -19,7 +19,7 @@
           <value>
             <TabSessionState>
               <option name="provider" value="claude" />
-              <option name="sessionId" value="391f8576-7a1f-4033-8cf2-d9400d689a0f" />
+              <option name="sessionId" value="68c1996d-eec2-4ab9-b784-3ffb5361b022" />
               <option name="cwd" value="$PROJECT_DIR$" />
               <option name="model" value="claude-opus-4-7[1m]" />
               <option name="permissionMode" value="bypassPermissions" />
@@ -31,7 +31,43 @@
           <value>
             <TabSessionState>
               <option name="provider" value="claude" />
-              <option name="sessionId" value="2da2d834-e278-4620-b205-4ef3fca473f7" />
+              <option name="sessionId" value="3cb2ed86-4c98-42cc-a37c-8d213f6d3262" />
+              <option name="cwd" value="$PROJECT_DIR$" />
+              <option name="model" value="claude-opus-4-7[1m]" />
+              <option name="permissionMode" value="bypassPermissions" />
+              <option name="reasoningEffort" value="high" />
+            </TabSessionState>
+          </value>
+        </entry>
+        <entry key="3">
+          <value>
+            <TabSessionState>
+              <option name="provider" value="claude" />
+              <option name="sessionId" value="fbdaa82c-4db6-4524-af37-a9615f16dda7" />
+              <option name="cwd" value="$PROJECT_DIR$" />
+              <option name="model" value="claude-opus-4-7[1m]" />
+              <option name="permissionMode" value="bypassPermissions" />
+              <option name="reasoningEffort" value="high" />
+            </TabSessionState>
+          </value>
+        </entry>
+        <entry key="4">
+          <value>
+            <TabSessionState>
+              <option name="provider" value="claude" />
+              <option name="sessionId" value="b0afeb94-4113-4f79-989e-84bae83331a3" />
+              <option name="cwd" value="$PROJECT_DIR$" />
+              <option name="model" value="claude-opus-4-7[1m]" />
+              <option name="permissionMode" value="bypassPermissions" />
+              <option name="reasoningEffort" value="high" />
+            </TabSessionState>
+          </value>
+        </entry>
+        <entry key="5">
+          <value>
+            <TabSessionState>
+              <option name="provider" value="claude" />
+              <option name="sessionId" value="24dd6f10-4a49-4b9c-95fa-486906c3cdba" />
               <option name="cwd" value="$PROJECT_DIR$" />
               <option name="model" value="claude-opus-4-7[1m]" />
               <option name="permissionMode" value="bypassPermissions" />
@@ -41,6 +77,6 @@
         </entry>
       </map>
     </option>
-    <option name="tabCount" value="3" />
+    <option name="tabCount" value="6" />
   </component>
 </project>
\ No newline at end of file
diff --git a/other-module/canteen-device/doc/CHANGELOG.md b/other-module/canteen-device/doc/CHANGELOG.md
new file mode 100644
index 0000000..b721198
--- /dev/null
+++ b/other-module/canteen-device/doc/CHANGELOG.md
@@ -0,0 +1,33 @@
+# 餐厅终端设备模块变更日志
+
+## 2026-08-14 · 毛菜验收秤 PAD 外壳改造 + 后厨补餐屏首版设计
+
+### 变更一:毛菜验收秤全页面 PAD 居中外壳改造(`raw-veg-inspection-scale/` 全部 9 页)
+- 涉及页面:`00-login.html`、`00-welcome.html`、`01-verify-inspection.html`、`02-settings.html`、`03-verify-history.html`、`04-ingredient-sampling.html`、`05-sampling-history.html`、`index.html`
+- 统一采用「全屏深色画布(#05080f) + 居中 PAD 外壳(.device-frame 1280×720)」模式:
+  - `body { display: grid; place-items: center; padding: 20px; min-width: 1320px; min-height: 760px }`
+  - 外壳带 24px 圆角、深色投影与 1px 描边,还原 PAD 硬件外观
+  - 内部 `calc(100vh - X)` 高度全部改为 `calc(100% - X)`,与外壳尺寸解耦
+- **居中方案用 grid 不用 flex**:flex 容器下 device-frame 主轴 hypothetical size 会被错误估算(1280 被算成 1648),导致内容反向偏移出横向滚动条;grid 方案在所有页面稳定(详见记忆 decisions.md「餐厅终端设备 PAD 居中外壳设计模式」)
+
+### 变更二:毛菜验收秤验收页列表动态列(`01-verify-inspection.html`)
+- 食材验收列表表头与列宽由 `renderFoodList` 按"有订单/无订单"动态渲染:
+  - 有订单(10 列):食材/采购规格/采购量/采购单价(只读)/采购单金额(只读)/实收规格/实收量/实收单价/实收总价/操作
+  - 无订单(8 列):食材/采购规格/采购量/实收规格/实收量/实收单价/实收总价/操作
+- 采购单价为数据字典值,只读展示(灰字),不可编辑
+
+### 变更三:返回导航统一"从哪里来回哪里去"
+- `00-welcome.html` 跳转内页时统一携带 `referer` 参数
+- 各内页返回按钮优先读取 `referer` 参数 → `document.referrer` → 兜底 `index.html`;顶部返回按钮与底部返回链接共用同一逻辑
+
+### 变更四:模块导航页入口统一(`raw-veg-inspection-scale/index.html`)
+- 所有功能卡片(验收操作/食材采样/采样历史/验收记录/设置)统一指向 `00-login.html`,强制先登录再进入功能页
+
+### 变更五:加工提示屏更名为后厨补餐屏并完成首版设计(`processing-prompt-screen/index.html`)
+- 模块更名:「加工提示屏」→「后厨补餐屏」,定位调整为"菜品余量监控与补餐任务提示看板"
+- 首版设计内容:
+  - 顶部栏:餐次时段(午餐时段 10:30-13:30)+ 就餐状态标签 + 日期时钟
+  - 左侧 16 格菜品余量监控网格:每卡展示菜名/余量kg/余量进度条/已取量,四态色编码(充足绿/偏低金/告急红/无数据灰)+ 图例
+  - 菜品来源标签:补餐(红「补」)/ 食谱(蓝「谱」)双色标识
+  - 同步采用 PAD 居中外壳(grid 居中方案)
+- `canteen-device/index.html` 导航卡片同步更名、更新图标与描述
diff --git a/other-module/canteen-device/index.html b/other-module/canteen-device/index.html
index 50112be..eb43eba 100644
--- a/other-module/canteen-device/index.html
+++ b/other-module/canteen-device/index.html
@@ -223,10 +223,10 @@
         <div class="card__desc">净菜暂存与保鲜存储</div>
       </a>
       <a class="card" href="processing-prompt-screen/index.html">
-        <span class="card__status card__status--none">无需设计</span>
-        <div class="card__icon">&#x1F4FA;</div>
-        <div class="card__name">加工提示屏</div>
-        <div class="card__desc">加工流程提示与操作指引</div>
+        <span class="card__status card__status--design">待产品设计</span>
+        <div class="card__icon">&#x1F372;</div>
+        <div class="card__name">后厨补餐屏</div>
+        <div class="card__desc">菜品余量监控与补餐任务提示看板</div>
       </a>
     </div>
 
diff --git a/other-module/canteen-device/processing-prompt-screen/index.html b/other-module/canteen-device/processing-prompt-screen/index.html
index 8d22099..25a059c 100644
--- a/other-module/canteen-device/processing-prompt-screen/index.html
+++ b/other-module/canteen-device/processing-prompt-screen/index.html
@@ -3,32 +3,728 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=1280, initial-scale=1.0">
-  <title>加工提示屏 - 蚁熊智能餐养平台</title>
+  <title>后厨补餐屏 - 蚁熊智能餐养平台</title>
   <style>
     * { margin: 0; padding: 0; box-sizing: border-box; }
+    /* 外层视口：全屏深色画布,承载居中 PAD 外壳 */
     body {
       font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-      background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+      background: #05080f;
+      color: #fff;
+      min-height: 100vh;
+      min-width: 1280px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 20px;
+    }
+    /* PAD 设备外壳 */
+    .device-frame {
+      width: 1280px;
+      height: 720px;
+      background: #0e1326;
+      border-radius: 24px;
+      overflow: hidden;
+      box-shadow: 0 24px 64px rgba(0, 0, 0, 0.6), 0 0 0 1px rgba(255, 255, 255, 0.04);
+      position: relative;
+      display: flex;
+      flex-direction: column;
+    }
+
+    /* ===== 顶部栏 ===== */
+    .top-bar {
+      display: flex;
+      align-items: center;
+      height: 52px;
+      background: #1a2b4a;
+      padding: 0 24px;
+      border-bottom: 1px solid rgba(255, 255, 255, 0.06);
+      flex-shrink: 0;
+    }
+    .top-bar__left {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      font-size: 13px;
+      color: rgba(255, 255, 255, 0.7);
+      min-width: 280px;
+    }
+    .top-bar__left .icon { font-size: 16px; }
+    .top-bar__title {
+      flex: 1;
+      text-align: center;
+      font-size: 17px;
+      font-weight: 700;
+      color: #fff;
+      letter-spacing: 2px;
+    }
+    .top-bar__title .title-icon {
+      color: #60a5fa;
+      margin-right: 8px;
+    }
+    .top-bar__right {
+      min-width: 280px;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      gap: 10px;
+    }
+    .meal-tag {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      padding: 5px 12px;
+      border-radius: 14px;
+      background: rgba(96, 165, 250, 0.15);
+      border: 1px solid rgba(96, 165, 250, 0.35);
+      color: #93c5fd;
+      font-size: 12px;
+      font-weight: 600;
+    }
+    .meal-tag__dot {
+      width: 6px; height: 6px; border-radius: 50%;
+      background: #4ade80;
+      box-shadow: 0 0 6px rgba(74, 222, 128, 0.8);
+      animation: pulse 1.8s ease-in-out infinite;
+    }
+    @keyframes pulse {
+      0%, 100% { opacity: 1; transform: scale(1); }
+      50% { opacity: 0.5; transform: scale(0.85); }
+    }
+    .meal-time {
+      font-size: 12px;
+      color: rgba(255, 255, 255, 0.6);
+    }
+
+    /* ===== 主内容（两栏:菜品网格 + 生产计划） ===== */
+    .main {
+      flex: 1;
+      display: flex;
+      gap: 14px;
+      padding: 14px 18px 16px;
+      height: calc(100% - 52px);
+      overflow: hidden;
+    }
+
+    /* ===== 左侧:菜品监控网格区 ===== */
+    .center-col {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+      min-width: 0;
+    }
+    .center-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0 2px;
+    }
+    .center-header__title {
+      font-size: 13px;
+      font-weight: 600;
+      color: rgba(255, 255, 255, 0.7);
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+    .center-header__title .icon { color: #60a5fa; }
+    .legend {
+      display: flex;
+      gap: 12px;
+      font-size: 11px;
+      color: rgba(255, 255, 255, 0.55);
+      align-items: center;
+    }
+    .legend__group {
+      display: flex;
+      gap: 8px;
+      padding-left: 10px;
+      border-left: 1px solid rgba(255, 255, 255, 0.1);
+    }
+    .legend__dot {
+      display: inline-block;
+      width: 8px; height: 8px;
+      border-radius: 50%;
+      margin-right: 4px;
+      vertical-align: middle;
+    }
+    .legend__dot--ok { background: #4ade80; }
+    .legend__dot--warn { background: #fbbf24; }
+    .legend__dot--danger { background: #f87171; }
+    .legend__dot--empty { background: #4b5563; }
+    /* 来源标签图例 */
+    .legend__src {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 16px; height: 16px;
+      border-radius: 50%;
+      font-size: 10px;
+      font-weight: 700;
+      color: #fff;
+      margin-right: 4px;
+    }
+    .legend__src--bu { background: #f87171; }
+    .legend__src--pu { background: #60a5fa; }
+    .legend__src--dian { background: #a78bfa; }
+
+    .grid-wrap {
+      flex: 1;
+      overflow-y: auto;
+      scrollbar-width: none;
+    }
+    .grid-wrap::-webkit-scrollbar { display: none; }
+    .grid {
+      display: grid;
+      grid-template-columns: repeat(4, 1fr);
+      grid-auto-rows: minmax(0, 1fr);
+      gap: 10px;
+      height: 100%;
+    }
+    /* 餐位卡 */
+    .dish-card {
+      background: #1a2b4a;
+      border-radius: 10px;
+      padding: 11px 12px 10px;
+      border: 1px solid rgba(255, 255, 255, 0.05);
+      display: flex;
+      flex-direction: column;
+      gap: 6px;
+      position: relative;
+      transition: all 0.2s;
+      overflow: hidden;
+    }
+    .dish-card--urgent {
+      background: linear-gradient(180deg, rgba(127, 29, 29, 0.35) 0%, #1a2b4a 70%);
+      border-color: rgba(248, 113, 113, 0.4);
+      box-shadow: 0 0 0 1px rgba(248, 113, 113, 0.15) inset;
+    }
+    .dish-card--warn {
+      background: linear-gradient(180deg, rgba(146, 64, 14, 0.3) 0%, #1a2b4a 70%);
+      border-color: rgba(251, 191, 36, 0.35);
+    }
+    .dish-card--ok {
+      background: linear-gradient(180deg, rgba(20, 83, 45, 0.28) 0%, #1a2b4a 70%);
+      border-color: rgba(74, 222, 128, 0.3);
+    }
+    .dish-card__head {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+    .dish-card__icon { font-size: 15px; flex-shrink: 0; }
+    .dish-card__name {
+      font-size: 13px;
+      font-weight: 600;
+      color: #fff;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      flex: 1;
+    }
+    /* 圆形来源标签 */
+    .src-tag {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 18px; height: 18px;
+      border-radius: 50%;
+      font-size: 11px;
+      font-weight: 700;
+      color: #fff;
+      flex-shrink: 0;
+      line-height: 1;
+    }
+    .src-tag--bu { background: #f87171; }   /* 补餐 - 红 */
+    .src-tag--pu { background: #60a5fa; }   /* 食谱 - 蓝 */
+    .src-tag--dian { background: #a78bfa; } /* 点餐 - 紫 */
+    .dish-card__qty {
+      font-size: 20px;
+      font-weight: 800;
+      color: #4ade80;
+      font-family: "DIN Alternate", sans-serif;
+      line-height: 1;
+    }
+    .dish-card--warn .dish-card__qty { color: #fbbf24; }
+    .dish-card--urgent .dish-card__qty { color: #f87171; }
+    .dish-card__qty-unit {
+      font-size: 11px;
+      color: rgba(255, 255, 255, 0.5);
+      font-weight: 500;
+      margin-left: 2px;
+    }
+    .dish-card__bar {
+      height: 4px;
+      background: rgba(255, 255, 255, 0.08);
+      border-radius: 2px;
+      overflow: hidden;
+    }
+    .dish-card__bar > span {
+      display: block;
+      height: 100%;
+      border-radius: 2px;
+    }
+    .dish-card__meta {
+      display: flex;
+      justify-content: space-between;
+      font-size: 10px;
+      color: rgba(255, 255, 255, 0.5);
+    }
+    .dish-card__tag {
+      position: absolute;
+      top: 8px;
+      right: 8px;
+      font-size: 9px;
+      padding: 2px 5px;
+      border-radius: 6px;
+      font-weight: 600;
+      line-height: 1;
+    }
+    .dish-card__tag--danger {
+      background: rgba(248, 113, 113, 0.22);
+      color: #fca5a5;
+      border: 1px solid rgba(248, 113, 113, 0.4);
+    }
+    .dish-card__tag--warn {
+      background: rgba(251, 191, 36, 0.22);
+      color: #fcd34d;
+      border: 1px solid rgba(251, 191, 36, 0.4);
+    }
+    /* 无开餐数据占位 */
+    .dish-card--empty {
+      align-items: center;
+      justify-content: center;
+      background: #161f33;
+      border: 1px dashed rgba(255, 255, 255, 0.08);
+    }
+    .dish-card--empty .empty-icon {
+      font-size: 22px;
+      color: rgba(255, 255, 255, 0.25);
+      margin-bottom: 4px;
+    }
+    .dish-card--empty .empty-text {
+      font-size: 11px;
+      color: rgba(255, 255, 255, 0.28);
+    }
+
+    /* ===== 右栏:生产计划 ===== */
+    .right-col {
+      width: 290px;
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+      flex-shrink: 0;
+    }
+    /* 右栏顶部来源图例条 */
+    .src-legend {
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      padding: 9px 10px;
+      background: rgba(96, 165, 250, 0.08);
+      border: 1px solid rgba(96, 165, 250, 0.18);
+      border-radius: 10px;
+      flex-shrink: 0;
+    }
+    .src-legend__item {
+      display: inline-flex;
+      align-items: center;
+      gap: 5px;
+      font-size: 11px;
+      color: rgba(255, 255, 255, 0.75);
+      font-weight: 500;
+    }
+    .plan-block {
+      background: #1a2b4a;
+      border-radius: 12px;
+      padding: 12px 14px;
+      border: 1px solid rgba(255, 255, 255, 0.06);
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+      min-height: 0;
+    }
+    .plan-block__head {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: 10px;
+      padding-bottom: 8px;
+      border-bottom: 1px solid rgba(255, 255, 255, 0.06);
+    }
+    .plan-block__title {
+      font-size: 13px;
+      font-weight: 600;
+      color: #fff;
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+    .plan-block__title .icon { color: #60a5fa; font-size: 14px; }
+    .plan-block__count {
+      font-size: 14px;
+      font-weight: 700;
+      color: #60a5fa;
+      font-family: "DIN Alternate", sans-serif;
+      padding: 2px 10px;
+      background: rgba(96, 165, 250, 0.12);
+      border-radius: 10px;
+    }
+    .plan-block__count--done {
+      color: #4ade80;
+      background: rgba(74, 222, 128, 0.12);
+    }
+    .plan-list {
+      list-style: none;
+      display: flex;
+      flex-direction: column;
+      gap: 6px;
+      overflow-y: auto;
+      scrollbar-width: none;
+      flex: 1;
+    }
+    .plan-list::-webkit-scrollbar { display: none; }
+    .plan-list__item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 7px 10px;
+      background: rgba(255, 255, 255, 0.03);
+      border-radius: 6px;
+      font-size: 12px;
+      color: rgba(255, 255, 255, 0.85);
+      gap: 8px;
+    }
+    .plan-list__item .item-name {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      flex: 1;
+      min-width: 0;
+    }
+    .plan-list__item .item-name .name-text {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .plan-list__item .item-qty {
+      color: rgba(255, 255, 255, 0.5);
+      font-size: 11px;
+      font-family: "DIN Alternate", sans-serif;
+      flex-shrink: 0;
+    }
+    .plan-list__item--done .item-name .name-text { color: rgba(255, 255, 255, 0.55); }
+    .plan-list__empty {
+      text-align: center;
+      font-size: 11px;
+      color: rgba(255, 255, 255, 0.3);
+      padding: 20px 0;
     }
-    .top-bar { display: flex; align-items: center; height: 44px; background: #1a2b4a; padding: 0 20px; }
-    .back-btn { font-size: 14px; cursor: pointer; color: rgba(255,255,255,0.7); text-decoration: none; transition: color 0.2s; }
-    .back-btn:hover { color: #fff; }
-    .top-bar__title { flex: 1; text-align: center; font-size: 15px; font-weight: 600; color: rgba(255,255,255,0.85); }
-    .main { display: flex; align-items: center; justify-content: center; height: calc(100% - 44px); }
-    .placeholder { text-align: center; color: rgba(255,255,255,0.3); }
-    .placeholder__icon { font-size: 48px; margin-bottom: 16px; }
-    .placeholder__text { font-size: 14px; }
   </style>
 </head>
 <body>
-  <div class="top-bar">
-    <span class="top-bar__title">加工提示屏</span>
-  </div>
-  <div class="main">
-    <div class="placeholder">
-      <div class="placeholder__icon">&#x1F6A7;</div>
-      <div class="placeholder__text">加工提示屏 &#x9875;&#x9762;&#x5F85;&#x5F00;&#x53D1;</div>
+
+  <div class="device-frame">
+
+    <!-- 顶部栏 -->
+    <div class="top-bar">
+      <div class="top-bar__left">
+        <span class="icon">&#x1F4C5;</span>
+        <span>2026-08-13 星期四</span>
+        <span style="color: rgba(255,255,255,0.3);">|</span>
+        <span class="icon">&#x1F552;</span>
+        <span>10:48</span>
+      </div>
+      <div class="top-bar__title">
+        <span class="title-icon">&#x1F372;</span>后厨补餐屏
+      </div>
+      <div class="top-bar__right">
+        <span class="meal-time">午餐时段 10:30 - 13:30</span>
+        <span class="meal-tag">
+          <span class="meal-tag__dot"></span>
+          进行中
+        </span>
+      </div>
     </div>
+
+    <!-- 主内容 两栏 -->
+    <div class="main">
+
+      <!-- 左侧:16 格菜品监控网格 -->
+      <div class="center-col">
+        <div class="center-header">
+          <div class="center-header__title">
+            <span class="icon">&#x1F37D;&#xFE0F;</span>餐线菜品余量看板（共 16 道）
+          </div>
+          <div class="legend">
+            <span><span class="legend__dot legend__dot--ok"></span>充足</span>
+            <span><span class="legend__dot legend__dot--warn"></span>偏低</span>
+            <span><span class="legend__dot legend__dot--danger"></span>告急</span>
+            <span><span class="legend__dot legend__dot--empty"></span>无数据</span>
+          </div>
+        </div>
+        <div class="grid-wrap">
+          <div class="grid">
+
+            <!-- 1. 告急-补餐 -->
+            <div class="dish-card dish-card--urgent">
+              <span class="dish-card__tag dish-card__tag--danger">告急</span>
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F95A;</span>
+                <span class="dish-card__name">拌莴苣鸡蛋</span>
+              </div>
+              <div><span class="dish-card__qty">0.31</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:8%;background:#f87171;"></span></div>
+              <div class="dish-card__meta"><span>余量 8%</span><span>已取 3.49kg</span></div>
+            </div>
+
+            <!-- 2. 偏低-补餐 -->
+            <div class="dish-card dish-card--warn">
+              <span class="dish-card__tag dish-card__tag--warn">偏低</span>
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F9C4;</span>
+                <span class="dish-card__name">炝炒菠菜</span>
+              </div>
+              <div><span class="dish-card__qty">0.85</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:22%;background:#fbbf24;"></span></div>
+              <div class="dish-card__meta"><span>余量 22%</span><span>已取 3.0kg</span></div>
+            </div>
+
+            <!-- 3. 充足-食谱 -->
+            <div class="dish-card dish-card--ok">
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F35A;</span>
+                <span class="dish-card__name">大米饭</span>
+              </div>
+              <div><span class="dish-card__qty">6.20</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:78%;background:#4ade80;"></span></div>
+              <div class="dish-card__meta"><span>余量 78%</span><span>已取 1.8kg</span></div>
+            </div>
+
+            <!-- 4. 充足-食谱 -->
+            <div class="dish-card dish-card--ok">
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F966;</span>
+                <span class="dish-card__name">虾皮烧冬瓜</span>
+              </div>
+              <div><span class="dish-card__qty">5.10</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:65%;background:#4ade80;"></span></div>
+              <div class="dish-card__meta"><span>余量 65%</span><span>已取 2.7kg</span></div>
+            </div>
+
+            <!-- 5. 充足-食谱 -->
+            <div class="dish-card dish-card--ok">
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F356;</span>
+                <span class="dish-card__name">牛肉饼</span>
+              </div>
+              <div><span class="dish-card__qty">4.30</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:58%;background:#4ade80;"></span></div>
+              <div class="dish-card__meta"><span>余量 58%</span><span>已取 3.1kg</span></div>
+            </div>
+
+            <!-- 6. 偏低-补餐 -->
+            <div class="dish-card dish-card--warn">
+              <span class="dish-card__tag dish-card__tag--warn">偏低</span>
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F95B;</span>
+                <span class="dish-card__name">苦瓜炒猪肉</span>
+              </div>
+              <div><span class="dish-card__qty">1.05</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:28%;background:#fbbf24;"></span></div>
+              <div class="dish-card__meta"><span>余量 28%</span><span>已取 2.7kg</span></div>
+            </div>
+
+            <!-- 7. 充足-食谱 -->
+            <div class="dish-card dish-card--ok">
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F97A;</span>
+                <span class="dish-card__name">青椒炒肉丝</span>
+              </div>
+              <div><span class="dish-card__qty">3.80</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:52%;background:#4ade80;"></span></div>
+              <div class="dish-card__meta"><span>余量 52%</span><span>已取 3.5kg</span></div>
+            </div>
+
+            <!-- 8. 充足-食谱 -->
+            <div class="dish-card dish-card--ok">
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F9C7;</span>
+                <span class="dish-card__name">肉夹馍</span>
+              </div>
+              <div><span class="dish-card__qty">4.50</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:68%;background:#4ade80;"></span></div>
+              <div class="dish-card__meta"><span>余量 68%</span><span>已取 2.1kg</span></div>
+            </div>
+
+            <!-- 9. 充足-点餐 -->
+            <div class="dish-card dish-card--ok">
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F364;</span>
+                <span class="dish-card__name">蒸饺</span>
+              </div>
+              <div><span class="dish-card__qty">2.80</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:48%;background:#4ade80;"></span></div>
+              <div class="dish-card__meta"><span>余量 48%</span><span>已取 3.0kg</span></div>
+            </div>
+
+            <!-- 10. 充足-点餐 -->
+            <div class="dish-card dish-card--ok">
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F35F;</span>
+                <span class="dish-card__name">红烧排骨</span>
+              </div>
+              <div><span class="dish-card__qty">3.20</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:55%;background:#4ade80;"></span></div>
+              <div class="dish-card__meta"><span>余量 55%</span><span>已取 2.6kg</span></div>
+            </div>
+
+            <!-- 11. 偏低-点餐 -->
+            <div class="dish-card dish-card--warn">
+              <span class="dish-card__tag dish-card__tag--warn">偏低</span>
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F361;</span>
+                <span class="dish-card__name">糖醋里脊</span>
+              </div>
+              <div><span class="dish-card__qty">0.95</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:24%;background:#fbbf24;"></span></div>
+              <div class="dish-card__meta"><span>余量 24%</span><span>已取 3.0kg</span></div>
+            </div>
+
+            <!-- 12. 充足-补餐 -->
+            <div class="dish-card dish-card--ok">
+              <div class="dish-card__head">
+                <span class="dish-card__icon">&#x1F35C;</span>
+                <span class="dish-card__name">番茄蛋汤</span>
+              </div>
+              <div><span class="dish-card__qty">5.60</span><span class="dish-card__qty-unit">kg</span></div>
+              <div class="dish-card__bar"><span style="width:72%;background:#4ade80;"></span></div>
+              <div class="dish-card__meta"><span>余量 72%</span><span>已取 2.2kg</span></div>
+            </div>
+
+            <!-- 13~16 无开餐数据 -->
+            <div class="dish-card dish-card--empty">
+              <div class="empty-icon">&#x1F963;</div>
+              <div class="empty-text">无开餐数据</div>
+            </div>
+            <div class="dish-card dish-card--empty">
+              <div class="empty-icon">&#x1F963;</div>
+              <div class="empty-text">无开餐数据</div>
+            </div>
+            <div class="dish-card dish-card--empty">
+              <div class="empty-icon">&#x1F963;</div>
+              <div class="empty-text">无开餐数据</div>
+            </div>
+            <div class="dish-card dish-card--empty">
+              <div class="empty-icon">&#x1F963;</div>
+              <div class="empty-text">无开餐数据</div>
+            </div>
+
+          </div>
+        </div>
+      </div>
+
+      <!-- 右栏:当前菜品生产计划 -->
+      <div class="right-col">
+        <!-- 来源图例 -->
+        <div class="src-legend">
+          <span class="src-legend__item"><span class="legend__src legend__src--bu">补</span>补餐</span>
+          <span class="src-legend__item"><span class="legend__src legend__src--pu">谱</span>食谱</span>
+          <span class="src-legend__item"><span class="legend__src legend__src--dian">点</span>点餐</span>
+        </div>
+
+        <!-- 未制作 -->
+        <div class="plan-block">
+          <div class="plan-block__head">
+            <div class="plan-block__title">
+              <span class="icon">&#x2754;</span>未制作
+            </div>
+            <span class="plan-block__count">7</span>
+          </div>
+          <ul class="plan-list">
+            <li class="plan-list__item">
+              <span class="item-name">
+                <span>&#x1F35A;</span>
+                <span class="name-text">大米饭</span>
+                <span class="src-tag src-tag--bu">补</span>
+              </span>
+              <span class="item-qty">0g</span>
+            </li>
+            <li class="plan-list__item">
+              <span class="item-name">
+                <span>&#x1F966;</span>
+                <span class="name-text">虾皮烧冬瓜</span>
+                <span class="src-tag src-tag--pu">谱</span>
+              </span>
+              <span class="item-qty">0g</span>
+            </li>
+            <li class="plan-list__item">
+              <span class="item-name">
+                <span>&#x1F9C4;</span>
+                <span class="name-text">炝炒菠菜</span>
+                <span class="src-tag src-tag--bu">补</span>
+              </span>
+              <span class="item-qty">0g</span>
+            </li>
+            <li class="plan-list__item">
+              <span class="item-name">
+                <span>&#x1F356;</span>
+                <span class="name-text">牛肉饼</span>
+                <span class="src-tag src-tag--pu">谱</span>
+              </span>
+              <span class="item-qty">0g</span>
+            </li>
+            <li class="plan-list__item">
+              <span class="item-name">
+                <span>&#x1F95B;</span>
+                <span class="name-text">苦瓜炒猪肉</span>
+                <span class="src-tag src-tag--bu">补</span>
+              </span>
+              <span class="item-qty">0g</span>
+            </li>
+            <li class="plan-list__item">
+              <span class="item-name">
+                <span>&#x1F97A;</span>
+                <span class="name-text">青椒炒肉丝</span>
+                <span class="src-tag src-tag--pu">谱</span>
+              </span>
+              <span class="item-qty">0g</span>
+            </li>
+            <li class="plan-list__item">
+              <span class="item-name">
+                <span>&#x1F9C7;</span>
+                <span class="name-text">肉夹馍</span>
+                <span class="src-tag src-tag--pu">谱</span>
+              </span>
+              <span class="item-qty">0g</span>
+            </li>
+          </ul>
+        </div>
+
+        <!-- 已制作 -->
+        <div class="plan-block">
+          <div class="plan-block__head">
+            <div class="plan-block__title">
+              <span class="icon" style="color:#4ade80;">&#x2705;</span>已制作
+            </div>
+            <span class="plan-block__count plan-block__count--done">1</span>
+          </div>
+          <ul class="plan-list">
+            <li class="plan-list__item plan-list__item--done">
+              <span class="item-name">
+                <span>&#x1F95A;</span>
+                <span class="name-text">拌莴苣鸡蛋</span>
+                <span class="src-tag src-tag--bu">补</span>
+              </span>
+              <span class="item-qty">3.80kg</span>
+            </li>
+          </ul>
+        </div>
+      </div>
+
+    </div>
+
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/other-module/canteen-device/raw-veg-inspection-scale/00-login.html b/other-module/canteen-device/raw-veg-inspection-scale/00-login.html
index 8feeecf..7538b3c 100644
--- a/other-module/canteen-device/raw-veg-inspection-scale/00-login.html
+++ b/other-module/canteen-device/raw-veg-inspection-scale/00-login.html
@@ -8,12 +8,27 @@
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
       font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-      background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+      background: #05080f;
+      min-height: 760px; min-width: 1320px;
+      display: grid; place-items: center;
+      padding: 20px;
+    }
+    /* PAD 居中外壳 */
+    .device-frame {
+      width: 1280px; height: 720px;
+      flex-shrink: 0;
+      background: #0e1326; color: #fff;
+      border-radius: 24px;
+      box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
+      overflow: hidden;
+      position: relative;
+      display: flex; flex-direction: column;
     }
 
     /* ---- 顶部导航栏 ---- */
     .top-bar {
       display: flex; align-items: center; height: 44px; background: #1a2b4a; padding: 0 20px;
+      flex-shrink: 0;
     }
     .back-btn {
       font-size: 14px; cursor: pointer; color: rgba(255,255,255,0.7); text-decoration: none; transition: color 0.2s;
@@ -27,6 +42,7 @@
     .login-main {
       display: flex; align-items: center; justify-content: center;
       height: calc(100% - 44px); padding: 24px 32px;
+      flex: 1; min-height: 0;
     }
 
     /* 登录面板 */
@@ -132,6 +148,8 @@
 </head>
 <body>
 
+  <div class="device-frame">
+
   <div class="top-bar">
     <span class="top-bar__title">毛菜验收秤 - 员工登录</span>
   </div>
@@ -176,6 +194,8 @@
     </div>
   </div>
 
+  </div>
+
   <div class="toast" id="toast"></div>
 
   <script>
diff --git a/other-module/canteen-device/raw-veg-inspection-scale/00-welcome.html b/other-module/canteen-device/raw-veg-inspection-scale/00-welcome.html
index f0340dc..f7205d5 100644
--- a/other-module/canteen-device/raw-veg-inspection-scale/00-welcome.html
+++ b/other-module/canteen-device/raw-veg-inspection-scale/00-welcome.html
@@ -8,12 +8,27 @@
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
       font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-      background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+      background: #05080f;
+      min-height: 760px; min-width: 1320px;
+      display: grid; place-items: center;
+      padding: 20px;
+    }
+    /* PAD 居中外壳 */
+    .device-frame {
+      width: 1280px; height: 720px;
+      flex-shrink: 0;
+      background: #0e1326; color: #fff;
+      border-radius: 24px;
+      box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
+      overflow: hidden;
+      position: relative;
+      display: flex; flex-direction: column;
     }
 
     /* ---- 顶部导航栏 ---- */
     .top-bar {
       display: flex; align-items: center; height: 44px; background: #1a2b4a; padding: 0 20px;
+      flex-shrink: 0;
     }
     .back-btn {
       font-size: 14px; cursor: pointer; color: rgba(255,255,255,0.7); text-decoration: none; transition: color 0.2s;
@@ -34,6 +49,7 @@
     .menu-main {
       display: flex; align-items: center; justify-content: center;
       height: calc(100% - 44px); padding: 24px 32px;
+      flex: 1; min-height: 0;
     }
 
     .menu-panel {
@@ -89,6 +105,8 @@
 </head>
 <body>
 
+  <div class="device-frame">
+
   <div class="top-bar">
     <span class="top-bar__title">毛菜验收秤 - 功能菜单</span>
     <span class="top-bar__user" id="topUser">--</span>
@@ -149,6 +167,8 @@
     </div>
   </div>
 
+  </div>
+
   <div class="toast" id="toast"></div>
 
   <script>
@@ -178,7 +198,8 @@
         window.location.href = '00-login.html';
         return;
       }
-      window.location.href = target + '?user=' + encodeURIComponent(currentUser.name) + '&uid=' + currentUser.id;
+      // 携带 referer 参数,内页返回按钮据此"从哪里来回哪里去"
+      window.location.href = target + '?user=' + encodeURIComponent(currentUser.name) + '&uid=' + currentUser.id + '&referer=00-welcome.html';
     }
 
     function handleLogout() {
diff --git a/other-module/canteen-device/raw-veg-inspection-scale/01-verify-inspection.html b/other-module/canteen-device/raw-veg-inspection-scale/01-verify-inspection.html
index 6b96d00..6942c19 100644
--- a/other-module/canteen-device/raw-veg-inspection-scale/01-verify-inspection.html
+++ b/other-module/canteen-device/raw-veg-inspection-scale/01-verify-inspection.html
@@ -8,13 +8,28 @@
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
       font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-      background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+      background: #05080f;
+      min-height: 760px; min-width: 1320px;
+      display: grid; place-items: center;
+      padding: 20px;
       user-select: none;
     }
+    /* PAD 居中外壳 */
+    .device-frame {
+      width: 1280px; height: 720px;
+      flex-shrink: 0;
+      background: #0e1326; color: #fff;
+      border-radius: 24px;
+      box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
+      overflow: hidden;
+      position: relative;
+      display: flex; flex-direction: column;
+    }
 
     /* ---- 顶部导航栏（含称重读数） ---- */
     .top-bar {
       display: flex; align-items: center; height: 52px; background: #1a2b4a; padding: 0 20px;
+      flex-shrink: 0;
     }
     .back-btn {
       font-size: 14px; cursor: pointer; color: rgba(255,255,255,0.7); text-decoration: none; transition: color 0.2s;
@@ -274,6 +289,12 @@
       font-family: monospace; letter-spacing: 0.3px;
     }
     .food-row__price { font-size: 12px; color: rgba(255,255,255,0.6); }
+    /* 只读采购单价(数据字典值,不可编辑) */
+    .food-row__price-readonly {
+      display: inline-block; width: 100%; padding: 2px 4px;
+      color: rgba(255,255,255,0.45); font-size: 12px; text-align: center;
+      font-weight: 500;
+    }
     .food-row__price-input {
       width: 100%; background: rgba(255,255,255,0.05); border: 1px solid rgba(255,255,255,0.1);
       border-radius: 4px; padding: 2px 4px; color: #faad14; font-size: 12px; text-align: center;
@@ -714,10 +735,12 @@
 </head>
 <body>
 
+  <div class="device-frame">
+
   <!-- 顶部导航（含称重读数） -->
   <div class="top-bar">
-
-    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>    <span class="page-title">食材验收识别屏</span>
+    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>
+    <span class="page-title">食材验收识别屏</span>
     <div class="user-info">
       <div class="avatar" id="userAvatar">张</div>
       <span id="userName">张三</span>
@@ -829,11 +852,9 @@
         </div>
       </div>
 
-      <!-- 食材验收列表 -->
+      <!-- 食材验收列表(表头与列宽由 renderFoodList 按"有订单/无订单"动态渲染) -->
       <div class="food-list" id="completedFoodList" style="display:none;">
-        <div class="food-list__head" id="foodListHead">
-          <span>食材</span><span>采购规格</span><span>采购量</span><span>采购单价</span><span>应付金额</span><span>实收规格</span><span>实收量</span><span>操作</span>
-        </div>
+        <div class="food-list__head" id="foodListHead"></div>
         <div class="food-list__body" id="foodList"></div>
       </div>
 
@@ -1006,6 +1027,8 @@
     </div>
   </div>
 
+  </div>
+
   <div class="toast" id="toast"></div>
 
   <script>
@@ -1149,9 +1172,6 @@
     }
 
     /* ===== 初始化 ===== */
-    /* 来源页，用于返回按钮 */
-    var refererPage = '00-welcome.html';
-
     function init() {
       currentUser = {
         name: getQueryParam('user') || '张三',
@@ -1160,36 +1180,19 @@
       document.getElementById('userName').textContent = currentUser.name;
       document.getElementById('userAvatar').textContent = currentUser.name.charAt(0);
 
-      /* 根据来源设置返回目标页 */
-      refererPage = detectRefererPage();
-      var backBtn = document.getElementById('topBackBtn');
-      if (backBtn) backBtn.href = refererPage;
-
       initDirectSupplierSelect();
       renderOrderCards();
-      if (backBtn) bindBackBtn();
+      bindBackBtn();
       bindCameraClick();
     }
 
-    /* 根据 URL 参数或 referrer 判断来源页 */
-    function detectRefererPage() {
-      var ref = document.referrer || '';
-      if (ref.indexOf('05-sampling-history.html') !== -1) return '05-sampling-history.html';
-      if (ref.indexOf('04-ingredient-sampling.html') !== -1) return '04-ingredient-sampling.html';
-      if (ref.indexOf('00-welcome.html') !== -1) return '00-welcome.html';
-      if (ref.indexOf('index.html') !== -1) return 'index.html';
-      /* URL 参数兜底 */
-      if (getQueryParam('sampleRef')) return '05-sampling-history.html';
-      if (getQueryParam('sampled')) return '04-ingredient-sampling.html';
-      return '00-welcome.html';
-    }
-
-    /* ===== 拦截返回按钮 ===== */
+    /* ===== 拦截返回按钮：step2 时若有验收数据则弹确认,否则回 step1 ===== */
     function bindBackBtn() {
-      document.getElementById('topBackBtn').addEventListener('click', function(e) {
+      var btn = document.getElementById('backBtn');
+      if (!btn) return;
+      btn.addEventListener('click', function(e) {
         if (step === 2) {
           e.preventDefault();
-          // 检查是否有验收数据
           var hasData = foodResults.some(function(r) { return r !== null; });
           if (hasData) {
             document.getElementById('backConfirmOverlay').classList.add('show');
@@ -1206,7 +1209,9 @@
 
     function confirmBack() {
       document.getElementById('backConfirmOverlay').classList.remove('show');
-      window.location.href = refererPage;
+      // 跳向与 backBtn 同源的目标(由末尾 IIFE 设置:优先 referer 参数 → referrer → index)
+      var btn = document.getElementById('backBtn');
+      window.location.href = btn ? btn.href : 'index.html';
     }
 
     function backToStep1() {
@@ -1426,14 +1431,28 @@
       startSceneSimulation();
     }
 
-    /* ===== 食材列表渲染（8列：食材/采购规格/采购量/采购单价/应付金额/实收规格/实收量/操作） ===== */
+    /* ===== 食材列表渲染 =====
+     * 有订单(10列): 食材/采购规格/采购量/采购单价(只读)/采购单金额(只读)/实收规格/实收量/实收单价/实收总价/操作
+     * 无订单(8列):  食材/采购规格/采购量/实收规格/实收量/实收单价/实收总价/操作
+     */
     function renderFoodList() {
       if (!selectedOrder) return;
       var headEl = document.getElementById('foodListHead');
       if (!headEl) return;
 
-      var gridCols = '1fr 56px 50px 56px 58px 50px 50px 52px';
+      var isDirect = !!selectedOrder._direct;
+      /* 列宽(单位 px,首列 1fr 自适应)
+       * 有订单(10列): 食材/采购规格/采购量/采购单价/采购单金额/实收规格/实收量/实收单价/实收总价/操作
+       * 无订单(6列):  食材/实收规格/实收量/实收单价/实收总价/操作
+       */
+      var gridCols = isDirect
+        ? '1fr 50px 50px 56px 60px 52px'
+        : '1fr 56px 50px 56px 60px 50px 50px 56px 60px 52px';
       headEl.style.gridTemplateColumns = gridCols;
+      /* 表头文字 */
+      headEl.innerHTML = isDirect
+        ? '<span>食材</span><span>实收规格</span><span>实收量</span><span>实收单价</span><span>实收总价</span><span>操作</span>'
+        : '<span>食材</span><span>采购规格</span><span>采购量</span><span>采购单价</span><span>采购单金额</span><span>实收规格</span><span>实收量</span><span>实收单价</span><span>实收总价</span><span>操作</span>';
 
       var html = '';
       for (var i = 0; i < selectedOrder.foods.length; i++) {
@@ -1465,18 +1484,16 @@
           hasRecord = false;
         }
 
-        /* 获取当前单价（支持自定义） */
-        var currentPrice = (f._customPrice !== undefined) ? f._customPrice : info.price;
+        /* 采购单价(数据字典值,只读展示。无订单模式不显示该列) */
+        var currentPrice = info.price;
 
-        /* 采购量列（无订单显示"--"） */
-        var isDirectOrder = selectedOrder._direct;
+        /* 采购量列(无订单显示"--") */
         var orderQty = spice ? (f._orderQty || f.weight || 0) : f.weight;
-        var orderQtyHtml = isDirectOrder
+        var orderQtyHtml = isDirect
           ? '<span class="food-row__weight" style="color:rgba(255,255,255,0.25);">--</span>'
           : '<span class="food-row__weight">' + (spice ? orderQty : orderQty.toFixed(1)) + '</span>';
 
-        /* 规格下拉选项（按 verifyType 分类过滤） */
-        /* 称重类(weight):'斤','公斤','克','千克' | 计数类(count):'袋','瓶','箱','桶','罐','份','个','只','条','把' */
+        /* 规格下拉选项(按 verifyType 分类过滤) */
         var UNIT_OPTIONS_WEIGHT = ['斤','公斤','克','千克'];
         var UNIT_OPTIONS_COUNT  = ['袋','瓶','箱','桶','罐','份','个','只','条','把'];
         var verifyType = info.verifyType || 'weight';
@@ -1493,9 +1510,10 @@
         }
         var specHtml = buildUnitSelect(currentUnit, 'updateFoodUnit(' + i + ', this.value)');
 
-        /* 应付金额列 */
-        var amountValue = currentPrice * orderQty;
-        var amountHtml = '<span class="food-row__amount">¥' + amountValue.toFixed(0) + '</span>';
+        /* 采购单价列(只读) + 采购单金额列(只读,= 采购单价 × 采购量) */
+        var priceReadOnlyHtml = '<span class="food-row__price-readonly">¥' + currentPrice.toFixed(1) + '</span>';
+        var orderAmountValue = currentPrice * orderQty;
+        var orderAmountHtml = '<span class="food-row__amount">¥' + orderAmountValue.toFixed(0) + '</span>';
 
         /* 实收列 */
         var actualHtml = '';
@@ -1519,38 +1537,59 @@
           }
         }
 
-        /* 单价列（可编辑） */
-        var priceHtml = '<input type="number" class="food-row__price-input" value="' + currentPrice.toFixed(1) + '" '
-          + 'step="0.1" min="0" '
+        /* 实收单价 / 实收总价输入框(联动) */
+        var unitPriceVal = (f._customActualUnitPrice !== undefined) ? f._customActualUnitPrice : '';
+        var totalPriceVal = (f._customActualTotalPrice !== undefined) ? f._customActualTotalPrice : '';
+        /* 有订单模式下,用户尚未编辑过时默认按"采购单价/采购单金额"回填,方便用户在一致时直接提交 */
+        if (!isDirect) {
+          if (unitPriceVal === '') unitPriceVal = currentPrice.toFixed(2);
+          if (totalPriceVal === '') totalPriceVal = orderAmountValue.toFixed(2);
+        }
+        /* 若一边有值另一边空(仅无订单模式会触发),render 时按已知那一边反算显示(不持久化对方) */
+        if (unitPriceVal === '' && totalPriceVal !== '' && actual > 0) {
+          unitPriceVal = (totalPriceVal / actual).toFixed(2);
+        } else if (totalPriceVal === '' && unitPriceVal !== '' && actual > 0) {
+          totalPriceVal = (unitPriceVal * actual).toFixed(2);
+        }
+        var actualUnitPriceHtml = '<input type="number" class="food-row__price-input" data-field="unitPrice" data-idx="' + i + '" '
+          + 'value="' + unitPriceVal + '" step="0.01" min="0" placeholder="0.00" '
           + 'onclick="event.stopPropagation()" '
-          + 'onchange="updateFoodPrice(' + i + ', this.value)" '
-          + 'title="点击修改单价">';
+          + 'oninput="updateActualUnitPrice(' + i + ', this.value)" '
+          + 'title="实收单价,与实收总价联动">';
+        var actualTotalPriceHtml = '<input type="number" class="food-row__price-input" data-field="totalPrice" data-idx="' + i + '" '
+          + 'value="' + totalPriceVal + '" step="0.01" min="0" placeholder="0.00" '
+          + 'onclick="event.stopPropagation()" '
+          + 'oninput="updateActualTotalPrice(' + i + ', this.value)" '
+          + 'title="实收总价,与实收单价联动">';
 
-        /* 操作列（删除 + 验收不通过；无订单模式无"不通过"，删除始终可用） */
-        var isDirect = selectedOrder._direct;
+        /* 操作列(删除 + 验收不通过;无订单模式无"不通过",删除始终可用) */
         var deleteDisabled = isDirect ? '' : (hasRecord ? '' : 'disabled');
-        /* 验收不通过按钮暂时隐藏（后期恢复：将下方条件改回原逻辑即可） */
+        /* 验收不通过按钮暂时隐藏(后期恢复:将下方条件改回原逻辑即可) */
         var actionsHtml = '<div class="food-row__actions">'
           + '<button class="food-row__action-btn food-row__action-btn--delete" ' + deleteDisabled + ' onclick="event.stopPropagation();deleteFoodRecord(' + i + ')" title="删除食材">🗑</button>'
-          + '' /* 暂时隐藏不通过按钮：(isDirect ? '' : '<button ...>✗</button>') */
+          + '' /* 暂时隐藏不通过按钮:(isDirect ? '' : '<button ...>✗</button>') */
           + '</div>';
 
         var isCurrent = (i === currentFoodIdx) ? ' current' : '';
-        /* 实收规格列（下拉可选，默认跟随采购规格） */
+        /* 实收规格列(下拉可选,默认跟随采购规格) */
         var actualSpecHtml = buildUnitSelect(actualUnit, 'updateActualUnit(' + i + ', this.value)');
 
-        html += '<div class="food-row' + isCurrent + '" data-idx="' + i + '" style="grid-template-columns:' + gridCols + ';">'
+        /* 组装行(按订单类型选不同列顺序) */
+        var rowHtml = '<div class="food-row' + isCurrent + '" data-idx="' + i + '" style="grid-template-columns:' + gridCols + ';">'
           + '<span class="food-row__name">' + f.name
               + '<span class="food-row__cat-tag">' + info.catLabel + '</span>'
-            + '</span>'
-          + specHtml
-          + orderQtyHtml
-          + priceHtml
-          + amountHtml
-          + actualSpecHtml
+            + '</span>';
+        if (!isDirect) {
+          /* 有订单:采购规格 + 采购量 + 采购单价(只读) + 采购单金额(只读) */
+          rowHtml += specHtml + orderQtyHtml + priceReadOnlyHtml + orderAmountHtml;
+        }
+        rowHtml += actualSpecHtml
           + actualHtml
+          + actualUnitPriceHtml
+          + actualTotalPriceHtml
           + actionsHtml
           + '</div>';
+        html += rowHtml;
       }
 
       if (selectedOrder.foods.length === 0) {
@@ -1565,14 +1604,38 @@
       updateOrderSummary();
     }
 
-    /* 更新食材单价（用户编辑） */
-    function updateFoodPrice(idx, newPrice) {
+    /* 更新实收单价(用户编辑) — 与实收总价联动,仅刷新对方 DOM 不重渲染避免光标丢失 */
+    function updateActualUnitPrice(idx, newVal) {
       if (!selectedOrder || idx < 0) return;
-      var price = parseFloat(newPrice);
-      if (isNaN(price) || price < 0) return;
-      selectedOrder.foods[idx]._customPrice = price;
-      renderFoodList();
-      calculateAmounts();
+      var price = parseFloat(newVal);
+      if (isNaN(price) || price < 0) price = 0;
+      var f = selectedOrder.foods[idx];
+      f._customActualUnitPrice = price;
+      /* 反算总价 = 单价 × 实收量,同步写回同行总价输入框 */
+      var actual = (accumulatedWeights[idx] !== undefined) ? accumulatedWeights[idx] : 0;
+      var totalEl = document.querySelector('.food-row__price-input[data-field="totalPrice"][data-idx="' + idx + '"]');
+      if (totalEl) {
+        var totalVal = price * actual;
+        f._customActualTotalPrice = totalVal;
+        totalEl.value = totalVal.toFixed(2);
+      }
+    }
+
+    /* 更新实收总价(用户编辑) — 与实收单价联动 */
+    function updateActualTotalPrice(idx, newVal) {
+      if (!selectedOrder || idx < 0) return;
+      var price = parseFloat(newVal);
+      if (isNaN(price) || price < 0) price = 0;
+      var f = selectedOrder.foods[idx];
+      f._customActualTotalPrice = price;
+      /* 反算单价 = 总价 / 实收量;实收量为 0 时单价置 0(避免除零) */
+      var actual = (accumulatedWeights[idx] !== undefined) ? accumulatedWeights[idx] : 0;
+      var unitEl = document.querySelector('.food-row__price-input[data-field="unitPrice"][data-idx="' + idx + '"]');
+      if (unitEl) {
+        var unitVal = actual > 0 ? (price / actual) : 0;
+        f._customActualUnitPrice = unitVal;
+        unitEl.value = unitVal.toFixed(2);
+      }
     }
 
     /* 更新食材规格/单位（用户编辑） */
diff --git a/other-module/canteen-device/raw-veg-inspection-scale/02-settings.html b/other-module/canteen-device/raw-veg-inspection-scale/02-settings.html
index 144f64f..6d85c06 100644
--- a/other-module/canteen-device/raw-veg-inspection-scale/02-settings.html
+++ b/other-module/canteen-device/raw-veg-inspection-scale/02-settings.html
@@ -8,11 +8,26 @@
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
       font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-      background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+      background: #05080f;
+      min-height: 760px; min-width: 1320px;
+      display: grid; place-items: center;
+      padding: 20px;
+    }
+    /* PAD 居中外壳 */
+    .device-frame {
+      width: 1280px; height: 720px;
+      flex-shrink: 0;
+      background: #0e1326; color: #fff;
+      border-radius: 24px;
+      box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
+      overflow: hidden;
+      position: relative;
+      display: flex; flex-direction: column;
     }
 
     .top-bar {
       display: flex; align-items: center; height: 44px; background: #1a2b4a; padding: 0 20px;
+      flex-shrink: 0;
     }
     .back-btn {
       font-size: 14px; cursor: pointer; color: rgba(255,255,255,0.7); text-decoration: none; transition: color 0.2s;
@@ -25,6 +40,7 @@
     .main-area {
       display: grid; grid-template-columns: 1fr 1fr; gap: 24px;
       padding: 32px 40px; height: calc(100% - 44px); align-content: start;
+      flex: 1; min-height: 0;
     }
 
     .settings-card {
@@ -101,9 +117,11 @@
 </head>
 <body>
 
-  <div class="top-bar">
+  <div class="device-frame">
 
-    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>    <span class="page-title">&#x8BBE;&#x7F6E;</span>
+  <div class="top-bar">
+    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>
+    <span class="page-title">设置</span>
     <button class="logout-btn" onclick="handleLogout()">退出</button>
   </div>
 
@@ -167,11 +185,13 @@
         </div>
       </div>
 
-      <a class="back-link" href="00-welcome.html">&#x25C0; &#x8FD4;&#x56DE;&#x9996;&#x9875;</a>
+      <a class="back-link" id="backLink" href="javascript:void(0)">&#x25C0; &#x8FD4;&#x56DE;&#x9996;&#x9875;</a>
     </div>
 
   </div>
 
+  </div>
+
   <div class="toast" id="toast"></div>
 
   <script>
@@ -200,20 +220,16 @@
     }
   </script>
 
-/* 返回按钮：从哪来回哪去 */
+/* 返回按钮：从哪来回哪去（顶部 back-btn 与底部 back-link 共用同一逻辑） */
 (function() {
+  var params = new URLSearchParams(window.location.search);
+  var referer = params.get('referer');
+  var target = referer
+    || (document.referrer && document.referrer.indexOf(window.location.hostname) !== -1 ? document.referrer : 'index.html');
   var backBtn = document.getElementById('backBtn');
-  if (backBtn) {
-    var params = new URLSearchParams(window.location.search);
-    var referer = params.get('referer');
-    if (referer) {
-      backBtn.href = referer;
-    } else if (document.referrer && document.referrer.indexOf(window.location.hostname) !== -1) {
-      backBtn.href = document.referrer;
-    } else {
-      backBtn.href = 'index.html';
-    }
-  }
+  if (backBtn) backBtn.href = target;
+  var backLink = document.getElementById('backLink');
+  if (backLink) backLink.href = target;
 })();
 
 </body>
diff --git a/other-module/canteen-device/raw-veg-inspection-scale/03-verify-history.html b/other-module/canteen-device/raw-veg-inspection-scale/03-verify-history.html
index 9c9913b..f113975 100644
--- a/other-module/canteen-device/raw-veg-inspection-scale/03-verify-history.html
+++ b/other-module/canteen-device/raw-veg-inspection-scale/03-verify-history.html
@@ -8,7 +8,20 @@
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
       font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-      background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+      background: #05080f;
+      min-height: 760px; min-width: 1320px;
+      display: grid; place-items: center;
+      padding: 20px;
+    }
+    /* PAD 居中外壳（承接原 body 的 flex column 布局职责） */
+    .device-frame {
+      width: 1280px; height: 720px;
+      flex-shrink: 0;
+      background: #0e1326; color: #fff;
+      border-radius: 24px;
+      box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
+      overflow: hidden;
+      position: relative;
       display: flex; flex-direction: column;
     }
 
@@ -225,9 +238,11 @@
 </head>
 <body>
 
-  <div class="top-bar">
+  <div class="device-frame">
 
-    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>    <span class="page-title">验收记录</span>
+  <div class="top-bar">
+    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>
+    <span class="page-title">验收记录</span>
     <button class="logout-btn" onclick="handleLogout()">退出</button>
   </div>
 
@@ -312,6 +327,8 @@
     <div class="table-footer" id="tableFooter">共 0 条记录</div>
   </div>
 
+  </div>
+
   <script>
     /* 退出登录 */
     function handleLogout() {
@@ -702,5 +719,6 @@
   }
 })();
 
+
 </body>
 </html>
diff --git a/other-module/canteen-device/raw-veg-inspection-scale/04-ingredient-sampling.html b/other-module/canteen-device/raw-veg-inspection-scale/04-ingredient-sampling.html
index f66ed52..7496099 100644
--- a/other-module/canteen-device/raw-veg-inspection-scale/04-ingredient-sampling.html
+++ b/other-module/canteen-device/raw-veg-inspection-scale/04-ingredient-sampling.html
@@ -8,11 +8,25 @@
 * { margin: 0; padding: 0; box-sizing: border-box; }
 body {
   font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-  background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+  background: #05080f;
+  min-height: 760px; min-width: 1320px;
+  display: grid; place-items: center;
+  padding: 20px;
+}
+/* PAD 居中外壳 */
+.device-frame {
+  width: 1280px; height: 720px;
+  flex-shrink: 0;
+  background: #0e1326; color: #fff;
+  border-radius: 24px;
+  box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
+  overflow: hidden;
+  position: relative;
+  display: flex; flex-direction: column;
 }
 
 /* ---- 顶部导航栏 ---- */
-.top-bar { display: flex; align-items: center; height: 44px; background: #1a2b4a; padding: 0 20px; }
+.top-bar { display: flex; align-items: center; height: 44px; background: #1a2b4a; padding: 0 20px; flex-shrink: 0; }
 .top-bar__title { flex: 1; text-align: center; font-size: 15px; font-weight: 600; color: rgba(255,255,255,0.85); }
 .back-btn { font-size: 14px; cursor: pointer; color: rgba(255,255,255,0.7); text-decoration: none; transition: color 0.2s; }
 .back-btn:hover { color: #fff; }
@@ -25,7 +39,7 @@ body {
 }
 .logout-btn:hover { background: rgba(255,77,79,0.18); color: #ff6b6d; border-color: rgba(255,77,79,0.4); }
 
-.main-content { display: flex; gap: 16px; padding: 16px 20px; height: calc(100% - 44px); }
+.main-content { display: flex; gap: 16px; padding: 16px 20px; height: calc(100% - 44px); flex: 1; min-height: 0; }
 
 /* ========== 左侧：食材选择区 ========== */
 .food-select-area {
@@ -244,10 +258,12 @@ body {
 </head>
 <body>
 
+<div class="device-frame">
+
 <!-- 顶部导航 -->
 <div class="top-bar">
-
-    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>  <span class="top-bar__title">食材采样</span>
+    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>
+    <span class="top-bar__title">食材采样</span>
   <button class="logout-btn" onclick="handleLogout()">退出</button>
 </div>
 
@@ -319,6 +335,8 @@ body {
   </div>
 </div>
 
+</div>
+
 <!-- Toast -->
 <div class="toast" id="toast"></div>
 
diff --git a/other-module/canteen-device/raw-veg-inspection-scale/05-sampling-history.html b/other-module/canteen-device/raw-veg-inspection-scale/05-sampling-history.html
index f8756e8..f489dde 100644
--- a/other-module/canteen-device/raw-veg-inspection-scale/05-sampling-history.html
+++ b/other-module/canteen-device/raw-veg-inspection-scale/05-sampling-history.html
@@ -8,7 +8,20 @@
 * { margin: 0; padding: 0; box-sizing: border-box; }
 body {
   font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-  background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+  background: #05080f;
+  min-height: 760px; min-width: 1320px;
+  display: grid; place-items: center;
+  padding: 20px;
+}
+/* PAD 居中外壳 */
+.device-frame {
+  width: 1280px; height: 720px;
+  flex-shrink: 0;
+  background: #0e1326; color: #fff;
+  border-radius: 24px;
+  box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
+  overflow: hidden;
+  position: relative;
   display: flex; flex-direction: column;
 }
 
@@ -30,7 +43,7 @@ body {
 .logout-btn:hover { background: rgba(255,77,79,0.18); color: #ff6b6d; border-color: rgba(255,77,79,0.4); }
 
 /* ---- 主内容区：左右两列 ---- */
-.main-content { display: flex; gap: 16px; padding: 16px 20px; height: calc(100% - 44px); }
+.main-content { display: flex; gap: 16px; padding: 16px 20px; height: calc(100% - 44px); flex: 1; min-height: 0; }
 
 /* ===== 左侧：快捷查找面板 ===== */
 .search-panel {
@@ -191,10 +204,12 @@ body {
 </head>
 <body>
 
+<div class="device-frame">
+
 <!-- 顶部导航 -->
 <div class="top-bar">
-
-    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>  <span class="top-bar__title">采样历史</span>
+    <a class="back-btn" id="backBtn" href="javascript:void(0)">&#x25C0; 返回</a>
+    <span class="top-bar__title">采样历史</span>
   <button class="logout-btn" onclick="handleLogout()">退出</button>
 </div>
 
@@ -259,6 +274,8 @@ body {
   </div>
 </div>
 
+</div>
+
 <!-- Toast -->
 <div class="toast" id="toast"></div>
 
diff --git a/other-module/canteen-device/raw-veg-inspection-scale/index.html b/other-module/canteen-device/raw-veg-inspection-scale/index.html
index 0f37061..c5939cc 100644
--- a/other-module/canteen-device/raw-veg-inspection-scale/index.html
+++ b/other-module/canteen-device/raw-veg-inspection-scale/index.html
@@ -8,10 +8,25 @@
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
       font-family: -apple-system, "Microsoft YaHei", "PingFang SC", sans-serif;
-      background: #0e1326; color: #fff; width: 1280px; height: 720px; overflow: hidden;
+      background: #05080f;
+      min-height: 760px; min-width: 1320px;
+      display: grid; place-items: center;
+      padding: 20px;
+    }
+    /* PAD 居中外壳 */
+    .device-frame {
+      width: 1280px; height: 720px;
+      flex-shrink: 0;
+      background: #0e1326; color: #fff;
+      border-radius: 24px;
+      box-shadow: 0 24px 64px rgba(0,0,0,0.6), 0 0 0 1px rgba(255,255,255,0.04);
+      overflow: hidden;
+      position: relative;
+      display: flex; flex-direction: column;
     }
     .top-bar {
       display: flex; align-items: center; height: 44px; background: #1a2b4a; padding: 0 20px;
+      flex-shrink: 0;
     }
     .top-bar__title {
       flex: 1; text-align: center; font-size: 15px; font-weight: 600; color: rgba(255,255,255,0.85);
@@ -19,6 +34,7 @@
     .main-content {
       display: grid; grid-template-columns: 1fr 1fr; gap: 16px 20px;
       padding: 24px 40px; height: calc(100% - 44px); align-content: center;
+      flex: 1; min-height: 0;
     }
     .card {
       display: flex; align-items: center; gap: 20px; padding: 24px 28px;
@@ -38,59 +54,64 @@
 </head>
 <body>
 
-  <div class="top-bar">
-    <span class="top-bar__title">&#x6BDB;&#x83DC;&#x9A8C;&#x6536;&#x79E4;</span>
-  </div>
+  <div class="device-frame">
+
+    <div class="top-bar">
+      <span class="top-bar__title">毛菜验收秤</span>
+    </div>
+
+    <div class="main-content">
+      <!-- 卡片统一指向登录页,登录成功后由 00-welcome 承载功能菜单,避免无登录态直进内页 -->
+      <a class="card" href="00-login.html">
+        <span class="card__icon">🔑</span>
+        <div class="card__info">
+          <div class="card__title">员工登录</div>
+          <div class="card__desc">人脸识别、账号密码登录</div>
+        </div>
+        <span class="card__arrow">›</span>
+      </a>
+      <a class="card" href="00-login.html">
+        <span class="card__icon">⚖️</span>
+        <div class="card__info">
+          <div class="card__title">验收操作</div>
+          <div class="card__desc">订单选择、称重验收、不合格处理</div>
+        </div>
+        <span class="card__arrow">›</span>
+      </a>
+      <a class="card" href="00-login.html">
+        <span class="card__icon">🔍</span>
+        <div class="card__info">
+          <div class="card__title">食材采样</div>
+          <div class="card__desc">采样操作、外观品级判定、保存采样</div>
+        </div>
+        <span class="card__arrow">›</span>
+      </a>
+      <a class="card" href="00-login.html">
+        <span class="card__icon">📋</span>
+        <div class="card__info">
+          <div class="card__title">采样历史</div>
+          <div class="card__desc">采样记录查看与筛选</div>
+        </div>
+        <span class="card__arrow">›</span>
+      </a>
+      <a class="card" href="00-login.html">
+        <span class="card__icon">📝</span>
+        <div class="card__info">
+          <div class="card__title">验收记录</div>
+          <div class="card__desc">历史验收记录查看与筛选</div>
+        </div>
+        <span class="card__arrow">›</span>
+      </a>
+      <a class="card" href="00-login.html">
+        <span class="card__icon">⚙️</span>
+        <div class="card__info">
+          <div class="card__title">设置</div>
+          <div class="card__desc">偏差率阈值配置、设备状态</div>
+        </div>
+        <span class="card__arrow">›</span>
+      </a>
+    </div>
 
-  <div class="main-content">
-    <a class="card" href="00-login.html">
-      <span class="card__icon">&#x1F510;</span>
-      <div class="card__info">
-        <div class="card__title">员工登录</div>
-        <div class="card__desc">人脸识别、账号密码登录</div>
-      </div>
-      <span class="card__arrow">&#x203A;</span>
-    </a>
-    <a class="card" href="01-verify-inspection.html">
-      <span class="card__icon">&#x2696;&#xFE0F;</span>
-      <div class="card__info">
-        <div class="card__title">&#x9A8C;&#x6536;&#x64CD;&#x4F5C;</div>
-        <div class="card__desc">&#x8BA2;&#x5355;&#x9009;&#x62E9;&#x3001;&#x79F0;&#x91CD;&#x9A8C;&#x6536;&#x3001;&#x4E0D;&#x5408;&#x683C;&#x5904;&#x7F6E;</div>
-      </div>
-      <span class="card__arrow">&#x203A;</span>
-    </a>
-    <a class="card" href="04-ingredient-sampling.html">
-      <span class="card__icon">&#x1F50D;</span>
-      <div class="card__info">
-        <div class="card__title">&#x98DF;&#x6750;&#x91C7;&#x6837;</div>
-        <div class="card__desc">&#x91C7;&#x6837;&#x64CD;&#x4F5C;&#x3001;&#x5916;&#x89C2;&#x54C1;&#x7EA7;&#x5224;&#x5B9A;&#x3001;&#x4FDD;&#x5B58;&#x91C7;&#x6837;</div>
-      </div>
-      <span class="card__arrow">&#x203A;</span>
-    </a>
-    <a class="card" href="05-sampling-history.html">
-      <span class="card__icon">&#x1F4CB;</span>
-      <div class="card__info">
-        <div class="card__title">&#x91C7;&#x6837;&#x5386;&#x53F2;</div>
-        <div class="card__desc">&#x91C7;&#x6837;&#x8BB0;&#x5F55;&#x67E5;&#x770B;&#x4E0E;&#x7B5B;&#x9009;</div>
-      </div>
-      <span class="card__arrow">&#x203A;</span>
-    </a>
-    <a class="card" href="03-verify-history.html">
-      <span class="card__icon">&#x1F4DD;</span>
-      <div class="card__info">
-        <div class="card__title">&#x9A8C;&#x6536;&#x8BB0;&#x5F55;</div>
-        <div class="card__desc">历史验收记录查看与筛选</div>
-      </div>
-      <span class="card__arrow">&#x203A;</span>
-    </a>
-    <a class="card" href="02-settings.html">
-      <span class="card__icon">&#x2699;&#xFE0F;</span>
-      <div class="card__info">
-        <div class="card__title">&#x8BBE;&#x7F6E;</div>
-        <div class="card__desc">&#x504F;&#x5DEE;&#x7387;&#x9608;&#x503C;&#x914D;&#x7F6E;&#x3001;&#x8BBE;&#x5907;&#x72B6;&#x6001;</div>
-      </div>
-      <span class="card__arrow">&#x203A;</span>
-    </a>
   </div>
 
 </body>
diff --git a/other-module/meal-delivery-h5/02-dispatch-incoming.html b/other-module/meal-delivery-h5/02-dispatch-incoming.html
index ab187f2..0cabf99 100644
--- a/other-module/meal-delivery-h5/02-dispatch-incoming.html
+++ b/other-module/meal-delivery-h5/02-dispatch-incoming.html
@@ -147,52 +147,6 @@
       font-size: 13px;
     }
 
-    /* 倒计时圆环 */
-    .countdown-section {
-      display: flex;
-      justify-content: center;
-      padding: 8px 0 16px;
-    }
-    .countdown-ring {
-      position: relative;
-      width: 110px; height: 110px;
-    }
-    .countdown-ring svg {
-      width: 100%; height: 100%;
-      transform: rotate(-90deg);
-    }
-    .countdown-track {
-      fill: none;
-      stroke: rgba(255, 255, 255, 0.3);
-      stroke-width: 8;
-    }
-    .countdown-progress {
-      fill: none;
-      stroke: white;
-      stroke-width: 8;
-      stroke-linecap: round;
-      stroke-dasharray: 283;
-      transition: stroke-dashoffset 1s linear;
-    }
-    .countdown-number {
-      position: absolute;
-      top: 50%; left: 50%;
-      transform: translate(-50%, -50%);
-      color: white;
-      text-align: center;
-    }
-    .countdown-number__val {
-      font-size: 36px;
-      font-weight: 700;
-      line-height: 1;
-      text-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-    }
-    .countdown-number__unit {
-      font-size: 12px;
-      margin-top: 2px;
-      opacity: 0.9;
-    }
-
     /* 订单卡片 */
     .order-card {
       background: white;
@@ -489,20 +443,6 @@
         <div class="ring-subtitle">调度中心为您指派了新订单</div>
       </div>
 
-      <!-- 倒计时 -->
-      <div class="countdown-section">
-        <div class="countdown-ring">
-          <svg viewBox="0 0 100 100">
-            <circle cx="50" cy="50" r="45" class="countdown-track"/>
-            <circle cx="50" cy="50" r="45" class="countdown-progress" id="progress"/>
-          </svg>
-          <div class="countdown-number">
-            <div class="countdown-number__val" id="countdownVal">30</div>
-            <div class="countdown-number__unit">秒后自动拒绝</div>
-          </div>
-        </div>
-      </div>
-
       <!-- 订单摘要卡片 -->
       <div class="order-card">
         <div class="order-card__head">
@@ -622,34 +562,8 @@
   </div>
 
   <script>
-    // 倒计时
-    const TOTAL = 30;
-    const CIRC = 2 * Math.PI * 45;
-    let remaining = TOTAL;
-    const progressEl = document.getElementById('progress');
-    const valEl = document.getElementById('countdownVal');
-    progressEl.style.strokeDasharray = CIRC;
-
-    function renderProgress() {
-      const offset = CIRC * (1 - remaining / TOTAL);
-      progressEl.style.strokeDashoffset = offset;
-      valEl.textContent = remaining;
-    }
-    renderProgress();
-
-    const timer = setInterval(() => {
-      remaining--;
-      renderProgress();
-      if (remaining <= 0) {
-        clearInterval(timer);
-        alert('已超时未响应,此单已自动转派');
-        location.href = '01-home.html';
-      }
-    }, 1000);
-
     // 接受
     function acceptOrder() {
-      clearInterval(timer);
       alert('✅ 已接单,请尽快到达取货地点');
       location.href = '04-order-detail.html?orderId=DP20260812-0928&state=accepted';
     }
@@ -674,7 +588,6 @@
         alert('请选择拒单理由');
         return;
       }
-      clearInterval(timer);
       alert('已拒单 · 理由:' + selectedReason);
       location.href = '01-home.html';
     }
diff --git a/other-module/meal-delivery-h5/04-order-detail.html b/other-module/meal-delivery-h5/04-order-detail.html
index 7525599..e95ac18 100644
--- a/other-module/meal-delivery-h5/04-order-detail.html
+++ b/other-module/meal-delivery-h5/04-order-detail.html
@@ -354,11 +354,6 @@
       justify-content: center;
       gap: 6px;
     }
-    .btn--ghost {
-      background: var(--background);
-      color: var(--text-primary);
-      flex: 0 0 110px;
-    }
     .btn--primary {
       background: linear-gradient(135deg, var(--primary), var(--primary-dark));
       color: white;
@@ -593,7 +588,6 @@
     </div>
 
     <div class="action-bar">
-      <button class="btn btn--ghost" onclick="toast('异常上报页面开发中')">⚠ 异常</button>
       <button class="btn btn--primary" onclick="location.href='05-delivering.html'">🚀 到店报到</button>
     </div>
 
diff --git a/other-module/meal-delivery-h5/05-delivering.html b/other-module/meal-delivery-h5/05-delivering.html
index 09f2cd8..b96559f 100644
--- a/other-module/meal-delivery-h5/05-delivering.html
+++ b/other-module/meal-delivery-h5/05-delivering.html
@@ -380,27 +380,132 @@
       background: var(--success);
       color: white;
     }
-    .icon-btn--msg {
-      background: var(--info);
-      color: white;
-    }
 
-    .order-summary {
+    /* 商家信息(弱化) */
+    .merchant-bar {
       display: flex;
-      justify-content: space-around;
-      padding: 12px 14px;
+      align-items: center;
+      gap: 8px;
+      padding: 10px 14px;
+      font-size: 12px;
+      color: var(--text-secondary);
+      background: #fafbfc;
     }
-    .summary-cell { text-align: center; }
-    .summary-num {
-      font-size: 17px;
+    .merchant-bar__label {
+      color: var(--text-tertiary);
+      flex-shrink: 0;
+    }
+    .merchant-bar__name {
+      flex: 1;
+      color: var(--text-secondary);
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .merchant-bar__call {
+      display: inline-flex;
+      align-items: center;
+      gap: 4px;
+      padding: 4px 10px;
+      border-radius: 12px;
+      background: white;
+      border: 1px solid var(--border);
+      color: var(--text-primary);
+      font-size: 11px;
+      font-weight: 600;
+      text-decoration: none;
+      flex-shrink: 0;
+      cursor: pointer;
+    }
+    .merchant-bar__call:active { background: var(--background); }
+
+    /* 餐品清单 */
+    .card__head {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: 8px;
+    }
+    .card__title {
+      font-size: 14px;
+      font-weight: 700;
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+    .card__title::before {
+      content: '';
+      width: 4px; height: 14px;
+      background: var(--primary);
+      border-radius: 2px;
+    }
+    .goods-list { padding: 0; }
+    .goods-item {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      padding: 10px 0;
+      border-bottom: 1px dashed var(--border);
+    }
+    .goods-item:last-child { border-bottom: none; }
+    .goods-img {
+      width: 44px; height: 44px;
+      background: linear-gradient(135deg, #fef3c7, #fed7aa);
+      border-radius: 8px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 20px;
+      flex-shrink: 0;
+    }
+    .goods-info { flex: 1; }
+    .goods-name {
+      font-size: 13px;
+      font-weight: 600;
+      color: var(--text-primary);
+      margin-bottom: 2px;
+    }
+    .goods-spec {
+      font-size: 11px;
+      color: var(--text-secondary);
+    }
+    .goods-qty {
+      font-size: 14px;
       font-weight: 700;
       color: var(--primary);
     }
-    .summary-label {
-      font-size: 11px;
-      color: var(--text-secondary);
-      margin-top: 2px;
+    .tag-list {
+      display: flex;
+      gap: 6px;
+      flex-wrap: wrap;
+      margin-top: 8px;
     }
+    .info-tag {
+      font-size: 10px;
+      padding: 2px 8px;
+      border-radius: 6px;
+      background: #f3f4f6;
+      color: var(--text-secondary);
+    }
+    .info-tag--warn {
+      background: #fef3c7;
+      color: #92400e;
+    }
+
+    /* 订单信息列表 */
+    .info-list {
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+    }
+    .info-row {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 13px;
+    }
+    .info-label { color: var(--text-secondary); }
+    .info-value { color: var(--text-primary); font-weight: 600; }
 
     /* 操作按钮 */
     .action-bar {
@@ -547,6 +652,13 @@
         </div>
       </div>
 
+      <!-- 商家信息(弱化) -->
+      <div class="merchant-bar">
+        <span class="merchant-bar__label">取自商家</span>
+        <span class="merchant-bar__name">味之都食堂·高新店</span>
+        <a href="javascript:void(0)" class="merchant-bar__call" onclick="toast('正在呼叫商家王经理')">📞 联系商家</a>
+      </div>
+
       <!-- 客户信息 -->
       <div class="card">
         <div class="customer-card">
@@ -557,29 +669,94 @@
           </div>
           <div class="customer-actions">
             <button class="icon-btn icon-btn--call" onclick="toast('正在呼叫张女士')">📞</button>
-            <button class="icon-btn icon-btn--msg" onclick="toast('已发送到达提醒短信')">💬</button>
           </div>
         </div>
         <div style="padding:8px 14px 14px;font-size:12px;color:var(--text-secondary);line-height:1.6;border-top:1px dashed var(--border);margin-top:4px">
           💬 <strong style="color:var(--text-primary)">客户备注:</strong>
-          麻烦放门口即可,不要按门铃,孩子正在午休。
+          麻烦放门口即可,不要按门铃,孩子正在午休。电话联系后放在 1802 门口鞋柜上,谢谢!
         </div>
       </div>
 
-      <!-- 订单概览 -->
+      <!-- 餐品清单 -->
       <div class="card">
-        <div class="order-summary">
-          <div class="summary-cell">
-            <div class="summary-num">4 份</div>
-            <div class="summary-label">餐品</div>
+        <div class="card__head">
+          <div class="card__title">餐品清单</div>
+          <span style="font-size:12px;color:var(--text-secondary)">共 4 份</span>
+        </div>
+        <div class="goods-list">
+          <div class="goods-item">
+            <div class="goods-img">🍱</div>
+            <div class="goods-info">
+              <div class="goods-name">红烧牛肉套餐</div>
+              <div class="goods-spec">主荤·标准份 · 含米饭/汤</div>
+            </div>
+            <div class="goods-qty">×2</div>
           </div>
-          <div class="summary-cell">
-            <div class="summary-num">2.6km</div>
-            <div class="summary-label">配送距离</div>
+          <div class="goods-item">
+            <div class="goods-img">🥗</div>
+            <div class="goods-info">
+              <div class="goods-name">清炒时蔬套餐</div>
+              <div class="goods-spec">素菜·小份 · 含米饭</div>
+            </div>
+            <div class="goods-qty">×1</div>
           </div>
-          <div class="summary-cell">
-            <div class="summary-num">15:45</div>
-            <div class="summary-label">要求送达</div>
+          <div class="goods-item">
+            <div class="goods-img">🍲</div>
+            <div class="goods-info">
+              <div class="goods-name">番茄鸡蛋汤</div>
+              <div class="goods-spec">汤类·大份</div>
+            </div>
+            <div class="goods-qty">×1</div>
+          </div>
+        </div>
+        <div class="tag-list">
+          <span class="info-tag info-tag--warn">⚠ 已核对溯源码</span>
+          <span class="info-tag">📦 含冷链保温箱</span>
+          <span class="info-tag">🥢 含餐具 4 份</span>
+        </div>
+      </div>
+
+      <!-- 订单信息 -->
+      <div class="card">
+        <div class="card__head">
+          <div class="card__title">订单信息</div>
+        </div>
+        <div class="info-list">
+          <div class="info-row">
+            <span class="info-label">订单编号</span>
+            <span class="info-value">DP20260812-0928</span>
+          </div>
+          <div class="info-row">
+            <span class="info-label">订单类型</span>
+            <span class="info-value">到家配送</span>
+          </div>
+          <div class="info-row">
+            <span class="info-label">接单方式</span>
+            <span class="info-value" style="color:var(--primary)">📌 派单</span>
+          </div>
+          <div class="info-row">
+            <span class="info-label">下单时间</span>
+            <span class="info-value">14:08:25</span>
+          </div>
+          <div class="info-row">
+            <span class="info-label">接单时间</span>
+            <span class="info-value">14:10:12</span>
+          </div>
+          <div class="info-row">
+            <span class="info-label">餐品份数</span>
+            <span class="info-value">4 份</span>
+          </div>
+          <div class="info-row">
+            <span class="info-label">配送距离</span>
+            <span class="info-value">2.6 km</span>
+          </div>
+          <div class="info-row">
+            <span class="info-label">要求送达</span>
+            <span class="info-value">15:45 前</span>
+          </div>
+          <div class="info-row">
+            <span class="info-label">收货方式</span>
+            <span class="info-value" style="color:var(--primary)">🔢 验证码收货</span>
           </div>
         </div>
       </div>
diff --git a/other-module/meal-delivery-h5/doc/CHANGELOG.md b/other-module/meal-delivery-h5/doc/CHANGELOG.md
index acc81d7..80634ab 100644
--- a/other-module/meal-delivery-h5/doc/CHANGELOG.md
+++ b/other-module/meal-delivery-h5/doc/CHANGELOG.md
@@ -1,5 +1,20 @@
 # 营养管理餐品配送 H5 模块变更日志
 
+## 2026-08-14 · 派单/配送流程降噪与信息补全
+
+### 优化
+- **`02-dispatch-incoming.html` 移除派单倒计时**:去除"30 秒倒计时圆环 + 超时自动拒绝转派"逻辑与弹层,派单响应不再强制限时
+- **`02-dispatch-incoming.html` / `04-order-detail.html` 移除异常上报按钮**:去除「⚠ 异常」占位按钮(异常上报页面暂不进入业务路径)
+- **`05-delivering.html` 新增商家信息弱化条**:页面顶部增加"取自商家"信息条(商家名 + 📞 联系商家),样式弱化不抢主流程视觉
+- **`05-delivering.html` 补全用户备注展示**:完整展示下单备注全文(如"麻烦放门口即可,不要按门铃…"类长文本),替代此前的短信提醒按钮(💬 到达提醒)
+- **`05-delivering.html` 信息结构卡片化**:「餐品清单」「订单信息」拆分为独立卡片区块,信息层级更清晰
+
+### 业务约定更新
+- 派单不设强制响应倒计时,超时自动转派机制暂缓
+- 配送中页面强化"联系商家"能力,配送员取货前可与商家直接通话
+
+---
+
 ## 2026-08-12 · 工作台与个人中心简化（第四版）
 
 ### 优化
diff --git a/web-admin/nutrition/din-dish-add.html b/web-admin/nutrition/din-dish-add.html
index 8994347..28d4390 100644
--- a/web-admin/nutrition/din-dish-add.html
+++ b/web-admin/nutrition/din-dish-add.html
@@ -141,6 +141,36 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .ingredient-table{width:100%;border-collapse:collapse;font-size:var(--font-sm);margin-top:12px;}
 .ingredient-table th{background:#FAFAFA;padding:10px 12px;text-align:left;color:var(--text-secondary);font-weight:500;border-bottom:1px solid var(--border);}
 .ingredient-table td{padding:10px 12px;border-bottom:1px solid #F0F0F0;color:var(--text-primary);}
+/* 餐品构成 - 双栏布局：左清单表格 + 右食材选择列表 */
+.ingredient-picker{display:flex;gap:16px;align-items:stretch;}
+.ingredient-picker__left{flex:1;min-width:0;background:#fff;border:1px solid var(--border);border-radius:var(--radius-sm);overflow:hidden;}
+.ingredient-picker__left .ingredient-table{margin-top:0;}
+.ingredient-picker__left .ingredient-table th,.ingredient-picker__left .ingredient-table td{font-size:var(--font-xs);}
+.ingredient-picker__left .ingredient-table th{padding:8px 10px;}
+.ingredient-picker__left .ingredient-table td{padding:6px 10px;}
+.ingredient-picker__right{width:280px;flex-shrink:0;background:#FAFBFC;border:1px solid var(--border);border-radius:var(--radius-sm);display:flex;flex-direction:column;max-height:360px;}
+.ingredient-picker__search{padding:10px;border-bottom:1px solid #F0F0F0;}
+.ingredient-picker__search input{width:100%;height:30px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 10px;font-size:var(--font-xs);outline:none;background:#fff;}
+.ingredient-picker__search input:focus{border-color:var(--primary);}
+.ingredient-picker__list{flex:1;overflow-y:auto;padding:6px 0;}
+.ingredient-picker__item{display:flex;align-items:center;gap:8px;padding:8px 12px;cursor:pointer;transition:background .15s;border-left:2px solid transparent;}
+.ingredient-picker__item:hover{background:var(--primary-light);}
+.ingredient-picker__item.is-added{cursor:default;background:#F5F5F5;opacity:0.65;}
+.ingredient-picker__item.is-added:hover{background:#F5F5F5;}
+.ingredient-picker__code{font-size:var(--font-xs);color:var(--text-placeholder);font-family:Menlo,Consolas,monospace;flex-shrink:0;min-width:54px;}
+.ingredient-picker__name{font-size:var(--font-sm);color:var(--text-primary);flex:1;min-width:0;}
+.ingredient-picker__badge{font-size:var(--font-xs);color:var(--text-placeholder);background:#E8E8E8;border-radius:8px;padding:1px 6px;flex-shrink:0;}
+.ingredient-picker__empty{padding:24px 12px;font-size:var(--font-xs);color:var(--text-placeholder);text-align:center;}
+/* 食材清单行内表单（净菜下拉 + 规格下拉） */
+.ingredient-table .td-code{font-family:Menlo,Consolas,monospace;font-size:var(--font-xs);color:var(--text-secondary);}
+.ingredient-table .td-net{min-width:180px;}
+.ingredient-table .td-net .td-net__inner{display:flex;align-items:center;gap:6px;}
+.ingredient-table .td-net .ingredient-net-select{flex:1;min-width:0;height:28px;font-size:var(--font-xs);}
+.ingredient-table .td-net .ingredient-spec-select{flex:0 0 76px;height:28px;font-size:var(--font-xs);}
+.ingredient-table .td-amount input{width:80px;height:28px;font-size:var(--font-xs);}
+.ingredient-table .form-select--sm{height:28px;font-size:var(--font-xs);padding:0 8px;background-position:right 6px center;}
+.ingredient-table .form-input--sm{height:28px;font-size:var(--font-xs);padding:0 8px;}
+.ingredient-table .td-actions{white-space:nowrap;}
 /* 弹窗 */
 .dialog-mask{display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.45);z-index:200;align-items:center;justify-content:center;}
 .dialog-mask.open{display:flex;}
@@ -236,9 +266,15 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .cost-detail-block__table th,.cost-detail-block__table td{padding:8px 12px;font-size:var(--font-xs);text-align:left;border-bottom:1px solid #F0F0F0;}
 .cost-detail-block__table th{color:var(--text-secondary);font-weight:500;background:#FAFBFC;}
 .cost-detail-block__table tr:last-child td{border-bottom:none;}
-.cost-detail-block__table th:nth-child(2),.cost-detail-block__table th:nth-child(3),.cost-detail-block__table th:nth-child(4),
-.cost-detail-block__table td:nth-child(2),.cost-detail-block__table td:nth-child(4){text-align:right;}
-.cost-detail-block__table td:nth-child(3){text-align:right;padding:6px 12px;}
+/* 列对齐:用量(3)/单价(4)/小计(7)右对齐,价格更新方式(6)居中 */
+.cost-detail-block__table th:nth-child(3),.cost-detail-block__table th:nth-child(4),.cost-detail-block__table th:nth-child(7),
+.cost-detail-block__table td:nth-child(3),.cost-detail-block__table td:nth-child(7){text-align:right;}
+.cost-detail-block__table th:nth-child(6),.cost-detail-block__table td:nth-child(6){text-align:center;}
+.cost-detail-block__table td:nth-child(4){text-align:right;padding:6px 12px;}
+/* 价格更新方式胶囊(只读) */
+.cost-price-mode{display:inline-flex;align-items:center;padding:2px 8px;border-radius:10px;font-size:var(--font-xs);line-height:1.4;}
+.cost-price-mode--manual{background:#F5F5F5;color:#666;}
+.cost-price-mode--accept{background:#F6FFED;color:#52C41A;}
 .cost-detail__unit-input{width:90px;height:28px;padding:2px 8px;border:1px solid var(--border);border-radius:var(--radius-sm);font-size:var(--font-xs);text-align:right;color:var(--text-primary);}
 .cost-detail__unit-input:focus{outline:none;border-color:var(--primary);box-shadow:0 0 0 2px rgba(24,144,255,0.1);}
 .cost-detail-block__total{display:flex;justify-content:flex-end;align-items:center;gap:6px;padding-top:6px;font-size:var(--font-sm);}
@@ -376,38 +412,8 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
   </div>
 </main>
 
-<!-- 新增食材弹窗 -->
-<div class="dialog-mask" id="ingredientDialog">
-  <div class="dialog">
-    <div class="dialog__header">
-      <div class="dialog__title">新增食材</div>
-      <button class="dialog__close" onclick="closeIngredientDialog()"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M1 1l12 12M13 1L1 13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg></button>
-    </div>
-    <div class="dialog__body">
-      <div class="form-row">
-        <div class="form-group"><label>食材名称<span class="required">*</span></label>
-          <select class="form-select" id="ingredientNameSelect" onchange="selectIngredient(this.value)"><option value="">请选择食材</option></select>
-        </div>
-        <div class="form-group"><label>净菜类型<span class="required">*</span></label><select class="form-select" id="ingredientNetType" disabled><option value="">请先选择食材</option></select></div>
-      </div>
-      <div class="form-row"><div class="form-group"><label>用量(g/份)<span class="required">*</span></label><input class="form-input" type="number" id="ingredientAmount" placeholder="请输入用量"></div><div class="form-group"><label>食材类型</label><select class="form-select" id="ingredientType"><option>辅材</option><option>主材</option><option>调料</option></select></div></div>
-      <div class="form-row"><div class="form-group"><label>过敏原</label><input class="form-input" type="text" id="ingredientAllergen" placeholder="无则填无"></div><div class="form-group"><label>备注</label><input class="form-input" type="text" id="ingredientNote" placeholder="请输入备注信息"></div></div>
-    </div>
-    <div class="dialog__footer">
-      <button class="btn btn-default" onclick="closeIngredientDialog()">取消</button>
-      <button class="btn btn-primary" onclick="confirmAddIngredient()">确定</button>
-    </div>
-  </div>
-</div>
-
 <script>
 function toggleSubgroup(header){header.parentElement.classList.toggle('open');}
-function openIngredientDialog(){
-  initIngredientNameOptions();
-  resetIngredientForm();
-  document.getElementById('ingredientDialog').classList.add('open');
-}
-function closeIngredientDialog(){document.getElementById('ingredientDialog').classList.remove('open');}
 
 var urlParams = new URLSearchParams(window.location.search);
 var pageMode = urlParams.get('mode') || 'add';
@@ -418,9 +424,9 @@ var INNOV_MAP = {
     expNo:'INN-H002', goal:'添加燕麦、藜麦，膳食纤维提升3倍', members:'厨师长陈磊 / 营养师王芳',
     name:'高纤维主食包', category:'主食', meal:'早/午', pyramid:'谷薯杂豆', allergen:'无', tag:'高纤维',
     composition:[
-      {name:'燕麦',netType:'燕麦片',amount:80,pct:'40%',type:'主材',allergen:'无',note:'提升纤维'},
-      {name:'藜麦',netType:'藜麦粒',amount:60,pct:'30%',type:'主材',allergen:'无',note:'低GI'},
-      {name:'大米',netType:'熟米饭',amount:60,pct:'30%',type:'辅材',allergen:'无',note:'基底'}
+      {code:'YQ-025',name:'燕麦',netName:'燕麦片',amount:80,type:'主材'},
+      {code:'YQ-026',name:'藜麦',netName:'藜麦粒',amount:60,type:'主材'},
+      {code:'YQ-011',name:'大米',netName:'熟米饭',amount:60,type:'辅材'}
     ],
     cook:{mainMethod:'蒸',subMethod:'无',heat:'大火→中火',duration:30,temp:100,steps:4,desc:''},
     nutri:{calorie:342,protein:12.8,carb:58.4,fat:5.2,vitC:0,mineral:38,fiber:9.6,sodium:210},
@@ -433,10 +439,10 @@ var INNOV_MAP = {
     expNo:'INN-H004', goal:'搭配维C食材，补铁效率提升2倍', members:'厨师长赵敏 / 营养师李明',
     name:'富铁青菜汤', category:'汤品', meal:'午/晚', pyramid:'蔬菜', allergen:'大豆', tag:'高铁',
     composition:[
-      {name:'菠菜',netType:'菠菜段',amount:120,pct:'40%',type:'主材',allergen:'无',note:'高铁来源'},
-      {name:'豆腐',netType:'豆腐块',amount:80,pct:'27%',type:'主材',allergen:'大豆',note:'补充蛋白'},
-      {name:'胡萝卜',netType:'胡萝卜丝',amount:40,pct:'13%',type:'辅材',allergen:'无',note:'维C协同'},
-      {name:'食用油',netType:'净油',amount:5,pct:'2%',type:'调料',allergen:'无',note:'少量'}
+      {code:'YQ-007',name:'菠菜',netName:'菠菜段',netSpecAlias:'长段',amount:120,type:'主材'},
+      {code:'YQ-013',name:'豆腐',netName:'豆腐块',amount:80,type:'主材'},
+      {code:'YQ-009',name:'胡萝卜',netName:'胡萝卜丝',netSpecAlias:'细丝',amount:40,type:'辅材'},
+      {code:'YQ-014',name:'食用油',netName:'净油',amount:5,type:'调料'}
     ],
     cook:{mainMethod:'煮',subMethod:'无',heat:'大火→小火',duration:15,temp:100,steps:3,desc:''},
     nutri:{calorie:68,protein:5.4,carb:6.2,fat:2.8,vitC:32,mineral:86,fiber:2.4,sodium:320},
@@ -496,19 +502,29 @@ var STEP_HTML = [
 <button type="button" class="dynamic-row-add" onclick="addPromoVideoRow()">＋ 添加宣传视频</button>
 <div class="upload-hint">已上传的宣传视频将独立显示在员工端，每个可单独启用/停用</div>`,
 
-  // Step 1: 餐品构成（含熟重 + 营养指标自动计算）
+  // Step 1: 餐品构成（含熟重 + 双栏食材清单 + 营养指标自动计算）
   `<div class="form-card__title">🧩 餐品构成</div>
 <div class="form-grid" style="grid-template-columns:repeat(4,1fr);margin-bottom:8px;">
   <div class="form-group"><label class="form-label">熟重(g)<span class="required">*</span></label><input class="form-input" id="cookedWeightInput" type="number" min="0" step="0.1" placeholder="请输入熟重" oninput="recalcAddNutri()"></div>
 </div>
 <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px;">
   <span style="font-size:var(--font-sm);font-weight:600;">食材清单<span class="required">*</span></span>
-  <button class="btn btn-primary" style="height:30px;font-size:var(--font-xs);" onclick="openIngredientDialog()">➕ 新增食材</button>
+  <span style="font-size:var(--font-xs);color:var(--text-placeholder);">从右侧食材列表点击添加,选定食材后选择净菜类型(多规格净菜需先选净菜再选规格)</span>
+</div>
+<div class="ingredient-picker">
+  <div class="ingredient-picker__left">
+    <table class="ingredient-table" id="ingredientTable">
+      <thead><tr><th>食材编码</th><th>食材名称</th><th>食材类型</th><th>净菜类型</th><th>用量(g/份)</th><th style="width:60px;">操作</th></tr></thead>
+      <tbody id="ingredientTbody"><tr class="ingredient-empty"><td colspan="6" style="text-align:center;color:var(--text-placeholder);padding:32px;">暂无食材,请从右侧点击食材添加</td></tr></tbody>
+    </table>
+  </div>
+  <div class="ingredient-picker__right">
+    <div class="ingredient-picker__search">
+      <input type="text" id="ingredientSearchInput" placeholder="按食材名称或净菜标准名、净菜俗名搜索" oninput="filterIngredientPicker()">
+    </div>
+    <div class="ingredient-picker__list" id="ingredientPickerList"></div>
+  </div>
 </div>
-<table class="ingredient-table" id="ingredientTable">
-  <thead><tr><th>食材名称</th><th>净菜类型</th><th>用量(g/份)</th><th>食材类型</th><th>过敏原</th><th>备注</th><th>操作</th></tr></thead>
-  <tbody id="ingredientTbody"><tr><td colspan="7" style="text-align:center;color:var(--text-placeholder);padding:32px;">暂无食材，请点击"新增食材"添加</td></tr></tbody>
-</table>
 <div class="form-subtitle">📊 营养指标 <span style="font-size:var(--font-xs);color:var(--text-placeholder);font-weight:normal;">（按 100g 熟重计）</span></div>
 <div class="nutri-readonly-tip">ⓘ 营养指标根据食材清单自动计算，不可手动修改；请先录入食材后系统会自动汇总</div>
 <div class="nutri-hero-form">
@@ -561,8 +577,8 @@ var STEP_HTML = [
     <div class="cost-detail-block">
       <div class="cost-detail-block__title">🧾 食材成本明细（每100g）</div>
       <table class="cost-detail-block__table">
-        <thead><tr><th>食材编号</th><th>食材名称</th><th>用量(g)</th><th>单价(元/kg)</th><th>价格更新时间</th><th>小计(元)</th></tr></thead>
-        <tbody id="costDetailTbody"><tr><td colspan="6" style="text-align:center;color:var(--text-placeholder);">暂无食材</td></tr></tbody>
+        <thead><tr><th>食材编号</th><th>食材名称</th><th>用量(g)</th><th>单价(元/kg)</th><th>价格更新时间</th><th>价格更新方式</th><th>小计(元)</th></tr></thead>
+        <tbody id="costDetailTbody"><tr><td colspan="7" style="text-align:center;color:var(--text-placeholder);">暂无食材</td></tr></tbody>
       </table>
       <div class="cost-detail-block__total"><span>食材总成本（100g）：</span><strong>¥<span id="costDetailTotal">0.00</span></strong></div>
     </div>
@@ -581,9 +597,9 @@ var STEP_HTML = [
 </div>
 <div class="form-subtitle">📐 餐品规格</div>
 <table class="spec-table" id="specTable">
-  <thead><tr><th style="width:200px;">规格(克重/份型)</th><th>餐品售价(元/份)</th><th>净菜包售价(元/份)</th><th>外售净菜包</th><th>默认</th><th style="width:60px;">操作</th></tr></thead>
+  <thead><tr><th style="width:200px;">规格(克重/份型)</th><th>餐品售价(元/份)</th><th>净菜包毛利率(%)</th><th>净菜包售价(元/份)</th><th>外售净菜包</th><th>默认</th><th style="width:60px;">操作</th></tr></thead>
   <tbody id="specBody">
-    <tr class="spec-add-row" onclick="addSpecRow(this)"><td colspan="6" style="text-align:center;">＋ 添加规格</td></tr>
+    <tr class="spec-add-row" onclick="addSpecRow(this)"><td colspan="7" style="text-align:center;">＋ 添加规格</td></tr>
   </tbody>
 </table>`,
 
@@ -646,6 +662,10 @@ function renderStep(){
     /* Step 0 阶段无需联动营养(食材在 Step 1) */
   }
   if(currentStep===1){
+    /* 初始化右侧食材选择列表(若已通过 fillEditData 预填,则该次渲染会反映已添加状态) */
+    if(!document.getElementById('ingredientPickerList').children.length){
+      renderIngredientPicker('');
+    }
     setTimeout(function(){ recalcAddNutri(); }, 0);
   }
   if(pageMode==='edit' || pageMode==='convert') fillEditData();
@@ -706,7 +726,7 @@ function addSpecRow(addRow){
   if(document.querySelector('.spec-edit-row')) return;
   var tr=document.createElement('tr');
   tr.className='spec-edit-row';
-  tr.innerHTML='<td><div class="spec-input-group"><input class="form-input" type="number" placeholder="克重" min="0"><select class="form-select">'+buildPortionOptions()+'</select></div></td><td><input class="form-input" type="number" placeholder="餐品售价"></td><td><input class="form-input" type="number" placeholder="净菜包售价"></td><td><div class="sale-toggle" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">下架</span></div></td><td></td><td><button class="btn-text btn-text--primary" onclick="confirmSpec(this)">确定</button> <button class="btn-text btn-text--danger" onclick="cancelSpec(this)">取消</button></td>';
+  tr.innerHTML='<td><div class="spec-input-group"><input class="form-input" type="number" placeholder="克重" min="0"><select class="form-select">'+buildPortionOptions()+'</select></div></td><td><input class="form-input" type="number" placeholder="餐品售价"></td><td><input class="form-input" type="number" placeholder="净菜包毛利率" min="0" max="100" step="0.1"></td><td><input class="form-input" type="number" placeholder="净菜包售价"></td><td><div class="sale-toggle" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">下架</span></div></td><td></td><td><button class="btn-text btn-text--primary" onclick="confirmSpec(this)">确定</button> <button class="btn-text btn-text--danger" onclick="cancelSpec(this)">取消</button></td>';
   addRow.parentNode.insertBefore(tr,addRow);
 }
 function confirmSpec(btn){
@@ -715,18 +735,21 @@ function confirmSpec(btn){
   var gramInput=group.querySelector('input[type="number"]');
   var sel=group.querySelector('select');
   var priceInput=row.querySelectorAll('input[type="number"]')[1];
-  var cleanPriceInput=row.querySelectorAll('input[type="number"]')[2];
+  var cleanMarginInput=row.querySelectorAll('input[type="number"]')[2];
+  var cleanPriceInput=row.querySelectorAll('input[type="number"]')[3];
   var portion=sel?sel.value:'';
   var gram=gramInput?gramInput.value.trim():'';
   var price=priceInput?priceInput.value.trim():'';
+  var cleanMargin=cleanMarginInput?cleanMarginInput.value.trim():'';
   var cleanPrice=cleanPriceInput?cleanPriceInput.value.trim():'';
   if(!portion||portion==='请选择'||!gram||!price){alert('请填写完整信息');return;}
+  var cleanMarginText = cleanMargin ? parseFloat(cleanMargin).toFixed(1)+'%' : '—';
   var cleanPriceText = cleanPrice ? parseFloat(cleanPrice).toFixed(2) : '—';
   var saleActive = !!row.querySelector('.sale-toggle.active');
   var saleHtml = '<div class="sale-toggle'+(saleActive?' active':'')+'" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">'+(saleActive?'上架':'下架')+'</span></div>';
   var specViewHtml='<div class="spec-cell-view"><span class="spec-cell-view__gram">'+parseFloat(gram)+'g</span><span class="spec-cell-view__sep">/</span><span class="spec-cell-view__name">'+portion+'</span></div>';
   row.className='';
-  row.innerHTML='<td>'+specViewHtml+'</td><td>'+parseFloat(price).toFixed(2)+'</td><td>'+cleanPriceText+'</td><td>'+saleHtml+'</td><td><div class="spec-toggle" onclick="toggleDefault(this)"><span class="spec-toggle__switch"></span><span class="spec-toggle__label">默认</span></div></td><td><button class="btn-text btn-text--danger" onclick="removeSpec(this)">删除</button></td>';
+  row.innerHTML='<td>'+specViewHtml+'</td><td>'+parseFloat(price).toFixed(2)+'</td><td>'+cleanMarginText+'</td><td>'+cleanPriceText+'</td><td>'+saleHtml+'</td><td><div class="spec-toggle" onclick="toggleDefault(this)"><span class="spec-toggle__switch"></span><span class="spec-toggle__label">默认</span></div></td><td><button class="btn-text btn-text--danger" onclick="removeSpec(this)">删除</button></td>';
 }
 function toggleCleanSale(el){
   var active = el.classList.toggle('active');
@@ -799,29 +822,26 @@ function calcCostPrice(){
     row.style.display = 'none';
     return;
   }
-  /* 食材来源:Step 1 餐品构成中的食材表 #ingredientTbody,若无则用演示数据 */
-  var rows = document.querySelectorAll('#ingredientTbody tr');
-  var hasRealIngredient = rows.length > 0 && !(rows.length === 1 && rows[0].querySelector('td[colspan]'));
+  /* 食材来源:Step 1 餐品构成中的食材表行数据(由 getIngredientRowsData 统一读取),无则用演示数据 */
+  var ingRows = getIngredientRowsData();
+  var hasRealIngredient = ingRows.length > 0;
   var items = [];
   if(!hasRealIngredient){
     items = [
-      {code:'ING-001', name:'鸡胸肉', amount:120, unitPrice:25.00, priceDate:'2026-08-04'},
-      {code:'ING-014', name:'西兰花', amount:80,  unitPrice:10.00, priceDate:'2026-08-03'},
-      {code:'ING-027', name:'橄榄油', amount:10,  unitPrice:35.00, priceDate:'2026-08-01'},
-      {code:'ING-031', name:'食盐',   amount:3,   unitPrice:6.00,  priceDate:'2026-07-28'}
+      {code:'YQ-004', name:'鸡胸肉', amount:120, unitPrice:25.00, priceDate:'2026-08-04', priceMode:'最新验收价'},
+      {code:'YQ-024', name:'时令青菜', amount:80,  unitPrice:10.00, priceDate:'2026-08-03', priceMode:'最新验收价'},
+      {code:'YQ-014', name:'食用油', amount:10,  unitPrice:35.00, priceDate:'2026-08-01', priceMode:'手工录入'},
+      {code:'YQ-018', name:'食盐',   amount:3,   unitPrice:6.00,  priceDate:'2026-07-28', priceMode:'手工录入'}
     ];
   } else {
-    rows.forEach(function(r, i){
-      var tds = r.querySelectorAll('td');
-      if(tds.length < 3) return;
-      var name = tds[0] ? tds[0].textContent : '';
-      var amount = parseFloat(tds[2] ? tds[2].textContent : 0) || 0;
+    ingRows.forEach(function(d, i){
       /* 简化原型:单价按食材类型粗略给(主材25元/kg / 辅材12元/kg / 调料8元/kg) */
-      var typeText = tds[3] ? tds[3].textContent : '';
       var unitPrice = 25;
-      if(typeText.indexOf('辅材')>=0) unitPrice = 12;
-      else if(typeText.indexOf('调料')>=0) unitPrice = 8;
-      items.push({code:'ING-' + String(i+1).padStart(3,'0'), name:name, amount:amount, unitPrice:unitPrice, priceDate:'2026-08-05'});
+      if(d.type==='辅材') unitPrice = 12;
+      else if(d.type==='调料') unitPrice = 8;
+      /* 价格更新方式:主材默认走"最新验收价",辅材/调料默认"手工录入" */
+      var priceMode = (d.type==='辅材' || d.type==='调料') ? '手工录入' : '最新验收价';
+      items.push({code:d.code, name:d.name, amount:d.amount, unitPrice:unitPrice, priceDate:'2026-08-05', priceMode:priceMode});
     });
   }
   /* 按 100g 餐品等比缩放:scale = 100 / Σ原用量,缩放后所有用量合计 = 100g */
@@ -832,18 +852,22 @@ function calcCostPrice(){
   var total = 0;
   var html = '';
   if(items.length === 0 || scale === 0){
-    html = '<tr><td colspan="6" style="text-align:center;color:var(--text-placeholder);">暂无食材</td></tr>';
+    html = '<tr><td colspan="7" style="text-align:center;color:var(--text-placeholder);">暂无食材</td></tr>';
   } else {
     items.forEach(function(d, idx){
       var scaledAmount = d.amount * scale;
       var subtotal = scaledAmount * d.unitPrice / 1000;
       total += subtotal;
+      /* 价格更新方式只读胶囊:手工录入(灰)/最新验收价(绿) */
+      var modeClass = d.priceMode === '最新验收价' ? 'cost-price-mode--accept' : 'cost-price-mode--manual';
+      var modeHtml = '<span class="cost-price-mode '+modeClass+'">'+(d.priceMode||'手工录入')+'</span>';
       html += '<tr>'
         + '<td>'+d.code+'</td>'
         + '<td>'+d.name+'</td>'
         + '<td class="cost-detail__amount" data-row-idx="'+idx+'">'+scaledAmount.toFixed(2)+'</td>'
         + '<td><input class="cost-detail__unit-input" type="number" step="0.01" min="0" value="'+d.unitPrice.toFixed(2)+'" data-row-idx="'+idx+'" oninput="recalcCostRow(this)"></td>'
         + '<td class="cost-detail__price-date">'+d.priceDate+'</td>'
+        + '<td class="cost-detail__price-mode">'+modeHtml+'</td>'
         + '<td class="cost-detail__subtotal" data-row-idx="'+idx+'">'+subtotal.toFixed(2)+'</td>'
         + '</tr>';
     });
@@ -986,77 +1010,164 @@ function removeSpec(btn){
   if(wasDefault){var first=document.querySelector('#specBody tr:not(.spec-add-row):not(.spec-edit-row) .spec-toggle');if(first)first.classList.add('active');}
 }
 
-/* 食材搜索选择 */
+/* 食材清单数据：每个食材含 code + 多个净菜(netName 净菜形式,本身可含-分隔符) + 净菜规格别名(aliases 多规格时需先选净菜再选规格) */
 var INGREDIENT_LIST=[
-  {name:'猪五花肉',types:['红烧块','五花片']},{name:'猪里脊肉',types:['里脊丝','里脊片']},{name:'牛腩',types:['牛腩块']},{name:'鸡胸肉',types:['鸡丁','鸡丝']},{name:'鸡蛋',types:['鸡蛋液','鸡蛋块']},
-  {name:'番茄',types:['番茄块','番茄丁']},{name:'菠菜',types:['菠菜段','菠菜泥']},{name:'土豆',types:['土豆丝','土豆块','土豆泥']},{name:'胡萝卜',types:['胡萝卜丝','胡萝卜块']},{name:'大白菜',types:['白菜帮','白菜叶']},
-  {name:'大米',types:['熟米饭','米粒']},{name:'面粉',types:['面粉糊']},{name:'豆腐',types:['豆腐块','豆腐丁']},{name:'食用油',types:['净油']},{name:'生姜',types:['姜丝','姜片']},
-  {name:'大蒜',types:['蒜末','蒜片']},{name:'生抽',types:['调味汁']},{name:'食盐',types:['盐粒']},{name:'白糖',types:['糖浆']},{name:'料酒',types:['料酒汁']}
+  {code:'YQ-001',name:'猪五花肉',netTypes:[{netName:'红烧块'},{netName:'五花片',aliases:['薄片','厚片']}]},
+  {code:'YQ-002',name:'猪里脊肉',netTypes:[{netName:'里脊丝',aliases:['细丝','粗丝']},{netName:'里脊片',aliases:['薄片','厚片']}]},
+  {code:'YQ-003',name:'牛腩',netTypes:[{netName:'牛腩块',aliases:['小块','大块']}]},
+  {code:'YQ-004',name:'鸡胸肉',netTypes:[{netName:'鸡丁',aliases:['大丁','小丁']},{netName:'鸡丝',aliases:['细丝','粗丝']}]},
+  {code:'YQ-005',name:'鸡蛋',netTypes:[{netName:'鸡蛋液'},{netName:'鸡蛋块'}]},
+  {code:'YQ-006',name:'番茄',netTypes:[{netName:'番茄块'},{netName:'番茄丁',aliases:['大丁','小丁']}]},
+  {code:'YQ-007',name:'菠菜',netTypes:[{netName:'菠菜段',aliases:['长段','短段']},{netName:'菠菜泥'}]},
+  {code:'YQ-008',name:'土豆',netTypes:[{netName:'土豆-丝',aliases:['细丝','粗丝']},{netName:'土豆块'},{netName:'土豆泥'}]},
+  {code:'YQ-009',name:'胡萝卜',netTypes:[{netName:'胡萝卜丝',aliases:['细丝','粗丝']},{netName:'胡萝卜块'}]},
+  {code:'YQ-010',name:'大白菜',netTypes:[{netName:'白菜帮'},{netName:'白菜叶'}]},
+  {code:'YQ-011',name:'大米',netTypes:[{netName:'熟米饭'},{netName:'米粒'}]},
+  {code:'YQ-012',name:'面粉',netTypes:[{netName:'面粉糊'}]},
+  {code:'YQ-013',name:'豆腐',netTypes:[{netName:'豆腐块'},{netName:'豆腐丁',aliases:['大丁','小丁']}]},
+  {code:'YQ-014',name:'食用油',netTypes:[{netName:'净油'}]},
+  {code:'YQ-015',name:'生姜',netTypes:[{netName:'姜丝',aliases:['细丝','粗丝']},{netName:'姜片',aliases:['薄片','厚片']}]},
+  {code:'YQ-016',name:'大蒜',netTypes:[{netName:'蒜末',aliases:['细末','粗末']},{netName:'蒜片',aliases:['薄片','厚片']}]},
+  {code:'YQ-017',name:'生抽',netTypes:[{netName:'调味汁'}]},
+  {code:'YQ-018',name:'食盐',netTypes:[{netName:'盐粒'}]},
+  {code:'YQ-019',name:'白糖',netTypes:[{netName:'糖浆'}]},
+  {code:'YQ-020',name:'料酒',netTypes:[{netName:'料酒汁'}]},
+  {code:'YQ-021',name:'食醋',netTypes:[{netName:'调味汁'}]},
+  {code:'YQ-022',name:'淀粉',netTypes:[{netName:'淀粉糊'}]},
+  {code:'YQ-023',name:'冰糖',netTypes:[{netName:'糖浆'}]},
+  {code:'YQ-024',name:'时令青菜',netTypes:[{netName:'青菜段',aliases:['长段','短段']}]},
+  {code:'YQ-025',name:'燕麦',netTypes:[{netName:'燕麦片'}]},
+  {code:'YQ-026',name:'藜麦',netTypes:[{netName:'藜麦粒'}]}
 ];
-function initIngredientNameOptions(){
-  var nameSelect=document.getElementById('ingredientNameSelect');
-  if(!nameSelect) return;
-  nameSelect.innerHTML='<option value="">请选择食材</option>'+INGREDIENT_LIST.map(function(item){
-    return '<option value="'+item.name+'">'+item.name+'</option>';
+/* 渲染右侧食材选择列表（按搜索关键词过滤,已添加的食材显示"已添加"标记并禁用点击） */
+function renderIngredientPicker(keyword){
+  var listEl=document.getElementById('ingredientPickerList');
+  if(!listEl) return;
+  var kw=(keyword||'').trim().toLowerCase();
+  var html=INGREDIENT_LIST.filter(function(item){
+    if(!kw) return true;
+    return (item.name||'').toLowerCase().indexOf(kw)>=0 || (item.code||'').toLowerCase().indexOf(kw)>=0;
+  }).map(function(item){
+    var added=isIngredientAdded(item.code);
+    var cls=added?'ingredient-picker__item is-added':'ingredient-picker__item';
+    var attr=added?'':'onclick="addIngredientRow(\''+item.code+'\')"';
+    var badge=added?'<span class="ingredient-picker__badge">已添加</span>':'';
+    return '<div class="'+cls+'" data-code="'+item.code+'" '+attr+'>'
+      +'<span class="ingredient-picker__code">'+item.code+'</span>'
+      +'<span class="ingredient-picker__name">'+item.name+'</span>'
+      +badge
+      +'</div>';
   }).join('');
+  if(!html) html='<div class="ingredient-picker__empty">无匹配食材</div>';
+  listEl.innerHTML=html;
 }
-function resetIngredientForm(){
-  var nameSelect=document.getElementById('ingredientNameSelect');
-  if(nameSelect) nameSelect.value='';
-  var netTypeSelect=document.getElementById('ingredientNetType');
-  if(netTypeSelect){
-    netTypeSelect.innerHTML='<option value="">请先选择食材</option>';
-    netTypeSelect.disabled=true;
-  }
-  document.getElementById('ingredientAmount').value='';
-  document.getElementById('ingredientType').selectedIndex=0;
-  document.getElementById('ingredientAllergen').value='';
-  document.getElementById('ingredientNote').value='';
+function filterIngredientPicker(){
+  var input=document.getElementById('ingredientSearchInput');
+  renderIngredientPicker(input?input.value:'');
 }
-function selectIngredient(name){
-  var nameSelect=document.getElementById('ingredientNameSelect');
-  if(nameSelect) nameSelect.value=name;
-  var match=INGREDIENT_LIST.find(function(item){return item.name===name;});
-  var netTypeSelect=document.getElementById('ingredientNetType');
-  if(netTypeSelect){
-    netTypeSelect.innerHTML='';
-    if(match && match.types && match.types.length){
-      netTypeSelect.disabled=false;
-      netTypeSelect.innerHTML=match.types.map(function(type){return '<option value="'+type+'">'+type+'</option>';}).join('');
-    } else {
-      netTypeSelect.disabled=true;
-      netTypeSelect.innerHTML='<option value="">暂无净菜类型</option>';
-    }
-  }
+function isIngredientAdded(code){
+  var tbody=document.getElementById('ingredientTbody');
+  if(!tbody) return false;
+  return !!tbody.querySelector('tr[data-code="'+code+'"]');
 }
-function confirmAddIngredient(){
-  var name=document.getElementById('ingredientNameSelect').value.trim();
-  var netType=document.getElementById('ingredientNetType').value.trim();
-  var amount=document.getElementById('ingredientAmount').value.trim();
-  if(!name){alert('请选择食材');return;}
-  if(!netType){alert('请选择净菜类型');return;}
-  if(!amount){alert('请填写用量');return;}
-  var ingredientType=document.getElementById('ingredientType').value;
-  var allergen=document.getElementById('ingredientAllergen').value.trim()||'无';
-  var note=document.getElementById('ingredientNote').value.trim()||'—';
-  var tbody=document.querySelector('.ingredient-table tbody');
-  /* 移除空状态行 */
-  var emptyRow=tbody.querySelector('td[colspan]');
-  if(emptyRow) emptyRow.parentElement.remove();
+/* 点击右侧食材项:在左侧食材清单末尾添加一行,包含净菜下拉+条件显示的规格下拉 */
+function addIngredientRow(code){
+  if(isIngredientAdded(code)) return;
+  var item=INGREDIENT_LIST.find(function(it){return it.code===code;});
+  if(!item) return;
+  var tbody=document.getElementById('ingredientTbody');
+  if(!tbody) return;
+  var emptyRow=tbody.querySelector('.ingredient-empty');
+  if(emptyRow) emptyRow.remove();
+  var netOptions='<option value="">请选择净菜</option>'+(item.netTypes||[]).map(function(n){
+    return '<option value="'+n.netName+'">'+n.netName+'</option>';
+  }).join('');
   var tr=document.createElement('tr');
-  var typeTagMap={'主材':'tag-blue','辅材':'tag-gray','调料':'tag-orange'};
-  tr.innerHTML='<td>'+name+'</td><td>'+netType+'</td><td>'+amount+'</td>'
-    +'<td><span class="tag '+(typeTagMap[ingredientType]||'tag-gray')+'">'+ingredientType+'</span></td>'
-    +'<td>'+allergen+'</td>'
-    +'<td>'+note+'</td>'
-    +'<td><a class="link" onclick="this.closest(\'tr\').remove()">删除</a></td>';
+  tr.className='ingredient-row';
+  tr.setAttribute('data-code',code);
+  tr.setAttribute('data-name',item.name);
+  tr.innerHTML=''
+    +'<td class="td-code">'+code+'</td>'
+    +'<td class="td-name">'+item.name+'</td>'
+    +'<td class="td-type"><select class="form-select form-select--sm" onchange="onIngredientTypeChange(this)">'
+      +'<option value="主材">主材</option>'
+      +'<option value="辅材" selected>辅材</option>'
+      +'<option value="调料">调料</option>'
+    +'</select></td>'
+    +'<td class="td-net"><div class="td-net__inner">'
+      +'<select class="form-select form-select--sm ingredient-net-select" onchange="onNetTypeChange(this)">'+netOptions+'</select>'
+      +'<select class="form-select form-select--sm ingredient-spec-select" style="display:none;" onchange="onNetSpecChange(this)"></select>'
+    +'</div></td>'
+    +'<td class="td-amount"><input type="number" class="form-input form-input--sm ingredient-amount-input" placeholder="用量" min="0" step="0.1" oninput="recalcAfterIngredientChange()"></td>'
+    +'<td class="td-actions"><a class="link" onclick="removeIngredientRow(this)">删除</a></td>';
   tbody.appendChild(tr);
-  /* 重置表单 */
-  resetIngredientForm();
-  closeIngredientDialog();
-  /* 重新计算营养指标和定价 */
+  renderIngredientPicker(document.getElementById('ingredientSearchInput')?document.getElementById('ingredientSearchInput').value:'');
   recalcAfterIngredientChange();
 }
+function removeIngredientRow(btn){
+  var tr=btn.closest('tr');
+  if(!tr) return;
+  var tbody=tr.parentElement;
+  tr.remove();
+  if(tbody && tbody.querySelectorAll('tr.ingredient-row').length===0){
+    tbody.innerHTML='<tr class="ingredient-empty"><td colspan="6" style="text-align:center;color:var(--text-placeholder);padding:32px;">暂无食材,请从右侧点击食材添加</td></tr>';
+  }
+  renderIngredientPicker(document.getElementById('ingredientSearchInput')?document.getElementById('ingredientSearchInput').value:'');
+  recalcAfterIngredientChange();
+}
+function onIngredientTypeChange(sel){
+  recalcAfterIngredientChange();
+}
+/* 净菜下拉变化:如该净菜有多规格(aliases 长度>0)则显示规格下拉,否则隐藏 */
+function onNetTypeChange(sel){
+  var tr=sel.closest('tr');
+  if(!tr) return;
+  var code=tr.getAttribute('data-code');
+  var item=INGREDIENT_LIST.find(function(it){return it.code===code;});
+  var netName=sel.value;
+  var specSel=tr.querySelector('.ingredient-spec-select');
+  if(!netName){
+    if(specSel){specSel.style.display='none';specSel.innerHTML='';}
+    recalcAfterIngredientChange();
+    return;
+  }
+  var netItem=item?(item.netTypes||[]).find(function(n){return n.netName===netName;}):null;
+  var aliases=netItem?(netItem.aliases||[]):[];
+  if(aliases.length>0){
+    if(specSel){
+      specSel.style.display='';
+      specSel.innerHTML='<option value="">请选择规格</option>'+aliases.map(function(a){return '<option value="'+a+'">'+a+'</option>';}).join('');
+      specSel.value='';
+    }
+  } else {
+    if(specSel){specSel.style.display='none';specSel.innerHTML='';}
+  }
+  recalcAfterIngredientChange();
+}
+function onNetSpecChange(sel){
+  recalcAfterIngredientChange();
+}
+/* 读取左侧食材清单所有行数据,供成本核算 calcCostPrice 使用 */
+function getIngredientRowsData(){
+  var tbody=document.getElementById('ingredientTbody');
+  if(!tbody) return [];
+  var rows=tbody.querySelectorAll('tr.ingredient-row');
+  var result=[];
+  rows.forEach(function(r){
+    var code=r.getAttribute('data-code');
+    var name=r.getAttribute('data-name');
+    var typeSel=r.querySelector('.td-type select');
+    var type=typeSel?typeSel.value:'辅材';
+    var netSel=r.querySelector('.ingredient-net-select');
+    var netName=netSel?netSel.value:'';
+    var specSel=r.querySelector('.ingredient-spec-select');
+    var alias=(specSel && specSel.style.display!=='none')?specSel.value:'';
+    var amountInput=r.querySelector('.ingredient-amount-input');
+    var amount=amountInput?(parseFloat(amountInput.value)||0):0;
+    result.push({code:code,name:name,type:type,netName:netName,alias:alias,amount:amount});
+  });
+  return result;
+}
 
 /* 图片上传 */
 function triggerImageUpload(){
@@ -1130,9 +1241,9 @@ var EDIT_DATA = {
   pricing:{basePrice:'6.00',ingredientCost:4.80,per100gCost:2.40,profitRate:150,suggestedPrice:'6.00'},
   promoVideos:[{title:'红烧肉宣传片',duration:'1分30秒',size:'48MB',enabled:true},{title:'制作工艺展示',duration:'2分15秒',size:'72MB',enabled:false}],
   crowd:[{name:'成人',level:'推荐'},{name:'高血脂人群',level:'慎食'},{name:'高血压人群',level:'适量'}],
-  specs:[{portion:'标准份',baseGram:200,unit:'份',price:12,cleanPrice:9,cleanSale:false,isDefault:true},{portion:'小份',baseGram:120,unit:'份',price:8,cleanPrice:6,cleanSale:false,isDefault:false},{portion:'大份',baseGram:300,unit:'份',price:18,cleanPrice:13,cleanSale:false,isDefault:false}],
+  specs:[{portion:'标准份',baseGram:200,unit:'份',price:12,cleanMargin:55.0,cleanPrice:9,cleanSale:false,isDefault:true},{portion:'小份',baseGram:120,unit:'份',price:8,cleanMargin:50.0,cleanPrice:6,cleanSale:false,isDefault:false},{portion:'大份',baseGram:300,unit:'份',price:18,cleanMargin:58.0,cleanPrice:13,cleanSale:false,isDefault:false}],
   cookedWeight:200,
-  composition:[{name:'五花肉',netType:'红烧块',amount:150,pct:'60%',type:'主材',allergen:'无',note:'—'},{name:'冰糖',netType:'糖浆',amount:20,pct:'8%',type:'调料',allergen:'无',note:'上色'},{name:'酱油',netType:'调味汁',amount:15,pct:'6%',type:'调料',allergen:'含大豆',note:'调味'},{name:'料酒',netType:'料酒汁',amount:10,pct:'4%',type:'调料',allergen:'无',note:'去腥'}],
+  composition:[{code:'YQ-001',name:'猪五花肉',netName:'红烧块',amount:150,type:'主材'},{code:'YQ-023',name:'冰糖',netName:'糖浆',amount:20,type:'调料'},{code:'YQ-017',name:'生抽',netName:'调味汁',amount:15,type:'调料'},{code:'YQ-020',name:'料酒',netName:'料酒汁',amount:10,type:'调料'}],
   cook:{mainMethod:'炖',subMethod:'煎',heat:'中火→小火',duration:45,temp:100,steps:6,desc:'1.五花肉切块焯水；2.锅中煎至金黄；3.加冰糖炒色；4.加酱油料酒；5.加水小火炖40分钟；6.大火收汁'},
   nutri:{calorie:385,protein:18.2,carb:12.4,fat:28.6,vitC:2.1,mineral:45,fiber:1.8,sodium:486,calcium:18,iron:2.4,zinc:1.8,potassium:280,cholesterol:88,vitA:14,vitE:0.6,vitB1:0.22,vitB2:0.12,magnesium:20,phosphorus:160,selenium:18},
   taste:{sour:1,sweet:3,bitter:1,spicy:1,salty:4,smell:4.2,flavorScore:3.8,flavorGrade:'good'},
@@ -1173,7 +1284,7 @@ if(pageMode==='convert' && INNOV){
   EDIT_DATA.tag = INNOV.tag;
   EDIT_DATA.status = '上架';
   EDIT_DATA.crowd = [];
-  EDIT_DATA.specs = [{portion:'标准份',baseGram:350,unit:'份',price:15,cleanPrice:10,cleanSale:false,isDefault:true},{portion:'小份',baseGram:200,unit:'份',price:10,cleanPrice:7,cleanSale:false,isDefault:false}];
+  EDIT_DATA.specs = [{portion:'标准份',baseGram:350,unit:'份',price:15,cleanMargin:52.0,cleanPrice:10,cleanSale:false,isDefault:true},{portion:'小份',baseGram:200,unit:'份',price:10,cleanMargin:48.0,cleanPrice:7,cleanSale:false,isDefault:false}];
   EDIT_DATA.cookedWeight = INNOV.cookedWeight || 200;
   EDIT_DATA.composition = INNOV.composition;
   EDIT_DATA.cook = INNOV.cook;
@@ -1220,18 +1331,70 @@ function fillEditData(){
       renderPromoVideoList();
     }
   } else if(currentStep===1){
-    // 餐品构成 - 熟重 + 食材表格 + 营养指标（只读自动计算）
+    // 餐品构成 - 熟重 + 双栏食材清单(左清单+右选择) + 营养指标(只读自动计算)
     if(inputs[0] && d.cookedWeight!==undefined) inputs[0].value = d.cookedWeight;
-    var tbody = container.querySelector('#ingredientTable tbody');
+    // 先初始化右侧食材选择列表
+    renderIngredientPicker('');
+    var tbody = container.querySelector('#ingredientTbody');
     if(tbody){
       tbody.innerHTML = '';
-      d.composition.forEach(function(c){
-        var tr = document.createElement('tr');
-        tr.innerHTML = (pageMode==='convert'
-              ? '<td>'+c.name+'</td><td>'+(c.netType||'—')+'</td><td>'+c.amount+'g</td><td><span class="tag '+(c.type==='主材'?'tag-blue':c.type==='调料'?'tag-orange':'tag-gray')+'">'+(c.type||'辅材')+'</span></td><td>'+c.allergen+'</td><td>'+c.note+'</td><td><span style="color:#bbb;cursor:not-allowed;">编辑</span> <span style="color:#bbb;cursor:not-allowed;">删除</span></td>'
-              : '<td>'+c.name+'</td><td>'+(c.netType||'—')+'</td><td>'+c.amount+'g</td><td><span class="tag '+(c.type==='主材'?'tag-blue':c.type==='调料'?'tag-orange':'tag-gray')+'">'+(c.type||'辅材')+'</span></td><td>'+c.allergen+'</td><td>'+c.note+'</td><td><span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td>');
-        tbody.appendChild(tr);
+      (d.composition||[]).forEach(function(c){
+        // 在 INGREDIENT_LIST 中按食材名匹配,以复用 addIngredientRow 的标准流程
+        var matched = INGREDIENT_LIST.find(function(it){return it.name===c.name;});
+        if(matched){
+          addIngredientRow(matched.code);
+          var tr = tbody.querySelector('tr[data-code="'+matched.code+'"]');
+          if(!tr) return;
+          var typeSel = tr.querySelector('.td-type select');
+          if(typeSel && c.type) typeSel.value = c.type;
+          var netSel = tr.querySelector('.ingredient-net-select');
+          if(netSel && c.netName){
+            // 若原数据 netName 不在 INGREDIENT_LIST 的 netTypes 中,追加一个 option 兜底
+            if(!netSel.querySelector('option[value="'+c.netName+'"]')){
+              var opt = document.createElement('option');
+              opt.value = c.netName;
+              opt.textContent = c.netName;
+              netSel.appendChild(opt);
+            }
+            netSel.value = c.netName;
+            onNetTypeChange(netSel);
+            var specSel = tr.querySelector('.ingredient-spec-select');
+            if(specSel && c.netSpecAlias && specSel.style.display!=='none'){
+              if(!specSel.querySelector('option[value="'+c.netSpecAlias+'"]')){
+                var sOpt = document.createElement('option');
+                sOpt.value = c.netSpecAlias;
+                sOpt.textContent = c.netSpecAlias;
+                specSel.appendChild(sOpt);
+              }
+              specSel.value = c.netSpecAlias;
+            }
+          }
+          var amountInput = tr.querySelector('.ingredient-amount-input');
+          if(amountInput && c.amount!==undefined) amountInput.value = c.amount;
+        } else {
+          // INGREDIENT_LIST 中无匹配:直接构建只读行(用 composition 原值)
+          var tr2 = document.createElement('tr');
+          tr2.className = 'ingredient-row';
+          tr2.setAttribute('data-code', c.code||'');
+          tr2.setAttribute('data-name', c.name||'');
+          tr2.innerHTML = ''
+            + '<td class="td-code">'+(c.code||'—')+'</td>'
+            + '<td class="td-name">'+(c.name||'—')+'</td>'
+            + '<td class="td-type"><select class="form-select form-select--sm"><option value="主材">主材</option><option value="辅材">辅材</option><option value="调料">调料</option></select></td>'
+            + '<td class="td-net"><div class="td-net__inner"><select class="form-select form-select--sm ingredient-net-select"><option value="'+(c.netName||'')+'">'+(c.netName||'—')+'</option></select><select class="form-select form-select--sm ingredient-spec-select" style="display:none;"></select></div></td>'
+            + '<td class="td-amount"><input type="number" class="form-input form-input--sm ingredient-amount-input" value="'+(c.amount||0)+'"></td>'
+            + '<td class="td-actions"><a class="link" onclick="removeIngredientRow(this)">删除</a></td>';
+          tbody.appendChild(tr2);
+          var tSel = tr2.querySelector('.td-type select');
+          if(tSel && c.type) tSel.value = c.type;
+        }
       });
+      // 若未预填任何项,显示空态
+      if(tbody.querySelectorAll('tr.ingredient-row').length===0){
+        tbody.innerHTML = '<tr class="ingredient-empty"><td colspan="6" style="text-align:center;color:var(--text-placeholder);padding:32px;">暂无食材,请从右侧点击食材添加</td></tr>';
+      }
+      // 重新渲染右侧以反映已添加状态
+      renderIngredientPicker(document.getElementById('ingredientSearchInput')?document.getElementById('ingredientSearchInput').value:'');
     }
     // 营养指标 - 通过 ID 设置只读文本（4 大项 + 16 项更多）
     if(d.nutri){
@@ -1259,7 +1422,8 @@ function fillEditData(){
         var saleHtml = '<div class="sale-toggle'+(saleActive?' active':'')+'" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">'+(saleActive?'上架':'下架')+'</span></div>';
         var portionVal = s.portion || s.spec || '';
         var gramVal = s.baseGram!==undefined?s.baseGram:(s.weight!==undefined?s.weight:'');
-        tr.innerHTML = '<td><div class="spec-input-group"><input class="form-input form-input--sm" type="number" value="'+gramVal+'"><select class="form-select form-select--sm">'+buildPortionOptions(portionVal)+'</select></div></td><td><input class="form-input form-input--sm" value="'+s.price+'"></td><td><input class="form-input form-input--sm" value="'+(s.cleanPrice!==undefined?s.cleanPrice:'')+'"></td><td>'+saleHtml+'</td><td><input type="checkbox"'+(s.isDefault?' checked':'')+'></td><td><span class="link" onclick="this.closest(\'tr\').remove()">删除</span></td>';
+        var cleanMarginVal = s.cleanMargin!==undefined?s.cleanMargin:'';
+        tr.innerHTML = '<td><div class="spec-input-group"><input class="form-input form-input--sm" type="number" value="'+gramVal+'"><select class="form-select form-select--sm">'+buildPortionOptions(portionVal)+'</select></div></td><td><input class="form-input form-input--sm" value="'+s.price+'"></td><td><input class="form-input form-input--sm" type="number" step="0.1" min="0" max="100" value="'+cleanMarginVal+'" placeholder="净菜包毛利率"></td><td><input class="form-input form-input--sm" value="'+(s.cleanPrice!==undefined?s.cleanPrice:'')+'"></td><td>'+saleHtml+'</td><td><input type="checkbox"'+(s.isDefault?' checked':'')+'></td><td><span class="link" onclick="this.closest(\'tr\').remove()">删除</span></td>';
         specBody.appendChild(tr);
       });
     }
diff --git a/web-admin/nutrition/din-dish-all.html b/web-admin/nutrition/din-dish-all.html
index 3f4fe35..91c885d 100644
--- a/web-admin/nutrition/din-dish-all.html
+++ b/web-admin/nutrition/din-dish-all.html
@@ -73,6 +73,11 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .panel-left__search input:focus{border-color:var(--primary);}
 .panel-left__filter{display:flex;gap:8px;}
 .panel-left__filter select{height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 24px 0 10px;font-size:var(--font-xs);outline: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 8px center;appearance:none;cursor:pointer;flex:1;}
+/* 高级搜索筛选条件汇总条(显示已应用的筛选条件,可一键清空) */
+.panel-left__filter-summary{margin-top:8px;padding:6px 10px;background:var(--primary-light);border:1px solid #BAE7FF;border-radius:var(--radius-sm);font-size:var(--font-xs);color:var(--primary);display:flex;align-items:center;justify-content:space-between;gap:8px;}
+.panel-left__filter-summary__text{flex:1;line-height:1.4;}
+.panel-left__filter-summary__clear{flex-shrink:0;cursor:pointer;color:var(--danger);font-size:var(--font-xs);background:none;border:none;padding:0 4px;}
+.panel-left__filter-summary__clear:hover{text-decoration:underline;}
 .panel-left__actions{display:flex;gap:8px;padding:10px 20px;border-bottom:1px solid var(--border);flex-wrap:wrap;}
 .panel-left__actions .btn{height:30px;font-size:var(--font-xs);padding:0 10px;}
 .food-list{flex:1;overflow-y:auto;padding:4px 0;}
@@ -116,6 +121,9 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .info-table td{padding:10px 12px;border-bottom:1px solid var(--border);color:var(--text-primary);}
 .info-table tr:last-child td{border-bottom:none;}
 .info-table tr:hover{background:#F8FBFF;}
+/* 净菜类型单元格：净菜名称（主样式）+ 净菜规格别名（弱化） */
+.net-type{font-size:var(--font-sm);color:var(--text-primary);}
+.net-type-alias{margin-left:6px;font-size:var(--font-xs);color:var(--text-placeholder);font-weight:normal;}
 .spec-detail-table th{padding:6px 12px;font-size:12px;}
 .spec-detail-table td{padding:6px 12px;font-size:12px;}
 /* 规格只读展示（克重g / 份型 合并单列） */
@@ -157,6 +165,12 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .form-input:focus,.form-select:focus{border-color:var(--primary);}
 .form-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-row{display:grid;grid-template-columns:1fr 1fr;gap:16px;}
+/* 高级搜索表单网格(2 列) + 区间输入(双 input 用 ~ 分隔) */
+.adv-search-grid{display:grid;grid-template-columns:1fr 1fr;gap:14px 18px;}
+.adv-search-grid .form-group{margin-bottom:0;}
+.adv-range{display:flex;align-items:center;gap:8px;}
+.adv-range .form-input{flex:1;min-width:0;}
+.adv-range__sep{color:var(--text-placeholder);font-size:var(--font-sm);flex-shrink:0;}
 /* 操作列固定右侧 */
 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;}
@@ -322,13 +336,15 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
       <div class="panel-left__header">
         <div class="panel-left__title">餐品列表</div>
         <div class="panel-left__search">
-          <input type="text" placeholder="搜索餐品名称/编号...">
-          <button class="btn btn-primary" style="height:32px;padding:0 12px;font-size:var(--font-xs);">搜索</button>
+          <input type="text" id="dishQuickSearchInput" placeholder="搜索餐品名称/编号..." oninput="onQuickSearchInput(this.value)">
+          <button class="btn btn-primary" style="height:32px;padding:0 12px;font-size:var(--font-xs);" onclick="onQuickSearch()">搜索</button>
+          <button class="btn btn-default" style="height:32px;padding:0 10px;font-size:var(--font-xs);" onclick="openAdvancedSearchDialog()">⚙ 高级搜索</button>
         </div>
         <div class="panel-left__filter">
-          <select><option>全部分类</option><option>主食</option><option>荤菜</option><option>素菜</option><option>汤品</option><option>小吃</option></select>
-          <select><option>全部状态</option><option>启用</option><option>停用</option></select>
+          <select id="dishCategoryFilter" onchange="onQuickSearch()"><option>全部分类</option><option>主食</option><option>荤菜</option><option>素菜</option><option>汤品</option><option>小吃</option></select>
+          <select id="dishStatusFilter" onchange="onQuickSearch()"><option>全部状态</option><option>启用</option><option>停用</option></select>
         </div>
+        <div class="panel-left__filter-summary" id="filterSummary" style="display:none;"></div>
       </div>
       <div class="panel-left__actions">
         <a href="din-dish-add.html" class="btn btn-primary">➕ 新增餐品</a>
@@ -336,8 +352,9 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 	        <button class="btn btn-default" onclick="openDishCategoryDialog()">📂 餐品分类管理</button>
       </div>
       <div class="food-list" id="dishList"></div>
+      <div id="dishListEmpty" style="display:none;text-align:center;padding:40px 20px;color:var(--text-placeholder);font-size:var(--font-sm);">未找到匹配的餐品<br><span style="font-size:var(--font-xs);">请调整搜索条件或 <span class="link" onclick="clearAdvancedSearch()">清空筛选</span></span></div>
       <div class="panel-left__footer">
-        <span>共 486 条</span>
+        <span id="dishListCount">共 0 条</span>
         <div style="display:flex;gap:4px;">
           <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>
         </div>
@@ -367,58 +384,115 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
   </div>
 </main>
 
+<!-- 高级搜索弹窗 -->
+<div class="dialog-mask" id="advancedSearchDialog">
+  <div class="dialog" style="width:720px;">
+    <div class="dialog__header">
+      <div class="dialog__title">⚙ 高级搜索</div>
+      <button class="dialog__close" onclick="closeAdvancedSearchDialog()"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M1 1l12 12M13 1L1 13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg></button>
+    </div>
+    <div class="dialog__body">
+      <div class="adv-search-grid">
+        <div class="form-group"><label>餐品名称</label><input class="form-input" id="advName" placeholder="支持模糊匹配"></div>
+        <div class="form-group"><label>餐品编号</label><input class="form-input" id="advCode" placeholder="如 DISH001"></div>
+        <div class="form-group"><label>餐品分类</label>
+          <select class="form-select" id="advCategory">
+            <option value="">全部</option>
+            <option>主食</option><option>荤菜</option><option>素菜</option><option>汤品</option><option>小吃</option>
+          </select>
+        </div>
+        <div class="form-group"><label>适用餐次</label>
+          <select class="form-select" id="advMeal">
+            <option value="">全部</option>
+            <option>早餐</option><option>午餐</option><option>晚餐</option><option>早/午</option><option>午/晚</option><option>早/午/晚</option>
+          </select>
+        </div>
+        <div class="form-group"><label>餐品标签</label>
+          <select class="form-select" id="advTag">
+            <option value="">全部</option>
+            <option>低脂</option><option>高蛋白</option><option>素食</option><option>低卡</option><option>高纤维</option><option>低GI</option><option>高糖</option><option>无麸质</option><option>主食</option>
+          </select>
+        </div>
+        <div class="form-group"><label>上架状态</label>
+          <select class="form-select" id="advStatus">
+            <option value="">全部</option>
+            <option>启用</option><option>停用</option>
+          </select>
+        </div>
+        <div class="form-group"><label>食材成本区间(元/100g)</label>
+          <div class="adv-range"><input class="form-input" id="advCostMin" type="number" step="0.01" min="0" placeholder="最低"><span class="adv-range__sep">~</span><input class="form-input" id="advCostMax" type="number" step="0.01" min="0" placeholder="最高"></div>
+        </div>
+        <div class="form-group"><label>餐品售价区间(元/份)</label>
+          <div class="adv-range"><input class="form-input" id="advPriceMin" type="number" step="0.01" min="0" placeholder="最低"><span class="adv-range__sep">~</span><input class="form-input" id="advPriceMax" type="number" step="0.01" min="0" placeholder="最高"></div>
+        </div>
+        <div class="form-group"><label>创建时间</label>
+          <div class="adv-range"><input class="form-input" id="advCreatedStart" type="date"><span class="adv-range__sep">~</span><input class="form-input" id="advCreatedEnd" type="date"></div>
+        </div>
+        <div class="form-group"><label>更新时间</label>
+          <div class="adv-range"><input class="form-input" id="advUpdatedStart" type="date"><span class="adv-range__sep">~</span><input class="form-input" id="advUpdatedEnd" type="date"></div>
+        </div>
+      </div>
+    </div>
+    <div class="dialog__footer">
+      <button class="btn btn-default" onclick="resetAdvancedSearch()">重置</button>
+      <button class="btn btn-default" onclick="closeAdvancedSearchDialog()">取消</button>
+      <button class="btn btn-primary" onclick="applyAdvancedSearch()">应用筛选</button>
+    </div>
+  </div>
+</div>
+
 <script>
 // 餐品数据
 const DISHES = [
-  {id:'DISH001',name:'红烧肉',icon:'🥩',category:'荤菜',tags:['高蛋白'],specs:[{portion:'标准份',baseGram:200,unit:'份',price:12,cleanPrice:9,cleanSale:false,isDefault:true},{portion:'小份',baseGram:120,unit:'份',price:8,cleanPrice:6,cleanSale:false},{portion:'大份',baseGram:300,unit:'份',price:18,cleanPrice:13,cleanSale:false}],method:'炖',meal:'午/晚',allergen:'无',status:'启用',source:'手动添加',
+  {id:'DISH001',name:'红烧肉',icon:'🥩',category:'荤菜',tags:['高蛋白'],specs:[{portion:'标准份',baseGram:200,unit:'份',price:12,cleanMargin:55.0,cleanPrice:9,cleanSale:false,isDefault:true},{portion:'小份',baseGram:120,unit:'份',price:8,cleanMargin:50.0,cleanPrice:6,cleanSale:false},{portion:'大份',baseGram:300,unit:'份',price:18,cleanMargin:58.0,cleanPrice:13,cleanSale:false}],method:'炖',meal:'午/晚',allergen:'无',status:'启用',source:'手动添加',updateTime:'2026-08-10',
     pricing:{basePrice:'6.00',ingredientCost:4.80,per100gCost:2.40,profitRate:150,suggestedPrice:'6.00'},
     promoVideos:[{title:'红烧肉宣传片',duration:'1分30秒',size:'48MB',enabled:true},{title:'制作工艺展示',duration:'2分15秒',size:'72MB',enabled:false}],
     crowd:[{name:'成人',level:'推荐'},{name:'高血脂人群',level:'慎食'},{name:'高血压人群',level:'适量'}],crowdNote:'高血脂人群控制摄入量',cookedWeight:200,
-    composition:[{name:'猪五花肉',netType:'红烧块',amount:160,pct:'80%',state:'净菜',type:'主材',allergen:'无',note:'—'},{name:'生姜',netType:'姜片',amount:5,pct:'2.5%',state:'净菜',type:'辅材',allergen:'无',note:'—'},{name:'生抽',netType:'调味汁',amount:15,pct:'7.5%',state:'原料',type:'调料',allergen:'含麸质',note:'酱油'},{name:'冰糖',netType:'糖浆',amount:10,pct:'5%',state:'原料',type:'调料',allergen:'无',note:'上色提味'},{name:'料酒',netType:'料酒汁',amount:10,pct:'5%',state:'原料',type:'调料',allergen:'无',note:'去腥'}],
+    composition:[{code:'YQ-001',name:'猪五花肉',netName:'红烧块',amount:160,type:'主材'},{code:'YQ-015',name:'生姜',netName:'姜片',amount:5,type:'辅材'},{code:'YQ-017',name:'生抽',netName:'调味汁',amount:15,type:'调料'},{code:'YQ-023',name:'冰糖',netName:'糖浆',amount:10,type:'调料'},{code:'YQ-020',name:'料酒',netName:'料酒汁',amount:10,type:'调料'}],
     nutri:{calorie:385,protein:18.2,carb:12.4,fat:28.6,vitC:0.8,mineral:42,fiber:0.3,sodium:486,calcium:18,iron:2.4,zinc:1.8,potassium:280,cholesterol:88,vitA:14,vitE:0.6,vitB1:0.22,vitB2:0.12,magnesium:20,phosphorus:160,selenium:18,copper:0.12,manganese:0.05,nutriGrade:'偏差',note:'铁2.4mg、锌1.8mg'},
     cook:{mainMethod:'炖',subMethod:'煎',heat:'中火→小火',duration:45,temp:'100→80',steps:6},
     taste:{sour:1,sweet:3,bitter:1,spicy:1,salty:4,smell:4.2,flavorScore:3.8,flavorGrade:'良好'},
     color:{mainColor:'红褐色',uniformity:4,gloss:4,freshness:4,appearance:4,colorScore:4.0,colorGrade:'良好'},
     texture:{hardness:2,sticky:3,crispy:1,smooth:4,elastic:3,textureScore:3.6,textureGrade:'良好'}
   },
-  {id:'DISH002',name:'清炒时蔬',icon:'🥬',category:'素菜',tags:['低脂','素食'],specs:[{portion:'标准份',baseGram:150,unit:'份',price:6,cleanPrice:4.5,cleanSale:false,isDefault:true},{portion:'小份',baseGram:100,unit:'份',price:4,cleanPrice:3,cleanSale:false}],method:'炒',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',
+  {id:'DISH002',name:'清炒时蔬',icon:'🥬',category:'素菜',tags:['低脂','素食'],specs:[{portion:'标准份',baseGram:150,unit:'份',price:6,cleanMargin:60.0,cleanPrice:4.5,cleanSale:false,isDefault:true},{portion:'小份',baseGram:100,unit:'份',price:4,cleanMargin:55.0,cleanPrice:3,cleanSale:false}],method:'炒',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',updateTime:'2026-08-09',
     pricing:{basePrice:'3.00',ingredientCost:1.80,per100gCost:1.20,profitRate:150,suggestedPrice:'3.00'},
     promoVideos:[{title:'清炒时蔬宣传片',duration:'45秒',size:'18MB',enabled:true}],
     crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'推荐'},{name:'肾结石人群',level:'慎食'}],crowdNote:'肾结石人群慎食（草酸含量高）',cookedWeight:140,
-    composition:[{name:'时令青菜',netType:'青菜段',amount:120,pct:'80%',state:'净菜',type:'主材',allergen:'无',note:'—'},{name:'蒜末',netType:'蒜末',amount:5,pct:'3.3%',state:'净菜',type:'调料',allergen:'无',note:'—'},{name:'食用油',netType:'净油',amount:8,pct:'5.3%',state:'原料',type:'调料',allergen:'无',note:'—'},{name:'食盐',netType:'盐粒',amount:2,pct:'1.3%',state:'原料',type:'调料',allergen:'无',note:'—'}],
+    composition:[{code:'YQ-024',name:'时令青菜',netName:'青菜段',netSpecAlias:'长段',amount:120,type:'主材'},{code:'YQ-016',name:'大蒜',netName:'蒜末',netSpecAlias:'细末',amount:5,type:'调料'},{code:'YQ-014',name:'食用油',netName:'净油',amount:8,type:'调料'},{code:'YQ-018',name:'食盐',netName:'盐粒',amount:2,type:'调料'}],
     nutri:{calorie:68,protein:2.1,carb:8.6,fat:3.2,vitC:28.5,mineral:86,fiber:2.4,sodium:186,calcium:45,iron:1.2,zinc:0.4,potassium:280,cholesterol:0,vitA:268,vitE:0.9,vitB1:0.04,vitB2:0.06,magnesium:24,phosphorus:42,selenium:1.2,copper:0.05,manganese:0.18,nutriGrade:'达标',note:'铁1.2mg、钙45mg'},
     cook:{mainMethod:'炒',subMethod:'—',heat:'大火',duration:5,temp:'200',steps:4},
     taste:{sour:1,sweet:2,bitter:1,spicy:1,salty:2,smell:3.5,flavorScore:3.2,flavorGrade:'一般'},
     color:{mainColor:'翠绿色',uniformity:5,gloss:4,freshness:5,appearance:4,colorScore:4.5,colorGrade:'优秀'},
     texture:{hardness:3,sticky:1,crispy:4,smooth:3,elastic:2,textureScore:3.4,textureGrade:'良好'}
   },
-  {id:'DISH003',name:'番茄鸡蛋汤',icon:'🍅',category:'汤品',tags:['低卡'],specs:[{portion:'标准份',baseGram:300,unit:'份',price:5,cleanPrice:3.5,cleanSale:false,isDefault:true}],method:'煮',meal:'午/晚',allergen:'含蛋类',status:'启用',source:'系统内置',
+  {id:'DISH003',name:'番茄鸡蛋汤',icon:'🍅',category:'汤品',tags:['低卡'],specs:[{portion:'标准份',baseGram:300,unit:'份',price:5,cleanMargin:42.0,cleanPrice:3.5,cleanSale:false,isDefault:true}],method:'煮',meal:'午/晚',allergen:'含蛋类',status:'启用',source:'系统内置',updateTime:'2026-08-08',
     pricing:{basePrice:'1.67',ingredientCost:1.20,per100gCost:0.40,profitRate:150,suggestedPrice:'1.00'},
     promoVideos:[{title:'番茄鸡蛋汤宣传片',duration:'1分钟',size:'24MB',enabled:true},{title:'家常做法教程',duration:'3分钟',size:'80MB',enabled:true}],
     crowd:[{name:'全人群',level:'推荐'},{name:'儿童',level:'推荐'},{name:'老年人',level:'推荐'}],crowdNote:'',cookedWeight:300,
-    composition:[{name:'番茄',netType:'番茄块',amount:150,pct:'50%',state:'净菜',type:'主材',allergen:'无',note:'—'},{name:'鸡蛋',netType:'鸡蛋液',amount:60,pct:'20%',state:'原料',type:'主材',allergen:'含蛋类',note:'—'},{name:'食用油',netType:'净油',amount:5,pct:'1.7%',state:'原料',type:'调料',allergen:'无',note:'—'},{name:'食盐',netType:'盐粒',amount:2,pct:'0.7%',state:'原料',type:'调料',allergen:'无',note:'—'}],
+    composition:[{code:'YQ-006',name:'番茄',netName:'番茄块',amount:150,type:'主材'},{code:'YQ-005',name:'鸡蛋',netName:'鸡蛋液',amount:60,type:'主材'},{code:'YQ-014',name:'食用油',netName:'净油',amount:5,type:'调料'},{code:'YQ-018',name:'食盐',netName:'盐粒',amount:2,type:'调料'}],
     nutri:{calorie:45,protein:3.8,carb:4.2,fat:2.1,vitC:18.2,mineral:32,fiber:1.1,sodium:280,calcium:18,iron:0.8,zinc:0.4,potassium:210,cholesterol:110,vitA:62,vitE:0.5,vitB1:0.04,vitB2:0.12,magnesium:12,phosphorus:80,selenium:8,copper:0.05,manganese:0.06,nutriGrade:'达标',note:'铁0.8mg、钾210mg'},
     cook:{mainMethod:'煮',subMethod:'炒',heat:'中火',duration:12,temp:'100',steps:5},
     taste:{sour:3,sweet:2,bitter:1,spicy:1,salty:2,smell:3.8,flavorScore:3.5,flavorGrade:'良好'},
     color:{mainColor:'橙红色',uniformity:4,gloss:3,freshness:5,appearance:4,colorScore:4.0,colorGrade:'良好'},
     texture:{hardness:1,sticky:2,crispy:1,smooth:5,elastic:2,textureScore:3.8,textureGrade:'良好'}
   },
-  {id:'DISH004',name:'米饭',icon:'🍚',category:'主食',tags:['主食'],specs:[{portion:'标准份',baseGram:200,unit:'份',price:3,cleanPrice:2,cleanSale:false,isDefault:true},{portion:'小份',baseGram:100,unit:'份',price:2,cleanPrice:1.5,cleanSale:false},{portion:'大份',baseGram:300,unit:'份',price:4,cleanPrice:3,cleanSale:false}],method:'蒸',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',
+  {id:'DISH004',name:'米饭',icon:'🍚',category:'主食',tags:['主食'],specs:[{portion:'标准份',baseGram:200,unit:'份',price:3,cleanMargin:38.0,cleanPrice:2,cleanSale:false,isDefault:true},{portion:'小份',baseGram:100,unit:'份',price:2,cleanMargin:35.0,cleanPrice:1.5,cleanSale:false},{portion:'大份',baseGram:300,unit:'份',price:4,cleanMargin:40.0,cleanPrice:3,cleanSale:false}],method:'蒸',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',updateTime:'2026-07-22',
     pricing:{basePrice:'1.50',ingredientCost:1.00,per100gCost:0.50,profitRate:150,suggestedPrice:'1.25'},
     promoVideos:[],
     crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'适量'}],crowdNote:'糖尿病人群注意控制量',cookedWeight:200,
-    composition:[{name:'大米',netType:'熟米饭',amount:100,pct:'100%',state:'原料',type:'主材',allergen:'无',note:'—'}],
+    composition:[{code:'YQ-011',name:'大米',netName:'熟米饭',amount:100,type:'主材'}],
     nutri:{calorie:232,protein:4.8,carb:51.2,fat:0.6,vitC:0,mineral:12,fiber:0.4,sodium:3,calcium:10,iron:0.5,zinc:0.8,potassium:43,cholesterol:0,vitA:0,vitE:0.1,vitB1:0.02,vitB2:0.02,magnesium:12,phosphorus:43,selenium:1.5,copper:0.05,manganese:0.18,nutriGrade:'达标',note:'—'},
     cook:{mainMethod:'蒸',subMethod:'—',heat:'大火→中火',duration:30,temp:'100',steps:2},
     taste:{sour:1,sweet:2,bitter:1,spicy:1,salty:1,smell:3.0,flavorScore:2.8,flavorGrade:'一般'},
     color:{mainColor:'乳白色',uniformity:5,gloss:4,freshness:4,appearance:4,colorScore:4.2,colorGrade:'良好'},
     texture:{hardness:2,sticky:3,crispy:1,smooth:3,elastic:2,textureScore:3.2,textureGrade:'一般'}
   },
-  {id:'DISH005',name:'糖醋里脊',icon:'🍖',category:'荤菜',tags:['高糖'],specs:[{portion:'标准份',baseGram:180,unit:'份',price:14,cleanPrice:10,cleanSale:false,isDefault:true},{portion:'大份',baseGram:280,unit:'份',price:20,cleanPrice:14,cleanSale:false}],method:'炸',meal:'午',allergen:'无',status:'停用',source:'味养创新',
+  {id:'DISH005',name:'糖醋里脊',icon:'🍖',category:'荤菜',tags:['高糖'],specs:[{portion:'标准份',baseGram:180,unit:'份',price:14,cleanMargin:62.0,cleanPrice:10,cleanSale:false,isDefault:true},{portion:'大份',baseGram:280,unit:'份',price:20,cleanMargin:65.0,cleanPrice:14,cleanSale:false}],method:'炸',meal:'午',allergen:'无',status:'停用',source:'味养创新',updateTime:'2026-08-05',
     pricing:{basePrice:'7.78',ingredientCost:5.20,per100gCost:2.89,profitRate:170,suggestedPrice:'7.80'},
     promoVideos:[{title:'糖醋里脊宣传片',duration:'2分钟',size:'58MB',enabled:true},{title:'正宗做法揭秘',duration:'5分钟',size:'150MB',enabled:true},{title:'出品摆盘展示',duration:'30秒',size:'12MB',enabled:false}],
     crowd:[{name:'成人',level:'推荐'},{name:'糖尿病人群',level:'慎食'},{name:'高血脂人群',level:'适量'}],crowdNote:'糖尿病人群慎食，含糖量高',cookedWeight:180,
-    composition:[{name:'猪里脊肉',netType:'里脊丝',amount:120,pct:'66.7%',state:'净菜',type:'主材',allergen:'无',note:'—'},{name:'淀粉',netType:'淀粉糊',amount:20,pct:'11.1%',state:'原料',type:'辅材',allergen:'无',note:'挂糊'},{name:'白糖',netType:'糖浆',amount:25,pct:'13.9%',state:'原料',type:'调料',allergen:'无',note:'糖醋汁'},{name:'食醋',netType:'调味汁',amount:15,pct:'8.3%',state:'原料',type:'调料',allergen:'无',note:'糖醋汁'}],
+    composition:[{code:'YQ-002',name:'猪里脊肉',netName:'里脊丝',netSpecAlias:'细丝',amount:120,type:'主材'},{code:'YQ-022',name:'淀粉',netName:'淀粉糊',amount:20,type:'辅材'},{code:'YQ-019',name:'白糖',netName:'糖浆',amount:25,type:'调料'},{code:'YQ-021',name:'食醋',netName:'调味汁',amount:15,type:'调料'}],
     nutri:{calorie:420,protein:22.4,carb:38.2,fat:18.6,vitC:1.2,mineral:28,fiber:0.6,sodium:620,calcium:22,iron:1.8,zinc:1.6,potassium:340,cholesterol:75,vitA:8,vitE:0.4,vitB1:0.45,vitB2:0.18,magnesium:24,phosphorus:200,selenium:14,copper:0.1,manganese:0.08,nutriGrade:'未达标',note:'铁1.8mg'},
     cook:{mainMethod:'炸',subMethod:'炒',heat:'大火',duration:15,temp:'180',steps:7},
     taste:{sour:4,sweet:4,bitter:1,spicy:1,salty:3,smell:4.0,flavorScore:4.2,flavorGrade:'良好'},
@@ -429,16 +503,20 @@ const DISHES = [
 
 let currentDish = 0;
 let currentTab = 0;
+/* 列表渲染基于 filteredDishes(由快速搜索 / 高级搜索筛选产生),默认全量 */
+let filteredDishes = [];
+/* 高级搜索已应用条件(用于汇总条显示) */
+let appliedAdvSearch = null;
 
 function renderDishList(){
-  document.getElementById('dishList').innerHTML = DISHES.map((d,i)=>`
+  document.getElementById('dishList').innerHTML = filteredDishes.map((entry)=>{const d=entry.dish;const i=entry.idx;return `
     <div class="food-item${i===currentDish?' active':''}" onclick="selectDish(${i})">
       <div class="food-item__icon">${d.icon}</div>
       <div class="food-item__info">
         <div class="food-item__name">${d.name}</div>
-        <div class="food-item__meta"><span>${d.id}</span><span>${d.category}</span><span class="tag tag-${d.status==='启用'?'green':'gray'}" style="margin:0;padding:1px 6px;">${d.status}</span></div>
+        <div class="food-item__meta"><span>${d.updateTime||'—'}</span><span>${d.category}</span><span class="tag tag-${d.status==='启用'?'green':'gray'}" style="margin:0;padding:1px 6px;">${d.status}</span></div>
       </div>
-    </div>`).join('');
+    </div>`;}).join('');
 }
 
 function selectDish(idx){ currentDish=idx; renderDishList(); renderDetail(); }
@@ -507,16 +585,17 @@ function renderBasic(d){
 function renderPricing(d){
   var specRows = (d.specs||[]).map(function(s){
     var statusHtml = s.isDefault ? '<span class="tag tag-blue" style="font-size:11px;">默认</span>' : '';
+    var cleanMargin = (s.cleanMargin!==undefined && s.cleanMargin!==null) ? parseFloat(s.cleanMargin).toFixed(1)+'%' : '—';
     var cleanPrice = (s.cleanPrice!==undefined && s.cleanPrice!==null) ? parseFloat(s.cleanPrice).toFixed(2) : '—';
     var cleanSaleActive = s.cleanSale === true;
     var cleanSaleHtml = '<div class="sale-toggle'+(cleanSaleActive?' active':'')+'" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">'+(cleanSaleActive?'上架':'下架')+'</span></div>';
     var gramText=s.baseGram?(parseFloat(s.baseGram)+'g'):'';
     var specViewHtml='<div class="spec-cell-view"><span class="spec-cell-view__gram">'+gramText+'</span><span class="spec-cell-view__sep">/</span><span class="spec-cell-view__name">'+(s.portion||'—')+'</span></div>';
-    return '<tr><td>'+specViewHtml+'</td><td>'+s.price.toFixed(2)+'</td><td>'+cleanPrice+'</td><td>'+cleanSaleHtml+'</td><td>'+statusHtml+'</td></tr>';
+    return '<tr><td>'+specViewHtml+'</td><td>'+s.price.toFixed(2)+'</td><td>'+cleanMargin+'</td><td>'+cleanPrice+'</td><td>'+cleanSaleHtml+'</td><td>'+statusHtml+'</td></tr>';
   }).join('');
   return renderPricingSection(d)
     + '<div class="info-section"><div class="info-section__title">📐 餐品规格（共 '+(d.specs||[]).length+' 项）</div>'
-    + '<table class="info-table spec-detail-table"><thead><tr><th>规格</th><th>餐品售价(元/份)</th><th>净菜包售价(元/份)</th><th>外售净菜包</th><th>状态</th></tr></thead><tbody>'+specRows+'</tbody></table></div>';
+    + '<table class="info-table spec-detail-table"><thead><tr><th>规格</th><th>餐品售价(元/份)</th><th>净菜包毛利率</th><th>净菜包售价(元/份)</th><th>外售净菜包</th><th>状态</th></tr></thead><tbody>'+specRows+'</tbody></table></div>';
 }
 
 /* 餐品定价分区（普通 info-section 样式，详情页只展示字段，成本核算仅在编辑/新增页） */
@@ -557,7 +636,15 @@ function renderPromoVideosSection(d){
 }
 
 function renderComposition(d){
-  const rows = (d.composition||[]).map(c=>`<tr><td>${c.name}</td><td>${c.netType}</td><td>${c.amount}</td><td>${c.pct}</td><td><span class="tag tag-${c.type==='主材'?'blue':c.type==='调料'?'orange':'gray'}">${c.type||'辅材'}</span></td><td>${c.allergen}</td><td>${c.note}</td></tr>`).join('');
+  const rows = (d.composition||[]).map(c=>{
+    /* 净菜类型:主名称(已含-分隔符) + 净菜规格别名(弱化样式) */
+    var netName = c.netName || c.netType || '—';
+    var netTypeHtml = c.netSpecAlias
+      ? '<span class="net-type">'+netName+'</span><span class="net-type-alias">'+c.netSpecAlias+'</span>'
+      : '<span class="net-type">'+netName+'</span>';
+    var typeTag = c.type==='主材'?'blue':c.type==='调料'?'orange':'gray';
+    return '<tr><td>'+(c.code||'—')+'</td><td>'+(c.name||'—')+'</td><td><span class="tag tag-'+typeTag+'">'+(c.type||'辅材')+'</span></td><td>'+netTypeHtml+'</td><td>'+(c.amount||0)+'g</td></tr>';
+  }).join('');
   return `<div class="composition-head">
     <div class="composition-head__title">🧩 餐品构成</div>
     <a class="link" href="din-dish-add.html?mode=edit&tab=1">编辑</a>
@@ -567,7 +654,7 @@ function renderComposition(d){
       <div class="info-cell"><div class="info-cell__label">熟重</div><div class="info-cell__value">${(d.cookedWeight!==undefined&&d.cookedWeight!==null)?(d.cookedWeight+'g'):'—'}</div></div>
     </div></div>
   <div class="info-section"><div class="info-section__title">食材构成（共 ${(d.composition||[]).length} 项）</div>
-    <table class="info-table"><thead><tr><th>食材名称</th><th>净菜类型</th><th>用量(g/份)</th><th>占比(%)</th><th>食材类型</th><th>过敏原</th><th>备注</th></tr></thead><tbody>${rows}</tbody></table></div>
+    <table class="info-table"><thead><tr><th>食材编码</th><th>食材名称</th><th>食材类型</th><th>净菜类型</th><th>用量(g/份)</th></tr></thead><tbody>${rows}</tbody></table></div>
   ${renderNutriSection(d)}`;
 }
 
@@ -717,9 +804,172 @@ function togglePromoVideo(el, dishIdx, videoIdx){
 
 (function(){var a=document.querySelector('.sidebar-item.active');if(!a)return;var s=a.closest('.sidebar-subgroup');if(s)s.classList.add('open');})();
 
-// 初始化
-renderDishList();
-renderDetail();
+// 初始化（先建立 filteredDishes 再渲染列表/详情）
+applyFilters();
+
+/* ============ 搜索与筛选 ============ */
+/* 收集快速搜索 + 高级搜索条件,刷新 filteredDishes 与汇总条 */
+function applyFilters(){
+  var kw = (document.getElementById('dishQuickSearchInput')||{}).value || '';
+  kw = kw.trim().toLowerCase();
+  var cat = (document.getElementById('dishCategoryFilter')||{}).value || '';
+  var stat = (document.getElementById('dishStatusFilter')||{}).value || '';
+  /* 应用快速搜索条件 */
+  var quickFiltered = DISHES.filter(function(d,i){
+    var matchKw = !kw || (d.name||'').toLowerCase().indexOf(kw)>=0 || (d.id||'').toLowerCase().indexOf(kw)>=0;
+    var matchCat = !cat || cat==='全部分类' || d.category===cat;
+    var matchStat = !stat || stat==='全部状态' || d.status===stat;
+    return matchKw && matchCat && matchStat;
+  });
+  /* 再叠加高级搜索条件 */
+  var list = quickFiltered;
+  if(appliedAdvSearch){
+    list = quickFiltered.filter(function(d){
+      return matchAdvanced(d, appliedAdvSearch);
+    });
+  }
+  filteredDishes = list.map(function(d){
+    var idx = DISHES.indexOf(d);
+    return {dish:d, idx:idx};
+  });
+  /* 若当前选中项被筛掉,则自动选第一条 */
+  var stillIn = filteredDishes.some(function(e){return e.idx===currentDish;});
+  if(!stillIn && filteredDishes.length>0){
+    currentDish = filteredDishes[0].idx;
+    currentTab = 0;
+  }
+  /* 更新汇总条 */
+  updateFilterSummary();
+  /* 重新渲染 */
+  renderDishList();
+  renderDetail();
+  /* 更新底部计数 */
+  var counter = document.getElementById('dishListCount');
+  if(counter) counter.textContent = '共 '+filteredDishes.length+' 条';
+  /* 空态提示 */
+  var emptyHint = document.getElementById('dishListEmpty');
+  if(emptyHint){
+    emptyHint.style.display = filteredDishes.length===0 ? 'block' : 'none';
+  }
+}
+
+/* 单条餐品是否匹配高级搜索条件 */
+function matchAdvanced(d, q){
+  if(q.name && (d.name||'').toLowerCase().indexOf(q.name.toLowerCase())<0) return false;
+  if(q.code && (d.id||'').toLowerCase().indexOf(q.code.toLowerCase())<0) return false;
+  if(q.category && d.category!==q.category) return false;
+  if(q.meal && (d.meal||'')!==q.meal) return false;
+  if(q.tag && !(d.tags||[]).some(function(t){return t===q.tag;})) return false;
+  if(q.status && d.status!==q.status) return false;
+  /* 食材成本区间 */
+  var cost = (d.pricing && d.pricing.ingredientCost!==undefined) ? d.pricing.ingredientCost : null;
+  if(cost===null) cost = 0;
+  if(q.costMin!==null && cost < q.costMin) return false;
+  if(q.costMax!==null && cost > q.costMax) return false;
+  /* 餐品售价区间:取规格中最低价/最高价 */
+  var prices = (d.specs||[]).map(function(s){return s.price;});
+  var minPrice = prices.length ? Math.min.apply(null, prices) : 0;
+  var maxPrice = prices.length ? Math.max.apply(null, prices) : 0;
+  if(q.priceMin!==null && maxPrice < q.priceMin) return false;
+  if(q.priceMax!==null && minPrice > q.priceMax) return false;
+  /* 时间区间(字符串比较即可,演示数据格式 YYYY-MM-DD) */
+  if(q.updatedStart && (d.updateTime||'') < q.updatedStart) return false;
+  if(q.updatedEnd && (d.updateTime||'') > q.updatedEnd) return false;
+  /* 创建时间演示数据缺失,留作扩展(命中即跳过比较) */
+  return true;
+}
+
+/* 更新筛选汇总条 */
+function updateFilterSummary(){
+  var sumEl = document.getElementById('filterSummary');
+  if(!sumEl) return;
+  var bits = [];
+  if(appliedAdvSearch){
+    Object.keys(appliedAdvSearch).forEach(function(k){
+      var v = appliedAdvSearch[k];
+      if(v===null || v===undefined || v==='') return;
+      var labelMap = {name:'名称',code:'编号',category:'分类',meal:'餐次',tag:'标签',status:'状态',
+        costMin:'成本≥',costMax:'成本≤',priceMin:'售价≥',priceMax:'售价≤',
+        updatedStart:'更新≥',updatedEnd:'更新≤',createdStart:'创建≥',createdEnd:'创建≤'};
+      var label = labelMap[k] || k;
+      var suffix = (k.indexOf('Min')>=0 || k.indexOf('Max')>=0) ? (k.indexOf('cost')>=0?'元':(k.indexOf('price')>=0?'元':'')) : '';
+      bits.push(label + v + suffix);
+    });
+  }
+  if(bits.length===0){
+    sumEl.style.display = 'none';
+    sumEl.innerHTML = '';
+  } else {
+    sumEl.style.display = 'flex';
+    sumEl.innerHTML = '<span class="panel-left__filter-summary__text">已应用筛选：' + bits.join(' · ') + '</span>'
+      + '<button class="panel-left__filter-summary__clear" onclick="clearAdvancedSearch()">✕ 清空</button>';
+  }
+}
+
+/* 快速搜索(输入框 + 分类/状态下拉触发) */
+function onQuickSearchInput(){ applyFilters(); }
+function onQuickSearch(){ applyFilters(); }
+
+/* 高级搜索弹窗 */
+function openAdvancedSearchDialog(){
+  /* 把已应用条件回填到表单 */
+  var q = appliedAdvSearch || {};
+  setVal('advName', q.name||'');
+  setVal('advCode', q.code||'');
+  setVal('advCategory', q.category||'');
+  setVal('advMeal', q.meal||'');
+  setVal('advTag', q.tag||'');
+  setVal('advStatus', q.status||'');
+  setVal('advCostMin', q.costMin!==null && q.costMin!==undefined ? q.costMin : '');
+  setVal('advCostMax', q.costMax!==null && q.costMax!==undefined ? q.costMax : '');
+  setVal('advPriceMin', q.priceMin!==null && q.priceMin!==undefined ? q.priceMin : '');
+  setVal('advPriceMax', q.priceMax!==null && q.priceMax!==undefined ? q.priceMax : '');
+  setVal('advUpdatedStart', q.updatedStart||'');
+  setVal('advUpdatedEnd', q.updatedEnd||'');
+  setVal('advCreatedStart', q.createdStart||'');
+  setVal('advCreatedEnd', q.createdEnd||'');
+  document.getElementById('advancedSearchDialog').classList.add('open');
+}
+function closeAdvancedSearchDialog(){
+  document.getElementById('advancedSearchDialog').classList.remove('open');
+}
+function resetAdvancedSearch(){
+  ['advName','advCode','advCategory','advMeal','advTag','advStatus','advCostMin','advCostMax','advPriceMin','advPriceMax','advUpdatedStart','advUpdatedEnd','advCreatedStart','advCreatedEnd'].forEach(function(id){ setVal(id,''); });
+}
+function applyAdvancedSearch(){
+  appliedAdvSearch = {
+    name: getVal('advName'),
+    code: getVal('advCode'),
+    category: getVal('advCategory'),
+    meal: getVal('advMeal'),
+    tag: getVal('advTag'),
+    status: getVal('advStatus'),
+    costMin: getNum('advCostMin'),
+    costMax: getNum('advCostMax'),
+    priceMin: getNum('advPriceMin'),
+    priceMax: getNum('advPriceMax'),
+    updatedStart: getVal('advUpdatedStart'),
+    updatedEnd: getVal('advUpdatedEnd'),
+    createdStart: getVal('advCreatedStart'),
+    createdEnd: getVal('advCreatedEnd')
+  };
+  /* 全部空字段视为未设置 */
+  var hasAny = Object.keys(appliedAdvSearch).some(function(k){
+    var v = appliedAdvSearch[k];
+    return v!==null && v!==undefined && v!=='';
+  });
+  if(!hasAny) appliedAdvSearch = null;
+  closeAdvancedSearchDialog();
+  applyFilters();
+}
+function clearAdvancedSearch(){
+  appliedAdvSearch = null;
+  applyFilters();
+}
+
+function setVal(id, v){ var el = document.getElementById(id); if(el) el.value = v; }
+function getVal(id){ var el = document.getElementById(id); return el ? el.value.trim() : ''; }
+function getNum(id){ var v = getVal(id); if(v==='') return null; var n = parseFloat(v); return isNaN(n) ? null : n; }
 
 /* ========== 跨页 specs 共享(阶段三任务 3.0) ========== */
 /* 把 DISHES 数组序列化到 localStorage,供下游订单/组配/包装等页面读取 */
@@ -862,41 +1112,6 @@ function deleteDishCat(id){
 }
 </script>
 
-<!-- 新增食材弹窗 -->
-<div class="dialog-mask" id="ingredientDialog">
-  <div class="dialog">
-    <div class="dialog__header">
-      <div class="dialog__title">新增食材</div>
-      <button class="dialog__close" onclick="closeIngredientDialog()">
-        <svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M1 1l12 12M13 1L1 13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg>
-      </button>
-    </div>
-    <div class="dialog__body">
-      <div class="form-row">
-        <div class="form-group"><label>食材名称<span class="required">*</span></label><input class="form-input" type="text" placeholder="请输入食材名称"></div>
-        <div class="form-group"><label>净菜类型<span class="required">*</span></label><select class="form-select"><option>请选择</option><option>土豆丝</option><option>土豆块</option><option>土豆泥</option><option>番茄块</option><option>蒜末</option></select></div>
-      </div>
-      <div class="form-row">
-        <div class="form-group"><label>用量(g/份)<span class="required">*</span></label><input class="form-input" type="number" placeholder="请输入用量"></div>
-        <div class="form-group"><label>加工状态</label><select class="form-select"><option>请选择</option><option>原料</option><option>净菜</option><option>半成品</option></select></div>
-      </div>
-      <div class="form-row">
-        <div class="form-group"><label>食材类型</label><select class="form-select"><option>辅材</option><option>主材</option><option>调料</option></select></div>
-        <div class="form-group"><label>过敏原</label><input class="form-input" type="text" placeholder="无则填无"></div>
-      </div>
-      <div class="form-group"><label>备注</label><input class="form-input" type="text" placeholder="请输入备注信息"></div>
-    </div>
-    <div class="dialog__footer">
-      <button class="btn btn-default" onclick="closeIngredientDialog()">取消</button>
-      <button class="btn btn-primary">确定</button>
-    </div>
-  </div>
-</div>
-
-<script>
-function openIngredientDialog(){document.getElementById('ingredientDialog').classList.add('open');}
-function closeIngredientDialog(){document.getElementById('ingredientDialog').classList.remove('open');}
-</script>
 <!-- 餐品分类管理弹窗 -->
 <div class="dialog-mask" id="dishCategoryDialog">
   <div class="dialog" style="width:820px;">
diff --git a/web-admin/nutrition/din-dish-own.html b/web-admin/nutrition/din-dish-own.html
index 0213aa1..ec727a9 100644
--- a/web-admin/nutrition/din-dish-own.html
+++ b/web-admin/nutrition/din-dish-own.html
@@ -73,6 +73,11 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .panel-left__search input:focus{border-color:var(--primary);}
 .panel-left__filter{display:flex;gap:8px;}
 .panel-left__filter select{height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 24px 0 10px;font-size:var(--font-xs);outline: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 8px center;appearance:none;cursor:pointer;flex:1;}
+/* 高级搜索筛选条件汇总条(显示已应用的筛选条件,可一键清空) */
+.panel-left__filter-summary{margin-top:8px;padding:6px 10px;background:var(--primary-light);border:1px solid #BAE7FF;border-radius:var(--radius-sm);font-size:var(--font-xs);color:var(--primary);display:flex;align-items:center;justify-content:space-between;gap:8px;}
+.panel-left__filter-summary__text{flex:1;line-height:1.4;}
+.panel-left__filter-summary__clear{flex-shrink:0;cursor:pointer;color:var(--danger);font-size:var(--font-xs);background:none;border:none;padding:0 4px;}
+.panel-left__filter-summary__clear:hover{text-decoration:underline;}
 .panel-left__actions{display:flex;gap:8px;padding:10px 20px;border-bottom:1px solid var(--border);flex-wrap:wrap;}
 .panel-left__actions .btn{height:30px;font-size:var(--font-xs);padding:0 10px;}
 .food-list{flex:1;overflow-y:auto;padding:4px 0;}
@@ -111,6 +116,9 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 /* 餐品构成 Tab 顶部标题栏（含编辑按钮，控制整个 Tab 区域） */
 .composition-head{display:flex;align-items:center;justify-content:space-between;margin-bottom:12px;}
 .composition-head__title{font-size:var(--font-base);font-weight:600;color:var(--text-primary);}
+/* 净菜类型:主名称 + 规格别名（弱化） */
+.net-type{font-size:var(--font-sm);color:var(--text-primary);}
+.net-type-alias{margin-left:6px;font-size:var(--font-xs);color:var(--text-placeholder);font-weight:normal;}
 .info-table{width:100%;border-collapse:collapse;font-size:var(--font-sm);}
 .info-table th{background:#FAFAFA;padding:10px 12px;text-align:left;color:var(--text-secondary);font-weight:500;border-bottom:1px solid var(--border);}
 .info-table td{padding:10px 12px;border-bottom:1px solid var(--border);color:var(--text-primary);}
@@ -157,6 +165,12 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .form-input:focus,.form-select:focus{border-color:var(--primary);}
 .form-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-row{display:grid;grid-template-columns:1fr 1fr;gap:16px;}
+/* 高级搜索表单网格(2 列) + 区间输入(双 input 用 ~ 分隔) */
+.adv-search-grid{display:grid;grid-template-columns:1fr 1fr;gap:14px 18px;}
+.adv-search-grid .form-group{margin-bottom:0;}
+.adv-range{display:flex;align-items:center;gap:8px;}
+.adv-range .form-input{flex:1;min-width:0;}
+.adv-range__sep{color:var(--text-placeholder);font-size:var(--font-sm);flex-shrink:0;}
 /* 操作列固定右侧 */
 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;}
@@ -228,6 +242,38 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .page-header-bar__right{display:flex;align-items:center;gap:12px;}
 .page-header-bar__right label{font-size:var(--font-sm);color:var(--text-secondary);white-space:nowrap;}
 .page-header-bar__right .canteen-select{height:36px;border:2px solid var(--primary);border-radius:var(--radius-sm);padding:0 32px 0 14px;font-size:var(--font-sm);color:var(--primary);font-weight:500;outline: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='%231890FF'/%3E%3C/svg%3E") no-repeat right 12px center;appearance:none;cursor:pointer;min-width:140px;}
+
+/* 操作历史 */
+.history-filter{display:flex;gap:8px;margin-bottom:16px;flex-wrap:wrap;}
+.history-filter select,.history-filter input[type="text"]{height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 28px 0 10px;font-size:var(--font-xs);outline: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 8px center;appearance:none;cursor:pointer;}
+.history-filter select:focus,.history-filter input[type="text"]:focus{border-color:var(--primary);}
+.history-filter input[type="text"]{padding-right:10px;background:#fff;appearance:auto;cursor:text;}
+.history-filter .btn{height:32px;font-size:var(--font-xs);padding:0 12px;}
+/* 时间轴 */
+.history-timeline{position:relative;padding-left:20px;}
+.history-timeline::before{content:'';position:absolute;left:5px;top:6px;bottom:6px;width:2px;background:#E8E8E8;}
+.history-item{position:relative;padding:0 0 18px 24px;}
+.history-item:last-child{padding-bottom:0;}
+.history-item::before{content:'';position:absolute;left:-19px;top:4px;width:12px;height:12px;border-radius:50%;background:#fff;border:2px solid var(--primary);box-shadow:0 0 0 3px #E6F7FF;}
+.history-item--create::before{border-color:var(--success);box-shadow:0 0 0 3px #F6FFED;}
+.history-item--edit::before{border-color:var(--primary);box-shadow:0 0 0 3px #E6F7FF;}
+.history-item--disable::before{border-color:var(--text-placeholder);box-shadow:0 0 0 3px #F5F5F5;}
+.history-item--price::before{border-color:var(--warning);box-shadow:0 0 0 3px #FFF7E6;}
+.history-item--delete::before{border-color:var(--danger);box-shadow:0 0 0 3px #FFF1F0;}
+.history-item--restore::before{border-color:#722ED1;box-shadow:0 0 0 3px #F9F0FF;}
+.history-card{background:#FAFBFC;border:1px solid #F0F0F0;border-radius:var(--radius-sm);padding:12px 16px;}
+.history-card__head{display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin-bottom:6px;}
+.history-card__time{font-size:var(--font-xs);color:var(--text-placeholder);margin-left:auto;}
+.history-card__op{font-size:var(--font-sm);font-weight:500;color:var(--text-primary);}
+.history-card__user{font-size:var(--font-xs);color:var(--text-secondary);display:flex;align-items:center;gap:4px;}
+.history-card__summary{font-size:var(--font-sm);color:var(--text-secondary);line-height:1.6;margin-top:4px;}
+.history-card__changes{margin-top:8px;background:#fff;border:1px solid #F0F0F0;border-radius:var(--radius-sm);overflow:hidden;}
+.history-change{display:grid;grid-template-columns:120px 1fr 1fr;align-items:center;font-size:var(--font-xs);border-bottom:1px solid #F5F5F5;}
+.history-change:last-child{border-bottom:none;}
+.history-change__field{padding:6px 12px;color:var(--text-secondary);background:#FAFAFA;border-right:1px solid #F0F0F0;}
+.history-change__old{padding:6px 12px;color:var(--text-placeholder);text-decoration:line-through;border-right:1px dashed #E8E8E8;}
+.history-change__new{padding:6px 12px;color:var(--text-primary);font-weight:500;}
+.history-empty{text-align:center;padding:40px 0;color:var(--text-placeholder);font-size:var(--font-sm);}
 </style>
 </head>
 <body>
@@ -346,13 +392,15 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
       <div class="panel-left__header">
         <div class="panel-left__title">餐品列表</div>
         <div class="panel-left__search">
-          <input type="text" placeholder="搜索餐品名称/编号...">
-          <button class="btn btn-primary" style="height:32px;padding:0 12px;font-size:var(--font-xs);">搜索</button>
+          <input type="text" id="dishQuickSearchInput" placeholder="搜索餐品名称/编号..." oninput="onQuickSearchInput(this.value)">
+          <button class="btn btn-primary" style="height:32px;padding:0 12px;font-size:var(--font-xs);" onclick="onQuickSearch()">搜索</button>
+          <button class="btn btn-default" style="height:32px;padding:0 10px;font-size:var(--font-xs);" onclick="openAdvancedSearchDialog()">⚙ 高级搜索</button>
         </div>
         <div class="panel-left__filter">
-          <select><option>全部分类</option><option>主食</option><option>荤菜</option><option>素菜</option><option>汤品</option><option>小吃</option></select>
-          <select><option>全部状态</option><option>启用</option><option>停用</option></select>
+          <select id="dishCategoryFilter" onchange="onQuickSearch()"><option>全部分类</option><option>主食</option><option>荤菜</option><option>素菜</option><option>汤品</option><option>小吃</option></select>
+          <select id="dishStatusFilter" onchange="onQuickSearch()"><option>全部状态</option><option>启用</option><option>停用</option></select>
         </div>
+        <div class="panel-left__filter-summary" id="filterSummary" style="display:none;"></div>
       </div>
       <div class="panel-left__actions">
         <a href="din-dish-add.html" class="btn btn-primary">➕ 新增餐品</a>
@@ -360,8 +408,9 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 	        <button class="btn btn-default" onclick="openDishCategoryDialog()">📂 餐品分类管理</button>
       </div>
       <div class="food-list" id="dishList"></div>
+      <div id="dishListEmpty" style="display:none;text-align:center;padding:40px 20px;color:var(--text-placeholder);font-size:var(--font-sm);">未找到匹配的餐品<br><span style="font-size:var(--font-xs);">请调整搜索条件或 <span class="link" onclick="clearAdvancedSearch()">清空筛选</span></span></div>
       <div class="panel-left__footer">
-        <span>共 486 条</span>
+        <span id="dishListCount">共 0 条</span>
         <div style="display:flex;gap:4px;">
           <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>
         </div>
@@ -384,6 +433,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           <div class="detail-tab" onclick="switchDetailTab(4)">👅 味道档案</div>
           <div class="detail-tab" onclick="switchDetailTab(5)">🫦 口感档案</div>
           <div class="detail-tab" onclick="switchDetailTab(6)">🎨 色泽档案</div>
+          <div class="detail-tab" onclick="switchDetailTab(7)">🕘 操作历史</div>
         </div>
       </div>
       <div class="panel-right__body" id="detailBody"></div>
@@ -391,78 +441,168 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
   </div>
 </main>
 
+<!-- 高级搜索弹窗 -->
+<div class="dialog-mask" id="advancedSearchDialog">
+  <div class="dialog" style="width:720px;">
+    <div class="dialog__header">
+      <div class="dialog__title">⚙ 高级搜索</div>
+      <button class="dialog__close" onclick="closeAdvancedSearchDialog()"><svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M1 1l12 12M13 1L1 13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg></button>
+    </div>
+    <div class="dialog__body">
+      <div class="adv-search-grid">
+        <div class="form-group"><label>餐品名称</label><input class="form-input" id="advName" placeholder="支持模糊匹配"></div>
+        <div class="form-group"><label>餐品编号</label><input class="form-input" id="advCode" placeholder="如 DISH001"></div>
+        <div class="form-group"><label>餐品分类</label>
+          <select class="form-select" id="advCategory">
+            <option value="">全部</option>
+            <option>主食</option><option>荤菜</option><option>素菜</option><option>汤品</option><option>小吃</option>
+          </select>
+        </div>
+        <div class="form-group"><label>适用餐次</label>
+          <select class="form-select" id="advMeal">
+            <option value="">全部</option>
+            <option>早餐</option><option>午餐</option><option>晚餐</option><option>早/午</option><option>午/晚</option><option>早/午/晚</option>
+          </select>
+        </div>
+        <div class="form-group"><label>餐品标签</label>
+          <select class="form-select" id="advTag">
+            <option value="">全部</option>
+            <option>低脂</option><option>高蛋白</option><option>素食</option><option>低卡</option><option>高纤维</option><option>低GI</option><option>高糖</option><option>无麸质</option><option>主食</option>
+          </select>
+        </div>
+        <div class="form-group"><label>上架状态</label>
+          <select class="form-select" id="advStatus">
+            <option value="">全部</option>
+            <option>启用</option><option>停用</option>
+          </select>
+        </div>
+        <div class="form-group"><label>食材成本区间(元/100g)</label>
+          <div class="adv-range"><input class="form-input" id="advCostMin" type="number" step="0.01" min="0" placeholder="最低"><span class="adv-range__sep">~</span><input class="form-input" id="advCostMax" type="number" step="0.01" min="0" placeholder="最高"></div>
+        </div>
+        <div class="form-group"><label>餐品售价区间(元/份)</label>
+          <div class="adv-range"><input class="form-input" id="advPriceMin" type="number" step="0.01" min="0" placeholder="最低"><span class="adv-range__sep">~</span><input class="form-input" id="advPriceMax" type="number" step="0.01" min="0" placeholder="最高"></div>
+        </div>
+        <div class="form-group"><label>创建时间</label>
+          <div class="adv-range"><input class="form-input" id="advCreatedStart" type="date"><span class="adv-range__sep">~</span><input class="form-input" id="advCreatedEnd" type="date"></div>
+        </div>
+        <div class="form-group"><label>更新时间</label>
+          <div class="adv-range"><input class="form-input" id="advUpdatedStart" type="date"><span class="adv-range__sep">~</span><input class="form-input" id="advUpdatedEnd" type="date"></div>
+        </div>
+      </div>
+    </div>
+    <div class="dialog__footer">
+      <button class="btn btn-default" onclick="resetAdvancedSearch()">重置</button>
+      <button class="btn btn-default" onclick="closeAdvancedSearchDialog()">取消</button>
+      <button class="btn btn-primary" onclick="applyAdvancedSearch()">应用筛选</button>
+    </div>
+  </div>
+</div>
+
 <script>
 // 餐品数据
 const DISHES = [
-  {id:'DISH001',name:'红烧肉',icon:'🥩',category:'荤菜',tags:['高蛋白'],specs:[{portion:'标准份',baseGram:200,unit:'份',price:12,cleanPrice:9,cleanSale:false,isDefault:true},{portion:'小份',baseGram:120,unit:'份',price:8,cleanPrice:6,cleanSale:false},{portion:'大份',baseGram:300,unit:'份',price:18,cleanPrice:13,cleanSale:false}],method:'炖',meal:'午/晚',allergen:'无',status:'启用',source:'手动添加',
+  {id:'DISH001',name:'红烧肉',icon:'🥩',category:'荤菜',tags:['高蛋白'],specs:[{portion:'标准份',baseGram:200,unit:'份',price:12,cleanMargin:55.0,cleanPrice:9,cleanSale:false,isDefault:true},{portion:'小份',baseGram:120,unit:'份',price:8,cleanMargin:50.0,cleanPrice:6,cleanSale:false},{portion:'大份',baseGram:300,unit:'份',price:18,cleanMargin:58.0,cleanPrice:13,cleanSale:false}],method:'炖',meal:'午/晚',allergen:'无',status:'启用',source:'手动添加',updateTime:'2026-08-10',
     pricing:{basePrice:'6.00',ingredientCost:4.80,per100gCost:2.40,profitRate:150,suggestedPrice:'6.00'},
     promoVideos:[{title:'红烧肉宣传片',duration:'1分30秒',size:'48MB',enabled:true},{title:'制作工艺展示',duration:'2分15秒',size:'72MB',enabled:false}],
     crowd:[{name:'成人',level:'推荐'},{name:'高血脂人群',level:'慎食'},{name:'高血压人群',level:'适量'}],crowdNote:'高血脂人群控制摄入量',cookedWeight:200,
-    composition:[{name:'猪五花肉',netType:'红烧块',amount:160,pct:'80%',state:'净菜',type:'主材',allergen:'无',note:'—'},{name:'生姜',netType:'姜片',amount:5,pct:'2.5%',state:'净菜',type:'辅材',allergen:'无',note:'—'},{name:'生抽',netType:'调味汁',amount:15,pct:'7.5%',state:'原料',type:'调料',allergen:'含麸质',note:'酱油'},{name:'冰糖',netType:'糖浆',amount:10,pct:'5%',state:'原料',type:'调料',allergen:'无',note:'上色提味'},{name:'料酒',netType:'料酒汁',amount:10,pct:'5%',state:'原料',type:'调料',allergen:'无',note:'去腥'}],
+    composition:[{code:'YQ-001',name:'猪五花肉',netName:'红烧块',amount:160,type:'主材'},{code:'YQ-015',name:'生姜',netName:'姜片',amount:5,type:'辅材'},{code:'YQ-017',name:'生抽',netName:'调味汁',amount:15,type:'调料'},{code:'YQ-023',name:'冰糖',netName:'糖浆',amount:10,type:'调料'},{code:'YQ-020',name:'料酒',netName:'料酒汁',amount:10,type:'调料'}],
     nutri:{calorie:385,protein:18.2,carb:12.4,fat:28.6,vitC:0.8,mineral:42,fiber:0.3,sodium:486,calcium:18,iron:2.4,zinc:1.8,potassium:280,cholesterol:88,vitA:14,vitE:0.6,vitB1:0.22,vitB2:0.12,magnesium:20,phosphorus:160,selenium:18,copper:0.12,manganese:0.05,nutriGrade:'偏差',note:'铁2.4mg、锌1.8mg'},
     cook:{mainMethod:'炖',subMethod:'煎',heat:'中火→小火',duration:45,temp:'100→80',steps:6},
     taste:{sour:1,sweet:3,bitter:1,spicy:1,salty:4,smell:4.2,flavorScore:3.8,flavorGrade:'良好'},
     color:{mainColor:'红褐色',uniformity:4,gloss:4,freshness:4,appearance:4,colorScore:4.0,colorGrade:'良好'},
-    texture:{hardness:2,sticky:3,crispy:1,smooth:4,elastic:3,textureScore:3.6,textureGrade:'良好'}
+    texture:{hardness:2,sticky:3,crispy:1,smooth:4,elastic:3,textureScore:3.6,textureGrade:'良好'},
+    history:[
+      {type:'新增',title:'创建餐品',time:'2026-05-10 09:30',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'手动添加「红烧肉」餐品基础档案,初始化基本档案与定价信息。'},
+      {type:'编辑',title:'完善餐品构成',time:'2026-05-22 14:15',user:'李建国',role:'营养师',dept:'营养管理部',summary:'新增冰糖、料酒两味调料,补全红烧调味体系。',changes:[{field:'餐品构成',old:'3 项',new:'5 项'},{field:'烹饪工艺-步骤数',old:'4 步',new:'6 步'}]},
+      {type:'价格调整',title:'更新餐品定价',time:'2026-06-08 11:00',user:'张明',role:'成本核算员',dept:'财务部',summary:'食材成本上调,重新核算标准份售价。',changes:[{field:'标准份售价',old:'10 元',new:'12 元'},{field:'食材成本',old:'4.20 元',new:'4.80 元'}]},
+      {type:'编辑',title:'补充宣传视频',time:'2026-07-05 16:40',user:'陈晓燕',role:'运营员',dept:'运营部',summary:'新增「红烧肉宣传片」与「制作工艺展示」两条视频素材。',changes:[{field:'宣传视频',old:'0 条',new:'2 条'}]},
+      {type:'编辑',title:'修订色泽档案',time:'2026-08-10 10:25',user:'李建国',role:'营养师',dept:'营养管理部',summary:'色泽评分根据试菜反馈微调,综合评级维持良好。',changes:[{field:'卖相评分',old:'3.5',new:'4'},{field:'综合色泽评分',old:'3.8',new:'4.0'}]}
+    ]
   },
-  {id:'DISH002',name:'清炒时蔬',icon:'🥬',category:'素菜',tags:['低脂','素食'],specs:[{portion:'标准份',baseGram:150,unit:'份',price:6,cleanPrice:4.5,cleanSale:false,isDefault:true},{portion:'小份',baseGram:100,unit:'份',price:4,cleanPrice:3,cleanSale:false}],method:'炒',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',
+  {id:'DISH002',name:'清炒时蔬',icon:'🥬',category:'素菜',tags:['低脂','素食'],specs:[{portion:'标准份',baseGram:150,unit:'份',price:6,cleanMargin:60.0,cleanPrice:4.5,cleanSale:false,isDefault:true},{portion:'小份',baseGram:100,unit:'份',price:4,cleanMargin:55.0,cleanPrice:3,cleanSale:false}],method:'炒',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',updateTime:'2026-08-09',
     pricing:{basePrice:'3.00',ingredientCost:1.80,per100gCost:1.20,profitRate:150,suggestedPrice:'3.00'},
     promoVideos:[{title:'清炒时蔬宣传片',duration:'45秒',size:'18MB',enabled:true}],
     crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'推荐'},{name:'肾结石人群',level:'慎食'}],crowdNote:'肾结石人群慎食（草酸含量高）',cookedWeight:140,
-    composition:[{name:'时令青菜',netType:'青菜段',amount:120,pct:'80%',state:'净菜',type:'主材',allergen:'无',note:'—'},{name:'蒜末',netType:'蒜末',amount:5,pct:'3.3%',state:'净菜',type:'调料',allergen:'无',note:'—'},{name:'食用油',netType:'净油',amount:8,pct:'5.3%',state:'原料',type:'调料',allergen:'无',note:'—'},{name:'食盐',netType:'盐粒',amount:2,pct:'1.3%',state:'原料',type:'调料',allergen:'无',note:'—'}],
+    composition:[{code:'YQ-024',name:'时令青菜',netName:'青菜段',netSpecAlias:'长段',amount:120,type:'主材'},{code:'YQ-016',name:'大蒜',netName:'蒜末',netSpecAlias:'细末',amount:5,type:'调料'},{code:'YQ-014',name:'食用油',netName:'净油',amount:8,type:'调料'},{code:'YQ-018',name:'食盐',netName:'盐粒',amount:2,type:'调料'}],
     nutri:{calorie:68,protein:2.1,carb:8.6,fat:3.2,vitC:28.5,mineral:86,fiber:2.4,sodium:186,calcium:45,iron:1.2,zinc:0.4,potassium:280,cholesterol:0,vitA:268,vitE:0.9,vitB1:0.04,vitB2:0.06,magnesium:24,phosphorus:42,selenium:1.2,copper:0.05,manganese:0.18,nutriGrade:'达标',note:'铁1.2mg、钙45mg'},
     cook:{mainMethod:'炒',subMethod:'—',heat:'大火',duration:5,temp:'200',steps:4},
     taste:{sour:1,sweet:2,bitter:1,spicy:1,salty:2,smell:3.5,flavorScore:3.2,flavorGrade:'一般'},
     color:{mainColor:'翠绿色',uniformity:5,gloss:4,freshness:5,appearance:4,colorScore:4.5,colorGrade:'优秀'},
-    texture:{hardness:3,sticky:1,crispy:4,smooth:3,elastic:2,textureScore:3.4,textureGrade:'良好'}
+    texture:{hardness:3,sticky:1,crispy:4,smooth:3,elastic:2,textureScore:3.4,textureGrade:'良好'},
+    history:[
+      {type:'新增',title:'创建餐品',time:'2026-04-18 10:00',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'从系统内置餐品库导入「清炒时蔬」。'},
+      {type:'编辑',title:'扩充餐品规格',time:'2026-05-30 15:20',user:'李建国',role:'营养师',dept:'营养管理部',summary:'新增「小份」规格,满足小胃口就餐需求。',changes:[{field:'餐品规格',old:'1 项(标准份)',new:'2 项(标准份/小份)'}]},
+      {type:'价格调整',title:'更新餐品定价',time:'2026-07-12 09:45',user:'张明',role:'成本核算员',dept:'财务部',summary:'夏季时蔬成本下降,标准份售价下调。',changes:[{field:'标准份售价',old:'8 元',new:'6 元'}]}
+    ]
   },
-  {id:'DISH003',name:'番茄鸡蛋汤',icon:'🍅',category:'汤品',tags:['低卡'],specs:[{portion:'标准份',baseGram:300,unit:'份',price:5,cleanPrice:3.5,cleanSale:false,isDefault:true}],method:'煮',meal:'午/晚',allergen:'含蛋类',status:'启用',source:'系统内置',
+  {id:'DISH003',name:'番茄鸡蛋汤',icon:'🍅',category:'汤品',tags:['低卡'],specs:[{portion:'标准份',baseGram:300,unit:'份',price:5,cleanMargin:42.0,cleanPrice:3.5,cleanSale:false,isDefault:true}],method:'煮',meal:'午/晚',allergen:'含蛋类',status:'启用',source:'系统内置',updateTime:'2026-08-08',
     pricing:{basePrice:'1.67',ingredientCost:1.20,per100gCost:0.40,profitRate:150,suggestedPrice:'1.00'},
     promoVideos:[{title:'番茄鸡蛋汤宣传片',duration:'1分钟',size:'24MB',enabled:true},{title:'家常做法教程',duration:'3分钟',size:'80MB',enabled:true}],
     crowd:[{name:'全人群',level:'推荐'},{name:'儿童',level:'推荐'},{name:'老年人',level:'推荐'}],crowdNote:'',cookedWeight:300,
-    composition:[{name:'番茄',netType:'番茄块',amount:150,pct:'50%',state:'净菜',type:'主材',allergen:'无',note:'—'},{name:'鸡蛋',netType:'鸡蛋液',amount:60,pct:'20%',state:'原料',type:'主材',allergen:'含蛋类',note:'—'},{name:'食用油',netType:'净油',amount:5,pct:'1.7%',state:'原料',type:'调料',allergen:'无',note:'—'},{name:'食盐',netType:'盐粒',amount:2,pct:'0.7%',state:'原料',type:'调料',allergen:'无',note:'—'}],
+    composition:[{code:'YQ-006',name:'番茄',netName:'番茄块',amount:150,type:'主材'},{code:'YQ-005',name:'鸡蛋',netName:'鸡蛋液',amount:60,type:'主材'},{code:'YQ-014',name:'食用油',netName:'净油',amount:5,type:'调料'},{code:'YQ-018',name:'食盐',netName:'盐粒',amount:2,type:'调料'}],
     nutri:{calorie:45,protein:3.8,carb:4.2,fat:2.1,vitC:18.2,mineral:32,fiber:1.1,sodium:280,calcium:18,iron:0.8,zinc:0.4,potassium:210,cholesterol:110,vitA:62,vitE:0.5,vitB1:0.04,vitB2:0.12,magnesium:12,phosphorus:80,selenium:8,copper:0.05,manganese:0.06,nutriGrade:'达标',note:'铁0.8mg、钾210mg'},
     cook:{mainMethod:'煮',subMethod:'炒',heat:'中火',duration:12,temp:'100',steps:5},
     taste:{sour:3,sweet:2,bitter:1,spicy:1,salty:2,smell:3.8,flavorScore:3.5,flavorGrade:'良好'},
     color:{mainColor:'橙红色',uniformity:4,gloss:3,freshness:5,appearance:4,colorScore:4.0,colorGrade:'良好'},
-    texture:{hardness:1,sticky:2,crispy:1,smooth:5,elastic:2,textureScore:3.8,textureGrade:'良好'}
+    texture:{hardness:1,sticky:2,crispy:1,smooth:5,elastic:2,textureScore:3.8,textureGrade:'良好'},
+    history:[
+      {type:'新增',title:'创建餐品',time:'2026-03-25 09:00',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'从系统内置餐品库导入「番茄鸡蛋汤」。'},
+      {type:'编辑',title:'补充宣传视频',time:'2026-05-14 14:30',user:'陈晓燕',role:'运营员',dept:'运营部',summary:'新增宣传片与家常做法教程两条视频。',changes:[{field:'宣传视频',old:'0 条',new:'2 条'}]},
+      {type:'编辑',title:'修订味道档案',time:'2026-07-20 11:10',user:'李建国',role:'营养师',dept:'营养管理部',summary:'根据试菜反馈调整酸味评分。',changes:[{field:'酸味(1-5)',old:'2',new:'3'},{field:'味道评分',old:'3.2',new:'3.5'}]}
+    ]
   },
-  {id:'DISH004',name:'米饭',icon:'🍚',category:'主食',tags:['主食'],specs:[{portion:'标准份',baseGram:200,unit:'份',price:3,cleanPrice:2,cleanSale:false,isDefault:true},{portion:'小份',baseGram:100,unit:'份',price:2,cleanPrice:1.5,cleanSale:false},{portion:'大份',baseGram:300,unit:'份',price:4,cleanPrice:3,cleanSale:false}],method:'蒸',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',
+  {id:'DISH004',name:'米饭',icon:'🍚',category:'主食',tags:['主食'],specs:[{portion:'标准份',baseGram:200,unit:'份',price:3,cleanMargin:38.0,cleanPrice:2,cleanSale:false,isDefault:true},{portion:'小份',baseGram:100,unit:'份',price:2,cleanMargin:35.0,cleanPrice:1.5,cleanSale:false},{portion:'大份',baseGram:300,unit:'份',price:4,cleanMargin:40.0,cleanPrice:3,cleanSale:false}],method:'蒸',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',updateTime:'2026-07-22',
     pricing:{basePrice:'1.50',ingredientCost:1.00,per100gCost:0.50,profitRate:150,suggestedPrice:'1.25'},
     promoVideos:[],
     crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'适量'}],crowdNote:'糖尿病人群注意控制量',cookedWeight:200,
-    composition:[{name:'大米',netType:'熟米饭',amount:100,pct:'100%',state:'原料',type:'主材',allergen:'无',note:'—'}],
+    composition:[{code:'YQ-011',name:'大米',netName:'熟米饭',amount:100,type:'主材'}],
     nutri:{calorie:232,protein:4.8,carb:51.2,fat:0.6,vitC:0,mineral:12,fiber:0.4,sodium:3,calcium:10,iron:0.5,zinc:0.8,potassium:43,cholesterol:0,vitA:0,vitE:0.1,vitB1:0.02,vitB2:0.02,magnesium:12,phosphorus:43,selenium:1.5,copper:0.05,manganese:0.18,nutriGrade:'达标',note:'—'},
     cook:{mainMethod:'蒸',subMethod:'—',heat:'大火→中火',duration:30,temp:'100',steps:2},
     taste:{sour:1,sweet:2,bitter:1,spicy:1,salty:1,smell:3.0,flavorScore:2.8,flavorGrade:'一般'},
     color:{mainColor:'乳白色',uniformity:5,gloss:4,freshness:4,appearance:4,colorScore:4.2,colorGrade:'良好'},
-    texture:{hardness:2,sticky:3,crispy:1,smooth:3,elastic:2,textureScore:3.2,textureGrade:'一般'}
+    texture:{hardness:2,sticky:3,crispy:1,smooth:3,elastic:2,textureScore:3.2,textureGrade:'一般'},
+    history:[
+      {type:'新增',title:'创建餐品',time:'2026-02-01 09:00',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'从系统内置餐品库导入「米饭」,作为基础主食。'},
+      {type:'编辑',title:'扩充餐品规格',time:'2026-04-10 14:00',user:'李建国',role:'营养师',dept:'营养管理部',summary:'新增「小份」「大份」规格,适应不同食量。',changes:[{field:'餐品规格',old:'1 项(标准份)',new:'3 项(小份/标准份/大份)'}]},
+      {type:'价格调整',title:'更新餐品定价',time:'2026-07-22 10:30',user:'张明',role:'成本核算员',dept:'财务部',summary:'粳米定价微调,标准份售价更新。',changes:[{field:'标准份售价',old:'2 元',new:'3 元'}]}
+    ]
   },
-  {id:'DISH005',name:'糖醋里脊',icon:'🍖',category:'荤菜',tags:['高糖'],specs:[{portion:'标准份',baseGram:180,unit:'份',price:14,cleanPrice:10,cleanSale:false,isDefault:true},{portion:'大份',baseGram:280,unit:'份',price:20,cleanPrice:14,cleanSale:false}],method:'炸',meal:'午',allergen:'无',status:'停用',source:'味养创新',
+  {id:'DISH005',name:'糖醋里脊',icon:'🍖',category:'荤菜',tags:['高糖'],specs:[{portion:'标准份',baseGram:180,unit:'份',price:14,cleanMargin:62.0,cleanPrice:10,cleanSale:false,isDefault:true},{portion:'大份',baseGram:280,unit:'份',price:20,cleanMargin:65.0,cleanPrice:14,cleanSale:false}],method:'炸',meal:'午',allergen:'无',status:'停用',source:'味养创新',updateTime:'2026-08-05',
     pricing:{basePrice:'7.78',ingredientCost:5.20,per100gCost:2.89,profitRate:170,suggestedPrice:'7.80'},
     promoVideos:[{title:'糖醋里脊宣传片',duration:'2分钟',size:'58MB',enabled:true},{title:'正宗做法揭秘',duration:'5分钟',size:'150MB',enabled:true},{title:'出品摆盘展示',duration:'30秒',size:'12MB',enabled:false}],
     crowd:[{name:'成人',level:'推荐'},{name:'糖尿病人群',level:'慎食'},{name:'高血脂人群',level:'适量'}],crowdNote:'糖尿病人群慎食，含糖量高',cookedWeight:180,
-    composition:[{name:'猪里脊肉',netType:'里脊丝',amount:120,pct:'66.7%',state:'净菜',type:'主材',allergen:'无',note:'—'},{name:'淀粉',netType:'淀粉糊',amount:20,pct:'11.1%',state:'原料',type:'辅材',allergen:'无',note:'挂糊'},{name:'白糖',netType:'糖浆',amount:25,pct:'13.9%',state:'原料',type:'调料',allergen:'无',note:'糖醋汁'},{name:'食醋',netType:'调味汁',amount:15,pct:'8.3%',state:'原料',type:'调料',allergen:'无',note:'糖醋汁'}],
+    composition:[{code:'YQ-002',name:'猪里脊肉',netName:'里脊丝',netSpecAlias:'细丝',amount:120,type:'主材'},{code:'YQ-022',name:'淀粉',netName:'淀粉糊',amount:20,type:'辅材'},{code:'YQ-019',name:'白糖',netName:'糖浆',amount:25,type:'调料'},{code:'YQ-021',name:'食醋',netName:'调味汁',amount:15,type:'调料'}],
     nutri:{calorie:420,protein:22.4,carb:38.2,fat:18.6,vitC:1.2,mineral:28,fiber:0.6,sodium:620,calcium:22,iron:1.8,zinc:1.6,potassium:340,cholesterol:75,vitA:8,vitE:0.4,vitB1:0.45,vitB2:0.18,magnesium:24,phosphorus:200,selenium:14,copper:0.1,manganese:0.08,nutriGrade:'未达标',note:'铁1.8mg'},
     cook:{mainMethod:'炸',subMethod:'炒',heat:'大火',duration:15,temp:'180',steps:7},
     taste:{sour:4,sweet:4,bitter:1,spicy:1,salty:3,smell:4.0,flavorScore:4.2,flavorGrade:'良好'},
     color:{mainColor:'金黄色',uniformity:4,gloss:5,freshness:4,appearance:5,colorScore:4.5,colorGrade:'优秀'},
-    texture:{hardness:3,sticky:1,crispy:5,smooth:4,elastic:3,textureScore:4.0,textureGrade:'良好'}
+    texture:{hardness:3,sticky:1,crispy:5,smooth:4,elastic:3,textureScore:4.0,textureGrade:'良好'},
+    history:[
+      {type:'新增',title:'创建餐品',time:'2026-04-25 10:30',user:'味养创新',role:'AI 推荐',dept:'味养创新中心',summary:'味养创新模块推演生成「糖醋里脊」餐品并入库。'},
+      {type:'编辑',title:'完善口感档案',time:'2026-05-18 14:50',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'根据实际出品反馈调整脆度评分。',changes:[{field:'脆度(1-5)',old:'4',new:'5'},{field:'口感评分',old:'3.8',new:'4.0'}]},
+      {type:'价格调整',title:'更新餐品定价',time:'2026-06-20 11:15',user:'张明',role:'成本核算员',dept:'财务部',summary:'里脊肉成本上调,标准份售价同步调整。',changes:[{field:'标准份售价',old:'12 元',new:'14 元'},{field:'大份售价',old:'18 元',new:'20 元'}]},
+      {type:'编辑',title:'补充宣传视频',time:'2026-07-08 16:00',user:'陈晓燕',role:'运营员',dept:'运营部',summary:'新增三条宣传视频素材。',changes:[{field:'宣传视频',old:'0 条',new:'3 条'}]},
+      {type:'停用',title:'停用餐品',time:'2026-08-05 09:20',user:'李建国',role:'营养师',dept:'营养管理部',summary:'高糖高油,营养指标未达标,根据健康饮食指引暂停供应。',changes:[{field:'餐品状态',old:'启用',new:'停用'}]}
+    ]
   }
 ];
 
 let currentDish = 0;
 let currentTab = 0;
+/* 列表渲染基于 filteredDishes(由快速搜索 / 高级搜索筛选产生),默认全量 */
+let filteredDishes = [];
+/* 高级搜索已应用条件(用于汇总条显示) */
+let appliedAdvSearch = null;
 
 function renderDishList(){
-  document.getElementById('dishList').innerHTML = DISHES.map((d,i)=>`
+  document.getElementById('dishList').innerHTML = filteredDishes.map((entry)=>{const d=entry.dish;const i=entry.idx;return `
     <div class="food-item${i===currentDish?' active':''}" onclick="selectDish(${i})">
       <div class="food-item__icon">${d.icon}</div>
       <div class="food-item__info">
         <div class="food-item__name">${d.name}</div>
-        <div class="food-item__meta"><span>${d.id}</span><span>${d.category}</span><span class="tag tag-${d.status==='启用'?'green':'gray'}" style="margin:0;padding:1px 6px;">${d.status}</span></div>
+        <div class="food-item__meta"><span>${d.updateTime||'—'}</span><span>${d.category}</span><span class="tag tag-${d.status==='启用'?'green':'gray'}" style="margin:0;padding:1px 6px;">${d.status}</span></div>
       </div>
-    </div>`).join('');
+    </div>`;}).join('');
 }
 
 function selectDish(idx){ currentDish=idx; renderDishList(); renderDetail(); }
@@ -481,7 +621,7 @@ function renderDetail(){
   const s = document.getElementById('detailStatus');
   s.textContent = d.status; s.className='tag tag-'+(d.status==='启用'?'green':'gray');
   const body = document.getElementById('detailBody');
-  const renderers = [renderBasic,renderComposition,renderPricing,renderCook,renderTaste,renderTexture,renderColor];
+  const renderers = [renderBasic,renderComposition,renderPricing,renderCook,renderTaste,renderTexture,renderColor,renderHistory];
   body.innerHTML = renderers[currentTab](d);
 }
 
@@ -530,16 +670,17 @@ function renderBasic(d){
 function renderPricing(d){
   var specRows = (d.specs||[]).map(function(s){
     var statusHtml = s.isDefault ? '<span class="tag tag-blue" style="font-size:11px;">默认</span>' : '';
+    var cleanMargin = (s.cleanMargin!==undefined && s.cleanMargin!==null) ? parseFloat(s.cleanMargin).toFixed(1)+'%' : '—';
     var cleanPrice = (s.cleanPrice!==undefined && s.cleanPrice!==null) ? parseFloat(s.cleanPrice).toFixed(2) : '—';
     var cleanSaleActive = s.cleanSale === true;
     var cleanSaleHtml = '<div class="sale-toggle'+(cleanSaleActive?' active':'')+'" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">'+(cleanSaleActive?'上架':'下架')+'</span></div>';
     var gramText=s.baseGram?(parseFloat(s.baseGram)+'g'):'';
     var specViewHtml='<div class="spec-cell-view"><span class="spec-cell-view__gram">'+gramText+'</span><span class="spec-cell-view__sep">/</span><span class="spec-cell-view__name">'+(s.portion||'—')+'</span></div>';
-    return '<tr><td>'+specViewHtml+'</td><td>'+s.price.toFixed(2)+'</td><td>'+cleanPrice+'</td><td>'+cleanSaleHtml+'</td><td>'+statusHtml+'</td></tr>';
+    return '<tr><td>'+specViewHtml+'</td><td>'+s.price.toFixed(2)+'</td><td>'+cleanMargin+'</td><td>'+cleanPrice+'</td><td>'+cleanSaleHtml+'</td><td>'+statusHtml+'</td></tr>';
   }).join('');
   return renderPricingSection(d)
     + '<div class="info-section"><div class="info-section__title">📐 餐品规格（共 '+(d.specs||[]).length+' 项）</div>'
-    + '<table class="info-table spec-detail-table"><thead><tr><th>规格</th><th>餐品售价(元/份)</th><th>净菜包售价(元/份)</th><th>外售净菜包</th><th>状态</th></tr></thead><tbody>'+specRows+'</tbody></table></div>';
+    + '<table class="info-table spec-detail-table"><thead><tr><th>规格</th><th>餐品售价(元/份)</th><th>净菜包毛利率</th><th>净菜包售价(元/份)</th><th>外售净菜包</th><th>状态</th></tr></thead><tbody>'+specRows+'</tbody></table></div>';
 }
 
 /* 餐品定价分区（普通 info-section 样式，详情页只展示字段，成本核算仅在编辑/新增页） */
@@ -580,7 +721,15 @@ function renderPromoVideosSection(d){
 }
 
 function renderComposition(d){
-  const rows = (d.composition||[]).map(c=>`<tr><td>${c.name}</td><td>${c.netType}</td><td>${c.amount}</td><td>${c.pct}</td><td><span class="tag tag-${c.type==='主材'?'blue':c.type==='调料'?'orange':'gray'}">${c.type||'辅材'}</span></td><td>${c.allergen}</td><td>${c.note}</td></tr>`).join('');
+  const rows = (d.composition||[]).map(c=>{
+    /* 净菜类型:主名称(已含-分隔符) + 净菜规格别名(弱化样式) */
+    var netName = c.netName || c.netType || '—';
+    var netTypeHtml = c.netSpecAlias
+      ? '<span class="net-type">'+netName+'</span><span class="net-type-alias">'+c.netSpecAlias+'</span>'
+      : '<span class="net-type">'+netName+'</span>';
+    var typeTag = c.type==='主材'?'blue':c.type==='调料'?'orange':'gray';
+    return '<tr><td>'+(c.code||'—')+'</td><td>'+(c.name||'—')+'</td><td><span class="tag tag-'+typeTag+'">'+(c.type||'辅材')+'</span></td><td>'+netTypeHtml+'</td><td>'+(c.amount||0)+'g</td></tr>';
+  }).join('');
   return `<div class="composition-head">
     <div class="composition-head__title">🧩 餐品构成</div>
     <a class="link" href="din-dish-add.html?mode=edit&tab=1">编辑</a>
@@ -590,7 +739,7 @@ function renderComposition(d){
       <div class="info-cell"><div class="info-cell__label">熟重</div><div class="info-cell__value">${(d.cookedWeight!==undefined&&d.cookedWeight!==null)?(d.cookedWeight+'g'):'—'}</div></div>
     </div></div>
   <div class="info-section"><div class="info-section__title">食材构成（共 ${(d.composition||[]).length} 项）</div>
-    <table class="info-table"><thead><tr><th>食材名称</th><th>净菜类型</th><th>用量(g/份)</th><th>占比(%)</th><th>食材类型</th><th>过敏原</th><th>备注</th></tr></thead><tbody>${rows}</tbody></table></div>
+    <table class="info-table"><thead><tr><th>食材编码</th><th>食材名称</th><th>食材类型</th><th>净菜类型</th><th>用量(g/份)</th></tr></thead><tbody>${rows}</tbody></table></div>
   ${renderNutriSection(d)}`;
 }
 
@@ -672,6 +821,74 @@ function renderColor(d){
     </div></div>`;
 }
 
+/* === 操作历史 === */
+// 操作类型标签配色
+function historyOpTag(type){
+  const map={
+    '新增':{cls:'tag-green',icon:'➕'},
+    '编辑':{cls:'tag-blue',icon:'✏️'},
+    '启用':{cls:'tag-green',icon:'✓'},
+    '停用':{cls:'tag-gray',icon:'⏸'},
+    '价格调整':{cls:'tag-orange',icon:'💰'},
+    '删除':{cls:'tag-red',icon:'🗑'},
+    '恢复':{cls:'',icon:'♻',style:'background:#F9F0FF;color:#722ED1;'}
+  };
+  const m = map[type] || {cls:'tag-gray',icon:'•'};
+  const styleAttr = m.style ? ` style="${m.style}"` : '';
+  return `<span class="tag ${m.cls}"${styleAttr}>${m.icon} ${type}</span>`;
+}
+
+// 渲染操作历史:筛选条 + 时间轴(只读视图,无编辑/删除入口)
+function renderHistory(d){
+  const list = d.history || [];
+  let html = `<div class="info-section"><div class="info-section__title">操作历史</div>`;
+
+  // 筛选条
+  html += `<div class="history-filter">
+    <select><option>全部操作</option><option>新增</option><option>编辑</option><option>启用</option><option>停用</option><option>价格调整</option><option>删除</option><option>恢复</option></select>
+    <input type="text" placeholder="操作时间范围(YYYY-MM-DD ~ YYYY-MM-DD)" style="flex:1;min-width:260px;">
+    <input type="text" placeholder="操作人" style="width:140px;">
+    <button class="btn btn-primary">查询</button>
+    <button class="btn btn-default">重置</button>
+  </div>`;
+
+  // 时间轴
+  if(list.length===0){
+    html += `<div class="history-empty">该餐品暂无操作历史记录</div>`;
+  } else {
+    html += `<div class="history-timeline">`;
+    list.forEach(function(h){
+      const opClassMap={'新增':'create','编辑':'edit','启用':'edit','停用':'disable','价格调整':'price','删除':'delete','恢复':'restore'};
+      const opCls = opClassMap[h.type] || 'edit';
+      html += `<div class="history-item history-item--${opCls}">`;
+      html += `<div class="history-card">`;
+      html += `<div class="history-card__head">`;
+      html += historyOpTag(h.type);
+      html += `<span class="history-card__op">${h.title || ''}</span>`;
+      html += `<span class="history-card__time">${h.time}</span>`;
+      html += `</div>`;
+      html += `<div class="history-card__user">👤 ${h.user} · ${h.role || '操作员'}${h.dept?(' · '+h.dept):''}</div>`;
+      if(h.summary) html += `<div class="history-card__summary">${h.summary}</div>`;
+      // 变更明细
+      if(h.changes && h.changes.length>0){
+        html += `<div class="history-card__changes">`;
+        h.changes.forEach(function(c){
+          html += `<div class="history-change">`;
+          html += `<div class="history-change__field">${c.field}</div>`;
+          html += `<div class="history-change__old">${c.old || '—'}</div>`;
+          html += `<div class="history-change__new">${c.new || '—'}</div>`;
+          html += `</div>`;
+        });
+        html += `</div>`;
+      }
+      html += `</div></div>`;
+    });
+    html += `</div>`;
+  }
+  html += `</div>`;
+  return html;
+}
+
 function renderTexture(d){
   const t = d.texture;
   const gradeTag = t.textureGrade==='优秀'?'green':t.textureGrade==='良好'?'blue':t.textureGrade==='一般'?'orange':'red';
@@ -739,9 +956,172 @@ function togglePromoVideo(el, dishIdx, videoIdx){
 
 (function(){var a=document.querySelector('.sidebar-item.active');if(!a)return;var s=a.closest('.sidebar-subgroup');if(s)s.classList.add('open');})();
 
-// 初始化
-renderDishList();
-renderDetail();
+// 初始化（先建立 filteredDishes 再渲染列表/详情）
+applyFilters();
+
+/* ============ 搜索与筛选 ============ */
+/* 收集快速搜索 + 高级搜索条件,刷新 filteredDishes 与汇总条 */
+function applyFilters(){
+  var kw = (document.getElementById('dishQuickSearchInput')||{}).value || '';
+  kw = kw.trim().toLowerCase();
+  var cat = (document.getElementById('dishCategoryFilter')||{}).value || '';
+  var stat = (document.getElementById('dishStatusFilter')||{}).value || '';
+  /* 应用快速搜索条件 */
+  var quickFiltered = DISHES.filter(function(d,i){
+    var matchKw = !kw || (d.name||'').toLowerCase().indexOf(kw)>=0 || (d.id||'').toLowerCase().indexOf(kw)>=0;
+    var matchCat = !cat || cat==='全部分类' || d.category===cat;
+    var matchStat = !stat || stat==='全部状态' || d.status===stat;
+    return matchKw && matchCat && matchStat;
+  });
+  /* 再叠加高级搜索条件 */
+  var list = quickFiltered;
+  if(appliedAdvSearch){
+    list = quickFiltered.filter(function(d){
+      return matchAdvanced(d, appliedAdvSearch);
+    });
+  }
+  filteredDishes = list.map(function(d){
+    var idx = DISHES.indexOf(d);
+    return {dish:d, idx:idx};
+  });
+  /* 若当前选中项被筛掉,则自动选第一条 */
+  var stillIn = filteredDishes.some(function(e){return e.idx===currentDish;});
+  if(!stillIn && filteredDishes.length>0){
+    currentDish = filteredDishes[0].idx;
+    currentTab = 0;
+  }
+  /* 更新汇总条 */
+  updateFilterSummary();
+  /* 重新渲染 */
+  renderDishList();
+  renderDetail();
+  /* 更新底部计数 */
+  var counter = document.getElementById('dishListCount');
+  if(counter) counter.textContent = '共 '+filteredDishes.length+' 条';
+  /* 空态提示 */
+  var emptyHint = document.getElementById('dishListEmpty');
+  if(emptyHint){
+    emptyHint.style.display = filteredDishes.length===0 ? 'block' : 'none';
+  }
+}
+
+/* 单条餐品是否匹配高级搜索条件 */
+function matchAdvanced(d, q){
+  if(q.name && (d.name||'').toLowerCase().indexOf(q.name.toLowerCase())<0) return false;
+  if(q.code && (d.id||'').toLowerCase().indexOf(q.code.toLowerCase())<0) return false;
+  if(q.category && d.category!==q.category) return false;
+  if(q.meal && (d.meal||'')!==q.meal) return false;
+  if(q.tag && !(d.tags||[]).some(function(t){return t===q.tag;})) return false;
+  if(q.status && d.status!==q.status) return false;
+  /* 食材成本区间 */
+  var cost = (d.pricing && d.pricing.ingredientCost!==undefined) ? d.pricing.ingredientCost : null;
+  if(cost===null) cost = 0;
+  if(q.costMin!==null && cost < q.costMin) return false;
+  if(q.costMax!==null && cost > q.costMax) return false;
+  /* 餐品售价区间:取规格中最低价/最高价 */
+  var prices = (d.specs||[]).map(function(s){return s.price;});
+  var minPrice = prices.length ? Math.min.apply(null, prices) : 0;
+  var maxPrice = prices.length ? Math.max.apply(null, prices) : 0;
+  if(q.priceMin!==null && maxPrice < q.priceMin) return false;
+  if(q.priceMax!==null && minPrice > q.priceMax) return false;
+  /* 时间区间(字符串比较即可,演示数据格式 YYYY-MM-DD) */
+  if(q.updatedStart && (d.updateTime||'') < q.updatedStart) return false;
+  if(q.updatedEnd && (d.updateTime||'') > q.updatedEnd) return false;
+  /* 创建时间演示数据缺失,留作扩展(命中即跳过比较) */
+  return true;
+}
+
+/* 更新筛选汇总条 */
+function updateFilterSummary(){
+  var sumEl = document.getElementById('filterSummary');
+  if(!sumEl) return;
+  var bits = [];
+  if(appliedAdvSearch){
+    Object.keys(appliedAdvSearch).forEach(function(k){
+      var v = appliedAdvSearch[k];
+      if(v===null || v===undefined || v==='') return;
+      var labelMap = {name:'名称',code:'编号',category:'分类',meal:'餐次',tag:'标签',status:'状态',
+        costMin:'成本≥',costMax:'成本≤',priceMin:'售价≥',priceMax:'售价≤',
+        updatedStart:'更新≥',updatedEnd:'更新≤',createdStart:'创建≥',createdEnd:'创建≤'};
+      var label = labelMap[k] || k;
+      var suffix = (k.indexOf('Min')>=0 || k.indexOf('Max')>=0) ? (k.indexOf('cost')>=0?'元':(k.indexOf('price')>=0?'元':'')) : '';
+      bits.push(label + v + suffix);
+    });
+  }
+  if(bits.length===0){
+    sumEl.style.display = 'none';
+    sumEl.innerHTML = '';
+  } else {
+    sumEl.style.display = 'flex';
+    sumEl.innerHTML = '<span class="panel-left__filter-summary__text">已应用筛选：' + bits.join(' · ') + '</span>'
+      + '<button class="panel-left__filter-summary__clear" onclick="clearAdvancedSearch()">✕ 清空</button>';
+  }
+}
+
+/* 快速搜索(输入框 + 分类/状态下拉触发) */
+function onQuickSearchInput(){ applyFilters(); }
+function onQuickSearch(){ applyFilters(); }
+
+/* 高级搜索弹窗 */
+function openAdvancedSearchDialog(){
+  /* 把已应用条件回填到表单 */
+  var q = appliedAdvSearch || {};
+  setVal('advName', q.name||'');
+  setVal('advCode', q.code||'');
+  setVal('advCategory', q.category||'');
+  setVal('advMeal', q.meal||'');
+  setVal('advTag', q.tag||'');
+  setVal('advStatus', q.status||'');
+  setVal('advCostMin', q.costMin!==null && q.costMin!==undefined ? q.costMin : '');
+  setVal('advCostMax', q.costMax!==null && q.costMax!==undefined ? q.costMax : '');
+  setVal('advPriceMin', q.priceMin!==null && q.priceMin!==undefined ? q.priceMin : '');
+  setVal('advPriceMax', q.priceMax!==null && q.priceMax!==undefined ? q.priceMax : '');
+  setVal('advUpdatedStart', q.updatedStart||'');
+  setVal('advUpdatedEnd', q.updatedEnd||'');
+  setVal('advCreatedStart', q.createdStart||'');
+  setVal('advCreatedEnd', q.createdEnd||'');
+  document.getElementById('advancedSearchDialog').classList.add('open');
+}
+function closeAdvancedSearchDialog(){
+  document.getElementById('advancedSearchDialog').classList.remove('open');
+}
+function resetAdvancedSearch(){
+  ['advName','advCode','advCategory','advMeal','advTag','advStatus','advCostMin','advCostMax','advPriceMin','advPriceMax','advUpdatedStart','advUpdatedEnd','advCreatedStart','advCreatedEnd'].forEach(function(id){ setVal(id,''); });
+}
+function applyAdvancedSearch(){
+  appliedAdvSearch = {
+    name: getVal('advName'),
+    code: getVal('advCode'),
+    category: getVal('advCategory'),
+    meal: getVal('advMeal'),
+    tag: getVal('advTag'),
+    status: getVal('advStatus'),
+    costMin: getNum('advCostMin'),
+    costMax: getNum('advCostMax'),
+    priceMin: getNum('advPriceMin'),
+    priceMax: getNum('advPriceMax'),
+    updatedStart: getVal('advUpdatedStart'),
+    updatedEnd: getVal('advUpdatedEnd'),
+    createdStart: getVal('advCreatedStart'),
+    createdEnd: getVal('advCreatedEnd')
+  };
+  /* 全部空字段视为未设置 */
+  var hasAny = Object.keys(appliedAdvSearch).some(function(k){
+    var v = appliedAdvSearch[k];
+    return v!==null && v!==undefined && v!=='';
+  });
+  if(!hasAny) appliedAdvSearch = null;
+  closeAdvancedSearchDialog();
+  applyFilters();
+}
+function clearAdvancedSearch(){
+  appliedAdvSearch = null;
+  applyFilters();
+}
+
+function setVal(id, v){ var el = document.getElementById(id); if(el) el.value = v; }
+function getVal(id){ var el = document.getElementById(id); return el ? el.value.trim() : ''; }
+function getNum(id){ var v = getVal(id); if(v==='') return null; var n = parseFloat(v); return isNaN(n) ? null : n; }
 
 /* ========== 餐品分类管理 ========== */
 var nextDishCatId = 100;
@@ -861,41 +1241,6 @@ function deleteDishCat(id){
 }
 </script>
 
-<!-- 新增食材弹窗 -->
-<div class="dialog-mask" id="ingredientDialog">
-  <div class="dialog">
-    <div class="dialog__header">
-      <div class="dialog__title">新增食材</div>
-      <button class="dialog__close" onclick="closeIngredientDialog()">
-        <svg width="14" height="14" viewBox="0 0 14 14" fill="none"><path d="M1 1l12 12M13 1L1 13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg>
-      </button>
-    </div>
-    <div class="dialog__body">
-      <div class="form-row">
-        <div class="form-group"><label>食材名称<span class="required">*</span></label><input class="form-input" type="text" placeholder="请输入食材名称"></div>
-        <div class="form-group"><label>净菜类型<span class="required">*</span></label><select class="form-select"><option>请选择</option><option>土豆丝</option><option>土豆块</option><option>土豆泥</option><option>番茄块</option><option>蒜末</option></select></div>
-      </div>
-      <div class="form-row">
-        <div class="form-group"><label>用量(g/份)<span class="required">*</span></label><input class="form-input" type="number" placeholder="请输入用量"></div>
-        <div class="form-group"><label>加工状态</label><select class="form-select"><option>请选择</option><option>原料</option><option>净菜</option><option>半成品</option></select></div>
-      </div>
-      <div class="form-row">
-        <div class="form-group"><label>食材类型</label><select class="form-select"><option>辅材</option><option>主材</option><option>调料</option></select></div>
-        <div class="form-group"><label>过敏原</label><input class="form-input" type="text" placeholder="无则填无"></div>
-      </div>
-      <div class="form-group"><label>备注</label><input class="form-input" type="text" placeholder="请输入备注信息"></div>
-    </div>
-    <div class="dialog__footer">
-      <button class="btn btn-default" onclick="closeIngredientDialog()">取消</button>
-      <button class="btn btn-primary">确定</button>
-    </div>
-  </div>
-</div>
-
-<script>
-function openIngredientDialog(){document.getElementById('ingredientDialog').classList.add('open');}
-function closeIngredientDialog(){document.getElementById('ingredientDialog').classList.remove('open');}
-</script>
 <!-- 餐品分类管理弹窗 -->
 <div class="dialog-mask" id="dishCategoryDialog">
   <div class="dialog" style="width:820px;">
diff --git a/web-admin/nutrition/din-ingredient-add.html b/web-admin/nutrition/din-ingredient-add.html
index 4ee4e13..b5d918e 100644
--- a/web-admin/nutrition/din-ingredient-add.html
+++ b/web-admin/nutrition/din-ingredient-add.html
@@ -111,6 +111,33 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .dynamic-row__del:hover{color:var(--danger);background:#FFF1F0;}
 .dynamic-row-add{display:inline-flex;align-items:center;gap:4px;padding:6px 12px;border:1px dashed var(--primary);color:var(--primary);border-radius:var(--radius-sm);font-size:var(--font-xs);cursor:pointer;background:none;margin-top:8px;transition:all .2s;}
 .dynamic-row-add:hover{background:var(--primary-light);}
+/* 净菜表格(扁平 + rowspan 合并) */
+.veg-table-wrap{overflow-x:auto;}
+.veg-table{width:100%;border-collapse:collapse;font-size:var(--font-xs);border:1px solid #E8E8E8;border-radius:var(--radius-sm);}
+.veg-table th{background:#FAFAFA;color:var(--text-secondary);font-weight:500;padding:8px 8px;text-align:left;border-bottom:1px solid #E8E8E8;white-space:nowrap;}
+.veg-table td{padding:6px 8px;border-bottom:1px solid #F0F0F0;vertical-align:middle;}
+.veg-table tr.veg-row:last-child td{border-bottom:none;}
+.veg-table tr.veg-row--spec td{background:#FAFBFC;}
+.veg-table .veg-cell--merged{background:#FAFBFC;vertical-align:middle;text-align:center;padding:8px;}
+.veg-table .veg-name{display:block;font-size:var(--font-sm);font-weight:600;color:var(--primary);line-height:1.3;word-break:break-all;}
+.veg-table .veg-name--placeholder{color:var(--text-placeholder);font-weight:400;font-size:var(--font-xs);}
+.veg-table .veg-cell--merged .form-input,.veg-table .veg-cell--merged .form-select{height:26px;font-size:11px;}
+.veg-table .form-input,.veg-table .form-select{height:28px;font-size:var(--font-xs);padding:0 6px;width:100%;}
+.veg-table .col-name{min-width:130px;}
+.veg-table .col-alias{min-width:100px;}
+.veg-table .col-yield{min-width:70px;}
+.veg-table .col-shape{min-width:90px;}
+.veg-table .col-spec-alias{min-width:90px;width:90px;}
+.veg-table .col-dim{min-width:62px;width:62px;}
+.veg-table .col-tech{min-width:85px;width:85px;}
+.veg-table .col-action{min-width:60px;white-space:nowrap;text-align:center;}
+.veg-action-btn{display:inline-flex;align-items:center;justify-content:center;width:24px;height:24px;border:1px solid var(--border);background:#fff;color:var(--text-secondary);border-radius:var(--radius-sm);cursor:pointer;font-size:13px;line-height:1;transition:all .15s;vertical-align:middle;margin:0 1px;}
+.veg-action-btn:hover{color:var(--primary);border-color:var(--primary);}
+.veg-action-btn--add{color:var(--primary);border-color:var(--primary);}
+.veg-action-btn--add:hover{background:var(--primary-light);}
+.veg-action-btn--del:hover{color:var(--danger);border-color:var(--danger);background:#FFF1F0;}
+.veg-action-btn[disabled]{opacity:0.35;cursor:not-allowed;pointer-events:none;}
+.veg-table .veg-empty-row td{padding:24px;text-align:center;color:var(--text-placeholder);}
 /* 复制食材弹窗 */
 .copy-overlay{display:none;position:fixed;inset:0;background:rgba(0,0,0,0.45);z-index:300;align-items:center;justify-content:center;}
 .copy-overlay.show{display:flex;}
@@ -282,7 +309,7 @@ var STEP_HTML = [
   `<div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:16px;"><div class="form-card__title" style="margin-bottom:0;padding-bottom:0;border-bottom:none;flex-shrink:0;">📋 基本信息</div><button type="button" class="btn btn-default" onclick="openCopyDialog()" style="height:32px;font-size:var(--font-xs);">📋 从已有食材复制</button></div>
 <div class="form-grid">
   <div class="form-group"><label class="form-label">食物编码<span class="required">*</span></label><input class="form-input" id="foodCode" placeholder="系统自动生成（分类+自编码）" readonly style="background:#f5f5f5;cursor:not-allowed;"></div>
-  <div class="form-group"><label class="form-label">食物名称<span class="required">*</span></label><input class="form-input" id="foodName" placeholder="请输入食物名称"></div>
+  <div class="form-group"><label class="form-label">食物名称<span class="required">*</span></label><input class="form-input" id="foodName" placeholder="请输入食物名称" oninput="onFoodNameInput()"></div>
   <div class="form-group"><label class="form-label">别名</label><input class="form-input" id="foodAlias" placeholder="请输入别名"></div>
   <div class="form-group"><label class="form-label">食物分类<span class="required">*</span></label>
     <div class="cascade-picker" id="addCategoryPicker">
@@ -302,9 +329,9 @@ var STEP_HTML = [
       <span style="position:absolute;right:12px;top:0;bottom:0;display:flex;align-items:center;color:var(--text-placeholder);font-size:var(--font-sm);pointer-events:none;">元/100g</span>
     </div>
   </div>
-  <div class="form-group full"><label class="form-label">净菜类型</label>
-    <div class="dynamic-rows" id="vegTypeRows"></div>
-    <button type="button" class="dynamic-row-add" onclick="addVegType()">+ 添加净菜类型</button>
+  <div class="form-group full">
+    <div id="vegTypeRows"></div>
+    <button type="button" class="dynamic-row-add" onclick="addVegType()">+ 添加净菜</button>
   </div>
   <div class="form-group"><label class="form-label">食材图片</label>
     <div class="upload-box" id="uploadBox" onclick="triggerUpload()">
@@ -517,76 +544,243 @@ function submitForm(){
   window.location.href='din-ingredient.html';
 }
 
-/* === 净菜类型动态行 === */
+/* === 净菜类型动态行(扁平结构 + rowspan 合并) === */
 /* 切配形状选项(对应字典 spec_cut_shape) */
-var VEG_SHAPE_OPTIONS=['','丝(细)','丝(中)','丝(粗)','片(薄)','片(中)','片(厚)','丁(小)','丁(中)','丁(大)','块(小)','块(中)','块(大)','段','条','泥','末'];
+var VEG_SHAPE_OPTIONS=['','丝','片','块','沫','泥','原状'];
 /* 刀工选项 */
 var VEG_TECH_OPTIONS=['','平刀','斜刀','直刀','花刀','其他'];
+/* 净菜组 ID 自增 */
+var vegGroupSeq = 1;
+
+/* 取当前食物名称（从表单中读取） */
+function getFoodName(){var el=document.getElementById('foodName');return el?el.value.trim():'';}
+/* 由食物名称+切配形状拼接净菜标准名 */
+function buildVegName(shape){
+  var fn=getFoodName();
+  if(!fn||!shape) return '';
+  return fn+'-'+shape;
+}
+/* 生成新净菜组 ID */
+function genGroupId(){return 'g'+(vegGroupSeq++);}
+
 function renderVegTypes(){
   var container = document.getElementById('vegTypeRows');
   if(!container) return;
-  if(vegTypes.length===0) vegTypes.push({name:'',yieldRate:''});
-  var html = '';
-  vegTypes.forEach(function(item,i){
-    var cs = item.cutSpec || {};
-    html += '<div class="dynamic-row">';
-    html += '<input class="form-input veg-name" placeholder="净菜名称" value="'+(item.name||'')+'" style="flex:1.2">';
-    html += '<input class="form-input veg-yield" type="number" min="0" max="100" placeholder="出净率(%)" value="'+(item.yieldRate||'')+'" style="flex:0.6">';
-    html += '<select class="form-select veg-shape" style="flex:0.9">';
-    VEG_SHAPE_OPTIONS.forEach(function(opt){
-      var sel = (opt && cs.shape===opt) ? ' selected' : '';
-      html += '<option value="'+opt+'"'+sel+'>'+(opt||'切配形状')+'</option>';
-    });
-    html += '</select>';
-    html += '<input class="form-input veg-length" type="number" min="0" step="0.1" placeholder="长(mm)" value="'+(cs.length||'')+'" style="flex:0.5">';
-    html += '<input class="form-input veg-width" type="number" min="0" step="0.1" placeholder="宽(mm)" value="'+(cs.width||'')+'" style="flex:0.5">';
-    html += '<input class="form-input veg-height" type="number" min="0" step="0.1" placeholder="高(mm)" value="'+(cs.height||'')+'" style="flex:0.5">';
-    html += '<select class="form-select veg-technique" style="flex:0.6">';
-    VEG_TECH_OPTIONS.forEach(function(opt){
-      var sel = (opt && cs.technique===opt) ? ' selected' : '';
-      html += '<option value="'+opt+'"'+sel+'>'+(opt||'刀工')+'</option>';
-    });
-    html += '</select>';
-    html += '<button type="button" class="dynamic-row__del" onclick="removeVegType('+i+')" title="删除">×</button>';
-    html += '</div>';
+  if(vegTypes.length===0){
+    vegTypes.push({groupId:genGroupId(),alias:'',specAlias:'',yieldRate:'',cutSpec:{}});
+  }
+  /* 按 groupId 分组(保持原顺序) */
+  var groupKeys = [];
+  var groupMap = {};
+  vegTypes.forEach(function(item){
+    var key = item.groupId;
+    if(!groupMap[key]){
+      groupKeys.push(key);
+      groupMap[key] = [];
+    }
+    groupMap[key].push(item);
   });
+
+  var html = '<div class="veg-table-wrap"><table class="veg-table"><thead><tr>';
+  html += '<th class="col-name">净菜标准名</th>';
+  html += '<th class="col-alias">净菜俗名</th>';
+  html += '<th class="col-yield">出净率(%)</th>';
+  html += '<th class="col-shape">切配形状</th>';
+  html += '<th class="col-spec-alias">规格别名</th>';
+  html += '<th class="col-dim">长(mm)</th>';
+  html += '<th class="col-dim">宽(mm)</th>';
+  html += '<th class="col-dim">高(mm)</th>';
+  html += '<th class="col-tech">刀工</th>';
+  html += '<th class="col-action">操作</th>';
+  html += '</tr></thead><tbody>';
+
+  if(groupKeys.length===0){
+    html += '<tr class="veg-empty-row"><td colspan="10">暂无净菜类型，点击下方"+ 添加净菜"按钮新增</td></tr>';
+  }
+
+  groupKeys.forEach(function(key){
+    var items = groupMap[key];
+    var first = items[0];
+    var rs = items.length; /* rowspan */
+    /* 净菜标准名 = 食物名称 + 切配形状(取自 master 的 cutSpec.shape) */
+    var firstCs = first.cutSpec||{};
+    var nameText = buildVegName(firstCs.shape);
+    items.forEach(function(item,idx){
+      var isMaster = idx===0;
+      var rowClass = 'veg-row' + (isMaster?'':' veg-row--spec');
+      html += '<tr class="'+rowClass+'" data-row-id="'+idx+'" data-group-id="'+key+'">';
+      if(isMaster){
+        /* 合并列1:净菜标准名(只读显示) */
+        var nameClass = nameText ? 'veg-name' : 'veg-name veg-name--placeholder';
+        html += '<td class="veg-cell--merged col-name" rowspan="'+rs+'">';
+        html += '<span class="'+nameClass+'">'+(nameText||'—')+'</span>';
+        html += '</td>';
+        /* 合并列2:净菜俗名 */
+        html += '<td class="veg-cell--merged col-alias" rowspan="'+rs+'"><input class="form-input veg-group-alias" value="'+(first.alias||'')+'" placeholder="如：细丝组" oninput="onGroupField(\''+key+'\',\'alias\',this.value)"></td>';
+        /* 合并列3:出净率(整组共享,跟 master 一致) */
+        html += '<td class="veg-cell--merged col-yield" rowspan="'+rs+'"><input class="form-input veg-yield" type="number" min="0" max="100" value="'+(first.yieldRate||'')+'" oninput="onGroupField(\''+key+'\',\'yieldRate\',this.value)"></td>';
+        /* 合并列4:切配形状(整组共享,驱动净菜标准名拼接) */
+        html += '<td class="veg-cell--merged col-shape" rowspan="'+rs+'"><select class="form-select veg-shape" onchange="onGroupShapeChange(\''+key+'\',this.value)">';
+        VEG_SHAPE_OPTIONS.forEach(function(opt){
+          var sel = (opt && firstCs.shape===opt) ? ' selected' : '';
+          html += '<option value="'+opt+'"'+sel+'>'+(opt||'请选择')+'</option>';
+        });
+        html += '</select></td>';
+      }
+      /* 各规格独立列:规格别名/长宽高/刀工 */
+      html += '<td class="col-spec-alias"><input class="form-input veg-spec-alias" value="'+(item.specAlias||'')+'" placeholder="如：细丝" oninput="onRowField('+idx+',\''+key+'\',\'specAlias\',this.value)"></td>';
+      var cs = item.cutSpec||{};
+      html += '<td class="col-dim"><input class="form-input veg-dim" type="number" min="0" step="0.1" value="'+(cs.length||'')+'" oninput="onRowField('+idx+',\''+key+'\',\'length\',this.value)"></td>';
+      html += '<td class="col-dim"><input class="form-input veg-dim" type="number" min="0" step="0.1" value="'+(cs.width||'')+'" oninput="onRowField('+idx+',\''+key+'\',\'width\',this.value)"></td>';
+      html += '<td class="col-dim"><input class="form-input veg-dim" type="number" min="0" step="0.1" value="'+(cs.height||'')+'" oninput="onRowField('+idx+',\''+key+'\',\'height\',this.value)"></td>';
+      html += '<td class="col-tech"><select class="form-select veg-tech" onchange="onRowField('+idx+',\''+key+'\',\'technique\',this.value)">';
+      VEG_TECH_OPTIONS.forEach(function(opt){
+        var sel = (opt && cs.technique===opt) ? ' selected' : '';
+        html += '<option value="'+opt+'"'+sel+'>'+(opt||'请选择')+'</option>';
+      });
+      html += '</select></td>';
+      /* 操作列:master 行有 +规格 和 ×删除; 子规格行只有 ×删除 */
+      html += '<td class="col-action">';
+      if(isMaster){
+        html += '<button type="button" class="veg-action-btn veg-action-btn--add" onclick="addVegSpec(\''+key+'\')" title="新增一行规格">＋</button>';
+      }
+      html += '<button type="button" class="veg-action-btn veg-action-btn--del" onclick="removeVegRow('+idx+',\''+key+'\')" title="删除该行">×</button>';
+      html += '</td>';
+      html += '</tr>';
+    });
+  });
+
+  html += '</tbody></table></div>';
   container.innerHTML = html;
 }
+
+/* 添加净菜(新组) */
 function addVegType(){
   saveVegTypes();
-  vegTypes.push({name:'',yieldRate:''});
+  vegTypes.push({groupId:genGroupId(),alias:'',specAlias:'',yieldRate:'',cutSpec:{}});
   renderVegTypes();
 }
-function removeVegType(idx){
+/* 在指定净菜组下追加一行规格(共用 groupId) */
+function addVegSpec(groupId){
   saveVegTypes();
-  vegTypes.splice(idx,1);
-  if(vegTypes.length===0) vegTypes.push({name:'',yieldRate:''});
+  var master = vegTypes.find(function(it){return it.groupId===groupId;});
+  var newItem = {
+    groupId:groupId,
+    alias:'',
+    specAlias:'',
+    yieldRate:'',
+    cutSpec:{}
+  };
+  /* 紧跟该组最后一项插入 */
+  var lastIdx = -1;
+  for(var i=vegTypes.length-1;i>=0;i--){
+    if(vegTypes[i].groupId===groupId){lastIdx=i;break;}
+  }
+  if(lastIdx>=0) vegTypes.splice(lastIdx+1,0,newItem);
+  else vegTypes.push(newItem);
   renderVegTypes();
 }
-function saveVegTypes(){
-  var rows = document.querySelectorAll('#vegTypeRows .dynamic-row');
-  vegTypes = [];
-  rows.forEach(function(row){
-    var name = row.querySelector('.veg-name');
-    var yieldRate = row.querySelector('.veg-yield');
-    if(!name || !yieldRate) return;
-    var shape = row.querySelector('.veg-shape');
-    var length = row.querySelector('.veg-length');
-    var width = row.querySelector('.veg-width');
-    var height = row.querySelector('.veg-height');
-    var technique = row.querySelector('.veg-technique');
-    var item = {name:name.value, yieldRate:yieldRate.value};
-    /* 任一切配字段有值则组装 cutSpec 对象 */
-    if((shape && shape.value) || (length && length.value) || (width && width.value) || (height && height.value) || (technique && technique.value)){
-      item.cutSpec = {
-        shape: shape ? shape.value : '',
-        length: length ? length.value : '',
-        width: width ? width.value : '',
-        height: height ? height.value : '',
-        technique: technique ? technique.value : ''
-      };
+/* 删除单行:同组最后一行则整组消失 */
+function removeVegRow(idx,groupId){
+  saveVegTypes();
+  /* 找到 DOM 中第 idx 行对应的 vegTypes 项(同组内的相对索引) */
+  var sameGroupItems = vegTypes.filter(function(it){return it.groupId===groupId;});
+  if(idx>=sameGroupItems.length) return;
+  var itemToRemove = sameGroupItems[idx];
+  var pos = vegTypes.indexOf(itemToRemove);
+  if(pos<0) return;
+  vegTypes.splice(pos,1);
+  if(vegTypes.length===0){
+    vegTypes.push({groupId:genGroupId(),shapeCat:'',alias:'',specAlias:'',yieldRate:'',cutSpec:{}});
+  }
+  renderVegTypes();
+}
+
+/* 切配形状变化:同步更新整组 cutSpec.shape(影响净菜标准名拼接) */
+function onGroupShapeChange(groupId,val){
+  vegTypes.forEach(function(it){
+    if(it.groupId===groupId){
+      if(!it.cutSpec) it.cutSpec = {};
+      it.cutSpec.shape = val;
     }
-    vegTypes.push(item);
+  });
+  /* 仅刷新净菜标准名文本,避免重绘输入框丢焦点 */
+  var masterName = document.querySelector('tr[data-group-id="'+groupId+'"][data-row-id="0"] td.col-name .veg-name');
+  if(masterName){
+    var txt = buildVegName(val);
+    masterName.textContent = txt || '—';
+    masterName.className = txt ? 'veg-name' : 'veg-name veg-name--placeholder';
+  }
+}
+/* 净菜组共享字段:净菜俗名/出净率 */
+function onGroupField(groupId,field,val){
+  vegTypes.forEach(function(it){
+    if(it.groupId===groupId) it[field] = val;
+  });
+}
+/* 单行字段实时保存(仅规格独立字段:specAlias/长宽高/刀工) */
+function onRowField(idx,groupId,field,val){
+  var sameGroupItems = vegTypes.filter(function(it){return it.groupId===groupId;});
+  if(idx>=sameGroupItems.length) return;
+  var item = sameGroupItems[idx];
+  if(field==='specAlias'){
+    item[field] = val;
+  } else if(field==='length' || field==='width' || field==='height' || field==='technique'){
+    if(!item.cutSpec) item.cutSpec = {};
+    item.cutSpec[field] = val;
+  }
+}
+
+/* 切换步骤时收集 DOM → vegTypes */
+function saveVegTypes(){
+  var newVegs = [];
+  var rows = document.querySelectorAll('#vegTypeRows .veg-table tbody tr.veg-row');
+  /* 按 groupId 缓存 master 的共享字段(净菜俗名/出净率/切配形状) */
+  var groupShared = {};
+  rows.forEach(function(row){
+    var groupId = row.getAttribute('data-group-id');
+    var rowIdx = parseInt(row.getAttribute('data-row-id'),10);
+    var isMaster = rowIdx===0;
+    var item = {groupId:groupId};
+    if(isMaster){
+      var aliasInp = row.querySelector('.veg-group-alias');
+      var yieldInp = row.querySelector('.veg-yield');
+      var shapeSel = row.querySelector('.veg-shape');
+      item.alias = aliasInp ? aliasInp.value : '';
+      item.yieldRate = yieldInp ? yieldInp.value : '';
+      var shape = shapeSel ? shapeSel.value : '';
+      item.cutSpec = {shape:shape};
+      groupShared[groupId] = {alias:item.alias, yieldRate:item.yieldRate, shape:shape};
+    } else {
+      /* 子规格行:共享字段从 master 拷贝 */
+      var shared = groupShared[groupId] || {alias:'',yieldRate:'',shape:''};
+      item.alias = shared.alias;
+      item.yieldRate = shared.yieldRate;
+      item.cutSpec = {shape:shared.shape};
+    }
+    item.specAlias = row.querySelector('.veg-spec-alias') ? row.querySelector('.veg-spec-alias').value : '';
+    var dims = row.querySelectorAll('.veg-dim');
+    var techSel = row.querySelector('.veg-tech');
+    item.cutSpec.length = dims[0] ? dims[0].value : '';
+    item.cutSpec.width = dims[1] ? dims[1].value : '';
+    item.cutSpec.height = dims[2] ? dims[2].value : '';
+    item.cutSpec.technique = techSel ? techSel.value : '';
+    newVegs.push(item);
+  });
+  vegTypes = newVegs.length>0 ? newVegs : [{groupId:genGroupId(),alias:'',specAlias:'',yieldRate:'',cutSpec:{}}];
+}
+
+/* 食物名称输入时实时刷新所有净菜标准名 */
+function onFoodNameInput(){
+  document.querySelectorAll('#vegTypeRows .veg-table tbody tr[data-row-id="0"] td.col-name .veg-name').forEach(function(el){
+    /* 找到同组 master 的切配形状 */
+    var row = el.closest('tr');
+    var groupId = row ? row.getAttribute('data-group-id') : '';
+    var master = vegTypes.find(function(it){return it.groupId===groupId;});
+    var shape = (master && master.cutSpec && master.cutSpec.shape) ? master.cutSpec.shape : '';
+    var txt = buildVegName(shape);
+    el.textContent = txt || '—';
+    el.className = txt ? 'veg-name' : 'veg-name veg-name--placeholder';
   });
 }
 
@@ -733,7 +927,10 @@ if(initTab >= 0 && initTab < totalSteps) currentStep = initTab;
 
 /* 编辑模式 mock 数据（与 din-ingredient.html 的 FOODS 结构一致） */
 var EDIT_FOODS = {
-  '0101001':{name:'粳米(生)',code:'0101001',alias:'大米',firstClass:'谷薯类',secondClass:'稻米',edible:'97',waterRate:'13.3',dataSource:'0',basePrice:'3.5',vegTypes:[{name:'洗净米',yieldRate:'97'},{name:'免淘米',yieldRate:'95'}],
+  '0101001':{name:'粳米(生)',code:'0101001',alias:'大米',firstClass:'谷薯类',secondClass:'稻米',edible:'97',waterRate:'13.3',dataSource:'0',basePrice:'3.5',vegTypes:[
+    {groupId:'g1',alias:'普洗组',specAlias:'洗净米',yieldRate:'97',cutSpec:{shape:'原状'}},
+    {groupId:'g1',alias:'普洗组',specAlias:'免淘米',yieldRate:'95',cutSpec:{shape:'原状'}}
+  ],
     crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'适量'}],
     nutri:{calorie:346,protein:7.4,fat:0.6,carbohydrate:77.2,dietary_fiber:0.7,
       vitamin_a:0,vitamin_b1:0.11,vitamin_b2:0.02,vitamin_b6:0.12,vitamin_b12:0,vitamin_c:0,vitamin_d:0,vitamin_e:1.01,vitamin_k:0,niacin:1.6,folic_acid:3.8,biotin:0,pantothenic_acid:0.6,total_choline:0,
@@ -744,7 +941,11 @@ var EDIT_FOODS = {
     color:{main:'乳白色',grade:'优',desc:'色泽洁白，半透明，颗粒饱满',cause:'碾磨去皮后淀粉体暴露'},
     taste:{main:'淡味',sub:'微涩',intensity:'弱',desc:'生米无明显味道，煮熟后清香'},
     texture:{main:'软糯',chew:'易',digest:'中',desc:'米粒饱满，质地坚硬，煮后软糯',cook:'水米比1:1.2，浸泡30分钟口感更佳'}},
-  '0301001':{name:'猪里脊(生)',code:'0301001',alias:'里脊肉',firstClass:'畜禽肉类',secondClass:'猪肉',edible:'100',waterRate:'73.3',dataSource:'0',basePrice:'18.8',vegTypes:[{name:'去筋膜',yieldRate:'92'},{name:'切丁',yieldRate:'88',cutSpec:{shape:'丁(中)',length:10,width:10,height:10,technique:'直刀'}}],
+  '0301001':{name:'猪里脊(生)',code:'0301001',alias:'里脊肉',firstClass:'畜禽肉类',secondClass:'猪肉',edible:'100',waterRate:'73.3',dataSource:'0',basePrice:'18.8',vegTypes:[
+    {groupId:'g1',alias:'丝类组',specAlias:'细丝',yieldRate:'92',cutSpec:{shape:'丝',length:10,width:1,height:1,technique:'平刀'}},
+    {groupId:'g1',alias:'丝类组',specAlias:'粗丝',yieldRate:'90',cutSpec:{shape:'丝',length:10,width:2,height:2,technique:'直刀'}},
+    {groupId:'g2',alias:'块类组',specAlias:'方块',yieldRate:'88',cutSpec:{shape:'块',length:15,width:15,height:15,technique:'直刀'}}
+  ],
     crowd:[{name:'成人',level:'推荐'},{name:'儿童',level:'推荐'},{name:'高血脂人群',level:'适量'}],
     nutri:{calorie:143,protein:20.2,fat:7.1,carbohydrate:0.7,dietary_fiber:0,
       vitamin_a:6,vitamin_b1:0.54,vitamin_b2:0.1,vitamin_b6:0.27,vitamin_b12:0.6,vitamin_c:0,vitamin_d:0.2,vitamin_e:0.34,vitamin_k:0,niacin:5.3,folic_acid:5,biotin:0,pantothenic_acid:0.5,total_choline:0,
@@ -766,7 +967,10 @@ var EDIT_FOODS = {
     color:{main:'金黄色',grade:'优',desc:'蛋壳浅褐，蛋黄金黄饱满',cause:'蛋黄富含叶黄素和类胡萝卜素'},
     taste:{main:'鲜味',sub:'蛋香',intensity:'中',desc:'蛋白柔和，蛋黄浓郁'},
     texture:{main:'嫩滑',chew:'易',digest:'易',desc:'水煮蛋弹嫩，炒蛋软嫩，蒸蛋细腻',cook:'蒸蛋口感最软，适合各年龄段'}},
-  '0201001':{name:'菠菜(生)',code:'0201001',alias:'波斯菜',firstClass:'蔬菜类',secondClass:'叶菜类',edible:'89',waterRate:'91.2',dataSource:'0',basePrice:'4.2',vegTypes:[{name:'去根',yieldRate:'90'},{name:'切段',yieldRate:'88',cutSpec:{shape:'段',length:50,width:'',height:'',technique:'直刀'}}],
+  '0201001':{name:'菠菜(生)',code:'0201001',alias:'波斯菜',firstClass:'蔬菜类',secondClass:'叶菜类',edible:'89',waterRate:'91.2',dataSource:'0',basePrice:'4.2',vegTypes:[
+    {groupId:'g1',alias:'段类组',specAlias:'净菜',yieldRate:'90',cutSpec:{shape:'原状'}},
+    {groupId:'g1',alias:'段类组',specAlias:'寸段',yieldRate:'88',cutSpec:{shape:'原状',length:50,width:'',height:'',technique:'直刀'}}
+  ],
     crowd:[{name:'全人群',level:'推荐'},{name:'肾结石人群',level:'慎食'}],
     nutri:{calorie:28,protein:2.6,fat:0.3,carbohydrate:4.5,dietary_fiber:1.7,
       vitamin_a:487,vitamin_b1:0.04,vitamin_b2:0.11,vitamin_b6:0.1,vitamin_b12:0,vitamin_c:32,vitamin_d:0,vitamin_e:1.74,vitamin_k:0,niacin:0.6,folic_acid:110,biotin:0,pantothenic_acid:0.2,total_choline:0,
@@ -777,7 +981,10 @@ var EDIT_FOODS = {
     color:{main:'深绿色',grade:'优',desc:'叶片翠绿有光泽，根部紫红',cause:'叶绿素含量高'},
     taste:{main:'清甜',sub:'微涩',intensity:'弱',desc:'清爽微甜带涩'},
     texture:{main:'嫩脆',chew:'易',digest:'易',desc:'叶片嫩滑，茎部脆嫩',cook:'焯水去草酸后口感最佳'}},
-  '0601001':{name:'豆腐(北)',code:'0601001',alias:'北豆腐',firstClass:'豆及豆制品',secondClass:'豆制品',edible:'100',waterRate:'82.8',dataSource:'1',basePrice:'5.0',vegTypes:[{name:'切块',yieldRate:'96',cutSpec:{shape:'块(中)',length:30,width:30,height:20,technique:'直刀'}},{name:'切丁',yieldRate:'94',cutSpec:{shape:'丁(中)',length:10,width:10,height:10,technique:'直刀'}}],
+  '0601001':{name:'豆腐(北)',code:'0601001',alias:'北豆腐',firstClass:'豆及豆制品',secondClass:'豆制品',edible:'100',waterRate:'82.8',dataSource:'1',basePrice:'5.0',vegTypes:[
+    {groupId:'g1',alias:'块类组',specAlias:'大方块',yieldRate:'96',cutSpec:{shape:'块',length:30,width:30,height:20,technique:'直刀'}},
+    {groupId:'g2',alias:'片类组',specAlias:'薄片',yieldRate:'94',cutSpec:{shape:'片',length:10,width:10,height:3,technique:'平刀'}}
+  ],
     crowd:[{name:'全人群',level:'推荐'},{name:'高血压人群',level:'推荐'},{name:'痛风人群',level:'适量'},{name:'老年人',level:'推荐'},{name:'术后恢复',level:'推荐'}],
     nutri:{calorie:98,protein:12.2,fat:4.8,carbohydrate:1.5,dietary_fiber:0.4,
       vitamin_a:0,vitamin_b1:0.07,vitamin_b2:0.04,vitamin_b6:0.05,vitamin_b12:0,vitamin_c:0,vitamin_d:0,vitamin_e:2.71,vitamin_k:0,niacin:0.1,folic_acid:37,biotin:0,pantothenic_acid:0.1,total_choline:0,
diff --git a/web-admin/nutrition/din-ingredient.html b/web-admin/nutrition/din-ingredient.html
index 3dac6c6..1958597 100644
--- a/web-admin/nutrition/din-ingredient.html
+++ b/web-admin/nutrition/din-ingredient.html
@@ -122,9 +122,13 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 /* 净菜类型小表格 */
 .veg-type-table{width:100%;border-collapse:collapse;border:1px solid #F0F0F0;border-radius:var(--radius-sm);overflow:hidden;margin-top:4px;}
 .veg-type-table th{background:#FAFAFA;font-size:var(--font-xs);color:var(--text-secondary);font-weight:500;text-align:left;padding:8px 12px;border-bottom:1px solid #F0F0F0;}
-.veg-type-table td{font-size:var(--font-sm);color:var(--text-primary);padding:8px 12px;border-bottom:1px solid #F5F5F5;}
+.veg-type-table td{font-size:var(--font-sm);color:var(--text-primary);padding:8px 12px;border-bottom:1px solid #F5F5F5;vertical-align:middle;}
 .veg-type-table tr:last-child td{border-bottom:none;}
 .veg-type-table th+th,.veg-type-table td+td{border-left:1px solid #F0F0F0;}
+.veg-type-table .veg-type__name{font-weight:500;color:var(--primary);background:#F8FBFF;}
+.veg-type-table .veg-type__groupalias{color:var(--text-secondary);}
+.veg-type-table .veg-type__specalias{color:var(--text-primary);}
+.veg-type-table .veg-type__divider td{border-top:2px solid #E8E8E8;}
 /* 级联选择器 */
 .cascade-picker{position:relative;flex:1;}
 .cascade-trigger{height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 28px 0 10px;font-size:var(--font-xs);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 8px center;cursor:pointer;display:flex;align-items:center;white-space:nowrap;color:var(--text-placeholder);width:100%;}
@@ -177,6 +181,38 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .status-toggle.active .status-toggle__switch::after{transform:translateX(16px);}
 .status-toggle__label{font-size:var(--font-xs);color:var(--text-placeholder);}
 .status-toggle.active .status-toggle__label{color:var(--success);}
+
+/* 操作历史 */
+.history-filter{display:flex;gap:8px;margin-bottom:16px;flex-wrap:wrap;}
+.history-filter select,.history-filter input[type="text"]{height:32px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 28px 0 10px;font-size:var(--font-xs);outline: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 8px center;appearance:none;cursor:pointer;}
+.history-filter select:focus,.history-filter input[type="text"]:focus{border-color:var(--primary);}
+.history-filter input[type="text"]{padding-right:10px;background:#fff;appearance:auto;cursor:text;}
+.history-filter .btn{height:32px;font-size:var(--font-xs);padding:0 12px;}
+/* 时间轴 */
+.history-timeline{position:relative;padding-left:20px;}
+.history-timeline::before{content:'';position:absolute;left:5px;top:6px;bottom:6px;width:2px;background:#E8E8E8;}
+.history-item{position:relative;padding:0 0 18px 24px;}
+.history-item:last-child{padding-bottom:0;}
+.history-item::before{content:'';position:absolute;left:-19px;top:4px;width:12px;height:12px;border-radius:50%;background:#fff;border:2px solid var(--primary);box-shadow:0 0 0 3px #E6F7FF;}
+.history-item--create::before{border-color:var(--success);box-shadow:0 0 0 3px #F6FFED;}
+.history-item--edit::before{border-color:var(--primary);box-shadow:0 0 0 3px #E6F7FF;}
+.history-item--disable::before{border-color:var(--text-placeholder);box-shadow:0 0 0 3px #F5F5F5;}
+.history-item--price::before{border-color:var(--warning);box-shadow:0 0 0 3px #FFF7E6;}
+.history-item--delete::before{border-color:var(--danger);box-shadow:0 0 0 3px #FFF1F0;}
+.history-item--restore::before{border-color:#722ED1;box-shadow:0 0 0 3px #F9F0FF;}
+.history-card{background:#FAFBFC;border:1px solid #F0F0F0;border-radius:var(--radius-sm);padding:12px 16px;}
+.history-card__head{display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin-bottom:6px;}
+.history-card__time{font-size:var(--font-xs);color:var(--text-placeholder);margin-left:auto;}
+.history-card__op{font-size:var(--font-sm);font-weight:500;color:var(--text-primary);}
+.history-card__user{font-size:var(--font-xs);color:var(--text-secondary);display:flex;align-items:center;gap:4px;}
+.history-card__summary{font-size:var(--font-sm);color:var(--text-secondary);line-height:1.6;margin-top:4px;}
+.history-card__changes{margin-top:8px;background:#fff;border:1px solid #F0F0F0;border-radius:var(--radius-sm);overflow:hidden;}
+.history-change{display:grid;grid-template-columns:120px 1fr 1fr;align-items:center;font-size:var(--font-xs);border-bottom:1px solid #F5F5F5;}
+.history-change:last-child{border-bottom:none;}
+.history-change__field{padding:6px 12px;color:var(--text-secondary);background:#FAFAFA;border-right:1px solid #F0F0F0;}
+.history-change__old{padding:6px 12px;color:var(--text-placeholder);text-decoration:line-through;border-right:1px dashed #E8E8E8;}
+.history-change__new{padding:6px 12px;color:var(--text-primary);font-weight:500;}
+.history-empty{text-align:center;padding:40px 0;color:var(--text-placeholder);font-size:var(--font-sm);}
 </style>
 </head>
 <body>
@@ -346,6 +382,7 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
           <div class="detail-tab" onclick="switchDetailTab(2)">👅 味道档案</div>
           <div class="detail-tab" onclick="switchDetailTab(3)">🫦 口感档案</div>
           <div class="detail-tab" onclick="switchDetailTab(4)">🎨 色泽档案</div>
+          <div class="detail-tab" onclick="switchDetailTab(5)">🕘 操作历史</div>
         </div>
       </div>
       <div class="panel-right__body" id="detail-body">
@@ -370,10 +407,24 @@ function formatCutSpec(cut){
   var result = dimStr + shapeStr + techStr;
   return result || '—';
 }
+/* 净菜类型列表专用:切配规格剥离 shape(丝/片/丁/块),因同表已有独立「切配形状」列,避免冗余 */
+function formatCutSpecNoShape(cut){
+  if(!cut) return '—';
+  if(typeof cut === 'string') return cut;
+  var dims = [cut.length, cut.width, cut.height].filter(function(v){
+    return v !== undefined && v !== null && v !== '' && !isNaN(v);
+  });
+  var dimStr = dims.length ? dims.join('×') + 'mm' : '';
+  var techStr = cut.technique ? ' · ' + cut.technique : '';
+  return (dimStr || techStr) ? (dimStr + techStr) : '—';
+}
 
 // 食物数据（对齐 yx_mater_base_material 表结构）
 const FOODS = [
-  {name:'粳米(生)',code:'0101001',alias:'大米',firstClass:'谷薯类',secondClass:'稻米',icon:'🌾',edible:'100',waterRate:'13.3',dataSource:0,basePrice:'3.5',vegTypes:[{name:'洗净米',yieldRate:'97'},{name:'免淘米',yieldRate:'95'}],
+  {name:'粳米(生)',code:'0101001',alias:'大米',firstClass:'谷薯类',secondClass:'稻米',icon:'🌾',edible:'100',waterRate:'13.3',dataSource:0,basePrice:'3.5',vegTypes:[
+    {groupId:'g1',alias:'普洗组',specAlias:'洗净米',yieldRate:'97',cutSpec:{shape:'原状'}},
+    {groupId:'g1',alias:'普洗组',specAlias:'免淘米',yieldRate:'95',cutSpec:{shape:'原状'}}
+  ],
    nutri:{calorie:346,protein:7.4,fat:0.8,carbohydrate:77.2,dietary_fiber:0.6,
      vitamin_a:0,vitamin_b1:0.16,vitamin_b2:0.08,vitamin_b6:0.16,vitamin_b12:0,vitamin_c:0,vitamin_d:0,vitamin_e:0.46,vitamin_k:0,niacin:1.9,folic_acid:3.8,biotin:0,pantothenic_acid:0.6,total_choline:0,
      ca:13,phosphorus:110,kalium:103,mg:34,na:3.8,fe:2.3,zn:1.7,se:2.23,cu:0.3,mn:1.29,iodine:0,
@@ -382,8 +433,20 @@ const FOODS = [
      gi:83,purine:18.4,guanine:0,adenine:0,hypoxanthine:0,xanthine:0},
    color:{main:'白色',desc:'乳白色，半透明，颗粒饱满',cause:'淀粉主体，含少量蛋白质',grade:'优',crowd:[{name:'成人',level:'推荐'},{name:'老年人',level:'推荐'},{name:'儿童',level:'推荐'}],note:'—'},
    taste:{main:'淡味',sub:'—',intensity:'弱',desc:'清淡，煮熟后微甜，无异味',crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'适量'}],note:'糖尿病人群注意控制量'},
-   texture:{main:'软糯',chew:'易',digest:'易',desc:'煮熟后软糯有嚼劲，易于消化',crowd:[{name:'全人群',level:'推荐'},{name:'老年人',level:'推荐'},{name:'术后恢复',level:'推荐'}],cook:'熬粥质地更软，适合老年人'}},
-  {name:'猪里脊肉',code:'0201001',alias:'里脊',firstClass:'畜禽肉类',secondClass:'猪肉',icon:'🥩',edible:'100',waterRate:'71.4',dataSource:0,basePrice:'18.8',vegTypes:[{name:'肉片',yieldRate:'95',cutSpec:{shape:'片(中)',length:3,width:1,height:5,technique:'平刀'}},{name:'肉丁',yieldRate:'92',cutSpec:{shape:'丁(中)',length:10,width:10,height:10,technique:'直刀'}},{name:'肉块',yieldRate:'97',cutSpec:{shape:'块(中)',length:30,width:30,height:30,technique:'直刀'}}],
+   texture:{main:'软糯',chew:'易',digest:'易',desc:'煮熟后软糯有嚼劲，易于消化',crowd:[{name:'全人群',level:'推荐'},{name:'老年人',level:'推荐'},{name:'术后恢复',level:'推荐'}],cook:'熬粥质地更软，适合老年人'},
+   history:[
+     {type:'新增',title:'创建食材条目',time:'2026-01-12 09:24',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'从系统内置食物成分库导入,初始化基础档案。'},
+     {type:'编辑',title:'补充营养成分数据',time:'2026-02-08 14:10',user:'李建国',role:'营养师',dept:'营养管理部',summary:'完善 53 项营养素中的维生素 K 与生物素字段。',changes:[{field:'维生素K',old:'—',new:'0 μg'},{field:'生物素',old:'—',new:'0 μg'}]},
+     {type:'编辑',title:'调整净菜类型',time:'2026-03-15 10:42',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'新增「免淘米」净菜规格,出净率 95%。',changes:[{field:'净菜类型',old:'1 项(普洗组)',new:'2 项(普洗组/免淘米)'}]},
+     {type:'价格调整',title:'更新基础定价',time:'2026-06-05 16:30',user:'张明',role:'采购员',dept:'采购部',summary:'根据 6 月市场行情调整粳米基础定价。',changes:[{field:'基础定价',old:'3.2 元/100g',new:'3.5 元/100g'}]},
+     {type:'编辑',title:'修订色泽描述',time:'2026-07-21 11:05',user:'李建国',role:'营养师',dept:'营养管理部',summary:'色泽描述语义化,补充感官评级。',changes:[{field:'色泽描述',old:'乳白色,半透明',new:'乳白色，半透明，颗粒饱满'},{field:'感官评级',old:'—',new:'优'}]}
+   ]},
+  {name:'猪里脊肉',code:'0201001',alias:'里脊',firstClass:'畜禽肉类',secondClass:'猪肉',icon:'🥩',edible:'100',waterRate:'71.4',dataSource:0,basePrice:'18.8',vegTypes:[
+    {groupId:'g1',alias:'里脊肉丝',specAlias:'细丝',yieldRate:'92',cutSpec:{shape:'丝',length:10,width:1,height:1,technique:'平刀'}},
+    {groupId:'g1',alias:'里脊肉丝',specAlias:'粗丝',yieldRate:'90',cutSpec:{shape:'丝',length:10,width:2,height:2,technique:'直刀'}},
+    {groupId:'g2',alias:'里脊肉片',specAlias:'薄片',yieldRate:'95',cutSpec:{shape:'片',length:3,width:1,height:5,technique:'平刀'}},
+    {groupId:'g3',alias:'里脊肉块',specAlias:'方块',yieldRate:'92',cutSpec:{shape:'块',length:20,width:20,height:20,technique:'直刀'}}
+  ],
    nutri:{calorie:155,protein:20.2,fat:7.9,carbohydrate:0.7,dietary_fiber:0,
      vitamin_a:6,vitamin_b1:0.54,vitamin_b2:0.1,vitamin_b6:0.33,vitamin_b12:0.6,vitamin_c:0,vitamin_d:0,vitamin_e:0.34,vitamin_k:0,niacin:5.3,folic_acid:3,biotin:0,pantothenic_acid:0.8,total_choline:0,
      ca:6,phosphorus:196,kalium:305,mg:25,na:43.2,fe:1.5,zn:2.3,se:11.97,cu:0.09,mn:0.01,iodine:0,
@@ -392,7 +455,15 @@ const FOODS = [
      gi:0,purine:132.6,guanine:28.5,adenine:42.3,hypoxanthine:51.2,xanthine:10.6},
    color:{main:'粉红色',desc:'鲜嫩粉红，有光泽，纹理细腻',cause:'肌红蛋白含量适中',grade:'优',crowd:[{name:'成人',level:'推荐'},{name:'老年人',level:'适量'}],note:'老年人消化负担稍重'},
    taste:{main:'鲜味',sub:'淡咸',intensity:'中',desc:'肉香鲜美，脂肪少，口感纯正',crowd:[{name:'成人',level:'推荐'},{name:'儿童',level:'推荐'},{name:'肾病人群',level:'慎食'}],note:'肾病人群需控制蛋白质摄入'},
-   texture:{main:'嫩滑',chew:'中',digest:'中',desc:'肌纤维细腻，炒制后滑嫩，少筋膜',crowd:[{name:'成人',level:'推荐'},{name:'老年人',level:'适量'},{name:'儿童',level:'推荐'}],cook:'老年人建议炖煮至软烂，避免大块'}},
+   texture:{main:'嫩滑',chew:'中',digest:'中',desc:'肌纤维细腻，炒制后滑嫩，少筋膜',crowd:[{name:'成人',level:'推荐'},{name:'老年人',level:'适量'},{name:'儿童',level:'推荐'}],cook:'老年人建议炖煮至软烂，避免大块'},
+   history:[
+     {type:'新增',title:'创建食材条目',time:'2026-01-12 09:25',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'从系统内置食物成分库导入,初始化基础档案。'},
+     {type:'编辑',title:'扩充净菜切配规格',time:'2026-02-20 15:48',user:'李建国',role:'营养师',dept:'营养管理部',summary:'新增里脊肉片(薄片)、里脊肉块(方块)两个切配组。',changes:[{field:'净菜类型',old:'2 项(丝类)',new:'4 项(丝/片/块)'}]},
+     {type:'价格调整',title:'更新基础定价',time:'2026-04-02 09:10',user:'张明',role:'采购员',dept:'采购部',summary:'清明后猪肉批发价上调,同步调整食材定价。',changes:[{field:'基础定价',old:'16.5 元/100g',new:'18.8 元/100g'}]},
+     {type:'编辑',title:'修正嘌呤数据',time:'2026-05-18 13:20',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'对齐《中国食物成分表》标准,修正嘌呤相关指标。',changes:[{field:'总嘌呤',old:'118.5 mg',new:'132.6 mg'},{field:'次黄嘌呤',old:'42.1 mg',new:'51.2 mg'}]},
+     {type:'价格调整',title:'更新基础定价',time:'2026-07-09 17:00',user:'张明',role:'采购员',dept:'采购部',summary:'夏季猪肉行情稳定,微调定价。',changes:[{field:'基础定价',old:'19.2 元/100g',new:'18.8 元/100g'}]},
+     {type:'编辑',title:'调整慎食人群说明',time:'2026-08-01 10:15',user:'李建国',role:'营养师',dept:'营养管理部',summary:'细化肾病人群慎食提示。',changes:[{field:'人群备注',old:'肾病患者慎食',new:'肾病人群需控制蛋白质摄入'}]}
+   ]},
   {name:'菠菜',code:'0701001',alias:'菠菜',firstClass:'蔬菜类',secondClass:'叶菜类',icon:'🥬',edible:'89',waterRate:'91.2',dataSource:0,basePrice:'4.2',vegTypes:[],
    nutri:{calorie:24,protein:2.6,fat:0.3,carbohydrate:3.1,dietary_fiber:1.7,
      vitamin_a:487,vitamin_b1:0.04,vitamin_b2:0.11,vitamin_b6:0.1,vitamin_b12:0,vitamin_c:32,vitamin_d:0,vitamin_e:1.74,vitamin_k:483,niacin:0.6,folic_acid:110,biotin:0,pantothenic_acid:0.2,total_choline:0,
@@ -402,7 +473,13 @@ const FOODS = [
      gi:15,purine:23.0,guanine:5.1,adenine:8.2,hypoxanthine:7.3,xanthine:2.4},
    color:{main:'深绿色',desc:'翠绿鲜亮，叶片厚实，颜色均匀',cause:'叶绿素含量丰富，含胡萝卜素',grade:'优',crowd:[{name:'成人',level:'推荐'},{name:'孕妇',level:'推荐'},{name:'贫血人群',level:'推荐'}],note:'富含叶酸，孕妇适宜'},
    taste:{main:'淡味',sub:'微涩',intensity:'弱',desc:'轻微涩感（草酸），汆烫后消失',crowd:[{name:'全人群',level:'推荐'},{name:'肾结石人群',level:'慎食'}],note:'肾结石人群慎食，草酸含量高'},
-   texture:{main:'嫩软',chew:'易',digest:'易',desc:'叶片薄嫩，焯水后柔软，汁水丰富',crowd:[{name:'全人群',level:'推荐'},{name:'老年人',level:'推荐'},{name:'婴幼儿',level:'适量'}],cook:'婴幼儿建议打泥处理，去除纤维'}},
+   texture:{main:'嫩软',chew:'易',digest:'易',desc:'叶片薄嫩，焯水后柔软，汁水丰富',crowd:[{name:'全人群',level:'推荐'},{name:'老年人',level:'推荐'},{name:'婴幼儿',level:'适量'}],cook:'婴幼儿建议打泥处理，去除纤维'},
+   history:[
+     {type:'新增',title:'创建食材条目',time:'2026-01-12 09:26',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'从系统内置食物成分库导入。'},
+     {type:'编辑',title:'完善叶酸数据',time:'2026-03-02 14:30',user:'李建国',role:'营养师',dept:'营养管理部',summary:'对齐最新检测数据,叶酸含量上调。',changes:[{field:'叶酸',old:'87 μg',new:'110 μg'}]},
+     {type:'价格调整',title:'更新基础定价',time:'2026-05-20 11:00',user:'张明',role:'采购员',dept:'采购部',summary:'夏季本地菠菜集中上市,定价下调。',changes:[{field:'基础定价',old:'5.5 元/100g',new:'4.2 元/100g'}]},
+     {type:'编辑',title:'调整慎食提示',time:'2026-06-12 09:40',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'明确草酸含量高的人群风险提示。',changes:[{field:'人群备注',old:'—',new:'肾结石人群慎食，草酸含量高'}]}
+   ]},
   {name:'鸡蛋',code:'0401001',alias:'鸡蛋',firstClass:'蛋类',secondClass:'鸡蛋',icon:'🥚',edible:'88',waterRate:'74.1',dataSource:0,basePrice:'6.5',vegTypes:[],
    nutri:{calorie:144,protein:13.3,fat:8.8,carbohydrate:2.8,dietary_fiber:0,
      vitamin_a:234,vitamin_b1:0.11,vitamin_b2:0.27,vitamin_b6:0.11,vitamin_b12:1.0,vitamin_c:0,vitamin_d:2.2,vitamin_e:1.06,vitamin_k:0,niacin:0.2,folic_acid:70,biotin:20,pantothenic_acid:1.3,total_choline:294,
@@ -412,8 +489,17 @@ const FOODS = [
      gi:0,purine:3.7,guanine:0.8,adenine:1.2,hypoxanthine:1.1,xanthine:0.6},
    color:{main:'米黄色',desc:'蛋黄橙黄，蛋白透明，整体色泽亮',cause:'蛋黄富含类胡萝卜素',grade:'优',crowd:[{name:'成人',level:'推荐'},{name:'儿童',level:'推荐'},{name:'高血脂人群',level:'慎食'}],note:'高血脂人群每日不超过1个'},
    taste:{main:'鲜味',sub:'淡味',intensity:'中',desc:'蛋黄浓郁，蛋白清淡，整体鲜香',crowd:[{name:'成人',level:'推荐'},{name:'儿童',level:'推荐'}],note:'优质蛋白，味道适中'},
-   texture:{main:'嫩滑',chew:'易',digest:'易',desc:'水煮蛋弹嫩，炒蛋软嫩，蒸蛋细腻',crowd:[{name:'全人群',level:'推荐'},{name:'婴幼儿',level:'推荐'},{name:'老年人',level:'推荐'}],cook:'蒸蛋口感最软，适合各年龄段'}},
-  {name:'豆腐(北)',code:'0601001',alias:'北豆腐',firstClass:'豆及豆制品',secondClass:'豆制品',icon:'🧈',edible:'100',waterRate:'82.8',dataSource:1,basePrice:'5.0',vegTypes:[{name:'豆腐块',yieldRate:'98',cutSpec:{shape:'块(中)',length:30,width:30,height:20,technique:'直刀'}}],
+   texture:{main:'嫩滑',chew:'易',digest:'易',desc:'水煮蛋弹嫩，炒蛋软嫩，蒸蛋细腻',crowd:[{name:'全人群',level:'推荐'},{name:'婴幼儿',level:'推荐'},{name:'老年人',level:'推荐'}],cook:'蒸蛋口感最软，适合各年龄段'},
+   history:[
+     {type:'新增',title:'创建食材条目',time:'2026-01-12 09:30',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'从系统内置食物成分库导入。'},
+     {type:'编辑',title:'完善生物素与胆碱',time:'2026-02-25 16:00',user:'李建国',role:'营养师',dept:'营养管理部',summary:'补充生物素、总胆碱等 4 项指标。',changes:[{field:'生物素',old:'—',new:'20 μg'},{field:'总胆碱',old:'—',new:'294 mg'}]},
+     {type:'价格调整',title:'更新基础定价',time:'2026-04-18 10:20',user:'张明',role:'采购员',dept:'采购部',summary:'蛋价季节性波动,微调。',changes:[{field:'基础定价',old:'7.0 元/100g',new:'6.5 元/100g'}]},
+     {type:'编辑',title:'补充碘含量',time:'2026-07-04 14:50',user:'王秀兰',role:'营养师',dept:'营养管理部',summary:'补充碘元素数据,完善矿物质维度。',changes:[{field:'碘',old:'—',new:'27.2 μg'}]}
+   ]},
+  {name:'豆腐(北)',code:'0601001',alias:'北豆腐',firstClass:'豆及豆制品',secondClass:'豆制品',icon:'🧈',edible:'100',waterRate:'82.8',dataSource:1,basePrice:'5.0',vegTypes:[
+    {groupId:'g1',alias:'块类组',specAlias:'大方块',yieldRate:'96',cutSpec:{shape:'块',length:30,width:30,height:20,technique:'直刀'}},
+    {groupId:'g1',alias:'块类组',specAlias:'中方块',yieldRate:'98',cutSpec:{shape:'块',length:20,width:20,height:15,technique:'直刀'}}
+  ],
    nutri:{calorie:98,protein:12.2,fat:4.8,carbohydrate:1.5,dietary_fiber:0.4,
      vitamin_a:0,vitamin_b1:0.07,vitamin_b2:0.04,vitamin_b6:0.05,vitamin_b12:0,vitamin_c:0,vitamin_d:0,vitamin_e:2.71,vitamin_k:0,niacin:0.1,folic_acid:37,biotin:0,pantothenic_acid:0.1,total_choline:0,
      ca:138,phosphorus:97,kalium:106,mg:63,na:7.2,fe:2.5,zn:1.11,se:2.3,cu:0.27,mn:0.47,iodine:0,
@@ -422,7 +508,14 @@ const FOODS = [
      gi:32,purine:68.6,guanine:15.2,adenine:22.1,hypoxanthine:24.8,xanthine:6.5},
    color:{main:'乳白色',desc:'洁白细腻，质地均匀，有光泽',cause:'大豆蛋白凝固，含水量高',grade:'优',crowd:[{name:'全人群',level:'推荐'},{name:'高血压人群',level:'推荐'}],note:'低脂优质蛋白，适合多数人群'},
    taste:{main:'淡味',sub:'豆香',intensity:'弱',desc:'清淡豆香，口感温和，无刺激性',crowd:[{name:'全人群',level:'推荐'},{name:'痛风人群',level:'适量'}],note:'痛风急性期适量，嘌呤含量偏高'},
-   texture:{main:'细腻',chew:'易',digest:'易',desc:'质地细腻滑嫩，入口即化，无渣感',crowd:[{name:'全人群',level:'推荐'},{name:'老年人',level:'推荐'},{name:'术后恢复',level:'推荐'}],cook:'细腻易消化，适合消化功能弱者'}}
+   texture:{main:'细腻',chew:'易',digest:'易',desc:'质地细腻滑嫩，入口即化，无渣感',crowd:[{name:'全人群',level:'推荐'},{name:'老年人',level:'推荐'},{name:'术后恢复',level:'推荐'}],cook:'细腻易消化，适合消化功能弱者'},
+   history:[
+     {type:'新增',title:'手动添加食材条目',time:'2026-02-15 10:00',user:'陈晓燕',role:'营养师',dept:'营养管理部',summary:'手动新增「豆腐(北)」食材档案。'},
+     {type:'编辑',title:'补充净菜规格',time:'2026-03-08 15:20',user:'陈晓燕',role:'营养师',dept:'营养管理部',summary:'新增块类组两个规格(大方块/中方块)。',changes:[{field:'净菜类型',old:'0 项',new:'2 项(大方块/中方块)'}]},
+     {type:'价格调整',title:'更新基础定价',time:'2026-05-12 09:30',user:'张明',role:'采购员',dept:'采购部',summary:'豆制品批发价上调。',changes:[{field:'基础定价',old:'4.5 元/100g',new:'5.0 元/100g'}]},
+     {type:'编辑',title:'补充痛风人群提示',time:'2026-06-28 11:45',user:'李建国',role:'营养师',dept:'营养管理部',summary:'新增痛风急性期适量提示。',changes:[{field:'人群备注',old:'—',new:'痛风急性期适量，嘌呤含量偏高'}]},
+     {type:'编辑',title:'修订矿物质数据',time:'2026-08-05 14:00',user:'陈晓燕',role:'营养师',dept:'营养管理部',summary:'对齐《中国食物成分表》修正钙、镁数据。',changes:[{field:'钙',old:'105 mg',new:'138 mg'},{field:'镁',old:'52 mg',new:'63 mg'}]}
+   ]}
 ];
 
 let currentFood = 1;
@@ -453,13 +546,15 @@ function levelTag(level){
 function renderDetail(){
   const f = FOODS[currentFood];
   const body = document.getElementById('detail-body');
-  const editLink = `<div style="text-align:right;margin-bottom:12px;display:flex;justify-content:flex-end;gap:16px;"><a class="link" href="din-ingredient-add.html?mode=edit&code=${f.code}&tab=${currentTab}">编辑</a><a class="link" style="color:var(--danger);" onclick="openDeleteFoodDialog()">删除食材</a></div>`;
+  // 操作历史是只读视图,不显示编辑/删除入口
+  const editLink = currentTab===5 ? '' : `<div style="text-align:right;margin-bottom:12px;display:flex;justify-content:flex-end;gap:16px;"><a class="link" href="din-ingredient-add.html?mode=edit&code=${f.code}&tab=${currentTab}">编辑</a><a class="link" style="color:var(--danger);" onclick="openDeleteFoodDialog()">删除食材</a></div>`;
   let content = '';
   if(currentTab===0) content = renderBasicInfo(f);
   else if(currentTab===1) content = renderNutri(f);
   else if(currentTab===2) content = renderTaste(f);
   else if(currentTab===3) content = renderTexture(f);
-  else content = renderColor(f);
+  else if(currentTab===4) content = renderColor(f);
+  else content = renderHistory(f);
   body.innerHTML = editLink + content;
 }
 
@@ -473,11 +568,50 @@ function renderBasicInfo(f){
   html += `<div class="profile-field"><div class="profile-field__label">可食部分</div><div class="profile-field__value">${f.edible}%</div></div>`;
   html += `<div class="profile-field"><div class="profile-field__label">水分</div><div class="profile-field__value">${f.waterRate}%</div></div>`;
   html += `<div class="profile-field"><div class="profile-field__label">数据来源</div><div class="profile-field__value">${sourceLabel}</div></div>`;
-  html += `<div class="profile-field"><div class="profile-field__label">基础定价</div><div class="profile-field__value">${f.basePrice ? f.basePrice + ' 元/100g' : '—'}</div></div>`;
+  const priceHint = f.basePrice ? `<span style="font-size:var(--font-xs);color:var(--text-placeholder);margin-left:8px;font-weight:400;">（2026-06-05 手工录入）</span>` : '';
+  html += `<div class="profile-field"><div class="profile-field__label">基础定价</div><div class="profile-field__value">${f.basePrice ? f.basePrice + ' 元/100g' : '—'}${priceHint}</div></div>`;
   let vegTypesValue;
   if(f.vegTypes && f.vegTypes.length > 0){
-    let rows = f.vegTypes.map(t=>`<tr><td>${t.name||'—'}</td><td>${t.yieldRate!==undefined&&t.yieldRate!==''?t.yieldRate+'%':'—'}</td><td>${formatCutSpec(t.cutSpec)}</td></tr>`).join('');
-    vegTypesValue = `<table class="veg-type-table"><thead><tr><th>净菜名称</th><th>菜品出净率</th><th>切配规格</th></tr></thead><tbody>${rows}</tbody></table>`;
+    /* 按 groupId 分组,同组多规格合并前 4 列(净菜标准名/净菜俗名/出净率/切配形状) */
+    var groupKeys = [];
+    var groupMap = {};
+    f.vegTypes.forEach(function(it){
+      var k = it.groupId || ('auto_'+it.shapeCat);
+      if(!groupMap[k]){groupKeys.push(k);groupMap[k]=[];}
+      groupMap[k].push(it);
+    });
+    let rows = '';
+    groupKeys.forEach(function(k){
+      var items = groupMap[k];
+      var first = items[0];
+      var firstCs = first.cutSpec || {};
+      var vegName = f.name + (firstCs.shape ? '-'+firstCs.shape : '');
+      var vegAlias = first.alias || '—';
+      var rs = items.length;
+      items.forEach(function(item,si){
+        var yieldRate = (item.yieldRate!==undefined && item.yieldRate!=='') ? item.yieldRate+'%' : '—';
+        var cs = item.cutSpec || {};
+        var cutShape = cs.shape || '—';
+        var cutSpecTxt = formatCutSpecNoShape(item.cutSpec);
+        var specAlias = item.specAlias || '—';
+        if(si===0){
+          rows += `<tr>`;
+          rows += `<td class="veg-type__name" rowspan="${rs}">${vegName}</td>`;
+          rows += `<td class="veg-type__groupalias" rowspan="${rs}">${vegAlias}</td>`;
+          rows += `<td rowspan="${rs}">${yieldRate}</td>`;
+          rows += `<td rowspan="${rs}">${cutShape}</td>`;
+          rows += `<td>${cutSpecTxt}</td>`;
+          rows += `<td class="veg-type__specalias">${specAlias}</td>`;
+          rows += `</tr>`;
+        } else {
+          rows += `<tr>`;
+          rows += `<td>${cutSpecTxt}</td>`;
+          rows += `<td class="veg-type__specalias">${specAlias}</td>`;
+          rows += `</tr>`;
+        }
+      });
+    });
+    vegTypesValue = `<table class="veg-type-table"><thead><tr><th>净菜标准名</th><th>净菜俗名</th><th>出净率</th><th>切配形状</th><th>切配规格</th><th>规格别名</th></tr></thead><tbody>${rows}</tbody></table>`;
   } else {
     vegTypesValue = '—';
   }
@@ -604,6 +738,72 @@ function renderCrowd(crowd, note){
   return html;
 }
 
+/* === 操作历史 === */
+// 操作类型标签配色
+function historyOpTag(type){
+  const map={
+    '新增':{cls:'tag-green',icon:'➕'},
+    '编辑':{cls:'tag-blue',icon:'✏️'},
+    '启用':{cls:'tag-green',icon:'✓'},
+    '禁用':{cls:'tag-gray',icon:'⏸'},
+    '价格调整':{cls:'tag-orange',icon:'💰'},
+    '删除':{cls:'tag-red',icon:'🗑'},
+    '恢复':{cls:'',icon:'♻',style:'background:#F9F0FF;color:#722ED1;'}
+  };
+  const m = map[type] || {cls:'tag-gray',icon:'•'};
+  const styleAttr = m.style ? ` style="${m.style}"` : '';
+  return `<span class="tag ${m.cls}"${styleAttr}>${m.icon} ${type}</span>`;
+}
+
+// 渲染操作历史:筛选条 + 时间轴
+function renderHistory(f){
+  const list = f.history || [];
+
+  // 筛选条
+  let html = `<div class="history-filter">
+    <select id="historyOpType"><option>全部操作</option><option>新增</option><option>编辑</option><option>启用</option><option>禁用</option><option>价格调整</option><option>删除</option><option>恢复</option></select>
+    <input type="text" placeholder="操作时间范围(YYYY-MM-DD ~ YYYY-MM-DD)" style="flex:1;min-width:260px;">
+    <input type="text" placeholder="操作人" style="width:140px;">
+    <button class="btn btn-primary">查询</button>
+    <button class="btn btn-default">重置</button>
+  </div>`;
+
+  // 时间轴列表
+  if(list.length===0){
+    html += `<div class="history-empty">该食材暂无操作历史记录</div>`;
+  } else {
+    html += `<div class="history-timeline">`;
+    list.forEach(function(h){
+      const opClassMap={'新增':'create','编辑':'edit','启用':'edit','禁用':'disable','价格调整':'price','删除':'delete','恢复':'restore'};
+      const opCls = opClassMap[h.type] || 'edit';
+      html += `<div class="history-item history-item--${opCls}">`;
+      html += `<div class="history-card">`;
+      html += `<div class="history-card__head">`;
+      html += historyOpTag(h.type);
+      html += `<span class="history-card__op">${h.title || ''}</span>`;
+      html += `<span class="history-card__time">${h.time}</span>`;
+      html += `</div>`;
+      html += `<div class="history-card__user">👤 ${h.user} · ${h.role || '操作员'}${h.dept?(' · '+h.dept):''}</div>`;
+      if(h.summary) html += `<div class="history-card__summary">${h.summary}</div>`;
+      // 变更明细
+      if(h.changes && h.changes.length>0){
+        html += `<div class="history-card__changes">`;
+        h.changes.forEach(function(c){
+          html += `<div class="history-change">`;
+          html += `<div class="history-change__field">${c.field}</div>`;
+          html += `<div class="history-change__old">${c.old || '—'}</div>`;
+          html += `<div class="history-change__new">${c.new || '—'}</div>`;
+          html += `</div>`;
+        });
+        html += `</div>`;
+      }
+      html += `</div></div>`;
+    });
+    html += `</div>`;
+  }
+  return html;
+}
+
 /* 级联分类选择器 */
 var CATEGORIES={'谷薯类':['稻米','小麦','玉米','薯类','杂粮'],'畜禽肉类':['猪肉','牛肉','羊肉','鸡肉','鸭肉'],'水产类':['淡水鱼','海水鱼','虾蟹','贝类'],'蛋类':['鸡蛋','鸭蛋','鹅蛋','鹌鹑蛋'],'奶及奶制品':['牛奶','酸奶','奶酪','奶粉'],'豆及豆制品':['大豆','豆制品','杂豆'],'蔬菜类':['叶菜类','根茎类','瓜果类','菌菇类','豆荚类'],'水果类':['仁果类','浆果类','柑橘类','瓜果类','热带水果'],'坚果种子类':['坚果','种子'],'油脂类':['植物油','动物油'],'调味品类':['酱料','香辛料','调味汁']};
 var cascadeL1Active='';
diff --git a/web-admin/nutrition/doc/CHANGELOG.md b/web-admin/nutrition/doc/CHANGELOG.md
index 0a773fa..d2aaeca 100644
--- a/web-admin/nutrition/doc/CHANGELOG.md
+++ b/web-admin/nutrition/doc/CHANGELOG.md
@@ -1,5 +1,30 @@
 # 营养用餐管理端 CHANGELOG
 
+## [2026-08-14] optimize: 餐品/食材档案检索与录入体系强化 + 进货明细金额补全
+
+### 变更一:餐品库高级搜索与筛选汇总(`din-dish-all.html` / `din-dish-own.html`)
+- 新增「⚙ 高级搜索」弹窗:支持餐品标签、上架状态等多条件组合筛选,与顶部快速搜索(名称/编号 + 分类/状态下拉)联动
+- 新增筛选条件汇总条:展示已应用的筛选条件(名称 · 分类 · 标签 · 状态等),支持一键清空
+- 列表渲染改为基于 `filteredDishes` 过滤结果,新增"未找到匹配的餐品"空状态提示
+
+### 变更二:餐品详情操作历史(`din-dish-own.html`)
+- 详情弹窗新增「🕘 操作历史」Tab:时间轴展示餐品的创建/停用等操作记录,含操作人、角色、部门、摘要与字段变更对比
+
+### 变更三:食材录入交互重构(`din-dish-add.html`)
+- 「新增食材」弹窗改为行内食材选择器:支持关键词搜索过滤、已选食材去重(不可重复添加)、选中即加行
+- 食材行支持行内编辑:食材类型(主材/辅材/调料)、净菜类型、净菜规格联动、用量输入
+- 规格表新增「净菜包毛利率」字段(0~100%,与净菜包售价并列);详情规格表同步增加毛利率列
+
+### 变更四:食材档案详情增强(`din-ingredient.html`)
+- 详情弹窗新增「🕘 操作历史」Tab:操作类型筛选条 + 时间轴,操作历史为只读视图(不显示编辑/删除入口)
+- 净菜类型展示升级为 6 列结构表:净菜标准名 / 净菜俗名 / 出净率 / 切配形状 / 切配规格 / 规格别名
+
+### 变更五:食材编辑蔬菜类型结构化(`din-ingredient-add.html`)
+- 蔬菜净菜类型编辑区改为结构化表格(`veg-table`):同食材多规格行共享合并单元格的食材名列,行内编辑俗名/出净率/切配形状/规格尺寸/刀法,支持增删行
+
+### 变更六:进货明细金额补全(`farm-purchase.html` / `sup-in-raw.html`)
+- 列表新增「金额(元)」「单价(元/kg)」两列,补齐采购成本数据口径
+
 ## [2026-08-12] optimize: 净菜物流列简化 + 配送时间轴 + 收货码角色可见性
 
 ### 变更背景
diff --git a/web-admin/nutrition/farm-purchase.html b/web-admin/nutrition/farm-purchase.html
index 675a3a6..55b9d7a 100644
--- a/web-admin/nutrition/farm-purchase.html
+++ b/web-admin/nutrition/farm-purchase.html
@@ -309,10 +309,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><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><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>
+                  <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>500g/袋</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>500g/袋</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>
@@ -335,11 +335,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><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><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>
+                  <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>500g/袋</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>500g/袋</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>500g/袋</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>
@@ -362,10 +362,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><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><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>
+                  <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>500g/袋</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>500g/袋</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>
@@ -388,11 +388,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><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>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>
+                  <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>500g/袋</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>500g/袋</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>500g/袋</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>
@@ -415,9 +415,9 @@ 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><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><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>25kg/袋</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>5kg/桶</td><td>¥16</td><td>¥2,688</td><td>—</td><td>—</td></tr>
                 </tbody>
               </table>
@@ -441,10 +441,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
           <tr class="detail-row" id="detail-6">
             <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><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-007</td><td>西兰花</td><td>蔬菜类</td><td>80</td><td>散装(kg)</td><td><span style="color:var(--danger);">待补充</span></td><td>—</td><td>—</td><td>—</td></tr>
-                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-QCAI-120K-20260416-008</td><td>芹菜</td><td>蔬菜类</td><td>120</td><td>散装(kg)</td><td><span style="color:var(--danger);">待补充</span></td><td>—</td><td>—</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-XLHU-080K-20260416-007</td><td>西兰花</td><td>蔬菜类</td><td>80</td><td>500g/袋</td><td><span style="color:var(--danger);">待补充</span></td><td>—</td><td>—</td><td>—</td></tr>
+                  <tr><td style="font-size:10px;color:#999;">ST-EX-LY01-VG-QCAI-120K-20260416-008</td><td>芹菜</td><td>蔬菜类</td><td>120</td><td>500g/袋</td><td><span style="color:var(--danger);">待补充</span></td><td>—</td><td>—</td><td>—</td></tr>
                 </tbody>
               </table>
               <div class="sub-table__footer" style="color:var(--warning);">合计：2 种食材，200 kg，单价待补充</div>
@@ -498,7 +498,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
       </div>
       <table class="items-table" id="itemsTable">
         <thead>
-          <tr><th style="width:140px;">溯源码</th><th style="width:110px;">食材名称</th><th style="width:80px;">食材分类</th><th style="width:80px;">采购数量</th><th style="width:150px;">规格</th><th style="width:80px;">单价(元)</th><th style="width:70px;">小计金额</th><th>备注</th><th style="width:36px;"></th></tr>
+          <tr><th style="width:140px;">溯源码</th><th style="width:110px;">食材名称</th><th style="width:80px;">食材分类</th><th style="width:80px;">采购数量</th><th style="width:150px;">包装规格</th><th style="width:80px;">单价(元)</th><th style="width:70px;">小计金额</th><th>备注</th><th style="width:36px;"></th></tr>
         </thead>
         <tbody id="itemsBody"></tbody>
       </table>
@@ -535,7 +535,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><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>
@@ -650,7 +650,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
       <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>
+          <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>
@@ -686,12 +686,15 @@ function renderUnitOptions(selectEl,selected){
   var html='<option value="">请选择</option>'+SPEC_UNIT_OPTIONS.map(function(u){return '<option'+(u===selected?' selected':'')+'>'+u+'</option>';}).join('');
   selectEl.innerHTML=html;
 }
-/* 解析列表展示用的规格字符串(如 "25kg/件" → {gram:25,unit:'件'}) */
+/* 解析包装规格字符串(如 "500g/袋" → {gram:500,unit:'袋'}、"25kg/袋" → {gram:25000,unit:'袋'}) */
 function parseSpecText(specText){
   if(!specText)return {gram:'',unit:''};
-  var m=specText.match(/^([\d.]+)kg\/(.+)$/);
-  if(m)return {gram:parseFloat(m[1]),unit:m[2]};
-  if(specText==='散装(kg)')return {gram:'',unit:'散装'};
+  /* 兼容 g 与 kg 两种克重单位,统一换算为克 */
+  var m=specText.match(/^([\d.]+)(g|kg)\/(.+)$/);
+  if(m){
+    var val=parseFloat(m[1]);
+    return {gram: m[2]==='kg'?val*1000:val, unit:m[3]};
+  }
   return {gram:'',unit:''};
 }
 
@@ -701,40 +704,40 @@ 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',acceptedQty:'—',remark:'—'},
-      {trace:'ST-EX-LY01-VG-QCAI-120K-20260416-002',name:'芹菜',cat:'蔬菜类',qty:120,spec:'散装(kg)',price:2.5,subtotal:'¥300',acceptedQty:'—',remark:'—'}
+      {trace:'ST-EX-LY01-VG-XLHU-080K-20260416-001',name:'西兰花',cat:'蔬菜类',qty:80,spec:'500g/袋',price:4.5,subtotal:'¥360',acceptedQty:'—',remark:'—'},
+      {trace:'ST-EX-LY01-VG-QCAI-120K-20260416-002',name:'芹菜',cat:'蔬菜类',qty:120,spec:'500g/袋',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',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:'—'}
+      {trace:'ST-EX-LY01-VG-BOCA-050K-20260415-002',name:'菠菜',cat:'蔬菜类',qty:50,spec:'500g/袋',price:2.5,subtotal:'¥125',acceptedQty:'—',remark:'—'},
+      {trace:'ST-EX-LY01-VG-BCAI-080K-20260415-003',name:'白菜',cat:'蔬菜类',qty:80,spec:'500g/袋',price:1.8,subtotal:'¥144',acceptedQty:'—',remark:'—'},
+      {trace:'ST-EX-LY01-VG-HLUB-120K-20260415-004',name:'胡萝卜',cat:'蔬菜类',qty:120,spec:'500g/袋',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',acceptedQty:'—',remark:'需冷链运输'},
-      {trace:'ST-EX-XR01-MT-ZWUA-240K-20260415-006',name:'猪五花',cat:'肉禽类',qty:240,spec:'25kg/件',price:26,subtotal:'¥6,240',acceptedQty:'—',remark:'—'}
+      {trace:'ST-EX-XR01-MT-ZLRJ-080K-20260415-005',name:'猪里脊',cat:'肉禽类',qty:80,spec:'500g/袋',price:28,subtotal:'¥2,240',acceptedQty:'—',remark:'需冷链运输'},
+      {trace:'ST-EX-XR01-MT-ZWUA-240K-20260415-006',name:'猪五花',cat:'肉禽类',qty:240,spec:'500g/袋',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',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:'冰鲜'}
+      {trace:'ST-EX-HS01-SF-CAYO-060K-20260414-001',name:'草鱼',cat:'水产类',qty:60,spec:'500g/袋',price:18,subtotal:'¥1,080',acceptedQty:'60',remark:'活鲜运输'},
+      {trace:'ST-EX-HS01-SF-JIYU-080K-20260414-002',name:'鲫鱼',cat:'水产类',qty:80,spec:'500g/袋',price:16,subtotal:'¥1,280',acceptedQty:'80',remark:'—'},
+      {trace:'ST-EX-HS01-SF-XIAA-050K-20260414-003',name:'虾',cat:'水产类',qty:50,spec:'500g/袋',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',acceptedQty:'—',remark:'东北五常大米'},
+      {trace:'ST-EX-LY02-DG-DAMI-1000-20260413-001',name:'大米',cat:'粮油类',qty:1000,spec:'25kg/袋',price:3.5,subtotal:'¥3,500',acceptedQty:'—',remark:'东北五常大米'},
       {trace:'ST-EX-LY02-DG-HSYO-168K-20260413-002',name:'花生油',cat:'粮油类',qty:168,spec:'5kg/桶',price:16,subtotal:'¥2,688',acceptedQty:'—',remark:'—'}
     ]},
   /* 待确认订单：系统自动生成，缺供应商与单价，需用户通过"立即确认"补全后流转为"待接单" */
@@ -742,8 +745,8 @@ var orders = [
     supplier:'', supplierContact:'', supplierPhone:'',
     date:'2026-04-16', arrival:'2026-04-17', source:'系统生成', status:'待确认', total:'待核算',
     items:[
-      {trace:'ST-EX-LY01-VG-XLHU-080K-20260416-007',name:'西兰花',cat:'蔬菜类',qty:80,spec:'散装(kg)',price:null,subtotal:'—',acceptedQty:'—',remark:'—'},
-      {trace:'ST-EX-LY01-VG-QCAI-120K-20260416-008',name:'芹菜',cat:'蔬菜类',qty:120,spec:'散装(kg)',price:null,subtotal:'—',acceptedQty:'—',remark:'—'}
+      {trace:'ST-EX-LY01-VG-XLHU-080K-20260416-007',name:'西兰花',cat:'蔬菜类',qty:80,spec:'500g/袋',price:null,subtotal:'—',acceptedQty:'—',remark:'—'},
+      {trace:'ST-EX-LY01-VG-QCAI-120K-20260416-008',name:'芹菜',cat:'蔬菜类',qty:120,spec:'500g/袋',price:null,subtotal:'—',acceptedQty:'—',remark:'—'}
     ]}
 ];
 
diff --git a/web-admin/nutrition/sup-in-raw.html b/web-admin/nutrition/sup-in-raw.html
index 582ea5f..8166447 100644
--- a/web-admin/nutrition/sup-in-raw.html
+++ b/web-admin/nutrition/sup-in-raw.html
@@ -222,23 +222,23 @@ tbody tr:hover{background:#F8FBFF;}
     <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>入库重量(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>入库规格</th><th>入库数量</th><th>入库重量(kg)</th><th>入库总价(元)</th><th>入库单价(元/kg)</th><th>入库时间</th><th>存储方式</th><th>存放区域</th><th>操作人</th><th>操作</th>
         </tr></thead>
         <tbody>
           <tr>
-            <td>IN-20260415-001</td><td><span class="tag tag-green">设备自动</span></td><td><div>毛菜验收秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">RW-SCALE-001</div></td><td>ST-FH-FA01-VG-BOCA-286K-20260415-001</td><td><span class="tag tag-blue">自产</span></td><td>菠菜</td><td>A区蔬菜基地</td><td>25kg/件</td><td>12件</td><td>286</td><td>2026-04-15 10:30</td><td><span class="tag tag-green">毛菜柜</span></td><td>8号柜-A01格口</td><td>张三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
+            <td>IN-20260415-001</td><td><span class="tag tag-green">设备自动</span></td><td><div>毛菜验收秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">RW-SCALE-001</div></td><td>ST-FH-FA01-VG-BOCA-286K-20260415-001</td><td><span class="tag tag-blue">自产</span></td><td>菠菜</td><td>A区蔬菜基地</td><td>25kg/件</td><td>12件</td><td>286</td><td>1001.00</td><td>3.50</td><td>2026-04-15 10:30</td><td><span class="tag tag-green">毛菜柜</span></td><td>8号柜-A01格口</td><td>张三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
           </tr>
           <tr>
-            <td>IN-20260415-002</td><td><span class="tag tag-green">设备自动</span></td><td><div>毛菜验收秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">RW-SCALE-002</div></td><td>ST-EX-LY01-VG-BOCA-050K-20260415-002</td><td><span class="tag tag-gray">外采</span></td><td>菠菜</td><td>绿源蔬菜配送</td><td>10kg/筐</td><td>5筐</td><td>50</td><td>2026-04-15 08:30</td><td><span class="tag tag-green">毛菜柜</span></td><td>8号柜-B03格口</td><td>李三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
+            <td>IN-20260415-002</td><td><span class="tag tag-green">设备自动</span></td><td><div>毛菜验收秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">RW-SCALE-002</div></td><td>ST-EX-LY01-VG-BOCA-050K-20260415-002</td><td><span class="tag tag-gray">外采</span></td><td>菠菜</td><td>绿源蔬菜配送</td><td>10kg/筐</td><td>5筐</td><td>50</td><td>200.00</td><td>4.00</td><td>2026-04-15 08:30</td><td><span class="tag tag-green">毛菜柜</span></td><td>8号柜-B03格口</td><td>李三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
           </tr>
           <tr>
-            <td>IN-20260415-003</td><td><span class="tag tag-orange">人工录入</span></td><td>—</td><td>ST-EX-XR01-MT-ZLRJ-080K-20260415-005</td><td><span class="tag tag-gray">外采</span></td><td>猪里脊</td><td>鲜肉直供公司</td><td>20kg/箱</td><td>4箱</td><td>80</td><td>2026-04-15 09:15</td><td><span class="tag tag-gray">仓库</span></td><td>B仓-肉类区-01</td><td>王三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
+            <td>IN-20260415-003</td><td><span class="tag tag-orange">人工录入</span></td><td>—</td><td>ST-EX-XR01-MT-ZLRJ-080K-20260415-005</td><td><span class="tag tag-gray">外采</span></td><td>猪里脊</td><td>鲜肉直供公司</td><td>20kg/箱</td><td>4箱</td><td>80</td><td>2800.00</td><td>35.00</td><td>2026-04-15 09:15</td><td><span class="tag tag-gray">仓库</span></td><td>B仓-肉类区-01</td><td>王三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
           </tr>
           <tr>
-            <td>IN-20260415-004</td><td><span class="tag tag-orange">人工录入</span></td><td>—</td><td>ST-EX-HS01-SF-CAYO-060K-20260414-001</td><td><span class="tag tag-gray">外采</span></td><td>草鱼</td><td>海鲜水产配送</td><td>散装(kg)</td><td>60kg</td><td>60</td><td>2026-04-15 09:45</td><td><span class="tag tag-gray">仓库</span></td><td>C仓-水产区-01</td><td>李三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
+            <td>IN-20260415-004</td><td><span class="tag tag-orange">人工录入</span></td><td>—</td><td>ST-EX-HS01-SF-CAYO-060K-20260414-001</td><td><span class="tag tag-gray">外采</span></td><td>草鱼</td><td>海鲜水产配送</td><td>散装(kg)</td><td>60kg</td><td>60</td><td>1080.00</td><td>18.00</td><td>2026-04-15 09:45</td><td><span class="tag tag-gray">仓库</span></td><td>C仓-水产区-01</td><td>李三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
           </tr>
           <tr>
-            <td>IN-20260416-005</td><td><span class="tag tag-green">设备自动</span></td><td><div>毛菜验收秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">RW-SCALE-003</div></td><td>ST-FH-FB01-VG-HLUB-420K-20260415-002</td><td><span class="tag tag-blue">自产</span></td><td>胡萝卜</td><td>B区根茎基地</td><td>25kg/件</td><td>17件</td><td>420</td><td>2026-04-16 11:00</td><td><span class="tag tag-gray">仓库</span></td><td>A仓-蔬菜区-03</td><td>张三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
+            <td>IN-20260416-005</td><td><span class="tag tag-green">设备自动</span></td><td><div>毛菜验收秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">RW-SCALE-003</div></td><td>ST-FH-FB01-VG-HLUB-420K-20260415-002</td><td><span class="tag tag-blue">自产</span></td><td>胡萝卜</td><td>B区根茎基地</td><td>25kg/件</td><td>17件</td><td>420</td><td>1050.00</td><td>2.50</td><td>2026-04-16 11:00</td><td><span class="tag tag-gray">仓库</span></td><td>A仓-蔬菜区-03</td><td>张三丰</td><td class="td-actions"><span class="link" onclick="openVideo()">查看视频</span> <span class="link">编辑</span> <span class="link" onclick="showDetail(this)">详情</span> <span class="link" style="color:var(--danger)">删除</span></td>
           </tr>
         </tbody>
       </table>
@@ -274,7 +274,9 @@ tbody tr:hover{background:#F8FBFF;}
           </div>
         </div>
         <div class="form-item"><label>入库数量<span class="required">*</span></label><input type="text" placeholder="请输入入库数量"></div>
-        <div class="form-item"><label>入库重量(kg)<span class="required">*</span></label><input type="number" placeholder="请输入入库重量"></div>
+        <div class="form-item"><label>入库重量(kg)<span class="required">*</span></label><input id="f-weight" type="number" min="0" step="0.01" placeholder="请输入入库重量" oninput="calcUnitPrice()"></div>
+        <div class="form-item"><label>入库总价(元)<span class="required">*</span></label><input id="f-total-price" type="number" min="0" step="0.01" placeholder="请输入入库总价" oninput="calcUnitPrice()"></div>
+        <div class="form-item"><label>入库单价(元/kg)</label><input id="f-unit-price" type="text" placeholder="根据总价与重量自动计算" readonly style="background:#F5F5F5;color:#999;"></div>
         <div class="form-item"><label>入库时间</label><input type="date"></div>
         <div class="form-item"><label>存储方式<span class="required">*</span></label><select id="rawStorageTypeModal" onchange="updateRawAreaModalOptions()"><option>请选择</option><option>毛菜柜</option><option>仓库</option></select></div>
         <div class="form-item"><label>所在区域<span class="required">*</span></label><select id="rawAreaModal"><option>请选择存储方式</option></select></div>
@@ -359,6 +361,17 @@ function updateRawAreaModalOptions(){
 }
 function openModal(){document.getElementById('modalOverlay').style.display='flex';}
 function closeModal(){document.getElementById('modalOverlay').style.display='none';}
+/* 入库单价 = 总价 / 重量,重量为 0 或为空时不计算 */
+function calcUnitPrice(){
+  var weight=parseFloat(document.getElementById('f-weight').value);
+  var total=parseFloat(document.getElementById('f-total-price').value);
+  var unitEl=document.getElementById('f-unit-price');
+  if(!weight||weight<=0||isNaN(weight)||!total||isNaN(total)){
+    unitEl.value='';
+    return;
+  }
+  unitEl.value=(total/weight).toFixed(2);
+}
 document.getElementById('modalOverlay').addEventListener('click',function(e){if(e.target===this)closeModal();});
 function openVideo(){document.getElementById('videoOverlay').style.display='flex';}
 function closeVideo(){document.getElementById('videoOverlay').style.display='none';}