From e3a05337b453b5f09e977f4196930e8c245fb139 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 15 九月 2026 10:47:49 +0800
Subject: [PATCH] fix: 1.检验保存优化 2.设备选择 3.检验复核合格不合格选择
---
src/workers/InspectionWorker.worker.js | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/workers/InspectionWorker.worker.js b/src/workers/InspectionWorker.worker.js
index a8756a7..f838022 100644
--- a/src/workers/InspectionWorker.worker.js
+++ b/src/workers/InspectionWorker.worker.js
@@ -35,6 +35,8 @@
// 褰撳墠杩欐杈撳叆瀵瑰簲鐨勫師濮嬫楠岄」銆傝绠楄繃绋嬩腑 pId 浼氬垏鎹㈠埌涓嬫父璁＄畻椤癸紝
// 淇濆瓨鏃跺繀椤诲悓鏃跺甫鍥炲師濮嬫楠岄」锛屽惁鍒欏彧浼氫繚瀛樿绠楃粨鏋溿��
let sourceInsItemId = null;
+// 褰撳墠娑堟伅鐗堟湰銆俉orker 鍗曠嚎绋嬩覆琛屽鐞嗘秷鎭紝渚涢�掑綊鍏紡璁＄畻瀹屾垚鍚庡洖浼犵粰涓荤嚎绋嬨��
+let currentRevision = null;
/**
* 鐢熸垚妯℃澘缁撴瀯绛惧悕
@@ -68,6 +70,7 @@
self.onmessage = function (event) {
// 淇濆瓨涓荤嚎绋嬩紶杩囨潵鐨勫��
const data = JSON.parse(event.data);
+ currentRevision = data.revision;
// 妯℃澘鍐呭鍙樹簡(涓嶅彧鏄ā鏉縤d鍙樹簡)涔熻鍒锋柊琛ㄦ牸,鍚﹀垯鏀瑰畬妯＄増鍚� Worker 浠嶇敤鏃фā鏉胯绠楀苟鎶婃棫鐗堝紡鍥炲啓椤甸潰
const nextTemplateSig = buildTemplateSig(data.tableList);
if (
@@ -468,6 +471,7 @@
// 璧嬪�间紶閫掑埌涓荤嚎绋嬬殑鏁版嵁锛宮ethod锛歴aveInsContext琛ㄧず姝ゆ秷鎭渶瑕佷繚瀛樻暟鎹�
result = {
method: "saveInsContext",
+ revision: currentRevision,
value: {
tableList, // 琛ㄦ牸鏁版嵁
param: getParam(), //浼犵粰鍚庣鐨勫弬鏁�
@@ -483,6 +487,7 @@
// 璧嬪�煎绾跨▼浼犺緭鏁版嵁
result = {
method: "tableList",
+ revision: currentRevision,
value: tableList,
};
// 鍙戦�佷富绾跨▼鏁版嵁
@@ -589,6 +594,13 @@
const resultParam = {};
tableList.forEach((t) => {
resultParam[t.templateId] = {};
+ const cells = (t.arr || []).reduce((all, row) => all.concat(row), []);
+ const resultHeader = cells.find((cell) =>
+ cell.v && String(cell.v.v || "").trim() === "妫�楠岀粨鏋�"
+ );
+ const exportRows = new Set(cells.filter((cell) =>
+ cell.v && cell.v.ps && cell.v.ps.value === "瀵煎嚭鍊�"
+ ).map((cell) => cell.r));
(t.arr || []).forEach((a) => {
a.forEach((b) => {
const isEditable =
@@ -598,10 +610,12 @@
b.v.ps.value === "璁＄畻鍊�" ||
b.v.ps.value === "鏈�缁堝��" ||
b.v.ps.value === "璁惧鍚嶇О");
- if (!isEditable) {
+ const isExportResult = resultHeader && exportRows.has(b.r) && b.c === resultHeader.c;
+ if (!isEditable && !isExportResult) {
return;
}
if (
+ isEditable &&
b.v.ps.value.includes("妫�楠屽��") &&
(b.v.v === "" || b.v.v === null || b.v.v === undefined)
) {
--
Gitblit v1.9.3