From 7d67f1880b63e1cd621329706eb785f8642cccab Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 11 十月 2024 13:48:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/系统管理/按钮设置/Xt_ModuleButtonSet.html | 138 +++++++++++++++++----------------------------
1 files changed, 53 insertions(+), 85 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 79ccc98..5dcf3d4 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;">
@@ -42,70 +42,12 @@
</div>
</div>
</div>
- <!--<div class="layui-tab" lay-filter="tab-POStockInBill">
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍐荤粨鍒�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HFixCols" lay-verify="HFixCols" id="HFixCols">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瀛椾綋澶у皬</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HFontSize" lay-verify="HFontSize" id="HFontSize">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍒楀</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HColumnWidth" name="HColumnWidth" id="HColumnWidth">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">鐐瑰嚮鎺掑簭</label>
- <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
- <select name="HSortFlag" lay-verify="HSortFlag" id="HSortFlag">
- <option value=""></option>
- <option value="鏄�">鏄�</option>
- <option value="鍚�">鍚�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閫変腑琛屽悎璁�</label>
- <div class="layui-input-block" style="margin-left: 125px;width: 184px;">
- <select name="HSelTotal" lay-verify="HSelTotal" id="HSelTotal">
- <option value=""></option>
- <option value="鏄�">鏄�</option>
- <option value="鍚�">鍚�</option>
- </select>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>-->
</form>
</div>
</div>
</div>
</body>
</html>
-<!--琛屼笅鎷夐�夋嫨(瀵归綈鏂瑰紡)-->
-<!--<script type="text/html" id="Alignment">
- <select name="Alignment" lay-filter="Alignment" id="Alignment{{d.LAY_TABLE_INDEX+1}}">
- <option value="L">宸﹀榻�</option>
- <option value="M">灞呬腑</option>
- <option value="R">鍙冲榻�</option>
- </select>
-</script>-->
<!--澶嶉�夋 鏄惁闅愯棌-->
<script type="text/html" id="IsHide">
<div class="layui-input-block" style="margin-left: 20px;">
@@ -125,23 +67,32 @@
, table = layui.table
, form = layui.form
, element = layui.element;
- //鏌ヨ鏉′欢
- var sWhere = "";
- var option = [];
- //#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
+ var no_edit = []; //涓嶅彲缂栬緫鎸夐挳鐨勪俊鎭垪琛�
+ //鑾峰彇鍙傛暟
var params = getUrlVars();
var HModName = params[params[0]]; //妯″潡鍚嶇О
var HBillType = params[params[1]]; //鍗曟嵁绫诲瀷
var btnIdList = params[params[2]]; //鎸夐挳id鍒楄〃
var btnNameList = params[params[3]]; //鎸夐挳鍚嶇О鍒楄〃
var btnOrderList = params[params[4]]; //鎸夐挳娆″簭鍒楄〃
+ var HUserName = sessionStorage["HUserName"]; //鐢ㄦ埛鍚�
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂囥�� 娉細HBillType 鏄弬鏁板懡鍚嶏紝涓嶆槸鍊�
+ HBillType = getParams("HBillType");
+
//瀵筓RI 杩涜瑙ｇ爜
btnIdList = decodeURI(btnIdList);
btnNameList = decodeURI(btnNameList);
btnOrderList = decodeURI(btnOrderList);
+
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
//椤甸潰鍒濆鍖�
set_ClearBill();
@@ -149,18 +100,6 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- ////琛岄�夋嫨澶勭悊锛堝榻愭柟寮忥級
- //form.on('select(Alignment)', function (data) {
- // //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
- // var elem = data.othis.parents('tr');
- // var dataindex = elem.attr("data-index");
- // $.each(option.data, function (index, value) {
- // if (value.LAY_TABLE_INDEX == dataindex) {
- // value.Alignment = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
- // }
- // });
- //});
//鏄惁闅愯棌
form.on('checkbox(IsHide)', function (data) {
@@ -212,28 +151,46 @@
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();
$.ajax({
url: GetWEBURL() + '/Xt_ModuleButtonSet_WMES/moduleButtonSetWMESList',
type: "GET",
- data: { "HModName": HModName, "HBillType": HBillType },
+ data: { "HModName": HModName, "HBillType": HBillType, "HUserName": HUserName },
success: function (data1) {
var btnIdLists = btnIdList.split(','); //鐩稿鍗曟嵁浼犺繃鏉ョ殑鎸夐挳id
var btnNameLists = btnNameList.split(','); //鐩稿鍗曟嵁浼犺繃鏉ョ殑鎸夐挳鍚嶇О
var btnOrderLists = btnOrderList.split(','); //鐩稿鍗曟嵁浼犺繃鏉ョ殑鎸夐挳娆″簭
var data = []; //闇�瑕佷紶杩涜〃鏍肩殑鏁版嵁
+ no_edit = []; //娓呯┖涓嶅彲缂栬緫鎸夐挳鐨勪俊鎭垪琛�
+
for (var i = 0; i < btnIdLists.length; i++) {
for (var j = 0; j < data1.count; j++) {
if (btnIdLists[i] == data1.data[j]["HButtonID"]) {
- data.push({ "BtnName": btnNameLists[i], "IsHide": data1.data[j]["HHideFlag"] });
+ 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"], "HOtherName": data1.data[j]["HOtherName"] });
+ } else {
+ 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 == i) {
- data.push({ "BtnName": btnNameLists[i], "IsHide": false });
+ if (data.length + no_edit.length == i) {
+ data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": false, "HOrder": btnOrderLists[i], "HOtherName": "" });
}
}
option.data = data;
@@ -266,8 +223,11 @@
, cellMinWidth: 90
, limit: 500
, cols: [[
- { field: 'BtnName', title: '鎸夐挳鍚�', width: 100 }
- , { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
+ { field: 'BtnID', title: '鎸夐挳ID', width: 100, hide: false }
+ ,{ field: 'BtnName', title: '鎸夐挳鍚�', width: 100 }
+ , { field: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
+ , { field: 'HOtherName', title: '鍒悕', width: 100, edit: true }
+ , { field: 'HOrder', title: '娆″簭', width: 100, edit:true }
]]
};
}
@@ -278,12 +238,19 @@
var tableData = []; //鑾峰彇琛ㄦ牸鏁版嵁
var btnIdLists = btnIdList.split(','); //鐩稿鍗曟嵁浼犺繃鏉ョ殑鎸夐挳id
var btnNameLists = btnNameList.split(','); //鐩稿鍗曟嵁浼犺繃鏉ョ殑鎸夐挳鍚嶇О
- var btnOrderLists = btnOrderList.split(',');//鐩稿鍗曟嵁浼犺繃鏉ョ殑鎸夐挳娆″簭
+ var btnOrderLists = btnOrderList.split(',');//鐩稿鍗曟嵁浼犺繃鏉ョ殑鎸夐挳娆″簭
//鑾峰彇琛ㄦ牸鏁版嵁
for (var i = 0; i < table.cache["mainTable"].length; i++) {
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);
+ }
}
}
@@ -292,10 +259,11 @@
var sBtnIdLists = JSON.stringify(btnIdLists);
var sBtnNameLists = JSON.stringify(btnNameLists);
var sBtnOrderLists = JSON.stringify(btnOrderLists);
+ var sNo_EditLists = JSON.stringify(no_edit);
//鎷兼帴闇�瑕佷紶閫掔殑鍙傛暟
- var sMainSub = sTableData + ';' + sBtnIdLists + ';' + sBtnNameLists + ';' + sBtnOrderLists + ';' + HModName + ';' + HBillType;
+ var sMainSub = sTableData + ';' + sBtnIdLists + ';' + sBtnNameLists + ';' + sBtnOrderLists + ';' + HModName + ';' + HBillType + ";" + sNo_EditLists + ";" + HUserName;
var index = layer.load();
$.ajax({
type: "POST",
--
Gitblit v1.9.1