From 700f3a7e97a030a2f9bd6b0308de1043bbbb228e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 28 十月 2024 19:11:14 +0800
Subject: [PATCH] 出站汇报单过滤筛选，质量汇报单表体数量默认为1
---
WebTM/layuiadmin/style/tableFilter.css | 106 ++++++++
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 6
WebTM/layuiadmin/modules/tableFilter2.js | 532 ++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 31 ++
WebTM/WebTM.csproj | 12 +
5 files changed, 683 insertions(+), 4 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 818c8dc..2fda9dd 100644
--- a/WebTM/WebTM.csproj
+++ b/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" />
@@ -374,6 +378,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" />
@@ -2253,6 +2258,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>
diff --git a/WebTM/layuiadmin/modules/tableFilter2.js b/WebTM/layuiadmin/modules/tableFilter2.js
new file mode 100644
index 0000000..f19cc8d
--- /dev/null
+++ b/WebTM/layuiadmin/modules/tableFilter2.js
@@ -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);
+
+ //璧嬪�糉ORM
+ 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 濡傛灉鏄痵earchInput 灏遍粯璁ら�変腑
+ 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") {
+ //闇�瑕佹竻闄here閲岀殑瀵瑰簲鐨勫��
+ 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;
+ }
+
+ //鑾峰彇鍖归厤鐨凾R鐨刣ata-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];
+
+ //濡傛灉鏈塶ame姣斿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) {
+ //杩欎竴娆℃湁鍊� 鍜屽墠闈娆″彇鐩稿悓鍊�
+ trsIndex = tableFilter.tool.getSameArray(trsIndex, this_trsIndex);
+ } else {
+ //杩欎竴娆℃病鍊� 鍓嶉潰N娆℃湁鍊�,濡傛灉瀛楃涓茶繃婊ゆ湭鏈夊�� 灏辨樉绀虹┖
+ trsIndex = $.isArray(filterValue) ? trsIndex : [];
+ }
+ }
+ }
+ return tableFilter.tool.uniqueObjArray(trsIndex);
+ }
+
+ //JSON 鏁版嵁杞琹ayuiFOMR 鍙敤鐨� 澶勭悊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);
+});
\ No newline at end of file
diff --git a/WebTM/layuiadmin/style/tableFilter.css b/WebTM/layuiadmin/style/tableFilter.css
new file mode 100644
index 0000000..068e588
--- /dev/null
+++ b/WebTM/layuiadmin/style/tableFilter.css
@@ -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;
+ }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index 5032a83..eb61400 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/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;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 4340955..7569b8c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/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">
@@ -241,7 +243,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
@@ -252,6 +254,7 @@
, laydate = layui.laydate
, util = layui.util
, soulTable = layui.soulTable
+ , tableFilter = layui.tableFilter
var Organization = sessionStorage["Organization"];
//鍏敤鍙橀噺
@@ -297,6 +300,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();
@@ -2102,6 +2115,18 @@
//, 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();
}
}
@@ -2129,6 +2154,10 @@
ins = table.render(option);
laypage.render(optionPage);
+
+ tableFilterIns = table.render(optionPage);
+ tableFilter.render(tableFilterIns);
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
--
Gitblit v1.9.1