From fb17470e7cadae7c75890e93b78682245ad7af1f Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期五, 18 四月 2025 16:26:36 +0800 Subject: [PATCH] 快捷键按钮设置 增加过滤筛选跳转页面 基础资料:物料(物料代码),仓库(仓库代码),部门,职员,工艺参数,不良原因,不良现象 工作中心,工序,生产资源,生产班组,生产班次,不良后果,不良类型,岗位技能,报废原因,检验项目 点检项目,维修项目,保养项目,点检方法,维修验收项目,点检项目分类,保养项目分类,维修项目分类 以上基础资料 , 均 增加一个 超链接, 并点击 进入 编制 页面; --- WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 32 + WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 71 +++ WebTM/views/基础资料/生产基础资料/Gy_ScrapReasonList.html | 21 + WebTM/views/user/login.html | 4 WebTM/views/基础资料/生产基础资料/Gy_Process.html | 9 WebTM/views/基础资料/生产基础资料/Gy_Source.html | 6 WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 31 + WebTM/views/基础资料/基础资料/Gy_MaintainList.html | 35 + WebTM/views/基础资料/公用基础资料/Gy_Material.html | 27 + WebTM/views/基础资料/工资基础资料/Gy_Group.html | 6 WebTM/views/home/console.html | 234 +++++------- WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterList.html | 27 + WebTM/views/基础资料/生产基础资料/Gy_BadResult.html | 33 + WebTM/views/基础资料/生产基础资料/Gy_PostSkillList.html | 32 + WebTM/views/基础资料/生产基础资料/Gy_WorkShiftList.html | 28 + WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 24 + WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 23 + WebTM/views/indexMenu.html | 143 +++++++ WebTM/views/基础资料/生产基础资料/Gy_BadType.html | 33 + WebTM/views/系统管理/快捷方式自定义/Xt_UserFastMenu.html | 22 WebTM/views/基础资料/基础资料/Gy_RepairList.html | 33 + WebTM/views/基础资料/基础资料/Gy_DotCheckItemClassList.html | 32 + WebTM/views/基础资料/基础资料/Gy_MaintainClass.html | 23 + WebTM/views/基础资料/基础资料/Gy_RepairClass.html | 23 + WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 34 + WebTM/views/基础资料/基础资料/Gy_DotCheckList.html | 32 + WebTM/views/基础资料/基础资料/Gy_DotCheckItemMethodList.html | 32 + WebTM/views/基础资料/基础资料/Gy_RepairCheckList.html | 33 + WebTM/views/基础资料/公用基础资料/Gy_BadPhenomena.html | 32 + WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 10 30 files changed, 955 insertions(+), 170 deletions(-) diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html index 3c710da..e48b80d 100644 --- a/WebTM/views/home/console.html +++ b/WebTM/views/home/console.html @@ -43,125 +43,32 @@ <div class="layui-col-md6"> <!-- 蹇嵎鏂瑰紡 --> <div class="layui-card"> - <div class="layui-card-header">蹇嵎鏂瑰紡</div> - <div class="layui-card-body"> - <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;"> - <!--蹇嵎鏂瑰紡--> - <div class="FastMenu" carousel-item=""></div> - <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button> + <div style="margin-left: 15px; padding-top: 15px; height: 28px; "> + <a lay-href="绯荤粺绠$悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html?id=FastMenu">蹇嵎鏂瑰紡涓�</a> + <!--<a style="margin-left: 20px;">璁剧疆鍥炬爣</a>--> + <button type="button" style="margin-left: 20px;" value="0" id="HIcon" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HIcon">寮�鍚浘鏍囪缃�</button> + </div> + <div class="layui-card-body"> + <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;"> + <!--蹇嵎鏂瑰紡--> + <div class="FastMenu" carousel-item=""></div> + <!--<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>--> + </div> </div> </div> </div> - </div> <div class="layui-col-md6"> <!-- 蹇嵎鏂瑰紡 --> <div class="layui-card"> - <div class="layui-card-header">蹇嵎鏂瑰紡</div> + <div style="margin-left: 15px; padding-top: 15px; height: 28px; "> + <a lay-href="绯荤粺绠$悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html?id=FastMenu_1">蹇嵎鏂瑰紡浜�</a> + <button type="button" style="margin-left: 20px;" value="0" id="HIcon_2" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HIcon_2">寮�鍚浘鏍囪缃�</button> + </div> <div class="layui-card-body"> <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;"> - <div carousel-item=""> - <ul class="layui-row layui-col-space10 layui-this"> - <li class="layui-col-xs3"> - <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-console"></i> - <cite>澶栬喘鍏ュ簱</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-engine"></i> - <cite>濮斿鍏ュ簱</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-template-1"></i> - <cite>浜у搧鍏ュ簱</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-chart"></i> - <cite>棰嗘枡鍑哄簱</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-unlink"></i> - <cite>濮斿鍑哄簱</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-chat"></i> - <cite>閿�鍞嚭搴�</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-component"></i> - <cite>璋冩嫧鍗�</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../浠撳瓨绠$悊/鏉$爜鐢熸垚/Gy_BarCodeBill.html" target="main_self_frame"> - <i class="layui-icon layui-icon-app"></i> - <cite>鏉$爜鐢熸垚</cite> - </a> - </li> - </ul> - <ul class="layui-row layui-col-space10"> - <li class="layui-col-xs3"> - <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame"> - <i class="layui-icon layui-icon-template"></i> - <cite>涓婃灦褰掕繕鍗�</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame"> - <i class="layui-icon layui-icon-snowflake"></i> - <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame"> - <i class="layui-icon layui-icon-transfer"></i> - <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html" target="main_self_frame"> - <i class="layui-icon layui-icon-light"></i> - <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/Kf_QCStockInCheckBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-senior"></i> - <cite>鏉ユ枡妫�楠屽崟</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-cellphone"></i> - <cite>鐢熶骇鎷嗙鍗�</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame"> - <i class="layui-icon layui-icon-dollar"></i> - <cite>鐢熶骇姹囨姤鍗�</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame"> - <i class="layui-icon layui-icon-survey"></i> - <cite>鐢熶骇閫�鏂欏崟</cite> - </a> - </li> - </ul> - </div> - <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button> + <!--蹇嵎鏂瑰紡--> + <div class="FastMenu_1" carousel-item=""></div> + <!--<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>--> </div> </div> </div> @@ -286,30 +193,104 @@ //椤甸潰鍒濆鍖栨柟娉� function set_ClearBill() { - get_Display(); + get_Display("FastMenu"); + get_Display("FastMenu_1"); get_Notices(); getNeedCheckRouting(); } //椤甸潰鍏跺畠鏂规硶 - function get_Display() { + function get_Display(HModelAtributos) { //鑾峰彇鑿滃崟鍒楄〃鏁版嵁 $.ajax({ url: GetWEBURL() + "/Web/Xt_UserFastMenu_Init", type: "GET", async: false, - data: { "HMakeName": sessionStorage["HUserName"], "HType": HType }, + data: { "HMakeName": sessionStorage["HUserName"], "HType": HType, "HModelAtributos": HModelAtributos }, success: function (data) { console.log(data.data); - FastMenu(data.data); + FastMenu(data.data, HModelAtributos); }, error: function (data) { layer.alert("鍙戠敓閿欒!", { icon: 5 }); } }); } + $('.FastMenu').on('click', 'ul li', function (event) { + // 杩欓噷鍐欎綘鐨勭偣鍑讳簨浠跺鐞嗕唬鐮� + console.log('List item clicked:', $(this).text()); - function FastMenu(data) { + var HIcon = $("#HIcon").val(); + + if (HIcon == "1") { + openICON("FastMenu") + return false; + } + }); + + $('.FastMenu_1').on('click', 'ul li', function (event) { + // 杩欓噷鍐欎綘鐨勭偣鍑讳簨浠跺鐞嗕唬鐮� + console.log('List item clicked:', $(this).text()); + + var HIcon = $("#HIcon_2").val(); + + if (HIcon == "1") { + openICON("FastMenu_1") + return false; + } + }); + + + //璁剧疆鍥炬爣 + function openICON(HModelAtributos) { + // 鎵撳紑鍥炬爣璁剧疆瀛愮獥鍙� + layer.open({ + type: 2 + , skin: "layui-layer-rim" //鍔犱笂杈规 + , title: "蹇嵎鏂瑰紡-鍥炬爣璁剧疆" //鏍囬 + , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡 + , shift: 2 //寮瑰嚭鍔ㄧ敾 + , area: ["30%", "90%"] //绐椾綋澶у皬 + , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀� + , content: '../绯荤粺绠$悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu_IconSet.html?HItemID=' + event.target.id + , btn: ["纭畾"] + , btn1: function (index, laero) { + //鍒锋柊蹇嵎鏂瑰紡 + get_Display(HModelAtributos); + //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹� + layer.close(index);//鍏抽棴寮圭獥 + } + }) + } + + form.on('submit(HIcon)', function (data) { + var HIcon = $("#HIcon").val(); + + if (HIcon == "0") { + $("#HIcon").val("1"); + $("#HIcon").text("鍏抽棴鍥炬爣璁剧疆"); + } + if (HIcon == "1") { + $("#HIcon").val("0"); + $("#HIcon").text("寮�鍚浘鏍囪缃�"); + } + }) + + form.on('submit(HIcon_2)', function (data) { + var HIcon = $("#HIcon_2").val(); + + if (HIcon == "0") { + $("#HIcon_2").val("1"); + $("#HIcon_2").text("鍏抽棴鍥炬爣璁剧疆"); + } + if (HIcon == "1") { + $("#HIcon_2").val("0"); + $("#HIcon_2").text("寮�鍚浘鏍囪缃�"); + } + }) + + + function FastMenu(data, HModelAtributos) { var liStr = ''; //閬嶅巻鐢熸垚涓昏彍鍗� for (var i = 0; i < data.length; i++) { @@ -350,25 +331,8 @@ liStr += '</ul>'; } }; - if (data.length % 8 == 0) { - liStr += '<ul class="layui-row layui-col-space10">'; - liStr += '<li class="layui-col-xs3">'; - liStr += '<a lay-href="绯荤粺绠$悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">'; - liStr += '<i class="layui-icon layui-icon-add-circle"></i>'; - liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>'; - liStr += '</a>'; - liStr += '</li>'; - liStr += '</ul>'; - } else { - liStr += '<li class="layui-col-xs3">'; - liStr += '<a lay-href="绯荤粺绠$悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">'; - liStr += '<i class="layui-icon layui-icon-add-circle"></i>'; - liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>'; - liStr += '</a>'; - liStr += '</li>'; - liStr += '</ul>'; - } - $(".FastMenu").html(liStr); + + $("." + HModelAtributos).html(liStr); element.init(); //for (var i = 0; i < data.length; i++) { diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html index cfcbe73..e2412ed 100644 --- a/WebTM/views/indexMenu.html +++ b/WebTM/views/indexMenu.html @@ -10,8 +10,15 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"> <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all"> - <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script> - <script language="JavaScript">//灞忚斀鍚庨��鎸夐挳 + <!--<script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>--> + <script src="../layuiadmin/Scripts/jquery-1.4.1.js"></script> + <script src="../layuiadmin/layui/layui.js"></script> + <script src="../layuiadmin/Scripts/webConfig.js"></script> + <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script> + <script src="../layuiadmin/PubCustom.js"></script> + <script src="../layuiadmin/Scripts/json2.js"></script> + <script language="JavaScript"> + //灞忚斀鍚庨��鎸夐挳 history.pushState(null, null, document.URL); window.addEventListener('popstate', function () { history.pushState(null, null, document.URL); @@ -20,7 +27,21 @@ <script> /^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶'); </script> - + <style> + /* 閫夐」鍩虹鏍峰紡 */ + .aa { + padding: 0 20px; + line-height: 36px; + cursor: pointer; + transition: all 0.3s; + color: #000 !important; /* 寮哄埗榛戣壊瀛椾綋 */ + } + /* 鎮仠鐘舵�� */ + .aa:hover { + background-color: #f8f8f8 !important; + color: #000 !important; + } + </style> </head> <body class="layui-layout-body"> @@ -45,7 +66,18 @@ </a> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> - <input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd="> + <!--<input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd=">--> + <div class="layui-form" style="margin-top: 5px; color: black;"> + <!--<select name="HModePage" id="HModePage" lay-filter="HModePage" lay-search> + </select>--> + <input type="text" class="layui-input" name="HModePage" lay-verify="HModePage" id="HModePage" placeholder="鎼滅储..." autocomplete="off"> + <!-- 涓嬫媺瀹瑰櫒 --> + <div id="dropdownMenu1" class="layui-anim layui-anim-upbit" + style="display: none;position: absolute;width: 100%;max-height: 200px;overflow-y: auto;border: 1px solid #e6e6e6;background: #f8f8f8;z-index: 999;top: 40px;left: 0;"> + <ul id="optionList1" class="layui-nav layui-nav-tree" style="width: 100%; background:white"></ul> + </div> + </div> + </li> <li class="layui-nav-item" lay-unselect style="color: black;"> <span>鐧诲綍缁勭粐锛�</span> @@ -168,10 +200,6 @@ </div> </div> - <script src="../layuiadmin/layui/layui.js"></script> - <script src="../layuiadmin/Scripts/webConfig.js"></script> - <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script> - <script src="../layuiadmin/PubCustom.js"></script> <script> // 瀵艰埅鑿滃崟鐨勯棿闅斿儚绱� var menuCell = 5; @@ -181,10 +209,12 @@ }).extend({ index: 'lib/index' //涓诲叆鍙fā鍧� }).use(['index', 'form', 'laydate', 'table', 'element'], function () { - var $ = layui.$; + var $ = layui.$ + , form = layui.form; var element = layui.element; var $ = layui.jquery; - + //鎵�鏈夋ā鍧楃殑闆嗗悎 + var PageModelList = []; var HType = "PC"; //鐧诲綍骞冲彴锛歅C绔�佹墜鏈虹 //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤� //if (sessionStorage.login != "login") { @@ -198,10 +228,103 @@ set_sideMenuDisPlay(); //#endregion + ModePage(); + //鑿滃崟鏍忓懡鍚� setMenuLabel(); + + //#region 鎹熷潖鎯呭喌 鐐瑰嚮浜嬩欢 + + // 鍒嗙鐒︾偣浜嬩欢鍜岃緭鍏ヤ簨浠� + $('#HModePage').on('focus', function () { // 鐒︾偣浜嬩欢锛氭樉绀哄叏閮ㄩ�夐」 + renderOptions1(''); + $('#dropdownMenu1').show(); + }).on('input', function () { // 杈撳叆浜嬩欢锛氳繃婊ら�夐」 + var inputVal = $(this).val().trim(); + renderOptions1(inputVal); + $('#dropdownMenu1').show(); + }); + + // 鏂囨。鐐瑰嚮鍏抽棴涓嬫媺 + $(document).on('click', function (e) { + if (!$(e.target).closest('#HModePage, #dropdownMenu1').length) { + $('#dropdownMenu1').hide(); + } + }); + + + // 娓叉煋閫夐」锛堟敮鎸佹樉绀哄叏閮級 + function renderOptions1(filterText) { + var LimitData = []; + if (filterText == "") { + for (var i = 0; i < 10; i++) { + LimitData.push(PageModelList[i]) + } + } + + var filteredData = filterText ? + PageModelList.filter(function (item) { + return item.HName.toLowerCase().includes(filterText.toLowerCase()); + }) : + LimitData; // 鏃犺繃婊ゆ枃鏈椂鏄剧ず鍏ㄩ儴 + + var DataMdel = []; + for (var i = 0; i < 10; i++) { + if (i < filteredData.length && filteredData.length != 0) { + DataMdel.push(filteredData[i]); + } + } + + var html = ''; + if (DataMdel.length > 0) { + DataMdel.forEach(function (item) { + html += `<li class="layui-nav-item aa" data-value="${item.Hurl}">${item.HName}</li>`; + }); + } else { + html = '<li class="layui-nav-item aa">鏃犲尮閰嶇粨鏋滐紙鍙嚜鐢辫緭鍏ワ級</li>'; + } + + $('#optionList1').html(html); + } + + // 閫夐」鐐瑰嚮浜嬩欢 + $('#optionList1').on('click', 'li', function (data) { + if (!$(this).text().includes('鏃犲尮閰嶇粨鏋�')) { + var selectedText = $(this).text(); + $('#HModePage').val(selectedText).trigger('input'); + var value = data.target.dataset.value + if (selectedText != "") { + layui.index.openTabsPage(value, selectedText); + } + } + $('#dropdownMenu1').hide(); + }); + //#endregion + + form.on('select(HModePage)', function (data) { + var keyword = data.elem[data.elem.selectedIndex].text; + if (data.value != "") { + layui.index.openTabsPage(data.value, keyword); + } + }); + //#region 椤甸潰鍏跺畠鏂规硶 + //鑾峰彇妯″潡椤甸潰 + function ModePage() { + $.ajax({ + type: "get", + url: GetWEBURL() + "/Web/ModePageList", + success: function (result) { + if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data.Gy_Menu; + PageModelList = data; + } + layer.closeAll("loading"); + } + }) + } + //鏄剧ず渚ц竟鑿滃崟 function set_sideMenuDisPlay() { //鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔� diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html index 1d47522..9426e9e 100644 --- a/WebTM/views/user/login.html +++ b/WebTM/views/user/login.html @@ -285,7 +285,7 @@ getBaseInfo(login_data2.HTranSlate); - if (login_data == null) { + if (login_data == null || login_data2.HTranSlate == undefined) { initFunction(1, "login", 1); } else { initFunction(1, "login", login_data2.HTranSlate); @@ -372,7 +372,7 @@ var data2 = JSON.parse(data); $("#LAY-user-login-username").val(data2["UserID"]); $("#Organization").val(data2["OrgID"]); - $("#HTranSlate").val(data2["HTranSlate"]); + $("#HTranSlate").val(data2["HTranSlate"] == undefined ? 1 : data2["HTranSlate"]); form.render('select'); } } diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadPhenomena.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadPhenomena.html" index c4c7291..72211be 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadPhenomena.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadPhenomena.html" @@ -285,6 +285,31 @@ }); //#endregion + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '涓嶈壇鐜拌薄浠g爜') { + var hID = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '涓嶈壇鐜拌薄-缂栬緫' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_BadPhenomena.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //#region 鐐瑰嚮琛岄�変腑楂樹寒 table.on('row(mainTable)', function (obj) { //閫変腑琛屾敼鍙橀鑹� @@ -362,6 +387,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '涓嶈壇鐜拌薄浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '涓嶈壇鐜拌薄浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.涓嶈壇鐜拌薄浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html" index e104b81..db5b01e 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html" @@ -309,6 +309,33 @@ }; }); + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '浠g爜') { + var hID = data.HItemID.toString(); + TagParentId = data.ParentID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫妫�楠岄」鐩�' + , closeBtn: 1 + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + hID + '&HType=3&TagParentId=' + TagParentId + '', 'yes'] + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //浠g爜鍥炶溅鏂规硶 $('#HNumber').on('keydown', function (event) { if (event.keyCode == 13) { @@ -387,6 +414,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" index f9476ae..299ccfa 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" @@ -281,6 +281,22 @@ }); //#endregion + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '閮ㄩ棬浠g爜') { + var linterid = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '閮ㄩ棬鍒楄〃-缂栬緫' + , shift: 0//寮瑰嚭鍔ㄧ敾 + , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' + }) + } + }); + //#region 鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) { get_FastQuery(); @@ -385,6 +401,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '閮ㄩ棬浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '閮ㄩ棬浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.閮ㄩ棬浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" index 0b221a0..71e5d01 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" @@ -311,6 +311,31 @@ }); }) + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '鑱屽憳浠g爜') { + var linterid = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '鑱屽憳璁剧疆-缂栬緫' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + , end: function () { + //鍒锋柊椤甸潰, + get_FastQuery(table, option); + } + }) + } + }); + //#region 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { set_ClearQuery(); @@ -569,6 +594,12 @@ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') { if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� + } else if (data[i].name == '鑱屽憳浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鑱屽憳浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鑱屽憳浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); } else { switch (data[i].Type) { diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" index 529c02b..4a99690 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" @@ -463,6 +463,26 @@ table.render(option); }); + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '鐗╂枡浠g爜') { + var hID = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫鐗╂枡璁剧疆' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Material.html?hID=' + hID + "&OperationType=3" + , resize: false + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); //#region 鐐瑰嚮琛岄�変腑楂樹寒 @@ -701,6 +721,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '鐗╂枡浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐗╂枡浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鐗╂枡浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html" index 35c3e8a..11f4f79 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html" @@ -307,6 +307,26 @@ //#endregion + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '宸ヨ壓鍙傛暟浠g爜') { + var linterid = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '宸ヨ壓鍙傛暟-缂栬緫' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍏敤鍩虹璧勬枡/Gy_TechnologyParameter_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' + , resize: false + , cancel: function () { + } + }) + } + }); + //#region 鍙屽嚮杩斿洖鏁版嵁 table.on('rowDouble(mainTable)', function (obj) { var data = []; @@ -500,6 +520,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '宸ヨ壓鍙傛暟浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '宸ヨ壓鍙傛暟浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.宸ヨ壓鍙傛暟浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" index 7a3e98a..6d40f94 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" @@ -371,6 +371,23 @@ }); //#endregion + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '浠撳簱浠g爜') { + var linterid = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '浠撳簱鍒楄〃-缂栬緫' + , shift: 0//寮瑰嚭鍔ㄧ敾 + , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' + }) + } + }); + + function btnrowDouble(obj) { var index = parent.layer.getFrameIndex(window.name); var data = obj.data; @@ -450,6 +467,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '浠撳簱浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '浠撳簱浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.浠撳簱浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" index 6265a1e..c336792 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" @@ -471,9 +471,13 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒� col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 }); - } else if (data[i].name == '宸ヤ綔涓績浠g爜') { - col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '宸ヤ綔涓績浠g爜'}); - } else { + } else if (data[i].name == '宸ヤ綔涓績浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '宸ヤ綔涓績浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.宸ヤ綔涓績浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + }else { switch (data[i].Type) { //int case 'DateTime': diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html" index 26fdc0f..469c3cc 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html" @@ -201,6 +201,31 @@ }; }); + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '鐐规椤圭洰鍒嗙被浠g爜') { + var hID = data.HItemID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫鐐规椤圭洰鍒嗙被' + , closeBtn: 1 + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍩虹璧勬枡/Gy_DotCheckItemClassEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + table.on('row(mainTable)', function (obj) { //閫変腑琛屾敼鍙橀鑹� var flag = !obj.tr.find(':checkbox:first').prop('checked'); @@ -311,6 +336,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '鐐规椤圭洰鍒嗙被浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐐规椤圭洰鍒嗙被浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鐐规椤圭洰鍒嗙被浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html" index bdfa193..6ab8e47 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html" @@ -221,6 +221,31 @@ }) //#endregion + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '鐐规鏂规硶浠g爜') { + var hID = data.HItemID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫鐐规鏂规硶' + , closeBtn: 1 + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍩虹璧勬枡/Gy_DotCheckItemMethodEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + get_FastQuery(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //#region 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { set_ClearQuery(); @@ -310,6 +335,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '鐐规鏂规硶浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐐规鏂规硶浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鐐规鏂规硶浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" index debab41..6e9215a 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" @@ -306,6 +306,31 @@ }; }); + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '鐐规椤圭洰浠g爜') { + var hID = data.HItemID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫鐐规椤圭洰' + , closeBtn: 1 + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍩虹璧勬枡/Gy_DotCheckEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + table.on('row(mainTable)', function (obj) { //閫変腑琛屾敼鍙橀鑹� var flag = !obj.tr.find(':checkbox:first').prop('checked'); @@ -429,6 +454,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '鐐规椤圭洰浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐐规椤圭洰浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鐐规椤圭洰浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainClass.html" index 67f0ad4..c7213f4 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainClass.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainClass.html" @@ -400,10 +400,12 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200 }) - } else if (data[i].id == '鍗曟嵁鍙�') { + } else if (data[i].name == '淇濆吇椤圭洰鍒嗙被浠g爜') {//娣诲姞瓒呴摼鎺� col.push({ - field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' - }) + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '淇濆吇椤圭洰鍒嗙被浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.淇濆吇椤圭洰鍒嗙被浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); } else { switch (data[i].Type) { @@ -457,6 +459,21 @@ } //#endregion + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '淇濆吇椤圭洰鍒嗙被浠g爜') { + var linterid = data.HItemID; + var linteridSub = data.hsubid; + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '淇濆吇椤圭洰鍒嗙被-缂栬緫' + , shift: 0//寮瑰嚭鍔ㄧ敾 + , content: '../鍩虹璧勬枡/Gy_MaintainClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub + }) + } + }); + //瀵煎叆 function set_SouceExcel() { layer.open({ diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html" index 1d24e4b..ff57c25 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html" @@ -311,6 +311,32 @@ }); //#endregion + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '淇濆吇椤圭洰浠g爜') { + var hID = data.HItemID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫淇濆吇椤圭洰' + , closeBtn: 1 + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍩虹璧勬枡/Gy_MaintainEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //#region 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { set_ClearQuery(); @@ -413,6 +439,13 @@ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') { if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� + } + else if (data[i].name == '淇濆吇椤圭洰浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '淇濆吇椤圭洰浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.淇濆吇椤圭洰浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); } else { switch (data[i].Type) { @@ -678,7 +711,7 @@ layer.open({ type: 2 , area: ['100%', '100%'] - , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�' + , title: '缂栬緫淇濆吇椤圭洰' , closeBtn: 1 , shade: 0.6 //閬僵閫忔槑搴� , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html" index ce2a45e..3cf191e 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html" @@ -311,6 +311,32 @@ }); //#endregion + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '缁翠慨楠屾敹椤圭洰浠g爜') { + var hID = data.hitemid.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫缁翠慨妫�楠岄」鐩�' + , closeBtn: 1 + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍩虹璧勬枡/Gy_RepairCheckEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //#region 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { set_ClearQuery(); @@ -412,6 +438,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '缁翠慨楠屾敹椤圭洰浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '缁翠慨楠屾敹椤圭洰浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.缁翠慨楠屾敹椤圭洰浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairClass.html" index 2e1b2a4..69b86c0 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairClass.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairClass.html" @@ -308,6 +308,21 @@ }); //#endregion + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '缁翠慨椤圭洰鍒嗙被浠g爜') { + var linterid = data.HItemID; + var linteridSub = data.hsubid; + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缁翠慨椤圭洰鍒嗙被-缂栬緫' + , shift: 0//寮瑰嚭鍔ㄧ敾 + , content: '../鍩虹璧勬枡/Gy_RepairClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub + }) + } + }); + //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶 //#region 鍒濆鍖栫晫闈� function set_ClearBill() { @@ -400,10 +415,12 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200 }) - } else if (data[i].id == '鍗曟嵁鍙�') { + } else if (data[i].name == '缁翠慨椤圭洰鍒嗙被浠g爜') {//娣诲姞瓒呴摼鎺� col.push({ - field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' - }) + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '缁翠慨椤圭洰鍒嗙被浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.缁翠慨椤圭洰鍒嗙被浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); } else { switch (data[i].Type) { diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html" index 57333d0..4cdedc1 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html" @@ -313,6 +313,32 @@ }); //#endregion + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '缁翠慨椤圭洰浠g爜') { + var hID = data.hitemid.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫缁翠慨椤圭洰' + , closeBtn: 1 + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鍩虹璧勬枡/Gy_RepairEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //#region 閲嶇疆鎸夐挳 form.on('submit(btnReSearch)', function (data) { set_ClearQuery(); @@ -430,6 +456,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '缁翠慨椤圭洰浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '缁翠慨椤圭洰浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.缁翠慨椤圭洰浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" index 2a1ecd5..32e6e17 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" @@ -491,7 +491,11 @@ } else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒� col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 }); } else if (data[i].name == '鐝粍浠g爜') { - col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '鐝粍浠g爜' }); + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐝粍浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鐝粍浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); } else { switch (data[i].Type) { diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" index 5306894..3a72db7 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" @@ -302,6 +302,31 @@ } }); + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '涓嶈壇鍘熷洜浠g爜') { + var hID = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫涓嶈壇鍘熷洜' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //鍚嶇О鍥炶溅鏂规硶 $('#HName').on('keydown', function (event) { if (event.keyCode == 13) { @@ -394,6 +419,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '涓嶈壇鍘熷洜浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '涓嶈壇鍘熷洜浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.涓嶈壇鍘熷洜浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadResult.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadResult.html" index efac181..d38a781 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadResult.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadResult.html" @@ -277,6 +277,32 @@ break; }; }); + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '涓嶈壇鍚庢灉浠g爜') { + var hID = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫涓嶈壇鍚庢灉' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadResult.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) { get_FastQuery(); @@ -399,6 +425,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '涓嶈壇鍚庢灉浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '涓嶈壇鍚庢灉浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.涓嶈壇鍚庢灉浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" index 39ec14c..c89665f 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" @@ -283,6 +283,32 @@ break; }; }); + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '涓嶈壇绫诲瀷浠g爜') { + var hID = data.HItemID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫涓嶈壇绫诲瀷' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadType.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) { get_FastQuery(); @@ -405,6 +431,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '涓嶈壇绫诲瀷浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '涓嶈壇绫诲瀷浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.涓嶈壇绫诲瀷浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html" index 46e3a51..124c819 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html" @@ -274,6 +274,31 @@ break; }; }); + + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '宀椾綅鎶�鑳戒唬鐮�') { + var hID = data.HItemID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '缂栬緫宀椾綅鎶�鑳�' + , shade: 0.6 //閬僵閫忔槑搴� + , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 + , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� + , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_PostSkillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=' + , resize: false, + end: function () { + //鍒锋柊椤甸潰, + location.reload(); + } + , cancel: function () { + //$(".layui-btn").removeClass("layui-btn-disabled"); + } + }) + } + }); + //鏌ヨ鎸夐挳 form.on('submit(btnSearch)', function (data) { get_FastQuery(); @@ -368,6 +393,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '宀椾綅鎶�鑳戒唬鐮�') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '宀椾綅鎶�鑳戒唬鐮�', templet: function (d) { + return '<span style="color: blue;">' + d.宀椾綅鎶�鑳戒唬鐮� + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" index 0e9f1ec..403a4a7 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" @@ -478,9 +478,12 @@ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒� col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 }); - } else if (data[i].name == '宸ュ簭浠g爜') { - col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '宸ュ簭浠g爜' }); - + } else if (data[i].name == '宸ュ簭浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '宸ュ簭浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.宸ュ簭浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ScrapReasonList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ScrapReasonList.html" index 0158e32..bce1d50 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ScrapReasonList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ScrapReasonList.html" @@ -209,6 +209,20 @@ }); //#endregion + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '鎶ュ簾鍘熷洜浠g爜') { + var linterid = data.HItemID.toString(); + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '鎶ュ簾鍘熷洜-缂栬緫' + , shift: 0//寮瑰嚭鍔ㄧ敾 + , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_ScrapReason.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' + }) + } + }); + //#region 鐐瑰嚮琛岄�変腑楂樹寒 table.on('row(mainTable)', function (obj) { //閫変腑琛屾敼鍙橀鑹� @@ -318,6 +332,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '鎶ュ簾鍘熷洜浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鎶ュ簾鍘熷洜浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鎶ュ簾鍘熷洜浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" index 00984e6..8f84f25 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" @@ -472,7 +472,11 @@ else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒� col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 }); } else if (data[i].name == '鐢熶骇璧勬簮浠g爜') { - col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '鐢熶骇璧勬簮浠g爜' }); + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐢熶骇璧勬簮浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鐢熶骇璧勬簮浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html" index 8dc7711..c244159 100644 --- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html" +++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html" @@ -282,6 +282,27 @@ }) //#endregion + table.on('tool(mainTable)', function (obj) { + var data = obj.data; + if (obj.event == '鐝浠g爜') { + var HInterID = data.HInterID.toString(); + //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉 + layer.open({ + type: 2 + , area: ['100%', '100%'] + , title: '鐝-缂栬緫' + , shift: 0 //寮瑰嚭鍔ㄧ敾 + , content: '../鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html?OperationType=3&HInterID=' + HInterID + , btn: ['纭畾'], + // 鎸夐挳1 鐨勫洖璋� + end: function (index, layero, that) { + //鍒锋柊椤甸潰 + $("#btn_Search").trigger('click'); + } + }) + } + }); + //#region 鍙屽嚮杩斿洖鏁版嵁 table.on('rowDouble(mainTable)', function (obj) { var data = []; @@ -736,6 +757,13 @@ if ($.inArray(data[i].name, titleData) > -1) { col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� } + else if (data[i].name == '鐝浠g爜') {//娣诲姞瓒呴摼鎺� + col.push({ + field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐝浠g爜', templet: function (d) { + return '<span style="color: blue;">' + d.鐝浠g爜 + '</span>' + }, style: 'cursor: pointer;' + }); + } else { switch (data[i].Type) { //int diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu.html" index ec3b4ec..aaa8529 100644 --- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu.html" +++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu.html" @@ -32,7 +32,15 @@ var option = {}; //鏍戠粍浠剁殑娓叉煋鍙傛暟锛屼繚瀛樻爲缁勪欢娓叉煋鐨勪俊鎭� var saveData = []; //瀛樺偍鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鏁版嵁锛屼紶閫掔粰鍚庣杩涜淇濆瓨 var menuDefineData = []; //浠ョ埗瀛愮骇缁撴瀯瀛樻斁鏍戠粍浠剁殑鑷畾涔夋暟鎹紝鐢ㄦ潵璧嬬粰option + var ID = -1; //#endregion + + var params = get_UrlVars(); + if (typeof (params[params[0]]) == "undefined") { + ID = -1;//鎿嶄綔绫诲瀷 + } else { + ID = params[params[0]];//鎿嶄綔绫诲瀷 + } //#region 鍒濆鍖栭〉闈� set_ClearBill(); //璋冪敤鍒濆鍖栫晫闈㈡柟娉曪紝瀹屾垚鐣岄潰鐨勫垵濮嬪寲 @@ -84,11 +92,11 @@ var checkedData = tree.getChecked('demo-id-1'); // 鑾峰彇閫変腑鑺傜偣鐨勬暟鎹� saveData = []; //娓呯┖淇濆瓨鑷畾涔夋暟鎹殑鍒楄〃鐨勬暟鎹� getSelectedData(checkedData); //灏嗛�変腑鐨勮妭鐐圭殑淇℃伅浠ュ垪琛ㄧ殑褰㈠紡淇濆瓨鍦╯aveData涓� - //if (saveData.length > 7) { - // layer.msg('璁剧疆瓒呴锛岃淇濊瘉蹇嵎鏂瑰紡浣庝簬8涓紒锛�'); - // return; - //} - var sMainSub = JSON.stringify(saveData) + ";" + sessionStorage["HUserName"] + ";" + HType; + if (saveData.length > 8) { + layer.msg('璁剧疆瓒呴锛岃淇濊瘉蹇嵎鏂瑰紡涓嶈秴杩囦簬8涓紒锛�'); + return; + } + var sMainSub = JSON.stringify(saveData) + ";" + sessionStorage["HUserName"] + ";" + HType + ";" + ID; var index = layer.load(); $.ajax({ url: GetWEBURL() + "/Web/Xt_UserFastMenu_Save", @@ -133,7 +141,7 @@ url: GetWEBURL() + "/Web/Xt_UserFastMenu_Display", type: "GET", async: false, - data: { "HMakeName": sessionStorage["HUserName"], "HType": HType }, + data: { "HMakeName": sessionStorage["HUserName"], "HType": HType, "HModelAtributos": ID }, success: function (res) { var dt = res.data.dt; //鑿滃崟娓呭崟鐨勫叏閮ㄤ俊鎭笌琚�変腑鎯呭喌 var trees = res.data.tree; //鏍戠粍浠剁殑鏍硅妭鐐� @@ -172,6 +180,8 @@ //#endregion + + }); </script> </body> diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" index 5e2b479..9c06a52 100644 --- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" +++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" @@ -50,7 +50,7 @@ <div class="layui-inline"> <label class="layui-form-label">閮ㄩ棬</label> <div class="layui-input-block"> - <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input"> + <select name="HDeptName" id="HDeptName" lay-verify="required" lay-filter="HDeptName" lay-search class="layui-input"> <!--鍔ㄦ�佹覆鏌撹溅闂�--> </select> </div> @@ -111,10 +111,20 @@ </button> </div> </div> - <div class="layui-inline"> + <div class="layui-inline" id="xh"> <label class="layui-form-label" style="width: 85px;">绌村彿</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" id="HMouldNum" name="HMouldNum"> + </div> + </div> + <div class="layui-inline" id="sczz" style="display:none"> + <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0"> + <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID" style="padding: 0 10px; margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> </div> </div> <div class="layui-inline"> @@ -287,6 +297,12 @@ }); //#endregion + //#region 鐢熶骇璧勬簮 + form.on('submit(btnHSourceID)', function (data) { + btnHSourceID(); + }); + //#endregion + //#region 妫�楠岄」鐩� form.on('submit(btnHQCCheckItemID)', function (data) { btnCheckProjectList(2); @@ -340,6 +356,12 @@ } }); }); + + //#region 妫�绱㈡ā寮忎笅鎷夊垪琛ㄧ洃鍚� + form.on('select(HDeptName)', function (data) { + changeInput_Dept(); + }); + //#endregion //#endregion @@ -462,6 +484,23 @@ } }); } + + //#region 鏍规嵁妫�绱㈡ā寮忚皟鏁� 鎼滅储妗� + function changeInput_Dept() { + var HSearchModel = $("#HDeptName").val(); + + if (HSearchModel == "389502" || HSearchModel == "15035820") { + //闅愯棌鐢熶骇璧勬簮 + $("#sczz").hide(); + $("#xh").show(); + } + else { + //闅愯棌绌村彿 + $("#xh").hide(); + $("#sczz").show(); + } + } + //#endregion //PPK璁$畻 x function set_PPK() { @@ -1243,6 +1282,7 @@ var HMaterID = $("#HMaterID").val();//鐗╂枡 var HQCCheckItemID = $("#HQCCheckItemID").val();//妫�楠岄」鐩� var HMouldNum = $("#HMouldNum").val();//绌村彿 + var HSourceID = $("#HSourceID").val();//鐢熶骇璧勬簮 if (limit == 0) { return layer.msg("鏍锋湰鏁伴噺涓嶈兘涓�0!"); @@ -1264,6 +1304,7 @@ , HMaterID: HMaterID , HQCCheckItemID: HQCCheckItemID , HMouldNum: HMouldNum + , HSourceID: HSourceID } //鍒濆鍖栬〃鏍� set_InitGrid(); @@ -1299,6 +1340,32 @@ }) } + //鐢熶骇璧勬簮 + function btnHSourceID() { + layer.open({ + type: 2 //绫诲瀷 + , skin: 'layui-layer-rim'//鍔犱笂杈规 + , area: ['90%', '90%']//澶у皬 + , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬 + , shift: 2//寮瑰嚭鍔ㄧ敾 + , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'] + , btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + //鑾峰彇鏁版嵁 + $("#HSourceID").val(checkStatus.data[0].HItemID); + $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О); + layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { } + }) + } + + //妫�楠岄」鐩垪琛� function btnHQCCheckItemID() { layer.open({ -- Gitblit v1.9.1