From 0adec6bd6536f550ab0069f651d948b246d348c3 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 19 二月 2025 15:21:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/Table/lims-table.vue | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 77fad98..bea03b5 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -19,7 +19,12 @@
@current-change="currentChange"
@selection-change="handleSelectionChange"
>
- <el-table-column align="center" type="selection" width="55" v-if="isSelection" />
+ <el-table-column
+ align="center"
+ type="selection"
+ width="55"
+ v-if="isSelection"
+ />
<el-table-column
align="center"
label="搴忓彿"
@@ -170,6 +175,15 @@
</el-upload>
</template>
</div>
+ <!-- 鍙偣鍑荤殑鏂囧瓧 -->
+ <div
+ v-else-if="item.dataType == 'link'"
+ class="cell link"
+ style="width: 100%"
+ @click="goLink(scope.row, item.linkMethod)"
+ >
+ <span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
+ </div>
<!-- 榛樿绾睍绀烘暟鎹� -->
<div v-else class="cell" style="width: 100%">
<span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
@@ -294,7 +308,7 @@
},
border: {
type: Boolean,
- default: false,
+ default: true,
},
highlightCurrentRow: {
type: Boolean,
@@ -389,6 +403,13 @@
// return index * 2;
return (this.page.current - 1) * this.page.size + index + 1;
},
+ // 鐐瑰嚮鍗曞厓鏍糽ink浜嬩欢
+ goLink(row, linkMethod) {
+ if (!linkMethod) {
+ return this.$message.warning("璇烽厤缃甽ingk浜嬩欢");
+ }
+ this.$parent[linkMethod](row);
+ },
},
};
</script>
@@ -397,14 +418,19 @@
.el-table >>> .el-table__empty-text {
text-align: center;
}
+
+>>> .cell {
+ padding: 0 !important;
+}
.cell {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding-right: 4px;
- padding-left: 4px;
+ padding-left: 10px;
}
->>> .cell {
- padding: 0 !important;
+.link {
+ color: rgb(64, 158, 255);
+ cursor: pointer;
}
</style>
--
Gitblit v1.9.3