From 14f31e66bae9fac4217bd5a18ed775952af57e94 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 03 十一月 2026 18:09:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/business/inspectionTask/inspection.vue | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 0a6299a..ce6b984 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -280,14 +280,14 @@
</template>
<template v-else-if="
n.v.ps != undefined &&
- n.v.ps.value === '璁$畻鍊�' &&
+ isInspectionValueAnnotation(n.v.ps.value, '璁$畻鍊�') &&
state == 1
"><span :style="`font-family:${n.v.ff} !important;`">{{
n.v.v
}}</span></template>
<template v-else-if="
n.v.ps != undefined &&
- n.v.ps.value === '鏈�缁堝��' &&
+ isInspectionValueAnnotation(n.v.ps.value, '鏈�缁堝��') &&
state == 1
">
<span :style="`font-family:${n.v.ff} !important;`">{{
@@ -523,7 +523,7 @@
import { mapGetters } from "@/utils/store-compat";
import viewManHourDia from "@/views/business/inspectionTask/components/viewManHourDia.vue";
import {getDicts} from "@/api/system/dict/data";
-import { parseInspectionValueAnnotation, formatInspectionValue } from "@/utils/inspectionValueFormat";
+import { parseInspectionValueAnnotation, formatInspectionValue, isInspectionValueAnnotation } from "@/utils/inspectionValueFormat";
export default {
name: 'Inspection',
components: {
@@ -838,6 +838,7 @@
this.stopWorker();
},
methods: {
+ isInspectionValueAnnotation,
syncRouteContext() {
const { sonLaboratory, orderId, state, inspectorList, typeSource, taskSource } = this.$route.query;
const orderChanged = this.id !== orderId;
@@ -1509,8 +1510,8 @@
b.v.ps != undefined &&
typeof b.v.ps.value === "string" &&
(b.v.ps.value.includes("妫�楠屽��") ||
- b.v.ps.value === "璁$畻鍊�" ||
- b.v.ps.value === "鏈�缁堝��" ||
+ isInspectionValueAnnotation(b.v.ps.value, "璁$畻鍊�") ||
+ isInspectionValueAnnotation(b.v.ps.value, "鏈�缁堝��") ||
b.v.ps.value === "璁惧鍚嶇О")
) {
b.v["v"] = "";
@@ -1575,12 +1576,12 @@
if (value === undefined || value === null) {
return;
}
- cell.v.v = value;
+ cell.v.v = formatInspectionValue(value, parseInspectionValueAnnotation(cell.v.ps && cell.v.ps.value));
if (typeof item === "object" && item.u) {
cell.u = item.u;
}
this.param[a.templateId][key] = {
- v: value,
+ v: cell.v.v,
u: typeof item === "object" ? item.u : cell.u,
};
});
@@ -2012,8 +2013,8 @@
cell.v.ps != undefined &&
typeof cell.v.ps.value === "string" &&
(cell.v.ps.value.includes("妫�楠屽��") ||
- cell.v.ps.value === "璁$畻鍊�" ||
- cell.v.ps.value === "鏈�缁堝��" ||
+ isInspectionValueAnnotation(cell.v.ps.value, "璁$畻鍊�") ||
+ isInspectionValueAnnotation(cell.v.ps.value, "鏈�缁堝��") ||
cell.v.ps.value === "璁惧鍚嶇О");
const isExportResult = resultHeader && exportRows.has(cell.r) && cell.c === resultHeader.c;
if (!isEditable && !isExportResult) {
@@ -2335,6 +2336,23 @@
flex: 0 0 360px;
}
+/* 澶嶆牳鏃堕�夋嫨妗嗙鐢紝鐩存帴灞曞紑瀹屾暣璁惧鍚嶇О鍜岀紪鍙枫�� */
+.template-panel:deep(.device-select .el-tag) {
+ height: auto;
+ min-height: 24px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ max-width: 100%;
+}
+
+.template-panel:deep(.device-select .el-select__tags-text) {
+ white-space: normal;
+ overflow-wrap: anywhere;
+ overflow: visible;
+ text-overflow: clip;
+ line-height: 1.5;
+}
+
.template-panel__unit {
margin-left: 4px;
color: var(--lims-text-2);
--
Gitblit v1.9.3