From 240fa2b20900b8c2542f6bc5d912d7f647ad0b64 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 19 二月 2025 16:31:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/inspectionTask/index.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 8c58f11..71998c7 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -167,7 +167,7 @@
:column="column"
:page="page"
:tableLoading="tableLoading"
- :height="'calc(100vh - 290px)'"
+ :height="'calc(100vh - 300px)'"
@pagination="pagination"
key="tableData0"
></lims-table>
@@ -727,15 +727,14 @@
label: "鏍峰搧缂栧彿",
prop: "sampleCode",
width: "140px",
- dataType: "link",
- linkMethod: "selectAllByOne",
+ mergeCol: true, //鍚堝苟鍒�
},
- { label: "鏍峰搧鍚嶇О", prop: "sample", width: "140px" },
+ { label: "鏍峰搧鍚嶇О", prop: "sample", width: "140px", mergeCol: true },
{ label: "妫�楠岄」鍒嗙被", prop: "inspectionItemClass" },
{ label: "妫�楠岄」", prop: "inspectionItem", width: "140px" },
{ label: "妫�楠屽瓙椤�", prop: "inspectionItemSubclass" },
{ label: "鍗曚綅", prop: "unit" },
- { label: "鏍峰搧鍨嬪彿", prop: "model" },
+ { label: "鏍峰搧鍨嬪彿", prop: "model", mergeCol: true },
{ label: "鏉′欢", prop: "radius" },
{ label: "鐢电紗鏍囪瘑", prop: "cableTag" },
{ label: "璇曢獙瑕佹眰", prop: "tell" },
--
Gitblit v1.9.3