From 2baa0ebfe5a070891bed8802b2a928112e55f68f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 28 十月 2024 19:23:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 30
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBill.html | 53
WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html | 79
WebTM/views/工资管理/工资报表/Pay_PaymentMonthSumReport.html | 626 +++++++
WebTM/layuiadmin/style/tableFilter.css | 106 +
WebTM/views/工资管理/工资报表/Pay_PaymentTimeSumReport.html | 572 +++++++
WebTM/layuiadmin/modules/tableFilter2.js | 532 ++++++
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 5
WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMainList.html | 45
WebTM/views/工资管理/工资报表/Pay_PaymentPieceSumReport.html | 521 ++++++
WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMain.html | 21
WebTM/views/工资管理/工资报表/Pay_PaymentDayCheckReport.html | 626 +++++++
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html | 2
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 7
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 6
WebTM/views/计划管理/工艺路线/Gy_RoutingBillToInvalidatedList.html | 286 ---
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 4
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 168 +
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_ICMO.html | 553 ++++++
WebTM/views/工资管理/工资报表/Pay_PayWorkShopSumReport.html | 572 +++++++
WebTM/WebTM.csproj | 18
22 files changed, 4,405 insertions(+), 431 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 89f78d7..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" />
@@ -409,6 +414,11 @@
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayWorkShopSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentDayCheckReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentMonthSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentTimeSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentPieceSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
@@ -579,6 +589,7 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_ICMO.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_MouldRequirementDay.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_CompareOrderToSelloutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_HICMMaterStatisticsList.html" />
@@ -2262,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/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 23c0038..70c2106 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,10 +5,10 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ /*var WEBURL = "http://localhost:8082/API/";*/ //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
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/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayWorkShopSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayWorkShopSumReport.html"
new file mode 100644
index 0000000..670d659
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayWorkShopSumReport.html"
@@ -0,0 +1,572 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>
+ 宸ヨ祫姹囨��
+ </title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱屽憳</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float:left;width:150px;" readonly>
+ <input type="hidden" class="layui-input" name="HEmpID" id="HEmpID" 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>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 100%;">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var ins;
+ var sWhere = "";
+ var option = [];
+ var HModName = "Pay_PayWorkShopSumReport";
+ //#endregion
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ DisPlay_HideColumn();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ get_FastQuery();
+ });
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on("toolbar(mainTable)", function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ case 'btn-reload':
+ get_FastQuery();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ default:
+ break;
+ }
+ })
+ //#endregion
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 閫夋嫨鑱屽憳
+ form.on('submit(HEmpList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //#endregion
+
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptID = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDeptID += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDeptID").append(HDeptID);
+
+ if (sessionStorage["HDeptID"] != "0") {
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ //鐢ㄦ埛缁戝畾鐨勮溅闂翠笉瀛樺湪锛屽垯榛樿鏄剧ず鍏ㄩ儴杞﹂棿
+ if ($("#HDeptID").val() == null || $("#HDeptID").val() == undefined) {
+ $("#HDeptID").val(0);
+ }
+ }
+
+ //$("#HDeptName").val("0");
+
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy)
+ form.render('select');
+ }
+
+ //鏈�
+ function Month() {
+ var MM = new Date().getMonth() + 1;
+ var MonthOption = "";
+ for (var i = 1; i <= 12; i++) {
+ MonthOption += '<option style="color:blue;" value="' + i + '">' + i + '</option>';
+ }
+ $("#HPeriod").append(MonthOption);
+ $("#HPeriod").val(MM)
+ form.render('select');
+ }
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ Month();
+ get_Dept();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ get_FastQuery()
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-180'
+ , page: true
+ , cellMinWidth: 90
+ , totalRow: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[]]
+ };
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDeptID = $("#HDeptID").val();
+ var HYear = $("#HYear").val();
+ var HPeriod = $("#HPeriod").val();
+ var HEmpID = $("#HEmpID").val();
+
+ //if (HDeptID) {
+ // sWhere += "and DeptID = " + DeptID;
+ //}
+ //if (HYear) {
+ // sWhere += " and HYear = " + HYear;
+ //}
+ //if (HPeriod) {
+ // sWhere += " and HPeriod = " + HPeriod;
+ //}
+ //sWhere = "'" + DeptID + "','" + HYear + "','" + HPeriod + "'";
+ get_Display(HYear, HPeriod, HDeptID, HEmpID);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HDeptID").val(0); //閮ㄩ棬
+ $("#HEmpID").val(0); //鑱屽憳
+ $("#HEmpName").val(""); //鑱屽憳
+ //$("#HYear").val(""); //骞�
+ //$("#HPeriod").val(""); //鏈�
+ Year();
+ Month();
+ form.render('select');
+ sWhere = "";
+ }
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(HYear, HPeriod, DeptID, HEmpID) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Pay_PayWorkShopSumReport/list',
+ type: "GET",
+ data: { "HYear": HYear, "HPeriod": HPeriod, "DeptID": DeptID, "HEmpID": HEmpID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col]
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+
+ DisPlay_HideColumn();
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Pay_PayWorkShopSumReportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ ins = table.render(option);
+ } else {
+ ins = table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function GetHEmpListValue(obj) { //杩斿洖鑱屽憳
+ $("#HEmpID").val(obj.HItemID);
+ $("#HEmpName").val(obj.鑱屽憳鍚嶇О);
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentDayCheckReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentDayCheckReport.html"
new file mode 100644
index 0000000..ccdd26f
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentDayCheckReport.html"
@@ -0,0 +1,626 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>
+ 姣忔棩宸ヨ祫纭
+ </title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐝粍<label style="color:red"></label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱屽憳</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float:left;width:150px;" readonly>
+ <input type="hidden" class="layui-input" name="HEmpID" id="HEmpID" 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>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 100%;">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var ins;
+ var sWhere = "";
+ var option = [];
+ var HModName = "Pay_PaymentDayCheckReport";
+ //#endregion
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ DisPlay_HideColumn();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ get_FastQuery();
+ });
+
+ //#region 閫夋嫨鐝粍鎸夐挳
+ form.on('submit(HGroupList)', function () {
+ get_checkGroup();
+ });
+ //#endregion
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on("toolbar(mainTable)", function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ case 'btn-reload':
+ get_FastQuery();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ default:
+ break;
+ }
+ })
+ //#endregion
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+
+ //#region 閫夋嫨鑱屽憳
+ form.on('submit(HEmpList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐝粍
+ function get_checkGroup() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐝粍鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ }
+ })
+ }
+
+ //#endregion
+
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptID = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDeptID += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDeptID").append(HDeptID);
+
+ if (sessionStorage["HDeptID"] != "0") {
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ //鐢ㄦ埛缁戝畾鐨勮溅闂翠笉瀛樺湪锛屽垯榛樿鏄剧ず鍏ㄩ儴杞﹂棿
+ if ($("#HDeptID").val() == null || $("#HDeptID").val() == undefined) {
+ $("#HDeptID").val(0);
+ }
+ }
+
+ //$("#HDeptName").val("0");
+
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy)
+ form.render('select');
+ }
+
+ //鏈�
+ function Month() {
+ var MM = new Date().getMonth() + 1;
+ var MonthOption = "";
+ for (var i = 1; i <= 12; i++) {
+ MonthOption += '<option style="color:blue;" value="' + i + '">' + i + '</option>';
+ }
+ $("#HPeriod").append(MonthOption);
+ $("#HPeriod").val(MM)
+ form.render('select');
+ }
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ Month();
+ get_Dept();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ get_FastQuery()
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-180'
+ , page: true
+ , cellMinWidth: 90
+ , totalRow: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[]]
+ };
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDeptID = $("#HDeptID").val();
+ var HYear = $("#HYear").val();
+ var HPeriod = $("#HPeriod").val();
+ var HEmpID = $("#HEmpID").val();
+ var HGroupID = $("#HGroupID").val();
+ //if (HDeptID) {
+ // sWhere += "and DeptID = " + DeptID;
+ //}
+ //if (HYear) {
+ // sWhere += " and HYear = " + HYear;
+ //}
+ //if (HPeriod) {
+ // sWhere += " and HPeriod = " + HPeriod;
+ //}
+ //sWhere = "'" + DeptID + "','" + HYear + "','" + HPeriod + "'";
+ get_Display(HYear, HPeriod, HDeptID, HGroupID, HEmpID);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HDeptID").val(0); //閮ㄩ棬
+ $("#HEmpID").val(0); //鑱屽憳
+ $("#HEmpName").val("");
+ $("#HGroupID").val(0); //鐝粍
+ $("#HGroupName").val("");
+ Year();
+ Month();
+ form.render('select');
+ sWhere = "";
+ }
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(HYear, HPeriod, DeptID,HGroupID,HEmpID) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Pay_PaymentDayCheckReport/list',
+ type: "GET",
+ data: { "HYear": HYear, "HPeriod": HPeriod, "DeptID": DeptID, "HGroupID": HGroupID, "HEmpID": HEmpID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鏃ユ湡') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." +data[i].name + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col]
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+
+ DisPlay_HideColumn();
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Pay_PaymentDayCheckReportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ ins = table.render(option);
+ } else {
+ ins = table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function GetHEmpListValue(obj) { //杩斿洖鑱屽憳
+ $("#HEmpID").val(obj.HItemID);
+ $("#HEmpName").val(obj.鑱屽憳鍚嶇О);
+ }
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentMonthSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentMonthSumReport.html"
new file mode 100644
index 0000000..69e16b4
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentMonthSumReport.html"
@@ -0,0 +1,626 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>
+ 宸ヨ祫鏈堟姤琛�
+ </title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐝粍<label style="color:red"></label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱屽憳</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float:left;width:150px;" readonly>
+ <input type="hidden" class="layui-input" name="HEmpID" id="HEmpID" 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>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 100%;">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var ins;
+ var sWhere = "";
+ var option = [];
+ var HModName = "Pay_PaymentMonthSumReport";
+ //#endregion
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ DisPlay_HideColumn();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ get_FastQuery();
+ });
+
+ //#region 閫夋嫨鐝粍鎸夐挳
+ form.on('submit(HGroupList)', function () {
+ get_checkGroup();
+ });
+ //#endregion
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on("toolbar(mainTable)", function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ case 'btn-reload':
+ get_FastQuery();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ default:
+ break;
+ }
+ })
+ //#endregion
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+
+ //#region 閫夋嫨鑱屽憳
+ form.on('submit(HEmpList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐝粍
+ function get_checkGroup() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐝粍鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ }
+ })
+ }
+
+ //#endregion
+
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptID = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDeptID += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDeptID").append(HDeptID);
+
+ if (sessionStorage["HDeptID"] != "0") {
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ //鐢ㄦ埛缁戝畾鐨勮溅闂翠笉瀛樺湪锛屽垯榛樿鏄剧ず鍏ㄩ儴杞﹂棿
+ if ($("#HDeptID").val() == null || $("#HDeptID").val() == undefined) {
+ $("#HDeptID").val(0);
+ }
+ }
+
+ //$("#HDeptName").val("0");
+
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy)
+ form.render('select');
+ }
+
+ //鏈�
+ function Month() {
+ var MM = new Date().getMonth() + 1;
+ var MonthOption = "";
+ for (var i = 1; i <= 12; i++) {
+ MonthOption += '<option style="color:blue;" value="' + i + '">' + i + '</option>';
+ }
+ $("#HPeriod").append(MonthOption);
+ $("#HPeriod").val(MM)
+ form.render('select');
+ }
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ Month();
+ get_Dept();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ get_FastQuery()
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-180'
+ , page: true
+ , cellMinWidth: 90
+ , totalRow: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[]]
+ };
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDeptID = $("#HDeptID").val();
+ var HYear = $("#HYear").val();
+ var HPeriod = $("#HPeriod").val();
+ var HEmpID = $("#HEmpID").val();
+ var HGroupID = $("#HGroupID").val();
+ //if (HDeptID) {
+ // sWhere += "and DeptID = " + DeptID;
+ //}
+ //if (HYear) {
+ // sWhere += " and HYear = " + HYear;
+ //}
+ //if (HPeriod) {
+ // sWhere += " and HPeriod = " + HPeriod;
+ //}
+ //sWhere = "'" + DeptID + "','" + HYear + "','" + HPeriod + "'";
+ get_Display(HYear, HPeriod, HDeptID, HGroupID, HEmpID);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HDeptID").val(0); //閮ㄩ棬
+ $("#HEmpID").val(0); //鑱屽憳
+ $("#HEmpName").val("");
+ $("#HGroupID").val(0); //鐝粍
+ $("#HGroupName").val("");
+ Year();
+ Month();
+ form.render('select');
+ sWhere = "";
+ }
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(HYear, HPeriod, DeptID,HGroupID,HEmpID) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Pay_PaymentMonthSumReport/list',
+ type: "GET",
+ data: { "HYear": HYear, "HPeriod": HPeriod, "DeptID": DeptID, "HGroupID": HGroupID, "HEmpID": HEmpID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col]
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+
+ DisPlay_HideColumn();
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Pay_PaymentMonthSumReportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ ins = table.render(option);
+ } else {
+ ins = table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function GetHEmpListValue(obj) { //杩斿洖鑱屽憳
+ $("#HEmpID").val(obj.HItemID);
+ $("#HEmpName").val(obj.鑱屽憳鍚嶇О);
+ }
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentPieceSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentPieceSumReport.html"
new file mode 100644
index 0000000..38367dd
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentPieceSumReport.html"
@@ -0,0 +1,521 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>
+ 杞﹂棿璁′欢宸ヨ祫姹囨��
+ </title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 100%;">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var ins;
+ var sWhere = "";
+ var option = [];
+ var HModName = "Pay_PaymentPieceSumReport";
+ //#endregion
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ DisPlay_HideColumn();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ get_FastQuery();
+ });
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on("toolbar(mainTable)", function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ case 'btn-reload':
+ get_FastQuery();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ default:
+ break;
+ }
+ })
+ //#endregion
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptID = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDeptID += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDeptID").append(HDeptID);
+
+ if (sessionStorage["HDeptID"] != "0") {
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ //鐢ㄦ埛缁戝畾鐨勮溅闂翠笉瀛樺湪锛屽垯榛樿鏄剧ず鍏ㄩ儴杞﹂棿
+ if ($("#HDeptID").val() == null || $("#HDeptID").val() == undefined) {
+ $("#HDeptID").val(0);
+ }
+ }
+
+ //$("#HDeptName").val("0");
+
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy)
+ form.render('select');
+ }
+
+ //鏈�
+ function Month() {
+ var MM = new Date().getMonth() + 1;
+ var MonthOption = "";
+ for (var i = 1; i <= 12; i++) {
+ MonthOption += '<option style="color:blue;" value="' + i + '">' + i + '</option>';
+ }
+ $("#HPeriod").append(MonthOption);
+ $("#HPeriod").val(MM)
+ form.render('select');
+ }
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ Month();
+ get_Dept();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ get_FastQuery()
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-180'
+ , page: true
+ , cellMinWidth: 90
+ , totalRow: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[]]
+ };
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDeptID = $("#HDeptID").val();
+ var HYear = $("#HYear").val();
+ var HPeriod = $("#HPeriod").val();
+ //if (HDeptID) {
+ // sWhere += "and DeptID = " + DeptID;
+ //}
+ //if (HYear) {
+ // sWhere += " and HYear = " + HYear;
+ //}
+ //if (HPeriod) {
+ // sWhere += " and HPeriod = " + HPeriod;
+ //}
+ //sWhere = "'" + DeptID + "','" + HYear + "','" + HPeriod + "'";
+ get_Display(HYear, HPeriod, HDeptID);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HDeptID").val(0); //閮ㄩ棬
+ //$("#HYear").val(""); //骞�
+ //$("#HPeriod").val(""); //鏈�
+ Year();
+ Month();
+ form.render('select');
+ sWhere = "";
+ }
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(HYear, HPeriod, DeptID) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Pay_PaymentPieceSumReport/list',
+ type: "GET",
+ data: { "HYear": HYear, "HPeriod": HPeriod, "DeptID": DeptID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col]
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+
+ DisPlay_HideColumn();
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Pay_PaymentPieceSumReportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ ins = table.render(option);
+ } else {
+ ins = table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function GetHEmpListValue(obj) { //杩斿洖鑱屽憳
+ $("#HEmpID").val(obj[0].HItemID);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ }
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentTimeSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentTimeSumReport.html"
new file mode 100644
index 0000000..cf63f24
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentTimeSumReport.html"
@@ -0,0 +1,572 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>
+ 杞﹂棿璁℃椂宸ヨ祫姹囨��
+ </title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱屽憳</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float:left;width:150px;" readonly>
+ <input type="hidden" class="layui-input" name="HEmpID" id="HEmpID" 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>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 100%;">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var ins;
+ var sWhere = "";
+ var option = [];
+ var HModName = "Pay_PaymentTimeSumReport";
+ //#endregion
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ DisPlay_HideColumn();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ get_FastQuery();
+ });
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on("toolbar(mainTable)", function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ case 'btn-reload':
+ get_FastQuery();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ default:
+ break;
+ }
+ })
+ //#endregion
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 閫夋嫨鑱屽憳
+ form.on('submit(HEmpList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //#endregion
+
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptID = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDeptID += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDeptID").append(HDeptID);
+
+ if (sessionStorage["HDeptID"] != "0") {
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ //鐢ㄦ埛缁戝畾鐨勮溅闂翠笉瀛樺湪锛屽垯榛樿鏄剧ず鍏ㄩ儴杞﹂棿
+ if ($("#HDeptID").val() == null || $("#HDeptID").val() == undefined) {
+ $("#HDeptID").val(0);
+ }
+ }
+
+ //$("#HDeptName").val("0");
+
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy)
+ form.render('select');
+ }
+
+ //鏈�
+ function Month() {
+ var MM = new Date().getMonth() + 1;
+ var MonthOption = "";
+ for (var i = 1; i <= 12; i++) {
+ MonthOption += '<option style="color:blue;" value="' + i + '">' + i + '</option>';
+ }
+ $("#HPeriod").append(MonthOption);
+ $("#HPeriod").val(MM)
+ form.render('select');
+ }
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ Month();
+ get_Dept();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ get_FastQuery()
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-180'
+ , page: true
+ , cellMinWidth: 90
+ , totalRow: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[]]
+ };
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDeptID = $("#HDeptID").val();
+ var HYear = $("#HYear").val();
+ var HPeriod = $("#HPeriod").val();
+ var HEmpID = $("#HEmpID").val();
+
+ //if (HDeptID) {
+ // sWhere += "and DeptID = " + DeptID;
+ //}
+ //if (HYear) {
+ // sWhere += " and HYear = " + HYear;
+ //}
+ //if (HPeriod) {
+ // sWhere += " and HPeriod = " + HPeriod;
+ //}
+ //sWhere = "'" + DeptID + "','" + HYear + "','" + HPeriod + "'";
+ get_Display(HYear, HPeriod, HDeptID, HEmpID);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HDeptID").val(0); //閮ㄩ棬
+ $("#HEmpID").val(0); //鑱屽憳
+ $("#HEmpName").val(""); //鑱屽憳
+ //$("#HYear").val(""); //骞�
+ //$("#HPeriod").val(""); //鏈�
+ Year();
+ Month();
+ form.render('select');
+ sWhere = "";
+ }
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(HYear, HPeriod, DeptID, HEmpID) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Pay_PaymentTimeSumReport/list',
+ type: "GET",
+ data: { "HYear": HYear, "HPeriod": HPeriod, "DeptID": DeptID, "HEmpID": HEmpID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col]
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+
+ DisPlay_HideColumn();
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Pay_PaymentTimeSumReportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ ins = table.render(option);
+ } else {
+ ins = table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function GetHEmpListValue(obj) { //杩斿洖鑱屽憳
+ $("#HEmpID").val(obj.HItemID);
+ $("#HEmpName").val(obj.鑱屽憳鍚嶇О);
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
index 22f9869..5cc50ff 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
@@ -154,7 +154,7 @@
</div>
</div>
<div class="layui-inline" style="width:500px;">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡鍚嶇О<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡鍚嶇О<label style="color:red"> </label></label>
<div class="layui-input-block" style="margin-left: 77px; width: 270px;">
<input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color: #efefef4d; width: 180px; display: inline-block;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
@@ -164,7 +164,7 @@
</div>
</div>
<div class="layui-inline" style="width:500px;">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁￠噺鍗曚綅<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁￠噺鍗曚綅<label style="color:red"> </label></label>
<div class="layui-input-block" style="margin-left: 77px; width: 270px;">
<input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color: #efefef4d; width: 180px; display: inline-block;" readonly>
<input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
@@ -742,7 +742,7 @@
, { field: 'HWorkTypeID', title: '宸ョID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HWorkTypeNumber', title: '宸ョ浠ｇ爜', edit: 'text', event: "HWorkTypeNumber" } //f7
, { field: 'HWorkTypeName', title: '宸ョ鍚嶇О', style: 'background-color: #f9f9f9;' }
- , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', style: 'background-color: #f9f9f9;' }
+ , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', edit: 'text' }
, { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes", hide: true }
, { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes", hide: true }
, { field: 'HTimes', title: '鍔犵彮鏃堕棿', totalRow: true, edit: 'text', totalRow: true }
@@ -1180,7 +1180,7 @@
var value1_ = ["灏忔椂宸ヨ祫", "鍔犵彮鏃堕棿", "瀹為檯鏃堕棿", "搴斿彂宸ヨ祫"]; ////瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗曞搴旂殑鍒楀悕娓呭崟
var value2 = []; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗�
var value2_ = []; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
- var value3 = ["HEmpID", "HWorkTypeID"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
+ var value3 = ["HEmpID"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
var value3_ = ["鑱屽憳", "宸ョ"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
@@ -1201,14 +1201,14 @@
layer.msg("閮ㄩ棬鏈�夋嫨!");
return false;
}
- if ($("#HMaterID").val() == "0") {
- layer.msg("鐗╂枡鏈�夋嫨!");
- return false;
- }
- if ($("#HUnitID").val() == "0") {
- layer.msg("璁￠噺鍗曚綅鏈�夋嫨!");
- return false;
- }
+ //if ($("#HMaterID").val() == "0") {
+ // layer.msg("鐗╂枡鏈�夋嫨!");
+ // return false;
+ //}
+ //if ($("#HUnitID").val() == "0") {
+ // layer.msg("璁￠噺鍗曚綅鏈�夋嫨!");
+ // return false;
+ //}
temp = $("#HSumRequestTimes").val();
if (temp == "") {
layer.msg("棰勮宸ユ椂涓嶈兘涓虹┖!");
@@ -1217,14 +1217,14 @@
layer.msg("棰勮宸ユ椂璇疯緭鍏ラ潪璐熸暟!");
return false;
}
- temp = $("#HPlanQty").val();
- if (temp == "") {
- layer.msg("璁″垝鏁伴噺涓嶈兘涓虹┖!");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("棰勮鏁伴噺璇疯緭鍏ラ潪璐熸暟!");
- return false;
- }
+ //temp = $("#HPlanQty").val();
+ //if (temp == "") {
+ // layer.msg("璁″垝鏁伴噺涓嶈兘涓虹┖!");
+ // return false;
+ //} else if (!ref.test(temp)) {
+ // layer.msg("棰勮鏁伴噺璇疯緭鍏ラ潪璐熸暟!");
+ // return false;
+ //}
//#endregion
//#region 瀛愯〃鏁版嵁妫�楠�
@@ -1264,10 +1264,10 @@
//鐗规畩鏍￠獙
temp = option.data[i]["HTimes"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛�:鍔犵彮鏃堕棿涓嶈兘涓�0!");
- return false;
- }
+ //if (temp == "0") {
+ // layer.msg("绗�" + (i + 1) + "琛�:鍔犵彮鏃堕棿涓嶈兘涓�0!");
+ // return false;
+ //}
temp = option.data[i]["HRelTimes"] + "";
if (temp == "0") {
layer.msg("绗�" + (i + 1) + "琛�:瀹為檯鏃堕棿涓嶈兘涓�0!");
@@ -1278,6 +1278,11 @@
layer.msg("绗�" + (i + 1) + "琛�:搴斾粯宸ヨ祫涓嶈兘涓�0!");
return false;
}
+ temp = option.data[i]["HPayMoney"] + "";
+ if (temp == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:灏忔椂宸ヨ祫涓嶈兘涓�0!");
+ return false;
+ }
if (option.data[i]["HRelTimes"] * option.data[i]["HPayMoney"] != option.data[i]["HRelPay"] * 1) {
layer.msg("绗�" + (i + 1) + "琛�:灏忔椂宸ヨ祫*瀹為檯鏃堕棿涓嶇瓑浜庡簲浠樺伐璧�!");
return false;
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\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillToInvalidatedList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillToInvalidatedList.html"
index 4b16ca2..b11de16 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillToInvalidatedList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillToInvalidatedList.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>宸ヨ壓璺嚎鍒楄〃</title>
+ <title>宸ヨ壓璺嚎寰呭け鏁堝垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -28,25 +28,6 @@
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡闂撮殧</label>
- <div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -85,14 +66,6 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -248,8 +221,6 @@
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var HBillType = 3301;
var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "Gy_RoutingBillList";
@@ -367,12 +338,7 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(2);
- }
+ get_FastQuery(2);
});
//#endregion
@@ -413,51 +379,15 @@
})
}
- //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
- form.on('select(HInitTimeCycle)', function (data) {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
-
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery();
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
- });
-
//#endregion
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- setSelect_HInitTimeCycle();
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
-
- //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
Organ();
//鏌ヨ
get_FastQuery(1);
- //鑾峰彇椤圭洰鍙�
- Get_HProject();
}
//#endregion
@@ -525,28 +455,7 @@
//, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
]]
};
- optionPage = {
- elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
- count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
- limit: 50,
- limits: [50, 500, 5000, 50000],
- layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
- jump: function (obj, first) {
- //console.log(obj)
- //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
- //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
- //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
-
- //棣栨涓嶆墽琛�
- if (!first) {
- //do something
- page = obj.curr;
- size = obj.limit;
- get_FastQuery();
- }
- }
- }
- laypage.render(optionPage);
+
}
//#region 鎺掑簭鍚庨�夋嫨
table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
@@ -587,9 +496,6 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#WorkCenter").val("");//鍗曟嵁鍙�
$("#HMaterID").val(0);//鐗╂枡
$("#HMaterName").val("");//鐗╂枡
@@ -668,19 +574,12 @@
//#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
- //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
- if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
- sWhere += " and HMaterID = " + HMaterID;
- }
- if (HProID != 0 && HProID != "undefined" && HProID != null) {
- sWhere += " and HMainProcID = " + HProID;
- }
var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ url: GetWEBURL() + '/Gy_RoutingBill/getInvalidityReport',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType":"3301" },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -773,9 +672,6 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
-
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HOrgID = "";
var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
//var HMaterID = $("#HMaterID").val();
@@ -783,7 +679,6 @@
var HMaterNumber = $("#HMaterNumber").val();
var HModel = $("#HModel").val();
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
- var HProject = $("#HProject").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -798,19 +693,19 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like''%" + ColContent + "%''";
+ com = "like'%" + ColContent + "%'";
break;
case "8":
- com = "like''%" + ColContent + "''";
+ com = "like'%" + ColContent + "'";
break;
case "9":
- com = "like''" + ColContent + "%''";
+ com = "like'" + ColContent + "%'";
break;
case "10":
- com = "not like''%" + ColContent + "%''";
+ com = "not like'%" + ColContent + "%'";
break;
default:
- com = "" + Comparator + "''" + ColContent + "''";
+ com = "" + Comparator + "'" + ColContent + "'";
break;
}
sWhere += " and " + ColName + " " + com;
@@ -820,19 +715,19 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like''%" + ColContent1 + "%''";
+ com1 = "like'%" + ColContent1 + "%'";
break;
case "8":
- com1 = "like''%" + ColContent1 + "''";
+ com1 = "like'%" + ColContent1 + "'";
break;
case "9":
- com1 = "like''" + ColContent1 + "%''";
+ com1 = "like'" + ColContent1 + "%'";
break;
case "10":
- com1 = "not like''%" + ColContent1 + "%''";
+ com1 = "not like'%" + ColContent1 + "%'";
break;
default:
- com1 = "" + Comparator1 + "''" + ColContent1 + "''";
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
break;
}
sWhere += " and " + ColName1 + " " + com1;
@@ -841,32 +736,26 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like''%" + ColContent2 + "%''";
+ com2 = "like'%" + ColContent2 + "%'";
break;
case "8":
- com2 = "like''%" + ColContent2 + "''";
+ com2 = "like'%" + ColContent2 + "'";
break;
case "9":
- com2 = "like''" + ColContent2 + "%''";
+ com2 = "like'" + ColContent2 + "%'";
break;
case "10":
- com2 = "not like''%" + ColContent2 + "%''";
+ com2 = "not like'%" + ColContent2 + "%'";
break;
default:
- com2 = "" + Comparator + "''" + ColContent + "''";
+ com2 = "" + Comparator + "'" + ColContent + "'";
break;
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + HDate + "''";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HDate1 + "''";
- }
if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
//浠庡埆鐨勯〉闈㈡墦寮�浼犲叆Hmaterid鍊硷紝璁剧疆鐗╂枡杩囨护,鏈叧闂�
- sWhere += " and HMaterID = " + HMaterID + " and 鍏抽棴浜�=''''";
+ sWhere += " and HMaterID = " + HMaterID + " and 鍏抽棴浜�=''";
} else {
//涓嶆槸浠庡埆鐨勯〉闈㈡墦寮�
var HMaterID2 = $("#HMaterID").val();
@@ -883,119 +772,27 @@
}
if (HOrderProcNO) {
- sWhere += " and 鍗曟嵁绫诲瀷 like ''%" + HOrderProcNO + "%''";
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
}
if (HMaterName) {
- sWhere += "and 鐗╂枡鍚嶇О like ''%" + HMaterName + "%''";
+ sWhere += "and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
}
if (HMaterNumber) {
- sWhere += "and 鐗╂枡浠ｇ爜 like ''%" + HMaterNumber + "%''";
+ sWhere += "and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
}
if (HModel) {
- sWhere += "and 瑙勬牸鍨嬪彿 like ''%" + HModel + "%''";
+ sWhere += "and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
}
if (WorkCenter) {
- sWhere += " and 鍗曟嵁鍙� like ''%" + WorkCenter + "%''";
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
}
if (HOrgID) {
- sWhere += " and HOrgID = ''" + HOrgID + "''";
- }
- if (number==2) {
- if (HProject!='0') {
- sWhere += " and 椤圭洰鍙� like ''%" + HProject + "%''";
- }
+ sWhere += " and HOrgID = '" + HOrgID + "'";
}
- sWhere += " and 宸ュ簭浠ｇ爜 != ''9999'' and HBillSubType<>''SUB''"
- get_DisplayPage(sWhere);
+ sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType<>'SUB'"
+ get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- }
- //#endregion
-
- //#region 鍒嗛〉鏌ヨ
- function get_DisplayPage(sWhere) {
- var wait = layer.load();//閬僵
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/page',
- type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
- success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
- if (data1.code == 1) {
- optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
- } else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
-
-
- option.cols = [col];
- option.data = data1.data;
- //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
- //鑾峰彇瀛愯〃鍒楁暟鎹�
- var colList = [];
- for (var i = 0; i < option.cols[0].length; i++) {
- colList.push(option.cols[0][i].field);
- }
- //璁剧疆鏁版嵁
- var result = data1.data;
- var temp = "";
- for (var i = 0; i < result.length; i++) {
- if (temp != result[i]["鍗曟嵁鍙�"]) {
- temp = result[i]["鍗曟嵁鍙�"];
- } else {
- var initIndex = $.inArray("鍗曟嵁鍙�", colList);
- var lastIndex = $.inArray("hsubid", colList);
- for (var j = initIndex; j < lastIndex; j++) {
- var fieldName = colList[j];
- result[i][fieldName] = "";
- }
- }
- }
- option.data = result;
- laypage.render(optionPage);
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- layer.close(ajaxLoad);
- if ($("#ColName option").length < 1) {
- ColFilter();
- }
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- //option.data = [[]]
- //table.render(option);
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
}
//#endregion
@@ -1098,31 +895,6 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
- }
- //#endregion
-
- //#region 鑾峰彇椤圭洰鍙�
- function Get_HProject() {
- //鑾峰彇椤圭洰鍙�
- var HProjectList = '<option value="0" style="color:red;" selected></option>';
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Gy_Material/Get_HProject",
- async: false,
- data: { "HOrgID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
- }
- $("#HProject").append(HProjectList);
- form.render('select');
-
- }
- layer.closeAll("loading");
- }
- })
}
//#endregion
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/\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..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">
@@ -148,6 +150,34 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -241,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
@@ -252,11 +282,10 @@
, laydate = layui.laydate
, util = layui.util
, soulTable = layui.soulTable
+ , tableFilter = layui.tableFilter
var Organization = sessionStorage["Organization"];
//鍏敤鍙橀噺
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var sWhere = "";
var option = [];
var option1 = [];
@@ -297,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();
@@ -1761,6 +1800,9 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
$("#HNumber").val("");
$("#HName").val("");
$("#HEmpNumber").val("");
@@ -1790,6 +1832,9 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val();
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val();
+ var ColContent1 = $("#ColContent1").val();
var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
var HName = $("#HName").val(); //褰撳墠宸ュ簭
var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮�
@@ -1815,6 +1860,28 @@
break;
}
sWhere += " and " + ColName+ " "+ com;
+ }
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com = "";
+ switch (Comparator1) {
+ case "7":
+ com = "like''%" + ColContent1 + "%''";
+ break;
+ case "8":
+ com = "like''%" + ColContent1 + "''";
+ break;
+ case "9":
+ com = "like''" + ColContent1 + "%''";
+ break;
+ case "10":
+ com = "not like''%" + ColContent1 + "%''";
+ break;
+ default:
+ com = "" + Comparator1 + "''" + ColContent1 + "''";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com;
}
if (HBeginDate) {
@@ -1878,78 +1945,6 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
- //#region 鍒嗛〉鏌ヨ
- function get_DisplayPage(sWhere) {
- var wait = layer.load();//閬僵
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/page',
- type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
- success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
- optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
-
- if (data1.code == 1) {
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
- }
- }
- }
-
-
- option.cols = [col];
- option.data = data1.data;
- ins = table.render(option);
- laypage.render(optionPage);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- layer.close(ajaxLoad);
- if ($("#ColName option").length < 1) {
- ColFilter();
- }
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- option.data = [[]]
- ins = table.render(option);
- laypage.render(optionPage);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- layer.close(ajaxLoad);
- if ($("#ColName option").length < 1) {
- ColFilter();
- }
- /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //#endregion
//鍔犺浇缃戞牸
function get_Display(sWhere) {
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -2102,9 +2097,22 @@
//, 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
//鍒ゆ柇鏄惁鏈夋煡鐪嬪伐浠锋潈闄�
$.ajax({
type: "get",
@@ -2129,6 +2137,10 @@
ins = table.render(option);
laypage.render(optionPage);
+
+ tableFilterIns = table.render(optionPage);
+ tableFilter.render(tableFilterIns);
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -2136,7 +2148,7 @@
Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
} else {
@@ -2463,6 +2475,8 @@
}
$("#ColName").empty()
$("#ColName").append(Organization);
+ $("#ColName1").empty()
+ $("#ColName1").append(Organization);
form.render('select');
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html"
new file mode 100644
index 0000000..0374de6
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html"
@@ -0,0 +1,553 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐢熶骇璁㈠崟鍏ㄧ▼璺熻釜鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block">
+ <select name="txtHOrderProcNo" id="txtHOrderProcNo" lay-filter="txtHOrderProcNo" style="width:190px;"lay-search>
+ <!--鍔ㄦ�佹覆鏌�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Mes_OrderProcFlowAllReport";
+ var ins;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
+ get_btnHMaterID();
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鑾峰彇閿�鍞鍗曞彿
+ HOrderBillNo()
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+
+ //ColFilter();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , totalRow: true
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , height: 'full-70'
+ };
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var totalArray = ["寮傚父璇勫娆℃暟", "璁″垝鏁伴噺", "鎺ュ彈宸ュ簭鏁伴噺1", "姹囨姤宸ュ簭鏁伴噺1", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�1", "鎺ユ敹宸ュ簭鏁伴噺2", "姹囨姤宸ュ簭鏁伴噺2", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�2", "鎺ユ敹宸ュ簭鏁伴噺3", "姹囨姤宸ュ簭鏁伴噺3", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�3", "鎺ユ敹宸ュ簭鏁伴噺4","姹囨姤宸ュ簭鏁伴噺4","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�4","鎺ユ敹宸ュ簭鏁伴噺5","姹囨姤宸ュ簭鏁伴噺5","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�5","鎺ユ敹宸ュ簭鏁伴噺6","姹囨姤宸ュ簭鏁伴噺6","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�6","鎺ユ敹宸ュ簭鏁伴噺7","姹囨姤宸ュ簭鏁伴噺7","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�7"];
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ DisPlay_HideColumn();
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
+ var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
+ var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
+ var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//澶嶉�夋
+ var check = "";
+ if (chkHShowUnFinish) {
+ check = "Y";
+ }
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" ;
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#txtHOrderProcNo").val("");
+ $("#txtHMaterNumber").val("");
+ $("#txtHDeptName").val("");
+ $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render('select');
+
+ sWhere = " ";
+ get_FastQuery();
+ }
+ //閿�鍞鍗曚笅鎷夋
+ function HOrderBillNo() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var HOrderBillNo = '<option style="color:blue;" value=""></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Mes_OrderProcFlowAllReport/getHSeOrderBillNo",
+ async: false,
+ data: { "sWhere": "", "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HOrderBillNo += '<option style="color:blue;" value="' + data[i]["HSeOrderBillNo"] + '">' + data[i]["HSeOrderBillNo"] + '</option>';
+ }
+
+ $("#txtHOrderProcNo").append(HOrderBillNo);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //鐗╂枡
+ function get_btnHMaterID() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTablemainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1