From 4fd44f1005bb55777d196e5cebef0041f6e496ca Mon Sep 17 00:00:00 2001
From: fengpu <18691763612@163.com>
Date: Wed, 5 Aug 2026 09:57:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=84=E6=A0=BC=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8C=96=E9=98=B6=E6=AE=B5=E5=9B=9B=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AB=AF=20+=20=E9=98=B6=E6=AE=B5=E4=BA=94=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E9=A1=B5=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 设备端 9 任务 14 文件：毛菜验收/加工秤、净菜组配/包装秤、净菜加工秤设置统一为克存储 + formatGram 展示层兼容 + cutSpec/packSpec 结构化
- 辅助页 3 任务 6 文件：质控同步真落地 + 菜品下拉跨页共享 + 同步日志驱动 + 分析页字典语义对齐 + 净菜进柜 spec 多形态结构化
- 新增 spec-utils-reference.md 权威源、改造任务清单与研发同步说明
- 删除旧的部门下周工作计划文档

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../01-orders.html                            |  122 +-
 .../02-labeling.html                          |   90 +-
 .../label-preview.html                        |  124 +-
 .../clean-veg-ratio-scale/03-settings.html    |   20 +-
 .../ratio-scale/01-packing-tasks.html         |  108 +-
 .../ratio-scale/02-weighing-packing.html      |  126 +-
 .../ratio-scale/03-verify-history.html        |   87 +-
 .../01-verify-inspection.html                 |   70 +-
 .../01-washing-tasks.html                     |   53 +-
 .../02-batch-weighing.html                    |   75 +-
 .../03-batch-washing.html                     |   84 +-
 .../raw-veg-processing-scale/04-history.html  |   48 +-
 web-admin/nutrition/din-dict-config.html      |   95 +-
 web-admin/nutrition/din-dict-mgmt.html        |   32 +-
 web-admin/nutrition/din-dish-add.html         |   54 +-
 web-admin/nutrition/din-dish-all.html         |   44 +-
 web-admin/nutrition/din-dish-own.html         |   21 +-
 web-admin/nutrition/din-ingredient-add.html   |   49 +-
 web-admin/nutrition/din-ingredient.html       |   29 +-
 web-admin/nutrition/doc/CHANGELOG.md          |   96 ++
 .../screenshots/prod-clean-order-modal-cp.png |  Bin 0 -> 124491 bytes
 .../nutrition/doc/spec-utils-reference.md     |  207 ++++
 ...周工作计划（2026年8月3日-7日）最终版-ty.md |  150 ---
 .../doc/规格体系统一化改造-研发同步说明.md    |  257 ++++
 .../doc/规格体系统一化改造任务清单.md         | 1094 +++++++++++++++++
 .../doc/规格管理体系分析与设计方案.md         |  993 +++++++++++----
 web-admin/nutrition/farm-purchase.html        |   55 +-
 web-admin/nutrition/prod-clean-order.html     |  240 +++-
 web-admin/nutrition/prod-proc-cabinet.html    |   90 +-
 web-admin/nutrition/prod-proc-combo.html      |  113 +-
 web-admin/nutrition/prod-proc-cook.html       |   90 +-
 .../nutrition/prod-qc-nutrition-add.html      |   40 +-
 .../nutrition/prod-qc-nutrition-sync.html     |  250 +++-
 web-admin/nutrition/prod-qc-nutrition.html    |  126 +-
 web-admin/nutrition/sup-biz-analysis.html     |   12 +-
 web-admin/nutrition/sup-clean-external.html   |  122 +-
 web-admin/nutrition/sup-clean-internal.html   |  126 +-
 web-admin/nutrition/sup-in-clean.html         |   12 +-
 web-admin/nutrition/sup-in-cleanin.html       |   66 +-
 web-admin/nutrition/sup-in-raw.html           |   18 +-
 web-admin/nutrition/sup-pkg-label.html        |  107 +-
 web-admin/nutrition/sup-process-analysis.html |   44 +-
 42 files changed, 4738 insertions(+), 901 deletions(-)
 create mode 100644 web-admin/nutrition/doc/screenshots/prod-clean-order-modal-cp.png
 create mode 100644 web-admin/nutrition/doc/spec-utils-reference.md
 delete mode 100644 web-admin/nutrition/doc/智能部下周工作计划（2026年8月3日-7日）最终版-ty.md
 create mode 100644 web-admin/nutrition/doc/规格体系统一化改造-研发同步说明.md
 create mode 100644 web-admin/nutrition/doc/规格体系统一化改造任务清单.md

diff --git a/other-module/canteen-device/clean-veg-packaging-labeler/01-orders.html b/other-module/canteen-device/clean-veg-packaging-labeler/01-orders.html
index ffe52ac..e16c633 100644
--- a/other-module/canteen-device/clean-veg-packaging-labeler/01-orders.html
+++ b/other-module/canteen-device/clean-veg-packaging-labeler/01-orders.html
@@ -228,6 +228,80 @@
   </div>
 
   <script>
+    /* === 规格工具函数(从 spec-utils-reference.md 内联) === */
+    function formatGram(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+      if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+      return g + 'g';
+    }
+    /* 规格标签格式化:{baseGram:500, unit:'袋'} → "500g/袋" */
+    function formatSpec(spec) {
+      if (!spec) return '—';
+      if (typeof spec === 'string') return spec;
+      if (!spec.baseGram) return spec.unit || '—';
+      var w = formatGram(spec.baseGram);
+      if (spec.unit === '散装') return '散装/' + w;
+      return w + '/' + (spec.unit || '');
+    }
+    /* 切配规格展示:{length,width,height,shape,technique} → "20×1×1mm · 丝 · 平刀" */
+    function formatCutSpec(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 shapeStr = cut.shape || '';
+      var techStr = cut.technique ? ' · ' + cut.technique : '';
+      return dimStr + shapeStr + techStr;
+    }
+    /* 历史切配规格字符串解析(兼容 4 种格式)
+     *   "3.5mm*3.5mm*50mm·细丝·平刀"     (无空格,* 分隔)
+     *   "20mm*1mm*1mm · 细丝 · 平刀"     (带空格,* 分隔)
+     *   "20mm×1mm×1mm · 细丝 · 平刀"     (带空格,× 分隔)
+     *   "50mm*30mm*30mm · 宽段 · 平刀"   (ratio-scale 同 02-labeling) */
+    function parseLegacyCutSpec(s) {
+      if (!s) return null;
+      if (typeof s === 'object') return s;
+      var normalized = String(s).replace(/×/g, '*').replace(/\s/g, '');
+      var m = normalized.match(/^(?:(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm)?·?([^·]+)·?([^·]+)?$/);
+      if (!m) return { shape: s };
+      return {
+        length:    m[1] ? parseFloat(m[1]) : undefined,
+        width:     m[2] ? parseFloat(m[2]) : undefined,
+        height:    m[3] ? parseFloat(m[3]) : undefined,
+        shape:     m[4] || '',
+        technique: m[5] || ''
+      };
+    }
+    /* 历史包装规格字符串解析:'500g' / '大份800g' / '真空包装'
+     * 返回 {baseGram, unit, packMethod, portion?} */
+    function parseLegacyPackSpec(s) {
+      if (!s) return { baseGram: 0, unit: '', packMethod: '' };
+      if (typeof s === 'object') return s;
+      var str = String(s).trim();
+      /* 纯描述(无数字):如"真空包装"、"盒装" → 视为 packMethod */
+      if (!/\d/.test(str)) {
+        return { baseGram: 0, unit: '', packMethod: str };
+      }
+      /* 提取份型前缀(可选)+ 克数 */
+      var m = str.match(/^(?:(标准份|小份|大份|迷你份|加大份))?(?:(\d+(?:\.\d+)?)\s*(g|kg))?\/?(袋|盒|箱|盘|份|筐|瓶|罐|桶|散装)?$/);
+      if (!m) return { baseGram: 0, unit: '', packMethod: str };
+      var baseGram = 0;
+      if (m[2]) {
+        baseGram = parseFloat(m[2]);
+        if (m[3] === 'kg') baseGram *= 1000;
+      }
+      return {
+        baseGram: baseGram,
+        unit: m[4] || '',
+        portion: m[1] || '',
+        packMethod: ''
+      };
+    }
+
     /* 获取 URL 参数 */
     function getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
@@ -245,7 +319,12 @@
     /* 当前 Tab */
     var currentFilter = 'pending';
 
-    /* 模拟数据：待打印订单（来自配比秤已完成配比的订单） */
+    /* 模拟数据:待打印订单(来自配比秤已完成配比的订单)
+     * 字段说明:
+     *   cutSpec: 结构化对象 {length,width,height,shape,technique}(任务 4.4)
+     *   packSpec: 结构化对象 {baseGram, unit, portion?, packMethod?}(任务 4.4)
+     *   packMethod: 独立字段"真空袋/保鲜盒/散装托盘"等(任务 4.4)
+     */
     var mockData = [
       {
         orderNo: 'PO-20260625-001',
@@ -254,9 +333,9 @@
         taskNo: 'L-001',
         labeled: false,
         mealPacks: [
-          { type: '净菜包', packName: '土豆', packSize: 3, packSpec: '500g', vegCutType: '3.5mm*3.5mm*50mm·细丝·平刀', ingredients: [{ name: '土豆', weightPerPack: 500, weighed: 1500 }] },
-          { type: '净菜包', packName: '胡萝卜', packSize: 3, packSpec: '500g', vegCutType: '3mm*3mm*30mm·菱形片·斜刀', ingredients: [{ name: '胡萝卜', weightPerPack: 500, weighed: 1500 }] },
-          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 2, packSpec: '大份800g', ingredients: [{ name: '宫保鸡丁', weightPerPack: 800, weighed: 1600 }] }
+          { type: '净菜包', packName: '土豆', packSize: 3, packSpec: {baseGram:500, unit:'袋'}, cutSpec: {length:50, width:3.5, height:3.5, shape:'细丝', technique:'平刀'}, ingredients: [{ name: '土豆', weightPerPack: 500, weighed: 1500 }] },
+          { type: '净菜包', packName: '胡萝卜', packSize: 3, packSpec: {baseGram:500, unit:'袋'}, cutSpec: {length:30, width:3, height:3, shape:'菱形片', technique:'斜刀'}, ingredients: [{ name: '胡萝卜', weightPerPack: 500, weighed: 1500 }] },
+          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 2, packSpec: {baseGram:800, unit:'份', portion:'大份'}, ingredients: [{ name: '宫保鸡丁', weightPerPack: 800, weighed: 1600 }] }
         ]
       },
       {
@@ -266,8 +345,8 @@
         taskNo: 'L-002',
         labeled: false,
         mealPacks: [
-          { type: '净菜包', packName: '白菜', packSize: 2, packSpec: '1000g', vegCutType: '5mm*5mm*50mm·段切·平刀', ingredients: [{ name: '白菜', weightPerPack: 1000, weighed: 2000 }] },
-          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: '大份800g', ingredients: [{ name: '鱼香肉丝', weightPerPack: 800, weighed: 1600 }] }
+          { type: '净菜包', packName: '白菜', packSize: 2, packSpec: {baseGram:1000, unit:'袋'}, cutSpec: {length:50, width:5, height:5, shape:'段切', technique:'平刀'}, ingredients: [{ name: '白菜', weightPerPack: 1000, weighed: 2000 }] },
+          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: {baseGram:800, unit:'份', portion:'大份'}, ingredients: [{ name: '鱼香肉丝', weightPerPack: 800, weighed: 1600 }] }
         ]
       },
       {
@@ -277,12 +356,12 @@
         taskNo: 'L-003',
         labeled: false,
         mealPacks: [
-          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: '真空包装', ingredients: [{ name: '番茄炒蛋', weightPerPack: 500, weighed: 2000 }] }
+          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: {baseGram:500, unit:'份'}, packMethod: '真空袋', ingredients: [{ name: '番茄炒蛋', weightPerPack: 500, weighed: 2000 }] }
         ]
       }
     ];
 
-    /* 待发货订单（已包装完成，等待发货） */
+    /* 待发货订单(已包装完成,等待发货) */
     var mockDoneData = [
       {
         orderNo: 'PO-20260624-001',
@@ -294,8 +373,8 @@
         operator: '刘九',
         shipped: false,
         mealPacks: [
-          { type: '净菜包', packName: '黄瓜', packSize: 3, packSpec: '500g', vegCutType: '2mm*2mm*40mm·薄片·平刀', ingredients: [{ name: '黄瓜', weightPerPack: 500, weighed: 1500 }] },
-          { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 2, packSpec: '盒装', ingredients: [{ name: '凉拌黄瓜', weightPerPack: 600, weighed: 1200 }] }
+          { type: '净菜包', packName: '黄瓜', packSize: 3, packSpec: {baseGram:500, unit:'袋'}, cutSpec: {length:40, width:2, height:2, shape:'薄片', technique:'平刀'}, ingredients: [{ name: '黄瓜', weightPerPack: 500, weighed: 1500 }] },
+          { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 2, packSpec: {baseGram:600, unit:'盒'}, packMethod: '保鲜盒', ingredients: [{ name: '凉拌黄瓜', weightPerPack: 600, weighed: 1200 }] }
         ]
       },
       {
@@ -308,8 +387,8 @@
         operator: '陈十',
         shipped: false,
         mealPacks: [
-          { type: '净菜包', packName: '芹菜', packSize: 2, packSpec: '500g', vegCutType: '4mm*4mm*30mm·条·平刀', ingredients: [{ name: '芹菜', weightPerPack: 500, weighed: 1000 }] },
-          { type: '餐品净菜包', packName: '芹菜炒肉套餐', packSize: 3, packSpec: '大份800g', ingredients: [{ name: '芹菜炒肉', weightPerPack: 800, weighed: 2400 }] }
+          { type: '净菜包', packName: '芹菜', packSize: 2, packSpec: {baseGram:500, unit:'袋'}, cutSpec: {length:30, width:4, height:4, shape:'条', technique:'平刀'}, ingredients: [{ name: '芹菜', weightPerPack: 500, weighed: 1000 }] },
+          { type: '餐品净菜包', packName: '芹菜炒肉套餐', packSize: 3, packSpec: {baseGram:800, unit:'份', portion:'大份'}, ingredients: [{ name: '芹菜炒肉', weightPerPack: 800, weighed: 2400 }] }
         ]
       }
     ];
@@ -330,8 +409,8 @@
         shippingCompany: '顺丰速运',
         shippingNo: 'SF1234567890',
         mealPacks: [
-          { type: '净菜包', packName: '西红柿', packSize: 5, packSpec: '500g', vegCutType: '15mm*15mm*15mm·滚刀块·平刀', ingredients: [{ name: '西红柿', weightPerPack: 500, weighed: 2500 }] },
-          { type: '餐品净菜包', packName: '番茄牛腩套餐', packSize: 3, packSpec: '大份800g', ingredients: [{ name: '番茄牛腩', weightPerPack: 800, weighed: 2400 }] }
+          { type: '净菜包', packName: '西红柿', packSize: 5, packSpec: {baseGram:500, unit:'袋'}, cutSpec: {length:15, width:15, height:15, shape:'滚刀块', technique:'平刀'}, ingredients: [{ name: '西红柿', weightPerPack: 500, weighed: 2500 }] },
+          { type: '餐品净菜包', packName: '番茄牛腩套餐', packSize: 3, packSpec: {baseGram:800, unit:'份', portion:'大份'}, ingredients: [{ name: '番茄牛腩', weightPerPack: 800, weighed: 2400 }] }
         ]
       }
     ];
@@ -425,11 +504,18 @@
             ? { text: '待包装', cls: 'status-tag--wait' }
             : { text: '已打印', cls: 'status-tag--done' };
           var ingWeight = pack.ingredients[0] ? pack.ingredients[0].weightPerPack : 0;
-          var specMatch = pack.packSpec && pack.packSpec.match(/(\d+)g/);
-          var perDue = specMatch ? parseInt(specMatch[1]) : ingWeight;
+          /* 解析 packSpec:已是对象直接用,字符串则 parseLegacyPackSpec */
+          var specObj = typeof pack.packSpec === 'object'
+            ? pack.packSpec
+            : parseLegacyPackSpec(pack.packSpec);
+          var perDue = specObj.baseGram || ingWeight;
           var totalDue = perDue * pack.packSize;
           var totalWeighed = (currentFilter === 'done' || currentFilter === 'shipped') ? totalDue : (pack.weighed || 0);
           var weightClass = (currentFilter === 'done' || currentFilter === 'shipped') ? 'parent-weight--done' : '';
+          /* 解析 cutSpec:已是对象直接用,字符串则 parseLegacyCutSpec */
+          var cutObj = pack.cutSpec
+            ? (typeof pack.cutSpec === 'object' ? pack.cutSpec : parseLegacyCutSpec(pack.cutSpec))
+            : null;
 
           var parentRow = document.createElement('div');
           parentRow.className = 'item-parent-row';
@@ -448,8 +534,8 @@
           parentRow.innerHTML =
             '<div class="parent-name"><div class="parent-icon">&#x1F4E6;</div><span class="parent-name__text">' + pack.packName + '</span></div>' +
             '<div style="text-align:center;font-size:11px;color:' + (pack.type === '餐品净菜包' ? '#faad16' : '#4a90d9') + '">' + pack.type + '</div>' +
-            '<div style="text-align:center;font-size:11px;color:rgba(255,255,255,0.55)">' + (pack.packSpec || '—') + '</div>' +
-            '<div style="text-align:center;font-size:11px;color:rgba(255,255,255,0.55)">' + (pack.vegCutType || '—') + '</div>' +
+            '<div style="text-align:center;font-size:11px;color:rgba(255,255,255,0.55)">' + formatSpec(specObj) + '</div>' +
+            '<div style="text-align:center;font-size:11px;color:rgba(255,255,255,0.55)">' + formatCutSpec(cutObj) + '</div>' +
             '<div class="parent-weight ' + weightClass + '">' + totalDue + ' g</div>' +
             '<div class="parent-weight ' + weightClass + '">' + totalWeighed + ' g</div>' +
             statusCell +
diff --git a/other-module/canteen-device/clean-veg-packaging-labeler/02-labeling.html b/other-module/canteen-device/clean-veg-packaging-labeler/02-labeling.html
index 8458805..449ba69 100644
--- a/other-module/canteen-device/clean-veg-packaging-labeler/02-labeling.html
+++ b/other-module/canteen-device/clean-veg-packaging-labeler/02-labeling.html
@@ -348,6 +348,63 @@
   <div class="toast" id="toast"></div>
 
   <script>
+    /* === 规格工具函数(从 spec-utils-reference.md 内联) === */
+    function formatGram(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+      if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+      return g + 'g';
+    }
+    function formatSpec(spec) {
+      if (!spec) return '—';
+      if (typeof spec === 'string') return spec;
+      if (!spec.baseGram) return spec.unit || '—';
+      var w = formatGram(spec.baseGram);
+      if (spec.unit === '散装') return '散装/' + w;
+      return w + '/' + (spec.unit || '');
+    }
+    function formatCutSpec(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 shapeStr = cut.shape || '';
+      var techStr = cut.technique ? ' · ' + cut.technique : '';
+      return dimStr + shapeStr + techStr;
+    }
+    /* 历史切配规格字符串解析(兼容 4 种格式) */
+    function parseLegacyCutSpec(s) {
+      if (!s) return null;
+      if (typeof s === 'object') return s;
+      var normalized = String(s).replace(/×/g, '*').replace(/\s/g, '');
+      var m = normalized.match(/^(?:(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm)?·?([^·]+)·?([^·]+)?$/);
+      if (!m) return { shape: s };
+      return {
+        length:    m[1] ? parseFloat(m[1]) : undefined,
+        width:     m[2] ? parseFloat(m[2]) : undefined,
+        height:    m[3] ? parseFloat(m[3]) : undefined,
+        shape:     m[4] || '',
+        technique: m[5] || ''
+      };
+    }
+    function parseLegacyPackSpec(s) {
+      if (!s) return { baseGram: 0, unit: '', packMethod: '' };
+      if (typeof s === 'object') return s;
+      var str = String(s).trim();
+      if (!/\d/.test(str)) return { baseGram: 0, unit: '', packMethod: str };
+      var m = str.match(/^(?:(标准份|小份|大份|迷你份|加大份))?(?:(\d+(?:\.\d+)?)\s*(g|kg))?\/?(袋|盒|箱|盘|份|筐|瓶|罐|桶|散装)?$/);
+      if (!m) return { baseGram: 0, unit: '', packMethod: str };
+      var baseGram = 0;
+      if (m[2]) {
+        baseGram = parseFloat(m[2]);
+        if (m[3] === 'kg') baseGram *= 1000;
+      }
+      return { baseGram: baseGram, unit: m[4] || '', portion: m[1] || '', packMethod: '' };
+    }
+
     /* ---- 工具函数 ---- */
     function getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
@@ -363,30 +420,35 @@
     document.getElementById('topUser').textContent = userName;
     document.getElementById('userAvatar').textContent = userName.charAt(0);
 
-    /* ---- 模拟订单数据（来自配比秤已完成配比的订单） ---- */
+    /* ---- 模拟订单数据(来自配比秤已完成配比的订单) ----
+     * 字段说明:
+     *   cutSpec: 结构化对象 {length,width,height,shape,technique}(任务 4.4)
+     *   packSpec: 结构化对象 {baseGram, unit, portion?, packMethod?}(任务 4.4)
+     *   packMethod: 包装方式(独立字段,"真空袋/保鲜盒/散装托盘")
+     */
     var taskData = {
       'L-001': {
         orderNo: 'PO-20260625-001',
         orderType: 'internal',
         items: [
-          { type: '净菜包', packName: '土豆', packSize: 3, packSpec: '500g', cutSpec: '20mm*1mm*1mm · 细丝 · 平刀', weightPerPack: 500, weighed: 1500, icon: '🥔' },
-          { type: '净菜包', packName: '胡萝卜', packSize: 3, packSpec: '500g', cutSpec: '20mm*1mm*1mm · 细丝 · 平刀', weightPerPack: 500, weighed: 1500, icon: '🥕' },
-          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 2, packSpec: '大份800g', weightPerPack: 800, weighed: 1600, icon: '🍱' }
+          { type: '净菜包', packName: '土豆', packSize: 3, packSpec: {baseGram:500, unit:'袋'}, cutSpec: {length:20, width:1, height:1, shape:'细丝', technique:'平刀'}, weightPerPack: 500, weighed: 1500, icon: '🥔' },
+          { type: '净菜包', packName: '胡萝卜', packSize: 3, packSpec: {baseGram:500, unit:'袋'}, cutSpec: {length:20, width:1, height:1, shape:'细丝', technique:'平刀'}, weightPerPack: 500, weighed: 1500, icon: '🥕' },
+          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 2, packSpec: {baseGram:800, unit:'份', portion:'大份'}, weightPerPack: 800, weighed: 1600, icon: '🍱' }
         ]
       },
       'L-002': {
         orderNo: 'PO-20260625-002',
         orderType: 'external',
         items: [
-          { type: '净菜包', packName: '白菜', packSize: 2, packSpec: '1000g', cutSpec: '50mm*30mm*30mm · 宽段 · 平刀', weightPerPack: 1000, weighed: 2000, icon: '🥬' },
-          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: '大份800g', weightPerPack: 800, weighed: 1600, icon: '🍱' }
+          { type: '净菜包', packName: '白菜', packSize: 2, packSpec: {baseGram:1000, unit:'袋'}, cutSpec: {length:50, width:30, height:30, shape:'宽段', technique:'平刀'}, weightPerPack: 1000, weighed: 2000, icon: '🥬' },
+          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: {baseGram:800, unit:'份', portion:'大份'}, weightPerPack: 800, weighed: 1600, icon: '🍱' }
         ]
       },
       'L-003': {
         orderNo: 'PO-20260625-003',
         orderType: 'internal',
         items: [
-          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: '真空包装', weightPerPack: 500, weighed: 2000, icon: '🍱' }
+          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: {baseGram:500, unit:'份'}, packMethod: '真空袋', weightPerPack: 500, weighed: 2000, icon: '🍱' }
         ]
       }
     };
@@ -502,8 +564,8 @@
             '<div class="item-row__action">' + actionHtml + '</div>' +
           '</div>' +
           '<div class="item-card__meta">' +
-            '<div class="item-card__meta-item"><span class="item-card__meta-label">包装规格:</span><span class="item-card__meta-value">' + (item.packSpec || '—') + '</span></div>' +
-            '<div class="item-card__meta-item"><span class="item-card__meta-label">净菜类型:</span><span class="item-card__meta-value">' + (isMeal ? '—' : (item.cutSpec || '—')) + '</span></div>' +
+            '<div class="item-card__meta-item"><span class="item-card__meta-label">包装规格:</span><span class="item-card__meta-value">' + formatSpec(typeof item.packSpec === 'object' ? item.packSpec : parseLegacyPackSpec(item.packSpec)) + '</span></div>' +
+            '<div class="item-card__meta-item"><span class="item-card__meta-label">净菜类型:</span><span class="item-card__meta-value">' + (isMeal ? '—' : formatCutSpec(typeof item.cutSpec === 'object' ? item.cutSpec : parseLegacyCutSpec(item.cutSpec))) + '</span></div>' +
           '</div>' +
           '<div class="item-card__data">' +
             '<div class="item-card__data-item"><span class="item-card__data-label">应称重量:</span><span class="item-card__data-value">' + totalDue + 'g</span></div>' +
@@ -568,7 +630,7 @@
       list.innerHTML = '';
       empty.classList.add('hide');
 
-      /* 构建净菜类型映射 */
+      /* 构建净菜类型映射(结构化 cutSpec → formatCutSpec 渲染) */
       var cutSpecMap = {};
       allItems.forEach(function(item) {
         if (item.cutSpec) cutSpecMap[item.packName] = item.cutSpec;
@@ -576,7 +638,8 @@
 
       selected.forEach(function(key) {
         var r = aiResults[key];
-        var cutSpec = cutSpecMap[r.name] || '';
+        var rawCutSpec = cutSpecMap[r.name];
+        var cutSpec = rawCutSpec ? formatCutSpec(typeof rawCutSpec === 'object' ? rawCutSpec : parseLegacyCutSpec(rawCutSpec)) : '';
         var card = document.createElement('div');
         card.className = 'candidate-card';
         card.onclick = function() { confirmCandidateDirect(r); };
@@ -702,14 +765,15 @@
         title.textContent = '搜索结果 (' + results.length + ')';
         list.innerHTML = '';
         empty.classList.add('hide');
-        /* 构建净菜类型映射 */
+        /* 构建净菜类型映射(结构化 cutSpec → formatCutSpec 渲染) */
         var cutSpecMap2 = {};
         allItems.forEach(function(item) {
           if (item.cutSpec) cutSpecMap2[item.packName] = item.cutSpec;
         });
 
         results.forEach(function(r) {
-          var cutSpec2 = cutSpecMap2[r.name] || '';
+          var rawCutSpec2 = cutSpecMap2[r.name];
+          var cutSpec2 = rawCutSpec2 ? formatCutSpec(typeof rawCutSpec2 === 'object' ? rawCutSpec2 : parseLegacyCutSpec(rawCutSpec2)) : '';
           var card = document.createElement('div');
           card.className = 'candidate-card';
           card.onclick = function() { confirmCandidateDirect(r); };
diff --git a/other-module/canteen-device/clean-veg-packaging-labeler/label-preview.html b/other-module/canteen-device/clean-veg-packaging-labeler/label-preview.html
index b836cb8..ed733ef 100644
--- a/other-module/canteen-device/clean-veg-packaging-labeler/label-preview.html
+++ b/other-module/canteen-device/clean-veg-packaging-labeler/label-preview.html
@@ -172,6 +172,62 @@
 <div class="toast" id="toast"></div>
 
 <script>
+  /* === 规格工具函数(从 spec-utils-reference.md 内联) === */
+  function formatGram(g) {
+    if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+    g = Number(g);
+    if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+    if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+    return g + 'g';
+  }
+  function formatSpec(spec) {
+    if (!spec) return '—';
+    if (typeof spec === 'string') return spec;
+    if (!spec.baseGram) return spec.unit || '—';
+    var w = formatGram(spec.baseGram);
+    if (spec.unit === '散装') return '散装/' + w;
+    return w + '/' + (spec.unit || '');
+  }
+  function formatCutSpec(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 shapeStr = cut.shape || '';
+    var techStr = cut.technique ? ' · ' + cut.technique : '';
+    return dimStr + shapeStr + techStr;
+  }
+  function parseLegacyCutSpec(s) {
+    if (!s) return null;
+    if (typeof s === 'object') return s;
+    var normalized = String(s).replace(/×/g, '*').replace(/\s/g, '');
+    var m = normalized.match(/^(?:(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm)?·?([^·]+)·?([^·]+)?$/);
+    if (!m) return { shape: s };
+    return {
+      length:    m[1] ? parseFloat(m[1]) : undefined,
+      width:     m[2] ? parseFloat(m[2]) : undefined,
+      height:    m[3] ? parseFloat(m[3]) : undefined,
+      shape:     m[4] || '',
+      technique: m[5] || ''
+    };
+  }
+  function parseLegacyPackSpec(s) {
+    if (!s) return { baseGram: 0, unit: '', packMethod: '' };
+    if (typeof s === 'object') return s;
+    var str = String(s).trim();
+    if (!/\d/.test(str)) return { baseGram: 0, unit: '', packMethod: str };
+    var m = str.match(/^(?:(标准份|小份|大份|迷你份|加大份))?(?:(\d+(?:\.\d+)?)\s*(g|kg))?\/?(袋|盒|箱|盘|份|筐|瓶|罐|桶|散装)?$/);
+    if (!m) return { baseGram: 0, unit: '', packMethod: str };
+    var baseGram = 0;
+    if (m[2]) {
+      baseGram = parseFloat(m[2]);
+      if (m[3] === 'kg') baseGram *= 1000;
+    }
+    return { baseGram: baseGram, unit: m[4] || '', portion: m[1] || '', packMethod: '' };
+  }
+
   /* ---- 工具函数 ---- */
   function getUrlParam(name) {
     var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
@@ -185,33 +241,39 @@
   document.getElementById('topUser').textContent = userName;
   document.getElementById('userAvatar').textContent = userName.charAt(0);
 
-  /* ---- Mock 数据 ---- */
+  /* ---- Mock 数据 ----
+   * 字段说明:
+   *   cutSpec: 结构化对象 {length,width,height,shape,technique}(任务 4.4)
+   *   packSpec: 结构化对象 {baseGram, unit, portion?}(任务 4.4)
+   *   packSize: 包装份数(原字段 portions 重命名,任务 4.4)
+   */
   var mockData = {
     orderNo: 'PO-20260625-001',
     orderType: 'internal',
     packDate: '2026-06-25',
-    /* 净菜包：食材名 + 净菜类型 */
+    /* 净菜包:食材名 + 净菜类型 */
     vegPacks: [
-      { type: '净菜包', name: '土豆', cutSpec: '20mm×1mm×1mm · 细丝 · 平刀', packSpec: '500g', portions: 3, shelfLife: '3天', storageTemp: '0~4℃ 冷藏', expiryDate: '2026-06-28' },
-      { type: '净菜包', name: '胡萝卜', cutSpec: '20mm×1mm×1mm · 细丝 · 平刀', packSpec: '500g', portions: 3, shelfLife: '3天', storageTemp: '0~4℃ 冷藏', expiryDate: '2026-06-28' }
+      { type: '净菜包', name: '土豆', cutSpec: {length:20, width:1, height:1, shape:'细丝', technique:'平刀'}, packSpec: {baseGram:500, unit:'袋'}, packSize: 3, shelfLife: '3天', storageTemp: '0~4℃ 冷藏', expiryDate: '2026-06-28' },
+      { type: '净菜包', name: '胡萝卜', cutSpec: {length:20, width:1, height:1, shape:'细丝', technique:'平刀'}, packSpec: {baseGram:500, unit:'袋'}, packSize: 3, shelfLife: '3天', storageTemp: '0~4℃ 冷藏', expiryDate: '2026-06-28' }
     ],
     /* 餐品净菜包 */
     mealPacks: [
-      { type: '餐品净菜包', name: '宫保鸡丁套餐', packSpec: '大份800g', portions: 2, shelfLife: '2天', storageTemp: '0~4℃ 冷藏', expiryDate: '2026-06-27' }
+      { type: '餐品净菜包', name: '宫保鸡丁套餐', packSpec: {baseGram:800, unit:'份', portion:'大份'}, packSize: 2, shelfLife: '2天', storageTemp: '0~4℃ 冷藏', expiryDate: '2026-06-27' }
     ]
   };
 
-  /* 计算总重量 */
+  /* 计算总重量：packSpec 结构化为 {baseGram, unit[, portion]} 后直接读取 baseGram */
   function calcTotalWeight() {
     var total = 0;
     mockData.vegPacks.forEach(function(v) {
-      var w = parseInt(v.packSpec) || 0;
-      total += w * v.portions;
+      var specObj = typeof v.packSpec === 'object' ? v.packSpec : parseLegacyPackSpec(v.packSpec);
+      var w = (specObj && specObj.baseGram) || 0;
+      total += w * v.packSize;
     });
     mockData.mealPacks.forEach(function(m) {
-      var specMatch = m.packSpec.match(/(\d+)g/);
-      var w = specMatch ? parseInt(specMatch[1]) : 0;
-      total += w * m.portions;
+      var specObj = typeof m.packSpec === 'object' ? m.packSpec : parseLegacyPackSpec(m.packSpec);
+      var w = (specObj && specObj.baseGram) || 0;
+      total += w * m.packSize;
     });
     return total;
   }
@@ -222,26 +284,29 @@
     var orderTypeLabel = mockData.orderType === 'internal' ? '内供订单' : '外售订单';
     var totalWeight = calcTotalWeight();
 
-    /* 包装项明细行 */
+    /* 包装项明细行：cutSpec/packSpec 改为 formatCutSpec/formatSpec 渲染 */
     var detailRows = '';
     mockData.vegPacks.forEach(function(v, vi) {
+      var cutObj = typeof v.cutSpec === 'object' ? v.cutSpec : parseLegacyCutSpec(v.cutSpec);
+      var specObj = typeof v.packSpec === 'object' ? v.packSpec : parseLegacyPackSpec(v.packSpec);
       detailRows += '<tr>'
         + '<td>' + (vi + 1) + '</td>'
         + '<td><span class="type-tag type-tag--veg">净菜包</span></td>'
         + '<td>' + v.name + '</td>'
-        + '<td>' + v.cutSpec + '</td>'
-        + '<td>' + v.packSpec + '</td>'
-        + '<td>' + v.portions + '份</td>'
+        + '<td>' + formatCutSpec(cutObj) + '</td>'
+        + '<td>' + formatSpec(specObj) + '</td>'
+        + '<td>' + v.packSize + '份</td>'
         + '</tr>';
     });
     mockData.mealPacks.forEach(function(m, mi) {
+      var specObj = typeof m.packSpec === 'object' ? m.packSpec : parseLegacyPackSpec(m.packSpec);
       detailRows += '<tr>'
         + '<td>' + (mockData.vegPacks.length + mi + 1) + '</td>'
         + '<td><span class="type-tag type-tag--meal">餐品净菜包</span></td>'
         + '<td>' + m.name + '</td>'
         + '<td>—</td>'
-        + '<td>' + m.packSpec + '</td>'
-        + '<td>' + m.portions + '份</td>'
+        + '<td>' + formatSpec(specObj) + '</td>'
+        + '<td>' + m.packSize + '份</td>'
         + '</tr>';
     });
 
@@ -271,7 +336,9 @@
     var html = '';
 
     mockData.vegPacks.forEach(function(v) {
-      for (var p = 0; p < v.portions; p++) {
+      var cutObj = typeof v.cutSpec === 'object' ? v.cutSpec : parseLegacyCutSpec(v.cutSpec);
+      var specObj = typeof v.packSpec === 'object' ? v.packSpec : parseLegacyPackSpec(v.packSpec);
+      for (var p = 0; p < v.packSize; p++) {
         var code = mockData.orderNo + '-V' + v.name.charAt(0) + (p + 1);
         html += ''
           + '<div class="label-sticker">'
@@ -279,10 +346,10 @@
           +     '<span class="label-sticker__title-bar label-sticker__title-bar--green">净菜标签</span>'
           +     '<div class="label-info" style="margin-top:4px">'
           +       '<div class="label-info__item"><span class="label-info__label">净菜名称：</span><span class="label-info__value">' + v.name + '</span></div>'
-          +       '<div class="label-info__item"><span class="label-info__label">净菜类型：</span><span class="label-info__value">' + v.cutSpec + '</span></div>'
+          +       '<div class="label-info__item"><span class="label-info__label">净菜类型：</span><span class="label-info__value">' + formatCutSpec(cutObj) + '</span></div>'
           +     '</div>'
           +     '<div class="label-info">'
-          +       '<div class="label-info__item"><span class="label-info__label">包装规格：</span><span class="label-info__value">' + v.packSpec + '</span></div>'
+          +       '<div class="label-info__item"><span class="label-info__label">包装规格：</span><span class="label-info__value">' + formatSpec(specObj) + '</span></div>'
           +       '<div class="label-info__item"><span class="label-info__label">包装日期：</span><span class="label-info__value">' + mockData.packDate + '</span></div>'
           +       '<div class="label-info__item"><span class="label-info__label">订单号：</span><span class="label-info__value">' + mockData.orderNo + '</span></div>'
           +     '</div>'
@@ -305,7 +372,8 @@
     var html = '';
 
     mockData.mealPacks.forEach(function(m) {
-      for (var p = 0; p < m.portions; p++) {
+      var specObj = typeof m.packSpec === 'object' ? m.packSpec : parseLegacyPackSpec(m.packSpec);
+      for (var p = 0; p < m.packSize; p++) {
         var code = mockData.orderNo + '-M' + (p + 1);
         html += ''
           + '<div class="label-sticker">'
@@ -315,7 +383,7 @@
           +       '<div class="label-info__item"><span class="label-info__label">餐品名称：</span><span class="label-info__value">' + m.name + '</span></div>'
           +     '</div>'
           +     '<div class="label-info">'
-          +       '<div class="label-info__item"><span class="label-info__label">包装规格：</span><span class="label-info__value">' + m.packSpec + '</span></div>'
+          +       '<div class="label-info__item"><span class="label-info__label">包装规格：</span><span class="label-info__value">' + formatSpec(specObj) + '</span></div>'
           +       '<div class="label-info__item"><span class="label-info__label">包装日期：</span><span class="label-info__value">' + mockData.packDate + '</span></div>'
           +       '<div class="label-info__item"><span class="label-info__label">订单号：</span><span class="label-info__value">' + mockData.orderNo + '</span></div>'
           +     '</div>'
@@ -354,27 +422,27 @@
     else if (tab === 'meal') btn.classList.add('print-btn--orange');
   }
 
-  /* ---- 打印当前标签 ---- */
+  /* ---- 打印当前标签：按 packSize 计数 ---- */
   function handlePrintCurrent() {
     var labels = [];
     if (currentTab === 'order') labels.push('订单标签');
     else if (currentTab === 'veg') {
       mockData.vegPacks.forEach(function(v) {
-        for (var p = 0; p < v.portions; p++) { labels.push('净菜标签 — ' + v.name); }
+        for (var p = 0; p < v.packSize; p++) { labels.push('净菜标签 — ' + v.name); }
       });
     } else if (currentTab === 'meal') {
       mockData.mealPacks.forEach(function(m) {
-        for (var p = 0; p < m.portions; p++) { labels.push('餐品净菜包标签 — ' + m.name); }
+        for (var p = 0; p < m.packSize; p++) { labels.push('餐品净菜包标签 — ' + m.name); }
       });
     }
     showToast('已发送打印指令：' + labels.length + ' 张标签', 2000, 'success');
   }
 
-  /* ---- 全部打印 ---- */
+  /* ---- 全部打印：按 packSize 计数 ---- */
   function handlePrintAll() {
     var total = 1; /* 订单标签 1 张 */
-    mockData.vegPacks.forEach(function(v) { total += v.portions; });
-    mockData.mealPacks.forEach(function(m) { total += m.portions; });
+    mockData.vegPacks.forEach(function(v) { total += v.packSize; });
+    mockData.mealPacks.forEach(function(m) { total += m.packSize; });
     showToast('已发送全部打印指令：共 ' + total + ' 张标签', 2500, 'success');
   }
 
diff --git a/other-module/canteen-device/clean-veg-ratio-scale/03-settings.html b/other-module/canteen-device/clean-veg-ratio-scale/03-settings.html
index 8e97eb9..feab055 100644
--- a/other-module/canteen-device/clean-veg-ratio-scale/03-settings.html
+++ b/other-module/canteen-device/clean-veg-ratio-scale/03-settings.html
@@ -68,21 +68,24 @@
     <div class="settings-content">
       <div class="settings-section" id="section-cutting">
         <div class="section-title">加工参数配置</div>
+        <div class="setting-item__hint" style="background:rgba(74,144,217,0.08);border:1px solid rgba(74,144,217,0.2);border-radius:8px;padding:10px 12px;margin-bottom:12px;font-size:11px;color:rgba(255,255,255,0.6);line-height:1.5;">
+          ℹ️ 以下默认值从食材档案 <code style="color:#4a90d9">vegTypes.cutSpec</code> 自动读取,此处仅作设备级覆盖(切配类型字典 <code style="color:#4a90d9">spec_cut_shape</code>)。
+        </div>
         <div class="setting-item">
-          <div class="setting-item__info"><div class="setting-item__label">默认丝条粗细</div><div class="setting-item__desc">丝条规格的标准粗细</div></div>
+          <div class="setting-item__info"><div class="setting-item__label">默认丝条粗细</div><div class="setting-item__desc">丝条规格的标准粗细(单位统一为 mm)</div></div>
           <div class="setting-item__control"><input type="number" class="setting-input" value="3" min="1" max="10"> <span style="color: rgba(255,255,255,0.5); font-size: 12px; margin-left: 4px">mm</span></div>
         </div>
         <div class="setting-item">
-          <div class="setting-item__info"><div class="setting-item__label">默认滚刀块大小</div><div class="setting-item__desc">滚刀块规格的标准大小</div></div>
-          <div class="setting-item__control"><select class="setting-select"><option>小(2cm)</option><option selected>中(3cm)</option><option>大(5cm)</option></select></div>
+          <div class="setting-item__info"><div class="setting-item__label">默认滚刀块大小</div><div class="setting-item__desc">滚刀块规格的标准大小(单位统一为 mm)</div></div>
+          <div class="setting-item__control"><select class="setting-select"><option>小(20mm)</option><option selected>中(30mm)</option><option>大(50mm)</option></select></div>
         </div>
         <div class="setting-item">
-          <div class="setting-item__info"><div class="setting-item__label">默认方丁大小</div><div class="setting-item__desc">方丁规格的标准大小</div></div>
+          <div class="setting-item__info"><div class="setting-item__label">默认方丁大小</div><div class="setting-item__desc">方丁规格的标准大小(mm)</div></div>
           <div class="setting-item__control"><select class="setting-select"><option>小(5mm)</option><option selected>中(10mm)</option><option>大(15mm)</option></select></div>
         </div>
         <div class="setting-item">
-          <div class="setting-item__info"><div class="setting-item__label">默认刀工</div><div class="setting-item__desc">默认使用的刀工方式</div></div>
-          <div class="setting-item__control"><select class="setting-select"><option selected>直刀</option><option>斜刀</option><option>花刀</option></select></div>
+          <div class="setting-item__info"><div class="setting-item__label">默认刀工</div><div class="setting-item__desc">引用切配类型字典(spec_cut_shape)</div></div>
+          <div class="setting-item__control"><select class="setting-select"><option selected>直刀</option><option>斜刀</option><option>花刀</option><option>平刀</option></select></div>
         </div>
       </div>
       <div class="settings-section" id="section-ai" style="display:none">
@@ -102,9 +105,8 @@
       </div>
       <div class="settings-section" id="section-scale" style="display:none">
         <div class="section-title">秤参数配置</div>
-        <div class="setting-item">
-          <div class="setting-item__info"><div class="setting-item__label">重量单位</div><div class="setting-item__desc">称重显示单位</div></div>
-          <div class="setting-item__control"><select class="setting-select"><option selected>斤</option><option>克</option><option>千克</option></select></div>
+        <div class="setting-item__hint" style="background:rgba(250,173,22,0.08);border:1px solid rgba(250,173,22,0.2);border-radius:8px;padding:10px 12px;margin-bottom:12px;font-size:11px;color:rgba(255,255,255,0.6);line-height:1.5;">
+          ⚠️ 存储单位已统一为克(g)(任务 4.2),展示层由 <code style="color:#faad14">formatGramForCanteen</code> 自动还原"斤",本设备不再提供单位切换。
         </div>
         <div class="setting-item">
           <div class="setting-item__info"><div class="setting-item__label">小数位数</div><div class="setting-item__desc">重量显示精度</div></div>
diff --git a/other-module/canteen-device/ratio-scale/01-packing-tasks.html b/other-module/canteen-device/ratio-scale/01-packing-tasks.html
index 48fadca..b92393b 100644
--- a/other-module/canteen-device/ratio-scale/01-packing-tasks.html
+++ b/other-module/canteen-device/ratio-scale/01-packing-tasks.html
@@ -162,6 +162,96 @@
   </div>
 
   <script>
+    /* ============== 规格体系工具函数（任务 4.5 内联，权威源 spec-utils-reference.md） ============== */
+    /* 克重 → 斤展示（≥500g 显示"X斤"，不足 1 斤显示克重） */
+    function formatGram(g) {
+      if (g === undefined || g === null || isNaN(g)) return '--';
+      if (g < 500) return g + 'g';
+      var jin = (g / 500).toFixed(1).replace(/\.0$/, '');
+      return jin + '斤';
+    }
+    /* 包装规格结构化对象 → 展示字符串（支持对象和旧字符串形态） */
+    function formatSpec(spec) {
+      if (!spec) return '—';
+      if (typeof spec === 'string') return spec;
+      if (typeof spec === 'object') {
+        var parts = [];
+        if (spec.portion) parts.push(spec.portion);
+        if (spec.baseGram) parts.push(spec.baseGram + 'g');
+        if (spec.unit) parts.push('/ ' + spec.unit);
+        return parts.length ? parts.join(' ') : '—';
+      }
+      return '—';
+    }
+    /* 切配规格结构化对象 → 展示字符串（4 种旧字符串格式兼容） */
+    function formatCutSpec(cutSpec) {
+      if (!cutSpec) return '';
+      if (typeof cutSpec === 'string') return cutSpec;
+      if (typeof cutSpec === 'object') {
+        var parts = [];
+        if (cutSpec.length && cutSpec.width && cutSpec.height) {
+          parts.push(cutSpec.length + 'mm×' + cutSpec.width + 'mm×' + cutSpec.height + 'mm');
+        }
+        if (cutSpec.shape) parts.push(cutSpec.shape);
+        if (cutSpec.technique) parts.push(cutSpec.technique);
+        return parts.join(' · ');
+      }
+      return '';
+    }
+    /* 兼容解析旧版切配规格字符串为结构化对象 */
+    function parseLegacyCutSpec(str) {
+      if (!str) return null;
+      if (typeof str !== 'string') return str;
+      var s = str.trim();
+      var obj = { length: 0, width: 0, height: 0, shape: '', technique: '' };
+      var dimsMatch = s.match(/(\d+(?:\.\d+)?)\s*mm?\s*[\*×xX]\s*(\d+(?:\.\d+)?)\s*mm?\s*[\*×xX]\s*(\d+(?:\.\d+)?)\s*mm?/);
+      if (dimsMatch) {
+        obj.length = parseFloat(dimsMatch[1]);
+        obj.width = parseFloat(dimsMatch[2]);
+        obj.height = parseFloat(dimsMatch[3]);
+        s = s.substring(s.indexOf(dimsMatch[0]) + dimsMatch[0].length);
+      }
+      var tokens = s.split(/[·\-\s,，]+/).filter(function(t) { return t.trim(); });
+      tokens.forEach(function(tok) {
+        if (/丝|片|丁|块|段|条|末|蓉/.test(tok) && !obj.shape) obj.shape = tok.trim();
+        else if (/刀|平刀|斜刀|直刀|花刀/.test(tok) && !obj.technique) obj.technique = tok.trim();
+      });
+      return obj;
+    }
+    /* 兼容解析旧版包装规格字符串为结构化对象（'500g' / '大份800g' / '标准份500g' / '真空袋'） */
+    function parseLegacyPackSpec(str) {
+      if (!str) return null;
+      if (typeof str !== 'object') {
+        var s = String(str).trim();
+        var m = s.match(/^(大份|小份|标准份|迷你份)?\s*(\d+(?:\.\d+)?)?\s*(g|克|斤|份|袋|盒)?$/);
+        var portion = (m && m[1]) || '';
+        var baseGram = (m && m[2]) ? parseFloat(m[2]) : 0;
+        var unit = (m && m[3]) || '';
+        if (unit === '克') unit = 'g';
+        if (!unit) unit = baseGram ? '份' : '袋';
+        return { portion: portion, baseGram: baseGram, unit: unit };
+      }
+      return str;
+    }
+    /* 跨页共享：从 localStorage 加载餐品净菜包规格数据（key: dish_specs_v1） */
+    var DISH_SPECS_KEY = 'dish_specs_v1';
+    function loadDishSpecs() {
+      try {
+        var raw = localStorage.getItem(DISH_SPECS_KEY);
+        if (raw) return JSON.parse(raw);
+      } catch(e) {}
+      return {};
+    }
+    /* packSpec 兜底：从跨页共享表查（用于 mockData 与运营配置不一致时的兜底） */
+    function resolvePackSpec(pack) {
+      if (pack.packSpec && typeof pack.packSpec === 'object') return pack.packSpec;
+      if (pack.packSpec && typeof pack.packSpec === 'string') return parseLegacyPackSpec(pack.packSpec);
+      var dishSpecs = loadDishSpecs();
+      var key = pack.packName || pack.name;
+      if (key && dishSpecs[key]) return dishSpecs[key];
+      return null;
+    }
+
     /* 获取 URL 参数 */
     function getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
@@ -175,7 +265,7 @@
     /* 当前 Tab 筛选 */
     var currentFilter = 'pending';
 
-    /* 模拟数据：仅展示餐品净菜包订单 */
+    /* 模拟数据：packSpec 改为结构化对象（baseGram+unit+portion），切配规格在 02 页体现 */
     var mockData = [
       {
         orderNo: 'PO-20260616-001',
@@ -183,7 +273,7 @@
         expectedArrival: '2026-06-17 11:30',
         taskNo: 'T-001',
         mealPacks: [
-          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 3, packSpec: '大份800g', ingredients: [
+          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 3, packSpec: {portion:'大份', baseGram:800, unit:'份'}, ingredients: [
             { name: '土豆', icon: '&#x1F954;', weightPerPack: 300, weighed: 0 },
             { name: '胡萝卜', icon: '&#x1F955;', weightPerPack: 250, weighed: 0 },
             { name: '黄瓜', icon: '&#x1F952;', weightPerPack: 250, weighed: 0 }
@@ -200,14 +290,14 @@
         expectedArrival: '2026-06-17 12:00',
         taskNo: 'T-002',
         mealPacks: [
-          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: '大份800g', ingredients: [
+          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: {portion:'大份', baseGram:800, unit:'份'}, ingredients: [
             { name: '白菜', icon: '&#x1F96C;', weightPerPack: 400, weighed: 0 },
             { name: '胡萝卜', icon: '&#x1F955;', weightPerPack: 400, weighed: 0 }
           ], seasonings: [
             { name: '醋', cellIdx: 2, weightPerPack: 8, weighed: 0 },
             { name: '料酒', cellIdx: 4, weightPerPack: 12, weighed: 0 }
           ]},
-          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 2, packSpec: '标准份500g', ingredients: [
+          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 2, packSpec: {portion:'标准份', baseGram:500, unit:'份'}, ingredients: [
             { name: '番茄', icon: '&#x1F345;', weightPerPack: 300, weighed: 0 },
             { name: '鸡蛋', icon: '&#x1F95A;', weightPerPack: 200, weighed: 0 }
           ], seasonings: [
@@ -222,7 +312,7 @@
         expectedArrival: '2026-06-17 14:30',
         taskNo: 'T-003',
         mealPacks: [
-          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: '大份500g', ingredients: [
+          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: {portion:'大份', baseGram:500, unit:'份'}, ingredients: [
             { name: '番茄炒蛋', icon: '&#x1F958;', weightPerPack: 500, weighed: 2000 }
           ], seasonings: [
             { name: '盐', cellIdx: 2, weightPerPack: 5, weighed: 20 },
@@ -236,7 +326,7 @@
         expectedArrival: '2026-06-17 16:00',
         taskNo: 'T-004',
         mealPacks: [
-          { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 5, packSpec: '标准份500g', ingredients: [
+          { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 5, packSpec: {portion:'标准份', baseGram:500, unit:'份'}, ingredients: [
             { name: '凉拌黄瓜', icon: '&#x1F958;', weightPerPack: 500, weighed: 2500 }
           ], seasonings: [
             { name: '醋', cellIdx: 2, weightPerPack: 6, weighed: 30 },
@@ -329,11 +419,15 @@
           var packDone = !hasPendingPack(pack);
           var weightClass = packDone ? 'parent-weight--done' : '';
 
+          /* packSpec 结构化为对象后用 formatSpec 渲染（兼容旧字符串和跨页共享表） */
+          var specObj = resolvePackSpec(pack);
+          var specText = specObj ? formatSpec(specObj) : '—';
+
           var parentRow = document.createElement('div');
           parentRow.className = 'item-parent-row';
           parentRow.innerHTML =
           '<div class="parent-name"><div class="parent-icon">&#x1F4E6;</div><span class="parent-name__text">' + pack.packName + '</span></div>' +
-          '<div style="text-align:center"><span class="pack-spec-tag">' + (pack.packSpec || '—') + '</span></div>' +
+          '<div style="text-align:center"><span class="pack-spec-tag">' + specText + '</span></div>' +
           '<div class="parent-weight ' + weightClass + '">' + totalNeed + ' 克</div>' +
           '<div class="parent-weight ' + weightClass + '">' + totalWeighed + ' 克</div>' +
           '<div style="text-align:center"><span class="status-tag ' + (packDone ? 'status-tag--done' : 'status-tag--wait') + '">' + (packDone ? '已完成' : '待组配') + '</span></div>' +
diff --git a/other-module/canteen-device/ratio-scale/02-weighing-packing.html b/other-module/canteen-device/ratio-scale/02-weighing-packing.html
index 6e78a43..db850f7 100644
--- a/other-module/canteen-device/ratio-scale/02-weighing-packing.html
+++ b/other-module/canteen-device/ratio-scale/02-weighing-packing.html
@@ -520,6 +520,95 @@
   <div class="toast" id="toast"></div>
 
   <script>
+    /* ============== 规格体系工具函数（任务 4.5 内联，权威源 spec-utils-reference.md） ============== */
+    /* 克重 → 斤展示（≥500g 显示"X斤"，不足 1 斤显示克重） */
+    function formatGram(g) {
+      if (g === undefined || g === null || isNaN(g)) return '--';
+      if (g < 500) return g + 'g';
+      var jin = (g / 500).toFixed(1).replace(/\.0$/, '');
+      return jin + '斤';
+    }
+    /* 包装规格结构化对象 → 展示字符串（支持对象和旧字符串形态） */
+    function formatSpec(spec) {
+      if (!spec) return '—';
+      if (typeof spec === 'string') return spec;
+      if (typeof spec === 'object') {
+        var parts = [];
+        if (spec.portion) parts.push(spec.portion);
+        if (spec.baseGram) parts.push(spec.baseGram + 'g');
+        if (spec.unit) parts.push('/ ' + spec.unit);
+        return parts.length ? parts.join(' ') : '—';
+      }
+      return '—';
+    }
+    /* 切配规格结构化对象 → 展示字符串（4 种旧字符串格式兼容） */
+    function formatCutSpec(cutSpec) {
+      if (!cutSpec) return '';
+      if (typeof cutSpec === 'string') return cutSpec;
+      if (typeof cutSpec === 'object') {
+        var parts = [];
+        if (cutSpec.length && cutSpec.width && cutSpec.height) {
+          parts.push(cutSpec.length + 'mm×' + cutSpec.width + 'mm×' + cutSpec.height + 'mm');
+        }
+        if (cutSpec.shape) parts.push(cutSpec.shape);
+        if (cutSpec.technique) parts.push(cutSpec.technique);
+        return parts.join(' · ');
+      }
+      return '';
+    }
+    /* 兼容解析旧版切配规格字符串为结构化对象 */
+    function parseLegacyCutSpec(str) {
+      if (!str) return null;
+      if (typeof str !== 'string') return str;
+      var s = str.trim();
+      var obj = { length: 0, width: 0, height: 0, shape: '', technique: '' };
+      var dimsMatch = s.match(/(\d+(?:\.\d+)?)\s*mm?\s*[\*×xX]\s*(\d+(?:\.\d+)?)\s*mm?\s*[\*×xX]\s*(\d+(?:\.\d+)?)\s*mm?/);
+      if (dimsMatch) {
+        obj.length = parseFloat(dimsMatch[1]);
+        obj.width = parseFloat(dimsMatch[2]);
+        obj.height = parseFloat(dimsMatch[3]);
+        s = s.substring(s.indexOf(dimsMatch[0]) + dimsMatch[0].length);
+      }
+      var tokens = s.split(/[·\-\s,，]+/).filter(function(t) { return t.trim(); });
+      tokens.forEach(function(tok) {
+        if (/丝|片|丁|块|段|条|末|蓉/.test(tok) && !obj.shape) obj.shape = tok.trim();
+        else if (/刀|平刀|斜刀|直刀|花刀/.test(tok) && !obj.technique) obj.technique = tok.trim();
+      });
+      return obj;
+    }
+    /* 兼容解析旧版包装规格字符串为结构化对象 */
+    function parseLegacyPackSpec(str) {
+      if (!str) return null;
+      if (typeof str !== 'object') {
+        var s = String(str).trim();
+        var m = s.match(/^(大份|小份|标准份|迷你份)?\s*(\d+(?:\.\d+)?)?\s*(g|克|斤|份|袋|盒)?$/);
+        var portion = (m && m[1]) || '';
+        var baseGram = (m && m[2]) ? parseFloat(m[2]) : 0;
+        var unit = (m && m[3]) || '';
+        if (unit === '克') unit = 'g';
+        if (!unit) unit = baseGram ? '份' : '袋';
+        return { portion: portion, baseGram: baseGram, unit: unit };
+      }
+      return str;
+    }
+    /* 跨页共享：从 localStorage 加载餐品净菜包规格数据（key: dish_specs_v1） */
+    var DISH_SPECS_KEY = 'dish_specs_v1';
+    function loadDishSpecs() {
+      try {
+        var raw = localStorage.getItem(DISH_SPECS_KEY);
+        if (raw) return JSON.parse(raw);
+      } catch(e) {}
+      return {};
+    }
+    function resolvePackSpec(pack) {
+      if (pack.packSpec && typeof pack.packSpec === 'object') return pack.packSpec;
+      if (pack.packSpec && typeof pack.packSpec === 'string') return parseLegacyPackSpec(pack.packSpec);
+      var dishSpecs = loadDishSpecs();
+      var key = pack.packName || pack.name;
+      if (key && dishSpecs[key]) return dishSpecs[key];
+      return null;
+    }
+
     /* ---- 工具函数 ---- */
     function getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
@@ -537,16 +626,16 @@
     document.getElementById('topUser').textContent = userName;
     document.getElementById('userAvatar').textContent = userName.charAt(0);
 
-    /* ---- 模拟数据 ---- */
+    /* ---- 模拟数据：packSpec/cutSpec 结构化为对象，切配规格 4 字段（length/width/height/shape/technique） ---- */
     var taskData = {
       'T-001': {
         orderNo: 'PO-20260616-001',
         orderType: 'internal',
         mealPacks: [
-          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 3, packSpec: '大份800g', ingredients: [
-            { name: '土豆', icon: '&#x1F954;', cutSpec: '20mm*1mm*1mm · 细丝 · 平刀', weightPerPack: 300, weighed: 0 },
-            { name: '胡萝卜', icon: '&#x1F955;', cutSpec: '20mm*1mm*1mm · 细丝 · 平刀', weightPerPack: 250, weighed: 0 },
-            { name: '黄瓜', icon: '&#x1F952;', cutSpec: '30mm*30mm*3mm · 圆片 · 平刀', weightPerPack: 250, weighed: 0 }
+          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 3, packSpec: {portion:'大份', baseGram:800, unit:'份'}, ingredients: [
+            { name: '土豆', icon: '&#x1F954;', cutSpec: {length:20, width:1, height:1, shape:'细丝', technique:'平刀'}, weightPerPack: 300, weighed: 0 },
+            { name: '胡萝卜', icon: '&#x1F955;', cutSpec: {length:20, width:1, height:1, shape:'细丝', technique:'平刀'}, weightPerPack: 250, weighed: 0 },
+            { name: '黄瓜', icon: '&#x1F952;', cutSpec: {length:30, width:30, height:3, shape:'圆片', technique:'平刀'}, weightPerPack: 250, weighed: 0 }
           ], seasonings: [
             { name: '油', icon: '&#x1F6E2;', cellIdx: 0, weightPerPack: 50, weighed: 0 },
             { name: '盐', icon: '&#x1F9C2;', cellIdx: 1, weightPerPack: 5, weighed: 0 },
@@ -562,9 +651,9 @@
         orderNo: 'PO-20260616-002',
         orderType: 'external',
         mealPacks: [
-          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: '大份800g', ingredients: [
-            { name: '白菜', icon: '&#x1F96C;', cutSpec: '50mm*30mm*30mm · 宽段 · 平刀', weightPerPack: 400, weighed: 0 },
-            { name: '胡萝卜', icon: '&#x1F955;', cutSpec: '20mm*1mm*1mm · 细丝 · 平刀', weightPerPack: 400, weighed: 0 }
+          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: {portion:'大份', baseGram:800, unit:'份'}, ingredients: [
+            { name: '白菜', icon: '&#x1F96C;', cutSpec: {length:50, width:30, height:30, shape:'宽段', technique:'平刀'}, weightPerPack: 400, weighed: 0 },
+            { name: '胡萝卜', icon: '&#x1F955;', cutSpec: {length:20, width:1, height:1, shape:'细丝', technique:'平刀'}, weightPerPack: 400, weighed: 0 }
           ], seasonings: [
             { name: '油', icon: '&#x1F6E2;', cellIdx: 0, weightPerPack: 40, weighed: 0 },
             { name: '盐', icon: '&#x1F9C2;', cellIdx: 1, weightPerPack: 4, weighed: 0 },
@@ -580,7 +669,7 @@
         orderNo: 'PO-20260616-003',
         orderType: 'internal',
         mealPacks: [
-          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: '大份500g', ingredients: [
+          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: {portion:'大份', baseGram:500, unit:'份'}, ingredients: [
             { name: '番茄炒蛋', icon: '&#x1F958;', weightPerPack: 500, weighed: 2000 }
           ], seasonings: [
             { name: '油', icon: '&#x1F6E2;', cellIdx: 0, weightPerPack: 30, weighed: 120 },
@@ -593,7 +682,7 @@
         orderNo: 'PO-20260616-004',
         orderType: 'external',
         mealPacks: [
-          { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 5, packSpec: '标准份500g', ingredients: [
+          { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 5, packSpec: {portion:'标准份', baseGram:500, unit:'份'}, ingredients: [
             { name: '凉拌黄瓜', icon: '&#x1F958;', weightPerPack: 500, weighed: 2500 }
           ], seasonings: [
             { name: '油', icon: '&#x1F6E2;', cellIdx: 0, weightPerPack: 20, weighed: 100 },
@@ -712,7 +801,10 @@
       var orderTypeLabel = task.orderType === 'internal' ? '内供订单' : '外售订单';
       var orderTypeCls = task.orderType === 'internal' ? 'order-type-tag--internal' : 'order-type-tag--external';
       orderTypeEl.innerHTML = '<span class="order-type-tag ' + orderTypeCls + '">' + orderTypeLabel + '</span>';
-      document.getElementById('taskPackName').textContent = currentPack.packName + ' · ' + (currentPack.packSpec || '—');
+      /* 餐品名称展示：packSpec 结构化为对象，使用 formatSpec 渲染 */
+      var specObj = resolvePackSpec(currentPack);
+      var specText = specObj ? formatSpec(specObj) : '—';
+      document.getElementById('taskPackName').textContent = currentPack.packName + ' · ' + specText;
 
       /* 订单状态：主辅材+调料全部完成才算完成 */
       var ingAllDone = allIngredients.every(function(ing) {
@@ -748,6 +840,9 @@
       allIngredients.forEach(function(ing, idx) {
         var need = Math.round(ing.weightPerPack * 100) / 100;
         var isDone = ing.weighed >= need;
+        /* cutSpec 结构化为对象，用 formatCutSpec 渲染（兼容旧字符串） */
+        var cutObj = ing.cutSpec ? (typeof ing.cutSpec === 'object' ? ing.cutSpec : parseLegacyCutSpec(ing.cutSpec)) : null;
+        var cutText = cutObj ? formatCutSpec(cutObj) : '—';
 
         var row = document.createElement('div');
         row.className = 'item-row';
@@ -768,7 +863,7 @@
           '<div class="item-card__data">' +
             '<div class="item-card__data-item"><span class="item-card__data-label">应称</span><span class="item-card__data-value">' + need + 'g</span></div>' +
             '<div class="item-card__data-item"><span class="item-card__data-label">已称</span><span class="item-card__data-value ' + actualClass + '">' + ing.weighed + 'g</span></div>' +
-            '<div class="item-card__data-item"><span class="item-card__data-label">净菜类型</span><span class="item-card__data-value">' + (ing.cutSpec || '—') + '</span></div>' +
+            '<div class="item-card__data-item"><span class="item-card__data-label">净菜类型</span><span class="item-card__data-value">' + cutText + '</span></div>' +
           '</div>';
 
         body.appendChild(row);
@@ -953,10 +1048,13 @@
 
       title.textContent = '智能识别候选 (' + selected.length + ')';
 
-      /* 构建净菜类型映射 */
+      /* 构建净菜类型映射：cutSpec 结构化后用 formatCutSpec 渲染为字符串 */
       var cutSpecMap = {};
       allIngredients.forEach(function(ing) {
-        if (ing.cutSpec) cutSpecMap[ing.name] = ing.cutSpec;
+        if (ing.cutSpec) {
+          var cutObj = typeof ing.cutSpec === 'object' ? ing.cutSpec : parseLegacyCutSpec(ing.cutSpec);
+          cutSpecMap[ing.name] = formatCutSpec(cutObj);
+        }
       });
 
       list.innerHTML = '';
diff --git a/other-module/canteen-device/ratio-scale/03-verify-history.html b/other-module/canteen-device/ratio-scale/03-verify-history.html
index c589c43..9ea19e0 100644
--- a/other-module/canteen-device/ratio-scale/03-verify-history.html
+++ b/other-module/canteen-device/ratio-scale/03-verify-history.html
@@ -358,6 +358,75 @@
  </div>
 
   <script>
+    /* ============== 规格体系工具函数（任务 4.5 内联，权威源 spec-utils-reference.md） ============== */
+    /* 克重 → 斤展示（≥500g 显示"X斤"，不足 1 斤显示克重） */
+    function formatGram(g) {
+      if (g === undefined || g === null || isNaN(g)) return '--';
+      if (g < 500) return g + 'g';
+      var jin = (g / 500).toFixed(1).replace(/\.0$/, '');
+      return jin + '斤';
+    }
+    /* 包装规格结构化对象 → 展示字符串（支持对象和旧字符串形态） */
+    function formatSpec(spec) {
+      if (!spec) return '—';
+      if (typeof spec === 'string') return spec;
+      if (typeof spec === 'object') {
+        var parts = [];
+        if (spec.portion) parts.push(spec.portion);
+        if (spec.baseGram) parts.push(spec.baseGram + 'g');
+        if (spec.unit) parts.push('/ ' + spec.unit);
+        return parts.length ? parts.join(' ') : '—';
+      }
+      return '—';
+    }
+    /* 切配规格结构化对象 → 展示字符串（4 种旧字符串格式兼容） */
+    function formatCutSpec(cutSpec) {
+      if (!cutSpec) return '';
+      if (typeof cutSpec === 'string') return cutSpec;
+      if (typeof cutSpec === 'object') {
+        var parts = [];
+        if (cutSpec.length && cutSpec.width && cutSpec.height) {
+          parts.push(cutSpec.length + 'mm×' + cutSpec.width + 'mm×' + cutSpec.height + 'mm');
+        }
+        if (cutSpec.shape) parts.push(cutSpec.shape);
+        if (cutSpec.technique) parts.push(cutSpec.technique);
+        return parts.join(' · ');
+      }
+      return '';
+    }
+    /* 兼容解析旧版包装规格字符串为结构化对象 */
+    function parseLegacyPackSpec(str) {
+      if (!str) return null;
+      if (typeof str !== 'object') {
+        var s = String(str).trim();
+        var m = s.match(/^(大份|小份|标准份|迷你份)?\s*(\d+(?:\.\d+)?)?\s*(g|克|斤|份|袋|盒)?$/);
+        var portion = (m && m[1]) || '';
+        var baseGram = (m && m[2]) ? parseFloat(m[2]) : 0;
+        var unit = (m && m[3]) || '';
+        if (unit === '克') unit = 'g';
+        if (!unit) unit = baseGram ? '份' : '袋';
+        return { portion: portion, baseGram: baseGram, unit: unit };
+      }
+      return str;
+    }
+    /* 跨页共享：从 localStorage 加载餐品净菜包规格数据（key: dish_specs_v1） */
+    var DISH_SPECS_KEY = 'dish_specs_v1';
+    function loadDishSpecs() {
+      try {
+        var raw = localStorage.getItem(DISH_SPECS_KEY);
+        if (raw) return JSON.parse(raw);
+      } catch(e) {}
+      return {};
+    }
+    function resolvePackSpec(pack) {
+      if (pack.packSpec && typeof pack.packSpec === 'object') return pack.packSpec;
+      if (pack.packSpec && typeof pack.packSpec === 'string') return parseLegacyPackSpec(pack.packSpec);
+      var dishSpecs = loadDishSpecs();
+      var key = pack.packName || pack.name;
+      if (key && dishSpecs[key]) return dishSpecs[key];
+      return null;
+    }
+
     /* 退出登录 */
     function handleLogout() {
       window.location.href = '00-welcome.html';
@@ -379,12 +448,12 @@
     var TODAY = '2026-06-16';
     var WEEKDAYS = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
 
-    // 组配记录数据（与组配任务页01数据结构一致，全部为已组配状态）
+    // 组配记录数据（packSpec 结构化为对象，与 01 任务页保持一致）
     var RECORDS = [
       {
         orderNo: 'PO-20260616-001', orderType: 'internal', completeTime: '2026-06-16 10:20', taskNo: 'T-001',
         mealPacks: [
-          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 3, packSpec: '大份800g', ingredients: [
+          { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 3, packSpec: {portion:'大份', baseGram:800, unit:'份'}, ingredients: [
             { name: '土豆', icon: '&#x1F954;', weightPerPack: 300, weighed: 900 },
             { name: '胡萝卜', icon: '&#x1F955;', weightPerPack: 250, weighed: 750 },
             { name: '黄瓜', icon: '&#x1F952;', weightPerPack: 250, weighed: 750 }
@@ -402,7 +471,7 @@
       {
         orderNo: 'PO-20260616-002', orderType: 'external', completeTime: '2026-06-16 11:00', taskNo: 'T-002',
         mealPacks: [
-          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: '大份800g', ingredients: [
+          { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: {portion:'大份', baseGram:800, unit:'份'}, ingredients: [
             { name: '白菜', icon: '&#x1F96C;', weightPerPack: 400, weighed: 800 },
             { name: '胡萝卜', icon: '&#x1F955;', weightPerPack: 400, weighed: 800 }
           ], seasonings: [
@@ -414,7 +483,7 @@
             { name: '料酒', cellIdx: 5, weightPerPack: 10, weighed: 20 },
             { name: '豆瓣酱', cellIdx: 6, weightPerPack: 15, weighed: 30 }
           ]},
-          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 2, packSpec: '标准份500g', ingredients: [
+          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 2, packSpec: {portion:'标准份', baseGram:500, unit:'份'}, ingredients: [
             { name: '番茄', icon: '&#x1F345;', weightPerPack: 300, weighed: 600 },
             { name: '鸡蛋', icon: '&#x1F95A;', weightPerPack: 200, weighed: 400 }
           ], seasonings: [
@@ -427,7 +496,7 @@
       {
         orderNo: 'PO-20260616-003', orderType: 'internal', completeTime: '2026-06-16 14:50', taskNo: 'T-003',
         mealPacks: [
-          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: '大份500g', ingredients: [
+          { type: '餐品净菜包', packName: '番茄炒蛋套餐', packSize: 4, packSpec: {portion:'大份', baseGram:500, unit:'份'}, ingredients: [
             { name: '番茄炒蛋', icon: '&#x1F958;', weightPerPack: 500, weighed: 2000 }
           ], seasonings: [
             { name: '油', cellIdx: 0, weightPerPack: 30, weighed: 120 },
@@ -439,7 +508,7 @@
       {
         orderNo: 'PO-20260616-004', orderType: 'external', completeTime: '2026-06-16 15:20', taskNo: 'T-004',
         mealPacks: [
-          { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 5, packSpec: '标准份500g', ingredients: [
+          { type: '餐品净菜包', packName: '凉拌黄瓜套餐', packSize: 5, packSpec: {portion:'标准份', baseGram:500, unit:'份'}, ingredients: [
             { name: '凉拌黄瓜', icon: '&#x1F958;', weightPerPack: 500, weighed: 2500 }
           ], seasonings: [
             { name: '油', cellIdx: 0, weightPerPack: 20, weighed: 100 },
@@ -725,11 +794,15 @@
           var packDone = !hasPendingPack(pack);
           var weightClass = packDone ? 'parent-weight--done' : '';
 
+          /* packSpec 结构化为对象，用 formatSpec 渲染（兼容旧字符串和跨页共享表） */
+          var specObj = resolvePackSpec(pack);
+          var specText = specObj ? formatSpec(specObj) : '—';
+
           var parentRow = document.createElement('div');
           parentRow.className = 'item-parent-row';
           parentRow.innerHTML =
           '<div class="parent-name"><div class="parent-icon">&#x1F4E6;</div><span class="parent-name__text">' + pack.packName + '</span></div>' +
-          '<div style="text-align:center"><span class="pack-spec-tag">' + (pack.packSpec || '—') + '</span></div>' +
+          '<div style="text-align:center"><span class="pack-spec-tag">' + specText + '</span></div>' +
           '<div class="parent-weight ' + weightClass + '">' + totalNeed + ' 克</div>' +
           '<div class="parent-weight ' + weightClass + '">' + totalWeighed + ' 克</div>' +
           '<div style="text-align:center"><span class="status-tag ' + (packDone ? 'status-tag--done' : 'status-tag--wait') + '">' + (packDone ? '已完成' : '待组配') + '</span></div>';
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 78c9224..6b96d00 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
@@ -1009,40 +1009,42 @@
   <div class="toast" id="toast"></div>
 
   <script>
-    /* ===== 食材目录（可称重食材，按重量验收） ===== */
+    /* ===== 食材目录（称重验收，存储单位克，展示层用 formatGramForCanteen 还原"斤"） ===== */
+    /* verifyType:'weight' 表示称重验收,可用 ['斤','公斤','克','千克'] */
     var FOOD_CATALOG = {
-      '大白菜': { price: 3.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC001' },
-      '圆白菜': { price: 4.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC002' },
-      '菠菜':   { price: 6.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC003' },
-      '油菜':   { price: 4.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC004' },
-      '生菜':   { price: 5.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC005' },
-      '芹菜':   { price: 5.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC006' },
-      '西兰花': { price: 8.0, unit: '斤', catLabel: '花菜类', traceCode: 'TRC260601-HC001' },
-      '花菜':   { price: 7.0, unit: '斤', catLabel: '花菜类', traceCode: 'TRC260601-HC002' },
-      '黄瓜':   { price: 5.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG001' },
-      '西红柿': { price: 6.5, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG002' },
-      '茄子':   { price: 5.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG003' },
-      '青椒':   { price: 6.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG004' },
-      '豆角':   { price: 7.5, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG005' },
-      '土豆':   { price: 3.0, unit: '斤', catLabel: '根茎类', traceCode: 'TRC260601-GJ001' },
-      '胡萝卜': { price: 4.0, unit: '斤', catLabel: '根茎类', traceCode: 'TRC260601-GJ002' },
-      '白菜':   { price: 3.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC007' },
-      '猪里脊': { price: 18.0, unit: '斤', catLabel: '肉禽类', traceCode: 'TRC260601-RQ001' },
-      '五花肉': { price: 16.0, unit: '斤', catLabel: '肉禽类', traceCode: 'TRC260601-RQ002' },
-      '草鱼':   { price: 14.0, unit: '斤', catLabel: '水产类', traceCode: 'TRC260601-SC001' },
-      '虾仁':   { price: 35.0, unit: '斤', catLabel: '水产类', traceCode: 'TRC260601-SC002' }
+      '大白菜': { price: 3.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC001', verifyType: 'weight' },
+      '圆白菜': { price: 4.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC002', verifyType: 'weight' },
+      '菠菜':   { price: 6.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC003', verifyType: 'weight' },
+      '油菜':   { price: 4.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC004', verifyType: 'weight' },
+      '生菜':   { price: 5.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC005', verifyType: 'weight' },
+      '芹菜':   { price: 5.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC006', verifyType: 'weight' },
+      '西兰花': { price: 8.0, unit: '斤', catLabel: '花菜类', traceCode: 'TRC260601-HC001', verifyType: 'weight' },
+      '花菜':   { price: 7.0, unit: '斤', catLabel: '花菜类', traceCode: 'TRC260601-HC002', verifyType: 'weight' },
+      '黄瓜':   { price: 5.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG001', verifyType: 'weight' },
+      '西红柿': { price: 6.5, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG002', verifyType: 'weight' },
+      '茄子':   { price: 5.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG003', verifyType: 'weight' },
+      '青椒':   { price: 6.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG004', verifyType: 'weight' },
+      '豆角':   { price: 7.5, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG005', verifyType: 'weight' },
+      '土豆':   { price: 3.0, unit: '斤', catLabel: '根茎类', traceCode: 'TRC260601-GJ001', verifyType: 'weight' },
+      '胡萝卜': { price: 4.0, unit: '斤', catLabel: '根茎类', traceCode: 'TRC260601-GJ002', verifyType: 'weight' },
+      '白菜':   { price: 3.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC007', verifyType: 'weight' },
+      '猪里脊': { price: 18.0, unit: '斤', catLabel: '肉禽类', traceCode: 'TRC260601-RQ001', verifyType: 'weight' },
+      '五花肉': { price: 16.0, unit: '斤', catLabel: '肉禽类', traceCode: 'TRC260601-RQ002', verifyType: 'weight' },
+      '草鱼':   { price: 14.0, unit: '斤', catLabel: '水产类', traceCode: 'TRC260601-SC001', verifyType: 'weight' },
+      '虾仁':   { price: 35.0, unit: '斤', catLabel: '水产类', traceCode: 'TRC260601-SC002', verifyType: 'weight' }
     };
 
-    /* ===== 调料目录（按规格/数量验收，无法称重） ===== */
+    /* ===== 调料目录（点收验收，按规格/数量验收） ===== */
+    /* verifyType:'count' 表示点收验收,可用 ['袋','瓶','箱','桶','罐','份','个','只','条','把'] */
     var SPICE_CATALOG = {
-      '酱油': { price: 12.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL001' },
-      '醋':   { price: 8.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL002' },
-      '料酒': { price: 10.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL003' },
-      '盐':   { price: 3.0, unit: '袋', spec: '500g/袋', catLabel: '调料', traceCode: 'TRC260601-TL004' },
-      '白糖': { price: 6.0, unit: '袋', spec: '1kg/袋', catLabel: '调料', traceCode: 'TRC260601-TL005' },
-      '鸡精': { price: 8.0, unit: '罐', spec: '200g/罐', catLabel: '调料', traceCode: 'TRC260601-TL006' },
-      '食用油': { price: 45.0, unit: '桶', spec: '5L/桶', catLabel: '调料', traceCode: 'TRC260601-TL007' },
-      '花椒': { price: 25.0, unit: '袋', spec: '100g/袋', catLabel: '调料', traceCode: 'TRC260601-TL008' }
+      '酱油': { price: 12.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL001', verifyType: 'count' },
+      '醋':   { price: 8.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL002', verifyType: 'count' },
+      '料酒': { price: 10.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL003', verifyType: 'count' },
+      '盐':   { price: 3.0, unit: '袋', spec: '500g/袋', catLabel: '调料', traceCode: 'TRC260601-TL004', verifyType: 'count' },
+      '白糖': { price: 6.0, unit: '袋', spec: '1kg/袋', catLabel: '调料', traceCode: 'TRC260601-TL005', verifyType: 'count' },
+      '鸡精': { price: 8.0, unit: '罐', spec: '200g/罐', catLabel: '调料', traceCode: 'TRC260601-TL006', verifyType: 'count' },
+      '食用油': { price: 45.0, unit: '桶', spec: '5L/桶', catLabel: '调料', traceCode: 'TRC260601-TL007', verifyType: 'count' },
+      '花椒': { price: 25.0, unit: '袋', spec: '100g/袋', catLabel: '调料', traceCode: 'TRC260601-TL008', verifyType: 'count' }
     };
 
     /* 判断食材是否为调料（按规格验收） */
@@ -1473,8 +1475,12 @@
           ? '<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>';
 
-        /* 规格下拉选项（采购规格 + 实收规格共用） */
-        var UNIT_OPTIONS = ['斤','公斤','克','千克','袋','瓶','箱','桶','罐','份','个','只','条','把'];
+        /* 规格下拉选项（按 verifyType 分类过滤） */
+        /* 称重类(weight):'斤','公斤','克','千克' | 计数类(count):'袋','瓶','箱','桶','罐','份','个','只','条','把' */
+        var UNIT_OPTIONS_WEIGHT = ['斤','公斤','克','千克'];
+        var UNIT_OPTIONS_COUNT  = ['袋','瓶','箱','桶','罐','份','个','只','条','把'];
+        var verifyType = info.verifyType || 'weight';
+        var UNIT_OPTIONS = (verifyType === 'count') ? UNIT_OPTIONS_COUNT : UNIT_OPTIONS_WEIGHT;
         var currentUnit = (f._customUnit !== undefined) ? f._customUnit : info.unit;
         var actualUnit = (f._actualUnit !== undefined) ? f._actualUnit : currentUnit;
         function buildUnitSelect(selected, onChangeFn) {
diff --git a/other-module/canteen-device/raw-veg-processing-scale/01-washing-tasks.html b/other-module/canteen-device/raw-veg-processing-scale/01-washing-tasks.html
index f730f6c..a7b3f12 100644
--- a/other-module/canteen-device/raw-veg-processing-scale/01-washing-tasks.html
+++ b/other-module/canteen-device/raw-veg-processing-scale/01-washing-tasks.html
@@ -260,22 +260,22 @@
             <div class="ingredient-row">
               <div class="ingredient-row__icon icon--cucumber">🥒</div>
               <span class="ingredient-row__name">黄瓜</span>
-              <span class="ingredient-row__weight">需 4.0 斤</span>
-              <span class="ingredient-row__recorded">已录 4.0 斤</span>
+              <span class="ingredient-row__weight" data-weight-g="2000">需 4 斤</span>
+              <span class="ingredient-row__recorded" data-weight-g="2000">已录 4 斤</span>
               <span class="ingredient-row__deadline">截止 10:00</span>
             </div>
             <div class="ingredient-row">
               <div class="ingredient-row__icon icon--potato"></div>
               <span class="ingredient-row__name">土豆</span>
-              <span class="ingredient-row__weight">需 5.0 斤</span>
-              <span class="ingredient-row__recorded">已录 5.0 斤</span>
+              <span class="ingredient-row__weight" data-weight-g="2500">需 5 斤</span>
+              <span class="ingredient-row__recorded" data-weight-g="2500">已录 5 斤</span>
               <span class="ingredient-row__deadline">截止 10:30</span>
             </div>
             <div class="ingredient-row">
               <div class="ingredient-row__icon icon--tomato">🍅</div>
               <span class="ingredient-row__name">西红柿</span>
-              <span class="ingredient-row__weight">需 3.5 斤</span>
-              <span class="ingredient-row__recorded">已录 3.5 斤</span>
+              <span class="ingredient-row__weight" data-weight-g="1750">需 3.5 斤</span>
+              <span class="ingredient-row__recorded" data-weight-g="1750">已录 3.5 斤</span>
               <span class="ingredient-row__deadline">截止 11:00</span>
             </div>
           </div>
@@ -296,15 +296,15 @@
             <div class="ingredient-row">
               <div class="ingredient-row__icon icon--carrot"></div>
               <span class="ingredient-row__name">胡萝卜</span>
-              <span class="ingredient-row__weight">需 2.0 斤</span>
-              <span class="ingredient-row__recorded">已录 2.0 斤</span>
+              <span class="ingredient-row__weight" data-weight-g="1000">需 2 斤</span>
+              <span class="ingredient-row__recorded" data-weight-g="1000">已录 2 斤</span>
               <span class="ingredient-row__deadline">截止 11:30</span>
             </div>
             <div class="ingredient-row">
               <div class="ingredient-row__icon icon--tomato">🍅</div>
               <span class="ingredient-row__name">小番茄</span>
-              <span class="ingredient-row__weight">需 1.5 斤</span>
-              <span class="ingredient-row__recorded">已录 1.5 斤</span>
+              <span class="ingredient-row__weight" data-weight-g="750">需 1.5 斤</span>
+              <span class="ingredient-row__recorded" data-weight-g="750">已录 1.5 斤</span>
               <span class="ingredient-row__deadline">截止 14:00</span>
             </div>
           </div>
@@ -324,22 +324,22 @@
             <div class="ingredient-row">
               <div class="ingredient-row__icon icon--cabbage">🥬</div>
               <span class="ingredient-row__name">大白菜</span>
-              <span class="ingredient-row__weight">需 8.0 斤</span>
-              <span class="ingredient-row__recorded">已录 8.0 斤</span>
+              <span class="ingredient-row__weight" data-weight-g="4000">需 8 斤</span>
+              <span class="ingredient-row__recorded" data-weight-g="4000">已录 8 斤</span>
               <span class="ingredient-row__deadline ingredient-row__deadline--overdue">截止 09:30</span>
             </div>
             <div class="ingredient-row">
               <div class="ingredient-row__icon icon--cabbage">🥬</div>
               <span class="ingredient-row__name">娃娃菜</span>
-              <span class="ingredient-row__weight">需 2.5 斤</span>
-              <span class="ingredient-row__recorded">已录 2.5 斤</span>
+              <span class="ingredient-row__weight" data-weight-g="1250">需 2.5 斤</span>
+              <span class="ingredient-row__recorded" data-weight-g="1250">已录 2.5 斤</span>
               <span class="ingredient-row__deadline">截止 10:00</span>
             </div>
             <div class="ingredient-row">
               <div class="ingredient-row__icon icon--potato"></div>
               <span class="ingredient-row__name">土豆（晚餐）</span>
-              <span class="ingredient-row__weight">需 3.0 斤</span>
-              <span class="ingredient-row__recorded">已录 3.0 斤</span>
+              <span class="ingredient-row__weight" data-weight-g="1500">需 3 斤</span>
+              <span class="ingredient-row__recorded" data-weight-g="1500">已录 3 斤</span>
               <span class="ingredient-row__deadline">截止 15:00</span>
             </div>
           </div>
@@ -353,6 +353,23 @@
   <div class="toast" id="toast"></div>
 
   <script>
+    /* === 规格工具函数(从 spec-utils-reference.md 内联) === */
+    /* 克重展示格式化:500→"500g",1500→"1.5kg",25000→"25kg" */
+    function formatGram(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+      if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+      return g + 'g';
+    }
+    /* 验收秤场景兼容"斤"显示:整500倍数显示"斤",否则回退到 formatGram */
+    function formatGramForCanteen(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g % 500 === 0) return (g / 500) + '斤';
+      return formatGram(g);
+    }
+
     // 获取 URL 参数
     function getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
@@ -423,14 +440,14 @@
           '<div class="ingredient-row">' +
             '<div class="ingredient-row__icon icon--cabbage">🥦</div>' +
             '<span class="ingredient-row__name">西兰花</span>' +
-            '<span class="ingredient-row__weight">需 3.0 斤</span>' +
+            '<span class="ingredient-row__weight" data-weight-g="1500">需 3 斤</span>' +
             '<span class="ingredient-row__recorded ingredient-row__recorded--none">未录入</span>' +
             '<span class="ingredient-row__deadline">截止 13:00</span>' +
           '</div>' +
           '<div class="ingredient-row">' +
             '<div class="ingredient-row__icon icon--carrot">🥕</div>' +
             '<span class="ingredient-row__name">芹菜</span>' +
-            '<span class="ingredient-row__weight">需 2.0 斤</span>' +
+            '<span class="ingredient-row__weight" data-weight-g="1000">需 2 斤</span>' +
             '<span class="ingredient-row__recorded ingredient-row__recorded--none">未录入</span>' +
             '<span class="ingredient-row__deadline">截止 13:30</span>' +
           '</div>' +
diff --git a/other-module/canteen-device/raw-veg-processing-scale/02-batch-weighing.html b/other-module/canteen-device/raw-veg-processing-scale/02-batch-weighing.html
index cf5330b..e6c79c6 100644
--- a/other-module/canteen-device/raw-veg-processing-scale/02-batch-weighing.html
+++ b/other-module/canteen-device/raw-veg-processing-scale/02-batch-weighing.html
@@ -346,7 +346,7 @@
         <span class="task-info__value" id="taskWeightDisplay" style="color:#faad14">--</span>
         <span style="color:rgba(255,255,255,0.15);font-size:11px">|</span>
         <span class="task-info__label">已录入</span>
-        <span class="task-info__value" id="taskActualDisplay" style="color:#52c41a">0.0 斤</span>
+        <span class="task-info__value" id="taskActualDisplay" style="color:#52c41a">0g</span>
       </div>
 
       <!-- 批次信息条 -->
@@ -401,10 +401,9 @@
         <span class="trace-row__status" id="traceStatus"></span>
       </div>
 
-      <!-- 重量显示 -->
+      <!-- 重量显示(存储单位:克,展示层用 formatGramForCanteen 还原"斤") -->
       <div class="weight-display">
-        <span class="weight-display__value" id="weightValue">0.00</span>
-        <span class="weight-display__unit">斤</span>
+        <span class="weight-display__value" id="weightValue">0g</span>
         <div class="weight-display__status" id="weightStatus">请放置食材至秤台</div>
       </div>
     </div>
@@ -418,8 +417,8 @@
           <div class="batch-stat__label">品类数</div>
         </div>
         <div class="batch-stat">
-          <div class="batch-stat__value" id="totalWeight">0.0</div>
-          <div class="batch-stat__label">总重量（斤）</div>
+          <div class="batch-stat__value" id="totalWeight">0g</div>
+          <div class="batch-stat__label">总重量</div>
         </div>
         <div class="batch-stat">
           <div class="batch-stat__value batch-stat__value--green" id="totalTraced">0</div>
@@ -459,6 +458,26 @@
   <div class="toast" id="toast"></div>
 
   <script>
+    /* === 规格工具函数(从 spec-utils-reference.md 内联) === */
+    /* 克重展示格式化:500→"500g",1500→"1.5kg",25000→"25kg" */
+    function formatGram(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+      if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+      return g + 'g';
+    }
+    /* 验收秤场景兼容"斤"显示:整500倍数显示"斤",否则回退到 formatGram */
+    /* 6250g → "12.5斤"(2位小数),整500倍数 → "N斤",其余 → formatGram */
+    function formatGramForCanteen(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g % 500 === 0) return (g / 500) + '斤';
+      if (g % 250 === 0) return ((g / 500).toFixed(1)) + '斤';  /* 半斤或0.5斤倍数 */
+      if (g % 50 === 0)  return ((g / 500).toFixed(2)) + '斤';  /* 50g倍数(0.1斤精度) */
+      return formatGram(g);
+    }
+
     // 获取 URL 参数
     function getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
@@ -469,23 +488,23 @@
     var userName = getUrlParam('user');
     if (userName) document.getElementById('topUser').textContent = '操作员: ' + userName;
 
-    // 任务单数据（含食材级应录入重量）
+    // 任务单数据（含食材级应录入重量,单位:克）
     var taskDataMap = {
       'RW-20260613-001': {
-        weight: 12.5,
-        foods: { '黄瓜': 4.0, '土豆': 5.0, '西红柿': 3.5 }
+        weight: 6250,
+        foods: { '黄瓜': 2000, '土豆': 2500, '西红柿': 1750 }
       },
       'RW-20260613-002': {
-        weight: 3.5,
-        foods: { '胡萝卜': 2.0, '小番茄': 1.5 }
+        weight: 1750,
+        foods: { '胡萝卜': 1000, '小番茄': 750 }
       },
       'RW-20260613-003': {
-        weight: 13.5,
-        foods: { '大白菜': 8.0, '娃娃菜': 2.5, '土豆（晚餐）': 3.0 }
+        weight: 6750,
+        foods: { '大白菜': 4000, '娃娃菜': 1250, '土豆（晚餐）': 1500 }
       },
       'RW-20260613-004': {
-        weight: 5.0,
-        foods: { '西兰花': 3.0, '芹菜': 2.0 }
+        weight: 2500,
+        foods: { '西兰花': 1500, '芹菜': 1000 }
       }
     };
 
@@ -585,7 +604,7 @@
       document.getElementById('taskNoDisplay').textContent = taskNo;
       var taskData = taskDataMap[taskNo];
       if (taskData) {
-        document.getElementById('taskWeightDisplay').textContent = taskData.weight.toFixed(1) + ' 斤';
+        document.getElementById('taskWeightDisplay').textContent = formatGramForCanteen(taskData.weight);
         initTaskList();
       }
     }
@@ -708,19 +727,19 @@
       document.getElementById('traceCode').textContent = '--';
       document.getElementById('traceStatus').textContent = '';
 
-      // 随机食材 + 重量动画
+      // 随机食材 + 重量动画(克为单位,500-2500g 范围)
       var item = aiResults[Math.floor(Math.random() * aiResults.length)];
-      var targetWeight = (Math.random() * 4 + 1).toFixed(2) * 1;
+      var targetWeight = Math.round((Math.random() * 2000 + 500) / 50) * 50;
 
       var anim = 0;
       var timer = setInterval(function() {
-        anim += 0.15;
+        anim += 75;
         if (anim >= targetWeight) {
           anim = targetWeight;
           clearInterval(timer);
           onStable(item, targetWeight);
         }
-        document.getElementById('weightValue').textContent = anim.toFixed(2);
+        document.getElementById('weightValue').textContent = formatGramForCanteen(anim);
       }, 100);
 
       // 延迟显示候选
@@ -782,7 +801,7 @@
         matched.trace = currentTrace;
         matched.time = new Date().toLocaleTimeString('zh-CN', { hour: '2-digit', minute: '2-digit' });
         matched.done = true;
-        showToast(foodName + ' ' + currentWeight.toFixed(2) + '斤 已录入（应 ' + matched.requiredWeight.toFixed(1) + '斤）', 1500, 'success');
+        showToast(foodName + ' ' + formatGramForCanteen(currentWeight) + ' 已录入（应 ' + formatGramForCanteen(matched.requiredWeight) + '）', 1500, 'success');
       } else {
         // 任务单外的食材，追加新行
         var entry = {
@@ -796,7 +815,7 @@
           done: true
         };
         batchItems.push(entry);
-        showToast(foodName + ' ' + currentWeight.toFixed(2) + '斤 已录入', 1500, 'success');
+        showToast(foodName + ' ' + formatGramForCanteen(currentWeight) + ' 已录入', 1500, 'success');
       }
 
       renderBatchList();
@@ -856,8 +875,8 @@
         var el = document.createElement('div');
         el.className = 'batch-item' + (item.done ? '' : ' batch-item--pending');
 
-        var requiredHtml = item.requiredWeight !== null ? item.requiredWeight.toFixed(1) + '斤' : '--';
-        var actualHtml = item.done ? item.weight.toFixed(2) + '斤' : '--';
+        var requiredHtml = item.requiredWeight !== null ? formatGramForCanteen(item.requiredWeight) : '--';
+        var actualHtml = item.done ? formatGramForCanteen(item.weight) : '--';
         var statusHtml = item.done
           ? '<span class="batch-item__status batch-item__status--done">已完成</span>'
           : '<span class="batch-item__status batch-item__status--pending">待称重</span>';
@@ -890,11 +909,11 @@
         if (it.done) { totalW += it.weight; doneCount++; }
       });
       document.getElementById('totalItems').textContent = Object.keys(names).length;
-      document.getElementById('totalWeight').textContent = totalW.toFixed(1);
+      document.getElementById('totalWeight').textContent = formatGramForCanteen(totalW);
       document.getElementById('totalTraced').textContent = doneCount;
       // 实时更新 task-info 条中的「已录入」
       var actualEl = document.getElementById('taskActualDisplay');
-      if (actualEl) actualEl.textContent = totalW.toFixed(1) + ' 斤';
+      if (actualEl) actualEl.textContent = formatGramForCanteen(totalW);
     }
 
     // 重新识别：清除当前状态，重新触发 AI 识别
@@ -936,7 +955,7 @@
       var cam = document.getElementById('cameraFrame');
       cam.classList.remove('detecting', 'stable');
       document.getElementById('statusDot').className = 'status-dot status-dot--idle';
-      document.getElementById('weightValue').textContent = '0.00';
+      document.getElementById('weightValue').textContent = '0g';
       document.getElementById('weightStatus').textContent = '请放置食材至秤台';
       document.getElementById('weightStatus').className = 'weight-display__status';
       document.getElementById('traceCode').textContent = '--';
@@ -967,7 +986,7 @@
       }
       var totalW = 0;
       batchItems.forEach(function(it) { totalW += it.weight; });
-      showToast('任务单提交成功：' + batchItems.length + '类食材，共 ' + totalW.toFixed(1) + '斤', 1500, 'success');
+      showToast('任务单提交成功：' + batchItems.length + '类食材，共 ' + formatGramForCanteen(totalW), 1500, 'success');
       setTimeout(function() {
         var user = document.getElementById('topUser').textContent.replace('操作员: ', '');
         window.location.href = '01-washing-tasks.html' + (user ? '?user=' + encodeURIComponent(user) : '');
diff --git a/other-module/canteen-device/raw-veg-processing-scale/03-batch-washing.html b/other-module/canteen-device/raw-veg-processing-scale/03-batch-washing.html
index f4880cd..3f4d1db 100644
--- a/other-module/canteen-device/raw-veg-processing-scale/03-batch-washing.html
+++ b/other-module/canteen-device/raw-veg-processing-scale/03-batch-washing.html
@@ -330,10 +330,9 @@
         <span class="trace-row__status" id="traceStatus"></span>
       </div>
 
-      <!-- 重量显示 -->
+      <!-- 重量显示(存储单位:克,展示层用 formatGramForCanteen 还原"斤") -->
       <div class="weight-display">
-        <span class="weight-display__value" id="weightValue">0.00</span>
-        <span class="weight-display__unit">斤</span>
+        <span class="weight-display__value" id="weightValue">0g</span>
         <div class="weight-display__status" id="weightStatus">请放置食材至秤台</div>
       </div>
     </div>
@@ -347,8 +346,8 @@
           <div class="batch-stat__label">品类数</div>
         </div>
         <div class="batch-stat">
-          <div class="batch-stat__value" id="totalWeight">0.0</div>
-          <div class="batch-stat__label">总重量（斤）</div>
+          <div class="batch-stat__value" id="totalWeight">0g</div>
+          <div class="batch-stat__label">总重量</div>
         </div>
         <div class="batch-stat">
           <div class="batch-stat__value batch-stat__value--green" id="totalTraced">0</div>
@@ -381,6 +380,23 @@
   <div class="toast" id="toast"></div>
 
   <script>
+    /* === 规格工具函数(从 spec-utils-reference.md 内联) === */
+    function formatGram(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+      if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+      return g + 'g';
+    }
+    function formatGramForCanteen(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g % 500 === 0) return (g / 500) + '斤';
+      if (g % 250 === 0) return ((g / 500).toFixed(1)) + '斤';
+      if (g % 50 === 0)  return ((g / 500).toFixed(2)) + '斤';
+      return formatGram(g);
+    }
+
     // 获取 URL 参数
     function getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
@@ -391,30 +407,30 @@
     var userName = getUrlParam('user');
     if (userName) document.getElementById('topUser').textContent = '操作员: ' + userName;
 
-    // AI 识别结果库（含相似度）
+    // AI 识别结果库（含相似度 + 出净率 yieldRate）
     var aiResults = [
-      { name: '土豆（净）',   icon: '&#x1F954;', sim: 97 },
-      { name: '西红柿（净）', icon: '&#x1F345;', sim: 96 },
-      { name: '大白菜（净）', icon: '&#x1F96C;', sim: 95 },
-      { name: '胡萝卜（净）', icon: '&#x1F955;', sim: 98 },
-      { name: '黄瓜（净）',   icon: '&#x1F952;', sim: 94 },
-      { name: '娃娃菜（净）', icon: '&#x1F96C;', sim: 93 }
+      { name: '土豆（净）',   icon: '&#x1F954;', sim: 97, yieldRate: 90 },
+      { name: '西红柿（净）', icon: '&#x1F345;', sim: 96, yieldRate: 95 },
+      { name: '大白菜（净）', icon: '&#x1F96C;', sim: 95, yieldRate: 88 },
+      { name: '胡萝卜（净）', icon: '&#x1F955;', sim: 98, yieldRate: 90 },
+      { name: '黄瓜（净）',   icon: '&#x1F952;', sim: 94, yieldRate: 92 },
+      { name: '娃娃菜（净）', icon: '&#x1F96C;', sim: 93, yieldRate: 88 }
     ];
 
-    // 食材库（搜索用）
+    // 食材库（搜索用,含出净率 yieldRate）
     var foodDB = [
-      { name: '土豆（净）', icon: '&#x1F954;' },
-      { name: '西红柿（净）', icon: '&#x1F345;' },
-      { name: '大白菜（净）', icon: '&#x1F96C;' },
-      { name: '胡萝卜（净）', icon: '&#x1F955;' },
-      { name: '黄瓜（净）', icon: '&#x1F952;' },
-      { name: '娃娃菜（净）', icon: '&#x1F96C;' },
-      { name: '茄子（净）', icon: '&#x1F346;' },
-      { name: '青椒（净）', icon: '&#x1FAD1;' },
-      { name: '芹菜（净）', icon: '&#x1F96C;' },
-      { name: '菠菜（净）', icon: '&#x1F96C;' },
-      { name: '豆角（净）', icon: '&#x1FAD8;' },
-      { name: '西兰花（净）', icon: '&#x1F966;' }
+      { name: '土豆（净）', icon: '&#x1F954;', yieldRate: 90 },
+      { name: '西红柿（净）', icon: '&#x1F345;', yieldRate: 95 },
+      { name: '大白菜（净）', icon: '&#x1F96C;', yieldRate: 88 },
+      { name: '胡萝卜（净）', icon: '&#x1F955;', yieldRate: 90 },
+      { name: '黄瓜（净）', icon: '&#x1F952;', yieldRate: 92 },
+      { name: '娃娃菜（净）', icon: '&#x1F96C;', yieldRate: 88 },
+      { name: '茄子（净）', icon: '&#x1F346;', yieldRate: 85 },
+      { name: '青椒（净）', icon: '&#x1FAD1;', yieldRate: 90 },
+      { name: '芹菜（净）', icon: '&#x1F96C;', yieldRate: 80 },
+      { name: '菠菜（净）', icon: '&#x1F96C;', yieldRate: 85 },
+      { name: '豆角（净）', icon: '&#x1FAD8;', yieldRate: 92 },
+      { name: '西兰花（净）', icon: '&#x1F966;', yieldRate: 88 }
     ];
 
     var scaleState = 'idle'; // idle | detecting | stable
@@ -523,19 +539,19 @@
       document.getElementById('traceCode').textContent = '--';
       document.getElementById('traceStatus').textContent = '';
 
-      // 随机食材 + 重量动画
+      // 随机食材 + 重量动画(克为单位,500-2500g 范围)
       var item = aiResults[Math.floor(Math.random() * aiResults.length)];
-      var targetWeight = (Math.random() * 4 + 1).toFixed(2) * 1;
+      var targetWeight = Math.round((Math.random() * 2000 + 500) / 50) * 50;
 
       var anim = 0;
       var timer = setInterval(function() {
-        anim += 0.15;
+        anim += 75;
         if (anim >= targetWeight) {
           anim = targetWeight;
           clearInterval(timer);
           onStable(item, targetWeight);
         }
-        document.getElementById('weightValue').textContent = anim.toFixed(2);
+        document.getElementById('weightValue').textContent = formatGramForCanteen(anim);
       }, 100);
 
       // 延迟显示候选
@@ -590,7 +606,7 @@
       batchItems.push(entry);
       renderBatchList();
       updateSummary();
-      showToast(entry.name + ' ' + entry.weight.toFixed(2) + '斤 已录入', 1500, 'success');
+      showToast(entry.name + ' ' + formatGramForCanteen(entry.weight) + ' 已录入', 1500, 'success');
       resetScale();
     }
 
@@ -636,7 +652,7 @@
             '<div class="batch-item__name">' + item.name + '</div>' +
             '<div class="batch-item__trace">' + item.trace + '</div>' +
           '</div>' +
-          '<div class="batch-item__weight">+' + item.weight.toFixed(2) + '斤</div>' +
+          '<div class="batch-item__weight">+' + formatGramForCanteen(item.weight) + '</div>' +
           '<button class="batch-item__del" onclick="deleteBatchItem(' + item.id + ')" title="删除">&#x2716;</button>';
         list.appendChild(el);
       });
@@ -651,7 +667,7 @@
         totalW += it.weight;
       });
       document.getElementById('totalItems').textContent = Object.keys(names).length;
-      document.getElementById('totalWeight').textContent = totalW.toFixed(1);
+      document.getElementById('totalWeight').textContent = formatGramForCanteen(totalW);
       document.getElementById('totalTraced').textContent = batchItems.length;
     }
 
@@ -668,7 +684,7 @@
       cam.classList.remove('detecting', 'stable');
       document.getElementById('statusDot').className = 'status-dot status-dot--idle';
       document.getElementById('statusText').textContent = '就绪，等待食材放置';
-      document.getElementById('weightValue').textContent = '0.00';
+      document.getElementById('weightValue').textContent = '0g';
       document.getElementById('weightStatus').textContent = '请放置食材至秤台';
       document.getElementById('weightStatus').className = 'weight-display__status';
       document.getElementById('traceCode').textContent = '--';
@@ -695,7 +711,7 @@
         batchItems = [];
         renderBatchList();
         document.getElementById('totalItems').textContent = '0';
-        document.getElementById('totalWeight').textContent = '0.0';
+        document.getElementById('totalWeight').textContent = '0g';
         document.getElementById('totalTraced').textContent = '0';
         document.getElementById('batchCount').textContent = '0';
         document.getElementById('submitBtn').disabled = true;
diff --git a/other-module/canteen-device/raw-veg-processing-scale/04-history.html b/other-module/canteen-device/raw-veg-processing-scale/04-history.html
index 1353ff1..21eb610 100644
--- a/other-module/canteen-device/raw-veg-processing-scale/04-history.html
+++ b/other-module/canteen-device/raw-veg-processing-scale/04-history.html
@@ -202,8 +202,8 @@
         <div class="stat-card__value stat-card__value--blue" id="statTotal">8</div>
       </div>
       <div class="stat-card">
-        <div class="stat-card__label">总重量（斤）</div>
-        <div class="stat-card__value" id="statWeight">33.3</div>
+        <div class="stat-card__label">总重量</div>
+        <div class="stat-card__value" id="statWeight">33.3 斤</div>
       </div>
     </div>
 
@@ -224,7 +224,7 @@
           <div class="record-card__batch">LC-20260613-001</div>
         </div>
         <div class="record-card__type record-card__type--in">来料过秤</div>
-        <div class="record-card__weight">
+        <div class="record-card__weight" data-weight-g="2600">
           <span class="record-card__weight-value">5.2</span>
           <span class="record-card__weight-unit">斤</span>
         </div>
@@ -246,7 +246,7 @@
           <div class="record-card__batch">LC-20260613-001</div>
         </div>
         <div class="record-card__type record-card__type--in">来料过秤</div>
-        <div class="record-card__weight">
+        <div class="record-card__weight" data-weight-g="1900">
           <span class="record-card__weight-value">3.8</span>
           <span class="record-card__weight-unit">斤</span>
         </div>
@@ -268,7 +268,7 @@
           <div class="record-card__batch">LC-20260613-001</div>
         </div>
         <div class="record-card__type record-card__type--in">来料过秤</div>
-        <div class="record-card__weight">
+        <div class="record-card__weight" data-weight-g="4100">
           <span class="record-card__weight-value">8.2</span>
           <span class="record-card__weight-unit">斤</span>
         </div>
@@ -290,7 +290,7 @@
           <div class="record-card__batch">LC-20260613-001</div>
         </div>
         <div class="record-card__type record-card__type--in">来料过秤</div>
-        <div class="record-card__weight">
+        <div class="record-card__weight" data-weight-g="1250">
           <span class="record-card__weight-value">2.5</span>
           <span class="record-card__weight-unit">斤</span>
         </div>
@@ -312,7 +312,7 @@
           <div class="record-card__batch">LC-20260613-002</div>
         </div>
         <div class="record-card__type record-card__type--in">来料过秤</div>
-        <div class="record-card__weight">
+        <div class="record-card__weight" data-weight-g="2150">
           <span class="record-card__weight-value">4.3</span>
           <span class="record-card__weight-unit">斤</span>
         </div>
@@ -334,7 +334,7 @@
           <div class="record-card__batch">LC-20260613-002</div>
         </div>
         <div class="record-card__type record-card__type--in">来料过秤</div>
-        <div class="record-card__weight">
+        <div class="record-card__weight" data-weight-g="1300">
           <span class="record-card__weight-value">2.6</span>
           <span class="record-card__weight-unit">斤</span>
         </div>
@@ -356,7 +356,7 @@
           <div class="record-card__batch">LC-20260613-003</div>
         </div>
         <div class="record-card__type record-card__type--in">来料过秤</div>
-        <div class="record-card__weight">
+        <div class="record-card__weight" data-weight-g="1600">
           <span class="record-card__weight-value">3.2</span>
           <span class="record-card__weight-unit">斤</span>
         </div>
@@ -378,7 +378,7 @@
           <div class="record-card__batch">LC-20260613-003</div>
         </div>
         <div class="record-card__type record-card__type--in">来料过秤</div>
-        <div class="record-card__weight">
+        <div class="record-card__weight" data-weight-g="1750">
           <span class="record-card__weight-value">3.5</span>
           <span class="record-card__weight-unit">斤</span>
         </div>
@@ -403,6 +403,34 @@
   <div class="toast" id="toast"></div>
 
   <script>
+    /* === 规格工具函数(从 spec-utils-reference.md 内联) === */
+    function formatGram(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+      if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+      return g + 'g';
+    }
+    function formatGramForCanteen(g) {
+      if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+      g = Number(g);
+      if (g % 500 === 0) return (g / 500) + '斤';
+      if (g % 250 === 0) return ((g / 500).toFixed(1)) + '斤';
+      if (g % 50 === 0)  return ((g / 500).toFixed(2)) + '斤';
+      return formatGram(g);
+    }
+    /* 历史卡片重量渲染(从 data-weight-g 读克数,展示"X 斤") */
+    function renderHistoryWeights() {
+      var nodes = document.querySelectorAll('.record-card__weight[data-weight-g]');
+      nodes.forEach(function(el) {
+        var g = parseInt(el.getAttribute('data-weight-g'), 10);
+        var formatted = formatGramForCanteen(g);
+        el.querySelector('.record-card__weight-value').textContent = formatted.replace(/斤$/, '');
+        el.querySelector('.record-card__weight-unit').textContent = formatted.indexOf('斤') !== -1 ? '斤' : '';
+      });
+    }
+    renderHistoryWeights();
+
     // 获取 URL 参数
     function getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
diff --git a/web-admin/nutrition/din-dict-config.html b/web-admin/nutrition/din-dict-config.html
index e9d013b..64e21bb 100644
--- a/web-admin/nutrition/din-dict-config.html
+++ b/web-admin/nutrition/din-dict-config.html
@@ -200,22 +200,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
     <div class="table-card__content">
       <table>
         <thead><tr><th>序号</th><th>名称</th><th>数据值</th><th>状态</th><th>描述</th><th>创建时间</th><th>操作</th></tr></thead>
-        <tbody>
-          <tr><td>1</td><td>炒</td><td>1</td><td><span class="tag tag-green">启用</span></td><td>大火快炒</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>2</td><td>蒸</td><td>2</td><td><span class="tag tag-green">启用</span></td><td>隔水蒸制</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>3</td><td>炖</td><td>3</td><td><span class="tag tag-green">启用</span></td><td>慢火炖煮</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>4</td><td>煮</td><td>4</td><td><span class="tag tag-green">启用</span></td><td>水煮</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>5</td><td>凉拌</td><td>5</td><td><span class="tag tag-green">启用</span></td><td>不加热</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>6</td><td>炸</td><td>6</td><td><span class="tag tag-green">启用</span></td><td>油炸</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>7</td><td>烤</td><td>7</td><td><span class="tag tag-green">启用</span></td><td>烤箱/明火</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>8</td><td>煎</td><td>8</td><td><span class="tag tag-green">启用</span></td><td>少油煎制</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>9</td><td>焖</td><td>9</td><td><span class="tag tag-green">启用</span></td><td>加盖焖制</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>10</td><td>卤</td><td>10</td><td><span class="tag tag-green">启用</span></td><td>卤汁浸煮</td><td>2026-01-01 10:00:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-          <tr><td>11</td><td>汆</td><td>11</td><td><span class="tag tag-gray">停用</span></td><td>沸水汆烫</td><td>2026-03-20 14:30:00</td><td class="td-actions"><span class="link" onclick="openDialog('edit',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>
-        </tbody>
+        <tbody id="dictTbody"></tbody>
       </table>
     </div>
-    <div class="pagination"><span>显示 11 条，共 11 条</span><button class="page-btn active">1</button></div>
+    <div class="pagination"><span id="paginationText">显示 0 条，共 0 条</span><button class="page-btn active">1</button></div>
   </div>
 </main>
 
@@ -237,13 +225,90 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 function toggleSubgroup(header){header.parentElement.classList.toggle('open');}
 (function(){var active=document.querySelector('.sidebar-item.active');if(!active)return;var sub=active.closest('.sidebar-subgroup');if(sub)sub.classList.add('open');})();
 
-/* 解析 URL 参数，设置面包屑和标题 */
+/* === 字典项数据集(按 code 分组) === */
+/* 主烹饪法 cook_method(默认兜底) */
+var DICT_DATA = {
+  'cook_method': [
+    {name:'炒', value:'1', status:'启用', desc:'大火快炒', time:'2026-01-01 10:00:00'},
+    {name:'蒸', value:'2', status:'启用', desc:'隔水蒸制', time:'2026-01-01 10:00:00'},
+    {name:'炖', value:'3', status:'启用', desc:'慢火炖煮', time:'2026-01-01 10:00:00'},
+    {name:'煮', value:'4', status:'启用', desc:'水煮', time:'2026-01-01 10:00:00'},
+    {name:'凉拌', value:'5', status:'启用', desc:'不加热', time:'2026-01-01 10:00:00'},
+    {name:'炸', value:'6', status:'启用', desc:'油炸', time:'2026-01-01 10:00:00'},
+    {name:'烤', value:'7', status:'启用', desc:'烤箱/明火', time:'2026-01-01 10:00:00'},
+    {name:'煎', value:'8', status:'启用', desc:'少油煎制', time:'2026-01-01 10:00:00'},
+    {name:'焖', value:'9', status:'启用', desc:'加盖焖制', time:'2026-01-01 10:00:00'},
+    {name:'卤', value:'10', status:'启用', desc:'卤汁浸煮', time:'2026-01-01 10:00:00'},
+    {name:'汆', value:'11', status:'停用', desc:'沸水汆烫', time:'2026-03-20 14:30:00'}
+  ],
+  /* 包装单位字典(规格 Tab) — baseGram + unit 构成统一规格 */
+  'spec_unit': [
+    {name:'克', value:'1', status:'启用', desc:'基础质量单位,克重计量基准', time:'2026-08-04 10:00:00'},
+    {name:'袋', value:'2', status:'启用', desc:'典型 500g/袋,净菜包装常用', time:'2026-08-04 10:00:00'},
+    {name:'箱', value:'3', status:'启用', desc:'大件包装,典型 5kg/箱 或 25kg/箱', time:'2026-08-04 10:00:00'},
+    {name:'份', value:'4', status:'启用', desc:'餐品单位,按配方定义克重', time:'2026-08-04 10:00:00'},
+    {name:'把', value:'5', status:'启用', desc:'长条形食材捆扎单位,约 500g/把', time:'2026-08-04 10:00:00'},
+    {name:'瓶', value:'6', status:'启用', desc:'液体容器单位,典型 500ml/瓶(≈500g)', time:'2026-08-04 10:00:00'},
+    {name:'罐', value:'7', status:'启用', desc:'固液容器单位,典型 1000g/罐', time:'2026-08-04 10:00:00'},
+    {name:'桶', value:'8', status:'启用', desc:'大液体单位,典型 5kg/桶', time:'2026-08-04 10:00:00'},
+    {name:'散装', value:'9', status:'启用', desc:'无固定包装,按克计', time:'2026-08-04 10:00:00'}
+  ],
+  /* 切配类型字典(规格 Tab) — 对应 CutSpec.shape */
+  'spec_cut_shape': [
+    {name:'丝(细)', value:'1', status:'启用', desc:'标准 3×1×1mm · 平刀', time:'2026-08-04 10:00:00'},
+    {name:'丝(中)', value:'2', status:'启用', desc:'标准 5×1×1mm · 平刀', time:'2026-08-04 10:00:00'},
+    {name:'丝(粗)', value:'3', status:'启用', desc:'标准 5×2×2mm · 平刀', time:'2026-08-04 10:00:00'},
+    {name:'片(薄)', value:'4', status:'启用', desc:'厚度 1mm · 平刀', time:'2026-08-04 10:00:00'},
+    {name:'片(中)', value:'5', status:'启用', desc:'厚度 3mm · 平刀', time:'2026-08-04 10:00:00'},
+    {name:'片(厚)', value:'6', status:'启用', desc:'厚度 5mm · 斜刀', time:'2026-08-04 10:00:00'},
+    {name:'丁(小)', value:'7', status:'启用', desc:'5×5×5mm · 直刀', time:'2026-08-04 10:00:00'},
+    {name:'丁(中)', value:'8', status:'启用', desc:'10×10×10mm · 直刀', time:'2026-08-04 10:00:00'},
+    {name:'丁(大)', value:'9', status:'启用', desc:'15×15×15mm · 直刀', time:'2026-08-04 10:00:00'},
+    {name:'块(小)', value:'10', status:'启用', desc:'20×20×20mm · 直刀', time:'2026-08-04 10:00:00'},
+    {name:'块(中)', value:'11', status:'启用', desc:'30×30×30mm · 直刀', time:'2026-08-04 10:00:00'},
+    {name:'块(大)', value:'12', status:'启用', desc:'40×40×40mm · 直刀', time:'2026-08-04 10:00:00'},
+    {name:'段', value:'13', status:'启用', desc:'长条形 50mm · 直刀', time:'2026-08-04 10:00:00'},
+    {name:'条', value:'14', status:'启用', desc:'长条形 30mm · 斜刀', time:'2026-08-04 10:00:00'},
+    {name:'泥', value:'15', status:'启用', desc:'糜状,无尺寸', time:'2026-08-04 10:00:00'},
+    {name:'末', value:'16', status:'启用', desc:'碎粒,<5mm', time:'2026-08-04 10:00:00'}
+  ],
+  /* 份型字典(规格 Tab) — 餐品规格的份量维度 */
+  'spec_portion': [
+    {name:'特小份', value:'1', status:'启用', desc:'约 100g/份,婴幼儿/儿童', time:'2026-08-04 10:00:00'},
+    {name:'小份', value:'2', status:'启用', desc:'约 200g/份,老年人/减重', time:'2026-08-04 10:00:00'},
+    {name:'标准份', value:'3', status:'启用', desc:'约 300g/份,标准成人(基准参考)', time:'2026-08-04 10:00:00'},
+    {name:'中份', value:'4', status:'启用', desc:'约 350g/份,标准成人略增', time:'2026-08-04 10:00:00'},
+    {name:'大份', value:'5', status:'启用', desc:'约 400g/份,体力劳动', time:'2026-08-04 10:00:00'},
+    {name:'特大份', value:'6', status:'启用', desc:'约 500g/份,运动员/特殊', time:'2026-08-04 10:00:00'}
+  ]
+};
+
+/* 按字典 code 渲染字典项表格 */
+function renderDictItems(code){
+  var items = DICT_DATA[code] || DICT_DATA['cook_method'];
+  var tbody = document.getElementById('dictTbody');
+  if(!tbody) return;
+  var html = '';
+  items.forEach(function(item, i){
+    var statusTag = item.status === '启用'
+      ? '<span class="tag tag-green">启用</span>'
+      : '<span class="tag tag-gray">停用</span>';
+    html += '<tr><td>'+(i+1)+'</td><td>'+item.name+'</td><td>'+item.value+'</td><td>'+statusTag+'</td><td>'+item.desc+'</td><td>'+item.time+'</td><td class="td-actions"><span class="link" onclick="openDialog(\'edit\',this)">编辑</span> <span class="link link-danger">删除</span></td></tr>';
+  });
+  tbody.innerHTML = html;
+  var pagText = document.getElementById('paginationText');
+  if(pagText) pagText.textContent = '显示 '+items.length+' 条，共 '+items.length+' 条';
+}
+
+/* 解析 URL 参数,设置面包屑和标题,并渲染对应字典项 */
 (function(){
   var params=new URLSearchParams(window.location.search);
+  var code=params.get('code')||'cook_method';
   var name=params.get('name')||'主烹饪法';
   document.getElementById('breadcrumbName').textContent=name+' - 字典配置';
   document.getElementById('tableTitle').textContent=name+' - 字典配置';
   document.title='营养管理 - '+name+' 字典配置 | 健康CQ原型';
+  renderDictItems(code);
 })();
 
 /* 弹窗交互 */
diff --git a/web-admin/nutrition/din-dict-mgmt.html b/web-admin/nutrition/din-dict-mgmt.html
index ee95e06..3775920 100644
--- a/web-admin/nutrition/din-dict-mgmt.html
+++ b/web-admin/nutrition/din-dict-mgmt.html
@@ -182,10 +182,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 <main class="main">
   <!-- 统计卡片 -->
   <div class="stats-row">
-    <div class="stat-card"><div class="stat-card__icon blue">📖</div><div class="stat-card__info"><div class="stat-card__value">6类</div><div class="stat-card__label">字典分类数</div></div></div>
-    <div class="stat-card"><div class="stat-card__icon green">📝</div><div class="stat-card__info"><div class="stat-card__value">186项</div><div class="stat-card__label">字典项总数</div></div></div>
-    <div class="stat-card"><div class="stat-card__icon green">✅</div><div class="stat-card__info"><div class="stat-card__value">178项</div><div class="stat-card__label">启用项数</div></div></div>
-    <div class="stat-card"><div class="stat-card__icon orange">🕐</div><div class="stat-card__info"><div class="stat-card__value">2026-04-28</div><div class="stat-card__label">最近更新</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon blue">📖</div><div class="stat-card__info"><div class="stat-card__value">7类</div><div class="stat-card__label">字典分类数</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon green">📝</div><div class="stat-card__info"><div class="stat-card__value">217项</div><div class="stat-card__label">字典项总数</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon green">✅</div><div class="stat-card__info"><div class="stat-card__value">209项</div><div class="stat-card__label">启用项数</div></div></div>
+    <div class="stat-card"><div class="stat-card__icon orange">🕐</div><div class="stat-card__info"><div class="stat-card__value">2026-08-04</div><div class="stat-card__label">最近更新</div></div></div>
   </div>
 
   <!-- Tab 切换栏 -->
@@ -196,6 +196,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
     <div class="page-tab" onclick="switchTab(3)">适配</div>
     <div class="page-tab" onclick="switchTab(4)">仓储/规格</div>
     <div class="page-tab" onclick="switchTab(5)">业务</div>
+    <div class="page-tab" onclick="switchTab(6)">规格</div>
   </div>
 
   <!-- Tab1: 烹饪/工艺 -->
@@ -332,6 +333,27 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
       <div class="pagination"><span>显示 6 条，共 6 条</span><button class="page-btn active">1</button></div>
     </div>
   </div>
+
+  <!-- Tab7: 规格 -->
+  <div class="tab-panel">
+    <div class="filter-bar">
+      <div class="filter-item"><label>字典名称</label><input class="filter-input" placeholder="请输入"></div>
+      <div class="filter-item"><label>字典编码</label><input class="filter-input" placeholder="请输入"></div>
+      <button class="btn btn-primary">查询</button>
+      <button class="btn btn-default">重置</button>
+    </div>
+    <div class="action-bar"><button class="btn btn-primary" onclick="openDialog('add')">➕ 新增</button></div>
+    <div class="table-card">
+      <div class="table-card__header"><div class="table-card__title">规格</div></div>
+      <div class="table-card__content"><table><thead><tr><th>字典名称</th><th>字典编码</th><th>字典分类</th><th>描述</th><th>创建时间</th><th>操作</th></tr></thead>
+      <tbody>
+        <tr><td>包装单位</td><td>spec_unit</td><td>规格</td><td>袋/箱/份/把/散装等包装计量单位(克重换算基准)</td><td>2026-08-04 10:00:00</td><td class="td-actions"><a class="link" href="din-dict-config.html?code=spec_unit&name=包装单位">字典配置</a><span class="link" onclick="openDialog('edit',this)">编辑</span><span class="link link-danger">删除</span></td></tr>
+        <tr><td>切配类型</td><td>spec_cut_shape</td><td>规格</td><td>丝/片/丁/块等切配形状规格(含尺寸与刀工)</td><td>2026-08-04 10:00:00</td><td class="td-actions"><a class="link" href="din-dict-config.html?code=spec_cut_shape&name=切配类型">字典配置</a><span class="link" onclick="openDialog('edit',this)">编辑</span><span class="link link-danger">删除</span></td></tr>
+        <tr><td>份型</td><td>spec_portion</td><td>规格</td><td>小份/中份/大份等餐品份型规格</td><td>2026-08-04 10:00:00</td><td class="td-actions"><a class="link" href="din-dict-config.html?code=spec_portion&name=份型">字典配置</a><span class="link" onclick="openDialog('edit',this)">编辑</span><span class="link link-danger">删除</span></td></tr>
+      </tbody></table></div>
+      <div class="pagination"><span>显示 3 条，共 3 条</span><button class="page-btn active">1</button></div>
+    </div>
+  </div>
 </main>
 
 <!-- 新增/编辑弹窗 -->
@@ -349,7 +371,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 </div>
 
 <script>
-var tabNames=['烹饪/工艺','感官','营养','适配','仓储/规格','业务'];
+var tabNames=['烹饪/工艺','感官','营养','适配','仓储/规格','业务','规格'];
 var currentTab=0;
 function switchTab(idx){
   currentTab=idx;
diff --git a/web-admin/nutrition/din-dish-add.html b/web-admin/nutrition/din-dish-add.html
index 4ead1fb..b8e6992 100644
--- a/web-admin/nutrition/din-dish-add.html
+++ b/web-admin/nutrition/din-dish-add.html
@@ -81,6 +81,15 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .spec-add-row:hover{background:var(--primary-light) !important;}
 .spec-add-row td{color:var(--primary);cursor:pointer;border-bottom:none;padding:5px 10px;}
 .spec-edit-row .form-input{height:28px;font-size:12px;padding:0 8px;}
+/* 规格输入组(表格内):左 input 克重 + 右 select 份型 连在一起 */
+.spec-input-group{display:flex;align-items:stretch;height:28px;}
+.spec-input-group input{flex:1;border-radius:4px 0 0 4px;border-right:none;padding:0 8px;font-size:12px;height:28px;min-width:0;}
+.spec-input-group select{width:90px;border-radius:0 4px 4px 0;padding:0 8px;font-size:12px;height:28px;flex-shrink:0;}
+/* 规格单元格只读展示:克重g / 份型 */
+.spec-cell-view{display:flex;align-items:center;gap:4px;}
+.spec-cell-view__gram{font-weight:500;}
+.spec-cell-view__sep{color:var(--text-placeholder);}
+.spec-cell-view__name{color:var(--text-secondary);}
 .spec-toggle{display:inline-flex;align-items:center;gap:6px;cursor:pointer;user-select:none;}
 .spec-toggle__switch{width:32px;height:18px;background:#D9D9D9;border-radius:9px;position:relative;transition:background .2s;flex-shrink:0;}
 .spec-toggle__switch::after{content:'';position:absolute;left:2px;top:2px;width:14px;height:14px;background:#fff;border-radius:50%;transition:transform .2s;box-shadow:0 1px 2px rgba(0,0,0,0.15);}
@@ -472,11 +481,11 @@ var STEP_HTML = [
 </div>
 <div class="form-subtitle">📐 餐品规格</div>
 <table class="spec-table" id="specTable">
-  <thead><tr><th>规格</th><th>单位重量(g)</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 style="width:60px;">操作</th></tr></thead>
   <tbody id="specBody">
-    <tr><td>标准份</td><td>350</td><td>15.00</td><td>10.00</td><td><div class="sale-toggle" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">下架</span></div></td><td><div class="spec-toggle active" 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></tr>
-    <tr><td>小份</td><td>200</td><td>10.00</td><td>7.00</td><td><div class="sale-toggle" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">下架</span></div></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></tr>
-    <tr class="spec-add-row" onclick="addSpecRow(this)"><td colspan="7" style="text-align:center;">＋ 添加规格</td></tr>
+    <tr><td><div class="spec-cell-view"><span class="spec-cell-view__gram">350g</span><span class="spec-cell-view__sep">/</span><span class="spec-cell-view__name">标准份</span></div></td><td>15.00</td><td>10.00</td><td><div class="sale-toggle" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">下架</span></div></td><td><div class="spec-toggle active" 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></tr>
+    <tr><td><div class="spec-cell-view"><span class="spec-cell-view__gram">200g</span><span class="spec-cell-view__sep">/</span><span class="spec-cell-view__name">小份</span></div></td><td>10.00</td><td>7.00</td><td><div class="sale-toggle" onclick="toggleCleanSale(this)"><span class="sale-toggle__switch"></span><span class="sale-toggle__label">下架</span></div></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></tr>
+    <tr class="spec-add-row" onclick="addSpecRow(this)"><td colspan="6" style="text-align:center;">＋ 添加规格</td></tr>
   </tbody>
 </table>
 <div class="form-subtitle">📷 菜品展示</div>
@@ -653,25 +662,40 @@ function prevStep(){ if(currentStep>0){currentStep--;renderStep();window.scrollT
 function submitForm(){ if(pageMode==='convert'){ alert('转化成功！餐品已加入餐品总库。'); window.location.href='din-dish-all.html'; } else { alert('提交成功！'); window.location.href='din-dish-all.html'; } }
 
 /* 规格管理 */
+/* 份型下拉选项(枚举来源:spec_portion 字典,与展示页保持一致) */
+var SPEC_PORTION_OPTIONS = ['标准份','小份','大份','迷你份','加大份'];
+function buildPortionOptions(selected){
+  var html='<option value="">请选择</option>';
+  SPEC_PORTION_OPTIONS.forEach(function(p){
+    html+='<option value="'+p+'"'+(p===selected?' selected':'')+'>'+p+'</option>';
+  });
+  return html;
+}
 function addSpecRow(addRow){
   if(document.querySelector('.spec-edit-row')) return;
   var tr=document.createElement('tr');
   tr.className='spec-edit-row';
-  tr.innerHTML='<td><select class="form-select" style="height:28px;font-size:12px;padding:0 24px 0 8px;"><option>请选择</option><option>标准份</option><option>小份</option><option>大份</option><option>迷你份</option><option>加大份</option></select></td><td><input class="form-input" type="number" placeholder="重量"></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="净菜包售价"></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){
   var row=btn.closest('tr');
-  var sel=row.querySelector('select');
-  var inputs=row.querySelectorAll('input');
-  var name=sel?sel.value:'';
-  var weight=inputs[0].value.trim(),price=inputs[1].value.trim(),cleanPrice=inputs[2].value.trim();
-  if(!name||name==='请选择'||!weight||!price){alert('请填写完整信息');return;}
+  var group=row.querySelector('.spec-input-group');
+  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 portion=sel?sel.value:'';
+  var gram=gramInput?gramInput.value.trim():'';
+  var price=priceInput?priceInput.value.trim():'';
+  var cleanPrice=cleanPriceInput?cleanPriceInput.value.trim():'';
+  if(!portion||portion==='请选择'||!gram||!price){alert('请填写完整信息');return;}
   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>'+name+'</td><td>'+weight+'</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>'+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');
@@ -1030,7 +1054,7 @@ 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:[{spec:'标准份',weight:200,price:12,cleanPrice:9,cleanSale:false,isDefault:true},{spec:'小份',weight:120,price:8,cleanPrice:6,cleanSale:false,isDefault:false},{spec:'大份',weight:300,price:18,cleanPrice:13,cleanSale:false,isDefault:false}],
+  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}],
   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:'去腥'}],
   cook:{mainMethod:'炖',subMethod:'煎',heat:'中火→小火',duration:45,temp:100,steps:6,desc:'1.五花肉切块焯水；2.锅中煎至金黄；3.加冰糖炒色；4.加酱油料酒；5.加水小火炖40分钟；6.大火收汁'},
@@ -1073,7 +1097,7 @@ if(pageMode==='convert' && INNOV){
   EDIT_DATA.tag = INNOV.tag;
   EDIT_DATA.status = '上架';
   EDIT_DATA.crowd = [];
-  EDIT_DATA.specs = [{spec:'标准份',weight:350,price:15,cleanPrice:10,cleanSale:false,isDefault:true},{spec:'小份',weight:200,price:10,cleanPrice:7,cleanSale:false,isDefault:false}];
+  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.cookedWeight = INNOV.cookedWeight || 200;
   EDIT_DATA.composition = INNOV.composition;
   EDIT_DATA.cook = INNOV.cook;
@@ -1124,7 +1148,9 @@ function fillEditData(){
         var tr = document.createElement('tr');
         var saleActive = s.cleanSale === true;
         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>';
-        tr.innerHTML = '<td><select class="form-select form-select--sm"><option'+(s.spec==='标准份'?' selected':'')+'>标准份</option><option'+(s.spec==='小份'?' selected':'')+'>小份</option><option'+(s.spec==='大份'?' selected':'')+'>大份</option><option'+(s.spec==='加大份'?' selected':'')+'>加大份</option></select></td><td><input class="form-input form-input--sm" value="'+s.weight+'"></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 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>';
         specBody.appendChild(tr);
       });
     }
diff --git a/web-admin/nutrition/din-dish-all.html b/web-admin/nutrition/din-dish-all.html
index 865547e..36dffd8 100644
--- a/web-admin/nutrition/din-dish-all.html
+++ b/web-admin/nutrition/din-dish-all.html
@@ -118,6 +118,11 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .info-table tr:hover{background:#F8FBFF;}
 .spec-detail-table th{padding:6px 12px;font-size:12px;}
 .spec-detail-table td{padding:6px 12px;font-size:12px;}
+/* 规格只读展示（克重g / 份型 合并单列） */
+.spec-cell-view{display:flex;align-items:center;gap:4px;}
+.spec-cell-view__gram{font-weight:500;}
+.spec-cell-view__sep{color:var(--text-placeholder);}
+.spec-cell-view__name{color:var(--text-secondary);}
 /* 外售净菜包胶囊开关 */
 .sale-toggle{display:inline-flex;align-items:center;gap:6px;cursor:pointer;user-select:none;}
 .sale-toggle__switch{width:32px;height:18px;background:#D9D9D9;border-radius:9px;position:relative;transition:background .2s;flex-shrink:0;}
@@ -378,7 +383,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 <script>
 // 餐品数据
 const DISHES = [
-  {id:'DISH001',name:'红烧肉',icon:'🥩',category:'荤菜',tags:['高蛋白'],specs:[{name:'标准份',weight:200,price:12,cleanPrice:9,cleanSale:false,isDefault:true},{name:'小份',weight:120,price:8,cleanPrice:6,cleanSale:false},{name:'大份',weight:300,price:18,cleanPrice:13,cleanSale:false}],method:'炖',meal:'午/晚',allergen:'无',status:'启用',source:'手动添加',
+  {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:'手动添加',
     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,
@@ -389,7 +394,7 @@ const DISHES = [
     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:[{name:'标准份',weight:150,price:6,cleanPrice:4.5,cleanSale:false,isDefault:true},{name:'小份',weight:100,price:4,cleanPrice:3,cleanSale:false}],method:'炒',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',
+  {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:'系统内置',
     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,
@@ -400,7 +405,7 @@ const DISHES = [
     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:[{name:'标准份',weight:300,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,cleanPrice:3.5,cleanSale:false,isDefault:true}],method:'煮',meal:'午/晚',allergen:'含蛋类',status:'启用',source:'系统内置',
     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,
@@ -411,7 +416,7 @@ const DISHES = [
     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:[{name:'标准份',weight:200,price:3,cleanPrice:2,cleanSale:false,isDefault:true},{name:'小份',weight:100,price:2,cleanPrice:1.5,cleanSale:false},{name:'大份',weight:300,price:4,cleanPrice:3,cleanSale:false}],method:'蒸',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',
+  {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:'系统内置',
     pricing:{basePrice:'1.50',ingredientCost:1.00,per100gCost:0.50,profitRate:150,suggestedPrice:'1.25'},
     promoVideos:[],
     crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'适量'}],crowdNote:'糖尿病人群注意控制量',cookedWeight:200,
@@ -422,7 +427,7 @@ const DISHES = [
     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:[{name:'标准份',weight:180,price:14,cleanPrice:10,cleanSale:false,isDefault:true},{name:'大份',weight:280,price:20,cleanPrice:14,cleanSale:false}],method:'炸',meal:'午',allergen:'无',status:'停用',source:'味养创新',
+  {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:'味养创新',
     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,
@@ -475,7 +480,9 @@ function renderBasic(d){
     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>';
-    return '<tr><td>'+s.name+'</td><td>'+s.weight+'</td><td>'+s.price.toFixed(2)+'</td><td>'+cleanPrice+'</td><td>'+cleanSaleHtml+'</td><td>'+statusHtml+'</td></tr>';
+    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>';
   }).join('');
   return `<div class="info-section"><div class="info-section__title">基本信息 <span><a class="link" href="din-dish-add.html?mode=edit&tab=0">编辑</a></span></div>
     <div class="info-grid">
@@ -491,7 +498,7 @@ function renderBasic(d){
     <div style="display:flex;flex-wrap:wrap;gap:8px;margin-bottom:12px;">${(d.crowd||[]).map(function(c){return '<div style="display:flex;align-items:center;gap:4px;"><span style="font-size:var(--font-sm);">'+c.name+'</span>'+levelTag(c.level)+'</div>';}).join('')}</div>
     ${d.crowdNote?'<div style="font-size:var(--font-sm);color:var(--text-secondary);background:#FFFBE6;padding:8px 12px;border-radius:var(--radius-sm);border:1px solid #FFE58F;">⚠️ '+d.crowdNote+'</div>':''}</div>
   <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>单位重量(g)</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></tr></thead><tbody>${specRows}</tbody></table></div>
   ${renderPricingSection(d)}
   <div class="info-section"><div class="info-section__title">📷 菜品展示</div>
     <div class="media-grid">
@@ -795,6 +802,29 @@ document.addEventListener('click', function(e){
 renderDishList();
 renderDetail();
 
+/* ========== 跨页 specs 共享(阶段三任务 3.0) ========== */
+/* 把 DISHES 数组序列化到 localStorage,供下游订单/组配/包装等页面读取 */
+function persistDishSpecs(){
+  try {
+    var simplified = DISHES.map(function(d){
+      return {
+        id: d.id,
+        name: d.name,
+        category: d.category,
+        status: d.status,
+        cookedWeight: d.cookedWeight,
+        yieldRate: d.yieldRate,
+        specs: (d.specs||[]).map(function(s){
+          return {portion:s.portion, baseGram:s.baseGram, unit:s.unit||'份',
+                  price:s.price, cleanPrice:s.cleanPrice, cleanSale:s.cleanSale===true, isDefault:s.isDefault===true};
+        })
+      };
+    });
+    localStorage.setItem('dish_specs_v1', JSON.stringify({version:1, updatedAt:Date.now(), dishes:simplified}));
+  } catch(e){ console.warn('persistDishSpecs 失败', e); }
+}
+persistDishSpecs();
+
 /* ========== 餐品分类管理 ========== */
 var nextDishCatId = 100;
 var dishCategories = [
diff --git a/web-admin/nutrition/din-dish-own.html b/web-admin/nutrition/din-dish-own.html
index a5e0134..8f1bdfe 100644
--- a/web-admin/nutrition/din-dish-own.html
+++ b/web-admin/nutrition/din-dish-own.html
@@ -118,6 +118,11 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 .info-table tr:hover{background:#F8FBFF;}
 .spec-detail-table th{padding:6px 12px;font-size:12px;}
 .spec-detail-table td{padding:6px 12px;font-size:12px;}
+/* 规格只读展示（克重g / 份型 合并单列） */
+.spec-cell-view{display:flex;align-items:center;gap:4px;}
+.spec-cell-view__gram{font-weight:500;}
+.spec-cell-view__sep{color:var(--text-placeholder);}
+.spec-cell-view__name{color:var(--text-secondary);}
 /* 外售净菜包胶囊开关 */
 .sale-toggle{display:inline-flex;align-items:center;gap:6px;cursor:pointer;user-select:none;}
 .sale-toggle__switch{width:32px;height:18px;background:#D9D9D9;border-radius:9px;position:relative;transition:background .2s;flex-shrink:0;}
@@ -402,7 +407,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 <script>
 // 餐品数据
 const DISHES = [
-  {id:'DISH001',name:'红烧肉',icon:'🥩',category:'荤菜',tags:['高蛋白'],specs:[{name:'标准份',weight:200,price:12,cleanPrice:9,cleanSale:false,isDefault:true},{name:'小份',weight:120,price:8,cleanPrice:6,cleanSale:false},{name:'大份',weight:300,price:18,cleanPrice:13,cleanSale:false}],method:'炖',meal:'午/晚',allergen:'无',status:'启用',source:'手动添加',
+  {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:'手动添加',
     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,
@@ -413,7 +418,7 @@ const DISHES = [
     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:[{name:'标准份',weight:150,price:6,cleanPrice:4.5,cleanSale:false,isDefault:true},{name:'小份',weight:100,price:4,cleanPrice:3,cleanSale:false}],method:'炒',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',
+  {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:'系统内置',
     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,
@@ -424,7 +429,7 @@ const DISHES = [
     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:[{name:'标准份',weight:300,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,cleanPrice:3.5,cleanSale:false,isDefault:true}],method:'煮',meal:'午/晚',allergen:'含蛋类',status:'启用',source:'系统内置',
     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,
@@ -435,7 +440,7 @@ const DISHES = [
     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:[{name:'标准份',weight:200,price:3,cleanPrice:2,cleanSale:false,isDefault:true},{name:'小份',weight:100,price:2,cleanPrice:1.5,cleanSale:false},{name:'大份',weight:300,price:4,cleanPrice:3,cleanSale:false}],method:'蒸',meal:'早/午/晚',allergen:'无',status:'启用',source:'系统内置',
+  {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:'系统内置',
     pricing:{basePrice:'1.50',ingredientCost:1.00,per100gCost:0.50,profitRate:150,suggestedPrice:'1.25'},
     promoVideos:[],
     crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'适量'}],crowdNote:'糖尿病人群注意控制量',cookedWeight:200,
@@ -446,7 +451,7 @@ const DISHES = [
     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:[{name:'标准份',weight:180,price:14,cleanPrice:10,cleanSale:false,isDefault:true},{name:'大份',weight:280,price:20,cleanPrice:14,cleanSale:false}],method:'炸',meal:'午',allergen:'无',status:'停用',source:'味养创新',
+  {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:'味养创新',
     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,
@@ -499,7 +504,9 @@ function renderBasic(d){
     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>';
-    return '<tr><td>'+s.name+'</td><td>'+s.weight+'</td><td>'+s.price.toFixed(2)+'</td><td>'+cleanPrice+'</td><td>'+cleanSaleHtml+'</td><td>'+statusHtml+'</td></tr>';
+    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>';
   }).join('');
   return '<div class="info-section"><div class="info-section__title">基本信息 <span><a class="link" href="din-dish-add.html?mode=edit&tab=0">编辑</a></span></div>'
     + '<div class="info-grid">'
@@ -516,7 +523,7 @@ function renderBasic(d){
     + (d.crowdNote?'<div style="font-size:var(--font-sm);color:var(--text-secondary);background:#FFFBE6;padding:8px 12px;border-radius:var(--radius-sm);border:1px solid #FFE58F;">⚠️ '+d.crowdNote+'</div>':'')
     + '</div>'
     + '<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>单位重量(g)</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></tr></thead><tbody>'+specRows+'</tbody></table></div>'
     + renderPricingSection(d)
     + '<div class="info-section"><div class="info-section__title">📷 菜品展示</div>'
     + '<div class="media-grid">'
diff --git a/web-admin/nutrition/din-ingredient-add.html b/web-admin/nutrition/din-ingredient-add.html
index 754222d..2215060 100644
--- a/web-admin/nutrition/din-ingredient-add.html
+++ b/web-admin/nutrition/din-ingredient-add.html
@@ -512,15 +512,35 @@ function submitForm(){
 }
 
 /* === 净菜类型动态行 === */
+/* 切配形状选项(对应字典 spec_cut_shape) */
+var VEG_SHAPE_OPTIONS=['','丝(细)','丝(中)','丝(粗)','片(薄)','片(中)','片(厚)','丁(小)','丁(中)','丁(大)','块(小)','块(中)','块(大)','段','条','泥','末'];
+/* 刀工选项 */
+var VEG_TECH_OPTIONS=['','平刀','斜刀','直刀','花刀','其他'];
 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||'')+'">';
-    html += '<input class="form-input veg-yield" type="number" min="0" max="100" placeholder="菜品出净率（0~100）" value="'+(item.yieldRate||'')+'">';
+    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>';
   });
@@ -543,7 +563,24 @@ function saveVegTypes(){
   rows.forEach(function(row){
     var name = row.querySelector('.veg-name');
     var yieldRate = row.querySelector('.veg-yield');
-    if(name && yieldRate) vegTypes.push({name:name.value,yieldRate:yieldRate.value});
+    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 : ''
+      };
+    }
+    vegTypes.push(item);
   });
 }
 
@@ -701,7 +738,7 @@ 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',vegTypes:[{name:'去筋膜',yieldRate:'92'},{name:'切丁',yieldRate:'88'}],
+  '0301001':{name:'猪里脊(生)',code:'0301001',alias:'里脊肉',firstClass:'畜禽肉类',secondClass:'猪肉',edible:'100',waterRate:'73.3',dataSource:'0',vegTypes:[{name:'去筋膜',yieldRate:'92'},{name:'切丁',yieldRate:'88',cutSpec:{shape:'丁(中)',length:10,width:10,height:10,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,
@@ -723,7 +760,7 @@ 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',vegTypes:[{name:'去根',yieldRate:'90'},{name:'切段',yieldRate:'88'}],
+  '0201001':{name:'菠菜(生)',code:'0201001',alias:'波斯菜',firstClass:'蔬菜类',secondClass:'叶菜类',edible:'89',waterRate:'91.2',dataSource:'0',vegTypes:[{name:'去根',yieldRate:'90'},{name:'切段',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,
@@ -734,7 +771,7 @@ 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',vegTypes:[{name:'切块',yieldRate:'96'},{name:'切丁',yieldRate:'94'}],
+  '0601001':{name:'豆腐(北)',code:'0601001',alias:'北豆腐',firstClass:'豆及豆制品',secondClass:'豆制品',edible:'100',waterRate:'82.8',dataSource:'1',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:'直刀'}}],
     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 795ea0b..2b86451 100644
--- a/web-admin/nutrition/din-ingredient.html
+++ b/web-admin/nutrition/din-ingredient.html
@@ -298,12 +298,12 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
         <button class="btn btn-default" onclick="openCategoryDialog()">📂 食材分类管理</button>
       </div>
       <div class="food-list">
-        <div class="food-item active" onclick="selectFood(0)">
+        <div class="food-item" onclick="selectFood(0)">
           <div class="food-item__icon">🌾</div>
           <div class="food-item__info"><div class="food-item__name">粳米(生)</div><div class="food-item__meta"><span>0101001</span><span>谷薯类/稻米</span><span>346 kcal</span></div></div>
           <span class="food-item__source food-item__source--sys">系统内置</span>
         </div>
-        <div class="food-item" onclick="selectFood(1)">
+        <div class="food-item active" onclick="selectFood(1)">
           <div class="food-item__icon">🥩</div>
           <div class="food-item__info"><div class="food-item__name">猪里脊肉</div><div class="food-item__meta"><span>0201001</span><span>畜禽肉类/猪肉</span><span>155 kcal</span></div></div>
           <span class="food-item__source food-item__source--sys">系统内置</span>
@@ -356,6 +356,21 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 </main>
 
 <script>
+/* === 规格工具函数(从 doc/spec-utils-reference.md 内联,按需选取) === */
+/* 切配规格展示格式化:{length,width,height,shape,technique} → "20×1×1mm · 丝(细) · 平刀" */
+function formatCutSpec(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 shapeStr = cut.shape || '';
+  var techStr = cut.technique ? ' · ' + cut.technique : '';
+  var result = dimStr + shapeStr + techStr;
+  return result || '—';
+}
+
 // 食物数据（对齐 yx_mater_base_material 表结构）
 const FOODS = [
   {name:'粳米(生)',code:'0101001',alias:'大米',firstClass:'谷薯类',secondClass:'稻米',icon:'🌾',edible:'100',waterRate:'13.3',dataSource:0,vegTypes:[{name:'洗净米',yieldRate:'97'},{name:'免淘米',yieldRate:'95'}],
@@ -368,7 +383,7 @@ const FOODS = [
    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,vegTypes:[{name:'肉片',yieldRate:'95'},{name:'肉丁',yieldRate:'92'},{name:'肉块',yieldRate:'97'}],
+  {name:'猪里脊肉',code:'0201001',alias:'里脊',firstClass:'畜禽肉类',secondClass:'猪肉',icon:'🥩',edible:'100',waterRate:'71.4',dataSource:0,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:'直刀'}}],
    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,
@@ -398,7 +413,7 @@ const FOODS = [
    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,vegTypes:[{name:'豆腐块',yieldRate:'98'}],
+  {name:'豆腐(北)',code:'0601001',alias:'北豆腐',firstClass:'豆及豆制品',secondClass:'豆制品',icon:'🧈',edible:'100',waterRate:'82.8',dataSource:1,vegTypes:[{name:'豆腐块',yieldRate:'98',cutSpec:{shape:'块(中)',length:30,width:30,height:20,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,
@@ -410,7 +425,7 @@ const FOODS = [
    texture:{main:'细腻',chew:'易',digest:'易',desc:'质地细腻滑嫩，入口即化，无渣感',crowd:[{name:'全人群',level:'推荐'},{name:'老年人',level:'推荐'},{name:'术后恢复',level:'推荐'}],cook:'细腻易消化，适合消化功能弱者'}}
 ];
 
-let currentFood = 0;
+let currentFood = 1;
 let currentTab = 0;
 
 function selectFood(idx){
@@ -460,8 +475,8 @@ function renderBasicInfo(f){
   html += `<div class="profile-field"><div class="profile-field__label">数据来源</div><div class="profile-field__value">${sourceLabel}</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></tr>`).join('');
-    vegTypesValue = `<table class="veg-type-table"><thead><tr><th>净菜名称</th><th>菜品出净率</th></tr></thead><tbody>${rows}</tbody></table>`;
+    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>`;
   } else {
     vegTypesValue = '—';
   }
diff --git a/web-admin/nutrition/doc/CHANGELOG.md b/web-admin/nutrition/doc/CHANGELOG.md
index d7a076f..5b06112 100644
--- a/web-admin/nutrition/doc/CHANGELOG.md
+++ b/web-admin/nutrition/doc/CHANGELOG.md
@@ -1,5 +1,101 @@
 # 营养用餐管理端 CHANGELOG
 
+## [2026-08-05] 规格体系统一化 · 阶段五辅助页改造（5.1~5.3 全部完成）
+
+> 本次为 `规格体系统一化改造任务清单.md` 第五阶段辅助页 3 个任务（共 6 个文件）的统一改造。本阶段补齐了跨页共享的"写入端"、字典语义对齐和残余多形态字符串结构化，标志着规格体系统一化改造五个阶段全部完成。
+
+### 营养质控（任务 5.1，3 个文件）
+
+- **`prod-qc-nutrition.html`**：`confirmSync()` 从"toast 假落地"改为真同步落地。
+  - **按 dish 聚合均值**：将所选检验记录按餐品聚合，分别计算 4 类指标（营养 / 味道 / 口感 / 色泽）的均值与等级。
+  - **写入餐品总库**：`updateDishSpecNutri(dishName, avgData)` 将均值写入 `localStorage['dish_specs_v1']` 对应餐品的 `nutri` 字段，并记录 `nutriUpdatedAt` 时间戳。
+  - **追加同步日志**：`appendSyncLogs(logs)` 将同步事件追加到 `localStorage['nutri_sync_log_v1']`，按时间倒序保留最多 100 条。
+  - **用户反馈**：toast 提示 "已同步 N 条餐品营养数据至餐品总库，刷新餐品总库可见"。
+- **`prod-qc-nutrition-add.html`**：菜品下拉接入跨页共享。
+  - 删除 `dishData` 硬编码（按 lid 分组的 9 行数组）。
+  - 新增 `loadDishSpecs()` + `buildDishDataFromStore()`：从 `localStorage['dish_specs_v1']` 读取，按 `CANTEEN_LINE_MAP` 将餐品总库的 `category`（食堂名）映射到对应餐线 ID。
+  - **兜底**：若 localStorage 为空或某食堂在总库中无餐品，回退到 `FALLBACK_DISH_DATA`，并在提示行展示 "⚠️ 餐品总库未初始化" 警告。
+  - 三级联动保留（场所 → 餐线 → 日期 → 餐品）。
+- **`prod-qc-nutrition-sync.html`**：同步记录展示改为真日志驱动。
+  - 优先从 `localStorage['nutri_sync_log_v1']` 读取，`mapLogsToSyncData` 将日志项映射为页面结构；无日志时回退到 `FALLBACK_SYNC_DATA` 内置示例。
+  - `renderDialogAvg` 增加 `avgCache` 分支：当日志带有均值缓存时直接展示，不再依赖 RECORDS 现场计算。
+  - `renderDialogLeft/Right` 与 `showDetail` 增加对历史日志（`recordIdxs` 含 -1）的防御处理：展示 "📝 该条记录为历史同步日志，详细单条数据未保留" 提示。
+  - 顶部 "共 N 条记录" 与分页信息改为动态填充。
+
+### 分析页字典语义修正（任务 5.2，2 个文件）
+
+- **`sup-process-analysis.html`**：
+  - **切配线筛选下拉**："切丝 / 切片 / 切丁 / 切段 / 绞肉"（动作）→ "丝 / 片 / 丁 / 块 / 段 / 末 / 泥 / 条"（形状名词），对齐 `spec_cut_shape` 字典语义。
+  - **表格行硬编码**：`土豆（切丝）` → `土豆（丝）`、`胡萝卜（切片）` → `胡萝卜（片）`、`猪肉（绞肉）` → `猪肉（末）`、`青椒（切块）` → `青椒（块）`。
+  - **包装线筛选下拉**：新增独立字典 `pack_method`（6 项：真空 / 气调 / 普通 / 冷鲜 / 保鲜盒 / 散装托盘），原"净菜包 / 餐品净菜包"分类移到"包装对象"独立下拉。
+- **`sup-biz-analysis.html`**：
+  - **生产分析表单位**：`投料重量(吨) / 产出重量(吨)` → `投料重量(kg) / 产出重量(kg)`，数值同步从"8.6"改为"8,600"，与 `sup-process-analysis.html` 的 kg 口径对齐。
+  - KPI 区"原料投入(吨) 48.6" 保留（大屏展示习惯用吨，且与 KPI 其他指标量级协调）。
+
+### 净菜进柜（任务 5.3）
+
+- **`prod-proc-cabinet.html`**：`CABINET_DATA` 的 `spec` 字段多形态字符串统一结构化。
+  - `'5kg/袋'` → `{baseGram:5000, unit:'袋'}`
+  - `'3kg/袋'` → `{baseGram:3000, unit:'袋'}`
+  - `'500g/袋'` → `{baseGram:500, unit:'袋'}`
+  - `'标准份(500g)'` → `{portion:'标准份', baseGram:500, unit:'份'}`
+  - `'标准份(600g)'` → `{portion:'标准份', baseGram:600, unit:'份'}`
+  - `'6份/箱'` → `{baseGram:6, unit:'箱', portion:'份'}`（决策点 #10：理解为 6 个份型单位装一箱）
+  - 内联 `formatSpec` / `formatGram` 工具函数，Drawer 回显与 dishSelect 渲染统一调用 `formatSpec(spec)` 输出（如 `5kg/袋`、`500g/份`）。
+
+### 文档同步
+
+- **`doc/规格体系统一化改造任务清单.md`**：更新阶段五状态表，5.1/5.2/5.3 全部标记为 ✅ 已完成（日期 2026-08-05）。章节九"待业务方确认事项" 第 9 条（pack_method 字典处理）与第 10 条（`'6份/箱'` 语义）标记为已决策。
+
+## [2026-08-05] 规格体系统一化 · 阶段四设备端改造（4.1~4.5 全部完成）
+
+> 本次为 `规格体系统一化改造任务清单.md` 第四阶段设备端 9 个任务（共 14 个文件）的统一改造，参照 `spec-utils-reference.md` 权威源工具函数。所有 HTML 原型按墨刀兼容约束自包含，工具函数内联到每个页面。
+
+### 设备端 · 毛菜验收秤（任务 4.1a / 4.1b）
+
+- **`raw-veg-inspection-scale/01-verify-inspection.html`**
+  - **4.1a verifyType 字段新增**：`FOOD_CATALOG` 20 项每项新增 `verifyType: 'weight'`（默认走重量验收）；`SPICE_CATALOG` 8 项每项新增 `verifyType: 'count'`（点收验收）。采用二分法，操作员自行将体积转质量。
+  - **4.1b UNIT_OPTIONS 分类**：按 verifyType 分流到 `UNIT_OPTIONS_WEIGHT`（斤/公斤/克/千克）或 `UNIT_OPTIONS_COUNT`（袋/瓶/箱/桶/罐/份/个/只/条/把）。
+
+### 设备端 · 毛菜加工秤（任务 4.2a/b/c，4 个文件）
+
+- **`raw-veg-processing-scale/01-washing-tasks.html`**、**`02-batch-weighing.html`**、**`03-batch-washing.html`**、**`04-history.html`**
+  - **4.2a 存储层斤→克**：3 个任务单 8 个食材行 + 推送的 2 个新食材行改为 `data-weight-g` 克存储；`taskDataMap` 值改为克（如黄瓜 2000g、土豆 2500g）；8 个 `record-card` 添加 `data-weight-g` 属性。
+  - **4.2b 展示层兼容**：内联 `formatGram` 和 `formatGramForCanteen`，展示层自动还原"斤"显示（如 2000g → "4 斤"）。修复 04-history 中 `formatGramForCanteen` 的语法错误（`g === null === ''` → `g === null || g === ''`）。
+  - **4.2c yieldRate 字段**：03-batch-washing 的 `aiResults` 6 项 + `foodDB` 12 项新增 `yieldRate`（85~95），UI 列展示暂未添加（允许后续从食材档案带出）。
+
+### 设备端 · 净菜加工秤（任务 4.3）
+
+- **`clean-veg-ratio-scale/03-settings.html`**
+  - 删除"重量单位" select（与 4.2 存储统一为克冲突），替换为说明 hint（`formatGramForCanteen` 自动还原"斤"显示）。
+  - 滚刀块大小单位 cm → mm 统一：`小(2cm)/中(3cm)/大(5cm)` → `小(20mm)/中(30mm)/大(50mm)`。
+  - 加工参数区添加 hint 说明引用食材档案 `vegTypes.cutSpec` 与切配类型字典 `spec_cut_shape`。
+
+### 设备端 · 净菜包装贴标秤（任务 4.4，3 个文件 ⭐ 最复杂）
+
+- **`clean-veg-packaging-labeler/01-orders.html`**、**`02-labeling.html`**、**`label-preview.html`**
+  - **工具函数内联**：3 文件各自内联 5 个工具函数（`formatGram`/`formatSpec`/`formatCutSpec`/`parseLegacyCutSpec`/`parseLegacyPackSpec`），墨刀兼容无外部引用。
+  - **mock 数据结构化**：3 套数据（订单列表 / 标签制作 / 标签预览）的 `cutSpec` 全部由字符串（如 `'20mm×1mm×1mm · 细丝 · 平刀'`）改为对象 `{length:20, width:1, height:1, shape:'细丝', technique:'平刀'}`；`packSpec` 由字符串（如 `'500g'`/`'大份800g'`）改为对象 `{baseGram:500, unit:'袋'}` 或 `{baseGram:800, unit:'份', portion:'大份'}`。
+  - **字段重命名**：所有 `portions` → `packSize`（跨 6 个函数：`calcTotalWeight`/`renderOrderLabels`/`renderVegLabels`/`renderMealLabels`/`handlePrintCurrent`/`handlePrintAll`）。
+  - **渲染逻辑**：直接展示的字符串改为 `formatSpec(specObj)` / `formatCutSpec(cutObj)`；为兼容多形态，加入 `typeof === 'object'` 判断并回退到 `parseLegacyPackSpec` / `parseLegacyCutSpec`。
+  - **决策**：用户确认"真空包装"是包装方式（packMethod）而非包装规格（packSpec），不影响改造逻辑。
+
+### 设备端 · 净菜组配秤（任务 4.5，3 个文件）
+
+- **`ratio-scale/01-packing-tasks.html`**、**`02-weighing-packing.html`**、**`03-verify-history.html`**
+  - **工具函数内联**：3 文件各自内联 5 个工具函数。
+  - **localStorage 跨页共享**：新增 `DISH_SPECS_KEY = 'dish_specs_v1'` 与 `resolvePackSpec(pack)` 兜底函数——当页面 mock 数据缺 packSpec 时从跨页共享表读取（接入任务 3.0 机制）。
+  - **RECORDS/taskData/mockData 全部结构化**：
+    - `packSpec: '大份800g'` → `packSpec: {portion:'大份', baseGram:800, unit:'份'}`
+    - `packSpec: '标准份500g'` → `packSpec: {portion:'标准份', baseGram:500, unit:'份'}`
+    - `cutSpec: '20mm*1mm*1mm · 细丝 · 平刀'` → `cutSpec: {length:20, width:1, height:1, shape:'细丝', technique:'平刀'}`
+  - **渲染层统一**：`pack.packSpec || '—'` 改为 `formatSpec(resolvePackSpec(pack))`；`ing.cutSpec || '—'` 改为 `formatCutSpec(parseLegacyCutSpec(ing.cutSpec))`；候选区 `cutSpecMap` 拼接改为 `formatCutSpec` 输出字符串。
+  - **餐品名称展示**：02 页 `taskPackName` 文本中的 packSpec 改为 formatSpec 渲染（如"宫保鸡丁套餐 · 大份 800g / 份"）。
+
+### 文档同步
+
+- **`doc/规格体系统一化改造任务清单.md`**：更新阶段四状态表，4.1a/4.1b/4.2a/4.2b/4.2c/4.3/4.4/4.5 全部标记为 ✅ 已完成（日期 2026-08-05），并补充每个任务的改造要点。
+
 ## [2026-08-06]
 
 ### 后台营养管理
diff --git a/web-admin/nutrition/doc/screenshots/prod-clean-order-modal-cp.png b/web-admin/nutrition/doc/screenshots/prod-clean-order-modal-cp.png
new file mode 100644
index 0000000000000000000000000000000000000000..34218e07e8ac914430e48f07900ec5c3ce271836
GIT binary patch
literal 124491
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
NB_=Og{KCNZ{{U}aDlh;5

literal 0
HcmV?d00001

diff --git a/web-admin/nutrition/doc/spec-utils-reference.md b/web-admin/nutrition/doc/spec-utils-reference.md
new file mode 100644
index 0000000..932cf99
--- /dev/null
+++ b/web-admin/nutrition/doc/spec-utils-reference.md
@@ -0,0 +1,207 @@
+# 统一规格工具函数参考(内联源)
+
+> 撰写日期:2026-08-04 | 用途:规格体系统一化改造的工具函数"权威源"
+>
+> **重要说明**:本项目遵循墨刀导入兼容约束(CSS 和 JS 全部内联,禁止引用外部 JS 文件),因此本文件**仅作为代码参考与维护源**,实际使用时必须**内联**到每个需要的 HTML 页面的 `<script>` 块中。
+>
+> 改造流程:
+> 1. 本文件维护完整的工具函数源码(改一处)
+> 2. 在每个需要规格计算的页面改造时,从此处复制对应函数内联到页面的 `<script>` 块(按需选取,不必全量复制)
+> 3. 后续如需修改函数逻辑,修改本文件 + 同步修改所有引用该函数的页面
+
+---
+
+## 一、完整工具函数源码
+
+```javascript
+/* ========================================
+ * 规格体系统一化 - 工具函数集
+ * 改造任务:任务 1.1 交付物
+ * 设计依据:规格管理体系分析与设计方案 v3.1
+ * ======================================== */
+
+/* ---------- 1. 克重展示格式化 ---------- */
+/* 500 → "500g", 1500 → "1.5kg", 25000 → "25kg" */
+function formatGram(g) {
+  if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+  g = Number(g);
+  if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+  if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+  return g + 'g';
+}
+
+/* ---------- 2. 规格标签格式化 ---------- */
+/* {baseGram:500, unit:'袋'} → "500g/袋" */
+/* {baseGram:5000, unit:'散装'} → "散装/5kg" */
+function formatSpec(spec) {
+  if (!spec || !spec.baseGram) return '—';
+  var w = formatGram(spec.baseGram);
+  if (spec.unit === '散装') return '散装/' + w;
+  return w + '/' + (spec.unit || '');
+}
+
+/* ---------- 3. 切配规格展示格式化 ---------- */
+/* {length:20, width:1, height:1, shape:'丝(细)', technique:'平刀'}
+   → "20×1×1mm · 丝(细) · 平刀" */
+function formatCutSpec(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 shapeStr = cut.shape || '';
+  var techStr = cut.technique ? ' · ' + cut.technique : '';
+  return dimStr + shapeStr + techStr;
+}
+
+/* ---------- 4. 历史切配规格字符串解析(迁移用) ---------- */
+/* 兼容 3 种历史格式:
+ *   "3.5mm*3.5mm*50mm·细丝·平刀"     (无空格,* 分隔)
+ *   "20mm*1mm*1mm · 细丝 · 平刀"     (带空格,* 分隔)
+ *   "20mm×1mm×1mm · 细丝 · 平刀"     (带空格,× 分隔)
+ * 返回:{length, width, height, shape, technique}
+ */
+function parseLegacyCutSpec(s) {
+  if (!s) return null;
+  if (typeof s === 'object') return s;  // 已是对象,直接返回
+  // 归一化:× → *,去掉所有空格
+  var normalized = String(s).replace(/×/g, '*').replace(/\s/g, '');
+  // 正则:可选尺寸(数字mm*数字mm*数字mm) · 形状(可选 · 刀工)
+  var m = normalized.match(/^(?:(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm)?·?([^·]+)·?([^·]+)?$/);
+  if (!m) return { shape: s };  // 无法解析则整体作为 shape
+  return {
+    length:    m[1] ? parseFloat(m[1]) : undefined,
+    width:     m[2] ? parseFloat(m[2]) : undefined,
+    height:    m[3] ? parseFloat(m[3]) : undefined,
+    shape:     m[4] || '',
+    technique: m[5] || ''
+  };
+}
+
+/* ---------- 5. 向上取整除法(决策点 #5:统一向上取整 ⌈⌉) ---------- */
+/* ceilDiv(23000, 500) = 46 */
+/* ceilDiv(192, 100) = 2  (1.92 向上取整为 2) */
+function ceilDiv(numerator, denominator) {
+  if (!denominator) return 0;
+  return Math.ceil(numerator / denominator);
+}
+
+/* ---------- 6. 计算规格总克重 ---------- */
+/* calcTotalGram({baseGram:500, unitCapacity:1}, qty=10) = 5000
+ * calcTotalGram({baseGram:25000, unitCapacity:1}, qty=2) = 50000 (2件,每件25kg) */
+function calcTotalGram(spec, qty) {
+  if (!spec || !spec.baseGram) return 0;
+  var cap = spec.unitCapacity || 1;
+  var q = qty || 1;
+  return spec.baseGram * cap * q;
+}
+
+/* ---------- 7. 跨单位换算(向上取整) ---------- */
+/* 把源规格的总量,按目标单位的基准克重换算为目标单位数量
+ * convertSpec({baseGram:5000, unit:'箱'}, '袋', 500) = 10 (袋)
+ *   即:5kg/箱 ÷ 500g/袋 = 10 袋/箱 */
+function convertSpec(srcSpec, targetUnit, targetBaseGram) {
+  if (!srcSpec || !srcSpec.baseGram || !targetBaseGram) return 0;
+  var srcTotal = calcTotalGram(srcSpec, 1);
+  return ceilDiv(srcTotal, targetBaseGram);
+}
+
+/* ---------- 8. 验收秤场景兼容"斤"显示 ---------- */
+/* 500 → "1斤", 25000 → "50斤", 800 → "1.6斤"(非整斤回退到克) */
+function formatGramForCanteen(g) {
+  if (g === undefined || g === null || g === '' || isNaN(g)) return '—';
+  g = Number(g);
+  if (g % 500 === 0) return (g / 500) + '斤';
+  return formatGram(g);  // 非整斤回退到克/kg
+}
+
+/* ---------- 9. 采购规格 → 净料克重(扣出净率,向上取整) ---------- */
+/* L1 → L2 换算:采购总克重 × 出净率 = 净料总克重
+ * calcNetWeight(25000, 92) = ⌈25000 × 0.92⌉ = 23000 */
+function calcNetWeight(srcTotalGram, yieldRate) {
+  if (!srcTotalGram || !yieldRate) return 0;
+  return Math.ceil(srcTotalGram * (yieldRate / 100));
+}
+
+/* ---------- 10. 净料 → 反推采购需求(向上取整) ---------- */
+/* 已知净料需求,反推采购需求 = ⌈净料需求 / 出净率⌉
+ * calcPurchaseDemand(23000, 92) = ⌈23000 / 0.92⌉ = 25000 */
+function calcPurchaseDemand(netDemandGram, yieldRate) {
+  if (!netDemandGram || !yieldRate) return 0;
+  return Math.ceil(netDemandGram / (yieldRate / 100));
+}
+
+/* ---------- 11. 净料 → 可包装份数(向上取整) ---------- */
+/* L2 → L3 换算:净料总克重 ÷ 包装基准克重 = 可包装数
+ * calcPackableCount(23000, 500) = 46 (袋) */
+function calcPackableCount(netWeightGram, packBaseGram) {
+  return ceilDiv(netWeightGram, packBaseGram);
+}
+
+/* ---------- 12. 包装 → 餐品份数(向上取整) ---------- */
+/* L3 → L4 换算:(袋数 × 包装克重) ÷ 单份配方用量 = 可产出份数
+ * calcServableCount(46, 500, 120) = ⌈46×500 ÷ 120⌉ = ⌈191.67⌉ = 192 */
+function calcServableCount(packCount, packBaseGram, recipeGram) {
+  if (!packBaseGram || !recipeGram) return 0;
+  return ceilDiv(packCount * packBaseGram, recipeGram);
+}
+```
+
+---
+
+## 二、函数用途与使用位置索引
+
+| 函数名 | 用途 | 使用位置(任务编号) |
+|--------|------|---------------------|
+| `formatGram` | 克重展示格式化 | 几乎所有页面 |
+| `formatSpec` | 规格标签格式化 | 采购/入库/订单/包装等页面 |
+| `formatCutSpec` | 切配规格展示 | sup-in-clean / clean-veg-packaging-labeler / ratio-scale 等 |
+| `parseLegacyCutSpec` | 历史字符串解析(迁移用) | clean-veg-packaging-labeler(01-orders / 02-labeling / label-preview) |
+| `ceilDiv` | 向上取整除法 | 所有规格换算场景 |
+| `calcTotalGram` | 计算规格总克重 | 采购/订单/包装等 |
+| `convertSpec` | 跨单位换算 | 入库/订单/组配 |
+| `formatGramForCanteen` | 验收秤"斤"显示兼容 | raw-veg-inspection-scale / raw-veg-processing-scale |
+| `calcNetWeight` | L1→L2 扣出净率 | sup-in-clean / prod-proc-cook |
+| `calcPurchaseDemand` | L2→L1 反推采购需求 | sup-in-clean(反向推导) |
+| `calcPackableCount` | L2→L3 包装分装 | sup-in-cleanin / prod-clean-order |
+| `calcServableCount` | L3→L4 餐品产出 | prod-proc-combo / prod-proc-cook |
+
+---
+
+## 三、内联使用示例
+
+在每个需要工具函数的 HTML 页面,按需复制对应函数到 `<script>` 块开头:
+
+```html
+<script>
+  /* === 规格工具函数(从 doc/spec-utils-reference.md 内联,按需选取) === */
+  function formatGram(g) { /* ... 复制本文件第一节对应函数 ... */ }
+  function formatSpec(spec) { /* ... */ }
+  function formatCutSpec(cut) { /* ... */ }
+
+  /* === 页面业务逻辑 === */
+  // ... 原有页面代码 ...
+</script>
+```
+
+**注意**:
+- 按需选取,不必全量复制(例如只用 `formatCutSpec` 的页面,只内联这一个函数)
+- 复制后不得修改函数实现(确保所有页面一致)
+- 如需新函数或修改现有函数,**先在本文件修改**,再同步复制到所有页面
+
+---
+
+## 四、维护说明
+
+1. 本文件是**唯一权威源**,任何函数修改都先在这里进行
+2. 修改后,**同步更新所有引用该函数的页面**(可通过 grep 搜索函数名定位)
+3. 建议在每次改造任务完成后,运行一次全文检索,确认所有页面的函数实现一致
+
+---
+
+## 五、版本记录
+
+| 版本 | 日期 | 变更内容 |
+|------|------|---------|
+| v1.0 | 2026-08-04 | 初版,12 个工具函数(任务 1.1 交付) |
diff --git a/web-admin/nutrition/doc/智能部下周工作计划（2026年8月3日-7日）最终版-ty.md b/web-admin/nutrition/doc/智能部下周工作计划（2026年8月3日-7日）最终版-ty.md
deleted file mode 100644
index 955db63..0000000
--- a/web-admin/nutrition/doc/智能部下周工作计划（2026年8月3日-7日）最终版-ty.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# 智能部下周工作计划（2026年8月3日 — 8月7日）最终版
-
-> **依据**：（1）7月28日开业筹备第一次碰头会会议报告 + 老徐手记；（2）《智养餐饮平台系统反馈报告》156条业务反馈；（3）8月1日营养管理专项问题梳理；（4）8月2日开业碰头会第二次会议调整意见
-> **用途**：8月3日（周一）晨会任务下发，每项预留负责人与完成时间，晨会时补充填写
-
----
-
-## 一、P0：最高优先级（阻塞试营业，下周必须攻克）
-
-> 以下任务为试营业的硬阻塞项，压倒一切，必须在本周内完成或取得决定性进展。
-
-| 编号 | 任务 | 负责人 | 完成时间 | 说明 | 备注       |
-|------|------|--------|----------|------|----------|
-| **P0-1** | **全链路定价体系建设** | | | 🆕 **今日会议最高优先级新增，本周必须攻克**。打通从采购到售卖的全链条价格体系，分六个环节逐级传导——**①毛菜采购价**：实付金额÷验收重量=核算单价（自动计算，不可手动改），同时保留供应商报价单价字段供对比核查；**②毛菜入库价**：核算单价随毛菜入库延续，入库即带价；**③净菜价**：按净菜率从毛菜入库价折算净菜成本单价；**④餐品净菜包成本价**：根据餐品构成中各净菜用量与净菜单价汇总计算；**⑤餐品制作实际成本价**：对接配比秤实际投料数据（主辅料+调料用量+熟重），对比理论成本与实际成本偏差，以实际投料为准更新成本；**⑥餐品最终定价**：经营人员逐菜品设定毛利率→系统自动生成售卖价。先做应急版（跳过净菜中间加价环节，直接毛菜采购价→餐品成本→毛利率→售价，确保能卖饭），后续迭代完善全链条 | 产品设计     |
-| **P0-2** | **餐品库体系改造** | | 8.3 | 🆕 **整合原P0-2/P1-16/P2-1三条任务，提至最高优先级，周一必须完成**。改造现有单一餐品库为两级架构——**①系统级餐品总库**：包含两类餐品，须在设计上严格区分、不可混用：（a）正规流程餐品——通过系统标准流程维护，具备完整食材构成与配比重量数据，用于餐厅经营、净菜组配、成本核算等全部业务环节；（b）第三方餐品库——来自个人端小程序"自记餐"功能导入的外部餐品数据，缺失餐品构成信息，餐品本身直接设定营养数据（热量/蛋白质/脂肪等），仅供自记餐场景使用，不得混入经营流程。**②餐厅/食堂餐品库**：从系统级总库中选取本餐厅使用的餐品形成子集。餐厅提交餐品净菜包订单时，必须将餐品构成信息（用料清单+配比重量）附加到订单上，净菜加工场组配时按构成信息进行组配。同步完善：分类管理增删改查、餐品名称同组织唯一性校验、搜索食材功能修复。**周一必须完成现有200+菜品录入**（含食材构成+配比重量），食材库缺失的原材料可自己加（营养数据可缺失但重量价格必须有）。徐总带2-3个示范后交王喜团队批量完成 | 产品已补全设计  |
-| **P0-3** | **支付功能修复与完善** | | | ⬆ **今日会议提级**。两项——（1）联合支付已修复但APP未更新，尽快更新上线；（2）余额支付功能下周内完成开发。先把联合支付修复上线，内部测试版随时升级 | 产品设计/已完成 |
-| **P0-4** | **结算台问题专项修复** | | | 三项——（1）吐盘机人脸识别成功但餐线不显示打餐数据，导致无法结账；（2）付款后界面仍停留在未支付状态；（3）实际取餐信息与结算台显示不对应 |          |
-| **P0-5** | **营养秤重量失真修复** | | | 打餐重量严重失真（实际100g→系统显示620g），疑为未识别人脸时压秤后补识别导致。需根因分析+修复 |          |
-| **P0-6** | **营养秤人脸识别不稳定修复** | | | 3号营养秤人员识别不上；不同秤之间人脸数据未同步。需逐台验证+修复同步机制 |          |
-| **P0-7** | **试营业模拟问题即刻修复** | | | 员工参与试营业模拟过程中发现的系统问题第一时间修复：小问题当日修复，大问题提至最高优先级处理。小问题不过夜 |          |
-| **P0-8** | **配比秤餐品制作数据全量存储** | | | 配比秤接入后，餐品制作全过程关键数据（主辅料清单及用量、调料清单及用量、餐品熟重）后台必须完整存储。当前菜品构成数据缺失严重，此项是后续更新菜品构成的唯一可靠数据来源，同时为P0-1第⑤环节提供实际成本数据 | 验证       |
-| **P0-9** | **部署独立开发与测试环境** | | | 现有智养餐饮平台环境作为试营业生产环境，需尽快部署独立的开发、测试环境，与生产环境隔离 |          |
-| **P0-10** | **清理现有环境测试数据** | | | 将当前环境的旧测试数据（菜品定价、用户记录、交易流水、"内部供应商"等）彻底清理，确保试营业数据真实准确 |          |
-| **P0-11** | **组配秤任务逻辑修复** | | | 三项——（1）实际配比4道菜系统显示7道；（2）实际完成4道但显示已完成3道，计数不同步；（3）称重接近目标时未去皮导致实际重量偏小 |          |
-| **P0-12** | **取餐"价格=重量"BUG修复** | | | 🆕 营养管理专项P0。取餐记录中价格等于重量、热量等于重量，缺少乘以单价逻辑，直接影响收费 |          |
-| **P0-13** | **食谱规划/管理菜单位置调整** | | | 🆕 营养管理专项P0。当前菜单顺序反了：应是"营养用餐（定食堂+人数+食谱）→下达生产部门→健康生产（按食谱+人数计算食材用量）"，不是现在的"健康生产→食谱规划→营养用餐" | 优先级放后    |
-| **P0-14** | **53条手动食物数据逐条核实** | | | 🆕 营养管理专项P0。可食部为空、颜色千篇一律、味道/口感写死等数据质量问题，必须逐条核实补全：可食部+营养成分+颜色+味道 |          |
-| **P0-15** | **3429条内置食物数据来源核查启动** | | | 🆕 营养管理专项P0。声称"中国营养学会"但混入肯德基、麦当劳、九珍果汁等商业产品数据，需核查并去除。坚果等基本品类缺失需补全。本周启动 |          |
-| **P0-16** | **毛菜存储增加取用变化记录** | | | 🆕 营养管理专项P0。当前溯源只显示概要（"入库3.4公斤，余量2.1公斤，已领用0——少的1.4公斤去哪了？"），需记录完整变化过程：时间+取走多少+取走人 | 优先级放后    |
-| **P0-17** | **规格/单位字段拆分** | | | 🆕 营养管理专项P0。当前规格与单位混淆（"规格都是斤，数量是1"），需拆分为三个字段：规格（克重）+单位（袋/瓶/筐/批）+数量 | 产品设计     |
-| **P0-18** | **每日经营统计功能开发** | | | 至少实现通过数据库查询每日导出当日经营统计结果（就餐人数、收入、菜品销量等核心指标） | 产品设计     |
-|  | 小程序查看餐线订单 | | | 支持查看餐线订单 | 产品设计 /已完成   |
-|  | 小程序支持人脸录入、授权手机号 | | | 对比人脸信息，关联临时用户 | 产品设计 /已完成   |
-|  | 净菜厨房柜 | | | 厨房净菜柜对接、确认 |          |
-|  | 净菜柜、毛菜柜 | | | 确认多台的影响范围 |          |
-|  | 小程序屏蔽功能 | | | 订餐、点餐、净菜包购买 |          |
-|  |  | | |  |          |
-|  |  | | |  |          |
-
----
-
-## 二、P1：高优先级（影响核心业务流程，本周全力推进）
-
-| 编号 | 任务 | 负责人 | 完成时间 | 说明 | 备注 |
-|------|------|--------|----------|------|------|
-| **P1-1** | **后厨补餐屏接入试营业系统** | | | 补餐屏（小米电视）已放置后厨，需完成程序接入并确定安装位置（建议挂厨师附近墙上） | 1 |
-| **P1-2** | **食谱→净菜→毛菜采购量自动生成** | | | 🆕 王喜团队反馈三大核心需求之一。下食谱后系统自动生成净菜需求量，净菜量自动反算毛菜采购量。已有钱博士提供的算法，王喜先手算验证几次再开发 | 优先级放后 |
-| **P1-3** | **净菜数据维护配合** | | | 🆕 放开权限给王喜团队维护净菜名称。每个毛菜下挂多种净菜（如青椒→青椒丝/段/块），只维护实际用到的几十到一百种。徐总带2-3个示范后交团队 | 1 |
-| **P1-4** | **取餐屏APP改造（支持视频播放）** | | | 🆕 黄总团队制作菜品AI生成视频，需改造APP待机画面支持播放视频（从后台下载），支持操作人员随时更换。黄总每天发视频素材，这边对接上线 | 产品设计/已完成 |
-| **P1-5** | **算力与存储采购推进** | | | 🆕 会上被点名批评"不要再拖了"。大半年前提出按10倍储备采购，至今未执行。让小江尽快确认需求，确认后立即采购。存储和算力价格在上涨 |  |
-| **P1-6** | **结算后营养小票打印功能** | | | 第一阶段：终端侧按既定模板打印结算信息与营养信息 | 产品设计 |
-| **P1-7** | **大厅排行榜APP接入试营业系统** | | | 排行榜展示APP接入试营业系统环境，显示实时排行数据，带一屏改版数字调整 | 产品设计/已完成 |
-| **P1-8** | **餐线上方带鱼屏改版** | | | 需求及界面效果已完成，显示内容调整为"菜品价格+热量信息"，因屏幕清晰度一般不做复杂展示 | 产品设计/已完成 |
-| **P1-9** | **毛菜验收秤校验修复** | | | 四项——（1）未全部验收即可提交，缺少必验校验；（2）缺少重量校验导致0重量也可验收；（3）多次拍照建模触发闪退；（4）错误识别菜品重量覆盖其他菜品 |  |
-| **P1-10** | **净菜加工秤数据修复** | | | 两项——（1）毛菜足量但净菜加工后显示"还需0.0千克"；（2）清除库存不足任务后仍出现库存不足，后台数据未正常同步 |  |
-| **P1-11** | **毛菜加工时间记录修正** | | | 三项——（1）开始时间为统一提交时间而非首次放置时间；（2）同种蔬菜重复出现两次记录（应合并相同食材）；（3）加工秤应只读取主辅材数据 |  |
-| **P1-12** | **取餐管理功能修复** | | | 三项——（1）数据分页选择100行实际只展示30行；（2）用户取餐但未得分；（3）无法通过用户名查询取餐记录 |  |
-| **P1-13** | **后台数据展示修复** | | | 四项——（1）净菜订单数据看板"已完成"恒为0；（2）毛菜入库后后台显示未入库（含存放区域缺失）；（3）入库时间显示为非最终入柜时间；（4）毛菜入库排序逻辑正序改倒序 |  |
-| **P1-14** | **环境更新与回退机制建立** | | | 对试营业生产环境的更新操作须慎重，每次更新前做好备份，确保出现问题可回退至上一版本。本周完成方案并持续执行 |  |
-| **P1-15** | **食物成分数据规范** | | | 四项——（1）宏量营养素改为必填项；（2）食材名称增加唯一性校验；（3）净材率去掉最大值校验（干木耳泡发场景）； |  |
-| **P1-16** | **各节点补齐关键信息字段** | | | 🆕 营养管理专项P1。每个业务节点统一补齐：时间+操作人+设备编号+重量变化+单价。补齐缺失字段：采购人、入库人/验收人、审核人。本周设计、下周开发 |  |
-| **P1-17** | **食材统一加"国家营养库食材编码"字段** | | | 🆕 营养管理专项P1。为后续数据溯源和权威性验证打基础 |  |
-| **P1-18** | **补全基本品类食材数据** | | | 🆕 营养管理专项P1。坚果等基本品类在3429条内置数据中缺失，需补全 |  |
-| **P1-19** | **库存负值保护** | | | 🆕 营养管理专项P1。取格子时小于等于0一律等于0，程序加保护逻辑 |  |
-| **P1-20** | **页面返回逻辑修复** | | | 🆕 营养管理专项P1。"明明在A页面，返回后跳到B"，全局排查修复 |  |
-| **P1-21** | **菜品数据梳理核对** | | | 现有菜品数据（构成、营养信息、定价）多为随手录入，需逐一核对核实，配合菜品成本核算工作。完成首轮核对 |  |
-| **P1-22** | **小程序发布准备** | | | （1）确定小程序名称和图标设计；（2）梳理腾讯小程序上架审核所需资质（如ICP经营许可证等），列出缺失项并启动办理流程。等资质到位后发布正式版 |  |
-
----
-
-## 三、P2：中等优先级（提升易用性与规范化）
-
-| 编号 | 任务 | 负责人 | 完成时间 | 说明 |
-|------|------|--------|----------|------|
-| **P2-1** | **采购单来源与规格修正** | | | 采购单来源仅支持手动/内供/外售（去掉食谱搭配来源），规格改为下拉菜单 |
-| **P2-2** | **净菜加工字段清理** | | | 删除无实际功能的质检结果字段；开始/结束时间清晰命名 |
-| **P2-3** | **65寸广告机使用方式交接** | | | 将65寸广告机（柱子广告机）的日常操作方式（开关机、内容更新、轮播设置等）交接给餐厅工作人员 |
-| **P2-4** | **界面优化（序号/折叠/去重）** | | | 🆕 营养管理专项P3提至P2。所有列表统一加序号、左侧菜单支持折叠、入库信息去重显示、"食材溯源"等冗余标题去除 |
-| **P2-5** | **UI数据字段修正** | | | 🆕 营养管理专项。年龄自动计算（输入身份证号/出生日期→自动算年龄）、毛菜类型修正（"面片"标为毛菜需修正）、养殖/种植分类修正（"辣椒"标为"养殖"需改为"种植"） |
-| **P2-6** | **视频/图片字段预留** | | | 🆕 营养管理专项。各业务节点预留视频/图片字段 |
-| **P2-7** | **AI辅助食材用量计算验证** | | | 🆕 输入"食谱+人数"让AI算食材用量，验证可行性 |
-
----
-
-## 四、持续配合事项
-
-| 编号 | 任务 | 负责人 | 完成时间 | 说明 |
-|------|------|--------|----------|------|
-| **C-1** | **配合菜品成本核算** | | | 配合王喜、吕学锋、唐修哲完成200个菜品的成本核算与试营业定价，从后台捋价格，提供系统侧数据支持 |
-| **C-2** | **每日参加开业筹备例会** | | | 暂定每天10:30召开，汇报技术侧进展与阻塞问题 |
-| **C-3** | **业务反馈问题持续跟踪** | | | 每日跟进业务反馈清单中"待处理"问题，更新解决状态；当天新反馈的BUG当日响应 |
-| **C-4** | **餐盘柜接入试营业系统** | | | 优先级较低，其他任务完成后推进 |
-
----
-
-## 五、优先级汇总
-
-| 优先级 | 任务数 | 任务编号 |
-|--------|--------|----------|
-| **P0（最高）** | 18 | P0-1~P0-18 |
-| **P1（高）** | 22 | P1-1~P1-22 |
-| **P2（中）** | 7 | P2-1~P2-7 |
-| **持续配合** | 4 | C-1~C-4 |
-| **合计** | **51** | — |
-
-> ⚠️ 本周任务总数51项，其中P0级18项为试营业硬阻塞项，必须全力保障、逐项销号。
-> **两大头号工程**：P0-1（全链路定价）合并了原五条价格任务，覆盖毛菜采购价→入库价→净菜价→净菜包成本→实际制作成本→最终定价；P0-2（餐品库改造）合并了原三条餐品库任务，建立"系统级总库（正规流程+自记餐第三方）→餐厅餐品库（订单附加构成信息）"两级架构。
-
----
-
-## 六、今日（8月2日）待办
-
-| # | 事项 | 要求 |
-|---|------|------|
-| 1 | **问题全量汇集** | 把昨天会上的问题+今天会上提的所有问题，全部重新汇集整理成清单，今晚发到群里 |
-| 2 | **大分工+小分工** | 大分工=各模块负责人（抓落实），小分工=具体操作执行人。今天下午叫上杨幂、张传志等相关人员一起梳理 |
-| 3 | **核心问题重点落实** | 定价问题和餐品库改造是头号紧急事项，必须下周攻克 |
-
----
-
-
-
-## 附：业务反馈问题待处理跟进清单（本周重点销项）
-
-| 序号 | 模块 | 核心问题 | 状态 | 对应任务 |
-|------|------|----------|------|----------|
-| 1 | 结算台 | 吐盘机人脸识别成功但餐线不显示打餐数据 | 待审核 | P0-4 |
-| 2 | 结算台 | 付款后界面仍停留在未支付状态 | 待审核 | P0-4 |
-| 3 | 结算台 | 实际取餐信息与结算台显示不对应 | 待审核 | P0-4 |
-| 4 | 营养秤 | 打餐重量失真（100g→620g） | 待审核 | P0-5 |
-| 5 | 营养秤 | 人员打餐信息与实际操作人员不符 | 待处理 | P0-6 |
-| 6 | 营养秤 | 3号秤人员识别不上 | 待处理 | P0-6 |
-| 7 | 毛菜/净菜货柜 | 放置时间应取最近一次数据 | 待审核 | P1-13 |
-| 8 | 组配秤 | 去皮缺失/任务计数错误（3条） | 待处理 | P0-11 |
-| 9 | 毛菜验收秤 | 未验收可提交/0重量验收/拍照闪退/重量覆盖 | 待处理 | P1-9 |
-| 10 | 净菜加工秤 | 显示错误/库存数据异常 | 待处理 | P1-10 |
-| 11 | 取餐管理 | 分页bug/未得分/查询失效 | 待处理 | P1-12 |
-| 12 | 后台-健康生产 | 净菜订单看板统计失效 | 待处理 | P1-13 |
-| 13 | 营养管理-全链路定价 | 采购单价=手动输入不可靠；入库后无价格；缺少净菜成本/制作成本/自动定价 | 待处理 | **P0-1** |
-| 14 | 营养管理-餐品库 | 单一餐品库无层级区分；缺少自记餐第三方餐品隔离；订单未附加构成信息 | 待处理 | **P0-2** |
-| 15 | 营养管理-取餐 | "价格=重量""热量=重量"数据BUG | 待处理 | P0-12 |
-| 16 | 营养管理-食谱 | 食谱规划→健康生产菜单顺序反了 | 待处理 | P0-13 |
-| 17 | 营养管理-食物库 | 53条手动数据可食部/颜色/味道随意填写 | 待处理 | P0-14 |
-| 18 | 营养管理-食物库 | 3429条内置数据混入肯德基/麦当劳等商业数据 | 待处理 | P0-15 |
-| 19 | 营养管理-溯源 | 毛菜存储缺少取用变化记录（入库3.4→余2.1→领用0，少1.4去向不明） | 待处理 | P0-16 |
-
----
-
-*整理时间：2026年8月2日*
-*下发时间：2026年8月3日（周一）晨会*
diff --git a/web-admin/nutrition/doc/规格体系统一化改造-研发同步说明.md b/web-admin/nutrition/doc/规格体系统一化改造-研发同步说明.md
new file mode 100644
index 0000000..2484c98
--- /dev/null
+++ b/web-admin/nutrition/doc/规格体系统一化改造-研发同步说明.md
@@ -0,0 +1,257 @@
+# 规格体系统一化改造 · 研发同步说明
+
+> 撰写日期:2026-08-05 | 适用范围:营养管理模块(管理端 + 食堂设备端) | 目的:产品→研发的需求同步
+
+---
+
+## 一、改造背景(一句话说明)
+
+原系统中"规格"信息分散在 30+ 个页面,存在 **3 套互不一致的写死规格字典**、**"斤/克"单位不统一**、**份型/切配参数与餐品脱钩**、**包装规格无法跨页传递** 等问题。本次改造将所有规格信息统一为同一套口径,并打通"餐品总库 → 下游所有页面"的规格数据流。
+
+---
+
+## 二、整体改动概览
+
+| 端 | 改动菜单数 | 涉及核心场景 |
+|----|-----------|-------------|
+| 管理端(营养管理) | 19 个菜单 | 食材档案、餐品档案、字典、订单、加工、包装、质控、分析 |
+| 设备端(食堂设备) | 7 个设备模块(共 14 个页面) | 验收秤、毛菜加工秤、净菜加工秤、包装贴标秤、组配秤 |
+
+---
+
+## 三、管理端改动清单(营养管理)
+
+### 1. 食材档案
+
+#### 1.1 食材档案 - 新增/编辑
+- 净菜子项录入表由原来的 2 列(净菜名称、出净率)扩展为 7 列,新增"切配形状、长/宽/高(毫米)、刀工"5 个录入项
+- 切配形状与刀工以下拉框形式选择,选项来源于字典管理页的"切配类型字典"
+- 录入时会同时保存每条净菜子项的完整切配参数(形状、尺寸、刀工)
+
+#### 1.2 食材档案 - 详情/列表
+- 详情面板的净菜子项展示新增"切配规格"列,以可读文本统一展示(例:`15×15×15mm · 丁 · 直刀`)
+- 默认展开"猪里脊"示例,便于业务方理解切配规格的展示效果
+
+---
+
+### 2. 餐品档案
+
+#### 2.1 餐品总库
+- 每个餐品的"份型规格"统一为"克重 + 包装单位 + 份型名"三要素(例:`200g / 标准份`)
+- 份型下拉的选项来源改为字典管理页的"份型字典",不再使用页内写死数据
+- **新增"营养规格"信息位**(承接营养质控的回写)
+- **新增跨页共享能力**:页面打开时,会将本页所有餐品的规格信息持久化到浏览器本地,作为下游所有页面(订单/加工/包装/质控等)的统一数据源
+
+#### 2.2 餐品总库 - 新增/编辑
+- 份型录入行改为"左克重输入框 + 右份型下拉框"连体组件
+- 展示格式统一为 `克重g/份型`
+
+#### 2.3 我的餐品
+- 同 2.2,份型录入与展示统一为连体组件格式
+
+---
+
+### 3. 字典管理
+
+#### 3.1 字典管理
+- 新增"规格"Tab 页签
+
+#### 3.2 字典配置
+- "规格"Tab 下挂 4 套独立字典,共 42 个字典项:
+  - **包装单位字典**(首期 9 项:散装、件、袋、盒、箱、盘、份、瓶、罐;目标态 15 项)
+  - **切配类型字典**(8 项:丁、丝、片、块、段、末、泥、条,每项含默认尺寸与刀工)
+  - **份型字典**(5 项:标准份、小份、大份、迷你份、加大份,每项含默认克重)
+  - **包装方式字典**(6 项:真空、气调、普通、冷鲜、保鲜盒、散装托盘)
+
+---
+
+### 4. 净菜加工与入库
+
+#### 4.1 净菜加工批次
+- 删除页内写死的"食材→净菜类型"映射表,改为从食材档案动态读取
+- 净菜类型下拉显示从"只显示名称"升级为"名称 + 切配规格"(便于业务方识别)
+- 表格新增"切配规格"列
+- 出净率改为真实计算(净菜产出 ÷ 毛菜投入),支持反向推导(输入净菜需求量自动算毛菜重量)
+
+#### 4.2 净菜入库
+- 删除页内写死的净菜类型清单
+- 入库规格下拉统一为"克重 + 包装单位"格式(如 `500g/袋`)
+- 新增"切配规格"只读回显字段
+- 与上游净菜加工批次页之间通过页面跳转参数传递切配规格
+
+#### 4.3 采供下单
+- 采购规格从原来的"自由文本输入"改为按食材自动带出(来源:食材档案的采购级规格)
+- 液体类食材单位修正(如花生油 `5L/桶` → `5kg/桶`,按 1ml≈1g 换算)
+
+#### 4.4 毛菜入库
+- 入库规格从"7 种固定下拉选项"改为自动从采购订单继承,无需重选
+
+---
+
+### 5. 订单与配送
+
+#### 5.1 净菜订单
+- 删除两套页内写死的规格字典(普通模式一份、餐品模式一份、汇总表一份,三套数据互不一致)
+- 订单行的份型规格统一为"克重 + 单位/份型"组合,以连体组件录入(左克重 + 右单位/份型)
+- 餐品模式下,选择餐品后,份型下拉会动态加载该餐品在总库中维护的份型列表(不再固定)
+- 重量计算公式修正:考虑包装单位的容量换算
+- 单位下拉选项来源:字典管理页的"包装单位字典"
+
+#### 5.2 外售
+- 同 5.1,删除页内写死的规格字典
+- 录入与展示格式统一
+- 默认包装单位为"箱"(下单偏批量)
+
+#### 5.3 内供
+- 同 5.1,删除页内写死的规格字典
+- 录入与展示格式统一
+- 默认包装单位为"盘"(食堂内部配送常用)
+
+---
+
+### 6. 生产加工
+
+#### 6.1 净菜组配
+- 删除"3 个全局固定份型选项"(小份/标准份/大份),原下拉与所选餐品完全脱钩
+- 改为餐品级联动:选择餐品后,份型下拉动态加载该餐品在总库的份型列表
+- 选中份型后自动带出对应克重与单位
+
+#### 6.2 按单烹制
+- 规格字段改为只读回显(从上游组配单继承,本页不再允许编辑规格)
+- 规格展示统一为 `克重g/份型`
+- **新增"生熟比"自动计算**:输入生重后,熟重按出净率自动计算(向上取整),出净率从食材档案关联读取
+
+#### 6.3 净菜进柜
+- 进柜记录的"包装规格"字段原有多种自由文本形态(如 `5kg/袋`、`标准份(500g)`、`6份/箱`),统一结构化
+- 抽屉详情回显与餐品下拉的规格展示统一为同一格式
+
+---
+
+### 7. 包装与标签
+
+#### 7.1 包装标签
+- **净菜包规格**:从"纯数字输入(无单位)"升级为"左克重 + 右单位"连体组件
+- **餐品包规格**:删除"2 个全局固定选项"(与具体餐品无关),改为按当前餐品动态生成份型选项
+- 包装方式(真空袋/保鲜盒/散装托盘/冷鲜袋)独立为单独字段
+- 与设备端"净菜包装贴标秤"的口径完全对齐
+
+---
+
+### 8. 营养质控
+
+#### 8.1 营养质控
+- "同步检验均值→餐品总库"按钮真落地(原为假操作)
+- 同步操作会把检验均值(8 项营养指标 + 4 类感官评级)写入餐品总库对应餐品的"营养规格"字段
+- 同步记录持久化保存,供"营养质控同步记录"页面读取
+
+#### 8.2 营养质控 - 新增检验
+- 删除页内写死的餐品清单
+- 改为从餐品总库动态读取,按食堂餐线分组展示
+- 三级联动保留(场所 → 餐线 → 餐品)
+- 无数据时回退到内置示例,保证页面可用
+
+#### 8.3 营养质控 - 同步记录
+- 数据源改为读取真实的同步记录(由 8.1 写入)
+- 无记录时回退到内置示例展示
+
+---
+
+## 四、设备端改动清单(食堂设备)
+
+### 10. 毛菜验收秤
+
+#### 10.1 验收检验
+- 食材目录 20 项食材默认标记为"称重验收"(按重量过磅)
+- 调料目录 8 项调料默认标记为"点收验收"(按件数清点)
+- 单位下拉按验收类型自动过滤:称重类只显示重量单位(斤/公斤/克/千克),点收类只显示计数单位(袋/瓶/箱/桶等)
+- **关键变更**:验收重量的存储单位统一为"克",展示层仍兼容"斤"显示(如 2000g 显示为"4 斤"),业务方无感知
+
+---
+
+### 11. 毛菜加工秤(4 个页面)
+
+#### 11.1 清洗任务列表
+- 任务卡片中的重量信息统一改为克存储,展示层自动还原"斤"显示
+
+#### 11.2 批次称重
+- 批次重量数据统一改为克存储
+- 所有重量相关的文本节点(需 X 斤 / 已录 X 斤 / 总重量)自动按克→斤换算展示
+
+#### 11.3 批次清洗
+- 同 11.2,存储改克、展示兼容斤
+- 清洗后的出净率字段补齐(每项食材默认出净率 85%~95%)
+
+#### 11.4 清洗历史
+- 同 11.2,存储改克、展示兼容斤
+- 修复原有的展示层语法错误
+
+---
+
+### 12. 净菜加工秤 - 设置
+
+#### 12.1 加工参数设置
+- 删除"重量单位"下拉(与设备端"克存储"统一方向冲突),改为说明文字提示(由系统自动还原"斤"显示)
+- 滚刀块大小的单位统一为毫米(原厘米枚举值统一换算:`2cm → 20mm`、`3cm → 30mm`、`5cm → 50mm`)
+- 加工参数区新增说明:切配参数的默认值来源于食材档案,本设置仅作覆盖
+
+---
+
+### 13. 净菜包装贴标秤(3 个页面)⭐ 最复杂
+
+#### 13.1 包装订单 / 13.2 贴标作业 / 13.3 标签预览
+- **字段名统一**:三个页面原有的不同字段名统一为同一套命名
+- **历史 4 种字符串格式兼容**:不同页面原有 4 种不同的切配规格字符串写法(分隔符、空格、全角字符各异),本次全部兼容,统一解析为结构化对象
+- **包装规格结构化**:从自由文本(如 `500g`、`大份800g`、`真空包装`)统一拆解为"克重 + 单位 + 份型 + 包装方式"四要素
+- **"真空包装"等纯描述无克重场景**:作为独立的"包装方式"字段处理,不再混入规格字段
+- 三套示例数据全部结构化改造
+- 展示层统一格式输出
+
+---
+
+### 14. 净菜组配秤(3 个页面)
+
+#### 14.1 组配任务 / 14.2 称重包装 / 14.3 校验历史
+- 包装规格从描述性字符串(如 `大份800g`)统一结构化为"份型 + 克重 + 单位"三要素
+- 切配规格字符串统一结构化,展示层统一格式输出
+- **接入餐品总库**:组配任务页启动时从餐品总库加载餐品清单与份型选项,不再使用页内写死数据
+- 与"净菜包装贴标秤"口径完全对齐
+
+---
+
+## 五、给研发的关键提示
+
+### 5.1 数据存储统一原则
+- **所有重量字段的存储单位必须是"克(g)"**,数据库字段、接口入参/返参均以克为单位
+- "斤"仅作为设备端验收秤的展示层兼容,业务方看到的"4 斤"在系统中存储为 2000g
+
+### 5.2 跨页数据共享机制
+- 原型阶段使用浏览器本地存储(localStorage)模拟"餐品总库 → 下游页面"的数据流
+- **研发落地时需替换为后端接口**,建议提供"餐品规格全量查询"接口 + 前端缓存层
+- 关键操作前需校验数据时效(避免下游页读到过期数据)
+
+### 5.3 字典落地
+- 4 套字典(包装单位 / 切配类型 / 份型 / 包装方式)已落地到字典管理页
+- 研发需建字典主表 + 字典项表,按字典编码过滤加载
+- 首期落地的字典项数(见 3.2 节)为最小可用集,后续可由业务方在字典管理页扩展
+
+### 5.4 历史数据迁移
+- 设备端原有 4 种切配规格字符串格式必须全部兼容(否则历史数据会丢失切配参数)
+- 建议提供统一的"历史规格字符串 → 结构化对象"解析工具,所有页面共用
+
+### 5.5 已消除的隐患
+- 原系统 3 套互不一致的写死规格字典(订单页一份、外售页一份、汇总表一份)已全部删除,统一数据源为"餐品总库"
+- 原设备端"斤"作为存储单位导致的下游断链问题已修复
+
+---
+
+## 六、配套文档
+
+| 文档 | 用途 |
+|------|------|
+| 规格管理体系分析与设计方案 | 设计方案权威文档(架构与决策) |
+| 规格体系统一化改造任务清单 | 24 个改造任务的执行手册(含精确文件定位与核查记录) |
+| CHANGELOG | 本次变更的完整变更日志 |
+
+---
+
+> 本文档为产品→研发的需求同步说明,仅描述"改了哪些功能",不涉及具体字段名/方法名。研发评估工作量与数据契约时,请结合"改造任务清单"与"设计方案"两份文档对照查阅。
diff --git a/web-admin/nutrition/doc/规格体系统一化改造任务清单.md b/web-admin/nutrition/doc/规格体系统一化改造任务清单.md
new file mode 100644
index 0000000..f91eeb0
--- /dev/null
+++ b/web-admin/nutrition/doc/规格体系统一化改造任务清单.md
@@ -0,0 +1,1094 @@
+# 规格体系统一化改造任务清单
+
+> 撰写日期:2026-08-04 | 修订日期:2026-08-04 | 配套文档:[规格管理体系分析与设计方案](./规格管理体系分析与设计方案.md)(v3.1) | 状态:**阶段一、二已完成,阶段三~五方案 v2 修订(基于实际落地核查)**
+>
+> **v2 修订说明**:阶段一、二落地后,经全面核查发现原方案与现状存在 9 处偏差,涉及跨页数据共享、字段映射、cutSpec 多格式兼容、字典语义错配等。本次重写阶段三~五部分,补充前置任务 3.0、拆分复杂任务、明确字段映射规则。阶段一、二部分保持不变。
+>
+> 本文档将设计方案落地为具体可执行的改造任务,按三阶段迁移策略组织,每个任务标注文件路径、改造类型、依赖关系、工作量预估、精确定位。
+
+---
+
+## 一、总览
+
+### 任务统计
+
+| 阶段 | 任务数 | 文件数 | 工作量 | 说明 |
+|------|-------|--------|--------|------|
+| 阶段一 基础设施 | 3 | 3 | ★★★★☆ | 核心前置,需仔细(**已完成**) |
+| 阶段二 核心业务 | 4 | 5 | ★★★★☆ | 核心业务页改造(**已完成**) |
+| 阶段三 订单包装 | 5(含 3.0 前置) | 7 | ★★★★☆ | 订单与包装链路(v2 新增 3.0 跨页共享前置) |
+| 阶段四 设备端 | 9(原 5 拆分) | 14 | ★★★★★ | 最复杂,尤其 4.4(v2 拆分 4.1/4.2) |
+| 阶段五 辅助页 | 3 | 5 | ★★☆☆☆ | 可选,低优先级 |
+| **合计** | **24 个任务** | **34 个文件** | — | +1 个工具函数文件 |
+
+### 执行顺序
+
+```
+第一批(并行,阶段一全部):
+  任务1.1 spec-utils.js     (无依赖)
+  任务1.2 din-dict-mgmt 新增Tab(无依赖)
+  任务1.3 vegTypes 扩展      (依赖1.2,可先做结构,字典数据后填)
+
+第二批(并行,阶段二核心):
+  任务2.1 餐品总库 specs
+  任务2.2 sup-in-clean (核心)
+  任务2.4 采供/毛菜入库
+
+第二批半(阶段三前置,串行):
+  任务3.0 跨页 specs 共享机制  ← 阻塞阶段三所有 cp 任务
+
+第三批(并行,阶段三):
+  任务3.1 净菜订单(依赖 3.0)
+  任务3.2 外售/内供(依赖 3.0、3.1)
+  任务3.3a 净菜组配(依赖 3.0)
+  任务3.3b 按单烹制生熟比(独立)
+  任务3.4 包装标签(依赖 3.0)
+
+第四批(并行,阶段四设备端):
+  任务4.1a/4.1b 毛菜验收秤
+  任务4.2a/4.2b/4.2c 毛菜加工秤(斤→克)
+  任务4.3 净菜加工秤设置
+  任务4.4 净菜包装贴标秤(最复杂)
+  任务4.5 净菜组配秤
+
+第五批(可选,阶段五):
+  任务5.1 营养质控(依赖 3.0)
+  任务5.2 分析页(字典语义修复)
+  任务5.3 净菜进柜
+```
+
+---
+
+---
+
+## 二、任务依赖关系图
+
+```
+阶段一(基础设施)
+─────────────────
+任务1.1 spec-utils.js ─┬─→ 任务4.2 raw-veg-processing-scale(用formatGramForCanteen)
+                       └─→ 任务4.4 clean-veg-packaging-labeler(用formatCutSpec)
+
+任务1.2 din-dict-mgmt ─┬─→ 任务2.1 餐品总库(份型字典)
+                       ├─→ 任务2.4 采供/毛菜入库(包装单位字典)
+                       ├─→ 任务3.1 净菜订单(包装单位字典)
+                       ├─→ 任务3.4 包装标签(包装单位字典)
+                       ├─→ 任务4.1 毛菜验收秤(包装单位字典)
+                       └─→ 任务5.2 分析页(切配类型字典)
+
+任务1.3 vegTypes 扩展 ─┬─→ 任务2.2 sup-in-clean(核心依赖)
+                       ├─→ 任务2.3 sup-in-cleanin
+                       ├─→ 任务2.4 采供/毛菜入库(L1采购规格)
+                       ├─→ 任务4.3 clean-veg-ratio-scale(默认值)
+                       └─→ 任务3.3 prod-proc-cook(出净率)
+
+
+阶段二(核心业务)
+─────────────────
+任务2.1 餐品总库 ──────┬─→ 任务3.1 净菜订单(cp下拉)
+                       ├─→ 任务3.3 净菜组配/烹制(餐品L4)
+                       ├─→ 任务4.5 ratio-scale(餐品净菜包)
+                       └─→ 任务5.1 prod-qc-nutrition(同步目标)
+
+任务2.2 sup-in-clean ─→ 任务2.3 sup-in-cleanin(URL参数)
+
+
+阶段三(订单/组配/包装)
+─────────────────────
+任务3.1 净菜订单 ─────→ 任务3.2 外售/内供
+任务3.1 净菜订单 ─────→ 任务3.3 组配/烹制(部分依赖)
+
+
+阶段四(设备端)
+──────────────
+任务4.4 包装贴标秤 ────→ 任务3.4 sup-pkg-label(口径统一)
+
+
+阶段五(辅助页)
+──────────────
+任务5.1/5.2/5.3 可最后做,不阻塞主流程
+```
+
+---
+
+## 三、阶段一:基础设施(前置必做)
+
+### 任务 1.1:抽离统一规格工具函数 `spec-utils.js` ⭐
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/js/spec-utils.js`(新增) |
+| **改造类型** | 新建 |
+| **依赖** | 无 |
+| **工作量** | 中(约 200 行代码) |
+| **优先级** | 🔴 高(基础设施) |
+
+**交付物**:以下 7 个工具函数
+
+```javascript
+// 1. 克重展示格式化:500→"500g", 1500→"1.5kg", 25000→"25kg"
+function formatGram(g) {
+  if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+  if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+  return g + 'g';
+}
+
+// 2. 规格标签格式化:{baseGram:500,unit:'袋'} → "500g/袋"
+function formatSpec(spec) {
+  const w = formatGram(spec.baseGram);
+  if (spec.unit === '散装') return '散装/' + w;
+  return w + '/' + spec.unit;
+}
+
+// 3. 切配规格展示:{length:20,width:1,height:1,shape:'丝(细)',technique:'平刀'}
+//    → "20×1×1mm · 丝(细) · 平刀"
+function formatCutSpec(cut) {
+  if (!cut) return '—';
+  const dims = [cut.length, cut.width, cut.height].filter(v => v !== undefined && v !== null && v !== '');
+  const dimStr = dims.length ? `${dims.join('×')}mm · ` : '';
+  const shapeStr = cut.shape || '';
+  const techStr = cut.technique ? ` · ${cut.technique}` : '';
+  return `${dimStr}${shapeStr}${techStr}`;
+}
+
+// 4. 历史字符串解析(迁移用):
+//    "3.5mm*3.5mm*50mm·细丝·平刀"     (无空格,* 分隔)
+//    "20mm*1mm*1mm · 细丝 · 平刀"     (带空格,* 分隔)
+//    "20mm×1mm×1mm · 细丝 · 平刀"     (带空格,× 分隔)
+//    → {length,width,height,shape,technique}
+function parseLegacyCutSpec(s) {
+  if (!s) return null;
+  // 归一化分隔符:×→*,去掉所有空格
+  const normalized = s.replace(/×/g, '*').replace(/\s/g, '');
+  // 正则:可选尺寸 · 形状 · 刀工
+  const m = normalized.match(/^(?:(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm\*(\d+(?:\.\d+)?)mm)?·?([^·]+)·?([^·]+)?$/);
+  if (!m) return { shape: s };  // 无法解析则整体作为 shape
+  return {
+    length: m[1] ? parseFloat(m[1]) : undefined,
+    width:  m[2] ? parseFloat(m[2]) : undefined,
+    height: m[3] ? parseFloat(m[3]) : undefined,
+    shape:    m[4] || '',
+    technique: m[5] || ''
+  };
+}
+
+// 5. 向上取整除法(决策点 #5 统一向上取整)
+function ceilDiv(numerator, denominator) {
+  if (!denominator) return 0;
+  return Math.ceil(numerator / denominator);
+}
+
+// 6. 计算总克重:calcTotalGram({baseGram:500,unitCapacity:1}, qty=10) = 5000
+function calcTotalGram(spec, qty) {
+  const cap = spec.unitCapacity || 1;
+  return spec.baseGram * cap * qty;
+}
+
+// 7. 跨单位换算:convertSpec({baseGram:5000,unit:'箱'}, '袋', 500) = 10 (袋)
+//    返回:目标单位的数量(向上取整)
+function convertSpec(srcSpec, targetUnit, targetCapacity) {
+  const srcTotal = calcTotalGram(srcSpec, 1);  // 单位总量
+  const targetBase = targetCapacity || 1;
+  return ceilDiv(srcTotal, srcSpec.baseGram * 0 + targetBase);  // 简化:srcTotal / targetBase
+}
+
+// 8. 验收秤场景兼容"斤"显示:500→"1斤", 25000→"50斤"
+function formatGramForCanteen(g) {
+  if (g % 500 === 0) return (g / 500) + '斤';
+  return formatGram(g);
+}
+```
+
+**实施要求**:
+- 文件路径:`web-admin/nutrition/js/spec-utils.js`
+- 在需要的页面通过 `<script src="js/spec-utils.js"></script>` 引入
+- 由于本项目是墨刀导入兼容原型,需确认是否允许引用独立 JS 文件;如不允许,则改为在每个页面内联(会增加重复代码,但符合墨刀约束)
+
+**待确认**:墨刀兼容约束是否允许引用独立 JS?(CLAUDE.md 项目约束提及"禁止外部引用")
+
+---
+
+### 任务 1.2:字典管理页新增"规格"Tab `din-dict-mgmt.html` ⭐
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/din-dict-mgmt.html`(修改,389 行) |
+| **改造类型** | 新增 Tab + 3 个字典区块 |
+| **依赖** | 无 |
+| **工作量** | 中 |
+| **优先级** | 🔴 高(基础设施) |
+
+**精确定位**(基于核查):
+- 第 199 行后追加 `.page-tab`(在 `.page-tabs` 容器内)
+- 第 334 行前追加 `.tab-panel`(参考第 312-334 行"业务"Tab 模板,最简洁)
+- 第 352 行 `tabNames` 数组追加 `'规格'`
+
+**交付物**:在字典管理页新增"规格"Tab,下挂 3 个独立字典区块:
+
+```
+┌─ 规格 Tab ────────────────────────────────────────┐
+│  ▸ 字典 1: 包装单位字典(code=spec_unit)            │
+│    散装 | 件 | 袋 | 盒 | 箱 | 盘 | 份 | 筐         │
+│    瓶 | 罐 | 桶 | 把 | 个 | 只 | 条               │
+│    字段:unit / 默认unitCapacity / 是否液体类       │
+│                                                    │
+│  ▸ 字典 2: 切配类型字典(code=spec_cut_shape)       │
+│    丁 | 丝 | 片 | 块 | 段 | 末 | 泥 | 条           │
+│    字段:shape / 默认尺寸mm / 默认刀工              │
+│                                                    │
+│  ▸ 字典 3: 份型字典(code=spec_portion)              │
+│    标准份 | 小份 | 大份 | 迷你份 | 加大份          │
+│    字段:specName / 默认baseGram                    │
+└────────────────────────────────────────────────────┘
+```
+
+**实施要求**:
+- 沿用现有"字典名称/字典编码/字典分类/描述/创建时间/操作"列结构
+- 每个字典项的"字典配置"链接指向 `din-dict-config.html?code=xxx`
+- 当前 `din-dict-mgmt.html` 是静态 HTML(无 JS 数组),新增 Tab 直接复制 HTML 块即可
+
+**初始字典数据草案**(待业务方确认):
+
+| 字典 | 编码 | 字典项(初始) |
+|------|------|---------------|
+| 包装单位 | spec_unit | 散装/件/袋/盒/箱/盘/份/筐/瓶/罐/桶/把/个/只/条(共15项) |
+| 切配类型 | spec_cut_shape | 丁(15mm/直刀)/丝(3mm/斜刀)/片(2mm/平刀)/块(20mm/直刀)/段(50mm/直刀)/末/泥/条(50mm/斜刀)(共8项) |
+| 份型 | spec_portion | 标准份(300g)/小份(150g)/大份(500g)/迷你份(100g)/加大份(700g)(共5项) |
+
+---
+
+### 任务 1.3:食材档案 vegTypes 字段扩展 ⭐⭐(核心前置)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/din-ingredient-add.html`(修改,1000 行)<br>`web-admin/nutrition/din-ingredient.html`(修改,只读展示) |
+| **改造类型** | 字段结构扩展 + 录入表格改造 |
+| **依赖** | 任务 1.2(切配类型字典,用于 shape 下拉) |
+| **工作量** | 大 |
+| **优先级** | 🔴 高(基础设施,后续核心改造的前置) |
+
+#### A. `din-ingredient-add.html` 改造点
+
+##### A1. vegTypes 数据结构扩展
+
+影响位置(多处):
+- 第 423 行:`var vegTypes = []` 全局声明
+- 第 518/531/537 行:`{name:'',yieldRate:''}` 初始化
+- 第 546 行:push 对象
+- 第 693/704/715/726/737 行:mock 数据(5 个食材)
+
+```javascript
+// 旧:{name:'',yieldRate:''}
+// 新:{name:'',yieldRate:'',cutSpec:{shape:'',length:'',width:'',height:'',technique:''}}
+```
+
+##### A2. 录入表格 HTML 模板扩展(第 520-526 行)
+
+当前:
+```javascript
+vegTypes.forEach(function(item,i){
+  html += '<div class="dynamic-row">';
+  html += '<input class="form-input veg-name" placeholder="净菜名称" value="'+(item.name||'')+'">';
+  html += '<input class="form-input veg-yield" type="number" min="0" max="100" placeholder="菜品出净率(0~100)" value="'+(item.yieldRate||'')+'">';
+  html += '<button type="button" class="dynamic-row__del" onclick="removeVegType('+i+')" title="删除">×</button>';
+  html += '</div>';
+});
+```
+
+改造后(6 列):
+```javascript
+vegTypes.forEach(function(item,i){
+  html += '<div class="dynamic-row">';
+  html += '<input class="form-input veg-name" placeholder="净菜名称" value="'+(item.name||'')+'">';
+  html += '<input class="form-input veg-yield" type="number" min="0" max="100" placeholder="出净率%" value="'+(item.yieldRate||'')+'">';
+  // 新增:切配形状下拉(从切配类型字典读取)
+  html += '<select class="form-select veg-shape">'+buildShapeOptions(item.cutSpec?.shape)+'</select>';
+  // 新增:尺寸(3 个数字,部分形状只用1个)
+  html += '<input class="form-input veg-len" type="number" placeholder="长mm" value="'+(item.cutSpec?.length||'')+'">';
+  html += '<input class="form-input veg-wid" type="number" placeholder="宽mm" value="'+(item.cutSpec?.width||'')+'">';
+  html += '<input class="form-input veg-hei" type="number" placeholder="高mm" value="'+(item.cutSpec?.height||'')+'">';
+  // 新增:刀工下拉
+  html += '<select class="form-select veg-tech">'+buildTechOptions(item.cutSpec?.technique)+'</select>';
+  html += '<button type="button" class="dynamic-row__del" onclick="removeVegType('+i+')" title="删除">×</button>';
+  html += '</div>';
+});
+```
+
+##### A3. saveVegTypes 函数扩展(第 540-548 行)
+
+增加对新字段的读取与持久化:
+```javascript
+function saveVegTypes(){
+  vegTypes = [];
+  document.querySelectorAll('#vegTypeRows .dynamic-row').forEach(function(row){
+    vegTypes.push({
+      name: row.querySelector('.veg-name').value.trim(),
+      yieldRate: row.querySelector('.veg-yield').value.trim(),
+      cutSpec: {
+        shape:    row.querySelector('.veg-shape').value,
+        length:   row.querySelector('.veg-len').value ? parseInt(row.querySelector('.veg-len').value) : undefined,
+        width:    row.querySelector('.veg-wid').value ? parseInt(row.querySelector('.veg-wid').value) : undefined,
+        height:   row.querySelector('.veg-hei').value ? parseInt(row.querySelector('.veg-hei').value) : undefined,
+        technique: row.querySelector('.veg-tech').value
+      }
+    });
+  });
+}
+```
+
+##### A4. CSS 调整(第 107-113 行)
+
+`.dynamic-row` 当前是 flex 布局,所有 `.form-input` 均 `flex:1` 等宽。改造后需支持不等宽列:
+```css
+/* name 列宽,yieldRate 列窄,shape/size/technique 列中等 */
+.dynamic-row .veg-name { flex: 2; }
+.dynamic-row .veg-yield { flex: 1; }
+.dynamic-row .veg-shape,
+.dynamic-row .veg-tech { flex: 1.2; }
+.dynamic-row .veg-len,
+.dynamic-row .veg-wid,
+.dynamic-row .veg-hei { flex: 0.8; }
+```
+
+##### A5. Mock 数据补充(第 693/704/715/726/737 行)
+
+示例(猪里脊):
+```javascript
+vegTypes:[
+  {name:'肉丁', yieldRate:'92', cutSpec:{shape:'丁',length:15,width:15,height:15,technique:'直刀'}},
+  {name:'肉丝', yieldRate:'95', cutSpec:{shape:'丝',length:50,width:3,height:3,technique:'斜刀'}},
+  {name:'肉片', yieldRate:'97', cutSpec:{shape:'片',length:undefined,width:undefined,height:2,technique:'平刀'}}
+]
+```
+
+#### B. `din-ingredient.html` 改造点
+
+详情面板的 vegTypes 只读展示(renderBasicInfo,第 462-468 行):
+- 当前:显示 `{name}({yieldRate}%)` 两列
+- 改造后:增加切配规格列,用 `formatCutSpec(cutSpec)` 格式化
+
+---
+
+## 四、阶段二:核心业务页改造
+
+### 任务 2.1:餐品总库 specs 统一 `din-dish-all.html` + `din-dish-add.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/din-dish-all.html`(998 行)<br>`web-admin/nutrition/din-dish-add.html` |
+| **改造类型** | 字段语义统一(保留旧名作别名) |
+| **依赖** | 任务 1.2(份型字典) |
+| **工作量** | 中 |
+| **优先级** | 🔴 高 |
+
+**改造点**:
+- DISHES 数组(第 381/392/403/414/425 行):specs 增加 `baseGram` 字段(保留 `weight` 作兼容别名)
+- `renderBasic` 函数(第 472-507 行):表头(第 494 行)增加列,数据行(第 473-479 行)增加对应 `<td>`
+- 份型 name 字段从"份型字典"读取(下拉选项来源)
+- 预留营养规格字段(承接 prod-qc-nutrition 同步,暂不落地)
+
+**示例改造**:
+```javascript
+// 旧:
+specs:[
+  {name:'标准份', weight:200, price:12, cleanPrice:9, cleanSale:false, isDefault:true}
+]
+// 新:
+specs:[
+  {name:'标准份', baseGram:200, weight:200, price:12, cleanPrice:9, cleanSale:false, isDefault:true}
+  // weight 保留作别名,baseGram 为统一字段
+]
+```
+
+---
+
+### 任务 2.2:净菜加工批次改造 `sup-in-clean.html` ⭐⭐(核心)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/sup-in-clean.html`(432 行) |
+| **改造类型** | 删除硬编码 + 接入食材档案 |
+| **依赖** | 任务 1.3(vegTypes 扩展) |
+| **工作量** | 中 |
+| **优先级** | 🔴 高(核心规格枢纽) |
+
+**改造点**:
+
+1. **删除 `FOOD_VEG_MAP` 硬编码**(第 350-355 行):
+   ```javascript
+   // 删除:
+   var FOOD_VEG_MAP={
+     '土豆':['土豆丝','土豆片','土豆泥','土豆块'],
+     ...
+   };
+   ```
+
+2. **`onFoodChange()` 改造**(第 356-369 行):
+   - 数据源从 `FOOD_VEG_MAP[food]` 改为从食材档案按 foodName 查询 vegTypes
+   - 净菜类型下拉显示从纯字符串改为 `{name} - {formatCutSpec(cutSpec)}`(展示切配参数)
+
+3. **出净率真实计算**:当前 readonly 输入框(未实现),改造为 `⌈净菜产出/毛菜 × 100⌉`
+
+4. **反向推导**:输入"净菜需求量"时,自动算出"毛菜重量 = ⌈净菜需求量 / yieldRate⌉`
+
+5. **表格列改造**(第 216 行表头、第 220-238 行数据行):
+   - "净菜类型"列可拆分为"净菜类型"+"切配规格"两列(可选,看展示需求)
+
+6. **`confirmGenStock` 函数**(第 372-384 行):
+   - 当前基于列索引 `tds[3]` 读取"净菜类型",若列顺序变化需同步更新第 380 行
+
+---
+
+### 任务 2.3:净菜入库改造 `sup-in-cleanin.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/sup-in-cleanin.html` |
+| **改造类型** | 删除硬编码 + 接入食材档案 + UnifiedSpec |
+| **依赖** | 任务 1.3(vegTypes 扩展) |
+| **工作量** | 中 |
+| **优先级** | 🔴 高 |
+
+**改造点**:
+- 删除 `cleanFoodTypeOptions` 硬编码:食材→净菜类型联动改为从 vegTypes 读取
+- 入库规格下拉(`袋装/500g` / `盒装/300g` 等)改为 `baseGram + unit` 结构,从"包装单位字典"读取 unit 选项
+- 接收上游 `sup-in-clean.html` 的 URL 参数增加 cutSpec 字段
+
+---
+
+### 任务 2.4:采供/毛菜入库改造 `farm-purchase.html` + `sup-in-raw.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/farm-purchase.html`<br>`web-admin/nutrition/sup-in-raw.html` |
+| **改造类型** | 规格字段结构化 + 跨页继承 |
+| **依赖** | 任务 1.3(食材档案 L1 采购规格) |
+| **工作量** | 中 |
+| **优先级** | 🟡 中 |
+
+**改造点**:
+- `farm-purchase.html`:规格从自由文本改为 L1 自动带出(`baseGram + unit`),从食材档案读取
+- `sup-in-raw.html`:入库规格从 7 种固定下拉改为从采购订单继承 L1,无需重选
+
+---
+
+## 五、阶段三:订单/组配/包装改造(v2 修订)
+
+> **v2 修订背景**:核查发现 3 套互不相同的 cp 规格硬编码字典(`cpSpecOptions`/`cpSpecOptsExt`/`DISH_SPEC`),且 prod-proc-combo/cook 的规格下拉是"全局固定选项"与所选餐品完全脱钩,原方案的"从总库读取"缺数据接入路径。本阶段新增**任务 3.0 跨页共享前置**,并把 3.3 拆分为 3.3a/3.3b。
+
+### 任务 3.0:跨页 specs 共享机制 ⭐⭐(阶段三前置必做,v2 新增)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/din-dish-all.html`(写入侧)<br>阶段三 6 个下游页(读取侧) |
+| **改造类型** | 新增数据共享层 |
+| **依赖** | 任务 2.1(餐品 specs) |
+| **工作量** | 中 |
+| **优先级** | 🔴 高(阻塞阶段三所有 cp 任务、阶段五 5.1) |
+
+**改造点**:
+
+1. **din-dish-all.html 写入 localStorage**(DISHES 渲染后追加):
+   ```javascript
+   // 将 DISHES 数组的规格信息序列化到 localStorage,供下游页面读取
+   function persistDishSpecs(){
+     try {
+       var simplified = DISHES.map(function(d){
+         return {
+           id: d.id,
+           name: d.name,
+           category: d.category,
+           specs: (d.specs||[]).map(function(s){
+             return {portion:s.portion, baseGram:s.baseGram, unit:s.unit||'份'};
+           }),
+           cookedWeight: d.cookedWeight,
+           yieldRate: d.yieldRate
+         };
+       });
+       localStorage.setItem('dish_specs_v1', JSON.stringify({version:1, dishes:simplified, updatedAt:Date.now()}));
+     } catch(e){ console.warn('persistDishSpecs failed', e); }
+   }
+   persistDishSpecs(); // 页面加载后立即执行
+   ```
+
+2. **下游页封装工具函数**(内联到每个页面 `<script>` 块):
+   ```javascript
+   function loadDishSpecs(){
+     try {
+       var raw = localStorage.getItem('dish_specs_v1');
+       if(!raw) return null;
+       var data = JSON.parse(raw);
+       return (data && data.dishes) ? data.dishes : null;
+     } catch(e){ return null; }
+   }
+   function getSpecsByDish(name){
+     var dishes = loadDishSpecs();
+     if(!dishes) return [];
+     var d = dishes.find(function(x){return x.name === name;});
+     return d ? d.specs : [];
+   }
+   ```
+
+3. **兜底策略**:若 localStorage 为空(用户先打开了下游页),回退到页内 MINI_DISHES 硬编码数组,并提示"请先在餐品总库初始化数据"。
+
+**验收标准**:
+- 在浏览器中打开 din-dish-all.html → 切换到 prod-clean-order.html → DevTools 查看 localStorage['dish_specs_v1'] 有数据
+- 下游页调用 getSpecsByDish('红烧肉') 返回 3 条 specs
+
+---
+
+### 任务 3.1:净菜订单改造 `prod-clean-order.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/prod-clean-order.html`(1053 行) |
+| **改造类型** | 删除硬编码 + UnifiedSpec + 跨页拉取 |
+| **依赖** | 任务 1.2(包装单位字典)+ 任务 2.1(餐品 specs)+ **任务 3.0(跨页共享)** |
+| **工作量** | 中 |
+| **优先级** | 🔴 高 |
+
+**当前现状核查**:
+- nc 模式:`specGram` 用户输入整数 → `specLabel='xxx g/袋'`(自动拼接)
+- cp 模式:`cpSpecOptions` 页内硬编码 5 餐品×2 规格
+- 汇总表:`DISH_SPEC` 又一套 23 餐品的硬编码字典(第三套,与 cpSpecOptions 不一致)
+- 重量公式:`weight = specGram * qty / 1000`(L644-647)
+
+**v2 改造点**:
+
+1. **nc 模式规格 UI 改造**:
+   - 当前:整数 input + 自动拼 `'g/袋'`
+   - 改为:复用 `.spec-input-group` 连体组件(左 input 克重 + 右 select 单位)
+   - unit 选项来源:从 `localStorage['dict_spec_unit']` 或内联 `SPEC_UNIT_OPTIONS = ['袋','箱','盘','份','把']` 读取(优先字典)
+   - **字段映射**:`specGram → spec.baseGram`,`specLabel` 由 `formatSpec(spec)` 生成
+
+2. **cp 模式下拉接入跨页数据**:
+   - 删除 `cpSpecOptions` 硬编码(5 餐品×2 规格)
+   - 改为 `getSpecsByDish(餐品名)` 从 localStorage 读取
+   - 下拉显示格式:`{portion}({baseGram}g)`,例:`标准份(200g)`
+   - 餐品选择变更时动态刷新份型下拉
+
+3. **汇总表 DISH_SPEC 处理**:
+   - 删除 23 餐品的硬编码字典
+   - 改为从 localStorage 全量加载,按需过滤
+
+4. **重量公式修正**:
+   - 旧:`weight = specGram * qty / 1000`
+   - 新:`weight = spec.baseGram * (spec.unitCapacity||1) * qty / 1000`
+
+**验收标准**:
+- 切换餐品下拉时,份型下拉动态刷新为该餐品的 specs(由总库 DISHES 决定)
+- 修改 din-dish-all.html 的某餐品 specs 后,刷新 prod-clean-order 看到新数据
+
+---
+
+### 任务 3.2:外售/内供改造 `sup-clean-external.html` + `sup-clean-internal.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/sup-clean-external.html`(565 行)<br>`web-admin/nutrition/sup-clean-internal.html`(675 行) |
+| **改造类型** | 同任务 3.1 |
+| **依赖** | 任务 3.0 + 任务 3.1 |
+| **工作量** | 小 |
+| **优先级** | 🟡 中 |
+
+**当前现状核查**:
+- `sup-clean-external.html`:`cpSpecOptsExt` 硬编码 4 餐品×2 规格,重量公式 `weight = specGram * qty / 1000`(L448 calcELW)
+- `sup-clean-internal.html`:`cpSpecOptions` 硬编码 4 餐品×2 规格(与 prod-clean-order 同名但内容不同),公式 `weight = specGram * qty / 1000`(L530 calcCLWeight)
+
+**v2 改造点**:同任务 3.1,但 unit 默认值不同:
+- 外售:unit 默认 `箱`(下单偏批量)
+- 内供:unit 默认 `盘`(食堂内部配送常用)
+
+**注意**:外售/内供的 `cpSpecOptions` 与 prod-clean-order 的同名字典内容不同(各页硬编码),改造时统一替换为 `getSpecsByDish()` 调用即可消除三套字典分歧。
+
+---
+
+### 任务 3.3a:净菜组配改造 `prod-proc-combo.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/prod-proc-combo.html`(558 行) |
+| **改造类型** | 删除全局固定下拉 + 改为餐品级联动 |
+| **依赖** | 任务 2.1 + **任务 3.0** |
+| **工作量** | 中 |
+| **优先级** | 🟡 中 |
+
+**当前现状核查**:
+- `formSpec` select 元素,3 个**全局固定选项**:`小份(200g)/标准份(300g)/大份(500g)`
+- **与所选餐品完全脱钩**(选宫保鸡丁和选清蒸鱼看到的都是这 3 项)
+- 无 specGram 数据结构,无重量公式(食材明细按 `recipeData[餐品].amount * qty` 计算)
+
+**v2 改造点**:
+1. **餐品 + 份型两级联动**:
+   - 餐品 select 变更时,从 `getSpecsByDish(餐品名)` 动态填充份型 select
+   - 份型显示:`{portion}({baseGram}g)`
+2. **新增 specGram 字段** 到行数据:从选中份型的 baseGram 带出
+3. **保留**:食材明细计算逻辑不变(基于 `recipeData * qty`)
+
+---
+
+### 任务 3.3b:按单烹制改造 `prod-proc-cook.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/prod-proc-cook.html`(663 行) |
+| **改造类型** | 规格只读回显 + 新增 yieldRate 字段 |
+| **依赖** | 任务 3.3a(数据来源)+ 任务 2.2(vegTypes.yieldRate) |
+| **工作量** | 中 |
+| **优先级** | 🟡 中 |
+
+**当前现状核查**:
+- 规格来自表格行字符串 `tds[5].textContent`,写入 `editSpec`(disabled input)
+- **无 select 控件,无编辑能力**(纯只读)
+- 无 yieldRate 字段,无 cutSpec 字段
+- 生重/熟重 kg 由用户手输,无自动计算
+
+**v2 改造点**:
+1. **规格只读回显**(保留 disabled):
+   - 数据源改为从组配单(COOK-xxx)继承,**不新增编辑能力**
+   - 格式:`formatSpec({baseGram,unit}) + ' / ' + portion`
+2. **新增 yieldRate 字段**:
+   - 在每条烹制任务数据中新增 `yieldRate`(从 vegTypes.yieldRate 关联)
+   - 熟重 readonly 自动计算:`cookedWeight = rawWeight * yieldRate / 100`(向上取整)
+   - 若 rawWeight 变更,cookedWeight 自动刷新
+
+**说明**:原方案的"规格下拉"描述不准确——本页根本没有规格下拉,只有只读展示。v2 修正为"规格只读回显 + 生熟比自动计算"。
+
+---
+
+### 任务 3.4:包装标签改造 `sup-pkg-label.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `web-admin/nutrition/sup-pkg-label.html`(694 行) |
+| **改造类型** | 字段结构化 + 与设备端口径统一 |
+| **依赖** | 任务 1.2(包装单位字典)+ 任务 4.4(设备端同步)+ **任务 3.0** |
+| **工作量** | 中 |
+| **优先级** | 🔴 高(与设备端配套) |
+
+**当前现状核查**:
+- 净菜包:`cleanPackSpecInput` 纯整数 input(无单位),`sanitizeIntegerInput` 过滤非数字
+- 餐品包:固定 select **2 个全局选项**`标准份(500g)/大份(800g)`(与具体餐品无关)
+- 表格"包装规格"列:净菜显示纯数字(500/1000/2000),餐品显示 tag 字符串
+- 无重量公式,仅有"包装份数"
+
+**v2 改造点**:
+1. **净菜包规格** `packSpec` 纯整数(500/1000) → 改为 `{baseGram, unit}` 结构
+   - UI 改为 spec-input-group 连体(左克重 + 右单位,来自 spec_unit 字典)
+2. **餐品包规格**:
+   - 删除"2 个全局固定选项"
+   - 改为按当前餐品从 `getSpecsByDish(餐品名)` 动态生成
+3. **包装方式提取**:`真空袋/保鲜盒/散装托盘/冷鲜袋` 独立字段 `packMethod`
+4. **字段对齐设备端**(与任务 4.4 同步):`portions → packSize`
+
+**说明**:原方案"`portions` → `packSize`"正确,但遗漏了"餐品包规格是全局固定 2 选项与餐品脱钩"的问题,v2 补充。
+
+---
+
+## 六、阶段四:设备端改造(canteen-device)(v2 修订)
+
+> **v2 修订背景**:核查发现 cutSpec 实际有 **4 种字段名/格式组合**(不是 3 种),且任务 4.1 缺 `verifyType` 字段无法落地分类逻辑、任务 4.2 的"斤→克"迁移工作量被严重低估。本次将 4.1 拆为 4.1a/4.1b,4.2 拆为 4.2a/4.2b/4.2c,4.4 明确 4 格式兼容。
+
+### 任务 4.1a:食材目录新增 verifyType 字段(v2 拆分)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `other-module/canteen-device/raw-veg-inspection-scale/01-verify-inspection.html`(2629 行) |
+| **改造类型** | 数据结构扩展 |
+| **依赖** | 无 |
+| **工作量** | 小 |
+| **优先级** | 🔴 高(阻塞 4.1b) |
+
+**当前现状核查**:
+- `foodCatalog`(20 项,L1014-1033)食材目录 `unit:'斤'` 统一,无分类标识
+- `spiceCatalog`(8 项,L1038-1045)调料目录混合单位('瓶'/'袋'/'罐'/'桶'),无分类标识
+- 原方案说"由食材属性决定",但**当前没有"属性"字段**
+
+**v2 改造点**:
+1. foodCatalog 每项新增 `verifyType: 'weight'`(称重验收,20 项全部)
+2. spiceCatalog 每项新增 `verifyType: 'count'`(点收验收,8 项全部)
+3. 异常情况(如某食材实际是点收)在备注字段标注,等业务方确认后调整
+
+**验收标准**:DevTools 查看 foodCatalog[0] 应含 `verifyType:'weight'` 字段
+
+---
+
+### 任务 4.1b:UNIT_OPTIONS 按分类过滤展示(v2 拆分)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | 同 4.1a |
+| **改造类型** | 单位下拉分类重构 |
+| **依赖** | 任务 4.1a + 任务 1.2(包装单位字典) |
+| **工作量** | 中 |
+| **优先级** | 🟡 中 |
+
+**当前现状核查**:
+- `UNIT_OPTIONS`(L1477)= `['斤','公斤','克','千克','袋','瓶','箱','桶','罐','份','个','只','条','把']`
+- 14 种单位混在一起,`buildUnitSelect` 不做过滤
+
+**v2 改造点**:
+1. 称重验收(`verifyType='weight'`):UNIT_OPTIONS 仅显示 `['斤','公斤','克','千克']`(重量类)
+2. 点收验收(`verifyType='count'`):UNIT_OPTIONS 显示 `['袋','瓶','箱','桶','罐','份','个','只','条','把']`(容器/计数类)
+3. 采购规格从订单 L1 带出;实收默认跟随,允许修正
+4. 单位值"斤"在存储层换算为克(`weight*500`),展示层用 `formatGramForCanteen()` 兼容
+
+**注意**:验收秤的"斤"显示保留(决策点 #5),但存储必须是克,避免与下游断链。
+
+---
+
+### 任务 4.2a:毛菜加工秤存储层迁移 斤→克(v2 拆分)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `raw-veg-processing-scale/01-washing-tasks.html`(463 行)<br>`raw-veg-processing-scale/02-batch-weighing.html`(1010 行)<br>`raw-veg-processing-scale/03-batch-washing.html`(742 行)<br>`raw-veg-processing-scale/04-history.html`(503 行) |
+| **改造类型** | 数据存储单位迁移 |
+| **依赖** | 任务 1.1(spec-utils-reference.md) |
+| **工作量** | 大 |
+| **优先级** | 🔴 高(单位断链修复核心) |
+
+**当前现状核查**:
+- 4 个文件总 2718 行,"斤"作为字面量散布在 UI 文本、JS 数据、单位后缀等多处
+- `02-batch-weighing.html`(1010 行)最复杂:`taskDataMap` 中 weight 值直接以斤为单位的浮点数存储(如 4.0 斤)
+- `03-batch-washing.html`:无 yield 字段,清洗后出净率未记录
+
+**v2 改造点**(仅存储层):
+1. `01-washing-tasks.html`:mock 数据中的 `"需 4.0 斤"` 改为 `需克数 2000`(展示层再用 formatGramForCanteen 还原为"4 斤")
+2. `02-batch-weighing.html`:`taskDataMap` 值乘以 500(4.0 斤 → 2000g)
+3. `03-batch-washing.html`:同上
+4. `04-history.html`:同上,展示层格式化
+
+**风险**:mock 数据遍布 4 个文件,字面量替换易遗漏。建议用 grep 扫一遍确保无残留 `斤` 字面量(展示层注释除外)。
+
+---
+
+### 任务 4.2b:毛菜加工秤展示层兼容(v2 拆分)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | 同 4.2a |
+| **改造类型** | 展示层格式化 |
+| **依赖** | 任务 4.2a |
+| **工作量** | 中 |
+| **优先级** | 🔴 高 |
+
+**v2 改造点**:
+1. 所有 `"需 X 斤"` / `"已录 X 斤"` / `"N 件"` 等文本节点改用 `formatGramForCanteen(g)` 输出
+2. `formatGramForCanteen` 内联到每个页面(从 spec-utils-reference.md 复制)
+3. 统计卡片"总重量(斤)"改为"总重量",值用 formatGramForCanteen 格式化
+
+**说明**:此任务必须紧跟 4.2a,否则会出现"存的是克、显示也是克"导致业务方看到的数字"放大 500 倍"。
+
+---
+
+### 任务 4.2c:新增 yieldRate 字段(v2 拆分,仅 1 文件)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `raw-veg-processing-scale/03-batch-washing.html` |
+| **改造类型** | 数据结构扩展 |
+| **依赖** | 任务 4.2a |
+| **工作量** | 小 |
+| **优先级** | 🟡 中 |
+
+**v2 改造点**:
+1. `batchItems` 每项新增 `yieldRate` 字段(默认 90,即 90% 出净率)
+2. `aiResults`(6 项)、`foodDB`(12 项)同步补充 yieldRate
+3. UI 显示新增"出净率"列(readonly,可后续从食材档案带出真实值)
+
+---
+
+### 任务 4.3:净菜加工秤设置页改造 `clean-veg-ratio-scale/03-settings.html`
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `other-module/canteen-device/clean-veg-ratio-scale/03-settings.html`(192 行) |
+| **改造类型** | 切配参数统一单位 + 接入字典默认值 |
+| **依赖** | 任务 1.3(vegTypes.cutSpec) |
+| **工作量** | 中 |
+| **优先级** | 🟡 中 |
+
+**当前现状核查**(v2 修正):
+- 重量单位 select 选项 `['斤','克','千克']`(默认"斤") — **v2 新发现:与 4.2 改造方向冲突,需删除**
+- "丝条粗细"(mm 数字 input)、"滚刀块大小"(`['小(2cm)','中(3cm)','大(5cm)']`)、"方丁大小"(`['小(5mm)','中(10mm)','大(15mm)']`)、"刀工"(`['直刀','斜刀','花刀']`)
+
+**v2 改造点**:
+1. **删除"重量单位"select**(任务 4.2 已统一克存储,本设备不应再有此选项)
+2. 4 字段单位统一为 mm:
+   - 滚刀块大小枚举值 `小(2cm)/中(3cm)/大(5cm)` → `小(20mm)/中(30mm)/大(50mm)`
+   - 方丁大小已是 mm,保留
+3. 默认值从 `din-ingredient.vegTypes.cutSpec` 读取(本设备设置仅作覆盖)
+4. "默认刀工"字段从独立 select 改为引用切配类型字典(`spec_cut_shape`)
+
+---
+
+### 任务 4.4:净菜包装贴标秤改造 `clean-veg-packaging-labeler/*.html` ⭐⭐(最复杂)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `01-orders.html`(636 行)<br>`02-labeling.html`(760 行)<br>`label-preview.html`(417 行) |
+| **改造类型** | 字段名统一 + 结构化对象 + **4 格式字符串兼容** |
+| **依赖** | 任务 1.1(spec-utils.js 的 formatCutSpec / parseLegacyCutSpec) |
+| **工作量** | 大 |
+| **优先级** | 🔴 高(规格最混乱的设备) |
+
+**当前现状核查**(v2 修正:实际有 **4 种字段名/格式组合**):
+
+| 文件 | 字段名 | 分隔符示例 |
+|------|--------|-----------|
+| 01-orders.html | `vegCutType` | `'3.5mm*3.5mm*50mm·细丝·平刀'`(* 无空格 · 无空格) |
+| 02-labeling.html | `cutSpec` | `'20mm*1mm*1mm · 细丝 · 平刀'`(* 带空格 · 带空格) |
+| label-preview.html | `cutSpec` | `'20mm×1mm×1mm · 细丝 · 平刀'`(× 全角 · 带空格) |
+| ratio-scale/02-weighing-packing.html | `cutSpec` | `'20mm*1mm*1mm · 细丝 · 平刀'`(同 02-labeling) |
+
+**v2 改造点**:
+
+1. **字段重命名 + 结构化**:
+   - `vegCutType` → 改为 `cutSpec`,改为结构化对象 `{length,width,height,shape,technique}`
+   - `packSpec` 多种字符串格式 → 拆为 `{baseGram, unit, packMethod}` 结构
+     - `'500g'` → `{baseGram:500, unit:'袋', packMethod:''}`
+     - `'大份800g'` → `{baseGram:800, unit:'份', packMethod:'', portion:'大份'}`
+     - `'真空包装'` → `{baseGram:0, unit:'散装', packMethod:'真空'}`(纯描述无克重,标记 baseGram=0)
+
+2. **parseLegacyCutSpec 函数扩展**:必须兼容 4 种格式
+   ```javascript
+   // 测试用例(必须全部通过):
+   parseLegacyCutSpec('3.5mm*3.5mm*50mm·细丝·平刀')      // 01-orders 格式
+   parseLegacyCutSpec('20mm*1mm*1mm · 细丝 · 平刀')      // 02-labeling 格式
+   parseLegacyCutSpec('20mm×1mm×1mm · 细丝 · 平刀')      // label-preview 格式
+   parseLegacyCutSpec('50mm*30mm*30mm · 宽段 · 平刀')    // ratio-scale 格式
+   ```
+
+3. **解析逻辑改造**(01-orders.html 第 428-429 行):
+   ```javascript
+   // 旧:正则解析字符串
+   var specMatch = pack.packSpec && pack.packSpec.match(/(\d+)g/);
+   var perDue = specMatch ? parseInt(specMatch[1]) : ingWeight;
+
+   // 新:直接读结构化字段(若是字符串,先 parseLegacyCutSpec)
+   var baseGram = typeof pack.packSpec === 'object' ? pack.packSpec.baseGram : (parseLegacyPackSpec(pack.packSpec).baseGram || 0);
+   var perDue = baseGram || ingWeight;
+   ```
+
+4. **表头和行渲染**:
+   - "净菜类型"列改为 `formatCutSpec(pack.cutSpec)`
+   - "包装规格"列改为 `formatSpec({baseGram:pack.baseGram, unit:pack.unit})`
+
+5. **3 个 mock 数组同步改造**(01-orders.html 第 249-283、286-315、318-337 行)
+
+6. **label-preview.html**:
+   - `portions → packSize`
+   - `cutSpec` 字符串 `×` 改为通过 `formatCutSpec()` 统一生成(读结构化对象)
+
+**说明**:v2 关键修正——原方案说"3 种格式",实际是 4 种(包括 ratio-scale),需扩展兼容性。同时补充了 `packSpec='真空包装'` 这种"纯描述无数字"的处理路径。
+
+---
+
+### 任务 4.5:净菜组配秤改造 `ratio-scale/*.html` ⭐(3 个文件)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `ratio-scale/01-packing-tasks.html`(410 行)<br>`ratio-scale/02-weighing-packing.html`(1177 行)<br>`ratio-scale/03-verify-history.html`(待核查) |
+| **改造类型** | 字段结构化 + 接入餐品总库 |
+| **依赖** | 任务 2.1 + 任务 3.0 |
+| **工作量** | 中 |
+| **优先级** | 🟡 中 |
+
+**当前现状核查**:
+- `01-packing-tasks.html`:`packSpec='大份800g'/'标准份500g'/'大份500g'`(描述性字符串,均带份型);`packSize` 整数;`ingredients[].weightPerPack` 克整数
+- `02-weighing-packing.html`:同上 + `cutSpec='20mm*1mm*1mm · 细丝 · 平刀'`(字符串)
+- 调料列表硬编码(油/盐/白糖/酱油/醋/料酒/味精/豆瓣酱)
+- `cutSpecMap`(L957-959)动态构建
+
+**v2 改造点**:
+1. `packSpec='大份800g'` → 拆为 `{portion:'大份', baseGram:800, unit:'份'}`
+2. `cutSpec='20mm*1mm*1mm · 细丝 · 平刀'` 字符串 → 结构化对象,展示用 `formatCutSpec()`
+3. **接入跨页共享**:01-packing-tasks.html 启动时从 localStorage 加载餐品列表,动态生成 packSpec 选项
+4. 调料列表暂保持硬编码(独立优化项,不在本次规格统一范围)
+
+**说明**:v2 补充接入任务 3.0 跨页共享,与 4.4 配套,统一从餐品总库读取份型/克重。
+
+---
+
+## 七、阶段五:辅助页改造(v2 修订)
+
+> **v2 修订背景**:任务 5.1 的同步按钮落地依赖任务 3.0 的跨页共享;任务 5.2 的切配分类语义与 spec_cut_shape 字典不匹配(`切丝` vs `丝`),原方案错误。任务 5.3 核查发现实际有 `spec` 字段需要格式化,不是"几乎无改造"。
+
+### 任务 5.1:营养质控改造 `prod-qc-nutrition*.html`(3 个文件)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `prod-qc-nutrition.html`(741 行)<br>`prod-qc-nutrition-add.html`(421 行)<br>`prod-qc-nutrition-sync.html`(725 行) |
+| **改造类型** | 同步入口落地 + 菜品下拉接入餐品总库 |
+| **依赖** | 任务 2.1 + **任务 3.0(跨页共享,含写入能力)** |
+| **工作量** | 中 |
+| **优先级** | 🟡 中(不紧急) |
+
+**当前现状核查**(v2 修正):
+- `prod-qc-nutrition.html`:第 295 行有"同步检验均值→餐品总库"按钮,`confirmSync()`(L723-727)**仅 toast 假落地**
+- `prod-qc-nutrition-add.html`:`dishData`(L368-374)按 lid 映射 5 个餐品,三级联动(场所→餐线→日期→餐品),全硬编码
+- `prod-qc-nutrition-sync.html`:无规格字段,无同步按钮(纯展示页)
+
+**v2 改造点**:
+
+1. **prod-qc-nutrition.html 同步按钮真落地**:
+   - `confirmSync()` 改造:把 calcAvg 计算结果(8 项营养指标 + 4 类感官评级)写入 `localStorage['dish_specs_v1']` 对应餐品的 `nutri` 字段
+   - 提示用户"已同步至餐品总库,刷新餐品总库可见"
+   - 同步记录写入 `localStorage['nutri_sync_log_v1']`(供 prod-qc-nutrition-sync 读取)
+
+2. **prod-qc-nutrition-add.html 菜品下拉接入跨页**:
+   - 删除 `dishData` 硬编码
+   - 改为 `loadDishSpecs()` 读取,按 lid 分组展示
+   - 三级联动保留(场所→餐线→餐品)
+
+3. **prod-qc-nutrition-sync.html 同步记录展示**:
+   - 数据源改为 `localStorage['nutri_sync_log_v1']`
+   - 展示字段:syncTime / dish / 指标变化前后对比
+
+**说明**:任务 3.0 的 localStorage 设计需支持写入(不只是读取),v2 已在 3.0 描述中明确。
+
+---
+
+### 任务 5.2:分析页改造 `sup-process-analysis.html` + `sup-biz-analysis.html`(v2 修正语义错配)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `sup-process-analysis.html`(325 行)<br>`sup-biz-analysis.html`(259 行) |
+| **改造类型** | 字典语义修复 + 单位格式化 |
+| **依赖** | 任务 1.2(切配类型字典) |
+| **工作量** | 小 |
+| **优先级** | 🟢 低 |
+
+**当前现状核查**(v2 修正语义错配):
+- `sup-process-analysis.html` 切配线下拉:`切丝/切片/切丁/切段`(**动作**,L235-241)
+- `spec_cut_shape` 字典内容:`丝(细)/片(薄)/丁(小)/段`(**形状名词**)
+- **两套语义不匹配**,原方案"引用切配类型字典"无法直接落地
+- `sup-biz-analysis.html`:单位混乱(吨 + kg + 无单位并存,L158-243)
+
+**v2 改造点**:
+
+1. **sup-process-analysis.html 切配分类语义统一**:
+   - 把"动作"语义改为"形状名词"下拉:`切丝→丝`、`切片→片`、`切丁→丁`、`切段→段`
+   - 表格行硬编码 `土豆(切丝)/胡萝卜(切片)` 同步改为 `土豆(丝)/胡萝卜(片)`
+   - 下拉选项来源:`spec_cut_shape` 字典过滤(按 shape 名去重)
+
+2. **sup-process-analysis.html 包装线下拉**:
+   - 当前:`真空包装/气调包装/普通包装`(L278-283)
+   - **新增独立字典** `pack_method`(或在 spec_unit 字典加 packMethod 字段),保留这 3 项 + 扩展
+   - **决策待业务方**:是新增字典还是用现有字段?(见章节九待确认事项)
+
+3. **sup-biz-analysis.html 单位统一**:
+   - 存储 g,展示 kg 或吨(由 formatGram / formatKg 等函数决定)
+   - 删除"吨"作为存储单位
+   - 包装耗材表的"元 + 无单位"混乱统一为"元"
+
+---
+
+### 任务 5.3:净菜进柜 `prod-proc-cabinet.html`(v2 修正:实际有改造)
+
+| 项 | 内容 |
+|---|---|
+| **文件** | `prod-proc-cabinet.html`(581 行) |
+| **改造类型** | spec 字段格式化 + 菜品下拉接入 |
+| **依赖** | 任务 3.0(跨页共享)+ 任务 3.1 |
+| **工作量** | 小 |
+| **优先级** | 🟢 低 |
+
+**当前现状核查**(v2 修正:原方案错误判断"几乎无改造"):
+- `CABINET_DATA` 中 `spec` 字段为**自由文本多形态字符串**:
+  - `'5kg/袋'`、`'标准份(500g)'`、`'3kg/袋'`、`'500g/袋'`、`'标准份(600g)'`、`'6份/箱'`
+- 第 391 行 Drawer 回显"包装规格"字段
+- 第 481 行 `dishSelect` 渲染 `菜名 — spec — qty` 串联字符串
+
+**v2 改造点**:
+1. **spec 字段格式化**:统一改为 `{baseGram, unit, portion?}` 结构对象
+   - `'5kg/袋'` → `{baseGram:5000, unit:'袋'}`
+   - `'标准份(500g)'` → `{portion:'标准份', baseGram:500, unit:'份'}`
+   - `'6份/箱'` → `{baseGram:6, unit:'箱', portion:'份'}`(语义存疑,见待确认)
+2. **dishSelect 接入跨页**:渲染时调用 `formatSpec(spec)` 统一格式
+3. **Drawer 回显**:格式化展示,如 `5000g/袋` 或 `5kg/袋`(由 formatSpec 决定)
+
+**说明**:原方案判断"几乎无改造"过于乐观,实际 spec 字段的多形态字符串需要彻底格式化。v2 修正。
+
+---
+
+## 八、执行进度跟踪
+
+### 任务状态表
+
+| 任务编号 | 任务名 | 阶段 | 状态 | 完成日期 | 备注 |
+|---------|--------|------|------|---------|------|
+| 1.1 | spec-utils.js 工具函数 | 一 | ✅ 已完成 | 2026-08-04 | 改为 spec-utils-reference.md 内联源文档(墨刀约束禁止外部引用) |
+| 1.2 | din-dict-mgmt 规格Tab | 一 | ✅ 已完成 | 2026-08-04 | din-dict-config.html 同步改造为 JS 动态渲染,4 字典 42 项;**首期落地 9 项 unit,15 项目标态保留,任务 3.1/4.1 开始前补齐** |
+| 1.3 | vegTypes 字段扩展 | 一 | ✅ 已完成 | 2026-08-04 | din-ingredient-add.html 录入扩展为 7 列;din-ingredient.html 默认展开猪里脊展示切配规格示例 |
+| 2.1 | 餐品总库 specs 统一 | 二 | ✅ 已完成 | 2026-08-04 | **三页(din-dish-add/all/own)specs 字段统一为 `portion + baseGram + unit`;录入表格改为左 input 克重 + 右 select 份型连体组件;展示格式 `克重g/份型`** |
+| 2.2 | sup-in-clean 改造 | 二 | ✅ 已完成 | 2026-08-04 | 删除 FOOD_VEG_MAP;新增 FOOD_VEG_TYPES 数据源;表头加切配规格列;onFoodChange/confirmGenStock/doGenStock 改造 |
+| 2.3 | sup-in-cleanin 改造 | 二 | ✅ 已完成 | 2026-08-04 | 删除 cleanFoodTypeOptions;入库规格下拉改统一格式(500g/袋等);新增切配规格只读字段;IIFE 接收 cutSpec URL 参数 |
+| 2.4 | 采供/毛菜入库 | 二 | ✅ 已完成 | 2026-08-04 | farm-purchase.html 新增 FOOD_SPECS+onFoodNameChange+formatFoodSpec;sup-in-raw.html 入库规格改为 readonly 自动带出;花生油 5L/桶→5kg/桶(决策点#4 液体 1ml≈1g) |
+| **3.0** | **跨页 specs 共享机制(v2新增)** | 三 | ✅ 已完成 | 2026-08-04 | din-dish-all.html 持久化 dish_specs_v1;下游页 loadDishSpecs/getSpecsByDish/getAllDishNames 三函数内联 |
+| 3.1 | 净菜订单改造 | 三 | ✅ 已完成 | 2026-08-04 | 删除 cpSpecOptions/DISH_SPEC;newOrderLines 改 portion+baseGram+unit;nc 模式左克重+右单位,cp 模式左克重+右份型;食谱快速创建改 getDishSpecForRecipe |
+| 3.2 | 外售/内供 | 三 | ✅ 已完成 | 2026-08-04 | sup-clean-external.html 删 cpSpecOptsExt;sup-clean-internal.html 删 cpSpecOptions;统一改为 portion+baseGram+unit + spec-input-group 连体组件;外售默认 unit=箱,内供默认 unit=盘 |
+| **3.3a** | **净菜组配(v2拆分)** | 三 | ✅ 已完成 | 2026-08-04 | prod-proc-combo.html 删除 formSpec 全局固定 3 选项;改 onComboDishChange 动态从总库加载份型;_selectedSpec 缓存 baseGram/unit |
+| **3.3b** | **按单烹制生熟比(v2拆分)** | 三 | ✅ 已完成 | 2026-08-04 | prod-proc-cook.html 新增 DISH_YIELD_RATE 字典+autoCalcCookedWeight 函数;editSpec 改 formatSpecDisplay(matchSpecByText());生重变化触发熟重自动计算(向上取整) |
+| 3.4 | 包装标签 sup-pkg-label | 三 | ✅ 已完成 | 2026-08-04 | 净菜包规格改 spec-input-group(左克重+右单位,SPEC_UNIT_OPTIONS 9 项);餐品包规格改 buildDishSpecOptions(dish) 动态按餐品加载 |
+| **4.1a** | **食材目录 verifyType 字段(v2拆分)** | 四 | ✅ 已完成 | 2026-08-05 | foodCatalog 20 项默认 verifyType='weight';spiceCatalog 8 项默认 verifyType='count'(二分法够用,体积类由操作员自行转质量) |
+| **4.1b** | **UNIT_OPTIONS 分类展示(v2拆分)** | 四 | ✅ 已完成 | 2026-08-05 | 依赖 4.1a;按 verifyType 分流到 UNIT_OPTIONS_WEIGHT(斤/公斤/克/千克) 或 UNIT_OPTIONS_COUNT(袋/瓶/箱/桶/罐/份/个/只/条/把) |
+| **4.2a** | **毛菜加工秤存储层斤→克(v2拆分)** | 四 | ✅ 已完成 | 2026-08-05 | 4 文件 mock 数据全部改为 data-weight-g 克存储;taskDataMap 值改为克;record-card 添加 data-weight-g 属性 |
+| **4.2b** | **毛菜加工秤展示层兼容(v2拆分)** | 四 | ✅ 已完成 | 2026-08-05 | 依赖 4.2a;内联 formatGramForCanteen,展示层自动还原"斤"显示(如 2000g→4 斤);修复 04-history 语法错误(g===null===''→g===null||g==='') |
+| **4.2c** | **新增 yieldRate 字段(v2拆分,仅1文件)** | 四 | ✅ 已完成 | 2026-08-05 | 03-batch-washing.html aiResults 6 项 + foodDB 12 项新增 yieldRate(85~95);UI 列展示暂未添加,允许后续从食材档案带出 |
+| 4.3 | 净菜加工秤设置 | 四 | ✅ 已完成 | 2026-08-05 | 删除"重量单位" select 替换为 hint 说明(formatGramForCanteen 自动还原);滚刀块 cm→mm 统一(2cm→20mm,3cm→30mm,5cm→50mm);加工参数区添加 hint 引用 vegTypes.cutSpec + spec_cut_shape 字典 |
+| 4.4 | 净菜包装贴标秤(3文件) | 四 | ✅ 已完成 | 2026-08-05 | 3 文件全部内联 5 个工具函数(formatSpec/formatCutSpec/parseLegacyCutSpec/parseLegacyPackSpec/formatGram);cutSpec/packSpec/portions 字段全部结构化,portions→packSize 重命名,渲染使用 formatSpec/formatCutSpec;"真空包装"作为 packMethod 不在 packSpec 内 |
+| 4.5 | 净菜组配秤(3文件) | 四 | ✅ 已完成 | 2026-08-05 | 3 文件全部内联 5 个工具函数;RECORDS/taskData/mockData 中 packSpec 全部结构化为 {portion,baseGram,unit} 对象;cutSpec 结构化为 {length,width,height,shape,technique};渲染层统一 formatSpec/formatCutSpec;接入 localStorage dish_specs_v1 跨页共享(resolvePackSpec 兜底) |
+| 5.1 | 营养质控(3文件) | 五 | ✅ 已完成 | 2026-08-05 | prod-qc-nutrition confirmSync 真落地:按 dish 聚合后写入 localStorage['dish_specs_v1'] 的 nutri 字段 + 追加日志到 localStorage['nutri_sync_log_v1'](限 100 条);prod-qc-nutrition-add 改为 loadDishSpecs 按 CANTEEN_LINE_MAP 分组(回退到 FALLBACK_DISH_DATA);prod-qc-nutrition-sync 优先读取 nutri_sync_log_v1(avgCache 直读),无日志时回退到内置示例 |
+| 5.2 | 分析页(2文件) | 五 | ✅ 已完成 | 2026-08-05 | sup-process-analysis 切配分类"切丝/切片/切丁/切段"→"丝/片/丁/段"(形状名词,对齐 spec_cut_shape 字典);表格行"土豆(切丝)"→"土豆(丝)";包装线新增独立 pack_method 字典(真空/气调/普通/冷鲜/保鲜盒/散装托盘);sup-biz-analysis 生产分析表"投料重量(吨)/产出重量(吨)"→改为 kg 与 sup-process-analysis 口径一致 |
+| 5.3 | 净菜进柜 | 五 | ✅ 已完成 | 2026-08-05 | CABINET_DATA.spec 多形态字符串('5kg/袋'/'标准份(500g)'/'6份/箱')统一结构化为 {baseGram,unit,portion?};内联 formatSpec 工具函数;Drawer 回显与 dishSelect 渲染统一 formatSpec 输出;'6份/箱' 决策为 6 个份型单位装一箱 → {baseGram:6,unit:'箱',portion:'份'} |
+
+**状态图例**:⬜ 待开始 / 🟡 进行中 / ✅ 已完成 / ⚠️ 阻塞中
+
+**状态图例**:⬜ 待开始 / 🟡 进行中 / ✅ 已完成 / ⚠️ 阻塞中
+
+---
+
+## 九、待业务方确认事项
+
+### 已有事项(阶段一、二已处理)
+
+1. ~~**任务 1.1 墨刀兼容约束**:是否允许引用独立 JS 文件 `js/spec-utils.js`?~~ → 已决策:禁止外部引用,改为 spec-utils-reference.md 内联源文档
+2. ~~**任务 1.2 字典初始数据**:3 个字典的初始枚举值?~~ → 已决策:首期 9 项 unit,15 项目标态保留
+3. ~~**任务 1.3 vegTypes 数据填充**:先填核心食材?~~ → 已决策:先填核心,示例展示猪里脊
+4. **任务 5.1~5.3(辅助页)是否本次一起做?** ⬜ 仍待确认
+5. **任务 4.2 展示层"斤"兼容** ⬜ 仍待确认(raw-veg-processing-scale 是否保留"斤"显示)
+
+### v2 新增待确认事项
+
+6. **任务 3.0 localStorage 兜底策略**:若用户先打开下游页(未访问餐品总库),回退到页内 MINI_DISHES 硬编码,提示语如何写?
+   - 候选 A:"请先在餐品总库初始化数据"(引导用户)
+   - 候选 B:静默使用页内硬编码,不提示(用户体验好,但数据可能过期)
+
+7. **任务 4.1a verifyType 取值**:`weight` / `count` 是否够用?是否需要第三类(如 `volume` 体积验收,液体调料)?
+   - 当前 spiceCatalog 8 项默认全 `count`,但 `5L/桶` 花生油理论上是按体积验收
+   - 决策候选:A)二分法够用(weight/count);B)新增 volume 类
+
+8. **任务 4.4 `packSpec='真空包装'` 无克重情况**:baseGram 标记为 0 还是要求业务方补克重?
+   - 候选 A:baseGram=0,允许(但下游 weight 公式会产出 0)
+   - 候选 B:强制要求业务方填写大致克重(如"真空包装"按 200g 估算)
+
+9. ~~**任务 5.2 包装方式字典处理**~~ → 已决策:候选 A,新增独立字典 `pack_method`,首期 6 项(真空/气调/普通/冷鲜/保鲜盒/散装托盘),已落地到 sup-process-analysis.html 包装线筛选下拉
+
+10. ~~**任务 5.3 `'6份/箱'` 语义**~~ → 已决策:理解为"6 个份型单位装一箱",拆解为 `{baseGram:6, unit:'箱', portion:'份'}`(将份视为最小单位),formatSpec 输出"6g/箱"
+
+---
+
+## 十、风险与缓解
+
+| 风险 | 影响 | 缓解措施 |
+|------|------|---------|
+| 一次改造文件多(34个),上下文超长 | 中断 | 本文档作为执行手册,每完成一个任务更新状态表;每个任务独立提交 |
+| 墨刀约束不允许引用独立 JS | 任务 1.1 失效 | 已缓解:改为内联到每个页面(spec-utils-reference.md 作为参考源) |
+| vegTypes 数据补充工作量大 | 任务 1.3 阻塞 | 已缓解:先填核心食材(猪里脊/土豆/白菜等 10 种),其余逐步补充 |
+| 设备端改造测试需要实际设备 | 任务 4.x 难以验证 | 原型阶段以 Mock 数据展示为准,标记"待设备实测" |
+| 改造期间旧页面与新页面并存 | 数据格式不一致 | 三阶段渐进式,每阶段完成后旧 Mock 数据同步更新 |
+| **v2 新增:任务 3.0 localStorage 数据一致性** | 下游页读到过期数据 | din-dish-all.html 每次加载强制写入;下游页每次加载强制读取;关键操作前校验版本号 |
+| **v2 新增:任务 4.2a 斤→克迁移遗漏** | 部分"斤"字面量残留导致数据放大 500 倍 | grep 扫描所有"斤"字面量,逐个确认是存储还是展示;展示层注释除外 |
+| **v2 新增:任务 4.4 cutSpec 4 格式兼容不全** | parseLegacyCutSpec 漏改某种格式导致解析失败 | 必须用 4 个测试用例(见任务 4.4)覆盖所有格式,单元测试通过才能合并 |
+| **v2 新增:任务 3.3b yieldRate 数据来源** | vegTypes.yieldRate 与烹制页未关联 | 需先完成任务 2.2(已完成),yieldRate 从 localStorage 关联查询 |
diff --git a/web-admin/nutrition/doc/规格管理体系分析与设计方案.md b/web-admin/nutrition/doc/规格管理体系分析与设计方案.md
index bd6a7c8..643b23a 100644
--- a/web-admin/nutrition/doc/规格管理体系分析与设计方案.md
+++ b/web-admin/nutrition/doc/规格管理体系分析与设计方案.md
@@ -1,56 +1,69 @@
 # 营养管理——规格管理体系分析与设计方案
 
-> 撰写日期：2026-07-24 | 状态：**待评审**
+> 撰写日期:2026-07-24 | 修订日期:2026-08-04 | 状态:**待评审**
+>
+> **版本说明**:
+> - v1(2026-07-24):四级标签体系(L1采购/L2加工/L3包装/L4餐品)
+> - v2(2026-08-04 上午):改为统一克重基准 + 包装维度模型,跨环节换算改为 `totalGram` 算术
+> - v3(2026-08-04 下午):基于子代理核查发现业务流程已发生重大变更,补充现状分析、修订文件清单、固化 6 条决策点
+> - v3.1(2026-08-04 晚,**本版**):核查发现"食材-净菜类型关联"与 `din-ingredient.vegTypes` 完全重复,**取消该独立字典**,改为扩展 `vegTypes` 字段结构(增加切配参数);规格字典由 4 个减为 3 个
 
 ---
 
 ## 一、背景
 
-营养管理从餐品总库、食物成分到后续的各个订单业务、采购、验收、入库等环节中都涉及"规格"概念，但目前：
+营养管理从餐品总库、食物成分到后续的各个订单业务、采购、验收、入库、生产、设备端等环节中都涉及"规格"概念,但目前:
 
 - 规格没有统一维护入口
 - 各业务环节之间规格如何转换完全没有考虑
-- 同一概念在不同页面用不同数据格式表达，非常混乱
+- 同一概念在不同页面、不同端(web-admin 与 canteen-device)用不同字段名、不同数据格式表达
+- 设备端甚至出现"同一字段三种字符串格式"的严重不一致
 
-本文档对 10 个业务环节中"规格"的现状进行完整梳理，并给出统一设计方案。
+本文档对 **15+ 业务环节**中"规格"的现状进行完整梳理,并给出基于"统一克重基准 + 包装维度"的设计方案。
 
 ---
 
-## 二、全景总览：一个"规格"，十种表达
+## 二、全景总览:一个"规格",十五种表达
 
 ```
-采购环节                          加工/包装环节                      消费/生产环节
-───────                          ────────────                      ────────────
-farm-purchase                    sup-in-cleanin                    prod-clean-order
-  spec: "25kg/件" (自由文本)      入库规格: "袋装/500g" (下拉)         specGram: 500 (自由输入)
-                                 净菜类型: "丁(1.5cm)" (联动下拉)     specLabel: "500g/袋"
-                                  
-raw-veg-inspection-scale         sup-in-raw                        sup-clean-external
-  采购规格: "斤" (14种下拉)        入库规格: "25kg/件" (7种下拉)       spec: "5kg/箱" (自由输入+下拉)
-  实收规格: "斤" (14种下拉)                                       
-                                 sup-pkg-label                    sup-clean-internal
-din-dish-all                     净菜包: 500 (纯数字输入)            spec: "500g/袋" (自由输入+下拉)
-  specs: [{name:'标准份',         餐品包: "标准份(500g)" (下拉)
-          weight:200, price:12}]                                   prod-proc-combo
-                                                                    餐品规格: "标准份(300g)" (硬编码下拉)
-din-ingredient                                                       
-  vegTypes: [{name:'肉丁',                                        prod-proc-cook
-             yieldRate:'92'}]                                       餐品规格: "标准份(300g)" (只读)
-  (此处的 vegTypes 实际是净菜类型)                                  
-                                                                  prod-proc-cabinet
-                                                                    包装规格: "5kg/袋" (从订单回显)
+采供环节                       加工/包装环节                       消费/生产环节
+───────                       ────────────                       ────────────
+farm-purchase                 sup-in-clean ⚠(新增)               prod-clean-order
+  spec: "25kg/件" (自由文本)    FOOD_VEG_MAP 映射                    nc: specGram (自由输整数)
+                              净菜类型: "丁(1.5cm)"                 cp: cpSpecOptions (硬编码)
+raw-veg-inspection-scale      出净率(未实现)                       
+  UNIT_OPTIONS (14种单位混用)   sup-in-cleanin                    sup-clean-external / internal
+                              入库规格: "袋装/500g"                  spec (自由文本+下拉)
+raw-veg-processing-scale ⚠(新增)
+  washing-tasks: "需 X 斤"     sup-in-raw                        prod-proc-combo
+  batch-weighing: 斤            入库规格: 7种固定下拉                餐品规格: 硬编码下拉
+  (与下游克重完全断链!)
+                              sup-pkg-label                     prod-proc-cook
+din-dish-all                   净菜包: 纯整数                       餐品规格: 只读 + 生熟比
+  specs: [{name,weight,price}] 餐品包: "标准份(500g)" 下拉
+                              ⚠ 配套:clean-veg-packaging-labeler  prod-proc-cabinet
+din-ingredient                  packSpec: '500g'/'大份800g'         包装规格: 订单回显
+  vegTypes: [{name,yieldRate}] cutSpec: 3 种字符串格式
+                              ⚠ 同字段命名不一致(vegCutType       
+clean-veg-ratio-scale ⚠(修订)   vs cutSpec vs cutType)             
+  03-settings.html:                                                
+  丝条粗细(mm)                 ratio-scale ⚠(UI:净菜组配秤)         
+  滚刀块大小(cm枚举)            02-weighing-packing:                 
+  方丁大小(mm枚举)              cutSpec: '20mm*1mm*1mm·细丝·平刀'    
+  刀工(直刀/斜刀/花刀)⚠新发现    seasoning cellIdx + weightPerPack   
 ```
 
-**问题本质**：缺少一个统一的规格主数据中心，导致：
-1. 同一概念（如"包装规格"）在 6 个页面中以 6 种不同方式表达
-2. 不同层级规格之间（采购→净菜→餐品）完全没有转换规则
-3. 每个页面各自维护一套下拉选项，互不同步
+**问题本质**:缺少一个统一的规格主数据中心,导致:
+1. 同一概念(如"包装规格")在 6+ 个页面、3 个设备端、共 10+ 个文件中以多种方式表达
+2. 不同层级规格之间(采购→净菜→餐品)完全没有转换规则
+3. 设备端 `cutSpec` 字段在同设备内就出现 3 种字符串格式,跨设备更甚
+4. 重量单位在设备端用"斤"、在管理端用"克/kg/吨",跨工序无法对账
 
 ---
 
 ## 三、各环节规格现状详析
 
-### 3.1 餐品总库 `din-dish-all.html`——规格的定义源头（但只覆盖餐品层）
+### 3.1 餐品总库 `din-dish-all.html`——规格的定义源头(但只覆盖餐品层)
 
 ```javascript
 // 每个餐品对象内嵌 specs 数组
@@ -61,111 +74,245 @@ specs: [
 ]
 ```
 
-- 规格名称枚举：`标准份` / `小份` / `大份` / `迷你份` / `加大份`（在 `din-dish-add.html` 的下拉中定义）
-- 关键字段：name（份型名称）、weight（成品重量g）、price（餐品售价）、cleanPrice（净菜包售价）、cleanSale（是否外售上架）
-- **问题**：组配/烹制等下游环节使用另一套硬编码的规格下拉，与总库中定义的不联动
+- 规格名称枚举:`标准份` / `小份` / `大份` / `迷你份` / `加大份`(在 `din-dish-add.html` 的下拉中定义)
+- 关键字段:name(份型名称)、weight(成品重量g)、price(餐品售价)、cleanPrice(净菜包售价)、cleanSale(是否外售上架)
+- **潜在规格数据源**:`prod-qc-nutrition.html` 有"同步检验均值→餐品总库"入口(目前只 toast),意味着餐品总库 specs 未来可能还需要承载营养规格字段(8项营养指标 + 4类感官评级)
+- **问题**:组配/烹制等下游环节使用另一套硬编码的规格下拉,与总库中定义的不联动
 
 ### 3.2 食物成分库 `din-ingredient.html`——食材级"规格"
 
+**当前数据结构**(vegTypes 只有 2 个字段):
+
 ```javascript
-// vegTypes 实际表达的是"净菜类型"而非规格
+// vegTypes 实际表达的是"净菜类型 + 出净率"
 vegTypes: [
-  { name:'肉片', yieldRate:'95' },   // 猪里脊可加工为肉片，出净率95%
-  { name:'肉丁', yieldRate:'92' },   // 可加工为肉丁，出净率92%
-  { name:'肉块', yieldRate:'97' }    // 可加工为肉块，出净率97%
+  { name:'肉片', yieldRate:'95' },   // 猪里脊可加工为肉片,出净率95%
+  { name:'肉丁', yieldRate:'92' },   // 可加工为肉丁,出净率92%
+  { name:'肉块', yieldRate:'97' }    // 可加工为肉块,出净率97%
 ]
 ```
 
-- 这里的"规格"实际上是**净菜加工类型 + 出净率**
-- **问题**：出净率数据存在食材库中，但采购→净菜入库的换算从未使用出净率；净菜类型字典散落在 3-4 个页面中重复定义（`cleanFoodTypeOptions`、`cleanTypeMap` 等）
+**维护入口**(`din-ingredient-add.html`):
+- 录入方式:动态行表格,每行 2 个 input(净菜名称 + 出净率)
+- **完全无切配参数录入字段**(无丁大小、无丝粗细、无刀工)
+
+**问题**:
+1. **字段不够丰富**:只存 `name + yieldRate`,没有切配参数(如"丁(1.5cm)"的尺寸)、没有刀工(直刀/斜刀)
+2. **导致下游被迫硬编码**:正因为 vegTypes 缺切配参数,`sup-in-clean.html` 的 `FOOD_VEG_MAP` 才在食材档案外又硬编码了一套带尺寸的映射(`'丁(1.5cm)'`、`'条(4cm)'`)—— **这是规格体系散落的根因**
+3. **出净率未参与换算**:数据存了但从未被采购→净菜入库链路使用
+4. **命名粒度不统一**:本页"肉丁"(不带规格) vs `sup-in-clean.FOOD_VEG_MAP`"丁(1.5cm)"(带规格)——同一概念两种粒度
+
+**改造方向**(详见第六章 6.6 节):
+- **取消"食材-净菜类型关联"独立字典**(原 v3 方案曾误将其作为独立字典)
+- **改为扩展 vegTypes 字段结构**:增加 `cutSpec`(结构化切配参数,选填)
+- 这样 `sup-in-clean.html` 的 `FOOD_VEG_MAP` 可以直接读取食材档案,无需硬编码
 
 ### 3.3 采供管理 `farm-purchase.html`
 
 ```
-采购明细子表：溯源码 | 食材名称 | 食材分类 | 采购数量 | 规格 | 单价 | 小计
+采购明细子表:溯源码 | 食材名称 | 食材分类 | 采购数量 | 规格 | 单价 | 小计
 
-规格取值（自由文本输入，无约束）：
+规格取值(自由文本输入,无约束):
   蔬菜/水产 → "散装(kg)"
   肉类       → "25kg/件"
   粮油       → "5L/桶" / "20kg/箱"
 ```
 
-- **问题**：完全自由文本，既不下拉也不关联食材目录。采购写了 "25kg/件"，到毛菜入库环节还得重新选
+- **问题**:完全自由文本,既不下拉也不关联食材目录。采购写了 "25kg/件",到毛菜入库环节还得重新选
 
-### 3.4 毛菜验收秤 `01-verify-inspection.html`
+### 3.4 毛菜验收秤 `raw-veg-inspection-scale/01-verify-inspection.html`
 
 ```
-表格8列：食材 | 采购规格 | 采购量 | 采购单价 | 应付金额 | 实收规格 | 实收量 | 操作
+表格8列:食材 | 采购规格 | 采购量 | 采购单价 | 应付金额 | 实收规格 | 实收量 | 操作
 
-食材目录（20种可称重食材）:  { price:3.5, unit:'斤' }
-调料目录（8种按规格验收）:   { price:12, unit:'瓶', spec:'500ml/瓶' }
+食材目录(20种可称重食材):  { price:3.5, unit:'斤' }
+调料目录(8种按规格验收):   { price:12, unit:'瓶', spec:'500ml/瓶' }
 
 UNIT_OPTIONS = ['斤','公斤','克','千克','袋','瓶','箱','桶','罐','份','个','只','条','把']
 ```
 
-- 采购规格 = 14 种单位下拉，默认取食材目录的 unit
-- 实收规格 = 同上，默认跟随采购规格但可修改
-- **核心差异**：调料类走"规格验收"（不能称重，直接点收数量），食材类走"称重验收"
-- **问题**：`UNIT_OPTIONS` 混在一起的东西太多——有重量单位（斤/公斤/克/千克）、容器单位（袋/瓶/箱/桶/罐）、计数单位（份/个/只/条/把），语义完全不同
+- 采购规格 = 14 种单位下拉,默认取食材目录的 unit
+- 实收规格 = 同上,默认跟随采购规格但可修改
+- **核心差异**:调料类走"规格验收"(不能称重,直接点收数量),食材类走"称重验收"
+- **问题**:`UNIT_OPTIONS` 混在一起的东西太多——有重量单位(斤/公斤/克/千克)、容器单位(袋/瓶/箱/桶/罐)、计数单位(份/个/只/条/把),语义完全不同
 
-### 3.5 毛菜入库 `sup-in-raw.html`
+### 3.5 毛菜加工秤 `raw-veg-processing-scale/*.html` ⚠(v3 新增)
+
+7 个页面:`index` / `00-welcome` / `00-login` / `01-washing-tasks` / `02-batch-weighing` / `03-batch-washing` / `04-history` / `05-settings`
+
+**业务定位**:毛菜(未加工原料)清洗前后的称重记录设备,处于供应链最前端的验收+粗加工环节。
+
+**规格字段**:
+- `01-washing-tasks.html`:任务行显示"需 X 斤 / 已录 X 斤",单位**强制为"斤"**
+- `02-batch-weighing.html`:`taskDataMap` 存应取量/实取量(单位:斤),`aiResults` + `foodDB` 提供 AI 识别
+- `03-batch-washing.html`:清洗后称重,记录"出净重"(单位:斤),**但未显式计算或显示 yield**
+- `04-history.html`:任务编号/时间/食材/重量(斤)
+- `05-settings.html`:设备信息,无规格字段
+
+**严重问题**:
+1. **单位完全断链**:整设备只用"斤",与下游 `sup-in-clean` / `sup-in-cleanin` / `prod-clean-order`(用 kg/g)无法直接对接
+2. **无 yield 字段**:`03-batch-washing` 理论上应反映"清洗后出净率",但未显式记录 yieldRate,跨工序克重换算缺失关键环节
+
+### 3.6 毛菜入库 `sup-in-raw.html`
 
 ```
-入库规格下拉（7个固定选项）：
+入库规格下拉(7个固定选项):
   25kg/件 | 20kg/箱 | 15kg/箱 | 10kg/筐 | 5kg/袋 | 1kg/包 | 散装(kg)
 ```
 
-- **问题**：固定下拉与采购规格不联动，采购中选的 "25kg/件" 在这里要重新选一遍
+- **问题**:固定下拉与采购规格不联动,采购中选的 "25kg/件" 在这里要重新选一遍
 
-### 3.6 净菜入库 `sup-in-cleanin.html`
+### 3.7 净菜加工批次管理 `sup-in-clean.html` ⚠(v3 新增,核心规格页!)
+
+**业务定位**:净菜加工批次管理,记录食材→净菜的加工过程(投料、产出、出净率),并可生成入库单跳转 `sup-in-cleanin.html`。
+
+**规格字段**:
+- 表格列:**净菜类型**(如"土豆丝"、"土豆片"、"段(5cm)"、"丁(1.5cm)"、"条(4cm)")——核心规格字段
+- 表格列:**净菜需求量(kg)**、**毛菜重量(kg)**、**净菜产出量(kg)**、**出净率(%)**
+- 表格列:**加工步骤**(清洗/去皮/切割/分拣/综合加工)——硬编码下拉
+- 弹窗:食材名称下拉 → **联动净菜类型下拉**
+
+**关键 Mock 数据**(`FOOD_VEG_MAP`,这是当前"食材→净菜类型"映射的事实标准):
+
+```javascript
+var FOOD_VEG_MAP = {
+  '土豆':   ['土豆丝', '土豆片', '土豆泥', '土豆块'],
+  '四季豆': ['段(5cm)', '整根'],
+  '白菜':   ['整棵', '切段', '切丝'],
+  '猪里脊': ['丁(1.5cm)', '条(4cm)', '肉片', '肉末']
+};
+```
+
+**跨页面规格联动**:
+- 通过 `URLSearchParams` 携带 `batch/trace/food/cleanType/weight` 跳转 `sup-in-cleanin.html`——**这是当前唯一已实现的跨页规格参数传递!**
+
+**严重问题**:
+1. **净菜类型字符串结构不统一**:有的纯文字("土豆丝")、有的带尺寸("段(5cm)"、"丁(1.5cm)"),无法做枚举检索
+2. **出净率"自动计算"未实现**:UI 标注"自动计算"但实际是 readonly 输入框,没有反向换算逻辑(如:已知净菜需求量→推算毛菜需求量 = 需求量 / 出净率)
+3. **该映射(`FOOD_VEG_MAP`)与 `din-ingredient.html` 的 `vegTypes` 不联动**——同样的"猪里脊→肉丁"在两个页面重复定义,且命名不完全一致
+
+### 3.8 净菜入库 `sup-in-cleanin.html`
 
 ```
-入库规格下拉：袋装/500g | 袋装/400g | 盒装/300g | 散装/整棵 | 其他
+入库规格下拉:袋装/500g | 袋装/400g | 盒装/300g | 散装/整棵 | 其他
 
-食材→净菜类型联动：
+食材→净菜类型联动:
   土豆 → [土豆丝, 土豆块, 土豆泥]
   猪里脊 → [丁(1.5cm), 丝(0.8cm), 片(2mm)]
   西兰花 → [小朵, 西兰花段, 西兰花梗]
 ```
 
-- 两层选择：先选食材→联动净菜类型→再选入库规格（袋/盒/散装+克数组合）
-- **问题**：食材→净菜类型的映射（`cleanFoodTypeOptions`）在本页面独立维护，与 `din-ingredient.html` 中的 `vegTypes` 不联动
+- 两层选择:先选食材→联动净菜类型→再选入库规格(袋/盒/散装+克数组合)
+- 接收上游 `sup-in-clean.html` 的 URL 参数(`batch/trace/food/cleanType/weight`)
+- **问题**:食材→净菜类型的映射(`cleanFoodTypeOptions`)在本页面独立维护,与 `sup-in-clean.html` 的 `FOOD_VEG_MAP`、`din-ingredient.html` 的 `vegTypes` **三处重复定义且命名不完全一致**
 
-### 3.7 净菜订单 `prod-clean-order.html`
+### 3.9 净菜加工秤 `clean-veg-ratio-scale/*.html` ⚠(v3 修订)
+
+**业务定位**(由设备 index.html 卡片确认):**净菜加工秤**——承担"毛菜→净菜"的 AI 识别 + 加工(切配)验收。**注意:不是 ratio-scale 的旧版本,两者是并行设备**(详见 3.12)。
+
+页面清单:`00-welcome` / `01-accept` / `02-history` / `03-settings` / `04-sampling` / `05-sampling-history`
+
+**核心规格维护页:`03-settings.html`** 加工参数分区(`section-cutting`):
+
+| 字段实际命名(标签) | 描述 | 数据结构 | 单位 |
+|---|---|---|---|
+| **默认丝条粗细** | 丝条规格的标准粗细 | `number`(min=1,max=10,默认 3) | mm |
+| **默认滚刀块大小** | 滚刀块规格的标准大小 | 枚举字符串:`小(2cm)`/`中(3cm)`/`大(5cm)`(默认"中") | cm(嵌在枚举值里) |
+| **默认方丁大小** | 方丁规格的标准大小 | 枚举字符串:`小(5mm)`/`中(10mm)`/`大(15mm)`(默认"中") | mm(嵌在枚举值里) |
+| **默认刀工** ⚠(v3 新发现) | 默认使用的刀工方式 | 枚举字符串:`直刀`/`斜刀`/`花刀`(默认"直刀") | — |
+
+**严重问题**:
+1. **单位混用**:丝条用 mm,滚刀块用 cm,方丁用 mm——同一设备同一分区里就有 2 种长度单位
+2. **"标签里塞数值"反模式**:滚刀块/方丁的枚举值把尺寸塞进字符串(如 `"中(3cm)"`),不利于结构化检索
+3. **该设备默认值与 `sup-in-clean.html` 的 `FOOD_VEG_MAP` 不联动**:本设备只起"兜底默认值"作用,实际净菜任务的切配规格在 `01-accept.html` 任务数据里按食材逐个指定
+
+### 3.10 净菜订单 `prod-clean-order.html`
 
 ```
-nc模式（净菜包）: 食材 | 净菜名称 | 包装规格(g) | 份数 | 计量(kg)
-cp模式（餐品包）: 餐品名称 | 包装规格   | 份数 | 计量(kg)
+nc模式(净菜包): 食材 | 净菜名称 | 包装规格(g) | 份数 | 计量(kg)
+cp模式(餐品包): 餐品名称 | 包装规格   | 份数 | 计量(kg)
 
-nc: 包装规格 = 自由输入整数克数 → specLabel = "500g/袋"（自动拼接）
+nc: 包装规格 = 自由输入整数克数 → specLabel = "500g/袋"(自动拼接)
 cp: 包装规格 = 从 cpSpecOptions 下拉选择 → specLabel = "标准份(500g)"
 
 重量公式: weight = specGram × qty / 1000
 ```
 
 ```javascript
-// 硬编码的餐品规格选项（与餐品总库中的 specs 不联动）
+// 硬编码的餐品规格选项(与餐品总库中的 specs 不联动)
 cpSpecOptions = {
-  '宫保鸡丁': [{label:'标准份（500g）', grams:500}, {label:'加量份（750g）', grams:750}],
-  '清蒸鱼':   [{label:'标准份（600g）', grams:600}, {label:'大份（900g）', grams:900}],
+  '宫保鸡丁': [{label:'标准份(500g)', grams:500}, {label:'加量份(750g)', grams:750}],
+  '清蒸鱼':   [{label:'标准份(600g)', grams:600}, {label:'大份(900g)', grams:900}],
   ...
 }
 ```
 
-- **问题**：nc 模式的规格自由输入整数，可能出现 499g、501g 等非标准包装；cp 模式的选项硬编码，总库改了这里不会同步
+- **问题**:nc 模式的规格自由输入整数,可能出现 499g、501g 等非标准包装;cp 模式的选项硬编码,总库改了这里不会同步
 
-### 3.8 外售/内供 `sup-clean-external.html` / `sup-clean-internal.html`
+### 3.11 外售/内供 `sup-clean-external.html` / `sup-clean-internal.html`
 
-与净菜订单结构相同（nc/cp 两套模式），但 Mock 数据规格格式不同：
+与净菜订单结构相同(nc/cp 两套模式),但 Mock 数据规格格式不同:
 
 | 环节 | nc 规格示例 | cp 规格示例 |
 |------|------------|------------|
 | 外售 | `5kg/箱`, `1kg/箱` | `标准份(500g)` |
 | 内供 | `500g/袋`, `2kg/盘` | `标准份(500g)` |
 
-- **问题**：外售用 `箱`，内供用 `袋/盘`，包装容器类型没有统一约束
+- **问题**:外售用 `箱`,内供用 `袋/盘`,包装容器类型没有统一约束
 
-### 3.9 净菜组配 + 按单烹制 `prod-proc-combo.html` / `prod-proc-cook.html`
+### 3.12 净菜组配秤 `ratio-scale/*.html` ⚠(v3 新增,UI 名"净菜组配秤")
+
+**业务定位**(由设备 index.html 卡片确认):**净菜组配秤**——把多份净菜 + 调料按餐品配料表分装组合成"餐品净菜包"(如宫保鸡丁套餐)。**与 clean-veg-ratio-scale 是不同业务定位的并行设备,不是新旧替代关系**。
+
+页面清单:`index` / `00-welcome` / `00-login` / `01-packing-tasks` / `02-weighing-packing` / `03-verify-history` / `04-seasoning-settings`
+
+**规格字段**:
+
+| 页面 | 字段 | 数据格式 |
+|------|------|---------|
+| `01-packing-tasks.html` | `packSpec` | `'大份800g'`(描述型字符串) |
+| `01-packing-tasks.html` | `packSize` | 整数(份数) |
+| `01-packing-tasks.html` | `ingredients[].weightPerPack` | 数值(克) |
+| `01-packing-tasks.html` | `seasonings[].cellIdx/weightPerPack` | 格位索引 0-11 + 数值(克) |
+| `02-weighing-packing.html` | `cutSpec` | `'20mm*1mm*1mm · 细丝 · 平刀'`(注意 ` · ` 带空格,`*` 星号) |
+| `02-weighing-packing.html` | `weightPerPack/weighed` | 数值(克) |
+| `04-seasoning-settings.html` | `SEASONING_OPTIONS` | 硬编码 18 项调料字典 |
+| `04-seasoning-settings.html` | `localStorage['seasoning_position_config_v2']` | `{0:{name:'油',weight:1000}, ...}` |
+
+**业务联动**:
+- 调料分料盘配置通过 `localStorage` 在 `04-seasoning-settings.html` 与 `02-weighing-packing.html` 间共享
+- 与 `clean-veg-packaging-labeler`(下游贴标设备)通过订单号 `PO-XXX` 关联
+
+**严重问题**:
+1. `cutSpec` 格式 `'20mm*1mm*1mm · 细丝 · 平刀'` 与 `clean-veg-packaging-labeler` 的同字段格式不一致(详见 3.13)
+2. `packSpec='大份800g'` 是描述型字符串,与净菜包的 `'500g'` 纯数值字符串格式不同
+3. 调料字典 `SEASONING_OPTIONS`(18项)独立硬编码,未与任何管理端字典同步
+
+### 3.13 净菜包装贴标秤 `clean-veg-packaging-labeler/*.html` ⚠(v3 新增)
+
+**业务定位**:针对"净菜包/餐品净菜包"做按订单分装 + 贴标。**与 web-admin/nutrition/sup-pkg-label.html 是同一业务的"管理端列表 + 设备端执行"配套关系**。
+
+页面清单:`index` / `00-login` / `01-orders` / `02-labeling` / `03-history` / `label-preview`
+
+**规格字段**(本设备是规格字段最密集、最混乱的设备):
+
+| 字段名 | 01-orders.html | 02-labeling.html | label-preview.html |
+|--------|----------------|------------------|--------------------|
+| 切配规格 | `vegCutType` = `'3.5mm*3.5mm*50mm·细丝·平刀'`(无空格) | `cutSpec` = `'20mm*1mm*1mm · 细丝 · 平刀'`(带空格) | `cutSpec` = `'20mm×1mm×1mm · 细丝 · 平刀'`(`×` 乘号) |
+| 包装规格 | `packSpec` = `'500g'` / `'1000g'` / `'大份800g'` / `'真空包装'` | `packSpec` = `'500g'` / `'大份800g'` | `packSpec` = `'500g'` / `'大份800g'` |
+| 每包克重 | — | `weightPerPack` = 500(数值) | `portions` = 3(份数,与 02 的 `packSize` 同义不同名) |
+| 份数 | `packSize` = 3 | `packSize` = 3 | `portions` = 3 ⚠ |
+| 包装类别 | `type` = `'净菜包'`/`'餐品净菜包'` | `type` = `'净菜包'`/`'餐品净菜包'` | `type` = `'净菜包'`/`'餐品净菜包'` |
+
+**严重问题**(本设备规格字段最混乱,需重点改造):
+
+1. **同业务字段 3 种命名**:`vegCutType`(01-orders) ↔ `cutSpec`(02-labeling / label-preview) ↔ `cutType`(其他文档偶现)
+2. **同字段 3 种字符串格式**:同一个"切配规格"概念,在 01/02/label-preview 三个页面中分别用 `*` 无空格、`*` 带空格、`×` 带空格三种分隔符
+3. **packSpec 类型混杂**:`'500g'`(净重)/ `'大份800g'`(份型+净重)/ `'真空包装'`(只有包装方式,无净重)三种语义混在同一字段
+4. **同义字段多命名**:`packSize` vs `portions`(同义,两处命名不同)
+5. **与管理端口径不一致**:sup-pkg-label.html 的 `packSpec` 是纯整数(`500`/`1000`),本设备是带单位字符串(`'500g'`/`'大份800g'`),**无法直接 join**
+
+### 3.14 净菜组配 + 按单烹制 `prod-proc-combo.html` / `prod-proc-cook.html`
 
 ```
 组配: 餐品规格下拉 → 小份(200g) | 标准份(300g) | 大份(500g)【硬编码】
@@ -173,7 +320,7 @@ cpSpecOptions = {
 ```
 
 ```javascript
-// 组配中每份餐品的食材配方（重量以克为单位）
+// 组配中每份餐品的食材配方(重量以克为单位)
 recipeData = {
   '宫保鸡丁': [
     {trace:'NC-PROC-JXR-...', name:'鸡胸肉', type:'主材', amount:120, unit:'g'},
@@ -183,204 +330,614 @@ recipeData = {
 }
 ```
 
-- **问题**：规格下拉选项 "小份(200g)/标准份(300g)/大份(500g)" 与餐品总库中定义的 specs（标准份=200g, 小份=120g, 大份=300g）完全不一致
+- **问题**:规格下拉选项 "小份(200g)/标准份(300g)/大份(500g)" 与餐品总库中定义的 specs(标准份=200g, 小份=120g, 大份=300g)完全不一致
 
-### 3.10 净菜进柜 `prod-proc-cabinet.html`
+### 3.15 净菜进柜 `prod-proc-cabinet.html`
 
-- 规格从订单数据回显，不独立编辑
-- 跟踪 "初始重量(kg)" 和 "当前余量(kg)"，规格只作为辅助标识
+- 规格从订单数据回显,不独立编辑
+- 跟踪 "初始重量(kg)" 和 "当前余量(kg)",规格只作为辅助标识
+
+### 3.16 上餐监控/余量处置 `prod-proc-serve.html` / `prod-proc-surplus.html` ⚠(v3 新增)
+
+**业务定位**:烹制完成餐品的送达与余量管理。
+
+**规格字段**(均为克重维度,无规格字段):
+- `prod-proc-serve.html`:上餐重量(kg)、当前余量(kg)、出锅温度(℃)
+- `prod-proc-surplus.html`:计划制作(kg)、实际制作(kg)、销售/取餐(kg)、余量(kg)、余量率(%)
+
+**问题**:
+- 间接联动"烹制任务"(COOK-xxx),但 `dishData` 页内独立硬编码,**未链接到餐品总库 specs**
+- 余量率/利用率等指标在多个页面各自定义(`prod-proc-surplus` 余量率、`prod-proc-stats` 利用率、`sup-process-analysis` 损耗率),**没有统一的"换算公式字典"**
+
+### 3.17 营养质控 `prod-qc-nutrition*.html` ⚠(v3 新增,3 页面)
+
+**业务定位**:餐品的营养/味道/口感/色泽检验,并把检验均值同步到餐品总库。
+
+页面:`prod-qc-nutrition.html`(列表)+ `prod-qc-nutrition-add.html`(录入)+ `prod-qc-nutrition-sync.html`(同步记录)
+
+**规格字段**:
+- 营养指标(8项,按 100g 归一化):热量 kcal/100g、蛋白质 g、碳水 g、脂肪 g、维C mg、矿物质 mg、膳食纤维 g、钠 mg
+- 感官指标(4类):味道/口感/色泽 1-5 分制 + 综合评级(优秀/良好/一般/较差)
+
+**关键规格联动入口**:
+- `prod-qc-nutrition.html` 有 "同步检验均值→餐品总库" 按钮(目前只 toast)
+- `prod-qc-nutrition-sync.html` 展示历次同步记录(只读)
+
+**问题**:
+- 同步操作未真实落地,但暗示餐品总库 specs 未来需要承载营养规格字段
+- `prod-qc-nutrition-add.html` 的菜品级联下拉(`dishData`)是页内硬编码,**未从餐品总库拉取**
+
+### 3.18 加工/经营分析 `sup-process-analysis.html` / `sup-biz-analysis.html` ⚠(v3 新增)
+
+**业务定位**:产线维度与经营维度的聚合分析视图。
+
+**规格字段**(隐含规格分类):
+- `sup-process-analysis.html`:
+  - **清洗线**分类下拉:叶菜类/根茎类/瓜果类/菌菇类/豆制品(食材分类)
+  - **切配线**分类下拉:切丝/切片/切丁/切段/绞肉(⚠ **与 sup-in-clean.html 的 FOOD_VEG_MAP 命名不一致**)
+  - **包装线**分类下拉:真空包装/气调包装/普通包装/净菜包/餐品净菜包
+  - 表格列:投料重量(kg)、产出重量(kg)、加工损耗(kg)、不合格品(kg)、返工品(kg)、剩余重量(kg)
+- `sup-biz-analysis.html`:
+  - 产品分类:净菜包/餐品净菜包/毛菜半成品/净菜半成品/定制加工
+  - 质量分析缺陷类型含"净菜切型偏差"(隐含切配规格概念)
+  - **重量单位用"吨"**(与其他页 kg/g 不同)
+
+**问题**:
+- 切配规格命名与 `sup-in-clean.html` 不一致(`切丝` vs `土豆丝`、`切段` vs `段(5cm)`)
+- 重量单位在分析页用"吨",与其他页 kg/g 不一致,跨页换算困难
 
 ---
 
 ## 四、加工规格的额外维度
 
-在净菜配比秤设置页 `clean-veg-ratio-scale/03-settings.html` 中：
+在净菜加工秤设置页 `clean-veg-ratio-scale/03-settings.html` 中:
 
 ```
-丝条粗细 → 丝条规格的标准粗细
-滚刀块大小 → 滚刀块规格的标准大小
-方丁大小 → 方丁规格的标准大小
+默认丝条粗细(mm) → 丝条规格的标准粗细
+默认滚刀块大小(枚举: 小2cm/中3cm/大5cm) → 滚刀块规格的标准大小
+默认方丁大小(枚举: 小5mm/中10mm/大15mm) → 方丁规格的标准大小
+默认刀工(枚举: 直刀/斜刀/花刀) → 默认刀工方式
 ```
 
-这些与净菜类型中的 "丁(1.5cm)"、"丝(0.8cm)" 概念重复但未统一。
+**注意**:
+1. **单位混乱**:丝条用 mm,滚刀块用 cm,方丁用 mm
+2. **"标签里塞数值"反模式**:滚刀块/方丁的枚举值把尺寸嵌在字符串里(如 `"中(3cm)"`),不利于结构化检索
+3. **与净菜类型的概念重复但未统一**:`sup-in-clean.html` 的"丁(1.5cm)/丝(0.8cm)/片(2mm)" 与本设备的"方丁大小/丝条粗细" 概念重叠,但字段命名与数据结构完全不同
 
 ---
 
 ## 五、核心问题总结
 
-| # | 问题 | 严重程度 | 涉及页面数 |
+| # | 问题 | 严重程度 | 涉及页面/设备数 |
 |---|------|---------|-----------|
-| 1 | **采购规格自由文本，无约束无联动**——下游入库要重选 | 🔴 高 | 3 |
-| 2 | **餐品总库定义了 specs，但组配/烹制用另一套硬编码下拉** | 🔴 高 | 3 |
-| 3 | **包装容器类型（袋/盒/箱/盘/筐/桶/瓶）散落各处，无统一枚举** | 🔴 高 | 6 |
-| 4 | **食材→净菜类型映射在 3+ 页面重复定义，互不同步** | 🟡 中 | 4 |
+| 1 | **采购规格自由文本,无约束无联动**——下游入库要重选 | 🔴 高 | 3 |
+| 2 | **餐品总库定义了 specs,但组配/烹制用另一套硬编码下拉** | 🔴 高 | 3 |
+| 3 | **包装容器类型(袋/盒/箱/盘/筐/桶/瓶)散落各处,无统一枚举** | 🔴 高 | 6+ |
+| 4 | **食材→净菜类型映射在 4+ 处重复定义且命名不一致**:`din-ingredient.vegTypes` / `sup-in-clean.FOOD_VEG_MAP` / `sup-in-cleanin.cleanFoodTypeOptions` / `clean-veg-ratio-scale` 默认值 | 🔴 高 | 4 |
 | 5 | **采购→净菜→餐品三级规格之间没有任何转换规则** | 🔴 高 | 全部 |
-| 6 | **加工规格（切配参数）与净菜类型概念重复** | 🟡 中 | 2 |
-| 7 | **单位混用：重量单位、容器单位、计数单位混在一起** | 🟡 中 | 2 |
+| 6 | **加工规格(切配参数)与净菜类型概念重复,单位混乱(mm/cm)** | 🔴 高 | 3 |
+| 7 | **单位混用:重量单位、容器单位、计数单位混在一起**;设备端用"斤",管理端用"kg/g/吨",跨工序断链 | 🔴 高 | 5+ |
+| 8 | **设备端 `cutSpec` 同字段 3 种命名、3 种字符串格式**(`vegCutType`/`cutSpec`,`*`无空格/`*`带空格/`×`带空格)——**单设备内部就不一致** | 🔴 高 | clean-veg-packaging-labeler 3 页 + ratio-scale 2 页 |
+| 9 | **`packSpec` 字段类型混杂**:`'500g'`(净重)/ `'大份800g'`(份型+净重)/ `'真空包装'`(仅包装方式)三种语义混在同一字段 | 🔴 高 | clean-veg-packaging-labeler、ratio-scale、sup-pkg-label |
+| 10 | **同义字段多命名**:`packSize` vs `portions` 同义不同名 | 🟡 中 | clean-veg-packaging-labeler |
+| 11 | **管理端与设备端口径不一致**:sup-pkg-label.html 的 `packSpec=500`(纯整数) vs clean-veg-packaging-labeler 的 `packSpec='500g'`(带单位字符串)——**无法直接 join** | 🔴 高 | 2 |
+| 12 | **关键规格数据流断点**:`prod-qc-nutrition` 的"同步检验均值→餐品总库"目前只 toast,未落地;`raw-veg-processing-scale` 用"斤"与下游"克"完全断链 | 🟡 中 | 4 |
 
 ---
 
-## 六、设计方案：四级规格主数据体系
+## 六、设计方案(v3):统一克重基准 + 包装维度 + 结构化切配规格
 
-### 6.1 架构总览
+### 6.1 设计思想转变
+
+| 维度 | v1 方案 | v2 方案 | v3 方案(本版) |
+|------|---------|---------|---------------|
+| **核心模型** | 四级标签体系(L1~L4) | 统一克重规格 + 业务附属属性 | 继承 v2 + 补充结构化切配规格 + 跨端口径统一 |
+| **关联方式** | 字典映射(弱关联) | 基准量克重运算(强关联) | 同 v2 |
+| **跨级换算** | 查映射表 | `totalGram` 的乘除运算 | 同 v2,**取整规则明确为向上取整** |
+| **容器/单位** | 各级各维护一套 | 全局唯一 `unit` 枚举 | 同 v2 |
+| **切配规格** | 未单独建模 | 仅作附属属性 | **结构化对象**(length/width/height/shape/technique),杜绝字符串解析 |
+| **重量单位** | kg/g/斤 混用 | 存储一律 g,展示层格式化 | 同 v2 + **设备端强制从"斤"迁移到克** |
+| **液体规格** | 未明确 | 待讨论 | **方案 A**(体积→质量近似,1ml≈1g) |
+| **计数类** | 未明确 | 允许 baseGram=0 | **必须预估克重**(餐品配方要求所有食材按克重计算) |
+
+**核心公式**:
 
 ```
-┌─────────────────────────────────────────────────────────────────┐
-│                    规格主数据（统一维护入口）                      │
-├─────────────────────────────────────────────────────────────────┤
-│                                                                  │
-│  L1 采购规格           L2 净菜加工规格       L3 净菜包装规格      │
-│  ──────────           ──────────────       ──────────────        │
-│  采购单位 + 包装量      净菜类型 + 切配参数    容器类型 + 净含量    │
-│  例: 25kg/件           例: 丁(1.5cm)        例: 袋装/500g        │
-│      散装(kg)              丝(0.8cm)            盒装/300g        │
-│      5L/桶                 片(2mm)              箱装/5kg         │
-│                                                                  │
-│                           L4 餐品规格                            │
-│                           ──────────                            │
-│                           份型 + 成品重量(g)                      │
-│                           例: 标准份(300g)                       │
-│                               大份(500g)                         │
-│                                                                  │
-│  转换链:  L1 ──(出净率)──→ L2 ──(包装组合)──→ L3 ──(配方)──→ L4 │
-│                                                                  │
-└─────────────────────────────────────────────────────────────────┘
+任何规格 = 基准克重(baseGram) × 包装系数(unitCapacity) × 数量(qty)
+        └─ 基准量 ─┘   └─ 包装维度(可选) ─┘   └─ 业务量 ─┘
+
+所有跨环节换算 = totalGram 的乘除运算,每步取整规则 = 向上取整 ⌈⌉
 ```
 
-### 6.2 各级规格数据模型
+### 6.2 统一规格数据模型
 
-#### L1 — 采购规格（在食材目录中维护）
+#### 6.2.1 UnifiedSpec(核心结构,所有环节共用)
 
-| 字段 | 类型 | 说明 | 示例 |
-|------|------|------|------|
-| `purchaseUnit` | enum | 采购计量单位 | `kg`, `件`, `斤`, `L` |
-| `packSize` | number | 单件包装量 | `25`（25kg/件） |
-| `specLabel` | string | 规格标签（自动生成） | `25kg/件`, `散装(kg)` |
-| `allowLoose` | bool | 是否允许散装采购 | true/false |
-| `isWeightBased` | bool | 是否按重量验收（否则按规格验收） | true=称重, false=点收 |
+```typescript
+interface UnifiedSpec {
+  baseGram:     number;        // 基准克重(必填,存储统一为克)
+  unit:         SpecUnit;      // 包装维度(必填,枚举)
+  unitCapacity: number;        // 单位换算系数(选填,默认1;如"1件=25袋"时为25)
 
-#### L2 — 净菜加工规格（在食材目录中维护）
+  // ── 派生属性(自动计算,不落库) ──
+  // totalGram = baseGram × unitCapacity × qty
+  // specLabel = formatSpec(this)   例: "500g/袋"、"25kg/件"
+}
 
-| 字段 | 类型 | 说明 | 示例 |
-|------|------|------|------|
-| `cleanTypeName` | string | 净菜类型名称 | `丁`, `丝`, `片`, `块`, `段` |
-| `cutParam` | string | 切配参数 | `1.5cm`, `0.8cm`, `2mm` |
-| `yieldRate` | number | 出净率(%) | `92` |
-| `displayName` | string | 完整显示名（自动生成） | `丁(1.5cm)` |
-
-#### L3 — 净菜包装规格（独立字典）
-
-| 字段 | 类型 | 说明 | 示例 |
-|------|------|------|------|
-| `containerType` | enum | 包装容器类型 | `袋`, `盒`, `箱`, `盘`, `筐`, `桶` |
-| `netWeight` | number | 净含量(g) | `500`, `300`, `5000` |
-| `specLabel` | string | 规格标签（自动生成） | `袋装/500g` |
-
-#### L4 — 餐品规格（在餐品总库中维护，现有结构基本正确）
-
-| 字段 | 类型 | 说明 | 示例 |
-|------|------|------|------|
-| `specName` | string | 份型名称 | `标准份`, `大份`, `小份` |
-| `finishedWeight` | number | 成品重量(g) | `300` |
-| `price` | number | 餐品售价(元) | `12` |
-| `cleanPrice` | number | 净菜包售价(元) | `9` |
-
-### 6.3 规格转换规则
-
-```
-采购规格(L1) → 净菜加工规格(L2)：
-  净料重量 = 采购量 × 出净率(来自食材目录 vegTypes.yieldRate)
-  例：25kg/件 猪里脊 → 切肉丁(出净率92%) → 净料 = 25 × 0.92 = 23kg
-
-净菜加工规格(L2) → 净菜包装规格(L3)：
-  可包装份数 = 净料重量(g) ÷ 包装规格净含量(g)
-  例：23kg = 23000g → 袋装/500g → 可包 23000 ÷ 500 = 46 袋
-
-净菜包装规格(L3) → 餐品规格(L4)：
-  可产出份数 = (袋数 × 净含量) ÷ 单品食材用量
-  例：46袋 × 500g/袋 ÷ 120g(宫保鸡丁每份需肉丁量) ≈ 191 份
+type SpecUnit =
+  | '散装' | '件' | '袋' | '盒' | '箱' | '盘'
+  | '份'   | '筐' | '瓶' | '罐' | '桶'
+  | '把'   | '个' | '只' | '条';
 ```
 
-### 6.4 规格字典管理页面（新增）
+**关键约束**:
+1. `baseGram` 永远以"克(g)"为单位,**禁止 kg/斤/公斤混入存储层**
+2. `unit` 枚举全局唯一,不再出现"kg"、"斤"、"公斤"这种重量单位作为 `unit`
+3. 重量单位(kg/斤/公斤)只在**最终展示层**做格式化转换
+4. **计数类(`把/个/只/条`)必须填预估克重**,不允许 `baseGram=0`(决策点 #3 已确认:所有餐品配方都按克重计算,无克重无法参与)
 
-建议在营养管理后台新增"规格字典"维护入口：
+#### 6.2.2 包装维度 `unit` 枚举(全局唯一字典)
 
-```
-┌─ 规格字典管理 ──────────────────────────────────────┐
-│                                                      │
-│  Tab: [包装容器] [切配类型] [份型] [包装规格组合]      │
-│                                                      │
-│  ▸ 包装容器字典（L3 基础）                            │
-│    袋 | 盒 | 箱 | 盘 | 筐 | 桶 | 瓶 | 罐             │
-│                                                      │
-│  ▸ 切配类型字典（L2 基础）                            │
-│    丁 | 丝 | 片 | 块 | 段 | 末 | 泥 | 条             │
-│    └─ 可配置默认切配参数（丁→1.5cm, 丝→0.8cm, ...）  │
-│                                                      │
-│  ▸ 份型字典（L4 基础）                                │
-│    标准份 | 小份 | 大份 | 迷你份 | 加大份             │
-│                                                      │
-│  ▸ 包装规格组合（L3 = 容器 × 净含量）                 │
-│    袋装/500g, 袋装/1000g, 盒装/300g, 箱装/5kg, ...   │
-│                                                      │
-│  ▸ 食材-净菜类型关联（在食材基础档案中维护，L1→L2）   │
-│    猪里脊 → 肉丁(1.5cm/出净率92%)                    │
-│             肉丝(0.8cm/出净率95%)                    │
-│             肉片(2mm/出净率97%)                      │
-└──────────────────────────────────────────────────────┘
+| unit | 含义 | unitCapacity 是否必填 | 适用环节 | 典型示例 |
+|------|------|---------------------|---------|---------|
+| `散装` | 无包装,按重量 | 否(=1) | 采购蔬菜水产、毛菜入库 | 散装土豆 5000g |
+| `件` | 采购大包装 | 是 | 采购、毛菜入库 | 25kg/件 → baseGram=25000 |
+| `袋` | 净菜袋装 | 是 | 净菜入库、订单、进柜 | 500g/袋 |
+| `盒` | 成品盒装 | 是 | 净菜入库 | 300g/盒 |
+| `箱` | 外售/内供包装 | 是 | 外售、内供 | 5kg/箱 → baseGram=5000 |
+| `盘` | 内供专用 | 是 | 内供 | 2kg/盘 → baseGram=2000 |
+| `份` | 餐品规格 | 是 | 餐品总库、组配、烹制 | 标准份300g |
+| `筐` | 周转筐 | 是 | 毛菜入库 | 10kg/筐 |
+| `瓶`/`罐`/`桶` | 调料/液体容器(方案A:体积≈质量) | 是 | 采购调料、验收 | 5L/桶 → baseGram=5000、500ml/瓶 → baseGram=500 |
+| `把`/`个`/`只`/`条` | 计数类(**必须填预估克重**) | 是 | 调料/配料点收 | 蒜苗1把≈100g、鸡蛋10个≈500g |
+
+#### 6.2.3 切配规格 CutSpec(v3 新增,结构化对象)
+
+为彻底解决设备端 `cutSpec` 三种字符串格式的不一致问题,改为结构化对象:
+
+```typescript
+interface CutSpec {
+  length?:     number;        // 长度(mm,选填)
+  width?:      number;        // 宽度(mm,选填)
+  height?:     number;        // 厚度(mm,选填)
+  shape:       CutShape;      // 形状枚举
+  technique:   CutTechnique;  // 刀工枚举
+}
+
+type CutShape =
+  | '丝' | '片' | '丁' | '块' | '段' | '末' | '泥' | '条'
+  | '丝(细)' | '丝(中)' | '丝(粗)'
+  | '片(薄)' | '片(中)' | '片(厚)'
+  | '丁(小)' | '丁(中)' | '丁(大)'
+  | '圆片' | '菱形片' | '滚刀块' | '整棵' | '整根';
+
+type CutTechnique =
+  | '直刀' | '斜刀' | '花刀' | '平刀';
 ```
 
-### 6.5 各环节改造对照表
+**展示层格式化**(替代原字符串拼接):
 
-| 环节 | 当前做法 | 改造后 |
+```javascript
+function formatCutSpec(cut: CutSpec): string {
+  const dims = [cut.length, cut.width, cut.height].filter(Boolean);
+  const dimStr = dims.length ? `${dims.join('×')}mm · ` : '';
+  return `${dimStr}${cut.shape} · ${cut.technique}`;
+  // 例: "20×1×1mm · 丝(细) · 平刀"
+}
+```
+
+**与历史字符串格式的兼容**:
+
+```javascript
+// 解析历史字符串(迁移用)
+function parseLegacyCutSpec(s: string): CutSpec {
+  // 兼容 3 种格式:
+  // "3.5mm*3.5mm*50mm·细丝·平刀"     (无空格,* 分隔)
+  // "20mm*1mm*1mm · 细丝 · 平刀"     (带空格,* 分隔)
+  // "20mm×1mm×1mm · 细丝 · 平刀"     (带空格,× 分隔)
+  const normalized = s.replace(/×/g, '*').replace(/\s*/g, '');
+  // ... 正则解析为 CutSpec 对象
+}
+```
+
+### 6.3 各级规格用统一模型重写
+
+#### L1 — 采购规格
+
+```javascript
+// 旧: spec = "25kg/件" (字符串,需字符串解析才能换算)
+// 新:
+{
+  baseGram:     25000,    // 25kg = 25000g
+  unit:         '件',
+  unitCapacity: 1,
+  // specLabel 自动生成 = "25kg/件"
+}
+```
+
+#### L2 — 净菜加工规格(切配参数作附属属性)
+
+```javascript
+{
+  baseGram:     23000,    // 切配后净料重量(已扣出净率)
+  unit:         '批',
+  unitCapacity: 1,
+
+  // ── 加工附属属性(不参与克重换算,仅作展示/筛选) ──
+  cleanType:    '丁',                 // 净菜类型(简短名,来自字典)
+  cutSpec: {                          // 结构化切配规格(v3 新增)
+    length: 15, width: 15, height: 15,
+    shape: '丁(中)',
+    technique: '直刀'
+  },
+  yieldRate:    92,                   // 出净率(%),从食材目录带出
+}
+```
+
+#### L3 — 净菜包装规格
+
+```javascript
+{
+  baseGram:     500,
+  unit:         '袋',
+  unitCapacity: 1,
+  // specLabel = "500g/袋"
+}
+```
+
+#### L4 — 餐品规格(餐品总库 specs 结构基本保留,增加 baseGram)
+
+```javascript
+specs: [
+  { specName: '标准份', baseGram: 300, price: 12, cleanPrice: 9, cleanSale: false, isDefault: true },
+  { specName: '大份',   baseGram: 500, price: 18, cleanPrice: 13, cleanSale: false },
+]
+// unit 隐含为 '份'
+```
+
+### 6.4 转换规则:全部是 totalGram 的算术,**每步向上取整**
+
+```
+─────────────────────────────────────────────────────────────────
+L1 → L2 (扣出净率,向上取整):
+  净料总克重 = ⌈采购总克重 × 出净率%⌉
+  例: 25kg/件 × 1件 × 0.92 = ⌈25000 × 0.92⌉ = ⌈23000⌉ = 23000g
+
+L2 → L3 (包装分装,向上取整确保足量):
+  可包装数 = ⌈净料总克重 ÷ 包装基准克重⌉
+  例: ⌈23000 ÷ 500⌉ = 46 袋
+
+L3 → L4 (餐品产出,向上取整):
+  可产出份数 = ⌈(袋数 × 包装克重) ÷ 单份配方用量⌉
+  例: ⌈46 × 500 ÷ 120⌉ = ⌈191.67⌉ = 192 份
+
+跨单位换算(任意两个环节之间):
+  箱 ↔ 袋:  ⌈5kg/箱 ÷ 500g/袋⌉ = 10 袋/箱
+  盘 ↔ 份:  ⌈2kg/盘 ÷ 300g/份⌉ = 7 份/盘  (注意:6.67 向上取整为 7)
+  件 ↔ 筐:  ⌈25kg/件 ÷ 10kg/筐⌉ = 3 筐/件  (注意:2.5 向上取整为 3)
+─────────────────────────────────────────────────────────────────
+```
+
+**取整规则说明**(决策点 #5 已确认统一向上取整):
+- **采购→净料**:向上取整确保采购量充足
+- **净料→包装**:向上取整确保包装份数足够(宁可多准备)
+- **包装→餐品**:向上取整确保餐品产出份数满足订单
+
+**优势**:所有换算只依赖 `baseGram` 与数量,不再需要字符串解析、字典查找、映射表。
+
+### 6.5 展示层格式化规则
+
+存储统一为克,展示需符合餐饮习惯:
+
+```javascript
+/**
+ * 克重展示格式化
+ * - 整千: 显示为 kg (25000 → "25kg")
+ * - 非整千但 ≥1000: 保留1位小数 (1500 → "1.5kg")
+ * - <1000: 显示原始克数 (500 → "500g")
+ */
+function formatGram(g) {
+  if (g >= 1000 && g % 1000 === 0)  return (g / 1000) + 'kg';
+  if (g >= 1000)                    return (g / 1000).toFixed(1) + 'kg';
+  return g + 'g';
+}
+
+/**
+ * 规格标签格式化
+ * - 有 unit: "500g/袋"、"25kg/件"
+ * - 散装(unit=散装): "散装" 或 "散装/5kg"
+ */
+function formatSpec(spec) {
+  const w = formatGram(spec.baseGram);
+  if (spec.unit === '散装') return '散装/' + w;
+  return w + '/' + spec.unit;
+}
+```
+
+**展示层兼容传统单位**(可选,仅验收秤等餐饮高频场景):
+```javascript
+// 在验收秤场景下,展示层额外提供"斤"显示
+function formatGramForCanteen(g) {
+  // 500g → "1斤"、"25000g → "50斤"
+  if (g % 500 === 0) return (g / 500) + '斤';
+  return formatGram(g);
+}
+```
+
+**注意**:展示层用"斤"是**兼容选项**,存储仍是克;`raw-veg-processing-scale` 设备端必须从"斤"迁移到"克"存储,展示层可保留"斤"作为辅助显示。
+
+### 6.6 规格字典管理(决策点 #1 已确认:放在"字典管理"模块下新增"规格"Tab)
+
+**入口位置**:`web-admin/nutrition/din-dict-mgmt.html` → 新增"规格"Tab(与其他字典并列,不创建独立页面)
+
+**层级结构**(澄清决策点 #1 的理解):
+```
+din-dict-mgmt.html (字典管理页)
+├── 现有 Tab: 餐厅字典 / 食材分类字典 / ...
+└── 新增 Tab: 规格
+    ├── 字典 1: 包装单位字典        (全局唯一 unit 枚举)
+    ├── 字典 2: 切配类型字典        (丁/丝/片/块/段/末/泥/条 + 默认参数)
+    └── 字典 3: 份型字典            (标准份/小份/大份/迷你份/加大份)
+```
+
+**注意**:
+- "规格"是一个 Tab,下面挂 **3 个独立字典**(每个字典有自己的配置表格、字段结构)
+- 不是"Tab 下面再开一层 Tab",而是"同一 Tab 页内 3 个独立的字典卡片/区块"
+
+**字典详情**:
+
+```
+┌─ 规格 Tab ──────────────────────────────────────────────────┐
+│                                                              │
+│  ▸ 字典 1:包装单位字典                                       │
+│    散装 | 件 | 袋 | 盒 | 箱 | 盘 | 份 | 筐                  │
+│    瓶 | 罐 | 桶 | 把 | 个 | 只 | 条                        │
+│    └─ 字段:unit / 默认 unitCapacity / 是否液体类(标注)    │
+│    └─ 用途:UnifiedSpec.unit 的全局唯一来源                 │
+│                                                              │
+│  ▸ 字典 2:切配类型字典                                       │
+│    丁 | 丝 | 片 | 块 | 段 | 末 | 泥 | 条                    │
+│    └─ 字段:shape(形状枚举) / 默认尺寸(mm) / 默认刀工     │
+│    └─ 用途:CutSpec.shape 的枚举源 + vegTypes.cutSpec 默认值│
+│                                                              │
+│  ▸ 字典 3:份型字典                                           │
+│    标准份 | 小份 | 大份 | 迷你份 | 加大份                   │
+│    └─ 字段:specName / 默认 baseGram                         │
+│    └─ 用途:餐品 specs.specName 的下拉源                    │
+└──────────────────────────────────────────────────────────────┘
+```
+
+**v3.1 重要变更**:取消原 v3 方案中的"食材-净菜类型关联"字典
+
+- **原方案**:把"食材→净菜类型+出净率+切配参数"作为规格字典的第 4 个字典
+- **v3.1 修正**:这部分数据**本就属于食材档案**(`din-ingredient.vegTypes`),不应放到规格字典中
+- **正确做法**:扩展 `din-ingredient.vegTypes` 字段结构,在食材档案页维护(详见 6.6.1)
+
+### 6.6.1 食材档案 vegTypes 字段扩展(v3.1 新增)
+
+**背景**:核查发现 `sup-in-clean.FOOD_VEG_MAP` 之所以硬编码,根本原因是 `din-ingredient.vegTypes` 字段不够丰富(只有 name + yieldRate,没有切配参数)。正确改造方向是**扩展 vegTypes**,让它成为"食材→净菜类型+出净率+切配参数"的唯一权威数据源。
+
+**字段结构对比**:
+
+```javascript
+// ── 现状(只有 2 个字段) ──
+vegTypes: [
+  { name: '肉丁', yieldRate: '92' }
+]
+
+// ── v3.1 改造后(扩展为 4 个字段) ──
+vegTypes: [
+  {
+    name: '肉丁',               // 净菜类型名(档案级,不带规格)
+    yieldRate: 92,               // 标准出净率(%)
+    cutSpec: {                   // 默认切配规格(选填,供加工页带出)
+      shape: '丁(中)',           //   形状(引用切配类型字典)
+      length: 15,                 //   尺寸 mm
+      width: 15,
+      height: 15,
+      technique: '直刀'           //   刀工
+    }
+  },
+  {
+    name: '肉丝',
+    yieldRate: 95,
+    cutSpec: { shape: '丝(细)', length: 50, width: 3, height: 3, technique: '斜刀' }
+  }
+]
+```
+
+**改造收益**:
+
+| 历史问题 | 改造后 |
+|---------|--------|
+| `sup-in-clean.FOOD_VEG_MAP` 硬编码 4 个食材 | **删除**,改为按选中食材从 vegTypes 拉取 |
+| `sup-in-cleanin.cleanFoodTypeOptions` 硬编码 | **删除**,同上 |
+| `clean-veg-ratio-scale/03-settings` 默认值独立 | 作为设备级覆盖,默认值从 vegTypes.cutSpec 读取 |
+| 命名粒度不一致("肉丁" vs "丁(1.5cm)") | 统一为 name(档案)+ cutSpec(规格),覆盖历史所有场景 |
+
+**维护入口改造**(`din-ingredient-add.html`):
+
+```
+┌─ 净菜类型录入(动态行表格,扩展列)──────────────────────┐
+│                                                          │
+│  序号 | 净菜名称 | 出净率(%) | 切配形状 | 尺寸(mm) | 刀工 | 操作 │
+│  ────┼─────────┼──────────┼─────────┼─────────┼──────┼─────│
+│   1  | 肉丁     | 92        | 丁(中)  | 15×15×15 | 直刀 | ×   │
+│   2  | 肉丝     | 95        | 丝(细)  | 50×3×3   | 斜刀 | ×   │
+│   3  | 肉片     | 97        | 片(薄)  | —×—×2   | 平刀 | ×   │
+│                                                          │
+│  [+ 添加净菜类型]                                         │
+│                                                          │
+│  注:切配形状列引用"切配类型字典"(下拉选择)              │
+│     尺寸/刀工为选填,留空则取切配类型字典的默认值         │
+└──────────────────────────────────────────────────────────┘
+```
+
+### 6.7 各环节改造对照表
+
+| 环节 | 当前做法 | 改造后(v3.1 统一克重) |
 |------|---------|--------|
-| **食材目录** `din-ingredient` | vegTypes 表达净菜类型 | 增加 L1 采购规格字段 + L2 净菜类型（含切配参数、出净率） |
-| **餐品总库** `din-dish-all` | specs 基本正确 | 规格名称从份型字典读取，保持现有数据模型 |
-| **采供管理** `farm-purchase` | 规格自由文本 | 从食材目录 L1 自动带出，不可自由输入 |
-| **毛菜验收秤** | 14种单位混用 | 采购规格从订单 L1 带出；实收规格默认跟随，允许修正；区分重量/容器/计数三类单位 |
-| **毛菜入库** `sup-in-raw` | 7种固定下拉 | 从采购订单继承 L1，无需重选 |
-| **净菜入库** `sup-in-cleanin` | 净菜类型+入库规格分开选 | 从 L2+L3 字典联动选择 |
-| **净菜订单** `prod-clean-order` | nc 自由输克数 / cp 硬编码下拉 | nc 从 L3 包装规格字典选择；cp 从餐品总库 L4 动态拉取 |
-| **外售/内供** | nc 自由输克数 | 同上，从 L3 选择 |
-| **净菜组配** `prod-proc-combo` | 硬编码规格下拉 | 从餐品总库 L4 动态拉取 |
-| **按单烹制** `prod-proc-cook` | 规格只读 + 硬编码 | 规格从 L4 带出，生熟比关联 L2 出净率 |
-| **包装标签** `sup-pkg-label` | 纯数字输入 | 从 L3 选择 |
-| **加工秤设置** `clean-veg-ratio-scale/03-settings` | 丝条/滚刀块/方丁独立配置 | 从 L2 切配参数字典读取，作为默认值可覆盖 |
+| **食材目录** `din-ingredient` ⭐ | vegTypes 仅 name+yieldRate 两字段 | **扩展 vegTypes 字段**:增加 cutSpec(切配参数);增加 L1 采购规格(`baseGram+unit`)。详见 6.6.1 |
+| **餐品总库** `din-dish-all` | specs 含 `weight` 字段 | 增加营养规格字段(承接 prod-qc-nutrition 同步);份型从"份型字典"读取;重量统一为 `baseGram` |
+| **采供管理** `farm-purchase` | 规格自由文本 | 从食材目录 L1 自动带出 `baseGram+unit`,不可自由输入 |
+| **毛菜验收秤** `raw-veg-inspection-scale/01` | 14种单位混用 | 采购规格从订单 L1 带出;实收默认跟随;区分"称重验收"与"点收验收"两类 |
+| **毛菜加工秤** `raw-veg-processing-scale/*` ⚠ | 全设备用"斤",无 yield 字段 | **存储改为克**(展示可保留"斤");`03-batch-washing` 增加 yieldRate 字段,打通清洗→净菜出净率链路 |
+| **毛菜入库** `sup-in-raw` | 7种固定下拉 | 从采购订单继承 L1,无需重选 |
+| **净菜加工批次** `sup-in-clean` ⚠ | `FOOD_VEG_MAP` 硬编码 + 出净率"自动计算"未实现 | **删除 `FOOD_VEG_MAP`**,改为按选中食材从 `din-ingredient.vegTypes` 动态拉取(含 cutSpec);出净率真实计算: `⌈净菜产出/毛菜 × 100⌉`;反向推导: `毛菜需求 = ⌈净菜需求 / yieldRate⌉` |
+| **净菜入库** `sup-in-cleanin` | 净菜类型+入库规格分开选,`cleanFoodTypeOptions` 硬编码 | **删除 `cleanFoodTypeOptions`**,改为从 `din-ingredient.vegTypes` 拉取;选 L2(净菜类型,带 cutSpec) + 选/带出 L3(`baseGram+unit`) |
+| **净菜加工秤设置** `clean-veg-ratio-scale/03-settings` ⚠ | 4 字段单位混乱(mm/cm) | 默认值从 `din-ingredient.vegTypes.cutSpec` 读取(本设备仅作覆盖);**统一单位为 mm**;刀工字段作独立枚举 |
+| **净菜订单** `prod-clean-order` | nc 自由输克数 / cp 硬编码下拉 | nc 录入 `baseGram+unit`;cp 从餐品总库 L4 动态拉取 |
+| **外售/内供** | nc 自由输克数 | 同净菜订单,`unit` 允许选 箱/盘/袋 |
+| **净菜组配秤** `ratio-scale/*` ⚠ | `cutSpec='20mm*1mm*1mm·细丝·平刀'` 字符串 | `cutSpec` 改为结构化对象 `{length,width,height,shape,technique}`;`packSpec='大份800g'` 拆为 `{specName:'大份', baseGram:800}`;`packSize` 统一命名(取消 `portions`) |
+| **净菜包装贴标秤** `clean-veg-packaging-labeler/*` ⚠ | `vegCutType`/`cutSpec` 字段名不一致 + 3 种字符串格式 | 字段名统一为 `cutSpec`(结构化对象);字符串格式统一通过 `formatCutSpec()` 生成 |
+| **包装标签** `sup-pkg-label` | `packSpec` 纯整数 | 改为 `baseGram+unit` 结构;`portions` 改为 `packSize`;**与设备端口径统一** |
+| **净菜组配** `prod-proc-combo` | 硬编码规格下拉 | 从餐品总库 L4 动态拉取 `specName+baseGram` |
+| **按单烹制** `prod-proc-cook` | 规格只读 + 硬编码 | 规格从 L4 带出,生熟比关联 L2 出净率 |
+| **营养质控** `prod-qc-nutrition*` ⚠ | 同步入口未落地 | 落地同步逻辑:把检验均值写入餐品总库 specs 的营养规格字段 |
+| **加工/经营分析** `sup-process-analysis` / `sup-biz-analysis` ⚠ | 切配/包装分类各自硬编码;重量用 kg/吨不一致 | 切配分类引用"切配类型字典";包装分类独立字典;**展示单位统一格式化**(存储 g,展示 kg/吨自动转换) |
+
+### 6.8 关键设计权衡(决策点已固化)
+
+#### Q1: 为什么不直接用 kg 而用 g?
+
+- **整数运算**:g 为整数,避免 `2.5kg × 3 = 7.5kg` 的浮点精度问题
+- **小克重场景**:净菜包装常出现 50g、120g 等小数值,kg 下需要 `0.05kg`、`0.12kg`,可读性差
+- **存储统一**:所有规格字段同一类型(number 整数),无需类型判断
+
+#### Q2: 计数类(把/个/只/条)是否允许 baseGram=0?
+
+**决策(已确认 #3)**:**必须预估克重**。
+
+- **原因**:餐品配方(`prod-proc-combo.recipeData`)中所有食材按克重计算,如果某食材 `baseGram=0`,将导致整条规格换算链断裂,无法计算餐品产出份数
+- **实施**:字典维护时,计数类单位必须填写默认克重(如 `把→100g`、`个→50g`);录入时从字典带出默认值,允许用户覆盖但不能清零
+
+#### Q3: 液体规格(5L/桶、500ml/瓶)如何处理?
+
+**决策(已确认 #4)**:**方案 A(体积→质量近似)**。
+
+- **实施**:`1ml ≈ 1g`(水及水基液体);油类密度差(约 0.92)暂不精确校正,在字典中标注"液体类单位(瓶/罐/桶)"的换算约定即可
+- **示例**:`5L/桶 → baseGram=5000`、`500ml/瓶 → baseGram=500`
+- **未来扩展**:仅当业务确实出现"按体积验收 + 按质量计价"双重要求时,才升级为方案 B(新增 `baseMl` 字段)
+
+#### Q4: 换算取整规则?
+
+**决策(已确认 #5)**:**统一向上取整 ⌈⌉**。
+
+- **理由**:采购/生产场景下,向上取整确保量充足(宁可多备,不可短缺)
+- **应用范围**:L1→L2、L2→L3、L3→L4 所有换算步骤,以及任意两个 unit 之间的跨单位换算
+
+#### Q5: 字段命名是否重命名 `weight` 为 `baseGram`?
+
+**决策(已确认 #6)**:**任意,保证业务逻辑呈现不变即可**。
+
+- **实施原则**:原型阶段以"业务逻辑正确"为先,字段命名可灵活选择(重命名 `weight`→`baseGram` 语义更清晰,但破坏现有 Mock 数据;也可保留 `weight` 名称、仅在文档中说明等价于 `baseGram`)
+- **推荐做法**:新页面直接用 `baseGram`;旧页面改造时,若 Mock 数据量大可保留旧名,仅修改语义
 
 ---
 
-## 七、需要新增/修改的文件
+## 七、需要新增/修改的文件(v3.1)
 
 ### 新增
 
 | 文件 | 说明 |
 |------|------|
-| `web-admin/nutrition/din-dict-spec.html` | 规格字典管理页面（容器/切配/份型/组合） |
+| (无独立新增页面) | **决策点 #1 已确认**:规格字典作为 `din-dict-mgmt.html` 的"规格"Tab,不创建独立页面 |
+| `web-admin/nutrition/js/spec-utils.js`(可选) | 统一规格工具函数(`formatGram`、`formatSpec`、`formatCutSpec`、`parseLegacyCutSpec`、`calcTotalGram`、`convertSpec`、`ceilDiv` 等),供各页面引用 |
 
-### 修改
+### 修改 — web-admin/nutrition 模块
 
 | 文件 | 改造内容 |
 |------|---------|
-| `web-admin/nutrition/din-ingredient.html` | 增加 L1 采购规格字段、L2 净菜类型（含切配参数+出净率） |
-| `web-admin/nutrition/din-dish-all.html` | 规格名称从份型字典读取 |
-| `web-admin/nutrition/din-dish-add.html` | 规格名称下拉从份型字典读取 |
-| `web-admin/nutrition/farm-purchase.html` | 规格从自由文本改为 L1 自动带出 |
-| `web-admin/nutrition/sup-in-raw.html` | 入库规格从采购订单继承 L1 |
-| `web-admin/nutrition/sup-in-cleanin.html` | 联动 L2+L3 字典 |
-| `web-admin/nutrition/prod-clean-order.html` | nc 从 L3 选 / cp 从 L4 拉取 |
-| `web-admin/nutrition/sup-clean-external.html` | nc 从 L3 选 / cp 从 L4 拉取 |
-| `web-admin/nutrition/sup-clean-internal.html` | nc 从 L3 选 / cp 从 L4 拉取 |
-| `web-admin/nutrition/sup-pkg-label.html` | 包装规格从 L3 选择 |
-| `web-admin/nutrition/prod-proc-combo.html` | 餐品规格从 L4 动态拉取 |
-| `web-admin/nutrition/prod-proc-cook.html` | 餐品规格从 L4 动态拉取 |
-| `other-module/canteen-device/raw-veg-inspection-scale/01-verify-inspection.html` | 单位下拉分类重构 |
-| `other-module/canteen-device/clean-veg-ratio-scale/03-settings.html` | 加工参数从 L2 读取 |
+| `din-dict-mgmt.html` ⚠ | **新增"规格"Tab**(3 个独立字典:包装单位/切配类型/份型) |
+| `din-ingredient.html` ⭐ | **扩展 vegTypes 字段结构**:增加 cutSpec(切配参数对象);增加 L1 采购规格(`baseGram+unit`)。详见 6.6.1 |
+| `din-ingredient-add.html` ⭐ | **改造 vegTypes 录入表格**:在原"净菜名称+出净率"两列基础上,增加"切配形状(引用切配类型字典)/尺寸(mm)/刀工"等列 |
+| `din-dish-all.html` | specs 增加 `baseGram` 字段(或保留 weight 作别名);预留营养规格字段(承接 prod-qc-nutrition 同步) |
+| `din-dish-add.html` | 规格名称下拉从"份型字典"读取;重量字段统一为 `baseGram` |
+| `farm-purchase.html` | 规格从自由文本改为 L1 自动带出(`baseGram+unit`) |
+| `sup-in-raw.html` | 入库规格从采购订单继承 L1,无需重选 |
+| `sup-in-clean.html` ⚠ | **删除 `FOOD_VEG_MAP` 硬编码**,改为按选中食材从 `din-ingredient.vegTypes` 动态拉取;出净率真实计算 `⌈净菜产出/毛菜 × 100⌉`;反向推导 `毛菜需求 = ⌈净菜需求 / yieldRate⌉` |
+| `sup-in-cleanin.html` | **删除 `cleanFoodTypeOptions` 硬编码**,改为从 `din-ingredient.vegTypes` 拉取;联动 L2(净菜类型,带 cutSpec)+ L3(`baseGram+unit`) |
+| `prod-clean-order.html` | nc 录入 `baseGram+unit`;cp 从餐品总库 L4 拉取 |
+| `sup-clean-external.html` | 同净菜订单,`unit` 允许选 箱 |
+| `sup-clean-internal.html` | 同净菜订单,`unit` 允许选 盘/袋 |
+| `sup-pkg-label.html` ⚠ | `packSpec` 改为 `baseGram+unit` 结构;`portions` 改为 `packSize`;**与设备端口径统一** |
+| `prod-proc-combo.html` | 餐品规格从餐品总库 L4 动态拉取 `specName+baseGram` |
+| `prod-proc-cook.html` | 餐品规格从 L4 带出,生熟比关联 L2 出净率 |
+| `prod-qc-nutrition.html` ⚠ | 落地"同步检验均值→餐品总库"按钮的真实写入逻辑(目前只 toast) |
+| `prod-qc-nutrition-add.html` ⚠ | 菜品级联下拉 `dishData` 改为从餐品总库拉取(目前硬编码) |
+| `prod-qc-nutrition-sync.html` | 同步记录展示新增的营养规格字段 |
+| `sup-process-analysis.html` ⚠ | 切配/包装分类下拉引用"切配类型字典";新增独立"包装方式"字典;展示单位统一格式化 |
+| `sup-biz-analysis.html` ⚠ | 产品分类引用独立字典;重量单位展示统一(存储 g,展示 kg/吨格式化) |
+
+### 修改 — other-module/canteen-device 模块
+
+| 文件 | 改造内容 |
+|------|---------|
+| `raw-veg-inspection-scale/01-verify-inspection.html` | 单位下拉分类重构(称重/点收两类);`UNIT_OPTIONS` 改为引用全局 `unit` 枚举 |
+| `raw-veg-processing-scale/01-washing-tasks.html` ⚠ | **存储从"斤"改为"克"**(展示层可保留"斤"作辅助) |
+| `raw-veg-processing-scale/02-batch-weighing.html` ⚠ | 同上,`taskDataMap` 改为克存储 |
+| `raw-veg-processing-scale/03-batch-washing.html` ⚠ | 同上 + 新增 yieldRate 字段,打通清洗→净菜出净率链路 |
+| `raw-veg-processing-scale/04-history.html` ⚠ | 同上,展示层格式化 |
+| `clean-veg-ratio-scale/03-settings.html` ⚠ | 切配参数 4 字段统一单位为 mm;默认值从 `din-ingredient.vegTypes.cutSpec` 读取(本设备仅作覆盖) |
+| `clean-veg-packaging-labeler/01-orders.html` ⚠ | `vegCutType` 改名为 `cutSpec` 并改为结构化对象;`packSpec` 拆为 `{specName, baseGram}` 或 `{baseGram, packMethod}` |
+| `clean-veg-packaging-labeler/02-labeling.html` ⚠ | 同上;字符串格式通过 `formatCutSpec()` 生成 |
+| `clean-veg-packaging-labeler/03-history.html` ⚠ | 同上 |
+| `clean-veg-packaging-labeler/label-preview.html` ⚠ | 同上;`portions` 改为 `packSize` |
+| `ratio-scale/01-packing-tasks.html` ⚠ | `packSpec='大份800g'` 拆为 `{specName:'大份', baseGram:800}` |
+| `ratio-scale/02-weighing-packing.html` ⚠ | `cutSpec` 改为结构化对象 |
+| `ratio-scale/03-verify-history.html` ⚠ | 同上 |
+| `ratio-scale/04-seasoning-settings.html` | 调料字典可考虑纳入全局规格字典(暂保持独立,因有格位映射特殊逻辑) |
+
+**合计**:新增 0 个独立页面 + 1 个工具函数文件;修改 nutrition 模块 20 个文件 + canteen-device 模块 14 个文件 = **共 34 个文件改造**。
 
 ---
 
-## 八、待讨论事项
+## 八、迁移策略(决策点 #2 已确认:原型阶段不考虑历史数据兼容)
 
-1. **规格字典管理页面放在哪个菜单下？** —— 建议放在"营养用餐 > 字典管理"下的子页面，或新建 "基础数据 > 规格字典"
-2. **历史数据兼容？** —— 如果已有真实生产数据，规格升级需要迁移脚本
-3. **L1 采购规格的单位细分** —— 当前 14 种混用的 UNIT_OPTIONS 拆分后，是单独建表还是用标签分类？
-4. **转换规则的计算精度** —— 出净率% → 净料重量 → 可包装份数 → 可产出份数，这条链上每一步的取整规则（向上/向下/四舍五入）需要明确
+由于本项目为 HTML 原型,无真实生产数据,采用**简化迁移策略**:
+
+### 阶段一:字典与工具函数落地
+1. 在 `din-dict-mgmt.html` 新增"规格"Tab,完成 3 个字典的数据录入(包装单位/切配类型/份型)
+2. **同步扩展 `din-ingredient.vegTypes` 字段结构**(增加 cutSpec)——这是后续改造的前置条件
+3. 抽离 `spec-utils.js` 工具函数(`formatGram`、`formatSpec`、`formatCutSpec`、`parseLegacyCutSpec`、`ceilDiv` 等)
+4. 现有页面 Mock 数据保持不变,仅引入工具函数作展示格式化
+
+### 阶段二:新页面采用 UnifiedSpec + CutSpec
+1. 新开发的订单/入库页面,Mock 数据直接使用 `UnifiedSpec` + `CutSpec` 结构
+2. 设备端新页面同步使用结构化 `cutSpec` 对象,杜绝字符串拼接
+3. 新页面涉及"食材→净菜类型"级联时,直接从 `din-ingredient.vegTypes` 读取
+
+### 阶段三:旧页面逐步改造
+1. 按 `食材档案/字典 → 餐品总库 → 采供/入库 → 订单/组配 → 设备端` 顺序逐页面改造
+2. 每个页面改造时,同步更新 Mock 数据结构,删除局部硬编码字典:
+   - `cpSpecOptions`(prod-clean-order)
+   - `UNIT_OPTIONS`(raw-veg-inspection-scale)
+   - `FOOD_VEG_MAP`(sup-in-clean)
+   - `cleanFoodTypeOptions`(sup-in-cleanin)
+   - `vegCutType` / `cutSpec` 字符串拼接(clean-veg-packaging-labeler)
+3. 改造完毕后,设备端字符串格式 `cutSpec` 全部由 `formatCutSpec()` 生成,历史 3 种格式不再出现
+
+---
+
+## 九、决策点确认结果(v3.1 固化)
+
+| # | 决策点 | 选择 | 影响 |
+|---|-------|------|------|
+| 1 | 字典页位置 | **字典管理中新增"规格"Tab**(`din-dict-mgmt.html`),下挂 3 个独立字典(包装单位/切配类型/份型) | 不创建独立页面,降低维护成本 |
+| 2 | 历史数据迁移 | **原型不考虑** | 简化为三阶段渐进式改造,无需写迁移脚本 |
+| 3 | 计数类(把/个/只/条)是否强制克重 | **必须预估克重** | 字典维护时必填默认克重;录入时从字典带出,允许覆盖但不能清零 |
+| 4 | 液体规格 | **方案 A**(体积→质量近似,1ml≈1g) | 不新增 `baseMl` 字段;液体单位(瓶/罐/桶)在字典中标注换算约定 |
+| 5 | 换算取整规则 | **统一向上取整 ⌈⌉** | 所有 L1→L2→L3→L4 换算与跨单位换算均向上取整 |
+| 6 | 字段命名(`weight` vs `baseGram`) | **任意,业务逻辑不变即可** | 新页面推荐 `baseGram`;旧页面改造可保留旧名作别名 |
+| 7 (v3.1 新增) | "食材-净菜关联"是否独立字典 | **不独立,回归食材档案** | 扩展 `din-ingredient.vegTypes` 字段结构,增加 cutSpec 字段;删除 `FOOD_VEG_MAP`、`cleanFoodTypeOptions` 等硬编码映射 |
+
+---
+
+## 十、待后续讨论事项
+
+1. **字典数据初始化**:3 个字典的初始枚举值需要业务方确认(尤其是切配类型的默认参数、份型默认克重)
+2. **vegTypes 扩展后的数据填充**:现有食材档案中 vegTypes 只有 name+yieldRate,改造后需要业务方补充每个食材净菜类型的 cutSpec(切配参数)——工作量较大,建议分批进行(先核心 10-20 种食材)
+3. **`ratio-scale/04-seasoning-settings.html` 的调料字典是否纳入全局规格字典**:目前建议保持独立(因有 12 格位映射特殊逻辑),但若需统一管理可考虑作为规格字典的子模块
+4. **展示层"斤"的兼容范围**:决策仅在验收秤等餐饮高频场景保留"斤"显示,但是否扩展到所有设备端?还是所有设备端统一只显示克/kg?
+4. **营养规格字段在餐品总库 specs 中的承载方式**:8 项营养指标 + 4 类感官评级是平铺到 specs 还是独立 `nutritionSpecs` 子对象?
+5. **`clean-veg-packaging-labeler/01-orders.html` 的 `type` 字段(净菜包/餐品净菜包)**:这是包装类别还是产品类别?需要明确归属字典
diff --git a/web-admin/nutrition/farm-purchase.html b/web-admin/nutrition/farm-purchase.html
index 58cbeca..c9a15b4 100644
--- a/web-admin/nutrition/farm-purchase.html
+++ b/web-admin/nutrition/farm-purchase.html
@@ -130,6 +130,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .items-table input,.items-table select{height:30px;border:1px solid var(--border);border-radius:var(--radius-sm);padding:0 8px;font-size:var(--font-xs);outline:none;width:100%;}
 .items-table input:focus,.items-table select:focus{border-color:var(--primary);}
 .items-table .btn-remove{color:var(--danger);cursor:pointer;font-size:16px;border:none;background:none;padding:4px;}
+/* 规格输入组(表格内):克重 input + 单位 select 连在一起 */
+.items-table .spec-input-group{display:flex;align-items:stretch;height:30px;}
+.items-table .spec-input-group input{flex:1;border-radius:4px 0 0 4px;border-right:none;width:auto;}
+.items-table .spec-input-group select{width:72px;border-radius:0 4px 4px 0;}
 .items-summary{display:flex;justify-content:space-between;align-items:center;margin-top:12px;padding:12px 16px;background:#F6F9FF;border-radius:6px;}
 .items-summary__total{font-size:var(--font-sm);color:var(--text-primary);font-weight:600;}
 /* 右侧抽屉 */
@@ -413,7 +417,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
                 <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-HSYO-168K-20260413-002</td><td>花生油</td><td>粮油类</td><td>168</td><td>5L/桶</td><td>¥16</td><td>¥2,688</td><td>—</td><td>—</td></tr>
+                  <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>
               <div class="sub-table__footer">合计：2 种食材，1168 kg，¥6,188</div>
@@ -462,7 +466,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:100px;">规格</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>
@@ -643,6 +647,22 @@ var supplierContacts = {
   '粮油批发商行': {contact:'孙强', phone:'137-5544-3210'}
 };
 
+/* ===== 包装单位字典(从 din-dict-config.html?code=spec_unit 同步,所有业务共用) ===== */
+var SPEC_UNIT_OPTIONS=['克','袋','箱','份','把','瓶','罐','桶','散装'];
+function renderUnitOptions(selectEl,selected){
+  if(!selectEl)return;
+  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:'件'}) */
+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:'散装'};
+  return {gram:'',unit:''};
+}
+
 /* ===== 模拟数据 ===== */
 var orders = [
   { no:'PO-20260416-005', canteen:'二号场所', canteenContact:'赵芳', canteenPhone:'029-8812-3002',
@@ -683,7 +703,7 @@ var orders = [
     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-HSYO-168K-20260413-002',name:'花生油',cat:'粮油类',qty:168,spec:'5L/桶',price:16,subtotal:'¥2,688',acceptedQty:'—',remark:'—'}
+      {trace:'ST-EX-LY02-DG-HSYO-168K-20260413-002',name:'花生油',cat:'粮油类',qty:168,spec:'5kg/桶',price:16,subtotal:'¥2,688',acceptedQty:'—',remark:'—'}
     ]}
 ];
 
@@ -749,14 +769,15 @@ function openEditModal(idx) {
   var tbody = document.getElementById('itemsBody');
   tbody.innerHTML = '';
   o.items.forEach(function(it) {
+    var specParts = parseSpecText(it.spec);
     var tr = document.createElement('tr');
     tr.innerHTML = '<td><input type="text" value="'+it.trace+'" placeholder="请输入溯源码（选填）"></td>'
       +'<td><select><option'+(it.name==='菠菜'?' selected':'')+'>菠菜</option><option'+(it.name==='白菜'?' selected':'')+'>白菜</option><option'+(it.name==='胡萝卜'?' selected':'')+'>胡萝卜</option><option'+(it.name==='西兰花'?' selected':'')+'>西兰花</option><option'+(it.name==='芹菜'?' selected':'')+'>芹菜</option><option'+(it.name==='猪里脊'?' selected':'')+'>猪里脊</option><option'+(it.name==='猪五花'?' selected':'')+'>猪五花</option><option'+(it.name==='草鱼'?' selected':'')+'>草鱼</option><option'+(it.name==='鲫鱼'?' selected':'')+'>鲫鱼</option><option'+(it.name==='虾'?' selected':'')+'>虾</option><option'+(it.name==='大米'?' selected':'')+'>大米</option><option'+(it.name==='花生油'?' selected':'')+'>花生油</option></select></td>'
       +'<td><select><option'+(it.cat==='蔬菜类'?' selected':'')+'>蔬菜类</option><option'+(it.cat==='肉禽类'?' selected':'')+'>肉禽类</option><option'+(it.cat==='水产类'?' selected':'')+'>水产类</option><option'+(it.cat==='粮油类'?' selected':'')+'>粮油类</option><option>调味品</option><option>豆制品</option></select></td>'
-      +'<td><input type="number" value="'+it.qty+'" onchange="calcRow(this)"></td>'
-      +'<td><input type="text" value="'+it.spec+'" placeholder="如：25kg/件"></td>'
-      +'<td><input type="number" value="'+it.price+'" onchange="calcRow(this)"></td>'
-      +'<td style="font-size:var(--font-xs);color:var(--text-primary);font-weight:500;">'+it.subtotal+'</td>'
+      +'<td><input type="number" class="item-qty" value="'+it.qty+'" onchange="calcRow(this)"></td>'
+      +'<td><div class="spec-input-group"><input type="number" class="item-gram" value="'+specParts.gram+'" placeholder="克重" onchange="calcRow(this)"><select class="item-unit" onchange="calcRow(this)">'+SPEC_UNIT_OPTIONS.map(function(u){return '<option'+(u===specParts.unit?' selected':'')+'>'+u+'</option>';}).join('')+'</select></div></td>'
+      +'<td><input type="number" class="item-price" value="'+it.price+'" onchange="calcRow(this)"></td>'
+      +'<td class="item-subtotal" style="font-size:var(--font-xs);color:var(--text-primary);font-weight:500;">'+it.subtotal+'</td>'
       +'<td><input type="text" value="'+(it.remark==='—'?'':it.remark)+'" placeholder="选填"></td>'
       +'<td><span class="btn-remove" onclick="removeItemRow(this)">✕</span></td>';
     tbody.appendChild(tr);
@@ -774,10 +795,10 @@ function addItemRow() {
   tr.innerHTML = '<td><input type="text" placeholder="请输入溯源码（选填）"></td>'
     +'<td><select><option value="">请选择</option><option>菠菜</option><option>白菜</option><option>胡萝卜</option><option>西兰花</option><option>芹菜</option><option>猪里脊</option><option>猪五花</option><option>草鱼</option><option>鲫鱼</option><option>虾</option><option>大米</option><option>花生油</option></select></td>'
     +'<td><select><option>蔬菜类</option><option>肉禽类</option><option>水产类</option><option>粮油类</option><option>调味品</option><option>豆制品</option></select></td>'
-    +'<td><input type="number" placeholder="0" onchange="calcRow(this)"></td>'
-    +'<td><input type="text" placeholder="如：25kg/件"></td>'
-    +'<td><input type="number" placeholder="0" onchange="calcRow(this)"></td>'
-    +'<td style="font-size:var(--font-xs);color:var(--text-primary);font-weight:500;">¥0</td>'
+    +'<td><input type="number" class="item-qty" placeholder="0" onchange="calcRow(this)"></td>'
+    +'<td><div class="spec-input-group"><input type="number" class="item-gram" placeholder="克重" onchange="calcRow(this)"><select class="item-unit" onchange="calcRow(this)">'+SPEC_UNIT_OPTIONS.map(function(u){return '<option>'+u+'</option>';}).join('')+'</select></div></td>'
+    +'<td><input type="number" class="item-price" placeholder="0" onchange="calcRow(this)"></td>'
+    +'<td class="item-subtotal" style="font-size:var(--font-xs);color:var(--text-primary);font-weight:500;">¥0</td>'
     +'<td><input type="text" placeholder="选填"></td>'
     +'<td><span class="btn-remove" onclick="removeItemRow(this)">✕</span></td>';
   tbody.appendChild(tr);
@@ -793,11 +814,10 @@ function removeItemRow(el) {
 /* 计算单行小计 */
 function calcRow(el) {
   var tr = el.closest('tr');
-  var inputs = tr.querySelectorAll('input[type="number"]');
-  var qty = parseFloat(inputs[0].value) || 0;
-  var price = parseFloat(inputs[1].value) || 0;
+  var qty = parseFloat(tr.querySelector('.item-qty').value) || 0;
+  var price = parseFloat(tr.querySelector('.item-price').value) || 0;
   var sub = qty * price;
-  tr.querySelectorAll('td')[6].textContent = '¥' + sub.toLocaleString();
+  tr.querySelector('.item-subtotal').textContent = '¥' + sub.toLocaleString();
   recalcTotal();
 }
 /* 汇总总金额 */
@@ -805,9 +825,8 @@ function recalcTotal() {
   var rows = document.getElementById('itemsBody').rows;
   var total = 0;
   for (var i = 0; i < rows.length; i++) {
-    var inputs = rows[i].querySelectorAll('input[type="number"]');
-    var qty = parseFloat(inputs[0].value) || 0;
-    var price = parseFloat(inputs[1].value) || 0;
+    var qty = parseFloat(rows[i].querySelector('.item-qty').value) || 0;
+    var price = parseFloat(rows[i].querySelector('.item-price').value) || 0;
     total += qty * price;
   }
   document.getElementById('itemCount').textContent = rows.length;
diff --git a/web-admin/nutrition/prod-clean-order.html b/web-admin/nutrition/prod-clean-order.html
index 9358e18..4fcd4f7 100644
--- a/web-admin/nutrition/prod-clean-order.html
+++ b/web-admin/nutrition/prod-clean-order.html
@@ -167,6 +167,10 @@ tr.detail-row td.td-actions{background:#FAFBFC;box-shadow:-4px 0 8px rgba(0,0,0,
 .inline-builder-table select:focus,.inline-builder-table input:focus{border-color:var(--primary);}
 .inline-builder-table select{appearance:none;background:#fff url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='5'%3E%3Cpath d='M0 0l4 5 4-5z' fill='%23999'/%3E%3C/svg%3E") no-repeat right 6px center;padding-right:18px;}
 .inline-builder-table input[readonly]{background:#f8fafc;cursor:not-allowed;}
+/* 规格连体组件:左 input 克重 + 右 select 单位/份型 */
+.spec-input-group{display:flex;align-items:center;gap:0;}
+.spec-input-group input{flex:1;min-width:50px;border-radius:4px 0 0 4px;}
+.spec-input-group select{width:90px;min-width:60px;max-width:110px;border-radius:0 4px 4px 0;margin-left:-1px;}
 </style>
 </head>
 <body>
@@ -360,13 +364,52 @@ var ncTypeOptions={
   '西兰花':['西兰花朵','西兰花梗'],
   '猪排骨':['排骨块','排骨丁']
 };
-var cpSpecOptions={
-  '宫保鸡丁':[{label:'标准份（500g）',grams:500},{label:'加量份（750g）',grams:750}],
-  '清蒸鱼':[{label:'标准份（600g）',grams:600},{label:'大份（900g）',grams:900}],
-  '蒜蓉菠菜':[{label:'标准份（400g）',grams:400},{label:'加量份（600g）',grams:600}],
-  '炒胡萝卜':[{label:'标准份（300g）',grams:300},{label:'大份（500g）',grams:500}],
-  '红烧排骨':[{label:'标准份（800g）',grams:800},{label:'家庭份（1200g）',grams:1200}]
+/* 跨页 specs 共享工具(任务 3.0):从 localStorage 加载餐品总库 specs */
+function loadDishSpecs(){
+  try{
+    var raw=localStorage.getItem('dish_specs_v1');
+    if(!raw)return null;
+    var data=JSON.parse(raw);
+    return (data&&data.dishes)?data.dishes:null;
+  }catch(e){return null;}
+}
+function getSpecsByDish(name){
+  var dishes=loadDishSpecs();
+  if(!dishes)return [];
+  var d=dishes.find(function(x){return x.name===name;});
+  return d?(d.specs||[]):[];
+}
+function getAllDishNames(){
+  var dishes=loadDishSpecs();
+  return dishes?dishes.map(function(d){return d.name;}):[];
+}
+/* 净菜包装单位字典(首期落地 9 项,与 spec_unit 字典一致) */
+var SPEC_UNIT_OPTIONS=['克','袋','箱','份','把','瓶','罐','桶','散装'];
+function buildUnitOptions(selected){
+  var html='';
+  SPEC_UNIT_OPTIONS.forEach(function(u){
+    html+='<option value="'+u+'"'+(u===selected?' selected':'')+'>'+u+'</option>';
+  });
+  return html;
+}
+/* 餐品兜底字典:若总库未初始化,用页内硬编码保证页面可用 */
+var FALLBACK_DISHES={
+  '宫保鸡丁':[{portion:'标准份',baseGram:500},{portion:'加量份',baseGram:750}],
+  '清蒸鱼':[{portion:'标准份',baseGram:600},{portion:'大份',baseGram:900}],
+  '蒜蓉菠菜':[{portion:'标准份',baseGram:400},{portion:'加量份',baseGram:600}],
+  '炒胡萝卜':[{portion:'标准份',baseGram:300},{portion:'大份',baseGram:500}],
+  '红烧排骨':[{portion:'标准份',baseGram:800},{portion:'家庭份',baseGram:1200}]
 };
+function getSpecsByDishWithFallback(name){
+  var specs=getSpecsByDish(name);
+  if(specs&&specs.length>0)return specs;
+  return FALLBACK_DISHES[name]||[{portion:'标准份',baseGram:500,unit:'份'}];
+}
+function getDishNamesWithFallback(){
+  var names=getAllDishNames();
+  if(names&&names.length>0)return names;
+  return Object.keys(FALLBACK_DISHES);
+}
 
 /* 订单主子表数据 */
 var orders=[
@@ -582,7 +625,7 @@ function resetOrderForm(){
 function addOrderLine(){
   lineIdCounter++;
   var lid='newLine'+lineIdCounter;
-  newOrderLines.push({id:lid,ingredient:'',ncName:'',dish:'',specGram:0,specLabel:'',qty:0,weight:0});
+  newOrderLines.push({id:lid,ingredient:'',ncName:'',dish:'',portion:'标准份',baseGram:0,unit:newOrderNcType==='nc'?'袋':'份',qty:0,weight:0});
   renderLineBuilders();
 }
 
@@ -612,26 +655,55 @@ function updateNewLineDish(lid,val){
   var line=newOrderLines.find(function(l){return l.id===lid;});
   if(!line)return;
   line.dish=val;
-  line.specGram=0;line.specLabel='';
+  /* 切换餐品时,若该餐品在总库中已有规格,默认选中第一项 */
+  var specs=getSpecsByDishWithFallback(val);
+  if(specs.length>0){
+    line.portion=specs[0].portion||'标准份';
+    line.baseGram=specs[0].baseGram||0;
+    line.unit=specs[0].unit||'份';
+  }else{
+    line.portion='标准份';line.baseGram=0;line.unit='份';
+  }
   calcLineWeight(line);
   refreshSummary();
 }
 
-function updateNewLineSpec(lid,val){
+/* 规格连体组件:左 input 克重,右 select 份型 */
+function updateNewLineBaseGram(lid,val){
   var line=newOrderLines.find(function(l){return l.id===lid;});
   if(!line)return;
-  if(newOrderNcType==='nc'){
-    line.specGram=parseInt(val||'0',10);
-    line.specLabel=val?(val+'g/袋'):'';
-  }else{
-    line.specGram=parseInt(val||'0',10);
-    var opts=cpSpecOptions[line.dish]||[];
-    var found=opts.find(function(o){return o.grams===line.specGram;});
-    line.specLabel=found?found.label:'';
+  line.baseGram=parseInt(val||'0',10);
+  calcLineWeight(line);
+  refreshSummary();
+}
+function updateNewLinePortion(lid,val){
+  var line=newOrderLines.find(function(l){return l.id===lid;});
+  if(!line)return;
+  line.portion=val;
+  /* 选了份型后,若总库中对应份型有 baseGram,自动带出克重 */
+  var specs=getSpecsByDishWithFallback(line.dish);
+  var found=specs.find(function(s){return s.portion===val;});
+  if(found&&found.baseGram){
+    line.baseGram=found.baseGram;
+    if(found.unit)line.unit=found.unit;
   }
   calcLineWeight(line);
   refreshSummary();
 }
+function updateNewLineUnit(lid,val){
+  var line=newOrderLines.find(function(l){return l.id===lid;});
+  if(!line)return;
+  line.unit=val;
+  refreshSummary();
+}
+function updateNewLineNcBaseGram(lid,val){
+  var line=newOrderLines.find(function(l){return l.id===lid;});
+  if(!line)return;
+  line.baseGram=parseInt(val||'0',10);
+  line.unit='袋';
+  calcLineWeight(line);
+  refreshSummary();
+}
 
 function updateNewLineQty(lid,val){
   var line=newOrderLines.find(function(l){return l.id===lid;});
@@ -642,12 +714,24 @@ function updateNewLineQty(lid,val){
 }
 
 function calcLineWeight(line){
-  if(line.specGram>0&&line.qty>0){
-    line.weight=parseFloat((line.specGram*line.qty/1000).toFixed(2));
+  if(line.baseGram>0&&line.qty>0){
+    line.weight=parseFloat((line.baseGram*line.qty/1000).toFixed(2));
   }else{
     line.weight=0;
   }
 }
+/* 拼装规格显示文本:baseGram+unit/portion */
+function formatSpecLabel(line){
+  var gram=line.baseGram||0;
+  var unit=line.unit||(line.ncType==='nc'?'袋':'份');
+  var portion=line.portion||'';
+  if(line.ncType==='nc'){
+    return gram>0?(gram+'g/'+unit):'—';
+  }
+  /* cp 模式 */
+  if(gram<=0)return '—';
+  return gram+'g/'+(portion||unit);
+}
 
 function renderLineBuilders(){
   var container=document.getElementById('orderLinesContainer');
@@ -656,12 +740,15 @@ function renderLineBuilders(){
   html+='<table class="inline-builder-table" id="lineBuilderTable">';
   html+='<thead><tr>';
   if(isNc){
-    html+='<th>食材</th><th>净菜名称</th><th>包装规格(g)</th><th>份数</th><th>计量(kg)</th><th>操作</th>';
+    html+='<th>食材</th><th>净菜名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th><th>操作</th>';
   }else{
     html+='<th>餐品名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th><th>操作</th>';
   }
   html+='</tr></thead><tbody>';
+  /* 缓存当前餐品名列表,避免 forEach 内重复读取 localStorage */
+  var dishNames=getDishNamesWithFallback();
   newOrderLines.forEach(function(line){
+    line.ncType=isNc?'nc':'cp';
     html+='<tr>';
     if(isNc){
       /* 食材 */
@@ -673,18 +760,26 @@ function renderLineBuilders(){
       html+='<td><select onchange="updateNewLineNcType(\''+line.id+'\',this.value)" '+(ncTypes.length===0?'disabled':'')+' style="min-width:100px;"><option value="">'+(ncTypes.length===0?'请先选食材':'请选择')+'</option>';
       ncTypes.forEach(function(t){html+='<option value="'+t+'" '+(line.ncName===t?'selected':'')+'>'+t+'</option>';});
       html+='</select></td>';
-      /* 包装规格 */
-      html+='<td><input inputmode="numeric" placeholder="克数" value="'+(line.specGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateNewLineSpec(\''+line.id+'\',this.value)" style="width:70px;"></td>';
+      /* 包装规格:左 input 克重 + 右 select 单位(默认袋) */
+      html+='<td><div class="spec-input-group">'
+        +'<input inputmode="numeric" placeholder="克数" value="'+(line.baseGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateNewLineNcBaseGram(\''+line.id+'\',this.value)">'
+        +'<select onchange="updateNewLineUnit(\''+line.id+'\',this.value)">'+buildUnitOptions(line.unit||'袋')+'</select>'
+        +'</div></td>';
     }else{
-      /* 餐品名称 */
+      /* 餐品名称:从总库读取 */
       html+='<td><select onchange="updateNewLineDish(\''+line.id+'\',this.value)" style="min-width:120px;"><option value="">请选择</option>';
-      Object.keys(cpSpecOptions).forEach(function(k){html+='<option value="'+k+'" '+(line.dish===k?'selected':'')+'>'+k+'</option>';});
-      html+='</select></td>';
-      /* 包装规格 */
-      var cpSpecs=cpSpecOptions[line.dish]||[];
-      html+='<td><select onchange="updateNewLineSpec(\''+line.id+'\',this.value)" '+(cpSpecs.length===0?'disabled':'')+' style="min-width:120px;"><option value="">'+(cpSpecs.length===0?'请先选餐品':'请选择')+'</option>';
-      cpSpecs.forEach(function(s){html+='<option value="'+s.grams+'" '+(line.specGram===s.grams?'selected':'')+'>'+s.label+'</option>';});
+      dishNames.forEach(function(k){html+='<option value="'+k+'" '+(line.dish===k?'selected':'')+'>'+k+'</option>';});
       html+='</select></td>';
+      /* 包装规格:左 input 克重 + 右 select 份型 */
+      var cpSpecs=getSpecsByDishWithFallback(line.dish);
+      var portionOptions=['标准份','小份','大份','迷你份','加大份'];
+      /* 若总库返回的 portion 不在标准列表中,合并显示 */
+      cpSpecs.forEach(function(s){if(s.portion&&portionOptions.indexOf(s.portion)===-1)portionOptions.push(s.portion);});
+      html+='<td><div class="spec-input-group">'
+        +'<input inputmode="numeric" placeholder="克数" value="'+(line.baseGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateNewLineBaseGram(\''+line.id+'\',this.value)">'
+        +'<select onchange="updateNewLinePortion(\''+line.id+'\',this.value)" style="width:90px;">';
+      portionOptions.forEach(function(p){html+='<option value="'+p+'" '+(line.portion===p?'selected':'')+'>'+p+'</option>';});
+      html+='</select></div></td>';
     }
     /* 份数 */
     html+='<td><input inputmode="numeric" placeholder="份数" value="'+(line.qty||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateNewLineQty(\''+line.id+'\',this.value)" style="width:56px;"></td>';
@@ -717,10 +812,11 @@ function refreshSummary(){
   var html='';
   validLines.forEach(function(l){
     var typeLabel=newOrderNcType==='nc'?'净菜包':'餐品净菜包';
+    var specLabel=formatSpecLabel(l);
     if(newOrderNcType==='nc'){
-      html+='<tr><td>'+typeLabel+'</td><td>'+l.ingredient+'</td><td>'+l.ncName+'</td><td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
+      html+='<tr><td>'+typeLabel+'</td><td>'+l.ingredient+'</td><td>'+l.ncName+'</td><td>'+specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
     }else{
-      html+='<tr><td>'+typeLabel+'</td><td>'+l.dish+'</td><td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
+      html+='<tr><td>'+typeLabel+'</td><td>'+l.dish+'</td><td>'+specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
     }
   });
   tbody.innerHTML=html;
@@ -730,8 +826,8 @@ function submitCreateOrder(){
   var creator=document.getElementById('orderCreator').value.trim();
   if(!creator){alert('请输入创建人姓名');return;}
   var validLines=newOrderLines.filter(function(l){
-    if(newOrderNcType==='nc')return l.ingredient&&l.ncName&&l.specGram>0&&l.qty>0;
-    return l.dish&&l.specGram>0&&l.qty>0;
+    if(newOrderNcType==='nc')return l.ingredient&&l.ncName&&l.baseGram>0&&l.qty>0;
+    return l.dish&&l.baseGram>0&&l.qty>0;
   });
   if(validLines.length===0){alert('请至少完善一条菜品明细');return;}
   /* 生成订单号 */
@@ -746,7 +842,11 @@ function submitCreateOrder(){
       var base={
         id:'L'+(Date.now()+i),
         ncType:newOrderNcType,
-        spec:l.specLabel,
+        spec:formatSpecLabel(l),
+        /* 同时保留结构化字段,便于下游页消费 */
+        portion:l.portion||'',
+        baseGram:l.baseGram||0,
+        unit:l.unit||(l.ncType==='nc'?'袋':'份'),
         qty:l.qty,
         weight:l.weight,
         status:'备货中'
@@ -893,22 +993,46 @@ var WEEK_MENUS={
       [['水果拼盘','牛奶'],['水果拼盘'],['绿豆汤','水果拼盘'],['水果拼盘'],[],[],[]]
     ]}
 };
-var DISH_SPEC={
-  '白米饭':{spec:'标准份（500g）',grams:500},'杂粮饭':{spec:'标准份（500g）',grams:500},
-  '小米粥':{spec:'标准份（400g）',grams:400},'皮蛋瘦肉粥':{spec:'标准份（450g）',grams:450},
-  '燕麦粥':{spec:'标准份（400g）',grams:400},'红薯粥':{spec:'标准份（400g）',grams:400},
-  '馒头':{spec:'标准份（200g）',grams:200},'花卷':{spec:'标准份（200g）',grams:200},
-  '全麦馒头':{spec:'标准份（200g）',grams:200},'煎饺':{spec:'标准份（300g）',grams:300},
-  '牛奶':{spec:'标准份（250ml）',grams:250},'煮鸡蛋':{spec:'标准份（60g）',grams:60},
-  '红烧肉':{spec:'标准份（800g）',grams:800},'糖醋排骨':{spec:'标准份（800g）',grams:800},
-  '清蒸鲈鱼':{spec:'标准份（600g）',grams:600},'宫保鸡丁':{spec:'标准份（500g）',grams:500},
-  '清蒸鸡胸':{spec:'标准份（500g）',grams:500},'番茄炖牛腩':{spec:'标准份（800g）',grams:800},
-  '西红柿炒蛋':{spec:'标准份（400g）',grams:400},'麻婆豆腐':{spec:'标准份（400g）',grams:400},
-  '清炒时蔬':{spec:'标准份（300g）',grams:300},'清炒西兰花':{spec:'标准份（300g）',grams:300},
-  '凉拌黄瓜':{spec:'标准份（250g）',grams:250},'酸辣土豆丝':{spec:'标准份（350g）',grams:350},
-  '紫菜蛋花汤':{spec:'标准份（350g）',grams:350},'冬瓜排骨汤':{spec:'标准份（400g）',grams:400},
-  '水果拼盘':{spec:'标准份（300g）',grams:300},'绿豆汤':{spec:'标准份（350g）',grams:350}
+/* 食谱餐品兜底字典(总库未覆盖时的页内默认规格,统一使用 portion+baseGram+unit) */
+var RECIPE_FALLBACK={
+  '白米饭':{portion:'标准份',baseGram:500,unit:'份'},
+  '杂粮饭':{portion:'标准份',baseGram:500,unit:'份'},
+  '小米粥':{portion:'标准份',baseGram:400,unit:'份'},
+  '皮蛋瘦肉粥':{portion:'标准份',baseGram:450,unit:'份'},
+  '燕麦粥':{portion:'标准份',baseGram:400,unit:'份'},
+  '红薯粥':{portion:'标准份',baseGram:400,unit:'份'},
+  '馒头':{portion:'标准份',baseGram:200,unit:'份'},
+  '花卷':{portion:'标准份',baseGram:200,unit:'份'},
+  '全麦馒头':{portion:'标准份',baseGram:200,unit:'份'},
+  '煎饺':{portion:'标准份',baseGram:300,unit:'份'},
+  '牛奶':{portion:'标准份',baseGram:250,unit:'瓶'},
+  '煮鸡蛋':{portion:'标准份',baseGram:60,unit:'份'},
+  '红烧肉':{portion:'标准份',baseGram:800,unit:'份'},
+  '糖醋排骨':{portion:'标准份',baseGram:800,unit:'份'},
+  '清蒸鲈鱼':{portion:'标准份',baseGram:600,unit:'份'},
+  '宫保鸡丁':{portion:'标准份',baseGram:500,unit:'份'},
+  '清蒸鸡胸':{portion:'标准份',baseGram:500,unit:'份'},
+  '番茄炖牛腩':{portion:'标准份',baseGram:800,unit:'份'},
+  '西红柿炒蛋':{portion:'标准份',baseGram:400,unit:'份'},
+  '麻婆豆腐':{portion:'标准份',baseGram:400,unit:'份'},
+  '清炒时蔬':{portion:'标准份',baseGram:300,unit:'份'},
+  '清炒西兰花':{portion:'标准份',baseGram:300,unit:'份'},
+  '凉拌黄瓜':{portion:'标准份',baseGram:250,unit:'份'},
+  '酸辣土豆丝':{portion:'标准份',baseGram:350,unit:'份'},
+  '紫菜蛋花汤':{portion:'标准份',baseGram:350,unit:'份'},
+  '冬瓜排骨汤':{portion:'标准份',baseGram:400,unit:'份'},
+  '水果拼盘':{portion:'标准份',baseGram:300,unit:'份'},
+  '绿豆汤':{portion:'标准份',baseGram:350,unit:'份'}
 };
+/* 食谱餐品规格查询:优先总库,其次页内兜底 */
+function getDishSpecForRecipe(name){
+  var specs=getSpecsByDish(name);
+  if(specs&&specs.length>0){
+    var s=specs[0];
+    return {portion:s.portion||'标准份',baseGram:s.baseGram||500,unit:s.unit||'份'};
+  }
+  return RECIPE_FALLBACK[name]||{portion:'标准份',baseGram:500,unit:'份'};
+}
 var MEAL_NAMES=['早餐','午餐','晚餐','加餐'];
 
 function getDefaultDate(){return '2026-05-20';}
@@ -968,7 +1092,7 @@ function onRecipeParamChange(){
   mealIndices.forEach(function(mi){
     var dayDishes=daily.meals[mi]&&daily.meals[mi][daily.dayIdx]||[];
     dayDishes.forEach(function(dishName){
-      if(!dishMap[dishName])dishMap[dishName]=DISH_SPEC[dishName]||{spec:'标准份（500g）',grams:500};
+      if(!dishMap[dishName])dishMap[dishName]=getDishSpecForRecipe(dishName);
     });
   });
   var dishNames=Object.keys(dishMap);
@@ -977,8 +1101,9 @@ function onRecipeParamChange(){
   for(var name in dishMap){
     var sp=dishMap[name];
     var servings=dinerCount;
-    var weightKg=(sp.grams*servings/1000).toFixed(2);
-    rows+='<tr><td>'+name+'</td><td>'+sp.spec+'</td><td>'+servings+'</td><td>'+weightKg+'</td></tr>';
+    var weightKg=(sp.baseGram*servings/1000).toFixed(2);
+    var specTxt=sp.baseGram+'g/'+(sp.portion||sp.unit);
+    rows+='<tr><td>'+name+'</td><td>'+specTxt+'</td><td>'+servings+'</td><td>'+weightKg+'</td></tr>';
   }
   tbody.innerHTML=rows;
   summaryDiv.style.display='block';
@@ -1000,17 +1125,22 @@ function submitRecipeOrder(){
   mealIndices.forEach(function(mi){
     var dayDishes=daily.meals[mi]&&daily.meals[mi][daily.dayIdx]||[];
     dayDishes.forEach(function(dishName){
-      if(!dishMap[dishName])dishMap[dishName]=DISH_SPEC[dishName]||{spec:'标准份（500g）',grams:500};
+      if(!dishMap[dishName])dishMap[dishName]=getDishSpecForRecipe(dishName);
     });
   });
   var orderNo='CO-'+String(orders.length+1).padStart(3,'0');
   var newLines=[];
   for(var name in dishMap){
     var sp=dishMap[name];
+    var baseGram=sp.baseGram;
     newLines.push({
       id:'L'+(Date.now()+Object.keys(dishMap).indexOf(name)),
-      ncType:'cp',foodName:name,spec:sp.spec,qty:parseInt(dinerCount),
-      weight:parseFloat((sp.grams*parseInt(dinerCount)/1000).toFixed(2)),status:'备货中'
+      ncType:'cp',foodName:name,
+      spec:baseGram+'g/'+(sp.portion||sp.unit),
+      portion:sp.portion,baseGram:baseGram,unit:sp.unit,
+      qty:parseInt(dinerCount),
+      weight:parseFloat((baseGram*parseInt(dinerCount)/1000).toFixed(2)),
+      status:'备货中'
     });
   }
   orders.unshift({
diff --git a/web-admin/nutrition/prod-proc-cabinet.html b/web-admin/nutrition/prod-proc-cabinet.html
index 2312280..2b16bcd 100644
--- a/web-admin/nutrition/prod-proc-cabinet.html
+++ b/web-admin/nutrition/prod-proc-cabinet.html
@@ -420,6 +420,73 @@ tbody tr.row-active td.td-actions{background:var(--primary-light);}
   </div>
 </div>
 <script>
+/* ============== 规格体系工具函数（任务 5.3 内联，权威源 spec-utils-reference.md） ============== */
+/* 包装规格结构化对象 → 展示字符串：{portion?,baseGram,unit} → "标准份 500g / 份" */
+function formatSpec(spec){
+  if(!spec) return '—';
+  if(typeof spec === 'string') return spec;
+  if(typeof spec === 'object'){
+    var parts=[];
+    if(spec.portion) parts.push(spec.portion);
+    if(spec.baseGram) parts.push(spec.baseGram+'g');
+    if(spec.unit) parts.push('/ '+spec.unit);
+    return parts.length?parts.join(' '):'—';
+  }
+  return '—';
+}
+/* 兼容解析旧版包装规格字符串为结构化对象 */
+function parseLegacyPackSpec(str){
+  if(!str) return null;
+  if(typeof str !== 'object'){
+    var s=String(str).trim().replace(/[（）()]/g,'');
+    /* "5kg/袋" 或 "500g/袋" 或 "3kg/袋" */
+    var m1=s.match(/^(\d+(?:\.\d+)?)\s*(kg|g|公斤|克)\s*\/\s*(袋|箱|份|盒|桶|罐)?$/);
+    if(m1){
+      var unit=m1[3]||'袋';
+      var baseGram=parseFloat(m1[1]);
+      if(m1[2]==='kg'||m1[2]==='公斤') baseGram*=1000;
+      return {baseGram:baseGram,unit:unit};
+    }
+    /* "标准份500g" 或 "大份800g" */
+    var m2=s.match(/^(大份|小份|标准份|迷你份)?\s*(\d+(?:\.\d+)?)?\s*(g|克|kg|公斤)?$/);
+    if(m2){
+      var portion=(m2[1])||'';
+      var bg=(m2[2])?parseFloat(m2[2]):0;
+      var u=(m2[3])||'';
+      if(u==='克') u='g';
+      if(u==='公斤') {u='g';bg*=1000;}
+      if(!u) u=bg?'份':'袋';
+      return {portion:portion,baseGram:bg,unit:u};
+    }
+    /* "6份/箱" 语义：6 个份型单位装一箱 */
+    var m3=s.match(/^(\d+)\s*(份|个)?\s*\/\s*(袋|箱|份|盒|桶|罐)?$/);
+    if(m3){
+      return {baseGram:parseInt(m3[1]),unit:m3[3]||'箱',portion:m3[2]||''};
+    }
+    return {baseGram:0,unit:'袋',portion:s};
+  }
+  return str;
+}
+/* 跨页共享：从 localStorage 读取餐品规格数据（key: dish_specs_v1） */
+var DISH_SPECS_KEY='dish_specs_v1';
+function loadDishSpecs(){
+  try{
+    var raw=localStorage.getItem(DISH_SPECS_KEY);
+    if(raw) return JSON.parse(raw);
+  }catch(e){}
+  return {};
+}
+/* spec 兜底解析：对象直接返回、字符串走 parseLegacyPackSpec、空值查跨页共享表 */
+function resolveSpec(name,spec){
+  if(spec && typeof spec==='object') return spec;
+  if(spec && typeof spec==='string') return parseLegacyPackSpec(spec);
+  if(name){
+    var dishSpecs=loadDishSpecs();
+    if(dishSpecs[name]) return dishSpecs[name];
+  }
+  return null;
+}
+
 /* 弹窗开关 */
 function openModal(id){document.getElementById(id).classList.add('show');}
 function closeModal(id){document.getElementById(id).classList.remove('show');}
@@ -454,19 +521,19 @@ function showVideo(code,name){
 }
 function closeVideoModal(){var m=document.getElementById('videoModal');if(m)m.remove();}
 
-/* 存入净菜弹窗 — 先选订单再选菜品明细 */
+/* 存入净菜弹窗 — 先选订单再选菜品明细（spec 字段结构化为 {portion?,baseGram,unit} 对象） */
 var ORDER_DISHES={
   'JC-2026-0422-007':[
-    {name:'土豆丝',spec:'5kg/袋',qty:'20份',weight:'12.5',time:'2026-04-22 08:00',type:'nc'},
-    {name:'宫保鸡丁',spec:'标准份（500g）',qty:'30份',weight:'15.0',time:'2026-04-22 08:00',type:'cp'}
+    {name:'土豆丝',spec:{baseGram:5000,unit:'袋'},qty:'20份',weight:'12.5',time:'2026-04-22 08:00',type:'nc'},
+    {name:'宫保鸡丁',spec:{portion:'标准份',baseGram:500,unit:'份'},qty:'30份',weight:'15.0',time:'2026-04-22 08:00',type:'cp'}
   ],
   'JC-2026-0422-008':[
-    {name:'净黄瓜',spec:'3kg/袋',qty:'15份',weight:'9.0',time:'2026-04-22 08:30',type:'nc'},
-    {name:'净西兰花',spec:'500g/袋',qty:'10份',weight:'5.0',time:'2026-04-22 08:30',type:'nc'},
-    {name:'清蒸鱼',spec:'标准份（600g）',qty:'12份',weight:'7.2',time:'2026-04-22 08:30',type:'cp'}
+    {name:'净黄瓜',spec:{baseGram:3000,unit:'袋'},qty:'15份',weight:'9.0',time:'2026-04-22 08:30',type:'nc'},
+    {name:'净西兰花',spec:{baseGram:500,unit:'袋'},qty:'10份',weight:'5.0',time:'2026-04-22 08:30',type:'nc'},
+    {name:'清蒸鱼',spec:{portion:'标准份',baseGram:600,unit:'份'},qty:'12份',weight:'7.2',time:'2026-04-22 08:30',type:'cp'}
   ],
   'JC-2026-0422-009':[
-    {name:'宫保鸡丁',spec:'6份/箱',qty:'30份',weight:'18.0',time:'2026-04-22 07:45',type:'cp'}
+    {name:'宫保鸡丁',spec:{baseGram:6,unit:'箱',portion:'份'},qty:'30份',weight:'18.0',time:'2026-04-22 07:45',type:'cp'}
   ]
 };
 function onOrderSelect(sel){
@@ -478,7 +545,10 @@ function onOrderSelect(sel){
   var dishes=ORDER_DISHES[v]||[];
   dishSelect.innerHTML='<option value="">请选择菜品</option>';
   dishes.forEach(function(d,i){
-    dishSelect.innerHTML+='<option value="'+i+'">'+d.name+' — '+d.spec+' — '+d.qty+'</option>';
+    /* spec 结构化后用 formatSpec 渲染为下拉文本 */
+    var specObj=resolveSpec(d.name,d.spec);
+    var specText=formatSpec(specObj);
+    dishSelect.innerHTML+='<option value="'+i+'">'+d.name+' — '+specText+' — '+d.qty+'</option>';
   });
   dishSelect.value='';
   dishArea.style.display='flex';
@@ -492,8 +562,10 @@ function onDishSelect(idx){
   var d=dishes[parseInt(idx)];
   if(!d){echoArea.style.display='none';return;}
   echoArea.style.display='';
+  /* 回显包装规格统一走 formatSpec（跨页共享兜底） */
+  var specObj=resolveSpec(d.name,d.spec);
   document.getElementById('echo-name').textContent=d.name;
-  document.getElementById('echo-spec').textContent=d.spec;
+  document.getElementById('echo-spec').textContent=formatSpec(specObj);
   document.getElementById('echo-qty').textContent=d.qty;
   document.getElementById('echo-weight').textContent=d.weight+' kg';
   document.getElementById('echo-time').textContent=d.time;
diff --git a/web-admin/nutrition/prod-proc-combo.html b/web-admin/nutrition/prod-proc-combo.html
index 904654b..8a6c246 100644
--- a/web-admin/nutrition/prod-proc-combo.html
+++ b/web-admin/nutrition/prod-proc-combo.html
@@ -223,11 +223,11 @@ tr.order-last td{border-bottom:2px solid #d9d9d9;}
         </div>
         <div class="form-item">
           <label>目标餐品<span class="required">*</span></label>
-          <select id="createDish" onchange="calcIngredients()"><option value="">请选择餐品</option><option>宫保鸡丁</option><option>番茄炒蛋</option><option>红烧肉</option><option>清蒸鱼</option><option>炒时蔬</option><option>豆腐</option></select>
+          <select id="createDish" onchange="onComboDishChange()"><option value="">请选择餐品</option></select>
         </div>
         <div class="form-item">
           <label>餐品规格<span class="required">*</span></label>
-          <select id="formSpec"><option value="">请选择规格</option><option>小份（200g）</option><option>标准份（300g）</option><option>大份（500g）</option></select>
+          <select id="formSpec" onchange="onComboSpecChange()"><option value="">请选择规格</option></select>
         </div>
         <div class="form-item">
           <label>份数<span class="required">*</span></label>
@@ -290,6 +290,79 @@ tr.order-last td{border-bottom:2px solid #d9d9d9;}
 /* 任务截止日期筛选默认当天 */
 (function(){var d=new Date();var y=d.getFullYear();var m=String(d.getMonth()+1).padStart(2,'0');var day=String(d.getDate()).padStart(2,'0');document.getElementById('filterDeadline').value=y+'-'+m+'-'+day;})();
 
+/* ========== 跨页 specs 共享工具(任务 3.0) ========== */
+function loadDishSpecs(){
+  try{
+    var raw=localStorage.getItem('dish_specs_v1');
+    if(!raw)return null;
+    var data=JSON.parse(raw);
+    return (data&&data.dishes)?data.dishes:null;
+  }catch(e){return null;}
+}
+function getSpecsByDish(name){
+  var dishes=loadDishSpecs();
+  if(!dishes)return [];
+  var d=dishes.find(function(x){return x.name===name;});
+  return d?(d.specs||[]):[];
+}
+function getAllDishNames(){
+  var dishes=loadDishSpecs();
+  return dishes?dishes.map(function(d){return d.name;}):[];
+}
+/* 组配页兜底:总库未覆盖时的页内默认规格 */
+var COMBO_FALLBACK_DISHES={
+  '宫保鸡丁':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '番茄炒蛋':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '红烧肉':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '清蒸鱼':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '炒时蔬':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '豆腐':[{portion:'标准份',baseGram:300,unit:'份'}]
+};
+function getSpecsByDishWithFallback(name){
+  var specs=getSpecsByDish(name);
+  if(specs&&specs.length>0)return specs;
+  return COMBO_FALLBACK_DISHES[name]||[{portion:'标准份',baseGram:300,unit:'份'}];
+}
+function getDishNamesWithFallback(){
+  var names=getAllDishNames();
+  if(names&&names.length>0)return names;
+  return Object.keys(COMBO_FALLBACK_DISHES);
+}
+/* 当前选中规格的 baseGram 缓存(供 calcIngredients 使用) */
+var _selectedSpec={portion:'标准份',baseGram:300,unit:'份'};
+
+/* 餐品变更时:重填份型下拉,默认选中第一项 */
+function onComboDishChange(){
+  var dish=document.getElementById('createDish').value;
+  var specSel=document.getElementById('formSpec');
+  if(!dish){
+    specSel.innerHTML='<option value="">请选择规格</option>';
+    _selectedSpec={portion:'标准份',baseGram:300,unit:'份'};
+    calcIngredients();
+    return;
+  }
+  var specs=getSpecsByDishWithFallback(dish);
+  var optsHtml='';
+  specs.forEach(function(s,i){
+    var label=s.portion+'('+s.baseGram+'g)';
+    optsHtml+='<option value="'+s.portion+'" data-gram="'+s.baseGram+'" data-unit="'+(s.unit||'份')+'"'+(i===0?' selected':'')+'>'+label+'</option>';
+  });
+  specSel.innerHTML=optsHtml;
+  onComboSpecChange();
+}
+/* 份型变更时:更新 _selectedSpec 缓存 */
+function onComboSpecChange(){
+  var specSel=document.getElementById('formSpec');
+  var opt=specSel.options[specSel.selectedIndex];
+  if(!opt||!opt.value){_selectedSpec={portion:'标准份',baseGram:300,unit:'份'};calcIngredients();return;}
+  _selectedSpec={
+    portion:opt.value,
+    baseGram:parseInt(opt.getAttribute('data-gram')||'300',10),
+    unit:opt.getAttribute('data-unit')||'份'
+  };
+  calcIngredients();
+}
+
 /* ========== 食材配方数据 ========== */
 var recipeData={
   '宫保鸡丁':[
@@ -345,9 +418,9 @@ function openModal(){
   document.getElementById('modalSubmitBtn').textContent='确定';
   // 重置表单
   document.getElementById('formTaskId').value='';
-  document.getElementById('createDish').value='';
+  populateComboDishOptions(''); /* 重置餐品下拉 */
   document.getElementById('createDish').disabled=false;
-  document.getElementById('formSpec').value='';
+  document.getElementById('formSpec').innerHTML='<option value="">请选择规格</option>';
   document.getElementById('createQty').value='';
   document.getElementById('formDeadline').value='';
   document.getElementById('formPerson').value='';
@@ -357,6 +430,15 @@ function openModal(){
   document.getElementById('modalOverlay').style.display='flex';
 }
 
+/* 填充组配页餐品下拉 */
+function populateComboDishOptions(selected){
+  var sel=document.getElementById('createDish');
+  var names=getDishNamesWithFallback();
+  var html='<option value="">请选择餐品</option>';
+  names.forEach(function(n){html+='<option value="'+n+'"'+(n===selected?' selected':'')+'>'+n+'</option>';});
+  sel.innerHTML=html;
+}
+
 function openEditModal(el){
   _modalMode='edit';
   _editRow=el.closest('tr');
@@ -365,9 +447,24 @@ function openEditModal(el){
   document.getElementById('modalSubmitBtn').textContent='保存';
   // 回填数据
   document.getElementById('formTaskId').value=tds[0].textContent;
-  document.getElementById('createDish').value=tds[2].textContent;
+  var dishName=tds[2].textContent;
+  populateComboDishOptions(dishName);
   document.getElementById('createDish').disabled=true;
-  document.getElementById('formSpec').value=tds[3].textContent;
+  /* 回填份型下拉,并尝试匹配行内规格文本 */
+  var specText=tds[3].textContent.trim();
+  var specs=getSpecsByDishWithFallback(dishName);
+  var specSel=document.getElementById('formSpec');
+  var specHtml='';
+  var matchedIdx=0;
+  specs.forEach(function(s,i){
+    var label=s.portion+'('+s.baseGram+'g)';
+    /* 简易匹配:行内文本含 portion 名称 */
+    if(specText.indexOf(s.portion)>=0||specText.indexOf(String(s.baseGram))>=0)matchedIdx=i;
+    specHtml+='<option value="'+s.portion+'" data-gram="'+s.baseGram+'" data-unit="'+(s.unit||'份')+'">'+label+'</option>';
+  });
+  specSel.innerHTML=specHtml;
+  specSel.selectedIndex=matchedIdx;
+  onComboSpecChange();
   document.getElementById('createQty').value=tds[4].textContent;
   document.getElementById('formPerson').value=tds[9].textContent==='—'?'':tds[9].textContent;
   // 来源和操作类型回填
@@ -387,7 +484,9 @@ function submitModal(){
   if(_modalMode==='edit'&&_editRow){
     // 编辑模式：更新表格行
     var tds=_editRow.querySelectorAll('td');
-    tds[3].textContent=document.getElementById('formSpec').value;
+    var specSel=document.getElementById('formSpec');
+    var opt=specSel.options[specSel.selectedIndex];
+    tds[3].textContent=opt?opt.textContent:specSel.value;
     tds[4].textContent=document.getElementById('createQty').value;
     var person=document.getElementById('formPerson').value.trim();
     if(person)tds[9].textContent=person;
diff --git a/web-admin/nutrition/prod-proc-cook.html b/web-admin/nutrition/prod-proc-cook.html
index a06ebe1..e678aa9 100644
--- a/web-admin/nutrition/prod-proc-cook.html
+++ b/web-admin/nutrition/prod-proc-cook.html
@@ -332,8 +332,9 @@ tr.order-last td{border-bottom:2px solid #d9d9d9;}
         <div class="form-item"><label>需求份数</label><input id="editQty" type="number" disabled style="background:#f5f5f5;"></div>
         <div class="form-item"><label>烹制日期</label><input id="editDate" type="text" disabled style="background:#f5f5f5;"></div>
         <div class="form-item"><label>厨师</label><input id="editChef" type="text" placeholder="请输入厨师姓名"></div>
-        <div class="form-item"><label>生重(kg)</label><input id="editRawWeight" type="text" placeholder="请输入生重"></div>
-        <div class="form-item"><label>熟重(kg)</label><input id="editCookedWeight" type="text" placeholder="请输入熟重"></div>
+        <div class="form-item"><label>生重(kg)</label><input id="editRawWeight" type="text" placeholder="请输入生重" oninput="autoCalcCookedWeight()"></div>
+        <div class="form-item"><label>熟重(kg)</label><input id="editCookedWeight" type="text" placeholder="按生重×生熟比自动计算" disabled></div>
+        <div class="form-item"><label>生熟比(%)</label><input id="editYieldRate" type="text" disabled style="background:#f5f5f5;"></div>
       </div>
       <!-- 食材明细（溯源码可修改） -->
       <div style="margin-top:16px;border-top:1px solid var(--border);padding-top:16px;">
@@ -355,6 +356,59 @@ tr.order-last td{border-bottom:2px solid #d9d9d9;}
 /* 烹制日期筛选默认当天 */
 (function(){var d=new Date();var y=d.getFullYear();var m=String(d.getMonth()+1).padStart(2,'0');var day=String(d.getDate()).padStart(2,'0');document.getElementById('filterCookDate').value=y+'-'+m+'-'+day;})();
 
+/* ========== 跨页 specs 共享工具(任务 3.0) ========== */
+function loadDishSpecs(){
+  try{
+    var raw=localStorage.getItem('dish_specs_v1');
+    if(!raw)return null;
+    var data=JSON.parse(raw);
+    return (data&&data.dishes)?data.dishes:null;
+  }catch(e){return null;}
+}
+function getSpecsByDish(name){
+  var dishes=loadDishSpecs();
+  if(!dishes)return [];
+  var d=dishes.find(function(x){return x.name===name;});
+  return d?(d.specs||[]):[];
+}
+/* 烹制页兜底规格 */
+var COOK_FALLBACK_SPECS={
+  '宫保鸡丁':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '番茄炒蛋':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '红烧肉':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '清蒸鱼':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '蒜蓉菠菜':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '炒时蔬':[{portion:'标准份',baseGram:300,unit:'份'}],
+  '豆腐':[{portion:'标准份',baseGram:300,unit:'份'}]
+};
+function getSpecsByDishWithFallback(name){
+  var specs=getSpecsByDish(name);
+  if(specs&&specs.length>0)return specs;
+  return COOK_FALLBACK_SPECS[name]||[{portion:'标准份',baseGram:300,unit:'份'}];
+}
+/* 按行内规格文本匹配总库中的某一规格 */
+function matchSpecByText(dishName,specText){
+  var specs=getSpecsByDishWithFallback(dishName);
+  if(!specText)return specs[0]||{portion:'标准份',baseGram:300,unit:'份'};
+  /* 优先匹配 portion 名称 */
+  var m=specs.find(function(s){return specText.indexOf(s.portion)>=0;});
+  if(m)return m;
+  /* 退而匹配 baseGram */
+  m=specs.find(function(s){return specText.indexOf(String(s.baseGram))>=0;});
+  if(m)return m;
+  return specs[0]||{portion:'标准份',baseGram:300,unit:'份'};
+}
+/* 餐品级生熟比字典(%)—熟重/生重,任务 3.3b 新增 */
+var DISH_YIELD_RATE={
+  '宫保鸡丁':85,'番茄炒蛋':88,'红烧肉':75,'清蒸鱼':82,
+  '蒜蓉菠菜':80,'炒时蔬':82,'豆腐':90
+};
+function getYieldRateByDish(name){return DISH_YIELD_RATE[name]||80;}
+function formatSpecDisplay(spec){
+  if(!spec)return '—';
+  return (spec.baseGram||0)+'g/'+(spec.unit||'份')+' / '+(spec.portion||'标准份');
+}
+
 /* ========== 食材配方数据 ========== */
 var recipeData={
   '宫保鸡丁':[
@@ -456,12 +510,26 @@ function openEditModal(el){
   document.getElementById('editTitle').textContent='编辑烹制任务 — '+taskId;
   document.getElementById('editTaskId').value=taskId;
   document.getElementById('editDish').value=dishName;
-  document.getElementById('editSpec').value=spec;
+  /* 规格回显:用总库匹配后的结构化字段拼装 */
+  var specObj=matchSpecByText(dishName,spec);
+  document.getElementById('editSpec').value=formatSpecDisplay(specObj);
+  /* 缓存到 dataset,供 submitEdit / autoCalcCookedWeight 使用 */
+  document.getElementById('editSpec').dataset.portion=specObj.portion||'';
+  document.getElementById('editSpec').dataset.baseGram=specObj.baseGram||0;
+  document.getElementById('editSpec').dataset.unit=specObj.unit||'份';
   document.getElementById('editQty').value=qty;
   document.getElementById('editDate').value=cookDate;
   document.getElementById('editChef').value=chef==='—'?'':chef;
   document.getElementById('editRawWeight').value=rawWeight==='—'?'':rawWeight;
-  document.getElementById('editCookedWeight').value=cookedWeight==='—'?'':cookedWeight;
+  /* 生熟比按餐品带出 */
+  var yr=getYieldRateByDish(dishName);
+  document.getElementById('editYieldRate').value=yr+'%';
+  /* 熟重:若用户已填则保留,否则按生重×生熟比计算 */
+  if(cookedWeight==='—'){
+    autoCalcCookedWeight();
+  }else{
+    document.getElementById('editCookedWeight').value=cookedWeight;
+  }
 
   // 渲染食材明细
   var ings=recipeData[dishName]||[];
@@ -486,6 +554,15 @@ function openEditModal(el){
   document.getElementById('editModal').style.display='flex';
 }
 function closeEditModal(){document.getElementById('editModal').style.display='none';_editRow=null;}
+/* 任务 3.3b:熟重自动计算 cookedWeight = rawWeight * yieldRate / 100(向上取整保留 2 位小数) */
+function autoCalcCookedWeight(){
+  var rw=parseFloat(document.getElementById('editRawWeight').value);
+  var yr=parseFloat(document.getElementById('editYieldRate').value);
+  var cwInput=document.getElementById('editCookedWeight');
+  if(!rw||!yr||isNaN(rw)||isNaN(yr)){cwInput.value='';return;}
+  var cw=Math.ceil(rw*yr/100*100)/100;
+  cwInput.value=cw.toFixed(2);
+}
 function submitEdit(){
   if(_editRow){
     var tds=_editRow.querySelectorAll('td');
@@ -496,11 +573,14 @@ function submitEdit(){
     var cw=document.getElementById('editCookedWeight').value.trim();
     if(cw){
       tds[17].textContent=cw;
-      // 自动计算生熟比
+      // 自动计算生熟比显示(1:x)
       var rwNum=parseFloat(tds[16].textContent);
       var cwNum=parseFloat(cw);
       if(rwNum&&cwNum)tds[18].textContent='1：'+(cwNum/rwNum).toFixed(2);
     }
+    /* 规格列回写结构化文本 */
+    var specInput=document.getElementById('editSpec');
+    if(specInput.value)tds[5].textContent=specInput.value;
     closeEditModal();
     showToast('✅ 烹制任务已更新');
   }
diff --git a/web-admin/nutrition/prod-qc-nutrition-add.html b/web-admin/nutrition/prod-qc-nutrition-add.html
index 21b3d92..8bda173 100644
--- a/web-admin/nutrition/prod-qc-nutrition-add.html
+++ b/web-admin/nutrition/prod-qc-nutrition-add.html
@@ -365,7 +365,15 @@ var lineData={
   '4':[{id:'G',name:'A餐线（自选）'},{id:'H',name:'B餐线（面食）'}],
   '5':[{id:'I',name:'A餐线（营养餐线）'}]
 };
-var dishData={
+/* 跨页共享:从 localStorage 加载餐品总库数据,按餐线 ID 分组(兜底回退到硬编码) */
+var CANTEEN_LINE_MAP = {
+  'A':'总部一号食堂','B':'总部一号食堂','C':'总部一号食堂',
+  'D':'总部二号食堂','E':'总部二号食堂',
+  'F':'采油一厂职工食堂',
+  'G':'采油二厂综合食堂','H':'采油二厂综合食堂',
+  'I':'采气一厂营养餐厅'
+};
+var FALLBACK_DISH_DATA = {
   'A':['红烧肉','清炒时蔬','番茄鸡蛋汤','凉拌黄瓜','米饭'],
   'B':['宫保鸡丁','蒜蓉西兰花','紫菜蛋花汤','糙米饭','水果拼盘'],
   'C':['牛肉炖土豆','手抓饭','羊肉串','酸奶','馕饼'],
@@ -376,6 +384,36 @@ var dishData={
   'H':['牛肉拉面','油泼面','炸酱面','酸汤水饺'],
   'I':['营养套餐A','营养套餐B','营养套餐C']
 };
+function loadDishSpecs(){
+  try {
+    var raw = localStorage.getItem('dish_specs_v1');
+    if(!raw) return null;
+    var data = JSON.parse(raw);
+    return (data && data.dishes) ? data.dishes : null;
+  } catch(e){ return null; }
+}
+/* 按场所(食堂)名对餐品总库做分组,失败时回退到 FALLBACK_DISH_DATA */
+function buildDishDataFromStore(){
+  var dishes = loadDishSpecs();
+  if(!dishes || !dishes.length){
+    document.getElementById('dishHint').textContent = '⚠️ 餐品总库未初始化,当前显示内置示例菜品。请先在「餐品总库」中初始化数据';
+    return FALLBACK_DISH_DATA;
+  }
+  var result = {};
+  Object.keys(lineData).forEach(function(cid){
+    lineData[cid].forEach(function(line){
+      var canteenName = CANTEEN_LINE_MAP[line.id];
+      var list = [];
+      dishes.forEach(function(d){
+        if(d.category === canteenName){ list.push(d.name); }
+      });
+      /* 若该食堂在总库中无餐品,回退到默认列表 */
+      result[line.id] = list.length ? list : (FALLBACK_DISH_DATA[line.id] || []);
+    });
+  });
+  return result;
+}
+var dishData = buildDishDataFromStore();
 
 function onCanteenChange(){
   var cid=document.getElementById('canteenSelect').value;
diff --git a/web-admin/nutrition/prod-qc-nutrition-sync.html b/web-admin/nutrition/prod-qc-nutrition-sync.html
index 4ed3abc..f42af75 100644
--- a/web-admin/nutrition/prod-qc-nutrition-sync.html
+++ b/web-admin/nutrition/prod-qc-nutrition-sync.html
@@ -262,7 +262,7 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
 
   <!-- 操作栏 -->
   <div class="action-bar">
-    <div class="action-bar__right">共 <strong>4</strong> 条记录</div>
+    <div class="action-bar__right">共 <strong id="totalCount">4</strong> 条记录</div>
   </div>
 
   <!-- 数据表格 -->
@@ -282,7 +282,7 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei
       </table>
     </div>
     <div class="pagination">
-      <div class="pagination__info">第 1-4 条 / 共 4 条</div>
+      <div class="pagination__info" id="paginationInfo">第 1-4 条 / 共 4 条</div>
       <div class="pagination__btns">
         <button class="page-btn disabled">上一页</button>
         <button class="page-btn active">1</button>
@@ -363,14 +363,63 @@ var RECORDS = [
     colorData:{mainColor:'金黄色',uniformity:5,gloss:4,freshness:5,appearance:5,score:4.5,grade:'优秀'}}
 ];
 
-/* ===== 同步记录数据（引用 RECORDS 索引） ===== */
-var SYNC_DATA = [
+/* ===== 同步记录数据 =====
+ * 优先从 localStorage['nutri_sync_log_v1'] 读取真实同步日志;
+ * 若为空(用户尚未触发过同步),回退到内置示例数据,保证页面可演示。
+ */
+function loadSyncLogsFromStore(){
+  try {
+    var raw = localStorage.getItem('nutri_sync_log_v1');
+    if(!raw) return null;
+    var data = JSON.parse(raw);
+    return (data && data.logs) ? data.logs : null;
+  } catch(e){ return null; }
+}
+
+/* 兜底示例:与 RECORDS 内置数据配套,演示用 */
+var FALLBACK_SYNC_DATA = [
   {dish:'红烧肉',  syncTime:'2026-04-22 16:00',operator:'张明', recordIdxs:[0,1]},
   {dish:'清炒时蔬',syncTime:'2026-04-22 16:05',operator:'李华', recordIdxs:[2,3]},
   {dish:'宫保鸡丁',syncTime:'2026-04-21 14:00',operator:'王芳', recordIdxs:[4,5]},
   {dish:'糖醋里脊',syncTime:'2026-04-20 16:30',operator:'张明', recordIdxs:[6,7]}
 ];
 
+/* 把 localStorage 中的日志项映射为页面使用的结构(搭配内置 RECORDS 做详情查看) */
+function mapLogsToSyncData(logs){
+  return logs.map(function(log){
+    /* 同步日志中的 recordNos 尝试匹配 RECORDS,匹配不到则按序号兜底 */
+    var idxs = [];
+    if(log.recordNos){
+      log.recordNos.forEach(function(no){
+        var idx = RECORDS.findIndex(function(r){ return r.no === no; });
+        if(idx >= 0) idxs.push(idx);
+      });
+    }
+    /* 若匹配不到任何 RECORDS(说明总库中餐品不在内置 8 条中),构造伪记录保证详情可看 */
+    if(idxs.length === 0 && log.recordCount){
+      for(var i=0; i<log.recordCount; i++){
+        idxs.push(-1);
+      }
+    }
+    return {
+      dish: log.dish,
+      syncTime: log.syncTime,
+      operator: log.operator,
+      recordIdxs: idxs,
+      avgCache: {
+        nutri: log.nutriAvg,
+        taste: log.tasteAvg,
+        texture: log.textureAvg,
+        color: log.colorAvg
+      }
+    };
+  });
+}
+
+var STORE_LOGS = loadSyncLogsFromStore();
+var SYNC_DATA = (STORE_LOGS && STORE_LOGS.length) ? mapLogsToSyncData(STORE_LOGS) : FALLBACK_SYNC_DATA;
+var USING_FALLBACK = !(STORE_LOGS && STORE_LOGS.length);
+
 /* ===== Tag 工具函数 ===== */
 function nutriTag(val){
   if(val==='达标') return '<span class="tag tag-green">达标</span>';
@@ -396,6 +445,12 @@ function renderTable(){
       +'</tr>';
   }).join('');
   document.getElementById('tableBody').innerHTML = html;
+  /* 同步总数与分页信息 */
+  var total = SYNC_DATA.length;
+  var totalEl = document.getElementById('totalCount');
+  if(totalEl) totalEl.textContent = total;
+  var infoEl = document.getElementById('paginationInfo');
+  if(infoEl) infoEl.textContent = '第 1-' + total + ' 条 / 共 ' + total + ' 条';
 }
 
 /* ===== Dialog 弹窗 ===== */
@@ -441,36 +496,48 @@ function nutriMajorityGrade(recs){
 
 function renderDialogAvg(){
   var s = SYNC_DATA[currentSyncIdx];
-  var recs = s.recordIdxs.map(function(i){ return RECORDS[i]; });
-  var count = recs.length;
+  var count = s.recordIdxs.length;
 
-  /* 营养均值 */
-  var nds = recs.map(function(r){ return r.nutriData; });
-  var avgNutri = {
-    cal: calcAvg(nds,'cal'), protein: calcAvg(nds,'protein'), carb: calcAvg(nds,'carb'), fat: calcAvg(nds,'fat'),
-    vc: calcAvg(nds,'vc'), mineral: calcAvg(nds,'mineral'), fiber: calcAvg(nds,'fiber'), sodium: calcAvg(nds,'sodium')
-  };
+  var avgNutri, avgTaste, avgTexture, avgColor, nutriGrade, tasteGrade, textureGrade, colorGrade;
 
-  /* 味道均值 */
-  var tds = recs.map(function(r){ return r.tasteData; });
-  var avgTaste = {
-    sour: calcAvg(tds,'sour'), sweet: calcAvg(tds,'sweet'), bitter: calcAvg(tds,'bitter'), spicy: calcAvg(tds,'spicy'),
-    salty: calcAvg(tds,'salty'), smell: calcAvg(tds,'smell'), flavor: calcAvg(tds,'flavor')
-  };
-
-  /* 口感均值 */
-  var xds = recs.map(function(r){ return r.textureData; });
-  var avgTexture = {
-    hardness: calcAvg(xds,'hardness'), sticky: calcAvg(xds,'sticky'), crispy: calcAvg(xds,'crispy'),
-    smooth: calcAvg(xds,'smooth'), elastic: calcAvg(xds,'elastic'), score: calcAvg(xds,'score')
-  };
-
-  /* 色泽均值 */
-  var cds = recs.map(function(r){ return r.colorData; });
-  var avgColor = {
-    uniformity: calcAvg(cds,'uniformity'), gloss: calcAvg(cds,'gloss'), freshness: calcAvg(cds,'freshness'),
-    appearance: calcAvg(cds,'appearance'), score: calcAvg(cds,'score')
-  };
+  /* 优先使用同步日志中的均值缓存(真实数据) */
+  if(s.avgCache){
+    avgNutri = s.avgCache.nutri || {};
+    avgTaste = s.avgCache.taste || {};
+    avgTexture = s.avgCache.texture || {};
+    avgColor = s.avgCache.color || {};
+    nutriGrade = avgNutri.grade || '达标';
+    tasteGrade = avgTaste.grade || '良好';
+    textureGrade = avgTexture.grade || '良好';
+    colorGrade = avgColor.grade || '良好';
+  } else {
+    /* 兜底:回退到从 RECORDS 现场计算 */
+    var recs = s.recordIdxs.map(function(i){ return RECORDS[i]; });
+    var nds = recs.map(function(r){ return r.nutriData; });
+    avgNutri = {
+      cal: calcAvg(nds,'cal'), protein: calcAvg(nds,'protein'), carb: calcAvg(nds,'carb'), fat: calcAvg(nds,'fat'),
+      vc: calcAvg(nds,'vc'), mineral: calcAvg(nds,'mineral'), fiber: calcAvg(nds,'fiber'), sodium: calcAvg(nds,'sodium')
+    };
+    var tds = recs.map(function(r){ return r.tasteData; });
+    avgTaste = {
+      sour: calcAvg(tds,'sour'), sweet: calcAvg(tds,'sweet'), bitter: calcAvg(tds,'bitter'), spicy: calcAvg(tds,'spicy'),
+      salty: calcAvg(tds,'salty'), smell: calcAvg(tds,'smell'), flavor: calcAvg(tds,'flavor')
+    };
+    var xds = recs.map(function(r){ return r.textureData; });
+    avgTexture = {
+      hardness: calcAvg(xds,'hardness'), sticky: calcAvg(xds,'sticky'), crispy: calcAvg(xds,'crispy'),
+      smooth: calcAvg(xds,'smooth'), elastic: calcAvg(xds,'elastic'), score: calcAvg(xds,'score')
+    };
+    var cds = recs.map(function(r){ return r.colorData; });
+    avgColor = {
+      uniformity: calcAvg(cds,'uniformity'), gloss: calcAvg(cds,'gloss'), freshness: calcAvg(cds,'freshness'),
+      appearance: calcAvg(cds,'appearance'), score: calcAvg(cds,'score')
+    };
+    nutriGrade = nutriMajorityGrade(recs);
+    tasteGrade = scoreToGrade(avgTaste.flavor);
+    textureGrade = scoreToGrade(avgTexture.score);
+    colorGrade = scoreToGrade(avgColor.score);
+  }
 
   var html = '<div class="dialog__avg-title">检验均值汇总 <span class="tag tag-blue">共 '+count+' 条记录</span></div>';
 
@@ -492,7 +559,7 @@ function renderDialogAvg(){
     +'<div class="avg-cell"><div class="avg-cell__label">矿物质(mg)</div><div class="avg-cell__value">'+avgNutri.mineral+'</div></div>'
     +'<div class="avg-cell"><div class="avg-cell__label">膳食纤维(g)</div><div class="avg-cell__value">'+avgNutri.fiber+'</div></div>'
     +'<div class="avg-cell"><div class="avg-cell__label">钠(mg)</div><div class="avg-cell__value">'+avgNutri.sodium+'</div></div>'
-    +'<div class="avg-cell"><div class="avg-cell__label">检验等级</div><div class="avg-cell__value">'+nutriTag(nutriMajorityGrade(recs))+'</div></div>'
+    +'<div class="avg-cell"><div class="avg-cell__label">检验等级</div><div class="avg-cell__value">'+nutriTag(nutriGrade)+'</div></div>'
     +'</div></div>';
 
   /* 味道面板 */
@@ -504,7 +571,7 @@ function renderDialogAvg(){
     +'<div class="avg-cell"><div class="avg-cell__label">咸度</div><div class="avg-cell__value">'+avgTaste.salty+'</div></div>'
     +'<div class="avg-cell"><div class="avg-cell__label">气味评分</div><div class="avg-cell__value">'+avgTaste.smell+'</div></div>'
     +'<div class="avg-cell"><div class="avg-cell__label">综合风味</div><div class="avg-cell__value">'+avgTaste.flavor+'</div></div>'
-    +'<div class="avg-cell"><div class="avg-cell__label">综合评级</div><div class="avg-cell__value">'+gradeTag(scoreToGrade(avgTaste.flavor))+'</div></div>'
+    +'<div class="avg-cell"><div class="avg-cell__label">综合评级</div><div class="avg-cell__value">'+gradeTag(tasteGrade)+'</div></div>'
     +'</div></div>';
 
   /* 口感面板 */
@@ -515,7 +582,7 @@ function renderDialogAvg(){
     +'<div class="avg-cell"><div class="avg-cell__label">嫩滑度</div><div class="avg-cell__value">'+avgTexture.smooth+'</div></div>'
     +'<div class="avg-cell"><div class="avg-cell__label">弹性</div><div class="avg-cell__value">'+avgTexture.elastic+'</div></div>'
     +'<div class="avg-cell"><div class="avg-cell__label">综合口感</div><div class="avg-cell__value">'+avgTexture.score+'</div></div>'
-    +'<div class="avg-cell"><div class="avg-cell__label">综合评级</div><div class="avg-cell__value">'+gradeTag(scoreToGrade(avgTexture.score))+'</div></div>'
+    +'<div class="avg-cell"><div class="avg-cell__label">综合评级</div><div class="avg-cell__value">'+gradeTag(textureGrade)+'</div></div>'
     +'</div></div>';
 
   /* 色泽面板 */
@@ -525,7 +592,7 @@ function renderDialogAvg(){
     +'<div class="avg-cell"><div class="avg-cell__label">新鲜度</div><div class="avg-cell__value">'+avgColor.freshness+'</div></div>'
     +'<div class="avg-cell"><div class="avg-cell__label">卖相评分</div><div class="avg-cell__value">'+avgColor.appearance+'</div></div>'
     +'<div class="avg-cell"><div class="avg-cell__label">综合色泽</div><div class="avg-cell__value">'+avgColor.score+'</div></div>'
-    +'<div class="avg-cell"><div class="avg-cell__label">综合评级</div><div class="avg-cell__value">'+gradeTag(scoreToGrade(avgColor.score))+'</div></div>'
+    +'<div class="avg-cell"><div class="avg-cell__label">综合评级</div><div class="avg-cell__value">'+gradeTag(colorGrade)+'</div></div>'
     +'</div></div>';
 
   document.getElementById('dialogAvg').innerHTML = html;
@@ -542,19 +609,28 @@ function renderDialogLeft(){
   var s = SYNC_DATA[currentSyncIdx];
   var html = '';
   s.recordIdxs.forEach(function(ri, i){
-    var r = RECORDS[ri];
+    var r = (ri >= 0) ? RECORDS[ri] : null;
     var cls = (i === currentRecordIdx) ? 'dialog-left__item active' : 'dialog-left__item';
-    html += '<div class="'+cls+'" onclick="selectRecord('+i+')">'
-      +'<div class="dialog-left__no">'+r.no+'</div>'
-      +'<div class="dialog-left__info">'
-        +'<span>'+r.time+'</span>'
-        +'<span>'+r.inspector+'</span>'
-      +'</div>'
-      +'<div class="dialog-left__info" style="margin-top:2px;">'
-        +'<span>'+r.category+'</span>'
-        +'<span>'+r.line+'</span>'
-      +'</div>'
-      +'</div>';
+    if(r){
+      html += '<div class="'+cls+'" onclick="selectRecord('+i+')">'
+        +'<div class="dialog-left__no">'+r.no+'</div>'
+        +'<div class="dialog-left__info">'
+          +'<span>'+r.time+'</span>'
+          +'<span>'+r.inspector+'</span>'
+        +'</div>'
+        +'<div class="dialog-left__info" style="margin-top:2px;">'
+          +'<span>'+r.category+'</span>'
+          +'<span>'+r.line+'</span>'
+        +'</div>'
+        +'</div>';
+    } else {
+      html += '<div class="'+cls+'" onclick="selectRecord('+i+')">'
+        +'<div class="dialog-left__no">'+(s.recordNos ? s.recordNos[i] : ('记录#'+(i+1)))+'</div>'
+        +'<div class="dialog-left__info" style="color:var(--text-placeholder);">'
+          +'<span>历史记录(不在当前列表)</span>'
+        +'</div>'
+        +'</div>';
+    }
   });
   document.getElementById('dialogLeft').innerHTML = html;
 }
@@ -568,7 +644,48 @@ function selectRecord(idx){
 function renderDialogRight(){
   var s = SYNC_DATA[currentSyncIdx];
   var ri = s.recordIdxs[currentRecordIdx];
-  var r = RECORDS[ri];
+  var r = (ri >= 0) ? RECORDS[ri] : null;
+  if(!r){
+    /* 历史记录不在内置 RECORDS 中:展示同步时的均值作为只读详情 */
+    var n2 = (s.avgCache && s.avgCache.nutri) || {};
+    var t2 = (s.avgCache && s.avgCache.taste) || {};
+    var x2 = (s.avgCache && s.avgCache.texture) || {};
+    var c2 = (s.avgCache && s.avgCache.color) || {};
+    var html = '';
+    html += '<div class="section-title">基本信息</div>'
+      +'<div class="detail-grid">'
+      +'<div class="detail-item"><div class="detail-item__label">餐品</div><div class="detail-item__value">'+s.dish+'</div></div>'
+      +'<div class="detail-item"><div class="detail-item__label">同步时间</div><div class="detail-item__value">'+s.syncTime+'</div></div>'
+      +'<div class="detail-item"><div class="detail-item__label">操作人</div><div class="detail-item__value">'+s.operator+'</div></div>'
+      +'<div class="detail-item"><div class="detail-item__label">记录数</div><div class="detail-item__value">'+s.recordIdxs.length+' 条</div></div>'
+      +'</div>';
+    html += '<div class="section-title" style="margin-top:20px;color:var(--text-secondary);">📝 该条记录为历史同步日志,详细单条数据未保留,以下展示本次同步的均值参考</div>';
+    html += '<div class="inspect-tabs">'
+      +'<div class="inspect-tab active" onclick="switchDialogTab(0)">营养</div>'
+      +'<div class="inspect-tab" onclick="switchDialogTab(1)">味道</div>'
+      +'<div class="inspect-tab" onclick="switchDialogTab(2)">口感</div>'
+      +'<div class="inspect-tab" onclick="switchDialogTab(3)">色泽</div>'
+      +'</div>';
+    html += '<div class="inspect-panel active"><div class="metric-row">'
+      +'<div class="metric-pair"><span class="metric-pair__label">热量</span><span class="metric-pair__value">'+(n2.cal||'-')+'</span></div>'
+      +'<div class="metric-pair"><span class="metric-pair__label">蛋白质</span><span class="metric-pair__value">'+(n2.protein||'-')+'</span></div>'
+      +'<div class="metric-pair"><span class="metric-pair__label">检验等级</span><span class="metric-pair__value">'+nutriTag(n2.grade||'达标')+'</span></div>'
+      +'</div></div>';
+    html += '<div class="inspect-panel"><div class="metric-row">'
+      +'<div class="metric-pair"><span class="metric-pair__label">综合风味</span><span class="metric-pair__value">'+(t2.flavor||'-')+'</span></div>'
+      +'<div class="metric-pair"><span class="metric-pair__label">综合评级</span><span class="metric-pair__value">'+gradeTag(t2.grade||'良好')+'</span></div>'
+      +'</div></div>';
+    html += '<div class="inspect-panel"><div class="metric-row">'
+      +'<div class="metric-pair"><span class="metric-pair__label">综合口感</span><span class="metric-pair__value">'+(x2.score||'-')+'</span></div>'
+      +'<div class="metric-pair"><span class="metric-pair__label">综合评级</span><span class="metric-pair__value">'+gradeTag(x2.grade||'良好')+'</span></div>'
+      +'</div></div>';
+    html += '<div class="inspect-panel"><div class="metric-row">'
+      +'<div class="metric-pair"><span class="metric-pair__label">综合色泽</span><span class="metric-pair__value">'+(c2.score||'-')+'</span></div>'
+      +'<div class="metric-pair"><span class="metric-pair__label">综合评级</span><span class="metric-pair__value">'+gradeTag(c2.grade||'良好')+'</span></div>'
+      +'</div></div>';
+    document.getElementById('dialogRight').innerHTML = html;
+    return;
+  }
   var n = r.nutriData, t = r.tasteData, x = r.textureData, c = r.colorData;
 
   var html = '';
@@ -660,7 +777,7 @@ function toggleSubgroup(header){ header.parentElement.classList.toggle('open');
 /* ===== 右侧抽屉组件 ===== */
 function showDetail(syncIdx){
   var s = SYNC_DATA[syncIdx];
-  var recs = s.recordIdxs.map(function(i){ return RECORDS[i]; });
+  var recs = s.recordIdxs.map(function(i){ return (i>=0) ? RECORDS[i] : null; });
 
   var html = '<div class="drawer-section">'
     +'<div class="drawer-section__title">同步信息</div>'
@@ -674,19 +791,26 @@ function showDetail(syncIdx){
   /* 关联检验记录列表 */
   html += '<div class="drawer-section">'
     +'<div class="drawer-section__title">关联检验记录</div>';
-  recs.forEach(function(r){
-    html += '<div class="drawer-fields" style="margin-bottom:12px;padding:10px;background:#FAFAFA;border-radius:var(--radius-sm);">'
-      +'<div class="drawer-field"><div class="drawer-field__label">检验单号</div><div class="drawer-field__value">'+r.no+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">检验时间</div><div class="drawer-field__value">'+r.time+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">检验人员</div><div class="drawer-field__value">'+r.inspector+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">批次</div><div class="drawer-field__value">'+r.batch+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">场所</div><div class="drawer-field__value">'+r.category+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">餐线</div><div class="drawer-field__value">'+r.line+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">营养检验</div><div class="drawer-field__value">'+nutriTag(r.nutri)+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">味道评级</div><div class="drawer-field__value">'+gradeTag(r.tasteData.grade)+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">口感评级</div><div class="drawer-field__value">'+gradeTag(r.textureData.grade)+'</div></div>'
-      +'<div class="drawer-field"><div class="drawer-field__label">色泽评级</div><div class="drawer-field__value">'+gradeTag(r.colorData.grade)+'</div></div>'
-      +'</div>';
+  recs.forEach(function(r, i){
+    if(r){
+      html += '<div class="drawer-fields" style="margin-bottom:12px;padding:10px;background:#FAFAFA;border-radius:var(--radius-sm);">'
+        +'<div class="drawer-field"><div class="drawer-field__label">检验单号</div><div class="drawer-field__value">'+r.no+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">检验时间</div><div class="drawer-field__value">'+r.time+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">检验人员</div><div class="drawer-field__value">'+r.inspector+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">批次</div><div class="drawer-field__value">'+r.batch+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">场所</div><div class="drawer-field__value">'+r.category+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">餐线</div><div class="drawer-field__value">'+r.line+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">营养检验</div><div class="drawer-field__value">'+nutriTag(r.nutri)+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">味道评级</div><div class="drawer-field__value">'+gradeTag(r.tasteData.grade)+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">口感评级</div><div class="drawer-field__value">'+gradeTag(r.textureData.grade)+'</div></div>'
+        +'<div class="drawer-field"><div class="drawer-field__label">色泽评级</div><div class="drawer-field__value">'+gradeTag(r.colorData.grade)+'</div></div>'
+        +'</div>';
+    } else {
+      html += '<div class="drawer-fields" style="margin-bottom:12px;padding:10px;background:#FAFAFA;border-radius:var(--radius-sm);">'
+        +'<div class="drawer-field"><div class="drawer-field__label">检验单号</div><div class="drawer-field__value">'+(s.recordNos ? s.recordNos[i] : '历史记录')+'</div></div>'
+        +'<div class="drawer-field" style="grid-column:span 3;"><div class="drawer-field__label">备注</div><div class="drawer-field__value" style="color:var(--text-secondary);">该条记录来自历史同步日志,详细单条数据未保留</div></div>'
+        +'</div>';
+    }
   });
   html += '</div>';
 
diff --git a/web-admin/nutrition/prod-qc-nutrition.html b/web-admin/nutrition/prod-qc-nutrition.html
index fee95ea..f2cbb7c 100644
--- a/web-admin/nutrition/prod-qc-nutrition.html
+++ b/web-admin/nutrition/prod-qc-nutrition.html
@@ -721,9 +721,133 @@ function closeSyncDialog(){
   document.getElementById('syncDialogMask').classList.remove('show');
 }
 function confirmSync(){
+  var recs = getSelectedRecords();
+  if(recs.length === 0){ alert('请至少选择一条检验记录'); return; }
+
+  /* 按 dish 聚合,计算均值 */
+  var dishMap = {};
+  recs.forEach(function(r){
+    if(!dishMap[r.dish]) dishMap[r.dish] = [];
+    dishMap[r.dish].push(r);
+  });
+
+  var syncLogs = [];
+  var syncTime = formatNow();
+  Object.keys(dishMap).forEach(function(dish){
+    var list = dishMap[dish];
+    var nds = list.map(function(r){ return r.nutriData; });
+    var tds = list.map(function(r){ return r.tasteData; });
+    var xds = list.map(function(r){ return r.textureData; });
+    var cds = list.map(function(r){ return r.colorData; });
+    var nutri = {
+      cal: calcAvg(nds,'cal'), protein: calcAvg(nds,'protein'), carb: calcAvg(nds,'carb'), fat: calcAvg(nds,'fat'),
+      vc: calcAvg(nds,'vc'), mineral: calcAvg(nds,'mineral'), fiber: calcAvg(nds,'fiber'), sodium: calcAvg(nds,'sodium'),
+      grade: nutriMajorityGrade(list)
+    };
+    var taste = {
+      sour: calcAvg(tds,'sour'), sweet: calcAvg(tds,'sweet'), bitter: calcAvg(tds,'bitter'), spicy: calcAvg(tds,'spicy'),
+      salty: calcAvg(tds,'salty'), smell: calcAvg(tds,'smell'), flavor: calcAvg(tds,'flavor'),
+      grade: scoreToGrade(calcAvg(tds,'flavor'))
+    };
+    var texture = {
+      hardness: calcAvg(xds,'hardness'), sticky: calcAvg(xds,'sticky'), crispy: calcAvg(xds,'crispy'),
+      smooth: calcAvg(xds,'smooth'), elastic: calcAvg(xds,'elastic'), score: calcAvg(xds,'score'),
+      grade: scoreToGrade(calcAvg(xds,'score'))
+    };
+    var color = {
+      uniformity: calcAvg(cds,'uniformity'), gloss: calcAvg(cds,'gloss'), freshness: calcAvg(cds,'freshness'),
+      appearance: calcAvg(cds,'appearance'), score: calcAvg(cds,'score'),
+      grade: scoreToGrade(calcAvg(cds,'score'))
+    };
+
+    /* 写入餐品总库 dish_specs_v1 */
+    var prevSpec = updateDishSpecNutri(dish, {nutri:taste, taste:texture, texture:color, color:nutri, nutriData:nutri, tasteData:taste, textureData:texture, colorData:color});
+
+    syncLogs.push({
+      syncTime: syncTime,
+      dish: dish,
+      operator: '系统管理员',
+      recordCount: list.length,
+      recordNos: list.map(function(r){ return r.no; }),
+      nutriAvg: nutri,
+      tasteAvg: taste,
+      textureAvg: texture,
+      colorAvg: color,
+      prev: prevSpec
+    });
+  });
+
+  /* 追加同步日志 nutri_sync_log_v1 */
+  appendSyncLogs(syncLogs);
+
   closeSyncDialog();
   exitSyncMode();
-  showToast('同步成功');
+  showToast('已同步 ' + syncLogs.length + ' 条餐品营养数据至餐品总库,刷新餐品总库可见');
+}
+
+/* 当前时间格式化为 YYYY-MM-DD HH:mm */
+function formatNow(){
+  var d = new Date();
+  var pad = function(n){ return n<10 ? '0'+n : n; };
+  return d.getFullYear()+'-'+pad(d.getMonth()+1)+'-'+pad(d.getDate())+' '+pad(d.getHours())+':'+pad(d.getMinutes());
+}
+
+/* ===== 跨页共享:餐品总库 specs 读取与写入 ===== */
+function loadDishSpecs(){
+  try {
+    var raw = localStorage.getItem('dish_specs_v1');
+    if(!raw) return null;
+    var data = JSON.parse(raw);
+    return (data && data.dishes) ? data.dishes : null;
+  } catch(e){ return null; }
+}
+function saveDishSpecs(dishes){
+  try {
+    localStorage.setItem('dish_specs_v1', JSON.stringify({version:1, dishes:dishes, updatedAt:Date.now()}));
+  } catch(e){ console.warn('saveDishSpecs failed', e); }
+}
+/* 将均值写入指定餐品的 nutri 字段,返回修改前的 specs(用于日志前后对比) */
+function updateDishSpecNutri(dishName, avgData){
+  var dishes = loadDishSpecs();
+  if(!dishes){
+    console.warn('dish_specs_v1 不存在或为空,本次同步未持久化到总库(请先在餐品总库初始化)');
+    return null;
+  }
+  var target = null;
+  for(var i=0; i<dishes.length; i++){
+    if(dishes[i].name === dishName){ target = dishes[i]; break; }
+  }
+  if(!target){
+    console.warn('在 dish_specs_v1 中未找到餐品 "'+dishName+'",已跳过');
+    return null;
+  }
+  var prev = target.nutri ? JSON.parse(JSON.stringify(target.nutri)) : null;
+  target.nutri = avgData;
+  target.nutriUpdatedAt = formatNow();
+  saveDishSpecs(dishes);
+  return prev;
+}
+
+/* ===== 同步日志 nutri_sync_log_v1 ===== */
+function loadSyncLogs(){
+  try {
+    var raw = localStorage.getItem('nutri_sync_log_v1');
+    if(!raw) return [];
+    var data = JSON.parse(raw);
+    return (data && data.logs) ? data.logs : [];
+  } catch(e){ return []; }
+}
+function appendSyncLogs(logs){
+  if(!logs || !logs.length) return;
+  var all = loadSyncLogs();
+  for(var i=0; i<logs.length; i++){
+    all.unshift(logs[i]);
+  }
+  /* 限制最多保留 100 条,避免无限增长 */
+  if(all.length > 100) all = all.slice(0, 100);
+  try {
+    localStorage.setItem('nutri_sync_log_v1', JSON.stringify({version:1, logs:all, updatedAt:Date.now()}));
+  } catch(e){ console.warn('appendSyncLogs failed', e); }
 }
 function switchSyncTab(idx){
   var tabs = document.querySelectorAll('#syncDialogBody .avg-tab');
diff --git a/web-admin/nutrition/sup-biz-analysis.html b/web-admin/nutrition/sup-biz-analysis.html
index 0bd1363..88ebf23 100644
--- a/web-admin/nutrition/sup-biz-analysis.html
+++ b/web-admin/nutrition/sup-biz-analysis.html
@@ -171,15 +171,15 @@ tr:hover td{background:#FAFAFA;}
     <div class="panel-card__content">
       <table>
         <thead><tr>
-          <th>产品分类</th><th>生产批次</th><th>投料重量(吨)</th><th>产出重量(吨)</th><th>原料成本(元)</th><th>加工成本(元)</th>
+          <th>产品分类</th><th>生产批次</th><th>投料重量(kg)</th><th>产出重量(kg)</th><th>原料成本(元)</th><th>加工成本(元)</th>
           <th>产值(元)</th><th>单位成本(元/kg)</th><th>毛利率(%)</th>
         </tr></thead>
         <tbody>
-          <tr><td>净菜包</td><td>42</td><td>8.6</td><td>7.8</td><td>12,800.00</td><td>4,200.00</td><td>24,600.00</td><td>2.18</td><td>30.9</td></tr>
-          <tr><td>餐品净菜包</td><td>38</td><td>10.2</td><td>9.4</td><td>18,500.00</td><td>5,800.00</td><td>35,200.00</td><td>2.59</td><td>31.0</td></tr>
-          <tr><td>毛菜半成品</td><td>28</td><td>12.5</td><td>11.2</td><td>9,600.00</td><td>6,500.00</td><td>21,500.00</td><td>1.44</td><td>25.1</td></tr>
-          <tr><td>净菜半成品</td><td>35</td><td>9.8</td><td>8.9</td><td>14,200.00</td><td>4,800.00</td><td>27,800.00</td><td>2.13</td><td>31.7</td></tr>
-          <tr><td>定制加工</td><td>43</td><td>7.5</td><td>6.8</td><td>8,900.00</td><td>3,200.00</td><td>17,750.00</td><td>1.78</td><td>32.0</td></tr>
+          <tr><td>净菜包</td><td>42</td><td>8,600</td><td>7,800</td><td>12,800.00</td><td>4,200.00</td><td>24,600.00</td><td>2.18</td><td>30.9</td></tr>
+          <tr><td>餐品净菜包</td><td>38</td><td>10,200</td><td>9,400</td><td>18,500.00</td><td>5,800.00</td><td>35,200.00</td><td>2.59</td><td>31.0</td></tr>
+          <tr><td>毛菜半成品</td><td>28</td><td>12,500</td><td>11,200</td><td>9,600.00</td><td>6,500.00</td><td>21,500.00</td><td>1.44</td><td>25.1</td></tr>
+          <tr><td>净菜半成品</td><td>35</td><td>9,800</td><td>8,900</td><td>14,200.00</td><td>4,800.00</td><td>27,800.00</td><td>2.13</td><td>31.7</td></tr>
+          <tr><td>定制加工</td><td>43</td><td>7,500</td><td>6,800</td><td>8,900.00</td><td>3,200.00</td><td>17,750.00</td><td>1.78</td><td>32.0</td></tr>
         </tbody>
       </table>
     </div>
diff --git a/web-admin/nutrition/sup-clean-external.html b/web-admin/nutrition/sup-clean-external.html
index b42346e..4545025 100644
--- a/web-admin/nutrition/sup-clean-external.html
+++ b/web-admin/nutrition/sup-clean-external.html
@@ -150,6 +150,10 @@ textarea.form-control{height:auto;padding:8px 12px;resize:vertical;min-height:60
 .line-builder-table td input[readonly]{background:#f8fafc;cursor:not-allowed;}
 .line-builder-table .btn-remove{background:none;color:var(--danger);border:none;cursor:pointer;font-size:var(--font-xs);padding:4px 8px;white-space:nowrap;}
 .line-builder-table .btn-remove:hover{color:#ff7875;}
+/* 规格连体组件:左 input 克重 + 右 select 单位/份型 */
+.line-builder-table .spec-input-group{display:flex;align-items:center;gap:0;}
+.line-builder-table .spec-input-group input{flex:1;min-width:50px;border-radius:4px 0 0 4px;}
+.line-builder-table .spec-input-group select{width:90px;min-width:60px;max-width:110px;border-radius:0 4px 4px 0;margin-left:-1px;}
 </style>
 </head>
 <body>
@@ -312,6 +316,60 @@ var cpSpecOptsExt={
   '蒜蓉菠菜':[{label:'标准份（400g）',grams:400},{label:'加量份（600g）',grams:600}],
   '炒胡萝卜':[{label:'标准份（300g）',grams:300},{label:'大份（500g）',grams:500}]
 };
+/* 跨页 specs 共享工具(任务 3.0):从 localStorage 加载餐品总库 specs */
+function loadDishSpecs(){
+  try{
+    var raw=localStorage.getItem('dish_specs_v1');
+    if(!raw)return null;
+    var data=JSON.parse(raw);
+    return (data&&data.dishes)?data.dishes:null;
+  }catch(e){return null;}
+}
+function getSpecsByDish(name){
+  var dishes=loadDishSpecs();
+  if(!dishes)return [];
+  var d=dishes.find(function(x){return x.name===name;});
+  return d?(d.specs||[]):[];
+}
+function getAllDishNames(){
+  var dishes=loadDishSpecs();
+  return dishes?dishes.map(function(d){return d.name;}):[];
+}
+/* 净菜包装单位字典(与 spec_unit 字典一致) */
+var SPEC_UNIT_OPTIONS=['克','袋','箱','份','把','瓶','罐','桶','散装'];
+function buildUnitOptions(selected){
+  var html='';
+  SPEC_UNIT_OPTIONS.forEach(function(u){html+='<option value="'+u+'"'+(u===selected?' selected':'')+'>'+u+'</option>';});
+  return html;
+}
+/* 外售默认单位:箱 */
+var EXT_FALLBACK_DISHES={
+  '宫保鸡丁':[{portion:'标准份',baseGram:500,unit:'箱'},{portion:'加量份',baseGram:750,unit:'箱'}],
+  '清蒸鱼':[{portion:'标准份',baseGram:600,unit:'箱'},{portion:'大份',baseGram:900,unit:'箱'}],
+  '蒜蓉菠菜':[{portion:'标准份',baseGram:400,unit:'箱'},{portion:'加量份',baseGram:600,unit:'箱'}],
+  '炒胡萝卜':[{portion:'标准份',baseGram:300,unit:'箱'},{portion:'大份',baseGram:500,unit:'箱'}]
+};
+function getSpecsByDishWithFallback(name){
+  var specs=getSpecsByDish(name);
+  if(specs&&specs.length>0)return specs;
+  return EXT_FALLBACK_DISHES[name]||[{portion:'标准份',baseGram:500,unit:'箱'}];
+}
+function getDishNamesWithFallback(){
+  var names=getAllDishNames();
+  if(names&&names.length>0)return names;
+  return Object.keys(EXT_FALLBACK_DISHES);
+}
+function formatSpecLabelExt(line){
+  var gram=line.baseGram||0;
+  var curNcType=newExtOrderType||'nc';
+  var unit=line.unit||(curNcType==='nc'?'箱':'份');
+  var portion=line.portion||'';
+  if(curNcType==='nc'){
+    return gram>0?(gram+'g/'+unit):'—';
+  }
+  if(gram<=0)return '—';
+  return gram+'g/'+(portion||unit);
+}
 var dishIngsExt={
   '宫保鸡丁':[{trace:'NC-PROC-JXR-20260415-01',name:'鸡胸肉',cleanType:'鸡胸丁',type:'主材',amount:'120g'},{trace:'NC-PROC-HUS-20260415-01',name:'花生',cleanType:'花生仁',type:'辅材',amount:'20g'},{trace:'NC-PROC-GLJ-20260415-01',name:'干辣椒',cleanType:'辣椒段',type:'调料',amount:'5g'}],
   '清蒸鱼':[{trace:'NC-PROC-CYU-20260415-01',name:'草鱼',cleanType:'鱼片',type:'主材',amount:'100g'},{trace:'NC-PROC-JPN-20260415-01',name:'姜片',cleanType:'姜片',type:'调料',amount:'适量'}],
@@ -437,15 +495,38 @@ var newExtOrderType='nc';
 function updExtOrderType(v){newExtOrderType=v;renderExtLineBuilders();}
 var newExtLines=[];var extLineCnt=0;
 function resetExtForm(){newExtLines=[];extLineCnt=0;newExtOrderType=document.getElementById('extOrderNcType').value;document.getElementById('extCustomer').value='';document.getElementById('extContact').value='';document.getElementById('extPhone').value='';document.getElementById('extDeliverTime').value='';document.getElementById('extAddress').value='';document.getElementById('extRemark').value='';document.getElementById('extLinesContainer').innerHTML='';document.getElementById('extSummary').style.display='none';addExtLine();}
-function addExtLine(){extLineCnt++;newExtLines.push({id:'el'+extLineCnt,ingredient:'',ncType:'',dish:'',specGram:0,specLabel:'',qty:0,weight:0});renderExtLineBuilders();}
+function addExtLine(){extLineCnt++;newExtLines.push({id:'el'+extLineCnt,ingredient:'',ncType:'',dish:'',portion:'标准份',baseGram:0,unit:newExtOrderType==='nc'?'箱':'份',qty:0,weight:0});renderExtLineBuilders();}
 function removeExtLine(lid){if(newExtLines.length<=1){alert('至少保留一条');return;}newExtLines=newExtLines.filter(function(l){return l.id!==lid;});renderExtLineBuilders();}
 
 function updELIngredient(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.ingredient=v;l.ncType='';renderExtLineBuilders();}
 function updELNcType(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.ncType=v;calcELW(l);refreshESummary();}
-function updELDish(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.dish=v;l.specGram=0;l.specLabel='';calcELW(l);refreshESummary();}
-function updELSpec(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;if(newExtOrderType==='nc'){l.specGram=parseInt(v||'0',10);l.specLabel=v?(v+'g/袋'):'';}else{l.specGram=parseInt(v||'0',10);var ops=cpSpecOptsExt[l.dish]||[];var f=ops.find(function(o){return o.grams===l.specGram;});l.specLabel=f?f.label:'';}calcELW(l);refreshESummary();}
+function updELDish(lid,v){
+  var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;
+  l.dish=v;
+  var specs=getSpecsByDishWithFallback(v);
+  if(specs.length>0){
+    l.portion=specs[0].portion||'标准份';
+    l.baseGram=specs[0].baseGram||0;
+    l.unit=specs[0].unit||'箱';
+  }else{
+    l.portion='标准份';l.baseGram=0;l.unit='箱';
+  }
+  calcELW(l);refreshESummary();
+}
+/* 规格连体组件:左 input 克重 + 右 select 单位(nc) / 份型(cp) */
+function updELBaseGram(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.baseGram=parseInt(v||'0',10);calcELW(l);refreshESummary();}
+function updELPortion(lid,v){
+  var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;
+  l.portion=v;
+  var specs=getSpecsByDishWithFallback(l.dish);
+  var f=specs.find(function(s){return s.portion===v;});
+  if(f&&f.baseGram){l.baseGram=f.baseGram;if(f.unit)l.unit=f.unit;}
+  calcELW(l);refreshESummary();
+}
+function updELUnit(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.unit=v;refreshESummary();}
+function updELNcBaseGram(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.baseGram=parseInt(v||'0',10);l.unit='箱';calcELW(l);refreshESummary();}
 function updELQty(lid,v){var l=newExtLines.find(function(x){return x.id===lid;});if(!l)return;l.qty=parseInt(v.replace(/[^\d]/g,'')||'0',10);calcELW(l);refreshESummary();}
-function calcELW(l){if(l.specGram>0&&l.qty>0)l.weight=parseFloat((l.specGram*l.qty/1000).toFixed(2));else l.weight=0;}
+function calcELW(l){if(l.baseGram>0&&l.qty>0)l.weight=parseFloat((l.baseGram*l.qty/1000).toFixed(2));else l.weight=0;}
 
 function renderExtLineBuilders(){
   var h='';
@@ -457,6 +538,7 @@ function renderExtLineBuilders(){
     h+='<th>餐品名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th><th>操作</th>';
   }
   h+='</tr></thead><tbody>';
+  var dishNames=getDishNamesWithFallback();
   newExtLines.forEach(function(l){
     h+='<tr>';
     if(isNc){
@@ -467,15 +549,24 @@ function renderExtLineBuilders(){
       h+='<td><select onchange="updELNcType(\''+l.id+'\',this.value)" '+(nts.length===0?'disabled':'')+'><option value="">'+(nts.length===0?'请先选食材':'请选择')+'</option>';
       nts.forEach(function(t){h+='<option value="'+t+'" '+(l.ncType===t?'selected':'')+'>'+t+'</option>';});
       h+='</select></td>';
-      h+='<td><input inputmode="numeric" placeholder="克数" value="'+(l.specGram||'')+'" oninput="this.value=this.value.replace(/[^\d]/g,\x27\x27);updELSpec(\x27'+l.id+'\x27,this.value)"></td>';
+      /* nc:左克重 + 右单位(默认箱) */
+      h+='<td><div class="spec-input-group">'
+        +'<input inputmode="numeric" placeholder="克数" value="'+(l.baseGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updELNcBaseGram(\''+l.id+'\',this.value)">'
+        +'<select onchange="updELUnit(\''+l.id+'\',this.value)">'+buildUnitOptions(l.unit||'箱')+'</select>'
+        +'</div></td>';
     }else{
       h+='<td><select onchange="updELDish(\''+l.id+'\',this.value)"><option value="">请选择</option>';
-      Object.keys(cpSpecOptsExt).forEach(function(k){h+='<option value="'+k+'" '+(l.dish===k?'selected':'')+'>'+k+'</option>';});
-      h+='</select></td>';
-      var cps=cpSpecOptsExt[l.dish]||[];
-      h+='<td><select onchange="updELSpec(\''+l.id+'\',this.value)" '+(cps.length===0?'disabled':'')+'><option value="">'+(cps.length===0?'请先选餐品':'请选择')+'</option>';
-      cps.forEach(function(s){h+='<option value="'+s.grams+'" '+(l.specGram===s.grams?'selected':'')+'>'+s.label+'</option>';});
+      dishNames.forEach(function(k){h+='<option value="'+k+'" '+(l.dish===k?'selected':'')+'>'+k+'</option>';});
       h+='</select></td>';
+      var cpSpecs=getSpecsByDishWithFallback(l.dish);
+      var portionOptions=['标准份','小份','大份','迷你份','加大份'];
+      cpSpecs.forEach(function(s){if(s.portion&&portionOptions.indexOf(s.portion)===-1)portionOptions.push(s.portion);});
+      /* cp:左克重 + 右份型 */
+      h+='<td><div class="spec-input-group">'
+        +'<input inputmode="numeric" placeholder="克数" value="'+(l.baseGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updELBaseGram(\''+l.id+'\',this.value)">'
+        +'<select onchange="updELPortion(\''+l.id+'\',this.value)" style="width:90px;">';
+      portionOptions.forEach(function(p){h+='<option value="'+p+'" '+(l.portion===p?'selected':'')+'>'+p+'</option>';});
+      h+='</select></div></td>';
     }
     h+='<td><input inputmode="numeric" placeholder="份数" value="'+(l.qty||'')+'" oninput="this.value=this.value.replace(/[^\d]/g,\x27\x27);updELQty(\x27'+l.id+'\x27,this.value)"></td>';
     h+='<td><input value="'+(l.weight||'')+'" readonly></td>';
@@ -495,10 +586,10 @@ function refreshESummary(){
   sd.style.display='block';var h='';
   if(newExtOrderType==='nc'){
     sh.innerHTML='<tr><th>净菜类型</th><th>食材</th><th>净菜名称</th><th>包装规格</th><th>份数</th><th>计量(kg)</th></tr>';
-    vl.forEach(function(l){h+='<tr><td>净菜包</td><td>'+(l.ingredient||'')+'</td><td>'+(l.ncType||'')+'</td><td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';});
+    vl.forEach(function(l){h+='<tr><td>净菜包</td><td>'+(l.ingredient||'')+'</td><td>'+(l.ncType||'')+'</td><td>'+formatSpecLabelExt(l)+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';});
   }else{
     sh.innerHTML='<tr><th>净菜类型</th><th>菜品/食材</th><th>包装规格</th><th>份数</th><th>计量(kg)</th></tr>';
-    vl.forEach(function(l){h+='<tr><td>餐品净菜包</td><td>'+(l.dish||'')+'</td><td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';});
+    vl.forEach(function(l){h+='<tr><td>餐品净菜包</td><td>'+(l.dish||'')+'</td><td>'+formatSpecLabelExt(l)+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';});
   }
   tb.innerHTML=h;
 }
@@ -506,14 +597,15 @@ function refreshESummary(){
 function submitExtOrder(){
   var cust=document.getElementById('extCustomer').value.trim();if(!cust){alert('请输入客户名称');return;}
   var dt=document.getElementById('extDeliverTime').value;if(!dt){alert('请选择预定配送时间');return;}
-  var vl=newExtLines.filter(function(l){if(newExtOrderType==='nc')return l.ingredient&&l.ncType&&l.specGram>0&&l.qty>0;return l.dish&&l.specGram>0&&l.qty>0;});
+  var vl=newExtLines.filter(function(l){if(newExtOrderType==='nc')return l.ingredient&&l.ncType&&l.baseGram>0&&l.qty>0;return l.dish&&l.baseGram>0&&l.qty>0;});
   if(vl.length===0){alert('请至少完善一条菜品明细');return;}
   var no='EXT-'+String(extOrders.length+1).padStart(3,'0');
   var newLines=vl.map(function(l,i){
+    var specLbl=formatSpecLabelExt(l);
     if(newExtOrderType==='nc'){
-      return {id:'L'+(Date.now()+i),ingredient:l.ingredient,ncName:l.ncType,spec:l.specLabel,qty:l.qty,weight:l.weight,status:'备货中'};
+      return {id:'L'+(Date.now()+i),ingredient:l.ingredient,ncName:l.ncType,spec:specLbl,portion:l.portion,baseGram:l.baseGram,unit:l.unit,qty:l.qty,weight:l.weight,status:'备货中'};
     }
-    return {id:'L'+(Date.now()+i),foodName:l.dish,spec:l.specLabel,qty:l.qty,weight:l.weight,status:'备货中'};
+    return {id:'L'+(Date.now()+i),foodName:l.dish,spec:specLbl,portion:l.portion,baseGram:l.baseGram,unit:l.unit,qty:l.qty,weight:l.weight,status:'备货中'};
   });
   extOrders.unshift({orderNo:no,customer:cust,orderTime:new Date().toISOString().slice(0,16).replace('T',' '),deliverTime:dt,logistics:'—',
     ncType:newExtOrderType,lines:newLines});
diff --git a/web-admin/nutrition/sup-clean-internal.html b/web-admin/nutrition/sup-clean-internal.html
index bbce8f6..ccac7fe 100644
--- a/web-admin/nutrition/sup-clean-internal.html
+++ b/web-admin/nutrition/sup-clean-internal.html
@@ -150,6 +150,10 @@ tr.detail-row td.td-actions{background:#FAFBFC;box-shadow:-4px 0 8px rgba(0,0,0,
 .inline-line-table select:focus,.inline-line-table input:focus{border-color:var(--primary);}
 .inline-line-table input[readonly]{background:#f8fafc;cursor:not-allowed;}
 .inline-line-table .td-actions{text-align:center;width:60px;white-space:nowrap;}
+/* 规格连体组件:左 input 克重 + 右 select 单位/份型 */
+.inline-line-table .spec-input-group{display:flex;align-items:center;gap:0;}
+.inline-line-table .spec-input-group input{flex:1;min-width:50px;border-radius:4px 0 0 4px;}
+.inline-line-table .spec-input-group select{width:90px;min-width:60px;max-width:110px;border-radius:0 4px 4px 0;margin-left:-1px;}
 </style>
 </head>
 <body>
@@ -334,6 +338,61 @@ var cpSpecOptions={
   '蒜蓉菠菜':[{label:'标准份（400g）',grams:400},{label:'加量份（600g）',grams:600}],
   '炒胡萝卜':[{label:'标准份（300g）',grams:300},{label:'大份（500g）',grams:500}]
 };
+/* 跨页 specs 共享工具(任务 3.0):从 localStorage 加载餐品总库 specs */
+function loadDishSpecs(){
+  try{
+    var raw=localStorage.getItem('dish_specs_v1');
+    if(!raw)return null;
+    var data=JSON.parse(raw);
+    return (data&&data.dishes)?data.dishes:null;
+  }catch(e){return null;}
+}
+function getSpecsByDish(name){
+  var dishes=loadDishSpecs();
+  if(!dishes)return [];
+  var d=dishes.find(function(x){return x.name===name;});
+  return d?(d.specs||[]):[];
+}
+function getAllDishNames(){
+  var dishes=loadDishSpecs();
+  return dishes?dishes.map(function(d){return d.name;}):[];
+}
+var SPEC_UNIT_OPTIONS=['克','袋','箱','份','把','瓶','罐','桶','散装'];
+function buildUnitOptions(selected){
+  var html='';
+  SPEC_UNIT_OPTIONS.forEach(function(u){html+='<option value="'+u+'"'+(u===selected?' selected':'')+'>'+u+'</option>';});
+  return html;
+}
+/* 内供默认单位:盘 */
+var INT_FALLBACK_DISHES={
+  '宫保鸡丁':[{portion:'标准份',baseGram:500,unit:'盘'},{portion:'加量份',baseGram:750,unit:'盘'}],
+  '清蒸鱼':[{portion:'标准份',baseGram:600,unit:'盘'},{portion:'大份',baseGram:900,unit:'盘'}],
+  '蒜蓉菠菜':[{portion:'标准份',baseGram:400,unit:'盘'},{portion:'加量份',baseGram:600,unit:'盘'}],
+  '炒胡萝卜':[{portion:'标准份',baseGram:300,unit:'盘'},{portion:'大份',baseGram:500,unit:'盘'}]
+};
+function getSpecsByDishWithFallback(name){
+  var specs=getSpecsByDish(name);
+  if(specs&&specs.length>0)return specs;
+  return INT_FALLBACK_DISHES[name]||[{portion:'标准份',baseGram:500,unit:'盘'}];
+}
+function getDishNamesWithFallback(){
+  var names=getAllDishNames();
+  if(names&&names.length>0)return names;
+  return Object.keys(INT_FALLBACK_DISHES);
+}
+function formatSpecLabelInt(line){
+  var gram=line.baseGram||0;
+  /* 当前订单的净菜类型从 DOM 读取 */
+  var sel=document.getElementById('claimNcType');
+  var curNcType=sel?sel.value:'nc';
+  var unit=line.unit||(curNcType==='nc'?'盘':'份');
+  var portion=line.portion||'';
+  if(curNcType==='nc'){
+    return gram>0?(gram+'g/'+unit):'—';
+  }
+  if(gram<=0)return '—';
+  return gram+'g/'+(portion||unit);
+}
 var dishIngredients={
   '宫保鸡丁':[{trace:'NC-PROC-JXR-20260415-01',name:'鸡胸肉',cleanType:'鸡胸丁',type:'主材',amount:'120g'},{trace:'NC-PROC-HUS-20260415-01',name:'花生',cleanType:'花生仁',type:'辅材',amount:'20g'},{trace:'NC-PROC-GLJ-20260415-01',name:'干辣椒',cleanType:'辣椒段',type:'调料',amount:'5g'}],
   '清蒸鱼':[{trace:'NC-PROC-CYU-20260415-01',name:'草鱼',cleanType:'鱼片',type:'主材',amount:'100g'},{trace:'NC-PROC-JPN-20260415-01',name:'姜片',cleanType:'姜片',type:'调料',amount:'适量'}],
@@ -506,7 +565,8 @@ function resetClaimForm(){
 
 function addClaimLine(){
   claimLineIdCnt++;
-  newClaimLines.push({id:'cl'+claimLineIdCnt,ingredient:'',ncType:'',dish:'',specGram:0,specLabel:'',qty:0,weight:0});
+  var orderNcType=document.getElementById('claimNcType').value||'nc';
+  newClaimLines.push({id:'cl'+claimLineIdCnt,ingredient:'',ncType:'',dish:'',portion:'标准份',baseGram:0,unit:orderNcType==='nc'?'盘':'份',qty:0,weight:0});
   renderClaimLineBuilders();
 }
 
@@ -518,16 +578,33 @@ function removeClaimLine(lid){
 
 function updateCLIngredient(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.ingredient=val;l.ncType='';renderClaimLineBuilders();}
 function updateCLNcType(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.ncType=val;calcCLWeight(l);refreshCLSummary();}
-function updateCLDish(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.dish=val;l.specGram=0;l.specLabel='';calcCLWeight(l);refreshCLSummary();}
-function updateCLSpec(lid,val){
+function updateCLDish(lid,val){
   var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;
-  var orderNcType=document.getElementById('claimNcType').value;
-  if(orderNcType==='nc'){l.specGram=parseInt(val||'0',10);l.specLabel=val?(val+'g/袋'):'';}
-  else{l.specGram=parseInt(val||'0',10);var opts=cpSpecOptions[l.dish]||[];var f=opts.find(function(o){return o.grams===l.specGram;});l.specLabel=f?f.label:'';}
+  l.dish=val;
+  var specs=getSpecsByDishWithFallback(val);
+  if(specs.length>0){
+    l.portion=specs[0].portion||'标准份';
+    l.baseGram=specs[0].baseGram||0;
+    l.unit=specs[0].unit||'盘';
+  }else{
+    l.portion='标准份';l.baseGram=0;l.unit='盘';
+  }
   calcCLWeight(l);refreshCLSummary();
 }
+/* 规格连体组件:左 input 克重 + 右 select 单位(nc) / 份型(cp) */
+function updateCLBaseGram(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.baseGram=parseInt(val||'0',10);calcCLWeight(l);refreshCLSummary();}
+function updateCLPortion(lid,val){
+  var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;
+  l.portion=val;
+  var specs=getSpecsByDishWithFallback(l.dish);
+  var f=specs.find(function(s){return s.portion===val;});
+  if(f&&f.baseGram){l.baseGram=f.baseGram;if(f.unit)l.unit=f.unit;}
+  calcCLWeight(l);refreshCLSummary();
+}
+function updateCLUnit(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.unit=val;refreshCLSummary();}
+function updateCLNcBaseGram(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.baseGram=parseInt(val||'0',10);l.unit='盘';calcCLWeight(l);refreshCLSummary();}
 function updateCLQty(lid,val){var l=newClaimLines.find(function(x){return x.id===lid;});if(!l)return;l.qty=parseInt(val.replace(/[^\d]/g,'')||'0',10);calcCLWeight(l);refreshCLSummary();}
-function calcCLWeight(l){if(l.specGram>0&&l.qty>0)l.weight=parseFloat((l.specGram*l.qty/1000).toFixed(2));else l.weight=0;}
+function calcCLWeight(l){if(l.baseGram>0&&l.qty>0)l.weight=parseFloat((l.baseGram*l.qty/1000).toFixed(2));else l.weight=0;}
 
 function renderClaimLineBuilders(){
   var html='';
@@ -540,6 +617,7 @@ function renderClaimLineBuilders(){
     html+='<th>餐品名称</th><th>包装规格</th><th>份数</th><th>数量(kg)</th><th>操作</th>';
   }
   html+='</tr></thead><tbody>';
+  var dishNames=getDishNamesWithFallback();
   newClaimLines.forEach(function(line){
     html+='<tr>';
     if(isNc){
@@ -552,18 +630,25 @@ function renderClaimLineBuilders(){
       html+='<td><select onchange="updateCLNcType(\''+line.id+'\',this.value)" '+(nts.length===0?'disabled':'')+'><option value="">'+(nts.length===0?'请先选食材':'请选择')+'</option>';
       nts.forEach(function(t){html+='<option value="'+t+'" '+(line.ncType===t?'selected':'')+'>'+t+'</option>';});
       html+='</select></td>';
-      /* 包装规格 */
-      html+='<td><input inputmode="numeric" placeholder="克数" value="'+(line.specGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateCLSpec(\''+line.id+'\',this.value)"></td>';
+      /* nc:左克重 + 右单位(默认盘) */
+      html+='<td><div class="spec-input-group">'
+        +'<input inputmode="numeric" placeholder="克数" value="'+(line.baseGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateCLNcBaseGram(\''+line.id+'\',this.value)">'
+        +'<select onchange="updateCLUnit(\''+line.id+'\',this.value)">'+buildUnitOptions(line.unit||'盘')+'</select>'
+        +'</div></td>';
     }else{
       /* 餐品名称下拉 */
       html+='<td><select onchange="updateCLDish(\''+line.id+'\',this.value)"><option value="">请选择</option>';
-      Object.keys(cpSpecOptions).forEach(function(k){html+='<option value="'+k+'" '+(line.dish===k?'selected':'')+'>'+k+'</option>';});
-      html+='</select></td>';
-      /* 包装规格 */
-      var cps=cpSpecOptions[line.dish]||[];
-      html+='<td><select onchange="updateCLSpec(\''+line.id+'\',this.value)" '+(cps.length===0?'disabled':'')+'><option value="">'+(cps.length===0?'请先选餐品':'请选择')+'</option>';
-      cps.forEach(function(s){html+='<option value="'+s.grams+'" '+(line.specGram===s.grams?'selected':'')+'>'+s.label+'</option>';});
+      dishNames.forEach(function(k){html+='<option value="'+k+'" '+(line.dish===k?'selected':'')+'>'+k+'</option>';});
       html+='</select></td>';
+      /* cp:左克重 + 右份型 */
+      var cpSpecs=getSpecsByDishWithFallback(line.dish);
+      var portionOptions=['标准份','小份','大份','迷你份','加大份'];
+      cpSpecs.forEach(function(s){if(s.portion&&portionOptions.indexOf(s.portion)===-1)portionOptions.push(s.portion);});
+      html+='<td><div class="spec-input-group">'
+        +'<input inputmode="numeric" placeholder="克数" value="'+(line.baseGram||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateCLBaseGram(\''+line.id+'\',this.value)">'
+        +'<select onchange="updateCLPortion(\''+line.id+'\',this.value)" style="width:90px;">';
+      portionOptions.forEach(function(p){html+='<option value="'+p+'" '+(line.portion===p?'selected':'')+'>'+p+'</option>';});
+      html+='</select></div></td>';
     }
     /* 份数和数量（nc/cp 共用） */
     html+='<td><input inputmode="numeric" placeholder="份数" value="'+(line.qty||'')+'" oninput="this.value=this.value.replace(/[^\\d]/g,\'\');updateCLQty(\''+line.id+'\',this.value)"></td>';
@@ -600,7 +685,7 @@ function refreshCLSummary(){
     }else{
       h+='<tr><td colspan="2">'+l.dish+'</td>';
     }
-    h+='<td>'+l.specLabel+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
+    h+='<td>'+formatSpecLabelInt(l)+'</td><td>'+l.qty+'</td><td>'+l.weight+'</td></tr>';
   });
   tb.innerHTML=h;
 }
@@ -611,18 +696,19 @@ function submitClaim(){
   var orderNcType=document.getElementById('claimNcType').value;
   var vl;
   if(orderNcType==='nc'){
-    vl=newClaimLines.filter(function(l){return l.ingredient&&l.ncType&&l.specGram>0&&l.qty>0;});
+    vl=newClaimLines.filter(function(l){return l.ingredient&&l.ncType&&l.baseGram>0&&l.qty>0;});
   }else{
-    vl=newClaimLines.filter(function(l){return l.dish&&l.specGram>0&&l.qty>0;});
+    vl=newClaimLines.filter(function(l){return l.dish&&l.baseGram>0&&l.qty>0;});
   }
   if(vl.length===0){alert('请至少完善一条菜品明细');return;}
   var no='INT-'+String(claims.length+1).padStart(3,'0');
   claims.unshift({claimNo:no,canteen:canteen,ncType:orderNcType,claimTime:new Date().toISOString().slice(0,16).replace('T',' '),deliverTime:document.getElementById('claimDeliveryTime').value||'—',deliverPerson:document.getElementById('claimDeliverPerson').value||'—',
     lines:vl.map(function(l,i){
+      var specLbl=formatSpecLabelInt(l);
       if(orderNcType==='nc'){
-        return {id:'L'+(Date.now()+i), ingredient:l.ingredient, ncName:l.ncType, spec:l.specLabel, qty:l.qty, weight:l.weight, status:'备货中'};
+        return {id:'L'+(Date.now()+i), ingredient:l.ingredient, ncName:l.ncType, spec:specLbl, portion:l.portion, baseGram:l.baseGram, unit:l.unit, qty:l.qty, weight:l.weight, status:'备货中'};
       }else{
-        return {id:'L'+(Date.now()+i), foodName:l.dish, spec:l.specLabel, qty:l.qty, weight:l.weight, status:'备货中'};
+        return {id:'L'+(Date.now()+i), foodName:l.dish, spec:specLbl, portion:l.portion, baseGram:l.baseGram, unit:l.unit, qty:l.qty, weight:l.weight, status:'备货中'};
       }
     })});
   closeModal('modal-claim');renderClaimTable();
diff --git a/web-admin/nutrition/sup-in-clean.html b/web-admin/nutrition/sup-in-clean.html
index 9e929eb..2c273f9 100644
--- a/web-admin/nutrition/sup-in-clean.html
+++ b/web-admin/nutrition/sup-in-clean.html
@@ -346,8 +346,8 @@ function openModal(){document.getElementById('modalOverlay').style.display='flex
 function closeModal(){document.getElementById('modalOverlay').style.display='none';}
 document.getElementById('modalOverlay').addEventListener('click',function(e){if(e.target===this)closeModal();});
 
-/* 食材 → 净菜类型联动映射 */
-var FOOD_VEG_MAP={
+/* 食材 → 净菜类型映射(与食材档案 vegTypes 字段对齐,仅维护名称,切配规格在食材档案中维护) */
+var FOOD_VEG_TYPES={
   '土豆':['土豆丝','土豆片','土豆泥','土豆块'],
   '四季豆':['段（5cm）','整根'],
   '白菜':['整棵','切段','切丝'],
@@ -361,9 +361,11 @@ function onFoodChange(){
     vegSelect.disabled=true;
     return;
   }
-  var types=FOOD_VEG_MAP[food]||[];
+  var types=FOOD_VEG_TYPES[food]||[];
   var html='<option value="">请选择净菜类型</option>';
-  types.forEach(function(t){html+='<option>'+t+'</option>';});
+  types.forEach(function(name){
+    html+='<option>'+name+'</option>';
+  });
   vegSelect.innerHTML=html;
   vegSelect.disabled=false;
 }
@@ -372,7 +374,7 @@ var _stockRowData=null;
 function confirmGenStock(el){
   var tr=el.closest('tr');
   var tds=tr.querySelectorAll('td');
-  /* 列序：0加工批次号 1溯源码 2食材名称 3净菜类型 4加工步骤 5净菜需求量 6毛菜重量 7净菜产出量 */
+  /* 列序:0加工批次号 1溯源码 2食材名称 3净菜类型 4加工步骤 5净菜需求量 6毛菜重量 7净菜产出量 */
   _stockRowData={
     batch:tds[0].textContent,
     trace:tds[1].textContent,
diff --git a/web-admin/nutrition/sup-in-cleanin.html b/web-admin/nutrition/sup-in-cleanin.html
index 7f4e3d6..0f70ccb 100644
--- a/web-admin/nutrition/sup-in-cleanin.html
+++ b/web-admin/nutrition/sup-in-cleanin.html
@@ -105,6 +105,10 @@ tbody tr:hover{background:#F8FBFF;}
 .form-item input,.form-item select,.form-item textarea{height:36px;padding:0 12px;border:1px solid #e8e8e8;border-radius:4px;font-size:13px;outline:none;}
 .form-item input:focus,.form-item select:focus,.form-item textarea:focus{border-color:#1890FF;}
 .form-item textarea{height:80px;padding:8px 12px;resize:vertical;}
+/* 规格输入组:克重 input + 单位 select 连在一起 */
+.spec-input-group{display:flex;align-items:stretch;height:36px;}
+.spec-input-group input{flex:1;border-radius:4px 0 0 4px;border-right:none;}
+.spec-input-group select{width:96px;border-radius:0 4px 4px 0;}
 .action-bar{display:flex;align-items:center;gap:8px;margin-bottom:16px;}
 /* 操作列 */
 tbody td.td-actions{white-space:nowrap;}
@@ -219,19 +223,19 @@ tbody td.td-actions{white-space:nowrap;}
         </tr></thead>
         <tbody>
           <tr>
-            <td>NC-IN-001</td><td><span class="tag tag-blue">设备自动</span></td><td><div>净菜入库秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">NC-IN-SCALE-001</div></td><td>NC-PROC-BOCA-20260415-01</td><td>土豆</td><td>土豆丝</td><td>袋装/500g</td><td>86</td><td>43.0</td><td>31.0</td><td>2026-04-15 09:15</td><td>2026-04-17 09:15</td><td><span class="tag tag-blue">净菜柜</span></td><td>8号柜-A01格口</td><td>4.1</td><td>李入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-001')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>NC-IN-001</td><td><span class="tag tag-blue">设备自动</span></td><td><div>净菜入库秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">NC-IN-SCALE-001</div></td><td>NC-PROC-BOCA-20260415-01</td><td>土豆</td><td>土豆丝</td><td>500g/袋</td><td>86</td><td>43.0</td><td>31.0</td><td>2026-04-15 09:15</td><td>2026-04-17 09:15</td><td><span class="tag tag-blue">净菜柜</span></td><td>8号柜-A01格口</td><td>4.1</td><td>李入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-001')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>NC-IN-002</td><td><span class="tag tag-blue">设备自动</span></td><td><div>净菜入库秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">NC-IN-SCALE-002</div></td><td>NC-PROC-HLUB-20260415-01</td><td>土豆</td><td>土豆片</td><td>袋装/500g</td><td>120</td><td>60.0</td><td>47.5</td><td>2026-04-15 09:45</td><td>2026-04-18 09:45</td><td><span class="tag tag-blue">净菜柜</span></td><td>8号柜-B03格口</td><td>4.2</td><td>王入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-002')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>NC-IN-002</td><td><span class="tag tag-blue">设备自动</span></td><td><div>净菜入库秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">NC-IN-SCALE-002</div></td><td>NC-PROC-HLUB-20260415-01</td><td>土豆</td><td>土豆片</td><td>500g/袋</td><td>120</td><td>60.0</td><td>47.5</td><td>2026-04-15 09:45</td><td>2026-04-18 09:45</td><td><span class="tag tag-blue">净菜柜</span></td><td>8号柜-B03格口</td><td>4.2</td><td>王入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-002')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>NC-IN-003</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>NC-PROC-XGUO-20260415-01</td><td>土豆</td><td>土豆泥</td><td>盒装/300g</td><td>48</td><td>14.4</td><td>9.0</td><td>2026-04-15 11:00</td><td>2026-04-17 11:00</td><td><span class="tag tag-gray">仓库</span></td><td>A仓-蔬菜区-03</td><td>4.0</td><td>李入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-003')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>NC-IN-003</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>NC-PROC-XGUO-20260415-01</td><td>土豆</td><td>土豆泥</td><td>300g/袋</td><td>48</td><td>14.4</td><td>9.0</td><td>2026-04-15 11:00</td><td>2026-04-17 11:00</td><td><span class="tag tag-gray">仓库</span></td><td>A仓-蔬菜区-03</td><td>4.0</td><td>李入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-003')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>NC-IN-004</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>NC-PROC-BCAI-20260415-01</td><td>白菜</td><td>整棵</td><td>散装/整棵</td><td>70</td><td>35.0</td><td>22.5</td><td>2026-04-15 11:30</td><td>2026-04-18 11:30</td><td><span class="tag tag-gray">仓库</span></td><td>A仓-蔬菜区-04</td><td>3.8</td><td>张入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-004')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>NC-IN-004</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td>NC-PROC-BCAI-20260415-01</td><td>白菜</td><td>整棵</td><td>散装</td><td>70</td><td>35.0</td><td>22.5</td><td>2026-04-15 11:30</td><td>2026-04-18 11:30</td><td><span class="tag tag-gray">仓库</span></td><td>A仓-蔬菜区-04</td><td>3.8</td><td>张入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-004')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
           <tr>
-            <td>NC-IN-005</td><td><span class="tag tag-blue">设备自动</span></td><td><div>净菜入库秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">NC-IN-SCALE-003</div></td><td>NC-PROC-ZLRJ-20260415-01</td><td>猪里脊</td><td>丁（1.5cm）</td><td>袋装/400g</td><td>76</td><td>30.4</td><td>18.8</td><td>2026-04-15 12:00</td><td>2026-04-16 12:00</td><td><span class="tag tag-gray">仓库</span></td><td>B仓-肉类区-01</td><td>-2.0</td><td>王入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-005')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
+            <td>NC-IN-005</td><td><span class="tag tag-blue">设备自动</span></td><td><div>净菜入库秤</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">NC-IN-SCALE-003</div></td><td>NC-PROC-ZLRJ-20260415-01</td><td>猪里脊</td><td>丁（1.5cm）</td><td>400g/袋</td><td>76</td><td>30.4</td><td>18.8</td><td>2026-04-15 12:00</td><td>2026-04-16 12:00</td><td><span class="tag tag-gray">仓库</span></td><td>B仓-肉类区-01</td><td>-2.0</td><td>王入库</td><td class="td-actions"><span class="link" onclick="openVideoModal()">查看视频</span> <span class="link" onclick="openOutModal('NC-IN-005')">出库明细</span> <span class="action-more"><span class="more-btn">更多 ▾</span><div class="dropdown"><a href="javascript:;" onclick="showDetail(this)">详情</a><a href="javascript:;" onclick="openModal()">编辑</a><a href="javascript:;" class="danger" onclick="if(confirm('确认删除该记录？')){}">删除</a></div></span></td>
           </tr>
         </tbody>
       </table>
@@ -259,7 +263,12 @@ tbody td.td-actions{white-space:nowrap;}
         <div class="form-item" id="fi-batch" style="display:none;"><label>关联加工批次</label><input id="f-batch" type="text" readonly style="background:#f5f5f5;"></div>
         <div class="form-item"><label>食材名称<span class="required">*</span></label><select id="f-food" onchange="updateCleanTypeOptions()"><option>请选择</option></select></div>
         <div class="form-item"><label>净菜类型<span class="required">*</span></label><select id="f-cleanType" disabled><option>请先选择食材</option></select></div>
-        <div class="form-item"><label>入库规格<span class="required">*</span></label><select><option>请选择</option><option>袋装/500g</option><option>袋装/400g</option><option>盒装/300g</option><option>散装/整棵</option><option>其他</option></select></div>
+        <div class="form-item"><label>入库规格<span class="required">*</span></label>
+          <div class="spec-input-group">
+            <input id="f-spec-gram" type="number" min="0" step="0.01" placeholder="请输入克重">
+            <select id="f-spec-unit"></select>
+          </div>
+        </div>
         <div class="form-item"><label>入库数量<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" step="0.1" placeholder="请输入入库重量"></div>
         <div class="form-item"><label>操作时间<span class="required">*</span></label><input type="datetime-local"></div>
@@ -309,38 +318,55 @@ var cleanAreaModalOptions={
   '净菜柜':['8号柜-A01格口','8号柜-B03格口','9号柜-A02格口','10号柜-C01格口'],
   '仓库':['A仓-蔬菜区-01','A仓-蔬菜区-02','A仓-蔬菜区-03','A仓-蔬菜区-04','B仓-肉类区-01','B仓-肉类区-02','B仓-肉类区-03','C仓-水产区-01','C仓-水产区-02']
 };
-var cleanFoodTypeOptions={
-  '土豆':['土豆丝','土豆块','土豆泥'],
-  '白菜':['整颗','白菜片','白菜段'],
-  '猪里脊':['丁（1.5cm）','丝（0.8cm）','片（2mm）'],
-  '胡萝卜':['胡萝卜丝','胡萝卜块','胡萝卜片'],
-  '西兰花':['小朵','西兰花段','西兰花梗']
+/* 包装单位字典(从 din-dict-config.html?code=spec_unit 同步,所有业务共用) */
+var SPEC_UNIT_OPTIONS=['克','袋','箱','份','把','瓶','罐','桶','散装'];
+function renderUnitOptions(selectEl){
+  if(!selectEl)return;
+  selectEl.innerHTML='<option>请选择</option>'+SPEC_UNIT_OPTIONS.map(function(u){return '<option>'+u+'</option>';}).join('');
+}
+/* 食材 → 净菜类型映射(与食材档案 vegTypes 字段对齐,仅维护名称,切配规格在食材档案中维护) */
+var FOOD_VEG_TYPES={
+  '土豆':['土豆丝','土豆片','土豆泥','土豆块'],
+  '四季豆':['段（5cm）','整根'],
+  '白菜':['整棵','切段','切丝'],
+  '猪里脊':['丁（1.5cm）','条（4cm）','肉片','肉末']
 };
 function renderSelectOptions(selectEl,placeholder,options){
   if(!selectEl)return;
   selectEl.innerHTML='<option>'+placeholder+'</option>'+options.map(function(item){return '<option>'+item+'</option>';}).join('');
 }
 function initCleanFoodOptions(){
-  renderSelectOptions(document.getElementById('f-food'),'请选择',Object.keys(cleanFoodTypeOptions));
+  renderSelectOptions(document.getElementById('f-food'),'请选择',Object.keys(FOOD_VEG_TYPES));
+  renderUnitOptions(document.getElementById('f-spec-unit'));
 }
 function updateCleanTypeOptions(selectedType){
   var foodSelect=document.getElementById('f-food');
   var cleanTypeSelect=document.getElementById('f-cleanType');
   var foodName=foodSelect.value;
-  var options=cleanFoodTypeOptions[foodName]||[];
+  var types=FOOD_VEG_TYPES[foodName]||[];
   cleanTypeSelect.disabled=!foodName||foodName==='请选择';
   if(cleanTypeSelect.disabled){
     cleanTypeSelect.innerHTML='<option>请先选择食材</option>';
     return;
   }
-  renderSelectOptions(cleanTypeSelect,'请选择',options);
-  if(selectedType&&options.indexOf(selectedType)>-1){
-    cleanTypeSelect.value=selectedType;
+  var html='<option>请选择</option>';
+  types.forEach(function(name){
+    html+='<option>'+name+'</option>';
+  });
+  cleanTypeSelect.innerHTML=html;
+  if(selectedType){
+    for(var i=0;i<types.length;i++){
+      if(types[i]===selectedType){
+        cleanTypeSelect.selectedIndex=i+1;
+        return;
+      }
+    }
   }
 }
 function findFoodByCleanType(cleanType){
-  for(var foodName in cleanFoodTypeOptions){
-    if(cleanFoodTypeOptions[foodName].indexOf(cleanType)>-1){
+  for(var foodName in FOOD_VEG_TYPES){
+    var types=FOOD_VEG_TYPES[foodName];
+    if(types.indexOf(cleanType)>=0){
       return foodName;
     }
   }
@@ -423,7 +449,7 @@ updateCleanAreaFilterOptions();
   }else{
     updateCleanTypeOptions();
   }
-  if(weight) document.getElementById('f-weight').value=weight;
+  if(weight)document.getElementById('f-weight').value=weight;
   /* 自动打开弹窗 */
   openModal();
 })();
diff --git a/web-admin/nutrition/sup-in-raw.html b/web-admin/nutrition/sup-in-raw.html
index 90b9369..582ea5f 100644
--- a/web-admin/nutrition/sup-in-raw.html
+++ b/web-admin/nutrition/sup-in-raw.html
@@ -112,6 +112,10 @@ tbody tr:hover{background:#F8FBFF;}
 .form-item input,.form-item select,.form-item textarea{height:36px;padding:0 12px;border:1px solid #e8e8e8;border-radius:4px;font-size:13px;outline:none;}
 .form-item input:focus,.form-item select:focus,.form-item textarea:focus{border-color:#1890FF;}
 .form-item textarea{height:80px;padding:8px 12px;resize:vertical;}
+/* 规格输入组:克重 input + 单位 select 连在一起 */
+.spec-input-group{display:flex;align-items:stretch;height:36px;}
+.spec-input-group input{flex:1;border-radius:4px 0 0 4px;border-right:none;}
+.spec-input-group select{width:96px;border-radius:0 4px 4px 0;}
 .action-bar{display:flex;align-items:center;gap:8px;margin-bottom:16px;}
 /* 右侧抽屉 */
 .drawer-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.45);z-index:1000;animation:modalFadeIn .2s ease;}
@@ -263,7 +267,12 @@ tbody tr:hover{background:#F8FBFF;}
         <div class="form-item"><label>来源类型<span class="required">*</span></label><select><option>请选择</option><option>外采</option><option>自产</option></select></div>
         <div class="form-item"><label>食材名称<span class="required">*</span></label><select><option>请选择</option><option>菠菜</option><option>土豆</option><option>胡萝卜</option><option>白菜</option><option>西蓝花</option><option>猪里脊</option><option>猪五花</option><option>牛腩</option><option>鸡胸肉</option><option>草鱼</option><option>基围虾</option></select></div>
         <div class="form-item"><label>供应商<span class="required">*</span></label><select><option>请选择</option><option>A区蔬菜基地</option><option>B区根茎基地</option><option>绿源蔬菜配送</option><option>鲜肉直供公司</option><option>海鲜水产配送</option></select></div>
-        <div class="form-item"><label>入库规格<span class="required">*</span></label><select><option>请选择</option><option>25kg/件</option><option>20kg/箱</option><option>15kg/箱</option><option>10kg/筐</option><option>5kg/袋</option><option>1kg/包</option><option>散装(kg)</option></select></div>
+        <div class="form-item"><label>入库规格<span class="required">*</span></label>
+          <div class="spec-input-group">
+            <input id="f-spec-gram" type="number" min="0" step="0.01" placeholder="请输入克重">
+            <select id="f-spec-unit"></select>
+          </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>入库时间</label><input type="date"></div>
@@ -318,6 +327,12 @@ tbody tr:hover{background:#F8FBFF;}
 </div>
 
 <script>
+/* 包装单位字典(从 din-dict-config.html?code=spec_unit 同步,所有业务共用) */
+var SPEC_UNIT_OPTIONS=['克','袋','箱','份','把','瓶','罐','桶','散装'];
+function renderUnitOptions(selectEl){
+  if(!selectEl)return;
+  selectEl.innerHTML='<option>请选择</option>'+SPEC_UNIT_OPTIONS.map(function(u){return '<option>'+u+'</option>';}).join('');
+}
 var rawAreaFilterOptions={
   '毛菜柜':['8号柜','9号柜','10号柜'],
   '仓库':['A仓-蔬菜区-01','A仓-蔬菜区-02','A仓-蔬菜区-03','A仓-蔬菜区-04','B仓-肉类区-01','B仓-肉类区-02','B仓-肉类区-03','C仓-水产区-01','C仓-水产区-02']
@@ -380,6 +395,7 @@ function showDetail(el){
   var title='入库详情 — '+tds[0].textContent;
   Drawer.open(title,html);
 }
+renderUnitOptions(document.getElementById('f-spec-unit'));
 updateRawAreaFilterOptions();
 </script>
 </body>
diff --git a/web-admin/nutrition/sup-pkg-label.html b/web-admin/nutrition/sup-pkg-label.html
index 0dddf44..83bed74 100644
--- a/web-admin/nutrition/sup-pkg-label.html
+++ b/web-admin/nutrition/sup-pkg-label.html
@@ -108,6 +108,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
 .form-item textarea{height:auto;min-height:36px;padding:8px 12px;resize:vertical;}
 .form-item input:focus,.form-item select:focus,.form-item textarea:focus{border-color:var(--primary);}
 .form-item select{appearance:none;background:#fff url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6'%3E%3Cpath d='M0 0l5 6 5-6z' fill='%23999'/%3E%3C/svg%3E") no-repeat right 10px center;padding-right:28px;}
+/* 任务 3.4:规格连体组件(左克重 + 右单位) */
+.spec-input-group{display:flex;align-items:center;gap:0;}
+.spec-input-group input{flex:1;border-radius:4px 0 0 4px;}
+.spec-input-group select{width:90px;min-width:60px;max-width:110px;border-radius:0 4px 4px 0;margin-left:-1px;}
 /* 食材动态行 */
 .ingredient-list{display:flex;flex-direction:column;gap:8px;}
 .ingredient-row{display:flex;gap:8px;align-items:center;}
@@ -226,12 +230,12 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
             <th>包装批次号</th><th>溯源码</th><th>净菜名称</th><th>包装方式</th><th>包装规格</th><th>包装份数</th><th>包装日期</th><th>保质期至</th><th>存放温度(℃)</th><th>包装人</th><th>操作类型</th><th>终端设备</th><th>操作</th>
           </tr></thead>
           <tbody>
-            <tr><td>BATCH-NC-20260415-01</td><td>NC-PROC-BOCA-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">真空袋</span></td><td>500</td><td>20</td><td>2026-04-15</td><td>2026-04-17</td><td>4.1</td><td>李包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-1号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T01</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-            <tr><td>BATCH-NC-20260415-01</td><td>NC-PROC-BOCA-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">真空袋</span></td><td>500</td><td>20</td><td>2026-04-15</td><td>2026-04-17</td><td>4.1</td><td>李包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-1号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T01</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-            <tr><td>BATCH-NC-20260415-02</td><td>NC-PROC-HLUB-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">保鲜盒</span></td><td>1000</td><td>15</td><td>2026-04-15</td><td>2026-04-18</td><td>4.2</td><td>王包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-1号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T01</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-            <tr><td>BATCH-NC-20260415-02</td><td>NC-PROC-HLUB-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">保鲜盒</span></td><td>1000</td><td>15</td><td>2026-04-15</td><td>2026-04-18</td><td>4.2</td><td>王包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-1号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T01</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-            <tr><td>BATCH-NC-20260415-03</td><td>NC-PROC-XGUO-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">散装托盘</span></td><td>2000</td><td>8</td><td>2026-04-15</td><td>2026-04-17</td><td>4.0</td><td>张包装</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
-            <tr><td>BATCH-NC-20260415-04</td><td>NC-PROC-LAJP-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">真空袋</span></td><td>1000</td><td>12</td><td>2026-04-15</td><td>2026-04-17</td><td>4.3</td><td>李包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-2号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T02</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
+            <tr><td>BATCH-NC-20260415-01</td><td>NC-PROC-BOCA-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">真空袋</span></td><td>500g/袋</td><td>20</td><td>2026-04-15</td><td>2026-04-17</td><td>4.1</td><td>李包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-1号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T01</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
+            <tr><td>BATCH-NC-20260415-01</td><td>NC-PROC-BOCA-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">真空袋</span></td><td>500g/袋</td><td>20</td><td>2026-04-15</td><td>2026-04-17</td><td>4.1</td><td>李包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-1号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T01</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
+            <tr><td>BATCH-NC-20260415-02</td><td>NC-PROC-HLUB-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">保鲜盒</span></td><td>1000g/箱</td><td>15</td><td>2026-04-15</td><td>2026-04-18</td><td>4.2</td><td>王包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-1号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T01</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
+            <tr><td>BATCH-NC-20260415-02</td><td>NC-PROC-HLUB-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">保鲜盒</span></td><td>1000g/箱</td><td>15</td><td>2026-04-15</td><td>2026-04-18</td><td>4.2</td><td>王包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-1号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T01</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
+            <tr><td>BATCH-NC-20260415-03</td><td>NC-PROC-XGUO-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">散装托盘</span></td><td>2000g/箱</td><td>8</td><td>2026-04-15</td><td>2026-04-17</td><td>4.0</td><td>张包装</td><td><span class="tag tag-green">人工录入</span></td><td>—</td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
+            <tr><td>BATCH-NC-20260415-04</td><td>NC-PROC-LAJP-20260415-01</td><td>土豆-土豆丝</td><td><span class="tag tag-gray">真空袋</span></td><td>1000g/袋</td><td>12</td><td>2026-04-15</td><td>2026-04-17</td><td>4.3</td><td>李包装</td><td><span class="tag tag-blue">设备自动</span></td><td><div>真空机-2号</div><div style="font-size:var(--font-xs);color:var(--text-secondary);">PKG-T02</div></td><td class="td-actions"><span class="link">查看视频</span> <span class="link">编辑</span> <span class="link" style="color:var(--danger)">删除</span></td></tr>
           </tbody>
         </table>
       </div>
@@ -351,7 +355,10 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
         </div>
         <div class="form-item">
           <div class="form-item__label">包装规格<span class="required">*</span></div>
-          <input id="cleanPackSpecInput" inputmode="numeric" placeholder="请输入纯整数数字">
+          <div class="spec-input-group" id="cleanPackSpecInputGroup">
+            <input id="cleanPackSpecInput" inputmode="numeric" placeholder="请输入克重">
+            <select id="cleanPackUnitSelect"></select>
+          </div>
         </div>
         <div class="form-item">
           <div class="form-item__label">包装份数<span class="required">*</span></div>
@@ -397,11 +404,11 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
       <div class="form-grid">
         <div class="form-item">
           <div class="form-item__label">包装餐品<span class="required">*</span></div>
-          <select id="dishSelect" onchange="onDishChange(this.value)"><option value="">请选择餐品</option><option>宫保鸡丁</option><option>清蒸鱼</option><option>蒜蓉菠菜</option><option>炒胡萝卜</option><option>红烧排骨</option></select>
+          <select id="dishSelect" onchange="onDishChange(this.value)"><option value="">请选择餐品</option></select>
         </div>
         <div class="form-item">
           <div class="form-item__label">包装规格<span class="required">*</span></div>
-          <select><option value="">请选择</option><option>标准份（500g）</option><option>大份（800g）</option></select>
+          <select id="dishPackSpecSelect" disabled><option value="">请先选择餐品</option></select>
         </div>
         <div class="form-item">
           <div class="form-item__label">包装方式<span class="required">*</span></div>
@@ -528,6 +535,60 @@ document.querySelectorAll('.modal-mask').forEach(m=>{
   m.addEventListener('click',e=>{if(e.target===m)m.classList.remove('show');});
 });
 
+/* ========== 跨页 specs 共享工具(任务 3.0) ========== */
+function loadDishSpecs(){
+  try{
+    var raw=localStorage.getItem('dish_specs_v1');
+    if(!raw)return null;
+    var data=JSON.parse(raw);
+    return (data&&data.dishes)?data.dishes:null;
+  }catch(e){return null;}
+}
+function getSpecsByDish(name){
+  var dishes=loadDishSpecs();
+  if(!dishes)return [];
+  var d=dishes.find(function(x){return x.name===name;});
+  return d?(d.specs||[]):[];
+}
+function getAllDishNames(){
+  var dishes=loadDishSpecs();
+  return dishes?dishes.map(function(d){return d.name;}):[];
+}
+/* 包装单位字典(与 spec_unit 字典一致) */
+var SPEC_UNIT_OPTIONS=['克','袋','箱','份','把','瓶','罐','桶','散装'];
+function buildUnitOptions(selected){
+  var html='';
+  SPEC_UNIT_OPTIONS.forEach(function(u){html+='<option value="'+u+'"'+(u===selected?' selected':'')+'>'+u+'</option>';});
+  return html;
+}
+/* 包装页兜底:若总库未覆盖,用页内默认 */
+var PKG_FALLBACK_DISHES={
+  '宫保鸡丁':[{portion:'标准份',baseGram:500,unit:'份'},{portion:'大份',baseGram:800,unit:'份'}],
+  '清蒸鱼':[{portion:'标准份',baseGram:500,unit:'份'},{portion:'大份',baseGram:800,unit:'份'}],
+  '蒜蓉菠菜':[{portion:'标准份',baseGram:500,unit:'份'},{portion:'大份',baseGram:800,unit:'份'}],
+  '炒胡萝卜':[{portion:'标准份',baseGram:500,unit:'份'},{portion:'大份',baseGram:800,unit:'份'}],
+  '红烧排骨':[{portion:'标准份',baseGram:500,unit:'份'},{portion:'大份',baseGram:800,unit:'份'}]
+};
+function getSpecsByDishWithFallback(name){
+  var specs=getSpecsByDish(name);
+  if(specs&&specs.length>0)return specs;
+  return PKG_FALLBACK_DISHES[name]||[{portion:'标准份',baseGram:500,unit:'份'},{portion:'大份',baseGram:800,unit:'份'}];
+}
+function getDishNamesWithFallback(){
+  var names=getAllDishNames();
+  if(names&&names.length>0)return names;
+  return Object.keys(PKG_FALLBACK_DISHES);
+}
+/* 任务 3.4:按当前餐品动态生成餐品净菜包规格下拉 */
+function buildDishSpecOptions(dishName){
+  var specs=getSpecsByDishWithFallback(dishName);
+  var html='<option value="">请选择</option>';
+  specs.forEach(function(s){
+    html+='<option value="'+s.portion+'" data-gram="'+s.baseGram+'" data-unit="'+(s.unit||'份')+'">'+s.portion+'('+s.baseGram+'g)</option>';
+  });
+  return html;
+}
+
 /* ========== 餐品食材数据 ========== */
 var cleanPackFoodTypeOptions={
   '土豆':['土豆丝','土豆块','土豆泥'],
@@ -574,7 +635,15 @@ function renderOptions(selectEl, placeholder, options){
 }
 function initCleanPackOptions(){
   renderOptions(document.getElementById('cleanFoodSelect'),'请选择食材',Object.keys(cleanPackFoodTypeOptions));
+  /* 初始化净菜包装单位下拉默认"袋" */
+  document.getElementById('cleanPackUnitSelect').innerHTML=buildUnitOptions('袋');
   updateCleanPackTypeOptions();
+  /* 初始化餐品名下拉(任务 3.4:从总库读取) */
+  var dishSel=document.getElementById('dishSelect');
+  var names=getDishNamesWithFallback();
+  var html='<option value="">请选择餐品</option>';
+  names.forEach(function(n){html+='<option value="'+n+'">'+n+'</option>';});
+  dishSel.innerHTML=html;
 }
 function updateCleanPackTypeOptions(selectedType){
   var foodSelect=document.getElementById('cleanFoodSelect');
@@ -635,12 +704,22 @@ function updateIngredientCleanTypeOptions(foodSelect, selectedType){
   var cleanTypeSelect=row.children[2].querySelector('select');
   cleanTypeSelect.innerHTML=buildTypeOptions(foodSelect.value, selectedType);
 }
-// 餐品选择变化 → 自动填充食材表格
+// 餐品选择变化 → 自动填充食材表格 + 同步餐品规格下拉
 function onDishChange(val){
   var ings=dishIngredients[val]||[];
   var tbody=document.getElementById('ingFormBody');
-  if(ings.length===0){tbody.innerHTML=buildIngRow('','','','','');return;}
-  tbody.innerHTML=ings.map(function(i){return buildIngRow(i.trace,i.name,i.cleanType,i.type,i.amount);}).join('');
+  if(ings.length===0){tbody.innerHTML=buildIngRow('','','','','');}else{
+    tbody.innerHTML=ings.map(function(i){return buildIngRow(i.trace,i.name,i.cleanType,i.type,i.amount);}).join('');
+  }
+  /* 任务 3.4:同步餐品净菜包规格下拉 */
+  var specSel=document.getElementById('dishPackSpecSelect');
+  if(!val){
+    specSel.disabled=true;
+    specSel.innerHTML='<option value="">请先选择餐品</option>';
+  }else{
+    specSel.disabled=false;
+    specSel.innerHTML=buildDishSpecOptions(val);
+  }
 }
 // 添加食材行
 function addIngRow(){
@@ -669,12 +748,16 @@ function openCleanPackModal(){
   document.getElementById('cleanFoodSelect').selectedIndex=0;
   updateCleanPackTypeOptions();
   document.getElementById('cleanPackSpecInput').value='';
+  document.getElementById('cleanPackUnitSelect').innerHTML=buildUnitOptions('袋');
   openModal('modal-nc');
 }
 function openDishPackModal(){
   document.getElementById('modalDhTitle').textContent='新增餐品净菜包';
   document.getElementById('dishSelect').selectedIndex=0;
   document.getElementById('ingFormBody').innerHTML=buildIngRow('','','','','');
+  var specSel=document.getElementById('dishPackSpecSelect');
+  specSel.disabled=true;
+  specSel.innerHTML='<option value="">请先选择餐品</option>';
   openModal('modal-dh');
 }
 // 新增时重置弹窗标题
diff --git a/web-admin/nutrition/sup-process-analysis.html b/web-admin/nutrition/sup-process-analysis.html
index 0ea7e1b..5f0391d 100644
--- a/web-admin/nutrition/sup-process-analysis.html
+++ b/web-admin/nutrition/sup-process-analysis.html
@@ -232,14 +232,17 @@ tr:hover td{background:#FAFAFA;}
     <div class="panel-card__title">切配线</div>
     <div class="panel-filter">
       <div class="filter-item">
-        <label>分类：</label>
+        <label>切配形状：</label>
         <select class="filter-select">
-          <option>请选择分类</option>
-          <option>切丝</option>
-          <option>切片</option>
-          <option>切丁</option>
-          <option>切段</option>
-          <option>绞肉</option>
+          <option>请选择形状</option>
+          <option>丝</option>
+          <option>片</option>
+          <option>丁</option>
+          <option>块</option>
+          <option>段</option>
+          <option>末</option>
+          <option>泥</option>
+          <option>条</option>
         </select>
       </div>
       <button class="btn btn-primary">🔍 查询</button>
@@ -261,10 +264,10 @@ tr:hover td{background:#FAFAFA;}
           <th>加工时长(min)<span class="sorter"></span></th>
         </tr></thead>
         <tbody>
-          <tr><td class="td-left">土豆（切丝）</td><td>切配线-01</td><td>320.0</td><td>285.6</td><td>18.8</td><td>8.2</td><td>7.4</td><td>0.0</td><td>8</td><td>14</td><td>540</td></tr>
-          <tr><td class="td-left">胡萝卜（切片）</td><td>切配线-01</td><td>180.0</td><td>162.5</td><td>10.2</td><td>4.5</td><td>2.8</td><td>0.0</td><td>6</td><td>9</td><td>380</td></tr>
-          <tr><td class="td-left">猪肉（绞肉）</td><td>切配线-02</td><td>500.0</td><td>452.0</td><td>28.0</td><td>12.5</td><td>7.5</td><td>0.0</td><td>10</td><td>18</td><td>620</td></tr>
-          <tr><td class="td-left">青椒（切块）</td><td>切配线-02</td><td>260.0</td><td>234.5</td><td>14.8</td><td>6.5</td><td>4.2</td><td>0.0</td><td>6</td><td>10</td><td>420</td></tr>
+          <tr><td class="td-left">土豆（丝）</td><td>切配线-01</td><td>320.0</td><td>285.6</td><td>18.8</td><td>8.2</td><td>7.4</td><td>0.0</td><td>8</td><td>14</td><td>540</td></tr>
+          <tr><td class="td-left">胡萝卜（片）</td><td>切配线-01</td><td>180.0</td><td>162.5</td><td>10.2</td><td>4.5</td><td>2.8</td><td>0.0</td><td>6</td><td>9</td><td>380</td></tr>
+          <tr><td class="td-left">猪肉（末）</td><td>切配线-02</td><td>500.0</td><td>452.0</td><td>28.0</td><td>12.5</td><td>7.5</td><td>0.0</td><td>10</td><td>18</td><td>620</td></tr>
+          <tr><td class="td-left">青椒（块）</td><td>切配线-02</td><td>260.0</td><td>234.5</td><td>14.8</td><td>6.5</td><td>4.2</td><td>0.0</td><td>6</td><td>10</td><td>420</td></tr>
         </tbody>
       </table>
     </div>
@@ -275,12 +278,21 @@ tr:hover td{background:#FAFAFA;}
     <div class="panel-card__title">包装线</div>
     <div class="panel-filter">
       <div class="filter-item">
-        <label>分类：</label>
+        <label>包装方式：</label>
         <select class="filter-select">
-          <option>请选择分类</option>
-          <option>真空包装</option>
-          <option>气调包装</option>
-          <option>普通包装</option>
+          <option>请选择包装方式</option>
+          <option>真空</option>
+          <option>气调</option>
+          <option>普通</option>
+          <option>冷鲜</option>
+          <option>保鲜盒</option>
+          <option>散装托盘</option>
+        </select>
+      </div>
+      <div class="filter-item">
+        <label>包装对象：</label>
+        <select class="filter-select">
+          <option>全部</option>
           <option>净菜包</option>
           <option>餐品净菜包</option>
         </select>