From 47ab3b599d4765161d4adaf5b9a368429b152845 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 11 四月 2024 14:30:00 +0800
Subject: [PATCH] 添加按钮

---
 src/views/common/ztt-table.vue |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 0701521..4fc75c2 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -150,6 +150,7 @@
         v-on="$listeners"
         :highlight-current-row="true"
         :row-key="rowKey"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         @row-dblclick="dbClickRow"
         @row-contextmenu="contextMenu"
         @header-click="headClick"
@@ -182,6 +183,7 @@
           v-if="options.multiSelect && !isEdit"
           style="width: 55px;"
           :selectable="selectHandle"
+
         >
         </el-table-column>
         <!--鍗曢�夋-->
@@ -324,8 +326,13 @@
               <template v-else>
                 <template v-if="!item.render">
                   <template v-if="item.formatter">
-                    <span v-if="item.isTag" style="text-align: center;">
+                    <span v-if="item.isTag&&scope.row[item.prop]!=null" style="text-align: center;">
                       <el-tag style="width:60px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
+                        <span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
+                      </el-tag>
+                    </span>
+                    <span v-if="item.isTags&&scope.row[item.prop]!=null" style="text-align: center;">
+                      <el-tag style="width:60px;margin: 3px;" :type="scope.row[item.prop] == '姝e父' ? 'success' : (scope.row[item.prop] == '寮傚父'?'warning':(scope.row[item.prop] == '杩斾慨'?'danger':'info'))">
                         <span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
                       </el-tag>
                     </span>
@@ -571,7 +578,9 @@
     //闇�瑕佸悎骞剁殑瀛楁闆嗗悎
     mergeSpanArr: {
         type: Array,
-        default: []
+        default: ()=>{
+            return []
+        }
     },
     toolbarMaxLength: {
       type: Number,

--
Gitblit v1.9.3