From 9534a35e6d3241cfe926ab99be5747bbb45b7966 Mon Sep 17 00:00:00 2001 From: chenhaozhe <cgz@hz-kingdee.com> Date: 星期三, 21 五月 2025 19:50:25 +0800 Subject: [PATCH] fix: 完成 系统参数查询 系统模块信息查询 系统单据类型查询 的 模块完善 --- WebTM/views/系统管理/系统参数管理/Xt_SystemParameterList.html | 312 +++++++++- WebTM/layuiadmin/HideButton_New.js | 3 WebTM/views/系统管理/单据类型/Xt_BillType_Edit.html | 247 +++++--- WebTM/views/系统管理/模块管理/Xt_XtgnbList.html | 291 ++++++++- WebTM/views/系统管理/日志管理/Xt_SystemLogList.html | 97 +- WebTM/views/系统管理/系统参数管理/Xt_SystemParameter_Edit.html | 99 ++- WebTM/views/系统管理/单据类型/Xt_BillTypeList.html | 238 +++++++- WebTM/views/系统管理/模块管理/Xt_Xtgnb_Edit.html | 335 ++++++----- 8 files changed, 1,157 insertions(+), 465 deletions(-) diff --git a/WebTM/layuiadmin/HideButton_New.js b/WebTM/layuiadmin/HideButton_New.js index 24b2291..917d923 100644 --- a/WebTM/layuiadmin/HideButton_New.js +++ b/WebTM/layuiadmin/HideButton_New.js @@ -60,9 +60,6 @@ success: function (data1) { //鑾峰彇鐖惰妭鐐逛笅鎵�鏈夌殑鎸夐挳鑺傜偣 var parentNodes = document.getElementById(set_HideButton_ID); - console.log(set_HideButton_ID) - console.log(parentNodes) - debugger; var btns = parentNodes.querySelectorAll('button'); //鑾峰彇鏁版嵁搴撲腑宸茬粡璁板綍鐨勬寜閽妭鐐圭殑id鍒楄〃 diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" index 069272f..279d6b1 100644 --- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" +++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" @@ -1,5 +1,6 @@ 锘�<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>鍗曟嵁绫诲瀷鍒楄〃</title> @@ -12,8 +13,9 @@ <script src="../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> - + <script src="../../../layuiadmin/HideButton_new.js"></script> </head> + <body> <div class="layui-fluid"> <div class="layui-col-md12"> @@ -41,6 +43,12 @@ </div> </div> + <!--鏄剧ず褰撳墠杩囨护鏂规--> + <div class="layui-inline" style="margin-left:5px;"> + <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" + id="HFilterScheme_Now"></div> + </div> + <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">缁勭粐</label> <div class="layui-input-block" style="margin-left: 120px; width: 185px;"> @@ -50,10 +58,12 @@ </div> </div> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" + lay-filter="btnSearch" id="btnSearch"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" + lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> <!--涓夋杩囨护閫夐」妗�--> <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;"> @@ -61,19 +71,25 @@ <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;"> + <select name="ColName" id="ColName" class="ForFilteringSchemes" + lay-filter="ColName" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;"> + <select name="Comparator" id="Comparator" lay-filter="Comparator" + style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -81,26 +97,33 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent" id="ColContent"> </div> </div> <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px "> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;"> + <select name="ColName1" id="ColName1" class="ForFilteringSchemes" + lay-filter="ColName1" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;"> + <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" + class="ForFilteringSchemes" style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -108,26 +131,33 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent1" id="ColContent1"> </div> </div> <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px "> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;"> + <select name="ColName2" id="ColName2" class="ForFilteringSchemes" + lay-filter="ColName2" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;"> + <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" + class="ForFilteringSchemes" style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -135,7 +165,8 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent2" id="ColContent2"> </div> </div> </div> @@ -143,7 +174,7 @@ </div> <table class="" id="mainTable" lay-filter="mainTable"></table> <script type="text/html" id="toolbarDemo"> - <div class="layui-btn-container"> + <div class="layui-btn-container" id="Xt_BillTypeList_ButtonGroup"> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button> @@ -152,6 +183,7 @@ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button> </div> </script> </form> @@ -181,6 +213,8 @@ var sWhere = ""; var option = []; var HModName = "Xt_BillTypeList"; + var HBillType = 'Xt_BillTypeList'; + var set_HideButton_ID = "Xt_BillTypeList_ButtonGroup";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� var titleData = ["HItemID"]; //杩囨护鏉′欢鐨刢lass绫� @@ -205,6 +239,9 @@ switch (obj.event) { //鍒楄缃� case 'set_HideColumn': get_HideColumn(); + break; + //鎸夐挳璁剧疆 + case 'set_HideButton': get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]); break; //淇濆瓨鏂规 case 'set_SaveScheme': set_SaveScheme(); @@ -233,6 +270,15 @@ break; }; }); + //#endregion + + //#region 琛ㄦ牸浜嬩欢鐩戝惉 + table.on("tool(mainTable)", function (obj) { + let data = obj.data; + switch (obj.event) { + case 'onBillTypeCodeClickHandler': onBillTypeCodeClickHandler(data); break; + } + }) //#endregion //閲嶇疆鎸夐挳 @@ -306,7 +352,7 @@ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� function get_Display(sWhere) { var index = layer.load(0, { shade: false }); - var ajaxLoad = layer.load(); + var ajaxLoad = layer.load(); //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� $.ajax({ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum", @@ -335,7 +381,17 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); break; default: - col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + if (data[i].name === '鍗曟嵁绫诲瀷璧勬枡浠g爜') { + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, + templet: function (d) { + return '<span style="color: blue;">' + d.鍗曟嵁绫诲瀷璧勬枡浠g爜 + '</span>' + }, style: 'cursor: pointer;', event: 'onBillTypeCodeClickHandler' + }); + } else { + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + + } } } } @@ -359,8 +415,12 @@ layer.close(ajaxLoad); - if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + // ColFilter(); + // } + if ($("#ColName option").length < 1) { ColFilter(); + get_DefaultModule();//鍔犺浇鏂规 } //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); } else { @@ -430,7 +490,7 @@ com = "" + Comparator + "'" + ColContent + "'"; break; } - sWhere += " and " + ColName + " " + com; + // sWhere += " and " + ColName + " " + com; } if (ColName1 != 0 && Comparator1 != 0) { var com1 = ""; @@ -451,7 +511,7 @@ com1 = "" + Comparator1 + "'" + ColContent1 + "'"; break; } - sWhere += " and " + ColName1 + " " + com1; + // sWhere += " and " + ColName1 + " " + com1; } if (ColName2 != 0 && Comparator2 != 0) { var com2 = ""; @@ -472,7 +532,7 @@ com2 = "" + Comparator2 + "'" + ColContent2 + "'"; break; } - sWhere += " and " + ColName2 + " " + com2; + // sWhere += " and " + ColName2 + " " + com2; } if (HNumber) { @@ -799,6 +859,21 @@ , title: '杩囨护鏂规鍒楄〃' , shift: 0//寮瑰嚭鍔ㄧ敾 , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName + , btn: ['纭', '鍙栨秷'] + , btn1: function (index, layero, that) { + let iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + let checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length !== 1) { + return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�'); + } + // debugger; + HFilterScheme(checkStatus.data) + layer.close(layer.index); + + } + , btn2: function (index, layero, that) { + HIsClose_Manual = true; + } , cancel: function () { // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫 HIsClose_Manual = true; @@ -921,10 +996,113 @@ } //#endregion - + function onBillTypeCodeClickHandler(data) { + var hID = data.HItemID; + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫绯荤粺鍙傛暟鏌ヨ' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: './Xt_BillType_Edit.html?hID=' + hID + "&OperationType=3" + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + , end: function () { + //鍒锋柊椤甸潰, + get_FastQuery(table, option); + } + }) + } //浠ヤ笂鏄痩ayui妯″潡 + //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗� + function get_DefaultModule() { + $.ajax({ + url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', + type: "GET", + data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" }, + success: function (data1) { + if (data1.count == 1) { + //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规 + var data = data1.data; + //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗� + HInterID_Choose = data[0].hmainid; + //杩囨护鏂规鍐呯爜 + HInterID = data[0].hmainid + //杩囨护鏂规鍚嶇О + HDefaultFilter = data[0].鏂规鍚嶇О + //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛� + var HRemark = data[0].澶囨敞 + //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规 + document.getElementById("HFilterScheme_Now").style.display = "block"; + document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>'; + //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓� + for (let i = 0; i < data.length; i++) { + $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); + if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { + $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true); + } + } + //鏌ヨ + get_FastQuery(); + form.render("select"); + } else { + //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗� + //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭� + document.getElementById("HFilterScheme_Now").style.display = "none"; + //鎵ц鏌ヨ鏂规硶 + form.render("select"); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } }); + + //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹�� + function HFilterScheme(obj) //杩斿洖杩囨护鏂规 + { + var HInterID = obj[0].hmainid; + HInterID_Choose = obj[0].hmainid; + $.ajax({ + url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', + type: "GET", + data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" }, + success: function (data1) { + if (data1.count == 1) { + var data = data1.data; + //璧嬪�艰繃婊ゆ柟妗堝悕绉� + HDefaultFilter = data[0].鏂规鍚嶇О + var HRemark = data[0].澶囨敞 + //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗� + document.getElementById("HFilterScheme_Now").style.display = "block"; + document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>'; + HInterID = data[0].hmainid + //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢 + for (let i = 0; i < data.length; i++) { + $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); + if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { + $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true); + } + } + + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //#endregion </script> </body> -</html> + +</html> \ No newline at end of file diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillType_Edit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillType_Edit.html" index 04acbaf..156639d 100644 --- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillType_Edit.html" +++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillType_Edit.html" @@ -1,5 +1,6 @@ 锘�<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>鍗曟嵁绫诲瀷鍩虹璧勬枡</title> @@ -15,148 +16,181 @@ <script src="../../../layuiadmin/layui/lay/modules/util.js"></script> </head> + <body> <div class="layui-fluid" style="padding: 0;"> <div class="layui-card" style="padding: 15px;background-color: #efefef;"> <div class="layui-card-body" style="padding: 1px;"> <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> - <div style="padding: 10px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button> - <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button> + <div style="padding: 10px;" class="layui-btn-group"> + <button type="button" lay-submit="" class="layui-btn layui-bg-blue" + lay-filter="Saver">淇濆瓨</button> + <button type="button" lay-submit="" class="layui-btn layui-bg-blue" + lay-filter="Cancel">閫�鍑�</button> </div> - <div class="layui-form-item" style="padding-top: 10px;"> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label">鍗曟嵁缂栫爜</label> - <div class="layui-input-inline"> - <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鍗曟嵁鍚嶇О</label> - <div class="layui-input-inline"> - <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">妯″潡鍚�</label> - <div class="layui-input-inline"> - <input type="text" name="HTemplate" id="HTemplate" lay-verify="HTemplate" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label">鏁版嵁搴撲富琛�</label> - <div class="layui-input-inline"> - <input type="text" name="HHeadTable" id="HHeadTable" lay-verify="HHeadTable" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鏁版嵁搴撳瓙琛�</label> - <div class="layui-input-inline"> - <input type="text" name="HEntryTable" id="HEntryTable" lay-verify="HEntryTable" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label">瑙嗗浘鍚�</label> - <div class="layui-input-inline"> - <input type="text" name="HViewName" id="HViewName" lay-verify="HViewName" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">琛ㄥ悕</label> - <div class="layui-input-inline"> - <input type="text" name="HRightName" id="HRightName" lay-verify="HRightName" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">澶囨敞</label> - <div class="layui-input-inline"> - <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - </div> - </div> - <!--<div class="title">鍩烘湰淇℃伅</div>--> - <div class="layui-tab" lay-filter="tab-POStockInBill"> - <ul class="layui-tab-title" lay-filter="tab-all"> - <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li> - <li lay-id="2" style="padding:1px;">鍏朵粬</li> + + <div class="layui-card-body"> + <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> + <ul class="layui-tab-title"> + <li class="layui-this">鍩烘湰淇℃伅</li> + <li>鍒跺崟淇℃伅</li> </ul> <div class="layui-tab-content"> - <!--鍩烘湰淇℃伅--> - <!--鍏朵粬淇℃伅--> - <div class="layui-tab-item "> + <div class="layui-tab-item layui-show"> <div class="layui-form-item" style="padding-top: 10px;"> <div class="layui-row"> - <div class="layui-col-xs3"> - <label class="layui-form-label">鍒涘缓浜�</label> + <div class="layui-inline"> + <label class="layui-form-label">鍗曟嵁缂栫爜</label> <div class="layui-input-inline"> - <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" + autocomplete="off" placeholder="" class="layui-input"> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">鍒涘缓鏃ユ湡</label> + <div class="layui-inline"> + <label class="layui-form-label">鍗曟嵁鍚嶇О</label> <div class="layui-input-inline"> - <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="HName" id="HName" lay-verify="HName" + autocomplete="off" placeholder="" class="layui-input"> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">淇敼浜�</label> + <div class="layui-inline"> + <label class="layui-form-label">妯″潡鍚�</label> <div class="layui-input-inline"> - <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">淇敼鏃ユ湡</label> - <div class="layui-input-inline"> - <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="HTemplate" id="HTemplate" + lay-verify="HTemplate" autocomplete="off" placeholder="" + class="layui-input"> </div> </div> </div> <div class="layui-row"> - <div class="layui-col-xs3"> - <label class="layui-form-label">瀹℃牳浜�</label> + <div class="layui-inline"> + <label class="layui-form-label">鏁版嵁搴撲富琛�</label> <div class="layui-input-inline"> - <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="HHeadTable" id="HHeadTable" + lay-verify="HHeadTable" autocomplete="off" placeholder="" + class="layui-input"> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">瀹℃牳鏃ユ湡</label> + <div class="layui-inline"> + <label class="layui-form-label">鏁版嵁搴撳瓙琛�</label> <div class="layui-input-inline"> - <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="HEntryTable" id="HEntryTable" + lay-verify="HEntryTable" autocomplete="off" placeholder="" + class="layui-input"> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">浣滃簾浜�</label> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label">瑙嗗浘鍚�</label> <div class="layui-input-inline"> - <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="HViewName" id="HViewName" + lay-verify="HViewName" autocomplete="off" placeholder="" + class="layui-input"> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">浣滃簾鏃ユ湡</label> + <div class="layui-inline"> + <label class="layui-form-label">琛ㄥ悕</label> <div class="layui-input-inline"> - <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="HRightName" id="HRightName" + lay-verify="HRightName" autocomplete="off" placeholder="" + class="layui-input"> </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">澶囨敞</label> + <div class="layui-input-inline"> + <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" + autocomplete="off" placeholder="" class="layui-input"> + </div> + </div> + </div> + </div> + </div> + <!--鍒跺崟淇℃伅--> + <div class="layui-tab-item"> + <div class="layui-form-item"> + <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="HMaker" id="HMaker" + style="background-color:#efefef4d;" readonly> + </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="HChecker" id="HChecker" + style="background-color:#efefef4d;" readonly> + </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="HCloseMan" id="HCloseMan" + style="background-color:#efefef4d;" readonly> + </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="HUpDater" id="HUpDater" + style="background-color:#efefef4d;" readonly> + </div> + </div> + + </div> + <div class="layui-form-item"> + <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="HMakeDate" id="HMakeDate" + style="background-color:#efefef4d;" readonly> + </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="HCheckDate" id="HCheckDate" + style="background-color:#efefef4d;" readonly> + </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="HCloseDate" id="HCloseDate" + style="background-color:#efefef4d;" readonly> + </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="HUpDateDate" + id="HUpDateDate" style="background-color:#efefef4d;" readonly> + </div> + </div> + </div> + <div class="layui-form-item"> + <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="HDeleteMan" id="HDeleteMan" + style="background-color:#efefef4d;" readonly> + </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="HDeleteDate" + id="HDeleteDate" style="background-color:#efefef4d;" readonly> </div> </div> </div> </div> </div> </div> - <!--<di--> - <!--v class="layer-footer" style="text-align: center;"> - - - </div>--> - <!--闅愯棌瀛楁--> - <input type="hidden" name="lngBillKey" id="lngBillKey"> - <input type="hidden" name="lngBillSubKey" id="lngBillSubKey"> - <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�--> -</form> + </div> + </form> </div> </div> </div> @@ -290,7 +324,7 @@ type: "POST", url: GetWEBURL() + "Xt_BillType/AddBill1", async: true, - data: { "oMain": sBillModeify}, + data: { "oMain": sBillModeify }, dataType: "json", success: function (data) { if (data.count == 1) { @@ -319,4 +353,5 @@ } </script> </body> -</html> + +</html> \ No newline at end of file diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" index 67c8e90..724132a 100644 --- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" +++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" @@ -215,8 +215,8 @@ </div> </div> <table class="" id="mainTable" lay-filter="mainTable"></table> - <script type="text/html" id="toolbarDemo" id="xt_SystemLogList_ButtonGroup"> - <div class="layui-btn-container"> + <script type="text/html" id="toolbarDemo"> + <div class="layui-btn-container" id="xt_SystemLogList_ButtonGroup"> <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>--> <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>--> <!-- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button> --> @@ -331,10 +331,10 @@ table.on('toolbar(mainTable)', function (obj) { switch (obj.event) { //鎸夐挳璁剧疆 - case 'set_HideButton': get_HideButton(); + case 'set_HideButton': get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]); break; //鍒楄缃� - case 'set_HideColumn': get_HideColumn(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]); + case 'set_HideColumn': get_HideColumn(); break; //淇濆瓨鏂规 case 'set_SaveScheme': set_SaveScheme(); @@ -992,14 +992,55 @@ // , trigger: 'click' // , format:'yyyy-MM-dd HH:mm' //}); - + //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗� + function get_DefaultModule() { + $.ajax({ + url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', + type: "GET", + data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" }, + success: function (data1) { + if (data1.count == 1) { + //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规 + var data = data1.data; + //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗� + HInterID_Choose = data[0].hmainid; + //杩囨护鏂规鍐呯爜 + HInterID = data[0].hmainid + //杩囨护鏂规鍚嶇О + HDefaultFilter = data[0].鏂规鍚嶇О + //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛� + var HRemark = data[0].澶囨敞 + //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规 + document.getElementById("HFilterScheme_Now").style.display = "block"; + document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>'; + //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓� + for (let i = 0; i < data.length; i++) { + $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); + if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { + $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true); + } + } + //鏌ヨ + get_FastQuery(); + form.render("select"); + } else { + //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗� + //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭� + document.getElementById("HFilterScheme_Now").style.display = "none"; + //鎵ц鏌ヨ鏂规硶 + form.render("select"); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } //浠ヤ笂鏄痩ayui妯″潡 }); //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹�� function HFilterScheme(obj) //杩斿洖杩囨护鏂规 { - console.log(obj) var HInterID = obj[0].hmainid; HInterID_Choose = obj[0].hmainid; $.ajax({ @@ -1036,49 +1077,7 @@ } //#endregion - //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗� - function get_DefaultModule() { - $.ajax({ - url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', - type: "GET", - data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" }, - success: function (data1) { - if (data1.count == 1) { - //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规 - var data = data1.data; - //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗� - HInterID_Choose = data[0].hmainid; - //杩囨护鏂规鍐呯爜 - HInterID = data[0].hmainid - //杩囨护鏂规鍚嶇О - HDefaultFilter = data[0].鏂规鍚嶇О - //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛� - var HRemark = data[0].澶囨敞 - //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规 - document.getElementById("HFilterScheme_Now").style.display = "block"; - document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>'; - //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓� - for (let i = 0; i < data.length; i++) { - $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); - if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { - $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true); - } - } - //鏌ヨ - get_FastQuery(); - form.render("select"); - } else { - //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗� - //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭� - document.getElementById("HFilterScheme_Now").style.display = "none"; - //鎵ц鏌ヨ鏂规硶 - form.render("select"); - } - }, error: function () { - layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } - }); - } + </script> </body> diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" index f25567e..d423157 100644 --- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" +++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" @@ -1,5 +1,6 @@ 锘�<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>绯荤粺妯″潡鍒楄〃</title> @@ -12,8 +13,9 @@ <script src="../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> - + <script src="../../../layuiadmin/HideButton_new.js"></script> </head> + <body> <div class="layui-fluid"> <div class="layui-col-md12"> @@ -40,27 +42,11 @@ </div> </div> - <div class="layui-inline"> - <label class="layui-form-label">妯″潡鍚嶇О</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" name="HModule" id="HModule"> - </div> + <!--鏄剧ず褰撳墠杩囨护鏂规--> + <div class="layui-inline" style="margin-left:5px;"> + <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" + id="HFilterScheme_Now"></div> </div> - - <div class="layui-inline"> - <label class="layui-form-label">鍔熻兘缂栫爜</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" name="HFunctionalCode" id="HFunctionalCode"> - </div> - </div> - - <div class="layui-inline"> - <label class="layui-form-label">涓婄骇鍔熻兘缂栫爜</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" name="HSupFunctionalCode" id="HSupFunctionalCode"> - </div> - </div> - <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">缁勭粐</label> @@ -71,30 +57,61 @@ </div> </div> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" + lay-filter="btnSearch" id="btnSearch"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> - + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" + lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> + <!--涓夋杩囨护閫夐」妗�--> <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;"> + <div class="layui-inline"> + <label class="layui-form-label">妯″潡鍚嶇О</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HModule" id="HModule"> + </div> + </div> + + <div class="layui-inline"> + <label class="layui-form-label">鍔熻兘缂栫爜</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HFunctionalCode" + id="HFunctionalCode"> + </div> + </div> + + <div class="layui-inline"> + <label class="layui-form-label">涓婄骇鍔熻兘缂栫爜</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HSupFunctionalCode" + id="HSupFunctionalCode"> + </div> + </div> + <div class="layui-row" style="margin-top:5px"> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;"> + <select name="ColName" id="ColName" class="ForFilteringSchemes" + lay-filter="ColName" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;"> + <select name="Comparator" id="Comparator" lay-filter="Comparator" + style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -102,26 +119,33 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent" id="ColContent"> </div> </div> <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px "> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;"> + <select name="ColName1" id="ColName1" class="ForFilteringSchemes" + lay-filter="ColName1" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;"> + <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" + class="ForFilteringSchemes" style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -129,26 +153,33 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent1" id="ColContent1"> </div> </div> <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px "> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;"> + <select name="ColName2" id="ColName2" class="ForFilteringSchemes" + lay-filter="ColName2" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;"> + <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" + class="ForFilteringSchemes" style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -156,7 +187,8 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent2" id="ColContent2"> </div> </div> </div> @@ -164,7 +196,7 @@ </div> <table class="" id="mainTable" lay-filter="mainTable"></table> <script type="text/html" id="toolbarDemo"> - <div class="layui-btn-container"> + <div class="layui-btn-container" id="Xt_XtgnbList_ButtonGroup"> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button> @@ -174,6 +206,7 @@ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button> </div> </script> </form> @@ -203,6 +236,8 @@ var sWhere = ""; var option = []; var HModName = "Xt_XtgnbList"; + var HBillType = 'Xt_XtgnbList'; + var set_HideButton_ID = "Xt_XtgnbList_ButtonGroup";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� var titleData = ["Hitemid"]; //#endregion @@ -215,7 +250,6 @@ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛� window.HInterID_Choose = 0; var ins; - //#region 鍒濆鍖栫晫闈� set_ClearBill(); //#endregion @@ -277,6 +311,9 @@ //鍒楄缃� case 'set_HideColumn': get_HideColumn(); break; + //鎸夐挳璁剧疆 + case 'set_HideButton': get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]); + break; //淇濆瓨鏂规 case 'set_SaveScheme': set_SaveScheme(); break; @@ -304,6 +341,15 @@ break; }; }); + //#endregion + + //#region 琛ㄦ牸鍐呬簨浠剁洃鍚� + table.on("tool(mainTable)", function (obj) { + let data = obj.data + switch (obj.event) { + case 'onFunctionCodeClickHandler': onFunctionCodeClickHandler(data); break; + } + }) //#endregion //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� @@ -349,9 +395,9 @@ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� function get_Display(sWhere) { var index = layer.load(0, { shade: false }); - var ajaxLoad = layer.load(); + var ajaxLoad = layer.load(); //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� - $.ajax({ + $.ajax({ url: GetWEBURL() + '/Xt_Xtgnb/list', type: "GET", data: { "sWhere": sWhere }, @@ -377,7 +423,17 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); break; default: - col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + if (data[i].name === '鍔熻兘缂栫爜') { + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, + templet: function (d) { + return '<span style="color: blue;">' + d.鍔熻兘缂栫爜 + '</span>' + }, style: 'cursor: pointer;', event: 'onFunctionCodeClickHandler' + }); + } else { + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + + } } } } @@ -401,8 +457,12 @@ layer.close(ajaxLoad); - if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + // ColFilter(); + // } + if ($("#ColName option").length < 1) { ColFilter(); + get_DefaultModule();//鍔犺浇鏂规 } //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); } else { @@ -458,7 +518,7 @@ com = "" + Comparator + "'" + ColContent + "'"; break; } - sWhere += " and " + ColName + " " + com; + // sWhere += " and " + ColName + " " + com; } if (ColName1 != 0 && Comparator1 != 0) { var com1 = ""; @@ -479,7 +539,7 @@ com1 = "" + Comparator1 + "'" + ColContent1 + "'"; break; } - sWhere += " and " + ColName1 + " " + com1; + // sWhere += " and " + ColName1 + " " + com1; } if (ColName2 != 0 && Comparator2 != 0) { var com2 = ""; @@ -500,7 +560,7 @@ com2 = "" + Comparator2 + "'" + ColContent2 + "'"; break; } - sWhere += " and " + ColName2 + " " + com2; + // sWhere += " and " + ColName2 + " " + com2; } if (HNumber) { sWhere += " and 鍔熻兘缂栫爜 like '%" + HNumber + "%'"; @@ -526,7 +586,7 @@ get_Display(sWhere); sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 } - + //#endregion //#region 闅愯棌鍒楄缃� @@ -832,6 +892,21 @@ , title: '杩囨护鏂规鍒楄〃' , shift: 0//寮瑰嚭鍔ㄧ敾 , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName + , btn: ['纭', '鍙栨秷'] + , btn1: function (index, layero, that) { + let iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + let checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length !== 1) { + return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�'); + } + // debugger; + HFilterScheme(checkStatus.data) + layer.close(layer.index); + + } + , btn2: function (index, layero, that) { + HIsClose_Manual = true; + } , cancel: function () { // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫 HIsClose_Manual = true; @@ -951,10 +1026,118 @@ } else { layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒'); } - + } //#endregion + + //#region 瓒呴摼鎺ョ偣鍑昏繘鍏ョ紪杈� + function onFunctionCodeClickHandler(data) { + var hID = data.Hitemid; + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫绯荤粺鍙傛暟鏌ヨ' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: './Xt_Xtgnb_Edit.html?hID=' + hID + "&OperationType=3" + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + , end: function () { + //鍒锋柊椤甸潰, + get_FastQuery(table, option); + } + }) + } + //#endregion + //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗� + function get_DefaultModule() { + $.ajax({ + url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', + type: "GET", + data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" }, + success: function (data1) { + if (data1.count == 1) { + //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规 + var data = data1.data; + //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗� + HInterID_Choose = data[0].hmainid; + //杩囨护鏂规鍐呯爜 + HInterID = data[0].hmainid + //杩囨护鏂规鍚嶇О + HDefaultFilter = data[0].鏂规鍚嶇О + //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛� + var HRemark = data[0].澶囨敞 + //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规 + document.getElementById("HFilterScheme_Now").style.display = "block"; + document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>'; + //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓� + for (let i = 0; i < data.length; i++) { + $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); + if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { + $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true); + } + } + //鏌ヨ + get_FastQuery(); + form.render("select"); + } else { + //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗� + //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭� + document.getElementById("HFilterScheme_Now").style.display = "none"; + //鎵ц鏌ヨ鏂规硶 + form.render("select"); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } }); + //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹�� + function HFilterScheme(obj) //杩斿洖杩囨护鏂规 + { + var HInterID = obj[0].hmainid; + HInterID_Choose = obj[0].hmainid; + $.ajax({ + url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', + type: "GET", + data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" }, + success: function (data1) { + if (data1.count == 1) { + var data = data1.data; + //璧嬪�艰繃婊ゆ柟妗堝悕绉� + HDefaultFilter = data[0].鏂规鍚嶇О + var HRemark = data[0].澶囨敞 + //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗� + document.getElementById("HFilterScheme_Now").style.display = "block"; + document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>'; + HInterID = data[0].hmainid + //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢 + for (let i = 0; i < data.length; i++) { + $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); + if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { + $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true); + } + } + + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //#endregion + + </script> </body> -</html> + +</html> \ No newline at end of file diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_Xtgnb_Edit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_Xtgnb_Edit.html" index 967566d..850a0a5 100644 --- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_Xtgnb_Edit.html" +++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_Xtgnb_Edit.html" @@ -1,5 +1,6 @@ 锘�<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>绯荤粺妯″潡</title> @@ -15,163 +16,213 @@ <script src="../../../layuiadmin/layui/lay/modules/util.js"></script> </head> + <body> <div class="layui-fluid" style="padding: 0;"> <div class="layui-card" style="padding: 15px;background-color: #efefef;"> <div class="layui-card-body" style="padding: 1px;"> <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> - <div style="padding: 10px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button> - <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button> + <div style="padding: 10px;" class="layui-btn-group"> + <button type="button" lay-submit="" class="layui-btn layui-bg-blue" + lay-filter="Saver">淇濆瓨</button> + <button type="button" lay-submit="" class="layui-btn layui-bg-blue" + lay-filter="Cancel">閫�鍑�</button> </div> - <div class="layui-form-item" style="padding-top: 10px;"> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label">鍔熻兘缂栫爜</label> - <div class="layui-input-inline"> - <input type="text" name="gnbm" id="gnbm" lay-verify="gnbm" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">id</label> - <div class="layui-input-inline"> - <input type="text" name="id" id="id" lay-verify="id" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label">妯″潡鍚嶇О</label> - <div class="layui-input-inline"> - <input type="text" name="gnsy" id="gnsy" lay-verify="gnsy" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鍔熻兘鍚嶇О</label> - <div class="layui-input-inline"> - <input type="text" name="gnmc" id="gnmc" lay-verify="gnmc" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鍔熻兘MS</label> - <div class="layui-input-inline"> - <input type="text" name="gnms" id="gnms" lay-verify="gnms" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label">涓婄骇鍔熻兘缂栫爜</label> - <div class="layui-input-inline"> - <input type="text" name="sjgnbm" id="sjgnbm" lay-verify="sjgnbm" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鏈骇鏍囧織</label> - <div class="layui-input-inline"> - <input type="text" name="mjbz" id="mjbz" lay-verify="mjbz" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鍙鏍囧織</label> - <div class="layui-input-inline"> - <input type="text" name="MenuList" id="MenuList" lay-verify="MenuList" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label">鏉冮檺鏍囧織</label> - <div class="layui-input-inline"> - <input type="text" name="RightFlag" id="RightFlag" lay-verify="RightFlag" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鍚敤鏍囧織</label> - <div class="layui-input-inline"> - <input type="text" name="useflag" id="useflag" lay-verify="useflag" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">NET鍙鏍囧織</label> - <div class="layui-input-inline"> - <input type="text" name="netmenulist" id="netmenulist" lay-verify="netmenulist" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - </div> - </div> - <!--<div class="title">鍩烘湰淇℃伅</div>--> - <div class="layui-tab" lay-filter="tab-POStockInBill"> - <ul class="layui-tab-title" lay-filter="tab-all"> - <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li> - <li lay-id="2" style="padding:1px;">鍏朵粬</li> + <div class="layui-card-body"> + <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> + <ul class="layui-tab-title"> + <li class="layui-this">鍩烘湰淇℃伅</li> + <li>鍒跺崟淇℃伅</li> </ul> <div class="layui-tab-content"> - <!--鍩烘湰淇℃伅--> - <!--鍏朵粬淇℃伅--> - <div class="layui-tab-item "> + <div class="layui-tab-item layui-show"> <div class="layui-form-item" style="padding-top: 10px;"> <div class="layui-row"> - <div class="layui-col-xs3"> - <label class="layui-form-label">鍒涘缓浜�</label> + <div class="layui-inline"> + <label class="layui-form-label">鍔熻兘缂栫爜</label> <div class="layui-input-inline"> - <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="gnbm" id="gnbm" lay-verify="gnbm" + autocomplete="off" placeholder="" class="layui-input"> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">鍒涘缓鏃ユ湡</label> + <div class="layui-inline" style="visibility: hidden;"> + <label class="layui-form-label">id</label> <div class="layui-input-inline"> - <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">淇敼浜�</label> - <div class="layui-input-inline"> - <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input"> - </div> - </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">淇敼鏃ユ湡</label> - <div class="layui-input-inline"> - <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="id" id="id" lay-verify="id" + autocomplete="off" placeholder="" class="layui-input" + > </div> </div> </div> <div class="layui-row"> - <div class="layui-col-xs3"> - <label class="layui-form-label">瀹℃牳浜�</label> + <div class="layui-inline"> + <label class="layui-form-label">妯″潡鍚嶇О</label> <div class="layui-input-inline"> - <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="gnsy" id="gnsy" lay-verify="gnsy" + autocomplete="off" placeholder="" class="layui-input"> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">瀹℃牳鏃ユ湡</label> + <div class="layui-inline"> + <label class="layui-form-label">鍔熻兘鍚嶇О</label> <div class="layui-input-inline"> - <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="gnmc" id="gnmc" lay-verify="gnmc" + autocomplete="off" placeholder="" class="layui-input"> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">浣滃簾浜�</label> + <div class="layui-inline"> + <label class="layui-form-label">鍔熻兘MS</label> <div class="layui-input-inline"> - <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="gnms" id="gnms" lay-verify="gnms" + autocomplete="off" placeholder="" class="layui-input" disabled> </div> </div> - <div class="layui-col-xs3"> - <label class="layui-form-label">浣滃簾鏃ユ湡</label> + + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label">涓婄骇鍔熻兘缂栫爜</label> <div class="layui-input-inline"> - <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="sjgnbm" id="sjgnbm" lay-verify="sjgnbm" + autocomplete="off" placeholder="" class="layui-input"> </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鏈骇鏍囧織</label> + <div class="layui-input-inline"> + <!-- <input type="text" name="mjbz" id="mjbz" lay-verify="mjbz" + autocomplete="off" placeholder="" class="layui-input"> --> + <input type="checkbox" name="mjbz" id="mjbz" lay-verify="mjbz" + lay-skin="primary"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鍙鏍囧織</label> + <div class="layui-input-inline"> + <!-- <input type="text" name="MenuList" id="MenuList" + lay-verify="MenuList" autocomplete="off" placeholder="" + class="layui-input"> --> + <input type="checkbox" name="MenuList" id="MenuList" + lay-verify="MenuList" lay-skin="primary"> + </div> + </div> + + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label">鏉冮檺鏍囧織</label> + <div class="layui-input-inline"> + <!-- <input type="text" name="RightFlag" id="RightFlag" + lay-verify="RightFlag" autocomplete="off" placeholder="" + class="layui-input"> --> + <input type="checkbox" name="RightFlag" id="RightFlag" + lay-verify="RightFlag" lay-skin="primary"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鍚敤鏍囧織</label> + <div class="layui-input-inline"> + <!-- <input type="text" name="useflag" id="useflag" lay-verify="useflag" + autocomplete="off" placeholder="" class="layui-input"> --> + <input type="checkbox" name="useflag" id="useflag" + lay-verify="useflag" lay-skin="primary"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">NET鍙鏍囧織</label> + <div class="layui-input-inline"> + <!-- <input type="text" name="netmenulist" id="netmenulist" + lay-verify="netmenulist" autocomplete="off" placeholder="" + class="layui-input"> --> + <input type="checkbox" name="netmenulist" id="netmenulist" + lay-verify="netmenulist" lay-skin="primary"> + </div> + </div> + </div> + </div> + </div> + <!--鍒跺崟淇℃伅--> + <div class="layui-tab-item"> + <div class="layui-form-item"> + <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="HMaker" id="HMaker" + style="background-color:#efefef4d;" readonly> + </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="HChecker" id="HChecker" + style="background-color:#efefef4d;" readonly> + </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="HCloseMan" id="HCloseMan" + style="background-color:#efefef4d;" readonly> + </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="HUpDater" id="HUpDater" + style="background-color:#efefef4d;" readonly> + </div> + </div> + + </div> + <div class="layui-form-item"> + <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="HMakeDate" id="HMakeDate" + style="background-color:#efefef4d;" readonly> + </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="HCheckDate" id="HCheckDate" + style="background-color:#efefef4d;" readonly> + </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="HCloseDate" id="HCloseDate" + style="background-color:#efefef4d;" readonly> + </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="HUpDateDate" + id="HUpDateDate" style="background-color:#efefef4d;" readonly> + </div> + </div> + </div> + <div class="layui-form-item"> + <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="HDeleteMan" id="HDeleteMan" + style="background-color:#efefef4d;" readonly> + </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="HDeleteDate" + id="HDeleteDate" style="background-color:#efefef4d;" readonly> </div> </div> </div> </div> </div> </div> - <input type="hidden" name="lngBillKey" id="lngBillKey"> - <input type="hidden" name="lngBillSubKey" id="lngBillSubKey"> - <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�--> + </div> </form> </div> </div> @@ -221,11 +272,12 @@ $("#HItemID").val(d.data[0].hitemid); } }); + $("HMaker").val(sessionStorage["HMaker"]) } //淇敼 else if (OperationType == 3) { $.ajax({ - url: GetWEBURL() + "Xt_Xtgnb/get_Bill", + url: GetWEBURL() + "/Xt_Xtgnb/get_Bill", type: "GET", data: { "HItemID": hID @@ -238,15 +290,17 @@ $("#gnmc").val(d.data[0].鍔熻兘鍚嶇О); $("#gnms").val(d.data[0].鍔熻兘MS); $("#sjgnbm").val(d.data[0].涓婄骇鍔熻兘缂栫爜); - $("#mjbz").val(d.data[0].鏈骇鏍囧織); - $("#MenuList").val(d.data[0].鍙鏍囧織); - $("#RightFlag").val(d.data[0].鏉冮檺鏍囧織); - $("#useflag").val(d.data[0].鍚敤鏍囧織); - $("#netmenulist").val(d.data[0].NET鍙鏍囧織); + $("#mjbz").attr('checked', d.data[0].鏈骇鏍囧織 === 'Y'); + $("#MenuList").attr('checked', d.data[0].鍙鏍囧織 === 'Y'); + $("#RightFlag").attr("checked", d.data[0].鏉冮檺鏍囧織 === 'Y') + $("#useflag").attr('checked', d.data[0].鍚敤鏍囧織 === 'Y'); + $("#netmenulist").attr('checked', d.data[0].NET鍙鏍囧織 === 'Y');; $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜� //table.reload(layTableId, { // data: ajaxReturnData //}); + + form.render('checkbox') } }); @@ -286,7 +340,7 @@ //瀹℃牳 form.on('submit(Check)', function () { - + }); @@ -306,10 +360,13 @@ layer.msg("璇疯緭鍏ュ姛鑳界紪鐮侊紒", { icon: 5 }); return; } - var ModRightNameAdd = 'Xt_Xtgnb_Edit'; var user = sessionStorage["HUserName"]; - + data.field['MenuList'] = data.field['MenuList'] === 'on' ? 'Y' : 'N'; + data.field['RightFlag'] = data.field['RightFlag'] === 'on' ? 'Y' : 'N'; + data.field['mjbz'] = data.field['mjbz'] === 'on' ? 'Y' : 'N'; + data.field['netmenulist'] = data.field['netmenulist'] === 'on' ? 'Y' : 'N'; + data.field['useflag'] = data.field['useflag'] === 'on' ? 'Y' : 'N'; var oMain = JSON.stringify(data.field) var sBillModeify = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd; var index = layer.load(); @@ -344,9 +401,9 @@ if (OperationType == 3) { $.ajax({ type: "POST", - url: GetWEBURL() + "Xt_Xtgnb/AddBill1", + url: GetWEBURL() + "/Xt_Xtgnb/AddBill1", async: true, - data: { "oMain": sBillModeify}, + data: { "oMain": sBillModeify }, dataType: "json", success: function (data) { if (data.count == 1) { @@ -363,10 +420,8 @@ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); } }); - } + } }); - - }); //浠ヤ笂涓簂ayui妯″潡 @@ -375,12 +430,8 @@ $("#HSecManager").val(obj[0].HName); $("#HSecManagerID").val(obj[0].HItemID); } - - - - - </script> </body> -</html> + +</html> \ No newline at end of file diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" index 721fe9a..3704793 100644 --- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" +++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" @@ -1,7 +1,8 @@ 锘�<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>绯荤粺鍙傛暟鍒楄〃</title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> @@ -18,13 +19,15 @@ <script src="../../../layuiadmin/HideButton.js"></script> <script src="../../../layuiadmin/soulTable.slim.js"></script> <script src="../../../layuiadmin/PageTitle.js"></script> + <script src="../../../layuiadmin/HideButton_new.js"></script> <style type="text/css"> input.layui-input.layui-unselect { padding-right: 0; } </style> - + </head> + <body> <div class="layui-fluid"> <div class="layui-col-md12"> @@ -50,17 +53,10 @@ <input type="text" class="layui-input" name="HKeyCode" id="HKeyCode"> </div> </div> - <div class="layui-inline"> - <label class="layui-form-label">鎻忚堪</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" name="HDes" id="HDes"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鍙傛暟鍚嶇О</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" name="HName" id="HName"> - </div> + <!--鏄剧ず褰撳墠杩囨护鏂规--> + <div class="layui-inline" style="margin-left:5px;"> + <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" + id="HFilterScheme_Now"></div> </div> <div class="layui-inline"> @@ -72,29 +68,49 @@ </div> </div> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" + lay-filter="btnSearch" id="btnSearch"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" + lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;"> + <div class="layui-inline"> + <label class="layui-form-label">鎻忚堪</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HDes" id="HDes"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鍙傛暟鍚嶇О</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HName" id="HName"> + </div> + </div> <div class="layui-row" style="margin-top:5px"> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;"> + <select name="ColName" id="ColName" class="ForFilteringSchemes" + lay-filter="ColName" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;"> + <select name="Comparator" id="Comparator" lay-filter="Comparator" + style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -102,26 +118,33 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent" id="ColContent"> </div> </div> <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px "> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;"> + <select name="ColName1" id="ColName1" class="ForFilteringSchemes" + lay-filter="ColName1" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;"> + <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" + class="ForFilteringSchemes" style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -129,26 +152,33 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent1" id="ColContent1"> </div> </div> <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px "> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> <div class="layui-input-block"> - <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;"> + <select name="ColName2" id="ColName2" class="ForFilteringSchemes" + lay-filter="ColName2" style="width:190px;"> </select> </div> </div> <div class="layui-inline"> - <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;"> + <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" + class="ForFilteringSchemes" style="width:190px;"> <option value="0" selected="selected"></option> <option value="=">=</option> <option value=">=">>=</option> <option value=">">></option> - <option value="<="><=</option> - <option value="<"><</option> - <option value="<>"><></option> + <option value="<="> + <=< /option> + <option value="<"> + << /option> + <option value="<>"> + <> + </option> <option value="7">鍖呭惈</option> <option value="8">宸﹀寘鍚�</option> <option value="9">鍙冲寘鍚�</option> @@ -156,7 +186,8 @@ </select> </div> <div class="layui-inline"> - <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2"> + <input type="text" class="layui-input ForFilteringSchemes" value="" + name="ColContent2" id="ColContent2"> </div> </div> </div> @@ -164,15 +195,17 @@ </div> <table class="" id="mainTable" lay-filter="mainTable"></table> <script type="text/html" id="toolbarDemo"> - <div class="layui-btn-container"> + <div class="layui-btn-container" id="Xt_SystemParameterList_ButtonGroup"> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>淇敼</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-subtraction"></i>鍒犻櫎</button> <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>--> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button> </div> </script> </form> @@ -206,13 +239,16 @@ var HClassTag = "ForFilteringSchemes"; //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀� window.HModuleName = "绯荤粺鍙傛暟"; + HModName = 'Xt_SystemParameterList' //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛� window.HDefaultFilter = ""; //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛� window.HInterID_Choose = 0; var HModName = "Xt_SystemParameterList"; + var HBillType = "Xt_SystemParameterList"; + var set_HideButton_ID = 'Xt_SystemParameterList_ButtonGroup' //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� - var titleData = ["HItemID", "Hitemid","HInterID"]; + var titleData = ["HItemID", "Hitemid", "HInterID"]; var ins; //鍒濆鍖栬〃鏍� set_InitGrid(); @@ -270,11 +306,22 @@ }) //#endregion + //#region 琛ㄦ牸鍐呬簨浠剁粦瀹� + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + switch (obj.event) { + case 'onKeyCodeClickHandler': onKeyCodeClickHandler(data); break; + } + }) + //#endregion + //#region 澶村伐鍏锋爮浜嬩欢 table.on('toolbar(mainTable)', function (obj) { switch (obj.event) { //鍒楄缃� case 'set_HideColumn': get_HideColumn(); + break; + case 'set_HideButton': get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]); break; //淇濆瓨鏂规 case 'set_SaveScheme': set_SaveScheme(); @@ -297,8 +344,13 @@ case 'btn-Edit': set_ShowBill(); break; + case 'btn-Delete': + set_DeleteBill(); + break; }; }); + + //鑾峰彇缁勭粐 function Organ() { @@ -384,8 +436,19 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); break; default: - col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + if (data[i].name === '鍏抽敭鐮�') { + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, + templet: function (d) { + return '<span style="color: blue;">' + d.鍏抽敭鐮� + '</span>' + }, style: 'cursor: pointer;', event: 'onKeyCodeClickHandler' + }); + } else { + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + } + } + } } @@ -407,8 +470,12 @@ DisPlay_HideColumn(); layer.close(ajaxLoad); - if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + // ColFilter(); + // } + if ($("#ColName option").length < 1) { ColFilter(); + get_DefaultModule();//鍔犺浇鏂规 } //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); } else { @@ -460,7 +527,7 @@ com = "" + Comparator + "'" + ColContent + "'"; break; } - sWhere += " and " + ColName + " " + com; + // sWhere += " and " + ColName + " " + com; } if (ColName1 != 0 && Comparator1 != 0) { var com1 = ""; @@ -481,7 +548,7 @@ com1 = "" + Comparator1 + "'" + ColContent1 + "'"; break; } - sWhere += " and " + ColName1 + " " + com1; + // sWhere += " and " + ColName1 + " " + com1; } if (ColName2 != 0 && Comparator2 != 0) { var com2 = ""; @@ -502,7 +569,7 @@ com2 = "" + Comparator2 + "'" + ColContent2 + "'"; break; } - sWhere += " and " + ColName2 + " " + com2; + // sWhere += " and " + ColName2 + " " + com2; } if (HName) { sWhere += " and 鍙傛暟鍚嶇О like '%" + HName + "%'"; @@ -554,7 +621,7 @@ var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { - var hID = data[0].HInterID; + var hID = data[0].Hitemid; //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 layer.open({ type: 2 @@ -576,6 +643,47 @@ } else { layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒'); + } + } + //#endregion + + //#region 鍒犻櫎鎸夐挳 + function set_DeleteBill() { + var checkStatus = table.checkStatus('mainTable') + , data = checkStatus.data; + let roleCheck = new RegExp(/admin/i) + if (roleCheck.test(sessionStorage['HUserName']) !== true) { + layer.alert("鎮ㄦ病鏈夋潈闄愬垹闄ゆ暟鎹紒锛侊紒", { icon: 5 }); + return; + } + debugger; + if (checkStatus.data.length === 1) { + layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) { + $.ajax({ + url: GetWEBURL() + '/Xt_SystemParameter/Xt_SystemParameterDelete', + type: "GET", + //async: true, + data: { "HInterID": checkStatus.data[0].Hitemid, "user": sessionStorage["HUserName"] }, + success: function (result) { + if (result.code == 1) { + layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { + // 寰楀埌frame绱㈠紩 + var index = layer.getFrameIndex(window.name); + //鍏抽棴褰撳墠frame + layer.close(index); + //淇敼涓哄姛鍚庡埛鏂扮晫闈� + window.location.reload(); + }); + } else { + layer.alert(result.code + result.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }) + }) + } else { + layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒'); } } //#endregion @@ -861,6 +969,21 @@ , title: '杩囨护鏂规鍒楄〃' , shift: 0//寮瑰嚭鍔ㄧ敾 , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName + , btn: ['纭', '鍙栨秷'] + , btn1: function (index, layero, that) { + let iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + let checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length !== 1) { + return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�'); + } + // debugger; + HFilterScheme(checkStatus.data) + layer.close(layer.index); + + } + , btn2: function (index, layero, that) { + HIsClose_Manual = true; + } , cancel: function () { // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫 HIsClose_Manual = true; @@ -902,10 +1025,115 @@ // , trigger: 'click' // , format:'yyyy-MM-dd HH:mm' //}); + + function onKeyCodeClickHandler(data) { + var Hitemid = data.Hitemid; + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫绯荤粺鍙傛暟鏌ヨ' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: './Xt_SystemParameter_Edit.html?hID=' + Hitemid + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + , end: function () { + //鍒锋柊椤甸潰, + get_FastQuery(table, option); + } + }) + } + + //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗� + function get_DefaultModule() { + $.ajax({ + url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', + type: "GET", + data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" }, + success: function (data1) { + if (data1.count == 1) { + //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规 + var data = data1.data; + //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗� + HInterID_Choose = data[0].hmainid; + //杩囨护鏂规鍐呯爜 + HInterID = data[0].hmainid + //杩囨护鏂规鍚嶇О + HDefaultFilter = data[0].鏂规鍚嶇О + //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛� + var HRemark = data[0].澶囨敞 + //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规 + document.getElementById("HFilterScheme_Now").style.display = "block"; + document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>'; + //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓� + for (let i = 0; i < data.length; i++) { + $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); + if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { + $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true); + } + } + //鏌ヨ + get_FastQuery(); + form.render("select"); + } else { + //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗� + //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭� + document.getElementById("HFilterScheme_Now").style.display = "none"; + //鎵ц鏌ヨ鏂规硶 + form.render("select"); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } //浠ヤ笂鏄痩ayui妯″潡 }); + //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹�� + function HFilterScheme(obj) //杩斿洖杩囨护鏂规 + { + console.log(obj) + var HInterID = obj[0].hmainid; + HInterID_Choose = obj[0].hmainid; + $.ajax({ + url: GetWEBURL() + '/Xt_FastICScheme/Chooselist', + type: "GET", + data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" }, + success: function (data1) { + if (data1.count == 1) { + var data = data1.data; + //璧嬪�艰繃婊ゆ柟妗堝悕绉� + HDefaultFilter = data[0].鏂规鍚嶇О + var HRemark = data[0].澶囨敞 + //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗� + document.getElementById("HFilterScheme_Now").style.display = "block"; + document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>'; + HInterID = data[0].hmainid + //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢 + for (let i = 0; i < data.length; i++) { + $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); + if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { + $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true); + } + } + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //#endregion </script> <!--/Xt_SystemParameter/list--> </body> -</html> + +</html> \ No newline at end of file diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameter_Edit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameter_Edit.html" index 3d72d99..0783eeb 100644 --- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameter_Edit.html" +++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameter_Edit.html" @@ -1,5 +1,6 @@ 锘�<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>绯荤粺鍙傛暟缂栬緫</title> @@ -15,14 +16,17 @@ <script src="../../../layuiadmin/layui/lay/modules/util.js"></script> </head> + <body> <div class="layui-fluid" style="padding: 0;"> <div class="layui-card" style="padding: 15px;background-color: #efefef;"> <div class="layui-card-body" style="padding: 1px;"> <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> - <div style="padding: 10px;"> - <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button> - <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button> + <div style="padding: 10px;" class="layui-btn-group"> + <button type="button" lay-submit="" class="layui-btn layui-bg-blue" + lay-filter="Saver">淇濆瓨</button> + <button type="button" class="layui-btn layui-bg-blue" lay-submit="" + lay-filter="Exit">閫�鍑�</button> </div> <div class="layui-form-item" style="padding-top: 10px;"> <div class="layui-row"> @@ -40,12 +44,14 @@ </div> <div class="layui-inline"> <label class="layui-form-label">鍏抽敭鐮�</label> - <div class="layui-input-block" style="width:190px;"> - <select name="Hkey" lay-filter="Hkey"> + <div class="layui-input-inline" style="width:190px;"> + <!-- <select name="Hkey" lay-filter="Hkey"> <option value="MakerAndCheckerDiff" selected>MakerAndCheckerDiff</option> <option value="1">1</option> <option value="2">2</option> - </select> + </select> --> + <input type="text" name="HKeyCode" id="HKeyCode" lay-verify="HKeyCode" autocomplete="off" + placeholder="" class="layui-input" /> </div> </div> </div> @@ -53,7 +59,8 @@ <div class="layui-inline"> <label class="layui-form-label">鍙傛暟鍚嶇О</label> <div class="layui-input-inline"> - <input type="text" name="HCaption" id="HCaption" lay-verify="HCaption" autocomplete="off" placeholder="" class="layui-input" style="width:505px;"> + <input type="text" name="HCaption" id="HCaption" lay-verify="HCaption" + autocomplete="off" placeholder="" class="layui-input" style="width:505px;" /> <input id="HInterID" name="HInterID" value="0" type="hidden" /> </div> </div> @@ -61,17 +68,20 @@ <div class="layui-row"> <div class="layui-inline"> <label class="layui-form-label">鍊�</label> - <div class="layui-input-block" style="width:190px;"> - <select name="HValue" lay-filter="HValue"> + <div class="layui-input-inline" style="width:190px;"> + <!-- <select name="HValue" lay-filter="HValue"> <option value="鏄�" selected>鏄�</option> <option value="鍚�">鍚�</option> - </select> + </select> --> + <input type="text" name="HValue" id="HValue" lay-verify="HValue" + autocomplete="off" placeholder="" class="layui-input" /> </div> </div> <div class="layui-inline"> <label class="layui-form-label">鏁版嵁绫诲瀷</label> <div class="layui-input-inline"> - <input type="text" name="HFarmat" id="HFarmat" lay-verify="HFarmat" autocomplete="off" placeholder="" class="layui-input"> + <input type="text" name="HFarmat" id="HFarmat" lay-verify="HFarmat" + autocomplete="off" placeholder="" class="layui-input"> </div> </div> </div> @@ -79,26 +89,28 @@ <div class="layui-inline"> <label class="layui-form-label">鎻忚堪</label> <div class="layui-input-block" style="width:505px;"> - <textarea class="layui-textarea" name="HExplanation" id="HExplanation" lay-verify="HExplanation" style="height:120px"></textarea> + <textarea class="layui-textarea" name="HExplanation" id="HExplanation" + lay-verify="HExplanation" style="height:120px"></textarea> </div> </div> </div> <div class="layui-inline"> <div class="layui-input-inline" style="padding-left:515px;"> - <input type="checkbox" name="HReadonly" id="HReadonly" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁鍙紪杈�"> + <input type="checkbox" name="HReadonly" id="HReadonly" lay-skin="primary" + lay-filter="checkbox" value="true" title="鏄惁鍙紪杈�"> </div> </div> </div> - <!--<div class="title">鍩烘湰淇℃伅</div>--> - <!--<div class="layui-tab" lay-filter="tab-POStockInBill"> + <!--<div class="title">鍩烘湰淇℃伅</div>--> + <!--<div class="layui-tab" lay-filter="tab-POStockInBill"> <ul class="layui-tab-title" lay-filter="tab-all"> <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li> <li lay-id="2" style="padding:1px;">鍏朵粬</li> </ul> <div class="layui-tab-content">--> - <!--鍩烘湰淇℃伅--> - <!--鍏朵粬淇℃伅--> - <!--<div class="layui-tab-item "> + <!--鍩烘湰淇℃伅--> + <!--鍏朵粬淇℃伅--> + <!--<div class="layui-tab-item "> <div class="layui-form-item" style="padding-top: 10px;"> </div> </div> @@ -162,7 +174,7 @@ set_ClearBill(); - //#endregion + //#endregion // 鍒濆鍖栫晫闈� function set_ClearBill() { @@ -198,6 +210,9 @@ //淇濆瓨HMaker function set_AddNew(data) { + data.field['HReadOnly'] = data.field['HReadOnly'] === "true" ? true : false + data.field['HKey'] = data.field['HKeyCode'] + delete data.field['HKeyCode'] var sMainStr = JSON.stringify(data.field); var sMainSub = sMainStr + ";" + sessionStorage["HUserName"]; @@ -229,31 +244,36 @@ //缂栬緫 椤甸潰璧嬪�� function RoadBillMain(linterid)//鍔犺浇琛ㄥご { - var sWhere = " and HInterID='" + linterid + "'"; + var sWhere = " and HItemID='" + linterid + "'"; $.ajax({ url: GetWEBURL() + "/Xt_SystemParameter/list", type: "GET", async: false, - data: { "sWhere": sWhere}, + data: { "sWhere": sWhere }, success: function (d) { - var IsHReadonly = d.data[0].鏄惁鍙紪杈�; - if (IsHReadonly == "true") { - $("input[name='HReadonly']").prop("checked", true); - } //涓昏〃 - form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫�� - "HInterID": d.data[0].HInterID - ,"HItemID": d.data[0].HItemID - , "HModClass": d.data[0].妯″潡澶х被 - , "Hkey": d.data[0].鍏抽敭鐮� - , "HCaption": d.data[0].鍙傛暟鍚嶇О - , "HValue": d.data[0].鍊� - , "HFramat": d.data[0].鏁版嵁绫诲瀷 - , "HExplanation": d.data[0].鎻忚堪 - , "HReadonly": d.data[0].鏄惁鍙紪杈� - }); - form.render('checkbox'); - form.render('select'); + // form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫�� + // "HInterID": d.data[0].HInterID + // , "HItemID": d.data[0].HItemID + // , "HModClass": d.data[0].妯″潡澶х被 + // , "Hkey": d.data[0].鍏抽敭鐮� + // , "HCaption": d.data[0].鍙傛暟鍚嶇О + // , "HValue": d.data[0].鍊� + // , "HFramat": d.data[0].鏁版嵁绫诲瀷 + // , "HExplanation": d.data[0].鎻忚堪 + // , "HReadonly": d.data[0].鏄惁鍙紪杈� + // }); + $("#HInterID").val(d.data[0].HInterID) + $("#HItemID").val(d.data[0].HItemID) + $("#HModClass").val(d.data[0].妯″潡澶х被) + $("#HKeyCode").val(d.data[0].鍏抽敭鐮�) + $("#HCaption").val(d.data[0].鍙傛暟鍚嶇О) + $("#HValue").val(d.data[0].鍊�) + $("#HFarmat").val(d.data[0].鏁版嵁绫诲瀷) + $("#HExplanation").val(d.data[0].鎻忚堪) + $("#HReadonly").attr("checked", d.data[0].鏄惁鍙紪杈� === 'Y') + form.render(); + // form.render('select'); } }) } @@ -265,4 +285,5 @@ </script> </body> -</html> + +</html> \ No newline at end of file -- Gitblit v1.9.1