From eaff2fbd473362115c8c45e22b86b2ecb73e5a97 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 10 九月 2026 15:17:12 +0800
Subject: [PATCH] 新疆——新聚lims 1.标准库层级需要修改层级，行业-标准，总共两级；实验室换成行业 2.每个标准下的检验项列表加一个搜索查询功能
---
src/workers/InspectionWorker.worker.js | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/workers/InspectionWorker.worker.js b/src/workers/InspectionWorker.worker.js
index 5736162..5cd696e 100644
--- a/src/workers/InspectionWorker.worker.js
+++ b/src/workers/InspectionWorker.worker.js
@@ -10,7 +10,7 @@
let comparisonList = [];
// 褰撳墠鏍峰搧淇℃伅
let currentSample = {};
-// 褰撳墠椤圭洰锛氭娴嬩腑蹇冦�佽澶囩數缂�
+// 褰撳墠椤圭洰锛氭娴嬩腑蹇�
let PROJECT = "";
// 濂楃
let bushing = "";
@@ -30,6 +30,9 @@
let getDataTypeId = null;
//褰撳墠妫�楠岄」
let currentInsItem = null;
+// 褰撳墠杩欐杈撳叆瀵瑰簲鐨勫師濮嬫楠岄」銆傝绠楄繃绋嬩腑 pId 浼氬垏鎹㈠埌涓嬫父璁＄畻椤癸紝
+// 淇濆瓨鏃跺繀椤诲悓鏃跺甫鍥炲師濮嬫楠岄」锛屽惁鍒欏彧浼氫繚瀛樿绠楃粨鏋溿��
+let sourceInsItemId = null;
// 鎺ユ敹鍒颁富绾跨▼澶勭悊閫昏緫鐨勬秷鎭�
self.onmessage = function (event) {
// 淇濆瓨涓荤嚎绋嬩紶杩囨潵鐨勫��
@@ -54,6 +57,11 @@
}
modelType = data.modelType;
code = data.code;
+ const codeParts = typeof code === "string" ? code.split("-") : [];
+ sourceInsItemId =
+ data.currentInsItem && data.currentInsItem.i != null
+ ? data.currentInsItem.i
+ : codeParts[3];
if (data.getDataTypeId) {
// 璁板綍 浼樺寲鏁伴噰杈冨鏁版嵁鏃�-璁板綍鏈�鍚庝竴涓楠岄」鐨刬d
getDataTypeId = data.getDataTypeId;
@@ -490,6 +498,7 @@
param: getParam(), //浼犵粰鍚庣鐨勫弬鏁�
getDataTypeId: getDataTypeId,
currentInsItemId: item.i,
+ sourceInsItemId: sourceInsItemId,
},
};
// 鍙戞秷鎭粰涓荤嚎绋�
@@ -514,7 +523,7 @@
tell.length > 0 &&
typeof tell[0] == "string" &&
tell[0].includes("/") &&
- tell[0] !== "/"; // 瑁呭鐢电紗--鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
+ tell[0] !== "/"; // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
const inspectionItemClass = currentSample.insProduct.find(
(m) => m.id == item.i
).inspectionItemClass; // 妫�楠岄」鍒嗙被
@@ -703,6 +712,7 @@
param: getParam(), //浼犵粰鍚庣鐨勫弬鏁�
getDataTypeId: getDataTypeId,
currentInsItemId: currentInsItemId,
+ sourceInsItemId: sourceInsItemId,
},
};
// 鍙戞秷鎭粰涓荤嚎绋�
@@ -847,7 +857,11 @@
b.v.ps.value.includes("妫�楠屽��")
) {
// 璧嬪�兼楠屽��
- b.i && b.v.v && param[b.i].insValue.push(b);
+ b.i &&
+ b.v.v !== "" &&
+ b.v.v !== null &&
+ b.v.v !== undefined &&
+ param[b.i].insValue.push(b);
}
if (b.v.ps != undefined && b.v.ps.value === "璁＄畻鍊�") {
// 璧嬪�艰绠楀��
--
Gitblit v1.9.3