From 952a20f1c005d80e9bf881287c40e6f4e4266a0b Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:34:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/components/Table/lims-table.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 9f948f0..9b35d19 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -13,7 +13,7 @@
:row-style="rowStyle"
:row-key="rowKey"
:span-method="spanMethod"
- stripe
+ :stripe="stripe"
style="width: 100%"
tooltip-effect="dark"
@row-click="rowClick"
@@ -153,14 +153,11 @@
<el-upload
:action="
javaApi +
- o.url +
- '?id=' +
- (o.uploadIdFun ? o.uploadIdFun(scope.row) : scope.row.id)
+ o.url
"
size="mini"
ref="upload"
:multiple="o.multiple ? o.multiple : false"
- :limit="1"
:disabled="o.disabled ? o.disabled(scope.row) : false"
:accept="
o.accept
@@ -170,6 +167,8 @@
v-if="o.type == 'upload' && o.url"
style="display: inline-block; width: 50px"
v-show="o.showHide ? o.showHide(scope.row) : true"
+ :data="o.data ? o.data(scope.row) : {}"
+ :before-upload="o.beforeUpload ? o.beforeUpload(scope.row) : () => true"
:headers="uploadHeader"
:on-error="onError"
:on-exceed="onExceed"
@@ -217,11 +216,13 @@
<!-- 鍙偣鍑荤殑鏂囧瓧 -->
<div
v-else-if="item.dataType == 'link'"
- class="cell link"
+ class="cell"
style="width: 100%"
- @click="goLink(scope.row, item.linkMethod)"
+ @click="goLink(scope.row, item.linkEvent)"
>
- <span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
+ <span class="link" v-if="!item.formatData">
+ {{ scope.row[item.prop] }}
+ </span>
</div>
<!-- 榛樿绾睍绀烘暟鎹� -->
<div v-else class="cell" style="width: 100%">
@@ -354,6 +355,10 @@
type: Boolean,
default: false,
},
+ stripe: {
+ type: Boolean,
+ default: false,
+ },
headerCellStyle: {
type: Object,
default: () => {
@@ -453,6 +458,7 @@
this.$message.success("涓婁紶鎴愬姛");
}
}
+ this.$refs.upload.clearFiles();
},
onError(err, file, fileList) {
this.$message.error("涓婁紶澶辫触");
@@ -470,11 +476,11 @@
return (this.page.current - 1) * this.page.size + index + 1;
},
// 鐐瑰嚮鍗曞厓鏍糽ink浜嬩欢
- goLink(row, linkMethod) {
- if (!linkMethod) {
+ goLink(row, linkEvent) {
+ if (!linkEvent) {
return this.$message.warning("璇烽厤缃甽ingk浜嬩欢");
}
- this.$parent[linkMethod](row);
+ linkEvent.vueComponent[linkEvent.method](row);
},
// 鍚堝苟鍗曞厓鏍�
calculateSpanInfo() {
--
Gitblit v1.9.3