From 5a41caded26a3b4a5aeb9cbcd83ba4fcf60fd3ee Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 10 十一月 2025 16:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/layuiadmin/HideButton_New.js | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/WebTM/layuiadmin/HideButton_New.js b/WebTM/layuiadmin/HideButton_New.js
index 416cfca..781e409 100644
--- a/WebTM/layuiadmin/HideButton_New.js
+++ b/WebTM/layuiadmin/HideButton_New.js
@@ -22,8 +22,12 @@
//鑾峰彇鎸夐挳闅愯棌璁剧疆绐楀彛鏂囦欢璺緞
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+
+ var viewsLocation = urlStr.indexOf('views')
+ var viewsLocation = urlStr.indexOf('views')
+ urlStr = urlStr.substring(viewsLocation + 6, urlStr.length)
var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
+ for (var i = 0; i < urlLen.length - 1; i++) {
contentUrl += "../";
}
contentUrl += '绯荤粺绠＄悊/鎸夐挳璁剧疆/Xt_ModuleButtonSet.html?HModName=' + HModName + '&HBillType=' + HBillType + "&btnIdList=" + btnIdList + "&btnNameList=" + btnNameList + "&btnOrderList=" + btnOrderList + "&HUserName=" + HUserName;
@@ -81,6 +85,7 @@
, "HClassValue": btns[i].getAttribute('class')
, "HLay_Event": btns[i].getAttribute('lay-event')
, "HValue": btns[i].innerText
+ , "childLiElement": btns[i].querySelectorAll('i')
})
//璁板綍鏁版嵁搴撲腑娌℃湁璁剧疆鏁版嵁鐨勬寜閽妭鐐圭殑淇℃伅
if ($.inArray(btns[i].id, btnsData_InDataBase) == -1) {
@@ -106,7 +111,16 @@
child.className = btns_info[index_temp].HClassValue;
child.setAttribute('lay-event', btns_info[index_temp].HLay_Event);
child.id = btns_info[index_temp].HButtonID;
- child.innerHTML = data1.data[i]["HOtherName"] == "" ? btns_info[index_temp].HValue : data1.data[i]["HOtherName"];
+
+ if (btns_info[index_temp].childLiElement.length > 0) {
+ child.appendChild(btns_info[index_temp].childLiElement[0]);
+ }
+
+ var element_i = document.createElement('text');
+ element_i.innerHTML = btns_info[index_temp].HValue;
+ child.appendChild(element_i);
+
+ //child.innerHTML = data1.data[i]["HOtherName"] == "" ? btns_info[index_temp].HValue : data1.data[i]["HOtherName"];
if (data1.data[i]["HHideFlag"] == true) {
child.style = "display:none;";
} else {
@@ -127,7 +141,16 @@
child.className = btns_info[index_temp].HClassValue;
child.setAttribute('lay-event', btns_info[index_temp].HLay_Event);
child.id = btns_info[index_temp].HButtonID;
- child.innerHTML = btns_info[index_temp].HValue;
+
+ if (btns_info[index_temp].childLiElement.length > 0) {
+ child.appendChild(btns_info[index_temp].childLiElement[0]);
+ }
+
+ var element_i = document.createElement('text');
+ element_i.innerHTML = btns_info[index_temp].HValue;
+ child.appendChild(element_i);
+
+ //child.innerHTML = btns_info[index_temp].HValue;
child.style = "display:inline;";
// 灏嗗瓙鑺傜偣娣诲姞鍒扮埗鑺傜偣涓�
--
Gitblit v1.9.1