From a0431deb4d557cd50d304df885a275edf1390f56 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 16 一月 2025 17:34:32 +0800
Subject: [PATCH] 1、修改属性报错修护。 2、修改用户信息增加个人信息处修改判断处理。

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
index 4007355..2bc22b3 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
@@ -5,10 +5,12 @@
       <!--top灞曠ず琛ㄦ牸涓婃柟鍖哄煙 menu灞曠ず琛ㄦ牸鎿嶄綔鏍忓尯鍩� 鏃犲氨鏄粯璁� -->
       <el-tooltip v-if="LocationType === 'top'" v-for="item in basicButtonList.top" :content="item.description || item.name" placement="top">
         <el-button :key="item.oid"
-                   :icon="item.paramVOS && item.paramVOS.icon ? item.paramVOS.icon :''"
                    :type="item.paramVOS && item.paramVOS.btnType ?  item.paramVOS.btnType : 'primary'" plain
                    size="small"
-                   @click="buttonClick(item)">{{ item.name }}</el-button>
+                   class="button-custom-icon"
+                   @click="buttonClick(item)">
+          <icon-show :name="item.iconPath"></icon-show>{{ item.name }}
+        </el-button>
       </el-tooltip>
 
       <el-button type="text" @click="handleDefaultAddChildren(scope.row)" v-if="(LocationType === 'menu' && type === 'TreeTable')">鏂板瀛愮骇</el-button>
@@ -16,10 +18,14 @@
 
       <el-tooltip v-if="LocationType === 'menu'" v-for="item in basicButtonList.menu" :content="item.description || item.name" placement="top">
         <el-button :key="item.oid"
-                   :icon="item.paramVOS.icon ? item.paramVOS.icon : (item.id === 'edit' ? 'el-icon-edit' : (item.id === 'delete'  ||item.id === 'del' ? 'el-icon-delete' : ''))"
                    :type="item.paramVOS.btnType || 'text'" plain
                    size="small"
-                   @click="buttonClick(item,scope.row)">{{ item.name }}</el-button>
+                   class="button-custom-icon"
+                   @click="buttonClick(item,scope.row)">
+          <icon-show v-if="item.iconPath" :name="item.iconPath"></icon-show>
+          <i v-else :class="item.id === 'edit' ? 'el-icon-edit' : (item.id === 'delete'  ||item.id === 'del' ? 'el-icon-delete' : '')"></i>
+          {{ item.name }}
+        </el-button>
       </el-tooltip>
 
       <!-- 琛ㄦ牸鍐呮寜閽搷浣滃璇濇琛ㄥ崟   -->
@@ -29,25 +35,30 @@
     <div v-else-if="type === 'form'">
       <el-tooltip v-for="item in basicButtonList" :content="item.description || item.name" placement="top">
         <el-button :key="item.oid"
-                   :icon="item.paramVOS && item.paramVOS.icon ? item.paramVOS.icon :''"
                    :type="item.paramVOS && item.paramVOS.btnType ?  item.paramVOS.btnType : 'primary'" plain
                    plain
                    size="small"
-                   @click="buttonClick(item)">{{ item.name }}</el-button>
+                   class="button-custom-icon"
+                   @click="buttonClick(item)">
+          <icon-show :name="item.iconPath"></icon-show>{{ item.name }}
+        </el-button>
       </el-tooltip>
     </div>
     <div v-else-if="type === 'tree'" class="tree-buttons">
       <el-tooltip v-for="item in basicButtonList" :content="item.description || item.name" placement="top">
         <el-button :key="item.oid"
-                   :icon="item.paramVOS && item.paramVOS.icon ? item.paramVOS.icon :''"
                    :type="item.paramVOS && item.paramVOS.btnType ?  item.paramVOS.btnType : 'primary'" plain
                    plain
                    size="small"
-                   @click="buttonClick(item)">{{ item.name }}</el-button>
+                   class="button-custom-icon"
+                   @click="buttonClick(item)">
+          <icon-show :name="item.iconPath"></icon-show>{{ item.name }}
+        </el-button>
       </el-tooltip>
       <el-button type="primary"
                  plain
                  size="small"
+                 class="button-custom-icon"
                  @click="$emit('refresh')">鍒锋柊</el-button>
     </div>
   </div>

--
Gitblit v1.9.3