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 | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 4f4d89e..513b568 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -71,7 +71,7 @@
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, o)"
+ :icon="iconFn(o)"
:plain="o.plain"
:style="{ 'color': o.name === '鍒犻櫎' ? '#f56c6c' : o.color }"
:type="o.type | typeFn(scope.row)"
@@ -167,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') {
@@ -277,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