From 2d8b9e1b23f0463c4415d29d8414b4d382f5bdd8 Mon Sep 17 00:00:00 2001 From: fengpu <18691763612@163.com> Date: Fri, 21 Aug 2026 10:18:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=87=80=E8=8F=9C=E5=88=87=E9=85=8D?= =?UTF-8?q?=E6=9C=AF=E8=AF=AD=E7=BB=9F=E4=B8=80(=E5=8E=9F=E7=8A=B6?= =?UTF-8?q?=E2=86=92=E5=8E=9F=E6=9D=90)=20+=20=E5=87=80=E8=8F=9C=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E5=88=AB=E5=90=8D=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- web-admin/nutrition/din-dish-own.html | 4 ++-- web-admin/nutrition/din-ingredient-add.html | 10 +++++----- web-admin/nutrition/doc/CHANGELOG.md | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/web-admin/nutrition/din-dish-own.html b/web-admin/nutrition/din-dish-own.html index 25b149a..10bfe61 100644 --- a/web-admin/nutrition/din-dish-own.html +++ b/web-admin/nutrition/din-dish-own.html @@ -118,7 +118,7 @@ body{font-family:-apple-system,BlinkMacSystemFont,'PingFang SC','Microsoft YaHei .composition-head__title{font-size:var(--font-base);font-weight:600;color:var(--text-primary);} /* 净菜类型:主名称 + 规格别名（弱化） */ .net-type{font-size:var(--font-sm);color:var(--text-primary);} -.net-type-alias{margin-left:6px;font-size:var(--font-xs);color:var(--text-placeholder);font-weight:normal;} +.net-type-alias{font-size:var(--font-xs);color:var(--text-placeholder);font-weight:normal;} .info-table{width:100%;border-collapse:collapse;font-size:var(--font-sm);} .info-table th{background:#FAFAFA;padding:10px 12px;text-align:left;color:var(--text-secondary);font-weight:500;border-bottom:1px solid var(--border);} .info-table td{padding:10px 12px;border-bottom:1px solid var(--border);color:var(--text-primary);} @@ -792,7 +792,7 @@ function renderComposition(d){ /* 净菜类型:主名称(已含-分隔符) + 净菜规格别名(弱化样式) */ var netName = c.netName || c.netType || '—'; var netTypeHtml = c.netSpecAlias - ? ''+netName+''+c.netSpecAlias+'' + ? ''+netName+'.'+c.netSpecAlias+'' : ''+netName+''; var typeTag = c.type==='主材'?'blue':c.type==='调料'?'orange':'gray'; return ''+(c.code||'—')+''+(c.name||'—')+''+(c.type||'辅材')+''+netTypeHtml+''+(c.amount||0)+'g'; diff --git a/web-admin/nutrition/din-ingredient-add.html b/web-admin/nutrition/din-ingredient-add.html index 1e1d295..8cdf230 100644 --- a/web-admin/nutrition/din-ingredient-add.html +++ b/web-admin/nutrition/din-ingredient-add.html @@ -556,7 +556,7 @@ function submitForm(){ /* === 净菜类型动态行(扁平结构 + rowspan 合并) === */ /* 切配形状选项(对应字典 spec_cut_shape) */ -var VEG_SHAPE_OPTIONS=['','丝','片','块','沫','泥','原状']; +var VEG_SHAPE_OPTIONS=['','丝','片','块','沫','泥','原材']; /* 刀工选项 */ var VEG_TECH_OPTIONS=['','平刀','斜刀','直刀','花刀','其他']; /* 净菜组 ID 自增 */ @@ -938,8 +938,8 @@ if(initTab >= 0 && initTab < totalSteps) currentStep = initTab; /* 编辑模式 mock 数据（与 din-ingredient.html 的 FOODS 结构一致） */ var EDIT_FOODS = { '0101001':{name:'粳米(生)',code:'0101001',alias:'大米',firstClass:'谷薯类',secondClass:'稻米',edible:'97',waterRate:'13.3',dataSource:'0',basePrice:'3.5',vegTypes:[ - {groupId:'g1',alias:'普洗组',specAlias:'洗净米',yieldRate:'97',cutSpec:{shape:'原状'}}, - {groupId:'g1',alias:'普洗组',specAlias:'免淘米',yieldRate:'95',cutSpec:{shape:'原状'}} + {groupId:'g1',alias:'普洗组',specAlias:'洗净米',yieldRate:'97',cutSpec:{shape:'原材'}}, + {groupId:'g1',alias:'普洗组',specAlias:'免淘米',yieldRate:'95',cutSpec:{shape:'原材'}} ], crowd:[{name:'全人群',level:'推荐'},{name:'糖尿病人群',level:'适量'}], nutri:{calorie:346,protein:7.4,fat:0.6,carbohydrate:77.2,dietary_fiber:0.7, @@ -978,8 +978,8 @@ var EDIT_FOODS = { taste:{main:'鲜味',sub:'蛋香',intensity:'中',desc:'蛋白柔和，蛋黄浓郁'}, texture:{main:'嫩滑',chew:'易',digest:'易',desc:'水煮蛋弹嫩，炒蛋软嫩，蒸蛋细腻',cook:'蒸蛋口感最软，适合各年龄段'}}, '0201001':{name:'菠菜(生)',code:'0201001',alias:'波斯菜',firstClass:'蔬菜类',secondClass:'叶菜类',edible:'89',waterRate:'91.2',dataSource:'0',basePrice:'4.2',vegTypes:[ - {groupId:'g1',alias:'段类组',specAlias:'净菜',yieldRate:'90',cutSpec:{shape:'原状'}}, - {groupId:'g1',alias:'段类组',specAlias:'寸段',yieldRate:'88',cutSpec:{shape:'原状',length:50,width:'',height:'',technique:'直刀'}} + {groupId:'g1',alias:'段类组',specAlias:'净菜',yieldRate:'90',cutSpec:{shape:'原材'}}, + {groupId:'g1',alias:'段类组',specAlias:'寸段',yieldRate:'88',cutSpec:{shape:'原材',length:50,width:'',height:'',technique:'直刀'}} ], crowd:[{name:'全人群',level:'推荐'},{name:'肾结石人群',level:'慎食'}], nutri:{calorie:28,protein:2.6,fat:0.3,carbohydrate:4.5,dietary_fiber:1.7, diff --git a/web-admin/nutrition/doc/CHANGELOG.md b/web-admin/nutrition/doc/CHANGELOG.md index d7f2fdd..c00c343 100644 --- a/web-admin/nutrition/doc/CHANGELOG.md +++ b/web-admin/nutrition/doc/CHANGELOG.md @@ -1,5 +1,10 @@ # 营养用餐管理端 CHANGELOG +## [2026-08-21] feat: 净菜切配术语统一(原状→原材) + 净菜规格别名展示优化 + +- `din-ingredient-add.html` 净菜类型动态行:切配形状选项术语统一,「原状」改为「原材」(含编辑模式 mock 数据 `cutSpec.shape`) +- `din-dish-own.html` 菜品自有明细:净菜规格别名展示优化,去掉左边距,别名前加 `.` 点号前缀 + ## [2026-08-20] feat: 订餐终端净菜包货柜 + 净菜加工包装规格 + 包装标签状态列 - `din-terminal.html` 订餐终端设备概览:货柜 Tab 新增「净菜包货柜」,货柜数据模型新增 `itemLabel`/`unit` 字段,支持按包装单位(袋/件/箱)展示,非 kg 单位数量取整数