From 6f90e7110190d146fde06cf1f5b2272fd49b53d6 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 17:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/standard/model/index.vue | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index 14b6e38..d4e0274 100644
--- a/src/views/standard/model/index.vue
+++ b/src/views/standard/model/index.vue
@@ -64,6 +64,7 @@
delStandardTemplate,
getEditTemplatePreparation,
} from "@/api/standard/model";
+import { validateInspectionValueAnnotation } from "@/utils/inspectionValueFormat";
export default {
name: 'Model',
components: {
@@ -162,7 +163,7 @@
page: {
total: 0,
size: 10,
- current: 0,
+ current: 1,
},
tableLoading: false,
};
@@ -349,7 +350,12 @@
}
}
}
+ let annotationError = null;
data.data[0].celldata.forEach((a) => {
+ if (a.v && a.v.ps && typeof a.v.ps.value === "string") {
+ const error = validateInspectionValueAnnotation(a.v.ps.value);
+ if (!annotationError && error) annotationError = `鍗曞厓鏍�(${a.r + 1}琛�${a.c + 1}鍒�)锛�${error}`;
+ }
if (
a.v.ps != undefined &&
(a.v.ps.value === "妫�楠屽��" ||
@@ -362,6 +368,11 @@
}
}
});
+ if (annotationError) {
+ this.loading = false;
+ this.$message.error(annotationError);
+ return;
+ }
upStandardTemplate({
id: this.row.id,
thing: JSON.stringify(data),
@@ -370,6 +381,9 @@
this.loading = false;
this.$message.success("宸蹭繚瀛�");
this.isShow = false;
+ }).catch((error) => {
+ this.loading = false;
+ this.$message.error(error.message || "妯℃澘淇濆瓨澶辫触");
});
},
isClose(done) {
@@ -409,7 +423,7 @@
width: 88px;
font-size: 14px;
font-weight: 700;
- color: #606266;
+ color: var(--lims-text-2);
}
.search_button {
line-height: 26px;
--
Gitblit v1.9.3