From 43745249ed7ed29629a65a07623a0f47bb37b289 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 13 九月 2024 20:48:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/系统管理/按钮设置/Xt_ModuleButtonSet.html | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\214\211\351\222\256\350\256\276\347\275\256/Xt_ModuleButtonSet.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\214\211\351\222\256\350\256\276\347\275\256/Xt_ModuleButtonSet.html"
index f5cf8e8..ceb97c8 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\214\211\351\222\256\350\256\276\347\275\256/Xt_ModuleButtonSet.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\214\211\351\222\256\350\256\276\347\275\256/Xt_ModuleButtonSet.html"
@@ -182,15 +182,15 @@
for (var j = 0; j < data1.count; j++) {
if (btnIdLists[i] == data1.data[j]["HButtonID"]) {
if (data1.data[j]["HEditFlag"] == false) {
- no_edit.push({ "HBillType": data1.data[j]["HBillType"], "HModuleName": data1.data[j]["HModuleName"], "HButtonID": data1.data[j]["HButtonID"], "HButtonName": data1.data[j]["HButtonName"], "HOrder": data1.data[j]["HOrder"], "HHideFlag": data1.data[j]["HHideFlag"], "HEditFlag": data1.data[j]["HEditFlag"] });
+ no_edit.push({ "HBillType": data1.data[j]["HBillType"], "HModuleName": data1.data[j]["HModuleName"], "HButtonID": data1.data[j]["HButtonID"], "HButtonName": data1.data[j]["HButtonName"], "HOrder": data1.data[j]["HOrder"], "HHideFlag": data1.data[j]["HHideFlag"], "HEditFlag": data1.data[j]["HEditFlag"], "HOtherName": data1.data[j]["HOtherName"] });
} else {
- data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": data1.data[j]["HHideFlag"] });
+ data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": data1.data[j]["HHideFlag"], "HOrder": btnOrderLists[i], "HOtherName": data1.data[j]["HOtherName"] });
}
break;
}
}
if (data.length + no_edit.length == i) {
- data.push({ "BtnID": btnIdLists[i],"BtnName": btnNameLists[i], "IsHide": false });
+ data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": false, "HOtherName": "" });
}
}
option.data = data;
@@ -225,7 +225,9 @@
, cols: [[
{ field: 'BtnID', title: '鎸夐挳ID', width: 100, hide: false }
,{ field: 'BtnName', title: '鎸夐挳鍚�', width: 100 }
- , { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
+ , { field: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
+ , { field: 'HOtherName', title: '鍒悕', width: 100, edit: true }
+ , { field: 'HOrder', title: '娆″簭', width: 100, edit:true }
]]
};
}
@@ -242,6 +244,13 @@
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
tableData.push(table.cache["mainTable"][i])
+
+
+ //鏇存柊娆″簭鍒楄〃
+ var index_temp = $.inArray(table.cache["mainTable"][i].BtnID, btnIdLists);
+ if (index_temp != -1) {
+ btnOrderLists[index_temp] = (table.cache["mainTable"][i].HOrder == "" ? 0 : table.cache["mainTable"][i].HOrder);
+ }
}
}
--
Gitblit v1.9.1