WebTM/WebTM.csproj
@@ -97,6 +97,7 @@ <Content Include="layuiadmin\ckou.js" /> <Content Include="layuiadmin\echarts.min.js" /> <Content Include="layuiadmin\grwebapp.js" /> <Content Include="layuiadmin\modules\tableFilter2.js" /> <Content Include="layuiadmin\PlateBinding.js" /> <Content Include="layuiadmin\PageTitle.js" /> <Content Include="layuiadmin\HideButton.js" /> @@ -139,6 +140,9 @@ <Content Include="layuiadmin\Scripts\webConfig2.js" /> <Content Include="layuiadmin\serial-reader.js" /> <Content Include="layuiadmin\soulTable.slim.js" /> <Content Include="layuiadmin\style\tableFilter.css"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> <Content Include="layuiadmin\treeTable.js" /> <Content Include="layuiadmin\PubCustom.js" /> <Content Include="layuiadmin\PubJs\PubCheck.js" /> @@ -376,6 +380,7 @@ <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_PreventErrMould.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_WorkCenter_Excel.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_UnitConvertRateList.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_Gy_StockPlaceList.aspx" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_HPayMentBill.aspx" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_HPOOrderBillByID.aspx" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_HPOStockInBillByID.aspx" /> @@ -2268,6 +2273,13 @@ <Compile Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_EquipTypeBill.aspx.designer.cs"> <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon> </Compile> <Compile Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_Gy_StockPlaceList.aspx.cs"> <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> </Compile> <Compile Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_Gy_StockPlaceList.aspx.designer.cs"> <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon> </Compile> <Compile Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_HGy_CardChangeType.aspx.cs"> <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> @@ -12,29 +12,5 @@ <IISExpressUseClassicPipelineMode /> <UseGlobalApplicationHostFile /> </PropertyGroup> <ProjectExtensions> <VisualStudio> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <WebProjectProperties> <StartPageUrl> </StartPageUrl> <StartAction>CurrentPage</StartAction> <AspNetDebugging>True</AspNetDebugging> <SilverlightDebugging>False</SilverlightDebugging> <NativeDebugging>False</NativeDebugging> <SQLDebugging>False</SQLDebugging> <ExternalProgram> </ExternalProgram> <StartExternalURL> </StartExternalURL> <StartCmdLineArguments> </StartCmdLineArguments> <StartWorkingDirectory> </StartWorkingDirectory> <EnableENC>True</EnableENC> <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug> </WebProjectProperties> </FlavorProperties> </VisualStudio> </ProjectExtensions> <ProjectExtensions /> </Project> WebTM/layuiadmin/modules/tableFilter2.js
New file @@ -0,0 +1,532 @@ /** TABLEFILTER **/ layui.define(['table', 'jquery', 'form', 'laydate'], function (exports) { var MOD_NAME = 'tableFilter', $ = layui.jquery, table = layui.table, form = layui.form, laydate = layui.laydate; var tableFilter = { "v": '1.0.0' }; //ç¼å tableFilter.cache = {} //渲æ tableFilter.render = function (opt) { //é ç½®é»è®¤å¼ var elem = $(opt.elem || '#table'), elemId = elem.attr("id") || "table_" + new Date().getTime(), filters = opt.filters || [], parent = opt.parent || 'body', mode = opt.mode || "local"; opt.done = opt.done || function () { }; //åå ¥é»è®¤ç¼å tableFilter.cache[elemId] = {}; //主è¿è¡ var main = function () { //é»è®¤è¿æ»¤ if (mode == "local") { var trsIndex = tableFilter.getShowTrIndex(elem, elemId, filters); if (trsIndex.length > 0) { var trs = elem.next().find('.layui-table-body tr'); trs.each(function (i, tr) { if ($.inArray($(tr).data("index"), trsIndex) != -1) { $(tr).removeClass("layui-hide") } else { $(tr).addClass("layui-hide") } }) } else { elem.next().find('.layui-table-body tr').removeClass("layui-hide") } //FIXå ¨éçå¬ tableFilter.fixAll(elem); //éè½½è¡¨æ ¼å°ºå¯¸ (FIXå·æ°è¡¨æ ¼æ¶çè¡¨æ ¼å¼å¸¸) table.resize(elemId); } //éåè¿æ»¤é¡¹ layui.each(filters, function (i, filter) { var filterField = filter.field, filterName = filter.name || filter.field, filterType = filter.type || "input", filterData = filter.data || [], filterUrl = filter.url || ""; //æå ¥å¾æ var th = elem.next().find('.layui-table-header th[data-field="' + filterField + '"]'); var icon = filterType == 'input' ? 'layui-icon-search' : 'layui-icon-down'; var filterIcon = $('<span class="layui-table-filter layui-inline"><i class="layui-icon ' + icon + '"></i></span>'); th.find('.layui-table-cell').append(filterIcon) //å¾æ é»è®¤é«äº® if (tableFilter.cache[elemId][filterName]) { filterIcon.addClass("tableFilter-has") } else { filterIcon.removeClass("tableFilter-has") } //å¾æ ç¹å»äºä»¶ filterIcon.on("click", function (e) { e.stopPropagation(); //å¾å°è¿æ»¤é¡¹çé项 //å¦æå¼å¯æ¬å° 并ä¸æ²¡è®¾ç½®æ°æ® 就读æ¬å°æ°æ® if (!filter.data && !filterUrl && filterType != "input") { filterData = tableFilter.eachTds(elem, filterField); } //å¼¹åºå± var t = $(this).offset().top + $(parent).scrollTop() + $(this).outerHeight() + 5 + "px"; var l_fix = filterType == "date" ? 530 : 164; var l = $(this).offset().left - ($('body').outerWidth(true) - $(parent).outerWidth(true)) - l_fix + "px"; var filterBox = $('<div class="layui-table-filter-view layui-anim layui-anim-fadein" style="top:' + t + ';left:' + l + ';"><div class="layui-table-filter-box"><form class="layui-form" lay-filter="table-filter-form"></form></div></div>'); if (filterType == "input") { filterBox.find('form').append('<input type="search" name="' + filterName + '" lay-verify="required" lay-verType="tips" placeholder="å ³é®è¯" class="layui-input">'); } if (filterType == "checkbox") { filterBox.find('form').append('<ul></ul>'); if (!filterUrl) { layui.each(filterData, function (i, item) { filterBox.find('ul').append('<li><input type="checkbox" name="' + filterName + '[' + item.key + ']" value="' + item.key + '" title="' + item.value + '" lay-skin="primary"></li>'); }) } } if (filterType == "radio") { filterBox.find('form').append('<ul class="radio"></ul>'); if (!filterUrl) { filterBox.find('ul').append('<li><input type="radio" name="' + filterName + '" value="" title="All" checked></li>'); layui.each(filterData, function (i, item) { filterBox.find('ul').append('<li><input type="radio" name="' + filterName + '" value="' + item.key + '" title="' + item.value + '"></li>'); }) } } if (filterType == "date") { filterBox.find('form').append('<div class="layui-table-filter-date"></div>'); filterBox.find('form').append('<input type="text" name="' + filterName + '" lay-verify="required" lay-verType="tips" placeholder="请éæ©æ¥æ" class="layui-input">'); } filterBox.find('form').append('<button class="layui-btn layui-btn-normal layui-btn-sm" lay-submit lay-filter="tableFilter">ç¡®å®</button>'); filterBox.find('form').append('<button type="button" class="layui-btn layui-btn-primary layui-btn-sm filter-del layui-btn-disabled" disabled>åæ¶è¿æ»¤</button>'); //è®¾ç½®æ¸ é¤æ¯å¦å¯ç¨ $(this).hasClass('tableFilter-has') && filterBox.find('.filter-del').removeClass("layui-btn-disabled").removeAttr("disabled", "disabled"); //å å ¥DOM $(parent).append(filterBox); //èµå¼FORM form.val("table-filter-form", tableFilter.toLayuiFrom(elemId, filterName, filterType)); //渲ælayui form form.render(null, 'table-filter-form'); //渲ææ¥æ if (filterType == "date") { laydate.render({ elem: '.layui-table-filter-date', range: true, type: 'date', value: $('.layui-table-filter-date').next().val(), position: 'static', showBottom: false, change: function (value, date, endDate) { $('.layui-table-filter-date').next().val(value) } }); } //渲æFORM å¦ææ¯searchInput å°±é»è®¤éä¸ var searchInput = filterBox.find('form input[type="search"]'); searchInput.focus().select(); //å¤çå¼æ¥filterData if ((filterType == 'checkbox' || filterType == 'radio') && filterUrl) { var filterBoxUl = filterBox.find('.layui-table-filter-box ul'); filterBoxUl.append('<div class="loading"><i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i></div>'); $.getJSON(filterUrl + "?_t=" + new Date().getTime(), function (res, status, xhr) { filterBoxUl.empty(); filterType == "radio" && filterBoxUl.append('<li><input type="radio" name="' + filterName + '" value="" title="All" checked></li>'); layui.each(res.data, function (i, item) { filterType == "checkbox" && filterBoxUl.append('<li><input type="checkbox" name="' + filterName + '[' + item.key + ']" value="' + item.key + '" title="' + item.value + '" lay-skin="primary"></li>'); filterType == "radio" && filterBoxUl.append('<li><input type="radio" name="' + filterName + '" value="' + item.key + '" title="' + item.value + '"></li>'); }) form.render(null, 'table-filter-form'); form.val("table-filter-form", tableFilter.toLayuiFrom(elemId, filterName, filterType)); }); } //ç¹å»ç¡®è®¤å¼å§è¿æ»¤ form.on('submit(tableFilter)', function (data) { //éæå¤éæ¡ç»æ if (filterType == "checkbox") { var NEWfield = []; for (var key in data.field) { NEWfield.push(data.field[key]) } data.field[filterName] = NEWfield } //è¿æ»¤é¡¹åå ¥ç¼å tableFilter.cache[elemId][filterName] = data.field[filterName]; //å¦ææè¿æ»¤é¡¹ iconå°±é«äº® if (tableFilter.cache[elemId][filterName].length > 0) { filterIcon.addClass("tableFilter-has") } else { filterIcon.removeClass("tableFilter-has") } if (mode == "local") { //æ¬å°äº¤åè¿æ»¤ var trsIndex = tableFilter.getShowTrIndex(elem, elemId, filters); if (trsIndex.length > 0 || data.field[filterName].length > 0) { var trs = elem.next().find('.layui-table-body tr'); trs.each(function (i, tr) { if ($.inArray($(tr).data("index"), trsIndex) != -1) { $(tr).removeClass("layui-hide") } else { $(tr).addClass("layui-hide") } }) } else { elem.next().find('.layui-table-body tr').removeClass("layui-hide") } //æ´æ°åè®¡è¡ tableFilter.updataTotal(elem); //æ´æ°åºåå· tableFilter.upNumbers(elem); //åæ¶è¡¨æ ¼éä¸ tableFilter.uncheck(elem); //éè½½è¡¨æ ¼å°ºå¯¸ table.resize(elemId) } else if (mode == "api") { //æå¡ç«¯äº¤åè¿æ»¤ //å°æ°ç»è½¬å符串 var new_where = {}; for (var key in tableFilter.cache[elemId]) { var filterKey = key, filterValue = tableFilter.cache[elemId][key]; if ($.isArray(filterValue)) { new_where[filterKey] = filterValue.join(","); } else { new_where[filterKey] = filterValue; } } table.reload(elemId, { "where": new_where }) } //åå ¥åè°å½æ° opt.done(tableFilter.cache[elemId]); filterBox.remove(); return false; }) //ç¹å»æ¸ é¤æ¤é¡¹è¿æ»¤ filterBox.find('.layui-table-filter-box .filter-del').on('click', function (e) { delete tableFilter.cache[elemId][filterName]; filterIcon.removeClass("tableFilter-has"); if (mode == "local") { var trsIndex = tableFilter.getShowTrIndex(elem, elemId, filters); if (trsIndex.length > 0) { var trs = elem.next().find('.layui-table-body tr'); trs.each(function (i, tr) { if ($.inArray($(tr).data("index"), trsIndex) != -1) { $(tr).removeClass("layui-hide") } else { $(tr).addClass("layui-hide") } }) } else { elem.next().find('.layui-table-body tr').removeClass("layui-hide") } //æ´æ°åè®¡è¡ tableFilter.updataTotal(elem) //æ´æ°åºåå· tableFilter.upNumbers(elem) //åæ¶è¡¨æ ¼éä¸ tableFilter.uncheck(elem) //éè½½è¡¨æ ¼å°ºå¯¸ table.resize(elemId) } else if (mode == "api") { //éè¦æ¸ é¤whereéç对åºçå¼ var where = {}; where[filterName] = '' table.reload(elemId, { "where": where }) } opt.done(tableFilter.cache[elemId]); filterBox.remove(); }) //ç¹å»å ¶ä»åºåå ³é $(document).mouseup(function (e) { var userSet_con = $('.layui-table-filter-view'); if (!userSet_con.is(e.target) && userSet_con.has(e.target).length === 0) { filterBox.remove(); } }); }) }) }; main(); //å½æ°è¿å var returnObj = { 'config': opt, 'reload': function (opt) { main(); //æ´æ°åºåå· tableFilter.upNumbers(elem); } } return returnObj } //éåè¡è·åæ¬å°åéå return tdsArray[] tableFilter.eachTds = function (elem, filterField) { var tdsText = [], tdsArray = []; var tds = elem.next().find('.layui-table-body td[data-field="' + filterField + '"]'); tds.each(function (i, td) { tdsText.push($.trim(td.innerText)) }) tdsText = tableFilter.tool.uniqueObjArray(tdsText); layui.each(tdsText, function (i, item) { tdsArray.push({ 'key': item, 'value': item }) }) return tdsArray; } //è·åå¹é çTRçdata-index return trsIndex[] tableFilter.getShowTrIndex = function (elem, elemId, filters) { var trsIndex = []; var filterValues = tableFilter.cache[elemId]; for (var key in filterValues) { var filterKey = key, filterValue = filterValues[key]; //å¦æænameæ¯å¯¹filterField layui.each(filters, function (i, item) { if (filterKey == item.name) { filterKey = item.field } }) var tds = elem.next().find('.layui-table-body td[data-field="' + filterKey + '"]'); //è·åè¿ä¸æ¬¡è¿æ»¤çå¹é var this_trsIndex = []; tds.each(function (i, td) { if ($.isArray(filterValue)) { //è¿æ»¤å¼=æ°ç» inArray å¤éæ¡ if ($.inArray($.trim(td.innerText), filterValue) >= 0 && filterValue && filterValue.length > 0) { this_trsIndex.push($(td).parent().data("index")) } } else if (filterValue.indexOf(" - ") >= 0) { //æ¯å¦å¨æ¶é´æ®µå var d = $.trim(td.innerText); var s = filterValue.split(" - ")[0]; var e = filterValue.split(" - ")[1]; if (tableFilter.tool.isDuringDate(d, s, e)) { this_trsIndex.push($(td).parent().data("index")) } } else { //è¿æ»¤å¼=å符串 indexOf åéæ¡ è¾å ¥æ¡ if ($.trim(td.innerText).indexOf(filterValue) >= 0) { this_trsIndex.push($(td).parent().data("index")) } } }) //åæç»ç»æ å并æ°ç»åå»ç¸åå¼ //第ä¸æ¬¡ ä¸å并 if (trsIndex.length <= 0) { trsIndex = this_trsIndex } else { if (this_trsIndex.length > 0) { //è¿ä¸æ¬¡æå¼ ååé¢N次åç¸åå¼ trsIndex = tableFilter.tool.getSameArray(trsIndex, this_trsIndex); } else { //è¿ä¸æ¬¡æ²¡å¼ åé¢N次æå¼,å¦æå符串è¿æ»¤æªæå¼ å°±æ¾ç¤ºç©º trsIndex = $.isArray(filterValue) ? trsIndex : []; } } } return tableFilter.tool.uniqueObjArray(trsIndex); } //JSON æ°æ®è½¬layuiFOMR å¯ç¨ç å¤çcheckbox tableFilter.toLayuiFrom = function (elemId, filterName, filterType) { var form_val = JSON.stringify(tableFilter.cache[elemId]); form_val = JSON.parse(form_val); if (filterType == "checkbox") { layui.each(form_val[filterName], function (i, value) { form_val[filterName + "[" + value + "]"] = true; }) delete form_val[filterName]; } return form_val; } //æ´æ°å计è¡æ°æ® tableFilter.updataTotal = function (elem) { var elemId = elem.attr("id"); table.eachCols(elemId, function (i, item) { if (item.totalRow) { var tdAllnum = 0; var tds = elem.next().find('.layui-table-body td[data-field="' + item.field + '"]') tds.each(function (i, td) { if (!$(td).parent().hasClass('layui-hide')) { //FIX JS计ç®ç²¾åº¦ tdAllnum = (tdAllnum * 10 + Number($.trim(td.innerText)) * 10) / 10 } }) var totalTds = elem.next().find('.layui-table-total td[data-field="' + item.field + '"]') totalTds.each(function (i, td) { $(td).find(".layui-table-cell").html(tdAllnum || "0") }) } }) } //æ´æ°åºå·å tableFilter.upNumbers = function (elem) { //å½å第å 页 var cur = elem.next().find('.layui-laypage-curr').text(); cur = Number(cur || '1') var limit = elem.next().find('.layui-laypage-limits select').val(); limit = Number(limit) var trs = elem.next().find('.layui-table-main tr'); var n = cur == 1 ? 0 : limit * (cur - 1); trs.each(function (i, tr) { if (!$(tr).hasClass('layui-hide')) { n += 1; $(tr).find('.laytable-cell-numbers').html(n) } }) if (elem.next().find('.layui-table-fixed').length >= 1) { var trs_f = elem.next().find('.layui-table-fixed .layui-table-body tr'); var n_f = cur == 1 ? 0 : limit * (cur - 1); trs_f.each(function (i, tr_f) { if (!$(tr_f).hasClass('layui-hide')) { n_f += 1; $(tr_f).find('.laytable-cell-numbers').html(n_f) } }) } } //è¡¨æ ¼åæ¶éä¸ tableFilter.uncheck = function (elem) { var elemId = elem.attr("id"); var tableName = elem.attr("lay-filter"); var trs = elem.next().find('.layui-table-fixed-l tr'); trs.each(function (i, tr) { var c = $(tr).find("[name='layTableCheckbox']"); if (c.prop("checked")) { $(tr).find('.layui-form-checked i').click() } }) } //FIX è¡¨æ ¼å ¨ééä¸éè项 tableFilter.fixAll = function (elem) { var elemId = elem.attr("id"); var tableName = elem.attr("lay-filter"); var trs = elem.next().find('.layui-table-main tr'); table.on('checkbox(' + tableName + ')', function (obj) { if (obj.type == "all") { var data = table.cache[elemId]; trs.each(function (i, tr) { if ($(tr).hasClass('layui-hide')) { data[i].LAY_CHECKED = false; } }) } }) } //éèéæ©å¨ tableFilter.hide = function () { $('.layui-table-filter-view').remove(); } //å·¥å · tableFilter.tool = { //æ°ç»&对象æ°ç»å»é 'uniqueObjArray': function (arr, type) { var newArr = []; var tArr = []; if (arr.length == 0) { return arr; } else { if (type) { for (var i = 0; i < arr.length; i++) { if (!tArr[arr[i][type]]) { newArr.push(arr[i]); tArr[arr[i][type]] = true; } } return newArr; } else { for (var i = 0; i < arr.length; i++) { if (!tArr[arr[i]]) { newArr.push(arr[i]); tArr[arr[i]] = true; } } return newArr; } } }, //å并æ°ç»åç¸å项 'getSameArray': function (arry1, arry2) { var newArr = []; for (var i = 0; i < arry1.length; i++) { for (var j = 0; j < arry2.length; j++) { if (arry2[j] === arry1[i]) { newArr.push(arry2[j]); } } } return newArr; }, 'isDuringDate': function (dateStr, beginDateStr, endDateStr) { var curDate = new Date(dateStr), beginDate = new Date(beginDateStr), endDate = new Date(endDateStr); if (curDate >= beginDate && curDate <= endDate) { return true; } return false; } } //è¾åºæ¥å£ exports(MOD_NAME, tableFilter); }); WebTM/layuiadmin/style/tableFilter.css
New file @@ -0,0 +1,106 @@ /*table è¿æ»¤*/ .layui-table-filter { height: 100%; cursor: pointer; position: absolute; right: 15px; padding: 0 5px; } .layui-table-filter i { font-size: 12px; color: #ccc; } .layui-table-filter:hover i { color: #666; } .layui-table-filter.tableFilter-has i { color: #1E9FFF; } .layui-table-filter-view { min-width: 90px; background: #FFFFFF; border: 1px solid #d2d2d2; box-shadow: 0 2px 4px rgba(0,0,0,.12); position: absolute; top: 0px; left: 0px; z-index: 90000000; } .layui-table-filter-box { padding: 10px; } .layui-table-filter-box .loading { width: 100%; height: 100%; text-align: center; line-height: 150px; } .layui-table-filter-box .loading i { font-size: 18px; } .layui-table-filter-box input.layui-input { margin-bottom: 10px; } .layui-table-filter-box ul { border: 1px solid #eee; height: 150px; overflow: auto; margin-bottom: 10px; padding: 5px 10px 5px 10px; } .layui-table-filter-box ul li { padding: 3px 0; } .layui-table-filter-box ul.radio { padding: 0px; } .layui-table-filter-box ul.radio li { padding: 0px; } .layui-table-filter-box ul li .layui-form-radio { display: block; color: #666; margin: 0px; padding: 0px; transition: .1s linear; } .layui-table-filter-box ul li .layui-form-radio div { display: block; padding: 0 10px; } .layui-table-filter-box ul li .layui-form-radio i { display: none; } .layui-table-filter-box ul li .layui-form-radio:hover { background: #f9f9f9; } .layui-table-filter-box ul li .layui-form-radio.layui-form-radioed { background: #5FB878; color: #fff; } .layui-table-filter-date { margin-bottom: 10px; } .layui-table-filter-date .layui-laydate { box-shadow: none; border: 0; } WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckBillList.html
@@ -977,11 +977,11 @@ , "HPlanNo": data.ç¹æ£è®¡åå ç , "HMouldID": data.HMouldID == undefined ? 0 : data.HPlanInterID , "HMouldDotCheckRuleName": data.å¨å ·ç¹æ£è§ç¨åæ®å· , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HPlanInterID , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HMouldDotCheckRuleID , "HErrNote": data.å¼å¸¸æ åµè®°å½ //å¼å¸¸æ åµè®°å½ , "HBigSafeNote": data.é大å®å ¨éæ£è®°å½ //é大å®å ¨éæ£è®°å½ , "HDotCheckNote": data.ç¹æ£æ°æ® //ç¹æ£æ°æ® , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HPlanInterID , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HShiftsID , "HShiftsName": data.ç次å称 //ç次å称 }); if (data.æç»ç»è®º == "ä¸åæ ¼") { WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldDotCheckBillList.html
@@ -211,7 +211,7 @@ var option2 = []; var HModName = "Sc_MouldDotCheckBillList"; var HBillType = "3821"; var titleData = ["hmainid", "HPlanInterID", "HDotCheckItemID", "åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºå主å ç ", "æºååå ç ", "HBillType","HMouldDotCheckRuleID"];//ä¸éè¦æ¾ç¤ºçå段 å¯æ©å± var titleData = ["hmainid", "HPlanInterID", "HDotCheckItemID", "åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºå主å ç ", "æºååå ç ", "HBillType", "HMouldDotCheckRuleID","HShiftsID"];//ä¸éè¦æ¾ç¤ºçå段 å¯æ©å± //#endregion //#region è¿å ¥é¡µé¢å³å è½½ WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html
@@ -724,7 +724,10 @@ } else if ($("#HErrMsgBackTypeName").val() == "æ¨¡å ·åå ") { $("#HHandleEmpName").val("å´æ"); //ææ´¾å¤ç人 $("#HHandleEmpID").val(162686); //ææ´¾å¤ç人 } else if ($("#HErrMsgBackTypeName").val() == "ä¸åæ ¼åå ") { } else if ($("#HErrMsgBackTypeName").val() == "æµè¯åå ") { $("#HHandleEmpName").val("åæé"); //ææ´¾å¤ç人 $("#HHandleEmpID").val(162622); //ææ´¾å¤ç人 } else if ($("#HErrMsgBackTypeName").val() == "ç¯å¢åå ") { $("#HHandleEmpName").val("åæé"); //ææ´¾å¤ç人 $("#HHandleEmpID").val(162622); //ææ´¾å¤ç人 } WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_MESExecptFeedBackBillType.html
@@ -117,7 +117,7 @@ <div class="layui-inline"> <div class="layui-input-inline" style="margin-left:400px"> <label class="radio-label"> <input type="radio" name="faultType" value="设å¤å¼å¸¸">设å¤å¼å¸¸ <input type="radio" name="faultType" value="设å¤åå ">设å¤åå </label> </div> </div> @@ -127,7 +127,7 @@ <div class="layui-inline"> <div class="layui-input-inline" style="margin-left:200px"> <label class="radio-label"> <input type="radio" name="faultType" value="ç©æå¼å¸¸">ç©æå¼å¸¸ <input type="radio" name="faultType" value="ææåå ">ææåå </label> </div> </div> @@ -140,23 +140,31 @@ </div> </div> <div class="layui-form-item" style="margin-top:90px"> <div class="layui-form-item" style="margin-top:60px"> <div class="layui-inline"> <div class="layui-input-inline" style="margin-left:200px"> <label class="radio-label"> <input type="radio" name="faultType" value="æ£æµåå ">æ£æµåå <input type="radio" name="faultType" value="æ¨¡å ·åå ">æ¨¡å ·åå </label> </div> </div> <div class="layui-inline"> <div class="layui-input-inline" style="margin-left:400px"> <label class="radio-label"> <input type="radio" name="faultType" value="ä¸åæ ¼åå ">ä¸åæ ¼åå <input type="radio" name="faultType" value="æµè¯åå ">æµè¯åå </label> </div> </div> </div> <div class="layui-form-item" style="margin-top:60px"> <div class="layui-inline"> <div class="layui-input-inline" style="margin-left:200px"> <label class="radio-label"> <input type="radio" name="faultType" value="ç¯å¢åå ">ç¯å¢åå </label> </div> </div> </div> </div> </div> @@ -211,13 +219,17 @@ Pub_Close(1); }); document.querySelectorAll('input[name="faultType"]').forEach(function (radio) { // è·åææå称为 faultType çåéæé® const radios = document.querySelectorAll('input[name="faultType"]'); // 为æ¯ä¸ªåéæé®æ·»å change äºä»¶çå¬å¨ radios.forEach(function (radio) { radio.addEventListener('change', function () { if (this.checked) { // åªæ被éä¸çradioæä¼è§¦å var value = this.value; // è·åéä¸çradioçå¼ if (this.checked) { var value = this.value; layer.open({ type: 2, skin: 'layui-layer-rim', //å ä¸è¾¹æ¡ skin: 'layui-layer-rim', title: 'å¼å¸¸åé¦å', closeBtn: 1, shift: 2, @@ -246,7 +258,48 @@ }); }); // è·åææçåéæé®çç¶å ç´ div.layui-input-inline const radioContainers = document.querySelectorAll('.layui-input-inline'); // 为æ¯ä¸ªç¶å ç´ æ·»å ç¹å»äºä»¶çå¬å¨ radioContainers.forEach(function (container) { container.addEventListener('click', function (event) { // å¤æç¹å»çå ç´ æ¯å¦æ¯åéæé®æè å ¶ç´æ¥åå ç´ if (event.target.tagName === 'INPUT' || event.target.parentNode.tagName === 'INPUT') { const clickedRadio = event.target.tagName === 'INPUT' ? event.target : event.target.parentNode.querySelector('input'); if (clickedRadio && clickedRadio.checked) { var value = clickedRadio.value; layer.open({ type: 2, skin: 'layui-layer-rim', title: 'å¼å¸¸åé¦å', closeBtn: 1, shift: 2, area: ['100%', '100%'], maxmin: true, content: './Sc_Add_MESExecptFeedBackBillList.html?OperationType=4&linterid=&HSouceBillType=', end: function () { }, success: function (dom, index) { var data = []; data.push({ "HICMOBillNo": HICMOBillNo,//å·¥åå· "HSourceName": HSourceName, //è®¾å¤ "HType": value, //å¼å¸¸ç±»å "HSourceBillNo": HSourceBillNo //æµè½¬å¡å· }); // éè¿ç´¢å¼è·åå°å½å iframe å¼¹åºå± var iframe = window['layui-layer-iframe' + index]; // è°ç¨ iframe å¼¹åºå±å çæ¹æ³ iframe.edit(data); }, }); } } }); }); //以ä¸ä¸ºlayui模å }); </script> WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html
@@ -88,7 +88,7 @@ <div class="layui-inline"> <label class="layui-form-label">ç»è®°äºº<label style="color:red"> * </label></label> <div class="layui-input-inline"> <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly> <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly> <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;"> <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> @@ -1112,7 +1112,7 @@ "å·¥åº": result.data[i]["å·¥åº"], "HUnitID": result.data[i]["HUnitID"], "计éåä½": result.data[i]["计éåä½"], "HQty": result.data[i]["åºç«æ°é"], "HQty": 1, "HSourceID": result.data[i]["HSourceID"], "ç产èµæº": result.data[i]["ç产èµæº"], "HNowProcID": "0", "å½åå·¥åº": "", @@ -1314,7 +1314,7 @@ // return false; //} if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null) { if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null || $("#HEmpName").val() == "") { layer.msg("ç»è®°äººæªéæ©!"); return false; } WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html
@@ -86,6 +86,12 @@ </button> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width:110px;">ééIDå·</label> <div class="layui-input-inline"> <input class="layui-input" name="HDingDingUserID" id="HDingDingUserID" value="0"> </div> </div> </div> <div class="layui-form-item"> <div class="layui-inline"> @@ -1005,6 +1011,7 @@ , "HWorkCenterID": data.HWorkCenterID , "HWorkCenterName": data.å·¥ä½ä¸å¿ , "HICNumber": data.ICå¡å· , "HDingDingUserID": data.ééIDå· }); } else { WebTM/views/ÖÊÁ¿¹ÜÀí/°²µÆÖ𼶺ô½Ð¹æÔò/OA_AndengFlowRuleBillMain.html
@@ -296,22 +296,31 @@ ////ç¦ç¨ç»ç»é项 //$("#HOrgID").attr("disabled", true); OperationType = 1; //åå§å项ç®é¶æ®µè¡¨ get_InitGrid(); //çæ并设置主表çå ç ååæ®å· createBillNo(); //åå§åå¶å人åå¶åæ¶é´ $("#HMaker").val(sessionStorage["HUserName"]); $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd")); //åå§åæ¥æ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); } else if (OperationType == 2) {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¼è¾ OperationType = 1; //åå§å项ç®é¶æ®µè¡¨ get_InitGrid(); RoadBillMain(linterid); //çæ并设置主表çå ç ååæ®å· createBillNo(); //åå§åå¶å人åå¶åæ¶é´ $("#HMaker").val(sessionStorage["HUserName"]); $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd")); //åå§åæ¥æ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); } else if (OperationType == 3) {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¼è¾ ////ç¦ç¨ç»ç»é项 @@ -795,8 +804,8 @@ //主表 èµå¼ form.val("formData", { //formTest å³ class="layui-form" æå¨å ç´ å±æ§ lay-filter="" 对åºçå¼ "HInterID": data[0]["hmainid"] , "HBillNo": data[0]["åæ®å·"] "HInterID": OperationType == 2 ? "" : data[0]["hmainid"] , "HBillNo": OperationType == 2 ? "" : data[0]["åæ®å·"] , "HDate": formatDate(data[0]["æ¥æ"]) , "HDeptID": data[0]["HDeptID"] , "HDeptName": data[0]["åèµ·é¨é¨"] WebTM/views/ÖÊÁ¿¹ÜÀí/°²µÆÖ𼶺ô½Ð¹æÔò/OA_AndengFlowRuleBillMainList.html
@@ -153,6 +153,7 @@ <div class="layui-btn-container"> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button> @@ -232,6 +233,9 @@ break; //ç¼è¾ case 'set_ShowBill': set_ShowBill(); break; //å¤å¶ case 'set_Copy': set_Copy(); break; //å é¤ case 'set_DeleteBill': set_DeleteBill(); @@ -450,22 +454,6 @@ } } } ////å¨ææ¾ç¤ºåå //option = { // elem: '#mainTable' // , toolbar: '#toolbarDemo' // , cols: [col] // , data: data1.data // , height: 800 // , page: true // , totalRow: true // , cellMinWidth: 90 // , limit: 50 // , limits: [50, 500, 5000, 20000] // , done: function (res, curr, count) { // soulTable.render(this); // } //} option.cols = [col]; option.data = data1.data; @@ -602,7 +590,6 @@ , data = checkStatus.data; if (checkStatus.data.length === 1) { var linterid = data[0].hmainid.toString(); //if (AllowLoadData(sSubStr) != false) {//é空éªè¯ layer.open({ type: 2 , area: ['100%', '100%'] @@ -621,6 +608,28 @@ } //#endregion //å¤å¶ function set_Copy() { var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { var linterid = data[0].hmainid.toString(); layer.open({ type: 2 , area: ['100%', '100%'] , title: 'æ°å¢' + HPageTitle , shift: 0//å¼¹åºå¨ç» , content: '../../è´¨é管ç/å®ç¯é级å¼å«è§å/OA_AndengFlowRuleBillMain.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=' , end: function () { //å·æ°é¡µé¢, location.reload(); } }) } else { layer.msg('请éæ©ä¸è¡æ°æ®ç¼è¾ï¼'); } } //#region å é¤ function set_DeleteBill() { WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackaging.html
@@ -102,6 +102,12 @@ <input type="text" style="border-radius: 50px;width: 140%;" name="å件æ¡ç " id="SubBarcode" autocomplete="off" placeholder="请è¾å ¥å件æ¡ç " class="layui-input"> </div> </div> <div class=""> <label class="layui-inline" style="width:60px;">æ¯å¦æ··ç®±</label> <div class="layui-inline"> <input type="checkbox" id="HMixedBox" name="HMixedBox" lay-skin="primary" value="" lay-filter="HMixedBox"> </div> </div> </div> <div class="layui-inline"> <div class=""> @@ -441,6 +447,7 @@ return util.toDateString(time, "yyyy-MM-dd"); } } //, { field: 'HBarCode_Pack', title: 'æ¡å½¢ç ', width: 145 } , { field: 'HSourceBillNo', title: 'æ¡å½¢ç ', width: 145 } , { field: 'HBillNo', title: 'æºååå·', width: 125 } , { field: 'HBarCode', title: 'å¯ä¸ç ', width: 125 } @@ -526,7 +533,7 @@ return; } //å¤æè£ ç®±æ°éä¸è½å¤§äºå©ä½æ°é if (zxQty > icmoQtyNow) { if (zxQty > icmoQtyNow && $("#HMixedBox").val()=="") { playSound(); layer.msg("è£ ç®±æ°éä¸å 许大äºæµè½¬å¡å©ä½æ°éï¼å©ä½æ°é为" + icmoQtyNow, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' }); return; @@ -584,6 +591,24 @@ } } }); form.on('checkbox(HMixedBox)', function (obj) { if (icmoQtyNow == 0) { playSound(); layer.msg("å©ä½æ°é为" + icmoQtyNow + ",ä¸å 许混箱ï¼", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' }); $("input[name='HMixedBox']").prop("checked", false); form.render('checkbox'); return; } if (obj.value == "") { $("#HMixedBox").val("1"); } else { $("#HMixedBox").val(""); } }); //å件æ¡ç å车æ¹æ³ $('#SubBarcode').on('keydown', function (event) { //æ«æ¡å½¢ç @@ -688,7 +713,7 @@ url: GetWEBURL() + "/LEMS/SNBarcodeProcCtrl", type: "GET", async: false, data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo }, data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo, "HMixedBox": $("#HMixedBox").val(), "HBillNo": HBillNo2 }, success: function (result) { if (result.count == 0) { a = 1; @@ -728,6 +753,12 @@ if (AllHqty >= icmoQty) { playSound(); layer.alert("å è£ æ°éå·²çäºæµè½¬å¡æ°éï¼ä¸å 许æ«ç ï¼", { icon: 1 }); return; } else { //å¤æè£ ç®±æ°éä¸è½å¤§äºå©ä½æ°é if (AllHqty > icmoQtyNow && $("#HMixedBox").val() == "") { playSound(); layer.msg("è£ ç®±æ°éä¸å 许大äºæµè½¬å¡å©ä½æ°éï¼å©ä½æ°é为" + icmoQtyNow, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' }); return; } else { $.ajax({//表ä½åtemp表 @@ -810,6 +841,7 @@ layer.alert("å件æ¡ç æ¹æ³åçé误!", { icon: 5 }); } }); } } }, error: function () { playSound(); @@ -994,6 +1026,9 @@ //æ¸ ç©ºæ«æè®°å½çè£ ç®±æ°é zxQtyFlag = 0; pcmQtyFlag = 0; $("#HMixedBox").val(""); $("input[name='HMixedBox']").prop("checked", false); form.render('checkbox'); //è·ååæ®å· getBillno(); //æ«ææ¡ç WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -8,6 +8,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="../../../layuiadmin/style/tableFilter.css" media="all"> <script src="../../../layuiadmin/layui/layui.js"></script> <script src="../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> @@ -17,6 +18,7 @@ <script src="../../../layuiadmin/HideButton.js"></script> <script src="../../../layuiadmin/soulTable.slim.js"></script> <script src="../../../layuiadmin/PageTitle.js"></script> <script src="../../../layuiadmin/modules//tableFilter2.js"></script> </head> <body> <div class="layui-fluid"> @@ -269,7 +271,7 @@ base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾ }).extend({ index: 'lib/index', //ä¸»å ¥å£æ¨¡å }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () { }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable','tableFilter'], function () { var $ = layui.$ , admin = layui.admin , layer = layui.layer @@ -280,6 +282,7 @@ , laydate = layui.laydate , util = layui.util , soulTable = layui.soulTable , tableFilter = layui.tableFilter var Organization = sessionStorage["Organization"]; //å ¬ç¨åé @@ -323,6 +326,16 @@ var lookDownBar = 0; //(0:ä¸æ¥æä½ï¼1ï¼ç´æ¥æ¥ç) var params = get_UrlVars(); //è·ååæ° //var tableFilterIns = tableFilter.render({ // 'elem': '#mainTable',//tableçéæ©å¨ // 'mode': 'local',//è¿æ»¤æ¨¡å¼ // 'filters': [ // { field: '车é´', type: 'checkbox' }, // ],//è¿æ»¤é¡¹é ç½® // 'done': function (filters) { // //ç»æåè° // } //}) //åå§åè¡¨æ ¼ set_InitGrid(); @@ -2070,6 +2083,34 @@ } } } //å¨ææ¾ç¤ºåå option = { elem: '#mainTable' , toolbar: '#toolbarDemo' , cols: [col] , data: data1.data , height: 700 //, page: true , totalRow: true , cellMinWidth: 90 , limit: 50 //, limits: [50, 500, 5000, 20000] , done: function (res, curr, count) { soulTable.render(this); tableFilter.render({ 'elem': '#mainTable', 'mode': 'local', 'filters': [ { field: '车é´', type: 'input' }, { field: 'æ¥æ', type: 'date' }, { field: 'å®¡æ ¸äºº', type: 'checkbox' }, { field: 'ä»»å¡å', type: 'radio' }, ], 'done': function (filters) { } }).reload(); } } option.cols = [col]; option.data = data1.data //å¤ææ¯å¦ææ¥ç工价æé @@ -2096,6 +2137,10 @@ ins = table.render(option); laypage.render(optionPage); tableFilterIns = table.render(optionPage); tableFilter.render(tableFilterIns); //å·æ°è¡¨æ ¼æ°æ® DisPlay_HideColumn();
