From 0f213e44e69b8c1e9f86080ea0628352a5b279f8 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 13:41:06 +0800
Subject: [PATCH] 添康工资车间报表添加,异常工时申请单修改

---
 WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBill.html  |   53 
 WebTM/views/工资管理/工资报表/Pay_PaymentPieceSumReport.html       |  521 +++++++
 WebTM/views/工资管理/工资报表/Pay_PaymentMonthSumReport.html       |  626 +++++++++
 WebTM/views/工资管理/工资报表/Pay_PaymentDayCheckReport.html       |  626 +++++++++
 WebTM/views/工资管理/工资报表/Pay_PaymentTimeSumReport.html        |  572 ++++++++
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillToInvalidatedList.html |  286 ---
 WebTM/layuiadmin/Scripts/webConfig.js                      |    4 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html        |  153 -
 WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_ICMO.html |  526 +++++++
 WebTM/views/工资管理/工资报表/Pay_PayWorkShopSumReport.html        |  572 ++++++++
 WebTM/WebTM.csproj                                         |    6 
 11 files changed, 3,570 insertions(+), 375 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8debef8..ee12a95 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -409,6 +409,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" />
@@ -578,6 +583,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" />
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/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', //涓诲叆鍙fā鍧�
+        }).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 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    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', //涓诲叆鍙fā鍧�
+        }).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 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    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', //涓诲叆鍙fā鍧�
+        }).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 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    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', //涓诲叆鍙fā鍧�
+        }).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', //涓诲叆鍙fā鍧�
+        }).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 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    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: '宸ョ浠g爜', 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/\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 = " 浜у搧浠g爜 = '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  鐗╂枡浠g爜 like ''%" + HMaterNumber + "%''";
+                    sWhere += "and  鐗╂枡浠g爜 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 宸ュ簭浠g爜 != ''9999'' and HBillSubType<>''SUB''"
-                get_DisplayPage(sWhere);
+                sWhere += " and 宸ュ簭浠g爜 != '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\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..f978413 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"
@@ -148,6 +148,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>
@@ -255,8 +283,6 @@
 
             var Organization = sessionStorage["Organization"];
             //鍏敤鍙橀噺
-            var page = 1;//鍒嗛〉鏁版嵁
-            var size = 50;
             var sWhere = "";
             var option = [];
             var option1 = [];
@@ -1761,6 +1787,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 +1819,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(); //浜у搧浠g爜 鍗崇墿鏂欑紪鐮�
                 var HName = $("#HName").val(); //褰撳墠宸ュ簭
                 var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮�
@@ -1815,6 +1847,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 +1932,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) {
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -2088,23 +2070,8 @@
                                     }
                                 }
                             }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 700
-                                //, page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                //, limits: [50, 500, 5000, 20000]
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            }
-
+                            option.cols = [col];
+                            option.data = data1.data
                             //鍒ゆ柇鏄惁鏈夋煡鐪嬪伐浠锋潈闄�
                             $.ajax({
                                 type: "get",
@@ -2136,7 +2103,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 +2430,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..ed5ee98
--- /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,526 @@
+锘�<!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">
+                                        <input type="text" class="layui-input" id="txtHOrderProcNo" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐗╂枡浠g爜</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', //涓诲叆鍙fā鍧�
+        }).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() {
+                //鍒濆鍖栬〃鏍�
+                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 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