From a137c837d4ae36ffd67a3cee253bd7b5507f32a9 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 01 三月 2024 13:56:20 +0800
Subject: [PATCH] 1、工资管理模块下的全部单据和单据列表模块:单据有网格的增加合计行,单据列表增加合计行;模块标题名称根据单据类型从数据库单据类型表里动态获取;2、扣补项目费用单、请假申请单、加班申请单、工资单列表模块修改完善

---
 WebTM/views/工资管理/加班申请/Pay_OverApplyBill.html                  |   18 
 WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillEdit.html          |   15 
 WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBill.html     |   24 
 WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html             |   18 
 WebTM/views/工资管理/请假申请/Pay_OutApplyBillList.html               | 1116 ++++++------
 WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBillList.html |   15 
 WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html          |   18 
 WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html          |   24 
 WebTM/views/工资管理/工资单/Pay_PayMentBill.html                     |   34 
 WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html         |   21 
 WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillList.html          |   18 
 WebTM/views/工资管理/请假申请/Pay_OutApplyBill.html                   |   16 
 WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBillList.html       |   15 
 WebTM/views/工资管理/加班申请/Pay_OverApplyBillList.html              | 1117 ++++++------
 WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBill.html           |   24 
 WebTM/views/工资管理/扣补项目费用单/Pay_DuSubsidyItemBill.html           |   16 
 WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html         |   34 
 WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html             |   48 
 WebTM/views/工资管理/工资单/Pay_PayMentBillList.html                 | 1116 ++++++------
 WebTM/views/工资管理/扣补项目费用单/Pay_DuSubsidyItemBillList.html       | 1113 ++++++------
 20 files changed, 2,471 insertions(+), 2,349 deletions(-)

diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
index e343818..3fdfd11 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBill.html"
@@ -14,6 +14,7 @@
     <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/PageTitle.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鍔犵彮鐢宠鍗�</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -284,6 +286,14 @@
 
             //妯″潡鍚�
             var HModName = "Pay_OverApplyBill";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2209";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //瀛愯〃娓叉煋鍙傛暟
             //鑾峰彇鍙傛暟
@@ -661,7 +671,7 @@
                     , cellMinWidth: 120
                     , height: 400
                     , cols: [[
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
                         , { type: 'numbers', title: '搴忓彿' }
                         , { field: 'RowID', title: '琛屽彿', hide: true }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
                         , { field: 'HEmpID', title: '鑱屽憳ID', hide:true, style: 'background-color: #f9f9f9;' }
@@ -670,9 +680,9 @@
                         , { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes" }
                         , { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes" }
                         , { field: 'HRestFlag', title: '鍗堜紤鏍囪', templet: "#HRestFlag" }
-                        , { field: 'HRestTimes', title: '鍗堜紤鏃堕棿', edit: 'text'}     //f7
-                        , { field: 'HTimes', title: '鍔犵彮鏃堕棿', style: 'background-color: #f9f9f9;'}     //f7
-                        , { field: 'HRelTimes', title: '瀹為檯鏃堕棿', style: 'background-color: #f9f9f9;' }     //f7
+                        , { field: 'HRestTimes', title: '鍗堜紤鏃堕棿', edit: 'text', totalRow: true}     //f7
+                        , { field: 'HTimes', title: '鍔犵彮鏃堕棿', style: 'background-color: #f9f9f9;', totalRow: true}     //f7
+                        , { field: 'HRelTimes', title: '瀹為檯鏃堕棿', style: 'background-color: #f9f9f9;', totalRow: true }     //f7
                         , { field: 'HRemark', title: '澶囨敞', edit: 'text' }     //f7
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBillList.html"
index 3c7b0b9..66eb3f8 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\212\240\347\217\255\347\224\263\350\257\267/Pay_OverApplyBillList.html"
@@ -2,26 +2,28 @@
 <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">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
     <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/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>-->
+    <!--寮曠敤layui js鏂囦欢-->
     <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/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -37,12 +39,6 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                    <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
-                                    </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;">
@@ -54,6 +50,12 @@
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </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>
@@ -62,7 +64,7 @@
                                 <div class="layui-inline" style="margin-left:5px;">
                                     <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                 </div>
-                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
@@ -72,7 +74,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -96,22 +98,22 @@
                         <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" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_view" id="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAudit" id="btn_DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Close" id="btn_Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeClose" id="btn_DeClose"><i class="layui-icon layui-icon-circle"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Drop" id="btn_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeDrop" id="btn_DeDrop"><i class="layui-icon layui-icon-circle"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                             </div>
                         </script>
                     </form>
@@ -124,8 +126,8 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
-            //#region 鍏敤鍙橀噺
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -135,17 +137,28 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , soulTable = layui.soulTable
-
-            var option = [];
-            var sWhere = "";
             var HModName = "Pay_OverApplyBillList";
             var HBillType = "2209";
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var sWhere = "";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var option = [];
+            var columns = "";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
 
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+            //#endregion
 
-            //杩囨护鏉′欢鐨刢lass绫� 
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
             var HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "鍔犵彮鐢宠鍗曠淮鎶�";
+            window.HModuleName = "鍔犵彮鐢宠鍗曞垪琛�";
             //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
             window.HDefaultFilter = "";
             //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -153,81 +166,39 @@
 
             //#endregion
 
-            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["hmainid", "HDeptID", "HGroupID","HPayType","hsubid","HMaterID","HProcID","HEmpID"];
-            //#endregion
-
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //鍒濆鍖栫晫闈�
+            //#region 鍒濆鍖栫晫闈�
+
             set_ClearBill();
 
+            function set_ClearBill() {
+                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
             //#endregion
 
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //#region 澶村伐鍏锋爮浜嬩欢
-
-            table.on('toolbar(mainTable)', function (obj) {
-                switch (obj.event) {
-                    //鏂板
-                    case 'set_AddNew': set_AddNew();
-                        break;
-                    //缂栬緫
-                    case 'set_ShowBill': set_ShowBill();
-                        break;
-                    //鍒犻櫎
-                    case 'set_DeleteBill': set_DeleteBill();
-                        break;
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    ////娴忚
-                    //case 'get_view': get_view();
-                    //    break;
-                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
-                    case 'btn-Audit':
-                        set_CheckBill(1);
-                        break;
-                    //鍙嶅鏍告寜閽�
-                    case 'btn-DeAudit':
-                        set_CheckBill(2);
-                        break;
-                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
-                    case 'btn-Close':
-                        set_CloseBill(1);
-                        break;
-                    //鍙嶅叧闂寜閽�
-                    case 'btn-DeClose':
-                        set_CloseBill(2);
-                        break;
-                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
-                    case 'btn-Drop':
-                        set_DropBill(1);
-                        break;
-                    //鍙嶄綔搴熸寜閽�
-                    case 'btn-DeDrop':
-                        set_DropBill(2);
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                    //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
-                        break;
-                    //鎸夐挳璁剧疆
-                    case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-                        break;
-                    //淇濆瓨鏂规
-                    case 'set_SaveScheme': set_SaveScheme();
-                        break;
-                    //璇诲彇鏂规
-                    case 'set_ReadScheme': set_ReadScheme();
-                        break;
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
                 };
-            });
+            }
             //#endregion
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -251,453 +222,22 @@
             })
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                set_ClearQuery();
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(2);
-            });
-            //#endregion
-
-            //#endregion
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //#region 鍒濆鍖栫晫闈�
-            function set_ClearBill() {
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
-                //鏌ヨ
-                get_FastQuery(1);
-                //Organ();
-                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
-                get_DefaultModule();
-            }
-            //#endregion
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            function set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    , page: true
-                    //, cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 50000]
-                    , done: function (res, curr, count) {
-                        soulTable.render(this);
-                    }
-                };
-            }
-            //#endregion
-            //#endregion
-
-            //#region 鏌ヨ
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/Pay_OverApplyBill/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                    success: function (data1) {
-                        if (data1.count == 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: 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].id, title: data[i].name, align: 'center', sort: true, width: 120 });
-                                    }
-                                }
-                            }
-
-                            option.cols = [col];
-                            option.data = data1.data;
-                            table.render(option);
-
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
-                            layer.close(ajaxLoad);
-
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                                ColFilter();
-                            }
-
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-
-            }
-            //#endregion
-
-            //#region 蹇�熻繃婊�
-            function get_FastQuery(number) {
-                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
-                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                //浠绘剰瀛楁杩囨护
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").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 (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
-                }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
-                }
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                get_Display(sWhere);
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            }
-            //#endregion
-
-            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
-            function set_ClearQuery() {
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HBillNo").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                form.render('select');
-
-                sWhere = "";
-            }
-            //#endregion
-
-            //#region 鏂板
-            function set_AddNew() {
-                layer.open({
-                    type: 2
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['100%', '100%']
-                    , title: '鍔犵彮鐢宠鍗�-鏂板'
-                    , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../../宸ヨ祫绠$悊/鍔犵彮鐢宠/Pay_OverApplyBill.html?OperationType=1&linterid=0&HSouceBillType='
-                    ,btn: ['纭畾'],
-                    // 鎸夐挳1 鐨勫洖璋�
-                    btn1: function (index, layero, that) {
-                        //鍒锋柊椤甸潰
-                        window.location.reload();
-                    }
-                })
-            }
-            //#endregion
-
-            //#region 缂栬緫
-            function set_ShowBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].hmainid.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '鍔犵彮鐢宠鍗�-缂栬緫'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../宸ヨ祫绠$悊/鍔犵彮鐢宠/Pay_OverApplyBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        btn1: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            window.location.reload();
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //#endregion
-
-            //#region 娴忚
-            function get_view() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].HItemID.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '椤圭洰闃舵鍒楄〃-娴忚'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../椤圭洰绠$悊/椤圭洰闃舵/Add_Edit_Gy_ProjectStage.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        btn1: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            //window.location.reload();
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍒犻櫎
-            function set_DeleteBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HInterID = data[0].hmainid.toString();
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        var wait = layer.load();
-                        //閫昏緫鍒犻櫎鏂规硶
-                        $.ajax({
-                            url: GetWEBURL() + 'Pay_OverApplyBill/delete',
-                            type: "GET",
-                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
-                            success: function (result) {
-                                console.log('gouba' + result);
-                                if (result.count == 1) {
-                                    layer.msg(result.Message, { icon: 1 }, function () {
-                                        // 寰楀埌frame绱㈠紩
-                                        var index = layer.getFrameIndex(window.name);
-                                        //鍏抽棴褰撳墠frame
-                                        layer.close(wait);
-                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                        $("#btnSearch").trigger('click');
-                                    });
-                                } else {
-                                    layer.alert(result.code + result.Message, { icon: 5 });
-                                    layer.close(wait);
-                                }
-                            }, error: function () {
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                layer.close(wait);
-                            }
-                        });
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-
-            }
-            //#endregion
-
-            //#region 鍒锋柊
-            function get_Refresh() {
-                set_ClearQuery();
-                get_FastQuery(1);
-            }
-            //#endregion
-
-            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
-            function set_CheckBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_OverApplyBill/AuditPay_OverApplyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
-            function set_CloseBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_OverApplyBill/ClosePay_OverApplyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
-            function set_DropBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_OverApplyBill/DropPay_OverApplyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    colName += option.cols[0][i]["title"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "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",
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": HMaker },
                     success: function (data1) {
                         if (data1.data.length != 0) {
-
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                var dataCols = dataCol[i].split('|');
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
@@ -712,12 +252,6 @@
                                 } else {
                                     option.cols[0][i + 1]["style"] = "font-size:100%";
                                 }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                     option.cols[0][i + 1]["hide"] = false;
@@ -755,17 +289,14 @@
                                 }
                             }
                             table.render(option);
-
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
                             table.render(option);
-
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, HBillType, HModName, HMaker);
+
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
@@ -773,7 +304,466 @@
             }
             //#endregion
 
-            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鏂板鎸夐挳
+                    case 'btn_Add': btn_Add();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn_Edit': btn_Edit();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn_Delete': btn_Delete();
+                        break;
+                    //鍒锋柊鎸夐挳
+                    case 'btn_Refresh': btn_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn_Audit': set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn_DeAudit': set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn_Close': set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn_DeClose': set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn_Drop': set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn_DeDrop': set_DropBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'btn_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HBillType, HModName, HMaker);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'btn_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'btn_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 鏂板
+            function btn_Add() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim'   //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: HPageTitle + '- 鏂板'
+                    , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , content: '../鍔犵彮鐢宠/Pay_OverApplyBill.html?OperationType=1&linterid=0&HSouceBillType='
+                    , btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function btn_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../鍔犵彮鐢宠/Pay_OverApplyBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    var HBillNo = data[0].鍗曟嵁鍙�.toString();
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Pay_OverApplyBillController/GetPay_OverApplyBill_Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HMaker": HMaker },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+                                        //鍒锋柊鐣岄潰
+                                        $("#btnSearch").trigger('click');
+                                        layer.close(wait);
+                                    });
+
+                                } else {
+                                    layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function btn_Refresh() {
+                get_FastQuery();
+            }
+            //#endregion
+
+            //#region  瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_OverApplyBillController/GetPay_OverApplyBill_Check_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_OverApplyBillController/GetPay_OverApplyBill_Close_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_OverApplyBillController/GetPay_OverApplyBill_Cancelltion_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽浣滃簾锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                form.render('select');
+                sWhere = "";
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").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 (HBeginDate) {
+                    sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //#endregion
+
+            //#region 鍒楄〃鍒锋柊
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Pay_OverApplyBillController/GetPay_OverApplyBillList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere, "HMaker": HMaker },
+                    success: function (data1) {
+                        if (data1.count == 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 });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                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: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+
+                            option.cols = [columns];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            table.render(option);
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+                            //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑷畾涔夎繃婊や笅鎷夋
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -786,6 +776,7 @@
                 form.render('select');
             }
             //#endregion
+
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -849,7 +840,7 @@
                 for (var i = 0; i < Filter.length; i++) {
                     HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
                     HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
-                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
                     HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
                 }
 
@@ -994,11 +985,9 @@
 
             //#endregion
 
-        });
-
             //#endregion
-
             //浠ヤ笂鏄痩ayui妯″潡
+        });
         //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
         function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
         {
@@ -1040,4 +1029,4 @@
     </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
index 3b04601..25a7959 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
@@ -14,6 +14,7 @@
     <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/PageTitle.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>瀹氶鐢宠鍗�</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -261,6 +263,14 @@
 
             //妯″潡鍚�
             var HModName = "Pay_ProcPriceRequestBill";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2219";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //瀛愯〃娓叉煋鍙傛暟
             //鑾峰彇鍙傛暟
@@ -577,7 +587,7 @@
                     , cellMinWidth: 120
                     , height: 400
                     , cols: [[
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
                         , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
                         , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
                         , { field: 'HMaterID', title: '鐗╂枡ID', hide: true, style: 'background-color: #f9f9f9;' }
@@ -590,10 +600,10 @@
                         , { field: 'HSourceID', title: '璧勬簮ID', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HSourceNumber', title: '璧勬簮浠g爜', edit: 'text', event: "HSourceNumber" }     //f7
                         , { field: 'HSourceName', title: '璧勬簮鍚嶇О', style: 'background-color: #f9f9f9;' }
-                        , { field: 'HOldPrice', title: '鍘熷崟浠�', style: 'background-color: #f9f9f9;'}
-                        , { field: 'HPrice', title: '鍗曚环', edit: 'text' }
-                        , { field: 'HOldFixPrice', title: '鍘熷皬鏃跺畾棰�', style: 'background-color: #f9f9f9;' }
-                        , { field: 'HFixPrice', title: '灏忔椂瀹氶', edit: 'text' }
+                        , { field: 'HOldPrice', title: '鍘熷崟浠�', style: 'background-color: #f9f9f9;', totalRow: true}
+                        , { field: 'HPrice', title: '鍗曚环', edit: 'text', totalRow: true }
+                        , { field: 'HOldFixPrice', title: '鍘熷皬鏃跺畾棰�', style: 'background-color: #f9f9f9;', totalRow: true }
+                        , { field: 'HFixPrice', title: '灏忔椂瀹氶', edit: 'text', totalRow: true }
                         , { field: 'HBeginDate', title: '寮�濮嬫棩鏈�', event: "HBeginDate" }
                         , { field: 'HEndDate', title: '缁撴潫鏃ユ湡', event: "HEndDate" }
                         , { field: 'HCostFlag', title: '鎴愭湰榛樿鏍囪', templet: "#HCostFlag" }
@@ -602,8 +612,8 @@
                         , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' }
-                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', hide: true, style: 'background-color: #f9f9f9;' }
-                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', hide: true, style: 'background-color: #f9f9f9;', totalRow: true }
+                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', hide: true, style: 'background-color: #f9f9f9;', totalRow: true }
                         , { field: 'HCloseMan', title: '琛屽叧闂汉', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HEntryCloseDate', title: '琛屽叧闂椂闂�', hide: true, style: 'background-color: #f9f9f9;' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
index dbe2b77..2be2efe 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
@@ -17,6 +17,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -145,6 +146,11 @@
             var option = [];
             var columns = "";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -371,7 +377,7 @@
                     type: 2
                     , skin: 'layui-layer-rim'   //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '瀹氶鐢宠鍗�-鏂板'
+                    , title: HPageTitle + '- 鏂板'
                     , shift: 0  //寮瑰嚭鍔ㄧ敾
                     , content: '../../宸ヨ祫绠$悊/瀹氶鐢宠/Pay_ProcPriceRequestBill.html?OperationType=1&linterid=0&HSouceBillType='
                     , btn: ['纭畾'],
@@ -393,7 +399,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '瀹氶鐢宠鍗�-缂栬緫'
+                        , title: HPageTitle + '- 缂栬緫'
                         , shift: 0  //寮瑰嚭鍔ㄧ敾
                         , content: '../../宸ヨ祫绠$悊/瀹氶鐢宠/Pay_ProcPriceRequestBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
                         , btn: ['纭畾'],
@@ -707,7 +713,7 @@
                             }
 
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -718,6 +724,9 @@
                                         case 'DateTime':
                                             col.push({ field: data[i].id, 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 HH:mm:ss')}}</div>", width: 160 });
                                             break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                     }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBill.html"
index 5387a37..99f2c2b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBill.html"
@@ -14,6 +14,7 @@
     <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/PageTitle.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>宸ヨ祫鍗�</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -278,6 +280,14 @@
 
             //妯″潡鍚�
             var HModName = "Pay_PayMentBill";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2202";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //瀛愯〃娓叉煋鍙傛暟
             //鑾峰彇鍙傛暟
@@ -539,7 +549,7 @@
                     , cellMinWidth: 120
                     , height: 400
                     , cols: [[
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
                         , { type: 'numbers', title: '搴忓彿' }
                         , { field: 'RowID', title: '琛屽彿', hide: true }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
                         , { field: 'HEmpID', title: '鑱屽憳ID', hide: true }
@@ -549,19 +559,19 @@
                         , { field: 'HPostID', title: '宀椾綅ID', hide: true }
                         , { field: 'HPostNumber', title: '宀椾綅浠g爜' }
                         , { field: 'HPostName', title: '宀椾綅鍚嶇О' }
-                        , { field: 'HPiecePay', title: '璁′欢宸ヨ祫' }
-                        , { field: 'HTimesPay', title: '璁℃椂宸ヨ祫', event: "HTimesPay" }
-                        , { field: 'HFixPay', title: '鍥哄畾宸ヨ祫' }
-                        , { field: 'HBasePay', title: '鍩虹宸ヨ祫' }
+                        , { field: 'HPiecePay', title: '璁′欢宸ヨ祫', totalRow: true }
+                        , { field: 'HTimesPay', title: '璁℃椂宸ヨ祫', event: "HTimesPay", totalRow: true }
+                        , { field: 'HFixPay', title: '鍥哄畾宸ヨ祫', totalRow: true }
+                        , { field: 'HBasePay', title: '鍩虹宸ヨ祫', totalRow: true }
                         , { field: 'HWorkTimes', title: '涓婄彮鏃堕棿' }
-                        , { field: 'HPayTotal', title: '宸ヨ祫灏忚' }
-                        , { field: 'HSubsidyTotal', title: '琛ヨ创鍚堣' }
-                        , { field: 'HDeuctTotal', title: '鎵f灏忚' }
-                        , { field: 'HShoudPay', title: '搴斿彂宸ヨ祫' }
-                        , { field: 'HInsurance', title: '鎵gぞ淇�' }
-                        , { field: 'HTaxBefore', title: '绋庡墠' }
+                        , { field: 'HPayTotal', title: '宸ヨ祫灏忚', totalRow: true }
+                        , { field: 'HSubsidyTotal', title: '琛ヨ创鍚堣', totalRow: true }
+                        , { field: 'HDeuctTotal', title: '鎵f灏忚', totalRow: true }
+                        , { field: 'HShoudPay', title: '搴斿彂宸ヨ祫', totalRow: true }
+                        , { field: 'HInsurance', title: '鎵gぞ淇�', totalRow: true }
+                        , { field: 'HTaxBefore', title: '绋庡墠', totalRow: true }
                         , { field: 'HTax', title: '绋�' }
-                        , { field: 'HRelPay', title: '瀹炲彂鍚堣' }
+                        , { field: 'HRelPay', title: '瀹炲彂鍚堣', totalRow: true }
                         , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
index 94d40e7..de1af45 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
@@ -2,26 +2,28 @@
 <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">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
     <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/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>-->
+    <!--寮曠敤layui js鏂囦欢-->
     <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/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -37,12 +39,6 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                    <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
-                                    </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;">
@@ -54,6 +50,12 @@
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </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>
@@ -62,7 +64,7 @@
                                 <div class="layui-inline" style="margin-left:5px;">
                                     <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                 </div>
-                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
@@ -72,7 +74,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -96,22 +98,22 @@
                         <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" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_view" id="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAudit" id="btn_DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Close" id="btn_Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeClose" id="btn_DeClose"><i class="layui-icon layui-icon-circle"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Drop" id="btn_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeDrop" id="btn_DeDrop"><i class="layui-icon layui-icon-circle"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                             </div>
                         </script>
                     </form>
@@ -124,8 +126,8 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
-            //#region 鍏敤鍙橀噺
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -135,18 +137,28 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , soulTable = layui.soulTable
-
-            var option = [];
-            var sWhere = "";
             var HModName = "Pay_PayMentBillList";
             var HBillType = "2202";
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var sWhere = "";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var option = [];
+            var columns = "";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+            //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
-            //杩囨护鏉′欢鐨刢lass绫� 
+            //杩囨护鏉′欢鐨刢lass绫�
             var HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "宸ヨ祫鍗�";
+            window.HModuleName = "宸ヨ祫鍗曞垪琛�";
             //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
             window.HDefaultFilter = "";
             //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -154,81 +166,39 @@
 
             //#endregion
 
-            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["hmainid", "HDeptID", "HGroupID","HPayType","hsubid","HMaterID","HProcID","HEmpID"];
-            //#endregion
-
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //鍒濆鍖栫晫闈�
+            //#region 鍒濆鍖栫晫闈�
+
             set_ClearBill();
 
+            function set_ClearBill() {
+                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
             //#endregion
 
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //#region 澶村伐鍏锋爮浜嬩欢
-
-            table.on('toolbar(mainTable)', function (obj) {
-                switch (obj.event) {
-                    //鏂板
-                    case 'set_AddNew': set_AddNew();
-                        break;
-                    //缂栬緫
-                    case 'set_ShowBill': set_ShowBill();
-                        break;
-                    //鍒犻櫎
-                    case 'set_DeleteBill': set_DeleteBill();
-                        break;
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    ////娴忚
-                    //case 'get_view': get_view();
-                    //    break;
-                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
-                    case 'btn-Audit':
-                        set_CheckBill(1);
-                        break;
-                    //鍙嶅鏍告寜閽�
-                    case 'btn-DeAudit':
-                        set_CheckBill(2);
-                        break;
-                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
-                    case 'btn-Close':
-                        set_CloseBill(1);
-                        break;
-                    //鍙嶅叧闂寜閽�
-                    case 'btn-DeClose':
-                        set_CloseBill(2);
-                        break;
-                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
-                    case 'btn-Drop':
-                        set_DropBill(1);
-                        break;
-                    //鍙嶄綔搴熸寜閽�
-                    case 'btn-DeDrop':
-                        set_DropBill(2);
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                    //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
-                        break;
-                    //鎸夐挳璁剧疆
-                    case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-                        break;
-                    //淇濆瓨鏂规
-                    case 'set_SaveScheme': set_SaveScheme();
-                        break;
-                    //璇诲彇鏂规
-                    case 'set_ReadScheme': set_ReadScheme();
-                        break;
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
                 };
-            });
+            }
             //#endregion
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -252,454 +222,22 @@
             })
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                set_ClearQuery();
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(2);
-            });
-            //#endregion
-
-            //#endregion
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //#region 鍒濆鍖栫晫闈�
-            function set_ClearBill() {
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
-                //鏌ヨ
-                get_FastQuery(1);
-                //Organ();
-                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
-                get_DefaultModule();
-            }
-            //#endregion
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            function set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    , page: true
-                    //, cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 50000]
-                    , done: function (res, curr, count) {
-                        soulTable.render(this);
-                    }
-                };
-            }
-            //#endregion
-            //#endregion
-
-            //#region 鏌ヨ
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/Pay_PayMentBill/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                    success: function (data1) {
-                        if (data1.count == 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: 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].id, title: data[i].name, align: 'center', sort: true, width: 120 });
-                                    }
-                                }
-                            }
-
-                            option.cols = [col];
-                            option.data = data1.data;
-                            table.render(option);
-
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
-                            layer.close(ajaxLoad);
-
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                                ColFilter();
-                            }
-
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-
-            }
-            //#endregion
-
-            //#region 蹇�熻繃婊�
-            function get_FastQuery(number) {
-                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
-                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                //浠绘剰瀛楁杩囨护
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").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 (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
-                }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
-                }
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                get_Display(sWhere);
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            }
-            //#endregion
-
-            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
-            function set_ClearQuery() {
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HBillNo").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                form.render('select');
-
-                sWhere = "";
-            }
-            //#endregion
-
-            //#region 鏂板
-            function set_AddNew() {
-                layer.open({
-                    type: 2
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['100%', '100%']
-                    , title: '宸ヨ祫鍗�-鏂板'
-                    , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../../宸ヨ祫绠$悊/宸ヨ祫鍗�/Pay_PayMentBill.html?OperationType=1&linterid=0&HSouceBillType='
-                    ,btn: ['纭畾'],
-                    // 鎸夐挳1 鐨勫洖璋�
-                    btn1: function (index, layero, that) {
-                        //鍒锋柊椤甸潰
-                        window.location.reload();
-                    }
-                })
-            }
-            //#endregion
-
-            //#region 缂栬緫
-            function set_ShowBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].hmainid.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '宸ヨ祫鍗�-缂栬緫'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../宸ヨ祫绠$悊/宸ヨ祫鍗�/Pay_PayMentBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        btn1: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            window.location.reload();
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //#endregion
-
-            //#region 娴忚
-            function get_view() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].HItemID.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '椤圭洰闃舵鍒楄〃-娴忚'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../椤圭洰绠$悊/椤圭洰闃舵/Add_Edit_Gy_ProjectStage.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        btn1: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            //window.location.reload();
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍒犻櫎
-            function set_DeleteBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HInterID = data[0].hmainid.toString();
-                    var HBillNo = data[0].鍗曟嵁鍙�.toString();
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        var wait = layer.load();
-                        //閫昏緫鍒犻櫎鏂规硶
-                        $.ajax({
-                            url: GetWEBURL() + 'Pay_PayMentBill/delete',
-                            type: "GET",
-                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
-                            success: function (result) {
-                                console.log('gouba' + result);
-                                if (result.count == 1) {
-                                    layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { icon: 1 }, function () {
-                                        // 寰楀埌frame绱㈠紩
-                                        var index = layer.getFrameIndex(window.name);
-                                        //鍏抽棴褰撳墠frame
-                                        layer.close(wait);
-                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                        $("#btnSearch").trigger('click');
-                                    });
-                                } else {
-                                    layer.alert(result.code + result.Message, { icon: 5 });
-                                    layer.close(wait);
-                                }
-                            }, error: function () {
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                layer.close(wait);
-                            }
-                        });
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-
-            }
-            //#endregion
-
-            //#region 鍒锋柊
-            function get_Refresh() {
-                set_ClearQuery();
-                get_FastQuery(1);
-            }
-            //#endregion
-
-            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
-            function set_CheckBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_PayMentBill/AuditPay_PayMentBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
-            function set_CloseBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_PayMentBill/ClosePay_PayMentBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
-            function set_DropBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_PayMentBill/DropPay_PayMentBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    colName += option.cols[0][i]["title"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "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",
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": HMaker },
                     success: function (data1) {
                         if (data1.data.length != 0) {
-
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                var dataCols = dataCol[i].split('|');
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
@@ -714,12 +252,6 @@
                                 } else {
                                     option.cols[0][i + 1]["style"] = "font-size:100%";
                                 }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                     option.cols[0][i + 1]["hide"] = false;
@@ -757,15 +289,14 @@
                                 }
                             }
                             table.render(option);
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
                             table.render(option);
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, HBillType, HModName, HMaker);
+
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
@@ -773,7 +304,466 @@
             }
             //#endregion
 
-            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鏂板鎸夐挳
+                    case 'btn_Add': btn_Add();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn_Edit': btn_Edit();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn_Delete': btn_Delete();
+                        break;
+                    //鍒锋柊鎸夐挳
+                    case 'btn_Refresh': btn_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn_Audit': set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn_DeAudit': set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn_Close': set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn_DeClose': set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn_Drop': set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn_DeDrop': set_DropBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'btn_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HBillType, HModName, HMaker);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'btn_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'btn_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 鏂板
+            function btn_Add() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim'   //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: HPageTitle + '- 鏂板'
+                    , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ヨ祫鍗�/Pay_PayMentBill.html?OperationType=1&linterid=0&HSouceBillType='
+                    , btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function btn_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../宸ヨ祫鍗�/Pay_PayMentBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    var HBillNo = data[0].鍗曟嵁鍙�.toString();
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Pay_PayMentBillController/GetPay_PayMentBill_Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HMaker": HMaker },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+                                        //鍒锋柊鐣岄潰
+                                        $("#btnSearch").trigger('click');
+                                        layer.close(wait);
+                                    });
+
+                                } else {
+                                    layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function btn_Refresh() {
+                get_FastQuery();
+            }
+            //#endregion
+
+            //#region  瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_PayMentBillController/GetPay_PayMentBill_Check_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_PayMentBillController/GetPay_PayMentBill_Close_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_PayMentBillController/GetPay_PayMentBill_Cancelltion_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽浣滃簾锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                form.render('select');
+                sWhere = "";
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").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 (HBeginDate) {
+                    sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //#endregion
+
+            //#region 鍒楄〃鍒锋柊
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Pay_PayMentBillController/GetPay_PayMentBillList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere, "HMaker": HMaker },
+                    success: function (data1) {
+                        if (data1.count == 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 });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                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: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+
+                            option.cols = [columns];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            table.render(option);
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+                            //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑷畾涔夎繃婊や笅鎷夋
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -786,6 +776,7 @@
                 form.render('select');
             }
             //#endregion
+
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -849,7 +840,7 @@
                 for (var i = 0; i < Filter.length; i++) {
                     HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
                     HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
-                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
                     HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
                 }
 
@@ -993,13 +984,10 @@
             }
 
             //#endregion
-        });
-
 
             //#endregion
-
             //浠ヤ笂鏄痩ayui妯″潡
-
+        });
         //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
         function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
         {
@@ -1041,4 +1029,4 @@
     </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
index 4da9cb9..d6b19a5 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.html"
@@ -14,6 +14,7 @@
     <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/PageTitle.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>宸ヨ祫缁撶畻鍗�(涓汉)</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -307,6 +309,14 @@
 
             //妯″潡鍚�
             var HModName = "Pay_SingleBalBill";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2205";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //椤圭洰闃舵琛ㄦ覆鏌撳弬鏁�
             //鑾峰彇鍙傛暟
@@ -838,7 +848,7 @@
                     , cellMinWidth: 120
                     , height: 400
                     , cols: [[
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
                         , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;'}
                         , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
                         , { field: 'HMaterID', title: '鐗╂枡ID', hide: true, style: 'background-color: #f9f9f9;' }
@@ -851,21 +861,21 @@
                         , { field: 'HEmpID', title: '鑱屽憳ID', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HEmpNumber', title: '鑱屽憳浠g爜', edit: 'text', event: "HEmpNumber" }     //f7
                         , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', style: 'background-color: #f9f9f9;' }
-                        , { field: 'HTimes', title: '宸ユ椂', edit: 'text'}
-                        , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+                        , { field: 'HTimes', title: '宸ユ椂', edit: 'text', totalRow: true}
+                        , { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true }
                         , { field: 'HPrice', title: '宸ヤ环', style: 'background-color: #f9f9f9;'}
                         , { field: 'HPriceRate', title: '瀹氶娴姩姣旂巼', edit: 'text' }
-                        , { field: 'HSubsidyQty', title: '琛ヨ创鏁伴噺', hide: true }
-                        , { field: 'HSubsidyMoney', title: '琛ヨ创閲戦', hide: true}
-                        , { field: 'HSubsidyTotal', title: '琛ヨ创鍚堣', hide: true }
-                        , { field: 'HDeuctTotal', title: '鎵f灏忚', hide: true }
-                        , { field: 'HPackQty', title: '鍖呰鏁伴噺', hide: true }
+                        , { field: 'HSubsidyQty', title: '琛ヨ创鏁伴噺', hide: true, totalRow: true }
+                        , { field: 'HSubsidyMoney', title: '琛ヨ创閲戦', hide: true, totalRow: true}
+                        , { field: 'HSubsidyTotal', title: '琛ヨ创鍚堣', hide: true, totalRow: true }
+                        , { field: 'HDeuctTotal', title: '鎵f灏忚', hide: true, totalRow: true }
+                        , { field: 'HPackQty', title: '鍖呰鏁伴噺', hide: true, totalRow: true }
                         , { field: 'HPackPrice', title: '鍖呰鍗曚环', hide: true }
-                        , { field: 'HPackMoney', title: '鍖呰閲戦', hide: true}
+                        , { field: 'HPackMoney', title: '鍖呰閲戦', hide: true, totalRow: true}
                         , { field: 'HPackMaterID', title: '鍖呰绫诲瀷ID', hide: true }
                         //, { field: 'HPackMaterNumber', title: '鍖呰绫诲瀷浠g爜' }     //f7
                         , { field: 'HPackMaterName', title: '鍖呰绫诲瀷', hide: true, event: "HPackMaterName" }
-                        , { field: 'HMoney', title: '閲戦', totalRow: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMoney', title: '閲戦', totalRow: true, style: 'background-color: #f9f9f9;', totalRow: true }
                         , { field: 'HICMOInterID', title: '鐢熶骇浠诲姟鍗旾D', hide: true }
                         , { field: 'HICMOBillNo', title: '鐢熶骇浠诲姟鍗曞彿', hide: true }
                         , { field: 'HProcReportInterID', title: '宸ュ簭姹囨姤鍗旾D', hide: true }
@@ -879,8 +889,8 @@
                         , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true }
                         , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true }
                         , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true }
-                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', hide: true }
-                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', hide: true }
+                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', hide: true, totalRow: true }
+                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', hide: true, totalRow: true }
                         , { field: 'HCloseMan', title: '琛屽叧闂汉', hide: true }
                         , { field: 'HEntryCloseDate', title: '琛屽叧闂椂闂�', hide: true }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index 11590c7..aa8bf22 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -17,6 +17,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -145,6 +146,11 @@
             var option = [];
             var columns = "";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -371,7 +377,7 @@
                     type: 2
                     , skin: 'layui-layer-rim'   //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '宸ヨ祫缁撶畻鍗曪紙涓汉锛�-鏂板'
+                    , title: HPageTitle + '- 鏂板'
                     , shift: 0  //寮瑰嚭鍔ㄧ敾
                     , content: '../../宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillEdit.html?OperationType=1&linterid=0&HSouceBillType='
                     , btn: ['纭畾'],
@@ -393,7 +399,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ヨ祫缁撶畻鍗曪紙涓汉锛�-缂栬緫'
+                        , title: HPageTitle + '- 缂栬緫'
                         , shift: 0  //寮瑰嚭鍔ㄧ敾
                         , content: '../../宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
                         , btn: ['纭畾'],
@@ -707,17 +713,22 @@
                             }
 
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                }
-                                else {
+                                }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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                             break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                     }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
index 09df8c5..beae012 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
     <!--<style type="text/css">
         .layui-form-item .layui-inline {
             margin-right: 0;
@@ -293,6 +294,12 @@
             //妯″潡鍚�
             var HModName = "Pay_OtherBalBill";
 
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2206";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
 
             var params = get_UrlVars();
             if (typeof (params[params[0]]) == "undefined") {
@@ -318,7 +325,7 @@
                 , totalRow: true
                 //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
                 , cols: [[ //琛ㄥご
-                    { type: 'checkbox', fixed: 'left' }
+                    { type: 'checkbox', totalRowText: '鍚堣' }
                     , { templet: '#xuhao', title: '搴忓彿', fixed: 'left', event: "qwe", width: 100, style: 'background-color: #f9f9f9;' }
                     , { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true, style: 'background-color: #f9f9f9;' }
                     , { field: 'HEmpNumber', title: '鑱屽憳浠g爜', edit: 'text', event: 'HEmpCheck', width: 200 }
@@ -330,10 +337,10 @@
                     , { field: 'HProcID', title: 'HProcID', edit: 'text', width: 100, hide: true, style: 'background-color: #f9f9f9;' }
                     , { field: 'HProcNumber', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcNumber", width: 100 }
                     , { field: 'HProcName', title: '宸ュ簭鍚嶇О', width: 100, style: 'background-color: #f9f9f9;' }
-                    , { field: 'HTimes', title: '宸ユ椂', edit: 'text', width: 100 }
-                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HTimes', title: '宸ユ椂', edit: 'text', width: 100, totalRow: true }
+                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
                     , { field: 'HPrice', title: '宸ヤ环', width: 100, style: 'background-color: #f9f9f9;' }
-                    , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color: #f9f9f9;' }
+                    , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color: #f9f9f9;', totalRow: true }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
                     , { field: 'HMainSourceInterID ', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100, hide: true }
                     , { field: 'HMainSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
index 4b73b1e..ed380b9 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
@@ -17,6 +17,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -145,6 +146,11 @@
             var option = [];
             var columns = "";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -371,7 +377,7 @@
                     type: 2
                     , skin: 'layui-layer-rim'   //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '宸ヨ祫缁撶畻鍗曪紙鍏朵粬锛�-鏂板'
+                    , title: HPageTitle + '- 鏂板'
                     , shift: 0  //寮瑰嚭鍔ㄧ敾
                     ,content: '../宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1'
                     , btn: ['纭畾'],
@@ -393,7 +399,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ヨ祫缁撶畻鍗曪紙鍏朵粬锛�-缂栬緫'
+                        , title: HPageTitle + '- 缂栬緫'
                         , shift: 0  //寮瑰嚭鍔ㄧ敾
                         , content: '../宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=0&closeType=1'
                         , btn: ['纭畾'],
@@ -707,7 +713,7 @@
                             }
 
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -718,6 +724,12 @@
                                         case 'DateTime':
                                             col.push({ field: data[i].id, 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 HH:mm:ss')}}</div>", width: 160 });
                                             break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                     }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
index 3dd1124..8aa79d2 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
@@ -14,6 +14,7 @@
     <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/PageTitle.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>宸ヨ祫缁撶畻鍗�(闆嗕綋)</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -355,6 +357,14 @@
 
             //妯″潡鍚�
             var HModName = "Pay_GroupBalBill";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2201";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //鐢熶骇姹囨姤琛ㄦ覆鏌撳弬鏁�
             var option1 = {};           //宸ユ椂姹囨姤琛ㄦ覆鏌撳弬鏁�
@@ -843,8 +853,8 @@
                     , totalRow: true
                     , height: 400
                     , cols: [[
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
-                        , { type: 'numbers', title: '搴忓彿', totalRow: true, style: 'background-color: #f9f9f9;' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
+                        , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
                         , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
                         , { field: 'HMaterID', title: '鐗╂枡ID', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: "HMaterNumber" }     //f7
@@ -859,10 +869,10 @@
                         , { field: 'HSourceID', title: '璧勬簮ID', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HSourceNumber', title: '璧勬簮浠g爜', edit: 'text', event: "HSourceNumber" }     //f7
                         , { field: 'HSourceName', title: '璧勬簮鍚嶇О', style: 'background-color: #f9f9f9;' }
-                        , { field: 'HTimes', title: '宸ユ椂', edit: 'text' }
-                        , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+                        , { field: 'HTimes', title: '宸ユ椂', edit: 'text', totalRow: true }
+                        , { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true }
                         , { field: 'HPrice', title: '宸ヤ环', edit: 'text', style: 'background-color: #f9f9f9;' }
-                        , { field: 'HMoney', title: '閲戦', totalRow: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMoney', title: '閲戦', totalRow: true, style: 'background-color: #f9f9f9;', totalRow: true }
                         , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                         , { field: 'HICMOInterID', title: '鐢熶骇浠诲姟鍗旾D', hide: true }
                         , { field: 'HICMOBillNo', title: '鐢熶骇浠诲姟鍗曞彿', hide: true}
@@ -876,8 +886,8 @@
                         , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true }
                         , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true }
                         , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true }
-                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', totalRow: true, hide: true}
-                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', totalRow: true, hide: true }
+                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', totalRow: true, hide: true, totalRow: true}
+                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', totalRow: true, hide: true, totalRow: true }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
                 }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index 2323b20..720ba4b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -17,6 +17,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -145,6 +146,11 @@
             var option = [];
             var columns = "";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -371,7 +377,7 @@
                     type: 2
                     , skin: 'layui-layer-rim'   //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '宸ヨ祫缁撶畻鍗曪紙闆嗕綋锛�-鏂板'
+                    , title: HPageTitle + '- 鏂板'
                     , shift: 0  //寮瑰嚭鍔ㄧ敾
                     , content: '../../宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html?OperationType=1&linterid=0&HSouceBillType='
                     , btn: ['纭畾'],
@@ -393,7 +399,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ヨ祫缁撶畻鍗曪紙闆嗕綋锛�-缂栬緫'
+                        , title: HPageTitle + '- 缂栬緫'
                         , shift: 0  //寮瑰嚭鍔ㄧ敾
                         , content: '../../宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
                         , btn: ['纭畾'],
@@ -707,7 +713,7 @@
                             }
 
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -718,6 +724,12 @@
                                         case 'DateTime':
                                             col.push({ field: data[i].id, 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 HH:mm:ss')}}</div>", width: 160 });
                                             break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                     }
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 4bfb609..bb7ba1d 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"
@@ -14,6 +14,7 @@
     <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/PageTitle.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>寮傚父宸ユ椂鐢宠鍗�</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -187,7 +189,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline"  style="width:1500px;">
+                                        <div class="layui-inline" style="width:1500px;">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
                                             <div class="layui-input-block" style="margin-left: 120px; width: 800px;">
                                                 <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="width:1185px;">
@@ -329,6 +331,14 @@
 
             //妯″潡鍚�
             var HModName = "Pay_ErrWorkTimesRequestBill";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2231";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //瀛愯〃娓叉煋鍙傛暟
             //鑾峰彇鍙傛暟
@@ -723,7 +733,7 @@
                     , cellMinWidth: 120
                     , height: 400
                     , cols: [[
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
                         , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
                         , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
                         , { field: 'HEmpID', title: '鑱屽憳ID', hide: true, style: 'background-color: #f9f9f9;' }
@@ -735,16 +745,16 @@
                         , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', style: 'background-color: #f9f9f9;' }
                         , { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes", hide: true }
                         , { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes", hide: true }
-                        , { field: 'HTimes', title: '鍔犵彮鏃堕棿', totalRow: true, edit: 'text' }
-                        , { field: 'HRelTimes', title: '瀹為檯鏃堕棿', totalRow: true, edit: 'text' }
-                        , { field: 'HRelPay', title: '搴斿彂宸ヨ祫', totalRow: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HTimes', title: '鍔犵彮鏃堕棿', totalRow: true, edit: 'text', totalRow: true }
+                        , { field: 'HRelTimes', title: '瀹為檯鏃堕棿', totalRow: true, edit: 'text', totalRow: true }
+                        , { field: 'HRelPay', title: '搴斿彂宸ヨ祫', totalRow: true, style: 'background-color: #f9f9f9;', totalRow: true }
                         , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                         , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', hide: true }
                         , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true }
                         , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true }
                         , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true }
-                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', hide: true }
-                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', hide: true }
+                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', hide: true, totalRow: true }
+                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', hide: true, totalRow: true }
                         , { field: 'HCloseMan', title: '琛屽叧闂汉', hide: true }
                         , { field: 'HEntryCloseDate', title: '琛屽叧闂椂闂�', hide: true }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
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_ErrWorkTimesRequestBillList.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_ErrWorkTimesRequestBillList.html"
index e204a6b..c376144 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_ErrWorkTimesRequestBillList.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_ErrWorkTimesRequestBillList.html"
@@ -17,6 +17,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -145,6 +146,11 @@
             var option = [];
             var columns = "";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -371,7 +377,7 @@
                     type: 2
                     , skin: 'layui-layer-rim'   //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '寮傚父宸ユ椂鐢宠鍗�-鏂板'
+                    , title: HPageTitle + '- 鏂板'
                     , shift: 0  //寮瑰嚭鍔ㄧ敾
                     , content: '../../宸ヨ祫绠$悊/寮傚父宸ユ椂鐢宠鍗�/Pay_ErrWorkTimesRequestBill.html?OperationType=1&linterid=0&HSouceBillType='
                     , btn: ['纭畾'],
@@ -393,7 +399,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '寮傚父宸ユ椂鐢宠鍗�-缂栬緫'
+                        , title: HPageTitle + '- 缂栬緫'
                         , shift: 0  //寮瑰嚭鍔ㄧ敾
                         , content: '../../宸ヨ祫绠$悊/寮傚父宸ユ椂鐢宠鍗�/Pay_ErrWorkTimesRequestBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
                         , btn: ['纭畾'],
@@ -707,7 +713,7 @@
                             }
 
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -718,6 +724,9 @@
                                         case 'DateTime':
                                             col.push({ field: data[i].id, 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 HH:mm:ss')}}</div>", width: 160 });
                                             break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                     }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
index de86e3b..5d1e925 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
@@ -14,6 +14,7 @@
     <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/PageTitle.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鎵hˉ椤圭洰璐圭敤鍗�</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -267,6 +269,14 @@
 
             //妯″潡鍚�
             var HModName = "Pay_DuSubsidyItemBill";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2233";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //瀛愯〃娓叉煋鍙傛暟
             //鑾峰彇鍙傛暟
@@ -548,7 +558,7 @@
                     , cellMinWidth: 120
                     , height: 400
                     , cols: [[
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
                         , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
                         , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
                         , { field: 'HEmpID', title: '鑱屽憳ID', hide: true, style: 'background-color: #f9f9f9;' }
@@ -557,9 +567,9 @@
                         , { field: 'HDuSubsidyItemID', title: '鎵hˉ椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HDuSubsidyItemNumber', title: '鎵hˉ椤圭洰浠g爜', edit: 'text', event: "HDuSubsidyItemNumber" }     //f7
                         , { field: 'HDuSubsidyItemName', title: '鎵hˉ椤圭洰鍚嶇О', style: 'background-color: #f9f9f9;' }
-                        , { field: 'HQty', title: '鏁伴噺', edit: 'text'}     //f7
+                        , { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true}     //f7
                         , { field: 'HPrice', title: '鍗曚环', edit: 'text'}     //f7
-                        , { field: 'HMoney', title: '閲戦', totalRow: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMoney', title: '閲戦', totalRow: true, style: 'background-color: #f9f9f9;', totalRow: true }
                         , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBillList.html"
index 989d69e..425ff19 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBillList.html"
@@ -2,27 +2,28 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>鎵hˉ椤圭洰璐圭敤鍗曠淮鎶�</title>
+    <title>鎵hˉ椤圭洰璐圭敤鍗曞垪琛�</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">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
     <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/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>-->
+    <!--寮曠敤layui js鏂囦欢-->
     <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/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
-
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -38,12 +39,6 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                    <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
-                                    </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;">
@@ -55,6 +50,12 @@
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </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>
@@ -63,7 +64,7 @@
                                 <div class="layui-inline" style="margin-left:5px;">
                                     <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                 </div>
-                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
@@ -73,7 +74,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -97,22 +98,22 @@
                         <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" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_view" id="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAudit" id="btn_DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Close" id="btn_Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeClose" id="btn_DeClose"><i class="layui-icon layui-icon-circle"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Drop" id="btn_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeDrop" id="btn_DeDrop"><i class="layui-icon layui-icon-circle"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                             </div>
                         </script>
                     </form>
@@ -125,8 +126,8 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
-            //#region 鍏敤鍙橀噺
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -136,15 +137,28 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , soulTable = layui.soulTable
-            var option = [];
-            var sWhere = "";
             var HModName = "Pay_DuSubsidyItemBillList";
             var HBillType = "2233";
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var sWhere = "";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var option = [];
+            var columns = "";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
 
-            //杩囨护鏉′欢鐨刢lass绫� 
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
             var HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "寮傚父宸ユ椂鐢宠鍗曠淮鎶�";
+            window.HModuleName = "鎵hˉ椤圭洰璐圭敤鍗曞垪琛�";
             //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
             window.HDefaultFilter = "";
             //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -152,81 +166,39 @@
 
             //#endregion
 
-            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["hmainid", "HMangerID", "HDeptID", "HGroupID","HICMOInterID","HMaterID","HUnitID","HEmpID","HWorkTypeID"];
-            //#endregion
-
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //鍒濆鍖栫晫闈�
+            //#region 鍒濆鍖栫晫闈�
+
             set_ClearBill();
 
+            function set_ClearBill() {
+                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
             //#endregion
 
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //#region 澶村伐鍏锋爮浜嬩欢
-
-            table.on('toolbar(mainTable)', function (obj) {
-                switch (obj.event) {
-                    //鏂板
-                    case 'set_AddNew': set_AddNew();
-                        break;
-                    //缂栬緫
-                    case 'set_ShowBill': set_ShowBill();
-                        break;
-                    //鍒犻櫎
-                    case 'set_DeleteBill': set_DeleteBill();
-                        break;
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    ////娴忚
-                    //case 'get_view': get_view();
-                    //    break;
-                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
-                    case 'btn-Audit':
-                        set_CheckBill(1);
-                        break;
-                    //鍙嶅鏍告寜閽�
-                    case 'btn-DeAudit':
-                        set_CheckBill(2);
-                        break;
-                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
-                    case 'btn-Close':
-                        set_CloseBill(1);
-                        break;
-                    //鍙嶅叧闂寜閽�
-                    case 'btn-DeClose':
-                        set_CloseBill(2);
-                        break;
-                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
-                    case 'btn-Drop':
-                        set_DropBill(1);
-                        break;
-                    //鍙嶄綔搴熸寜閽�
-                    case 'btn-DeDrop':
-                        set_DropBill(2);
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                    //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
-                        break;
-                    //鎸夐挳璁剧疆
-                    case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-                        break;
-                    //淇濆瓨鏂规
-                    case 'set_SaveScheme': set_SaveScheme();
-                        break;
-                    //璇诲彇鏂规
-                    case 'set_ReadScheme': set_ReadScheme();
-                        break;
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
                 };
-            });
+            }
             //#endregion
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -250,448 +222,22 @@
             })
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                set_ClearQuery();
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(2);
-            });
-            //#endregion
-
-            //#endregion
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //#region 鍒濆鍖栫晫闈�
-            function set_ClearBill() {
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
-                //鏌ヨ
-                get_FastQuery(1);
-                //Organ();
-                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
-                get_DefaultModule();
-            }
-            //#endregion
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            function set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    , page: true
-                    //, cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 50000]
-                    , done: function (res, curr, count) {
-                        soulTable.render(this);
-                    }
-                };
-            }
-            //#endregion
-            //#endregion
-
-            //#region 鏌ヨ
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/Pay_DuSubsidyItemBill/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                    success: function (data1) {
-                        if (data1.count == 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: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width:120 });
-                                            break;
-                                        default:
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
-                                    }
-                                }
-                            }
-
-                            option.cols = [col];
-                            option.data = data1.data;
-                            table.render(option);
-
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
-                            layer.close(ajaxLoad);
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-
-            }
-            //#endregion
-
-            //#region 蹇�熻繃婊�
-            function get_FastQuery(number) {
-                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
-                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                //浠绘剰瀛楁杩囨护
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").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 (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
-                }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
-                }
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                get_Display(sWhere);
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            }
-            //#endregion
-
-            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
-            function set_ClearQuery() {
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HBillNo").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                form.render('select');
-
-                sWhere = "";
-            }
-            //#endregion
-
-            //#region 鏂板
-            function set_AddNew() {
-                layer.open({
-                    type: 2
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['100%', '100%']
-                    , title: '鎵hˉ椤圭洰璐圭敤鍗曞垪琛�-鏂板'
-                    , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../../宸ヨ祫绠$悊/鎵hˉ椤圭洰璐圭敤鍗�/Pay_DuSubsidyItemBill.html?OperationType=1&linterid=0&HSouceBillType='
-                    ,btn: ['纭畾'],
-                    // 鎸夐挳1 鐨勫洖璋�
-                    btn1: function (index, layero, that) {
-                        //鍒锋柊椤甸潰
-                        window.location.reload();
-                    }
-                })
-            }
-            //#endregion
-
-            //#region 缂栬緫
-            function set_ShowBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].hmainid.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '鎵hˉ椤圭洰璐圭敤鍗曞垪琛�-缂栬緫'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../宸ヨ祫绠$悊/鎵hˉ椤圭洰璐圭敤鍗�/Pay_DuSubsidyItemBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        btn1: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            $("#btnSearch").trigger('click');
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //#endregion
-
-            //#region 娴忚
-            function get_view() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].HItemID.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '椤圭洰闃舵鍒楄〃-娴忚'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../宸ヨ祫绠$悊/鎵hˉ椤圭洰璐圭敤鍗�/Pay_DuSubsidyItemBill.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        btn1: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            //window.location.reload();
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍒犻櫎
-            function set_DeleteBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HInterID = data[0].hmainid.toString();
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        var wait = layer.load();
-                        //閫昏緫鍒犻櫎鏂规硶
-                        $.ajax({
-                            url: GetWEBURL() + 'Pay_DuSubsidyItemBill/delete',
-                            type: "GET",
-                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
-                            success: function (result) {
-                                console.log('gouba' + result);
-                                if (result.count == 1) {
-                                    layer.msg(result.Message, { icon: 1 }, function () {
-                                        // 寰楀埌frame绱㈠紩
-                                        var index = layer.getFrameIndex(window.name);
-                                        //鍏抽棴褰撳墠frame
-                                        layer.close(wait);
-                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                        $("#btnSearch").trigger('click');
-                                    });
-                                } else {
-                                    layer.alert(result.code + result.Message, { icon: 5 });
-                                    layer.close(wait);
-                                }
-                            }, error: function () {
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                layer.close(wait);
-                            }
-                        });
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-
-            }
-            //#endregion
-
-            //#region 鍒锋柊
-            function get_Refresh() {
-                set_ClearQuery();
-                get_FastQuery(1);
-            }
-            //#endregion
-
-            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
-            function set_CheckBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_DuSubsidyItemBill/AuditPay_DuSubsidyItemBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
-            function set_CloseBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_DuSubsidyItemBill/ClosePay_DuSubsidyItemBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
-            function set_DropBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_DuSubsidyItemBill/DropPay_DuSubsidyItemBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    colName += option.cols[0][i]["title"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "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",
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": HMaker },
                     success: function (data1) {
                         if (data1.data.length != 0) {
-
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                var dataCols = dataCol[i].split('|');
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
@@ -706,12 +252,6 @@
                                 } else {
                                     option.cols[0][i + 1]["style"] = "font-size:100%";
                                 }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                     option.cols[0][i + 1]["hide"] = false;
@@ -749,17 +289,14 @@
                                 }
                             }
                             table.render(option);
-
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
                             table.render(option);
-
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, HBillType, HModName, HMaker);
+
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
@@ -767,7 +304,466 @@
             }
             //#endregion
 
-            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鏂板鎸夐挳
+                    case 'btn_Add': btn_Add();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn_Edit': btn_Edit();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn_Delete': btn_Delete();
+                        break;
+                    //鍒锋柊鎸夐挳
+                    case 'btn_Refresh': btn_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn_Audit': set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn_DeAudit': set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn_Close': set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn_DeClose': set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn_Drop': set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn_DeDrop': set_DropBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'btn_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HBillType, HModName, HMaker);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'btn_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'btn_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 鏂板
+            function btn_Add() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim'   //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: HPageTitle + '- 鏂板'
+                    , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , content: '../鎵hˉ椤圭洰璐圭敤鍗�/Pay_DuSubsidyItemBill.html?OperationType=1&linterid=0&HSouceBillType='
+                    , btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function btn_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../鎵hˉ椤圭洰璐圭敤鍗�/Pay_DuSubsidyItemBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    var HBillNo = data[0].鍗曟嵁鍙�.toString();
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Pay_DuSubsidyItemBillController/GetPay_DuSubsidyItemBill_Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HMaker": HMaker },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+                                        //鍒锋柊鐣岄潰
+                                        $("#btnSearch").trigger('click');
+                                        layer.close(wait);
+                                    });
+
+                                } else {
+                                    layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function btn_Refresh() {
+                get_FastQuery();
+            }
+            //#endregion
+
+            //#region  瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_DuSubsidyItemBillController/GetPay_DuSubsidyItemBill_Check_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_DuSubsidyItemBillController/GetPay_DuSubsidyItemBill_Close_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_DuSubsidyItemBillController/GetPay_DuSubsidyItemBill_Cancelltion_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽浣滃簾锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                form.render('select');
+                sWhere = "";
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").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 (HBeginDate) {
+                    sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //#endregion
+
+            //#region 鍒楄〃鍒锋柊
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Pay_DuSubsidyItemBillController/GetPay_DuSubsidyItemBillList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere, "HMaker": HMaker },
+                    success: function (data1) {
+                        if (data1.count == 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 });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                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: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+
+                            option.cols = [columns];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            table.render(option);
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+                            //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑷畾涔夎繃婊や笅鎷夋
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -780,6 +776,7 @@
                 form.render('select');
             }
             //#endregion
+
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -843,7 +840,7 @@
                 for (var i = 0; i < Filter.length; i++) {
                     HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
                     HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
-                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
                     HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
                 }
 
@@ -988,11 +985,9 @@
 
             //#endregion
 
-        });
-
             //#endregion
-
             //浠ヤ笂鏄痩ayui妯″潡
+        });
         //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
         function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
         {
@@ -1034,4 +1029,4 @@
     </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
index 4ea87d6..df7d350 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
     <style type="text/css">
         .layui-form-item .layui-inline {
             margin-right: 0;
@@ -281,6 +282,14 @@
                     , laydate = layui.laydate
                     , element = layui.element;
 
+                //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+                var HModuleType = "2203";
+                //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+                var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+                $("h1").html('<b>' + HPageTitle + '</b>');
+                //#endregion
+
+
                 var params = get_UrlVars();
                 if (typeof (params[params[0]]) == "undefined") {
                     var OperationType = 1;//鎿嶄綔绫诲瀷
@@ -303,32 +312,33 @@
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , height: 500
+                    , totalRow: true
                     //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
                     , page: true //寮�鍚垎椤�
                     , cols: [[ //琛ㄥご
-                        { type: 'checkbox', fixed: 'left' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
                         , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                         , { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true }
                         , { field: 'HEmpNumber', title: '鑱屽憳浠g爜', edit: 'text', event: 'HEmpCheck', width: 150 }
                         , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', edit: 'text', width: 100 }
                         , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', edit: 'text', width: 100 }
-                        , { field: 'HPMTimes', title: '涓嬪崍宸ユ椂', edit: 'text', width: 100 }
-                        , { field: 'HAMTimes', title: '涓婂崍宸ユ椂', edit: 'text', width: 100 }
-                        , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', width: 100 }
-                        , { field: 'HBaseDays', title: '鍩烘湰澶╂暟', edit: 'text', width: 100 }
-                        , { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', edit: 'text', width: 100 }
-                        , { field: 'HOverDays', title: '鍔犵彮澶╂暟', edit: 'text', width: 100 }
-                        , { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', edit: 'text', width: 100 }
-                        , { field: 'HLeaveDays', title: '璇峰亣澶╂暟', edit: 'text', width: 100 }
-                        , { field: 'HLateQty', title: '杩熷埌娆℃暟', edit: 'text', width: 100 }
-                        , { field: 'HLateTimes', title: '杩熷埌鏃堕棿', edit: 'text', width: 100 }
-                        , { field: 'HEarlyQty', title: '鏃╅��娆℃暟', edit: 'text', width: 100 }
-                        , { field: 'HEarlyTimes', title: '鏃╅��鏃堕棿', edit: 'text', width: 100 }
-                        , { field: 'HOutForEmpQty', title: '绉佸嚭娆℃暟', edit: 'text', width: 100 }
-                        , { field: 'HOutForEmpTimes', title: '绉佸嚭鏃堕棿', edit: 'text', width: 100 }
-                        , { field: 'HOutForComQty', title: '鍏嚭娆℃暟', edit: 'text', width: 100 }
-                        , { field: 'HOutForComTimes', title: '鍏嚭鏃堕棿', edit: 'text', width: 100 }
-                        , { field: 'HAbsentDays', title: '鏃峰伐澶╂暟', edit: 'text', width: 100 }
+                        , { field: 'HPMTimes', title: '涓嬪崍宸ユ椂', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HAMTimes', title: '涓婂崍宸ユ椂', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', width: 100, totalRow: true }
+                        , { field: 'HBaseDays', title: '鍩烘湰澶╂暟', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HOverDays', title: '鍔犵彮澶╂暟', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HLeaveDays', title: '璇峰亣澶╂暟', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HLateQty', title: '杩熷埌娆℃暟', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HLateTimes', title: '杩熷埌鏃堕棿', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HEarlyQty', title: '鏃╅��娆℃暟', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HEarlyTimes', title: '鏃╅��鏃堕棿', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HOutForEmpQty', title: '绉佸嚭娆℃暟', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HOutForEmpTimes', title: '绉佸嚭鏃堕棿', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HOutForComQty', title: '鍏嚭娆℃暟', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HOutForComTimes', title: '鍏嚭鏃堕棿', edit: 'text', width: 100, totalRow: true }
+                        , { field: 'HAbsentDays', title: '鏃峰伐澶╂暟', edit: 'text', width: 100, totalRow: true }
                         , { field: 'HRestFlag', title: '鍘備紤', edit: 'text', value: "true", width: 100, hide: true }
                         , { field: 'HSchClassID', title: '鐝', edit: 'text', width: 100 }
                         , { field: 'HCTPrjID', title: '鏍哥畻鏂规浠g爜', edit: 'text', width: 100, hide: true}
@@ -336,7 +346,7 @@
                         , { field: 'HWorkTypeID', title: '宸ョ浠g爜', edit: 'text', width: 100, hide: true}
                         , { field: 'HWorkTypeName', title: '宸ョ鍚嶇О', edit: 'text', event: 'HWorkTypeName', width: 100 }
                         , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', edit: 'text', width: 100 }
-                        , { field: 'HMoney', title: '宸ヨ祫', width: 100 }
+                        , { field: 'HMoney', title: '宸ヨ祫', width: 100, totalRow: true }
                         //, { field: 'HNeedTimes	', title: '搴斾笂鐝伐鏃�', edit: 'text', width: 100 }
                         , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
                         , { field: 'HMainSourceInterID ', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100, hide: true }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
index 95ea6f5..7c33cf2 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -17,6 +17,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -145,6 +146,11 @@
             var option = [];
             var columns = "";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -371,7 +377,7 @@
                     type: 2
                     , skin: 'layui-layer-rim'   //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '鑰冨嫟姹囨姤鍗�-鏂板'
+                    , title: HPageTitle + '- 鏂板'
                     , shift: 0  //寮瑰嚭鍔ㄧ敾
                     , content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1'
                     , btn: ['纭畾'],
@@ -393,7 +399,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '鑰冨嫟姹囨姤鍗�-缂栬緫'
+                        , title: HPageTitle + '- 缂栬緫'
                         , shift: 0  //寮瑰嚭鍔ㄧ敾
                         , content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=0&closeType=1'
                         , btn: ['纭畾'],
@@ -707,7 +713,7 @@
                             }
 
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -718,6 +724,12 @@
                                         case 'DateTime':
                                             col.push({ field: data[i].id, 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 HH:mm:ss')}}</div>", width: 160 });
                                             break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                     }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBill.html"
index 45a3963..9479b6b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBill.html"
@@ -14,6 +14,7 @@
     <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/PageTitle.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>璇峰亣鐢宠鍗�</b></h1>
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -296,6 +298,14 @@
 
             //妯″潡鍚�
             var HModName = "Pay_OutApplyBill";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "2221";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //瀛愯〃娓叉煋鍙傛暟
             //鑾峰彇鍙傛暟
@@ -681,7 +691,7 @@
                     , cellMinWidth: 120
                     , height: 400
                     , cols: [[
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'checkbox', totalRowText: '鍚堣' }
                         , { type: 'numbers', title: '搴忓彿' }
                         , { field: 'RowID', title: '琛屽彿', hide: true }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
                         , { field: 'HEmpID', title: '鑱屽憳ID', hide:true, style: 'background-color: #f9f9f9;' }
@@ -694,8 +704,8 @@
                         , { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes" }
                         , { field: 'HRestFlag', title: '鍗堜紤鏍囪', templet: "#HRestFlag" }
                         , { field: 'HRestTimes', title: '鍗堜紤鏃堕棿', edit: 'text'}     //f7
-                        , { field: 'HTimes', title: '鍔犵彮鏃堕棿', style: 'background-color: #f9f9f9;'}     //f7
-                        , { field: 'HRelTimes', title: '瀹為檯鏃堕棿', style: 'background-color: #f9f9f9;' }     //f7
+                        , { field: 'HTimes', title: '鍔犵彮鏃堕棿', style: 'background-color: #f9f9f9;', totalRow: true}     //f7
+                        , { field: 'HRelTimes', title: '瀹為檯鏃堕棿', style: 'background-color: #f9f9f9;', totalRow: true }     //f7
                         , { field: 'HRemark', title: '澶囨敞', edit: 'text' }     //f7
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBillList.html"
index f2341b1..b88eb2b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\257\267\345\201\207\347\224\263\350\257\267/Pay_OutApplyBillList.html"
@@ -2,27 +2,28 @@
 <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">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
     <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/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>-->
+    <!--寮曠敤layui js鏂囦欢-->
     <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/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
-
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -38,12 +39,6 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                    <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
-                                    </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;">
@@ -55,6 +50,12 @@
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </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>
@@ -63,7 +64,7 @@
                                 <div class="layui-inline" style="margin-left:5px;">
                                     <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                 </div>
-                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
@@ -73,7 +74,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -97,22 +98,22 @@
                         <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" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAudit" id="btn_DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Close" id="btn_Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeClose" id="btn_DeClose"><i class="layui-icon layui-icon-circle"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Drop" id="btn_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeDrop" id="btn_DeDrop"><i class="layui-icon layui-icon-circle"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                             </div>
                         </script>
                     </form>
@@ -125,8 +126,8 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
-            //#region 鍏敤鍙橀噺
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -136,18 +137,28 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , soulTable = layui.soulTable
-
-            var option = [];
-            var sWhere = "";
             var HModName = "Pay_OutApplyBillList";
             var HBillType = "2221";
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var sWhere = "";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var option = [];
+            var columns = "";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+            //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
-            //杩囨护鏉′欢鐨刢lass绫� 
+            //杩囨护鏉′欢鐨刢lass绫�
             var HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "璇峰亣鐢宠鍗�";
+            window.HModuleName = "璇峰亣鐢宠鍗曞垪琛�";
             //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
             window.HDefaultFilter = "";
             //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -155,81 +166,39 @@
 
             //#endregion
 
-            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["hmainid", "HDeptID", "HGroupID","HMangerID","HLeaveID","hsubid","HMaterID","HProcID","hEmpid"];
-            //#endregion
-
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //鍒濆鍖栫晫闈�
+            //#region 鍒濆鍖栫晫闈�
+
             set_ClearBill();
 
+            function set_ClearBill() {
+                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
             //#endregion
 
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //#region 澶村伐鍏锋爮浜嬩欢
-
-            table.on('toolbar(mainTable)', function (obj) {
-                switch (obj.event) {
-                    //鏂板
-                    case 'set_AddNew': set_AddNew();
-                        break;
-                    //缂栬緫
-                    case 'set_ShowBill': set_ShowBill();
-                        break;
-                    //鍒犻櫎
-                    case 'set_DeleteBill': set_DeleteBill();
-                        break;
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    ////娴忚
-                    //case 'get_view': get_view();
-                    //    break;
-                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
-                    case 'btn-Audit':
-                        set_CheckBill(1);
-                        break;
-                    //鍙嶅鏍告寜閽�
-                    case 'btn-DeAudit':
-                        set_CheckBill(2);
-                        break;
-                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
-                    case 'btn-Close':
-                        set_CloseBill(1);
-                        break;
-                    //鍙嶅叧闂寜閽�
-                    case 'btn-DeClose':
-                        set_CloseBill(2);
-                        break;
-                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
-                    case 'btn-Drop':
-                        set_DropBill(1);
-                        break;
-                    //鍙嶄綔搴熸寜閽�
-                    case 'btn-DeDrop':
-                        set_DropBill(2);
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                    //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
-                        break;
-                    //鎸夐挳璁剧疆
-                    case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-                        break;
-                    //淇濆瓨鏂规
-                    case 'set_SaveScheme': set_SaveScheme();
-                        break;
-                    //璇诲彇鏂规
-                    case 'set_ReadScheme': set_ReadScheme();
-                        break;
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
                 };
-            });
+            }
             //#endregion
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -253,453 +222,22 @@
             })
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                set_ClearQuery();
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(2);
-            });
-            //#endregion
-
-            //#endregion
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //#region 鍒濆鍖栫晫闈�
-            function set_ClearBill() {
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
-                //鏌ヨ
-                get_FastQuery(1);
-                //Organ();
-                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
-                get_DefaultModule();
-            }
-            //#endregion
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            function set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    , page: true
-                    //, cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 50000]
-                    , done: function (res, curr, count) {
-                        soulTable.render(this);
-                    }
-                };
-            }
-            //#endregion
-            //#endregion
-
-            //#region 鏌ヨ
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/Pay_OutApplyBill/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                    success: function (data1) {
-                        if (data1.count == 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: 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].id, title: data[i].name, align: 'center', sort: true, width: 120 });
-                                    }
-                                }
-                            }
-
-                            option.cols = [col];
-                            option.data = data1.data;
-                            table.render(option);
-
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
-                            layer.close(ajaxLoad);
-
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                                ColFilter();
-                            }
-
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-
-            }
-            //#endregion
-
-            //#region 蹇�熻繃婊�
-            function get_FastQuery(number) {
-                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
-                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                //浠绘剰瀛楁杩囨护
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").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 (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
-                }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
-                }
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                get_Display(sWhere);
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            }
-            //#endregion
-
-            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
-            function set_ClearQuery() {
-                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HBillNo").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                form.render('select');
-
-                sWhere = "";
-            }
-            //#endregion
-
-            //#region 鏂板
-            function set_AddNew() {
-                layer.open({
-                    type: 2
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['100%', '100%']
-                    , title: '璇峰亣鐢宠鍗�-鏂板'
-                    , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../../宸ヨ祫绠$悊/璇峰亣鐢宠/Pay_OutApplyBill.html?OperationType=1&linterid=0&HSouceBillType='
-                    ,btn: ['纭畾'],
-                    // 鎸夐挳1 鐨勫洖璋�
-                    btn1: function (index, layero, that) {
-                        //鍒锋柊椤甸潰
-                        window.location.reload();
-                    }
-                })
-            }
-            //#endregion
-
-            //#region 缂栬緫
-            function set_ShowBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].hmainid.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '璇峰亣鐢宠鍗�-缂栬緫'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../宸ヨ祫绠$悊/璇峰亣鐢宠/Pay_OutApplyBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        btn1: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            window.location.reload();
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //#endregion
-
-            //#region 娴忚
-            function get_view() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].HItemID.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '椤圭洰闃舵鍒楄〃-娴忚'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../椤圭洰绠$悊/椤圭洰闃舵/Add_Edit_Gy_ProjectStage.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
-                        , btn: ['纭畾'],
-                        // 鎸夐挳1 鐨勫洖璋�
-                        btn1: function (index, layero, that) {
-                            //鍒锋柊椤甸潰
-                            //window.location.reload();
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍒犻櫎
-            function set_DeleteBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HInterID = data[0].hmainid.toString();
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        var wait = layer.load();
-                        //閫昏緫鍒犻櫎鏂规硶
-                        $.ajax({
-                            url: GetWEBURL() + 'Pay_OutApplyBill/delete',
-                            type: "GET",
-                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
-                            success: function (result) {
-                                console.log('gouba' + result);
-                                if (result.count == 1) {
-                                    layer.msg(result.Message, { icon: 1 }, function () {
-                                        // 寰楀埌frame绱㈠紩
-                                        var index = layer.getFrameIndex(window.name);
-                                        //鍏抽棴褰撳墠frame
-                                        layer.close(wait);
-                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                        $("#btnSearch").trigger('click');
-                                    });
-                                } else {
-                                    layer.alert(result.code + result.Message, { icon: 5 });
-                                    layer.close(wait);
-                                }
-                            }, error: function () {
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                layer.close(wait);
-                            }
-                        });
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-
-            }
-            //#endregion
-
-            //#region 鍒锋柊
-            function get_Refresh() {
-                set_ClearQuery();
-                get_FastQuery(1);
-            }
-            //#endregion
-
-            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
-            function set_CheckBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_OutApplyBill/AuditPay_OutApplyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
-            function set_CloseBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_OutApplyBill/ClosePay_OutApplyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
-            function set_DropBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Pay_OutApplyBill/DropPay_OutApplyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    // 寰楀埌frame绱㈠紩
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-            }
-            //#endregion
-
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    colName += option.cols[0][i]["title"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "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",
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": HMaker },
                     success: function (data1) {
                         if (data1.data.length != 0) {
-
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                var dataCols = dataCol[i].split('|');
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
@@ -714,12 +252,6 @@
                                 } else {
                                     option.cols[0][i + 1]["style"] = "font-size:100%";
                                 }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                     option.cols[0][i + 1]["hide"] = false;
@@ -757,17 +289,14 @@
                                 }
                             }
                             table.render(option);
-
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
                             table.render(option);
-
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, HBillType, HModName, HMaker);
+
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
@@ -775,7 +304,466 @@
             }
             //#endregion
 
-            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鏂板鎸夐挳
+                    case 'btn_Add': btn_Add();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn_Edit': btn_Edit();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn_Delete': btn_Delete();
+                        break;
+                    //鍒锋柊鎸夐挳
+                    case 'btn_Refresh': btn_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn_Audit': set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn_DeAudit': set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn_Close': set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn_DeClose': set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn_Drop': set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn_DeDrop': set_DropBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'btn_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HBillType, HModName, HMaker);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'btn_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'btn_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 鏂板
+            function btn_Add() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim'   //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: HPageTitle + '- 鏂板'
+                    , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , content: '../璇峰亣鐢宠/Pay_OutApplyBill.html?OperationType=1&linterid=0&HSouceBillType='
+                    , btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function btn_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../璇峰亣鐢宠/Pay_OutApplyBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    var HBillNo = data[0].鍗曟嵁鍙�.toString();
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Pay_OutApplyBillController/GetPay_OutApplyBill_Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HMaker": HMaker },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+                                        //鍒锋柊鐣岄潰
+                                        $("#btnSearch").trigger('click');
+                                        layer.close(wait);
+                                    });
+
+                                } else {
+                                    layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function btn_Refresh() {
+                get_FastQuery();
+            }
+            //#endregion
+
+            //#region  瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_OutApplyBillController/GetPay_OutApplyBill_Check_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_OutApplyBillController/GetPay_OutApplyBill_Close_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Pay_OutApplyBillController/GetPay_OutApplyBill_Cancelltion_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽浣滃簾锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                form.render('select');
+                sWhere = "";
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").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 (HBeginDate) {
+                    sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //#endregion
+
+            //#region 鍒楄〃鍒锋柊
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Pay_OutApplyBillController/GetPay_OutApplyBillList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere, "HMaker": HMaker },
+                    success: function (data1) {
+                        if (data1.count == 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 });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                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: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+
+                            option.cols = [columns];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            table.render(option);
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+                            //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑷畾涔夎繃婊や笅鎷夋
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -788,6 +776,7 @@
                 form.render('select');
             }
             //#endregion
+
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -851,7 +840,7 @@
                 for (var i = 0; i < Filter.length; i++) {
                     HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
                     HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
-                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
                     HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
                 }
 
@@ -995,11 +984,10 @@
             }
 
             //#endregion
-        });
 
             //#endregion
-
             //浠ヤ笂鏄痩ayui妯″潡
+        });
         //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
         function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
         {
@@ -1041,4 +1029,4 @@
     </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.1