From 370e2aa3aa67f99b2ccfe495d2cd1450f79c8a0d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 24 九月 2024 11:41:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/系统管理/按钮设置/Xt_ModuleButtonSet.html | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 19851e3..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"
@@ -11,7 +11,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
- <style>
+ <!--<style>
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
.layui-table-cell {
overflow: visible !important;
@@ -22,7 +22,7 @@
margin-left: -15px;
margin-right: -15px;
}
- </style>
+ </style>-->
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
@@ -78,6 +78,8 @@
var btnNameList = params[params[3]]; //鎸夐挳鍚嶇О鍒楄〃
var btnOrderList = params[params[4]]; //鎸夐挳娆″簭鍒楄〃
var HUserName = sessionStorage["HUserName"]; //鐢ㄦ埛鍚�
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂囥�� 娉細HBillType 鏄弬鏁板懡鍚嶏紝涓嶆槸鍊�
+ HBillType = getParams("HBillType");
//瀵筓RI 杩涜瑙ｇ爜
btnIdList = decodeURI(btnIdList);
@@ -149,6 +151,18 @@
get_Display();
}
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return null;
+ };
+
//鏌ヨ
function get_Display() {
var ajaxLoad = layer.load();
@@ -168,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;
@@ -211,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 }
]]
};
}
@@ -228,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