From ce2570f8555ff6668da4f149521b4620bdd9d8bf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 23 九月 2026 15:25:22 +0800
Subject: [PATCH] feat(order): 添加订单委托要求字段并优化界面流程 - 新增分包内容、样品处置、结果评价、报告交付方式等委托要求字段 - 添加分包单位信息、报告寄送地址、收件人电话等关联信息录入功能 - 更新订单状态标签，新增作废状态和全部状态页签 - 调整报告准备页面审批流程，防止审核人和批准人为同一人
---
src/utils/standardTree.js | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/utils/standardTree.js b/src/utils/standardTree.js
index c69f81e..9f96784 100644
--- a/src/utils/standardTree.js
+++ b/src/utils/standardTree.js
@@ -36,7 +36,10 @@
let cur = node;
while (cur && cur.parent) {
if (isLeaf(cur.data)) {
- tokens.push(cur.label, leafMarker);
+ const leafValue = cur.data && cur.data.standardMethodId
+ ? (cur.data.value || cur.label)
+ : cur.label;
+ tokens.push(leafValue, leafMarker);
} else {
tokens.push(cur.label);
}
@@ -75,6 +78,14 @@
// 鍘绘帀璺緞鏈锛岀敤浜庛�屽綋鍓嶆槸鍙跺瓙浣嗘煡涓嶅埌鏍囧噯銆嶆椂鍥為��鍒扮埗绾ф煡璇�
export function dropLastLabel(path) {
if (!path) return '';
- const idx = path.lastIndexOf(' - ');
- return idx === -1 ? '' : path.slice(0, idx);
+ const tokens = path.split(' - ');
+ if (tokens.length <= 1) return '';
+ // 鍙跺瓙璺緞鏍煎紡涓衡�滆涓� - null - 鏍囧噯鈥濇垨鈥滆涓� - - 鏍囧噯鈥濄��
+ // 鍘绘帀鏍囧噯鍚嶅悗杩樿鍘绘帀浠呯敤浜庢爣璇嗗彾瀛愮殑鍗犱綅娈碉紝鐖惰矾寰勬墠鏄湡瀹炵殑琛屼笟璺緞銆�
+ tokens.pop();
+ const marker = tokens[tokens.length - 1];
+ if (marker === '' || marker === 'null') {
+ tokens.pop();
+ }
+ return tokens.join(' - ');
}
--
Gitblit v1.9.3