From 187db2c9b74f4908b143f73874cf72e4b2bd03e1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 29 十月 2024 10:09:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 30 -
WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html | 79 +++
WebTM/layuiadmin/style/tableFilter.css | 106 +++++
WebTM/layuiadmin/modules/tableFilter2.js | 532 ++++++++++++++++++++++++++++
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 5
WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMainList.html | 45 +
WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMain.html | 21
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html | 2
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 7
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 6
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 4
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 47 ++
WebTM/WebTM.csproj | 12
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 193 ++++++----
14 files changed, 938 insertions(+), 151 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 181a571..3d78034 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" />
@@ -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>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 67044c2..502622a 100644
--- a/WebTM/WebTM.csproj.user
+++ b/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>
\ No newline at end of file
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/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index c888503..0e0dc56 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/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.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
index 881cff5..a6ceb04 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/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 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 99e3cd5..2d5c516 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/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); //鎸囨淳澶勭悊浜�
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html"
index d589ab0..34522ce 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html"
@@ -106,7 +106,7 @@
</ul>
<div class="layui-tab-content" style="height: 700px;">
<div class="layui-tab-item layui-show">
- <div class="layui-form-item" style="margin-top:30px">
+ <div class="layui-form-item" style="margin-top:30px" >
<div class="layui-inline">
<div class="layui-input-inline" style="margin-left:200px">
<label class="radio-label">
@@ -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) { // 鍙湁琚�変腑鐨剅adio鎵嶄細瑙﹀彂
- var value = this.value; // 鑾峰彇閫変腑鐨剅adio鐨勫��
+ if (this.checked) {
+ var value = this.value;
layer.open({
type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
+ skin: 'layui-layer-rim',
title: '寮傚父鍙嶉鍗�',
closeBtn: 1,
shift: 2,
@@ -236,9 +248,9 @@
"HSourceBillNo": HSourceBillNo //娴佽浆鍗″彿
});
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // 閫氳繃绱㈠紩鑾峰彇鍒板綋鍓� iframe 寮瑰嚭灞�
var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // 璋冪敤 iframe 寮瑰嚭灞傚唴鐨勬柟娉�
iframe.edit(data);
},
});
@@ -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);
+ },
+ });
+ }
+ }
+ });
+ });
//浠ヤ笂涓簂ayui妯″潡
});
</script>
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/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index 102079d..060bb38 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/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 {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
index ad204cd..c9692b9 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/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]["鍙戣捣閮ㄩ棬"]
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMainList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMainList.html"
index 06d3bca..8d23ca6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMainList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/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();
@@ -449,23 +453,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
}
}
- }
- ////鍔ㄦ�佹樉绀哄垪鍚�
- //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() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 98f44f5..fc5861a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/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;
@@ -730,86 +755,93 @@
layer.alert("鍖呰鏁伴噺宸茬瓑浜庢祦杞崱鏁伴噺锛佷笉鍏佽鎵爜锛�", { icon: 1 });
return;
} else {
- $.ajax({//琛ㄤ綋瀛榯emp琛�
- url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json",
- type: "GET",
- async: false,
- data: {
- "HBillNo": HBillNo
- , "SubBarcode": SubBarcode
- , "HInterID": HInterID
- , "HBillNo2": HBillNo2
- , "HBillType": HBillType
- , "sMaker": sMaker
- , "HBarCode": $("#HBarCode_wym").val()
- , "HNumber": $("#HNumber").val()
- , "HName": $("#HMaterName").val()
- , "HModel": $("#HModel").val()
- },
- success: function (result) {
- var data = result.data;
- if (result.Message == "璇ュ瓙浠舵潯鐮佸凡瀛樺湪") {
- playSound();
- layer.alert("璇ュ瓙浠舵潯鐮佸凡瀛樺湪", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- } else {
- if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $('#SubBarcode').val("");
- $("#SubBarcode").focus();
- table.reload('smjl-table', {
- url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
- , where: {
- HBillNo: HBillNo2
- , HBarCode: HBillNo
- }
- });
- zxQtyFlag++;
- pcmQtyFlag++
- $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
- $("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
- layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
- $.ajax({//鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
- url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
- type: "GET",
- async: false,
- data: {
- "HBarCode": $("#HBarCode_wym").val()
- },
- success: function (result) {
- var HQty = result.data[0].HQty;
- HQty++;
- $.ajax({//鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
- url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
- type: "GET",
- async: false,
- data: {
- "HBarCode": $("#HBarCode_wym").val(),
- "HQty": HQty
- },
- success: function (result) {
- var HQty = result.data;
- ZJTMFlag = true;
- }, error: function () {
- playSound();
- layer.alert("鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }, error: function () {
- playSound();
- layer.alert("鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
- }
- });
- } else {
+ //鍒ゆ柇瑁呯鏁伴噺涓嶈兘澶т簬鍓╀綑鏁伴噺
+ if (AllHqty > icmoQtyNow && $("#HMixedBox").val() == "") {
+ playSound();
+ layer.msg("瑁呯鏁伴噺涓嶅厑璁稿ぇ浜庢祦杞崱鍓╀綑鏁伴噺锛佸墿浣欐暟閲忎负" + icmoQtyNow, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ } else {
+ $.ajax({//琛ㄤ綋瀛榯emp琛�
+ url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json",
+ type: "GET",
+ async: false,
+ data: {
+ "HBillNo": HBillNo
+ , "SubBarcode": SubBarcode
+ , "HInterID": HInterID
+ , "HBillNo2": HBillNo2
+ , "HBillType": HBillType
+ , "sMaker": sMaker
+ , "HBarCode": $("#HBarCode_wym").val()
+ , "HNumber": $("#HNumber").val()
+ , "HName": $("#HMaterName").val()
+ , "HModel": $("#HModel").val()
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.Message == "璇ュ瓙浠舵潯鐮佸凡瀛樺湪") {
playSound();
- // $("#verifycode").click();
- //layer.msg(result.Message, { icon: 5 });
- layer.alert("鎻掑叆缂撳瓨琛ㄥけ璐�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert("璇ュ瓙浠舵潯鐮佸凡瀛樺湪", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ } else {
+ if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $('#SubBarcode').val("");
+ $("#SubBarcode").focus();
+ table.reload('smjl-table', {
+ url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
+ , where: {
+ HBillNo: HBillNo2
+ , HBarCode: HBillNo
+ }
+ });
+ zxQtyFlag++;
+ pcmQtyFlag++
+ $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
+ $("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
+ layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ $.ajax({//鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+ url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+ type: "GET",
+ async: false,
+ data: {
+ "HBarCode": $("#HBarCode_wym").val()
+ },
+ success: function (result) {
+ var HQty = result.data[0].HQty;
+ HQty++;
+ $.ajax({//鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+ url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
+ type: "GET",
+ async: false,
+ data: {
+ "HBarCode": $("#HBarCode_wym").val(),
+ "HQty": HQty
+ },
+ success: function (result) {
+ var HQty = result.data;
+ ZJTMFlag = true;
+ }, error: function () {
+ playSound();
+ layer.alert("鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }, error: function () {
+ playSound();
+ layer.alert("鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ } else {
+ playSound();
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆缂撳瓨琛ㄥけ璐�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
}
+ }, error: function () {
+ playSound();
+ layer.alert("瀛愪欢鏉＄爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
}
- }, error: function () {
- playSound();
- 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();
//鎵弿鏉＄爜
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 f978413..fc168d6 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">
@@ -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();
--
Gitblit v1.9.1