feat: 净菜切配术语统一(原状→原材) + 净菜规格别名展示优化

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
fengpu
2026-08-21 10:18:05 +08:00
co-authored by Claude Opus 4.7
parent 3bdc47629c
commit 2d8b9e1b23
3 changed files with 12 additions and 7 deletions
+2 -2
View File
@@ -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
? '<span class="net-type">'+netName+'</span><span class="net-type-alias">'+c.netSpecAlias+'</span>'
? '<span class="net-type">'+netName+'</span><span class="net-type-alias">.'+c.netSpecAlias+'</span>'
: '<span class="net-type">'+netName+'</span>';
var typeTag = c.type==='主材'?'blue':c.type==='调料'?'orange':'gray';
return '<tr><td>'+(c.code||'—')+'</td><td>'+(c.name||'—')+'</td><td><span class="tag tag-'+typeTag+'">'+(c.type||'辅材')+'</span></td><td>'+netTypeHtml+'</td><td>'+(c.amount||0)+'g</td></tr>';
+5 -5
View File
@@ -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,
+5
View File
@@ -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 单位数量取整数