From 94853e46b9d4911fb4cf00389f00a4b820db5d3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 14:35:46 +0800
Subject: [PATCH] fix: 修正 系统上机日志查询 没有显示默认方案的问题

---
 WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html |  705 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 602 insertions(+), 103 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index 2fd01f3..f3d6ca6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -8,6 +8,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../../layuiadmin/SetColumn.js"></script>
     <script src="../../../../layuiadmin/PageTitle.js"></script>
     <style>
         .layui-form-select .layui-input {
@@ -21,23 +29,14 @@
             font-weight: bold;
         }
     </style>
-    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <script src="../../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../../layuiadmin/HideButton.js"></script>
-    <script src="../../../../layuiadmin/soulTable.slim.js"></script>
 
 </head>
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
             <div class="layui-card" style="padding: 1px">
-                <form class="layui-form" action="" lay-filter="component-form-group">
-                    <!--<div class="layui-card-header">
-                        <span id="top-title">浜ч噺姹囨姤鍗�</span>
-                    </div>-->
+                <form class="layui-form" action="" lay-filter="component-form-group">                  
                     <div class="layui-card-body" style="padding: 1px;">
-
-
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
                                 <div class="layui-colla-title layui-inline">
@@ -45,7 +44,13 @@
                                         <span>鏇村</span>
                                     </div>
                                 </div>
-
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
@@ -58,31 +63,33 @@
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HDate1" 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" style="width:190px;">
+                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+                                    <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" style="width:190px;">
+                                        </div>
                                     </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="Part" id="Part" style="width:190px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡淇℃伅</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="Part" id="Part" style="width:190px;">
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
-                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
-                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
-                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                        </select>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                            <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                            </select>
+                                        </div>
                                     </div>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""  lay-filter="btnSearch" id="btnSearch">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    </button>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button>
                                 </div>
-
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display:none;" lay-filter="btnSearch" id="btnSearch">
-                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                </button>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
+                                
                                 <!--鏄剧ず褰撳墠杩囨护鏂规-->
                                 <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>
@@ -100,50 +107,110 @@
                                                 <input type="text" class="layui-input ForFilteringSchemes" name="Source" id="Source" style="width:190px;">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
+                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <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>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
                                                 </select>
                                             </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                            </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
+
+                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                            </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+
+                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div id="page" style="position: relative; bottom: 0;"></div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add" disabled><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" 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" lay-event="btn-reload" style="display:none;" id="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm" style="display:none;"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back" style="display:none;"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;" id="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;" id="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;" id="btn-exit"><i class="layui-icon layui-icon-return"></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_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-exit" id="btn-exit"><i class="layui-icon layui-icon-return"></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>
@@ -154,11 +221,7 @@
             </div>
         </div>
     </div>
-    <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>
         //鑾峰彇鍙傛暟
         var workcode = "";  //宸ュ崟鍙�
@@ -168,7 +231,8 @@
         var HSourceBillType = ""; //婧愬崟绫诲瀷
         var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
         var HModName = "Sc_ProductReportStepBillList_Web";
-
+        var HBillType = "Sc_ProductReportStepBillList_Web";
+        var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
         //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
         var params = get_UrlVars();
         if (typeof (params[params[0]]) == "undefined") {
@@ -194,8 +258,11 @@
 
             var sWhere = "";
             var option = [];
+            var page = 1;//鍒嗛〉鏁版嵁
+            var size = 50;
+            var ins;//鐢ㄤ簬瀵煎嚭EXCEl
             //#endregion
-
+            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -233,6 +300,10 @@
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export ();
+                        break;
                     //鏂板鎸夐挳
                     case 'btn-Add': //set_AddNew();
                         break;
@@ -242,19 +313,40 @@
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete': set_DeleteBill();
                         break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit': set_CheckBill();
                         break;
                     //鍙嶅鏍告寜閽�
                     case 'btn-DeAudit': set_AbandonCheck();
                         break;
+                    //鍏抽棴鎸夐挳        锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(0);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(1);
+                        break;
+                    //浣滃簾鎸夐挳        锛�0:浣滃簾銆�1:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(0);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(1);
+                        break;
                     //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(1);
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
                         break;
                     //鎸夐挳璁剧疆
                     case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, "3724", HModName, sessionStorage["HUserName"]);
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
@@ -272,7 +364,8 @@
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                 $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HBillNo").val("");
                 $("#Part").val("");
@@ -280,26 +373,67 @@
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0")
                 $("#HOrgID").val(sessionStorage["OrganizationID"]);
                 form.render('select');
                 sWhere = "";
              
             });
         //#endregion
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
 
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+            //#endregion
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
             // 鍒濆鍖栫晫闈�
             function set_ClearBill() {
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
-                //鏌ヨ
-                get_Display(sWhere);
-                Organ();
-                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
-                get_DefaultModule();       
-            }
 
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();                
+                Organ();
+                //鏌ヨ
+                get_FastQuery();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();               
+            }
+           
+             //#endregion
             //鍒濆鍖栬〃鏍�
             function set_InitGrid()
             {
@@ -311,13 +445,14 @@
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , height: 'full-50'
-                    , page: true
+                    , page: false
                     , cellMinWidth: 90
                     , totalRow: true
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]                   
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                         , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200, sort: true}
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true}
@@ -439,6 +574,24 @@
                         });
                     }
                 };
+                optionPage = {
+                    elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+                    count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+                    limit: 50,
+                    limits: [50, 500, 5000, 50000],
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    jump: function (obj, first) {
+
+                        //棣栨涓嶆墽琛�
+                        if (!first) {
+                            //do something
+                            page = obj.curr;
+                            size = obj.limit;
+                            get_FastQuery();
+                        }
+                    }
+                }
+                laypage.render(optionPage);
             }
 
             //鑾峰彇缁勭粐
@@ -463,6 +616,37 @@
                 })
             }
 
+
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var HInterID = data[0].HInterID;
+                var HICMOInID = data[0].HICMOInterID;
+                var HICMOEnID = data[0].HICMOEntryID;
+                var HRelationInterID = data[0].HRelationInterID;
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.hmainid.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid   
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=&HICMOInID=' + HICMOInID + '&HICMOEnID=' + HICMOEnID + '&HRelationInterID=' + HRelationInterID + ''//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
             //鏌ヨ鏁版嵁
             function get_Display(sWhere)
             {
@@ -474,12 +658,60 @@
                     data: { "sWhere": sWhere,"user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
+                            var data = [];//鍒楀瓧娈垫暟鎹�
+                            var col = [];
+                            var totalArray = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�  
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else if (data[i].name == '鍗曟嵁鍙�') {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+                                } else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 800
+                                , page: true
+                                , totalRow: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                                , done: function (res, curr, count) {
+                                    soulTable.render(this);
+                                }
+                            }
                             option.data = data1.data;
-                            table.render(option);
-                            layer.close(ajaxLoad);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            ins = table.render(option);
 
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, "3724", HModName, sessionStorage["HUserName"]);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
 
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                 ColFilter();
@@ -496,6 +728,80 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
 
+            //#region 鍒嗛〉鏌ヨ
+            function get_DisplayPage(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESProductReportStepBill/Get_Sc_MESProductReportBillPage',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+                    success: function (data1) {
+                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙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: false, 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: false, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+                            option.cols = [col];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            laypage.render(optionPage);
+                            ins = table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+          
             // 蹇�熻繃婊�
             function get_FastQuery(number) {
                 var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
@@ -506,6 +812,12 @@
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
                 var HOrgID = ""; //缁勭粐
                 sWhere += SchWhere;
 
@@ -530,7 +842,49 @@
                     }
                     sWhere += " and " + ColName + " " + com;
                 }
-              
+
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
                 if (number == 1) {
                     HOrgID = sessionStorage["OrganizationID"];
                 }
@@ -555,10 +909,17 @@
                 //if (HOrgID) {
                 //    sWhere += " and HOrgID = '" + HOrgID + "'";
                 //}
-                get_Display(sWhere);
+                /* get_Display(sWhere);*/
+                get_DisplayPage(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
             }
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
 
             //鏂板
             function set_AddNew()
@@ -649,19 +1010,7 @@
 
                                 } else {
                                     layer.alert(result.code + result.Message, { icon: 5 });
-                                }
-                                //if (result.count == 1) {
-                                //    layer.msg(result.Message, { time: 1 * 2000, icon: 1 });
-                                //    table.reload('mainTable', {
-                                //        page: {
-                                //            curr: 1 //閲嶆柊浠庣涓�椤靛紑濮�
-                                //        }
-                                //    })
-                                //    return false;
-                                //} else {
-                                //    layer.alert(result.code + result.Message, { icon: 5 });
-                                //    return false;
-                                //}
+                                }                             
                             }, error: function () {
                                 layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                                 return false;
@@ -770,6 +1119,116 @@
 
             }
 
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESProductReportStepBill/CloseSc_ICMOBillWorkQtyStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": 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 瀵煎嚭Execel
+            function get_Export () {
+                option.data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                    }
+                });
+
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_MESProductReportStepBill/DeleteSc_ICMOStepBillWorkQtyStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": 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 setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#endregion
+
+
             //鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
@@ -779,9 +1238,32 @@
                     }
                 }
                 $("#ColName").empty();
-                $("#ColName").append(Organization);
+                $("#ColName").append(Organization); $("#ColName1").empty();
+                $("#ColName1").append(Organization); $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTablemainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
@@ -813,6 +1295,23 @@
                                     $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
                                 }
                             }
+                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                            if (HInitTimeCycle != -1) {
+                                $('#HBeginDate').prop('disabled', true);
+                                $('#HEndDate').prop('disabled', true);
+
+                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+                                //鎵ц鏌ヨ鏂规硶
+                                get_FastQuery();
+                            } else {
+                                $('#HBeginDate').prop('disabled', false);
+                                $('#HEndDate').prop('disabled', false);
+                            }
+
                             //鎵ц鏌ヨ鏂规硶
                             get_FastQuery()
                             form.render("select");
@@ -820,9 +1319,9 @@
                             //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
-                            form.render("select");
+                            ////鎵ц鏌ヨ鏂规硶
+                            //get_FastQuery()
+                            //form.render("select");
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });

--
Gitblit v1.9.1