From 5bdee15c4bba881d9cb991dd18b40613375bb41e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 17 二月 2025 10:06:07 +0800
Subject: [PATCH] Merge branch 'dev-licp' into dev
---
src/components/Table/lims-table.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index df1c423..513b568 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -31,7 +31,7 @@
:filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue"
:filters="item.filters" :fixed="item.fixed" :label="item.label"
:min-width="item.minWidth" :prop="item.prop"
- :show-overflow-tooltip="item.showOverflowTooltip"
+ show-overflow-tooltip
:sortable="item.sortable ? true : false" :type="item.type" :width="item.width"
align="center">
<!-- <div class="123" v-if="item.type == ''"> -->
@@ -68,17 +68,19 @@
<template v-for="(o, key) in item.operation">
<el-button
v-if="o.type!='upload'"
+ size="mini"
v-show="o.showHide ? o.showHide(scope.row) : true"
:disabled="o.disabled ? o.disabled(scope.row) : false"
- :icon="o.icon | iconFn(scope.row)"
- :plain="o.plain" :size="o.size"
- :style="{ 'color': o.color }"
+ :icon="iconFn(o)"
+ :plain="o.plain"
+ :style="{ 'color': o.name === '鍒犻櫎' ? '#f56c6c' : o.color }"
:type="o.type | typeFn(scope.row)"
@click="o.clickFun(scope.row)">
{{ o.name }}
</el-button>
<el-upload
action="#"
+ size="mini"
:on-change="(file, fileList)=>o.clickFun(scope.row,file, fileList)"
:multiple="o.multiple?o.multiple:false"
:limit="o.limit?o.limit:1"
@@ -165,11 +167,6 @@
export default {
name: 'ZTTable',
filters: {
- iconFn(val, row) {
- if (typeof (val) === 'function') {
- return val(row);
- } else return val;
- },
typeFn(val, row) {
// console.log(val, row, '11111111');
if (typeof (val) === 'function') {
@@ -275,6 +272,20 @@
},
methods: {
+ iconFn(row) {
+ if (row.name === '缂栬緫') {
+ return 'el-icon-edit'
+ } else if (row.name === '鍒犻櫎') {
+ return 'el-icon-delete'
+ } else if (row.name === '鏌ョ湅') {
+ return 'el-icon-view'
+ } else {
+ return row.icon
+ }
+ // if (typeof (val) === 'function') {
+ // return val(row);
+ // } else return val;
+ },
formatType(val, format) {
if (typeof (format) === 'function') {
return format(val);
--
Gitblit v1.9.3