';
(d.methods || []).forEach(function (m) {
var mInfo = MH_METHOD_MAP[m.key] || {};
@@ -2206,41 +2187,131 @@
+ '操作人 · ' + d.operator + ''
+ '
';
html += '';
- html += '';
+ // 5 种方式过滤 Tab(无"全部",每种方式独立查看)
+ var allRecords = d.records || [];
var filters = [
- { key: 'all', label: '全部 (' + (d.records || []).length + ')' },
- { key: 'welfare', label: '员工福利' },
- { key: 'donate', label: '捐赠' },
- { key: 'waste', label: '废弃' },
- { key: 'reprocess', label: '加工再利用' }
+ { key: 'welfare', label: '员工福利' },
+ { key: 'donate', label: '捐赠' },
+ { key: 'waste', label: '废弃' },
+ { key: 'reprocess', label: '加工再利用' },
+ { key: 'cabinet', label: '存入智能货柜' }
];
+ html += '
';
filters.forEach(function (f) {
- html += '' + f.label + '';
+ var count = allRecords.filter(function (r) { return r.method === f.key; }).length;
+ html += '' + f.label + ' (' + count + ')';
});
html += '
';
- var records = d.records || [];
- if (mhDisposeFilter !== 'all') records = records.filter(function (r) { return r.method === mhDisposeFilter; });
- html += '
';
- html += '';
- html += '| 时间 | 餐品 | 处置方式 | 处置量 (kg) | 接收方 · 领用人 | 操作人 | 备注 |
|---|
';
- html += '';
- if (records.length === 0) {
- html += '| 暂无该类型的处置记录 |
';
- } else {
- records.forEach(function (r) {
- var mInfo = MH_METHOD_MAP[r.method] || {};
- html += ''
- + '| ' + r.time + ' | '
- + '' + r.dish + ' | '
- + '' + (mInfo.label || r.method) + ' | '
- + '' + r.amount.toFixed(1) + ' | '
- + '' + r.receiver + ' | '
- + '' + r.operator + ' | '
- + '' + (r.note || '—') + ' | '
- + '
';
- });
+ // 当前方式的记录
+ var records = allRecords.filter(function (r) { return r.method === mhDisposeFilter; });
+ // 按方式渲染独立列结构
+ if (mhDisposeFilter === 'welfare') {
+ // 员工福利: 时间/餐品/处置量/领用人/操作人/备注
+ html += '';
+ html += '';
+ html += '| 时间 | 餐品 | 处置量 (kg) | 领用人 | 操作人 | 备注 |
|---|
';
+ html += '';
+ if (records.length === 0) {
+ html += '| 暂无员工福利处置记录 |
';
+ } else {
+ records.forEach(function (r) {
+ html += ''
+ + '| ' + r.time + ' | '
+ + '' + r.dish + ' | '
+ + '' + r.amount.toFixed(1) + ' | '
+ + '' + (r.receiver || '—') + ' | '
+ + '' + r.operator + ' | '
+ + '' + (r.note || '—') + ' | '
+ + '
';
+ });
+ }
+ html += '
';
+ html += '';
+ html += '| 时间 | 餐品 | 处置量 (kg) | 接收机构 | 操作人 | 备注 |
|---|
';
+ html += '';
+ if (records.length === 0) {
+ html += '| 暂无捐赠处置记录 |
';
+ } else {
+ records.forEach(function (r) {
+ html += ''
+ + '| ' + r.time + ' | '
+ + '' + r.dish + ' | '
+ + '' + r.amount.toFixed(1) + ' | '
+ + '' + (r.receiver || '—') + ' | '
+ + '' + r.operator + ' | '
+ + '' + (r.note || '—') + ' | '
+ + '
';
+ });
+ }
+ html += '
';
+ html += '';
+ html += '| 时间 | 餐品 | 处置量 (kg) | 废弃原因 | 操作人 | 备注 |
|---|
';
+ html += '';
+ if (records.length === 0) {
+ html += '| 暂无废弃处置记录 |
';
+ } else {
+ records.forEach(function (r) {
+ html += ''
+ + '| ' + r.time + ' | '
+ + '' + r.dish + ' | '
+ + '' + r.amount.toFixed(1) + ' | '
+ + '' + (r.reason || '—') + ' | '
+ + '' + r.operator + ' | '
+ + '' + (r.note || '—') + ' | '
+ + '
';
+ });
+ }
+ html += '
';
+ html += '';
+ html += '| 时间 | 餐品 | 处置量 (kg) | 加工用途 | 接收人 | 操作人 | 备注 |
|---|
';
+ html += '';
+ if (records.length === 0) {
+ html += '| 暂无加工再利用处置记录 |
';
+ } else {
+ records.forEach(function (r) {
+ html += ''
+ + '| ' + r.time + ' | '
+ + '' + r.dish + ' | '
+ + '' + r.amount.toFixed(1) + ' | '
+ + '' + (r.processing || '—') + ' | '
+ + '' + (r.receiver || '—') + ' | '
+ + '' + r.operator + ' | '
+ + '' + (r.note || '—') + ' | '
+ + '
';
+ });
+ }
+ html += '
';
+ html += '';
+ html += '| 时间 | 餐品 | 处置量 (kg) | 货柜编号 | 操作人 | 备注 |
|---|
';
+ html += '';
+ if (records.length === 0) {
+ html += '| 暂无存入智能货柜处置记录 |
';
+ } else {
+ records.forEach(function (r) {
+ html += ''
+ + '| ' + r.time + ' | '
+ + '' + r.dish + ' | '
+ + '' + r.amount.toFixed(1) + ' | '
+ + '' + (r.cabinetId || '—') + ' | '
+ + '' + r.operator + ' | '
+ + '' + (r.note || '—') + ' | '
+ + '
';
+ });
+ }
+ html += '
';
return html;
}
diff --git a/other-module/canteen-device/doc/CHANGELOG.md b/other-module/canteen-device/doc/CHANGELOG.md
index b721198..cf1034f 100644
--- a/other-module/canteen-device/doc/CHANGELOG.md
+++ b/other-module/canteen-device/doc/CHANGELOG.md
@@ -1,5 +1,17 @@
# 餐厅终端设备模块变更日志
+## 2026-08-18 · 结算设备统计页收餐记录 + 毛菜验收秤实收规格可编辑
+
+### 变更一:结算设备统计页收餐与余量处置记录(`checkout-device/07-statistics.html`)
+- 新增收餐记录:全部收餐/全部餐线收餐完成事件,取最新一条作为收餐时间基准
+- 新增余量处置记录:临期食品·冷藏保存·加工再利用·值班餐/加班餐等处置方式
+- 各记录弹窗明细含原因/用途/接收人/操作人/备注等字段,初始上餐量·制作人·上餐时间展示
+
+### 变更二:毛菜验收秤实收规格增强(`raw-veg-inspection-scale/01-verify-inspection.html`)
+- 实收规格列拆分为「克重 + 单位」组合编辑:单位组合字符串展示,支持分类过滤(叶菜类等)
+- 采购单价为数据字典值只读展示(灰字),实收量/实收单价/实收金额可编辑
+- 编辑时仅持久化到本次订单,输入不重渲染避免光标丢失
+
## 2026-08-14 · 毛菜验收秤 PAD 外壳改造 + 后厨补餐屏首版设计
### 变更一:毛菜验收秤全页面 PAD 居中外壳改造(`raw-veg-inspection-scale/` 全部 9 页)
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 6942c19..859a373 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
@@ -308,6 +308,33 @@
}
.food-row__spec-select:focus { border-color: #4a90d9; background: rgba(74,144,217,0.08); color: #fff; }
.food-row__spec-select option { background: #1a2b4a; color: #fff; }
+ /* 采购规格列(只读):克重+单位组合字符串展示,不可编辑 */
+ .food-row__spec-readonly {
+ display: inline-block; padding: 2px 6px; border-radius: 4px;
+ background: rgba(255,255,255,0.04); color: rgba(255,255,255,0.55);
+ font-size: 11px; font-weight: 500; white-space: nowrap;
+ }
+ /* 实收规格列:克重 input + 单位 select 连体容器(参考 sup-in-raw.html 的 .spec-input-group) */
+ .food-row__spec-input-group { display: flex; align-items: stretch; width: 100%; height: 24px; }
+ .food-row__spec-input-group input {
+ flex: 1; min-width: 0; padding: 0 4px;
+ background: rgba(255,255,255,0.05); border: 1px solid rgba(255,255,255,0.1);
+ border-radius: 4px 0 0 4px; border-right: none;
+ color: rgba(255,255,255,0.85); font-size: 11px; text-align: center;
+ outline: none; -moz-appearance: textfield;
+ }
+ .food-row__spec-input-group input::-webkit-outer-spin-button,
+ .food-row__spec-input-group input::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; }
+ .food-row__spec-input-group input:focus { border-color: #4a90d9; background: rgba(74,144,217,0.08); color: #fff; }
+ .food-row__spec-input-group input::placeholder { color: rgba(255,255,255,0.25); }
+ .food-row__spec-input-group select {
+ width: 44px; background: rgba(255,255,255,0.05); border: 1px solid rgba(255,255,255,0.1);
+ border-radius: 0 4px 4px 0; padding: 2px 2px;
+ color: rgba(255,255,255,0.7); font-size: 11px; text-align: center;
+ outline: none; appearance: auto; cursor: pointer;
+ }
+ .food-row__spec-input-group select:focus { border-color: #4a90d9; background: rgba(74,144,217,0.08); color: #fff; }
+ .food-row__spec-input-group select option { background: #1a2b4a; color: #fff; }
.food-row__amount { font-size: 12px; color: #faad14; font-weight: 500; }
.food-row__actual { color: #4a90d9; font-weight: 600; }
.food-row__status { font-size: 11px; }
@@ -1035,39 +1062,39 @@
/* ===== 食材目录（称重验收，存储单位克，展示层用 formatGramForCanteen 还原"斤"） ===== */
/* verifyType:'weight' 表示称重验收,可用 ['斤','公斤','克','千克'] */
var FOOD_CATALOG = {
- '大白菜': { 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' }
+ '大白菜': { price: 3.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC001', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '圆白菜': { price: 4.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC002', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '菠菜': { price: 6.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC003', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '油菜': { price: 4.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC004', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '生菜': { price: 5.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC005', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '芹菜': { price: 5.0, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC006', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '西兰花': { price: 8.0, unit: '斤', catLabel: '花菜类', traceCode: 'TRC260601-HC001', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '花菜': { price: 7.0, unit: '斤', catLabel: '花菜类', traceCode: 'TRC260601-HC002', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '黄瓜': { price: 5.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG001', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '西红柿': { price: 6.5, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG002', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '茄子': { price: 5.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG003', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '青椒': { price: 6.0, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG004', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '豆角': { price: 7.5, unit: '斤', catLabel: '瓜果类', traceCode: 'TRC260601-GG005', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '土豆': { price: 3.0, unit: '斤', catLabel: '根茎类', traceCode: 'TRC260601-GJ001', verifyType: 'weight', specGram: 1000, specUnit: '袋' },
+ '胡萝卜': { price: 4.0, unit: '斤', catLabel: '根茎类', traceCode: 'TRC260601-GJ002', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '白菜': { price: 3.5, unit: '斤', catLabel: '叶菜类', traceCode: 'TRC260601-YC007', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '猪里脊': { price: 18.0, unit: '斤', catLabel: '肉禽类', traceCode: 'TRC260601-RQ001', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '五花肉': { price: 16.0, unit: '斤', catLabel: '肉禽类', traceCode: 'TRC260601-RQ002', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '草鱼': { price: 14.0, unit: '斤', catLabel: '水产类', traceCode: 'TRC260601-SC001', verifyType: 'weight', specGram: 500, specUnit: '袋' },
+ '虾仁': { price: 35.0, unit: '斤', catLabel: '水产类', traceCode: 'TRC260601-SC002', verifyType: 'weight', specGram: 250, specUnit: '袋' }
};
/* ===== 调料目录（点收验收，按规格/数量验收） ===== */
/* verifyType:'count' 表示点收验收,可用 ['袋','瓶','箱','桶','罐','份','个','只','条','把'] */
var SPICE_CATALOG = {
- '酱油': { 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' }
+ '酱油': { price: 12.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL001', verifyType: 'count', specGram: 500, specUnit: '瓶' },
+ '醋': { price: 8.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL002', verifyType: 'count', specGram: 500, specUnit: '瓶' },
+ '料酒': { price: 10.0, unit: '瓶', spec: '500ml/瓶', catLabel: '调料', traceCode: 'TRC260601-TL003', verifyType: 'count', specGram: 500, specUnit: '瓶' },
+ '盐': { price: 3.0, unit: '袋', spec: '500g/袋', catLabel: '调料', traceCode: 'TRC260601-TL004', verifyType: 'count', specGram: 500, specUnit: '袋' },
+ '白糖': { price: 6.0, unit: '袋', spec: '1kg/袋', catLabel: '调料', traceCode: 'TRC260601-TL005', verifyType: 'count', specGram: 1000, specUnit: '袋' },
+ '鸡精': { price: 8.0, unit: '罐', spec: '200g/罐', catLabel: '调料', traceCode: 'TRC260601-TL006', verifyType: 'count', specGram: 200, specUnit: '罐' },
+ '食用油': { price: 45.0, unit: '桶', spec: '5L/桶', catLabel: '调料', traceCode: 'TRC260601-TL007', verifyType: 'count', specGram: 5000, specUnit: '桶' },
+ '花椒': { price: 25.0, unit: '袋', spec: '100g/袋', catLabel: '调料', traceCode: 'TRC260601-TL008', verifyType: 'count', specGram: 100, specUnit: '袋' }
};
/* 判断食材是否为调料（按规格验收） */
@@ -1442,12 +1469,12 @@
var isDirect = !!selectedOrder._direct;
/* 列宽(单位 px,首列 1fr 自适应)
- * 有订单(10列): 食材/采购规格/采购量/采购单价/采购单金额/实收规格/实收量/实收单价/实收总价/操作
- * 无订单(6列): 食材/实收规格/实收量/实收单价/实收总价/操作
+ * 有订单(10列): 食材/采购规格(只读)/采购量/采购单价/采购单金额/实收规格(input+select)/实收量/实收单价/实收总价/操作
+ * 无订单(6列): 食材/实收规格(input+select)/实收量/实收单价/实收总价/操作
*/
var gridCols = isDirect
- ? '1fr 50px 50px 56px 60px 52px'
- : '1fr 56px 50px 56px 60px 50px 50px 56px 60px 52px';
+ ? '1fr 96px 50px 56px 60px 52px'
+ : '1fr 60px 50px 56px 60px 96px 50px 56px 60px 52px';
headEl.style.gridTemplateColumns = gridCols;
/* 表头文字 */
headEl.innerHTML = isDirect
@@ -1493,22 +1520,31 @@
? '
--'
: '
' + (spice ? orderQty : orderQty.toFixed(1)) + '';
- /* 规格下拉选项(按 verifyType 分类过滤) */
+ /* 规格单位下拉选项(按 verifyType 分类过滤,用于实收规格单位 select) */
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) {
- var opts = '';
- for (var u = 0; u < UNIT_OPTIONS.length; u++) {
- var unit = UNIT_OPTIONS[u];
- opts += '
';
- }
- return '
';
+ /* 采购规格克重/单位(数据字典值,只读展示;格式 "500g/袋") */
+ var specGram = info.specGram || 0;
+ var specUnit = info.specUnit || info.unit || '';
+ /* 采购规格列(只读):克重+单位组合字符串 */
+ var specHtml = '
' + specGram + 'g/' + specUnit + '';
+ /* 实收规格:默认代入采购规格数据(克重/单位),用户可编辑 */
+ var actualSpecGram = (f._actualSpecGram !== undefined) ? f._actualSpecGram : specGram;
+ var actualSpecUnit = (f._actualSpecUnit !== undefined) ? f._actualSpecUnit : specUnit;
+ var unitOpts = '';
+ for (var u = 0; u < UNIT_OPTIONS.length; u++) {
+ var unit = UNIT_OPTIONS[u];
+ unitOpts += '
';
}
- var specHtml = buildUnitSelect(currentUnit, 'updateFoodUnit(' + i + ', this.value)');
+ var actualSpecHtml = '
'
+ + ''
+ + ''
+ + '
';
/* 采购单价列(只读) + 采购单金额列(只读,= 采购单价 × 采购量) */
var priceReadOnlyHtml = '
¥' + currentPrice.toFixed(1) + '';
@@ -1571,8 +1607,6 @@
+ '
'
@@ -1638,20 +1672,20 @@
}
}
- /* 更新食材规格/单位（用户编辑） */
- function updateFoodUnit(idx, newUnit) {
+ /* 更新实收规格克重(用户编辑) — 仅持久化到本次订单的食材状态,不重渲染避免光标丢失 */
+ function updateActualSpecGram(idx, newVal) {
if (!selectedOrder || idx < 0) return;
- var unit = (newUnit || '').trim();
- if (!unit) return;
- selectedOrder.foods[idx]._customUnit = unit;
+ var gram = parseFloat(newVal);
+ if (isNaN(gram) || gram < 0) gram = 0;
+ selectedOrder.foods[idx]._actualSpecGram = gram;
}
- /* 更新实收规格（用户在下拉中切换） */
+ /* 更新实收规格单位(用户在下拉中切换) */
function updateActualUnit(idx, newUnit) {
if (!selectedOrder || idx < 0) return;
var unit = (newUnit || '').trim();
if (!unit) return;
- selectedOrder.foods[idx]._actualUnit = unit;
+ selectedOrder.foods[idx]._actualSpecUnit = unit;
}
/* 验收不通过（从操作列触发） */
@@ -2343,7 +2377,7 @@
var orderQty = spice ? (food._orderQty || food.weight) : food.weight;
var refundQty = (ngScope === 'full') ? orderQty : Math.ceil(orderQty / 2);
var refundAmount = currentPrice * refundQty;
- var unitLabel = food._customUnit || (spice ? findFoodInfo(food.name).unit : '斤');
+ var unitLabel = spice ? findFoodInfo(food.name).unit : '斤';
var refundDisplay = document.getElementById('ngRefundAmountDisplay');
var refundInput = document.getElementById('ngRefundAmountInput');
diff --git a/web-admin/nutrition/ano-result.html b/web-admin/nutrition/ano-result.html
index cc0ec99..686e0c0 100644
--- a/web-admin/nutrition/ano-result.html
+++ b/web-admin/nutrition/ano-result.html
@@ -146,6 +146,7 @@ tbody tr:hover td.td-actions{background:#F8FBFF;}
+