From c71ba8a52fdbfba410afe5b58f4a31cc8db29a32 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 23 一月 2026 09:15:09 +0800
Subject: [PATCH] 添康排产导出优化升级;可打备料单列表添加保存过滤方案功能

---
 WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK.html            |   89 +++++++++++++++++++++++++++++
 WebTM/views/车间管理/报表分析/Sc_AllowedPrintProcExchangeBillList.html |   63 +++++++++++++++-----
 2 files changed, 133 insertions(+), 19 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK.html"
index 6f6408d..02be3ba 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK.html"
@@ -12,6 +12,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/Scripts/xlsx.full.min.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -417,7 +418,7 @@
                     break;
                 //瀵煎嚭excel
                 case 'get_export':
-                    get_Export();
+                    get_Export2();
                     break;
                 //娓呴櫎鎵�鏈夋爣棰樼瓫閫�
                 case 'clearFilter':
@@ -3495,6 +3496,90 @@
         //    table.exportFile(ins.config.id, data, "xls");
         //}
 
+        function get_Export2() {
+            var data = option.data
+            data.forEach((item) => {
+                // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+                if (item.瑙勬牸鍨嬪彿.length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                    item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                    item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�');  // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+                }
+            });
+            for (let i = 22; i < option.cols[0].length - 45; i++) {
+                option.cols[0][i].title = ("2026" + "-" + Format(option.cols[0][i].title, 'MM-dd').toString()).toString();
+            }
+
+            // 鏍¢獙1锛氭暟鎹负绌哄垯鎻愮ず
+            if (!data || data.length === 0) {
+                layer.msg('鏆傛棤鏁版嵁鍙鍑�', { icon: 2 });
+                return;
+            }
+
+            // 鍒涘缓绌哄伐浣滆〃
+            var ws = {};
+
+            // 閰嶇疆琛ㄥご鏍囬锛堟枃鏈牸寮忥級
+            var headersTitle = [];
+            var headersField = [];
+            var excludeFields = ['閿佸畾宸ュ崟', '鏄ㄦ棩鏁伴噺', '瑕佽揣鏃ユ湡', '涓氬姟鐘舵��', '浜х嚎鍏ュ簱鏁伴噺', '鏈帓鏁伴噺', '閿�鍞鍗曞鏍告棩鏈�', '璁㈠崟绫诲瀷', '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', '璁㈠崟绛夌骇', '璁㈠崟浜よ揣鏈�', '璁㈠崟闇�姹傛暟閲�', '寮�宸ヤ綑閲�', '鐢熶骇鍛ㄦ湡', '鏈�杩熷紑宸ユ棩鏈�', '鏈�杩熷畬宸ユ棩鏈�', '婧愬崟涓诲唴鐮�', '婧愬崟瀛愬唴鐮�', 'hmainid', '鎷嗗崟鏁伴噺', '鏈叆搴撴暟閲�', 'HICMOInterID', 'HGroupID', 'HGroupName', 'HMaterID', 'HSourceID', 'HWorkShopID', 'HUnitID', 'HProdORGID', 'HEmpID', '鎷嗗崟姹囨姤鏁伴噺', '閿�鍞鍗曟暟閲�', '鏃ヨ鍒掓暟閲忔�婚噺', '鎷嗗崟鏁伴噺', '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', '璁″垝寮�濮嬫棩鏈�', '璁″垝缁撴潫鏃ユ湡', '鏈�鏃╁紑宸ユ棩鏈�', '鎿嶄綔宸�', 'HMouldID', 'HMouldPCTime', '鎵�闇�宸ヤ綅鏁�', '浣跨敤宸ヨ','鍗曟嵁鍙�'];
+            //寰幆娣诲姞鏍囬
+            for (var i = 2; i < option.cols[0].length - 4; i++) {
+                if (option.cols[0][i].hide == false && excludeFields.indexOf(option.cols[0][i].title) == -1) {
+                    headersTitle.push(option.cols[0][i].title);
+                    if (option.cols[0][i].title == "鐗╂枡浠g爜") {
+                        headersField.push("鐗╂枡缂栫爜");
+                    } else if (option.cols[0][i].title == "璁″垝鏁伴噺") {
+                        headersField.push("鐢熶骇璁㈠崟鏁伴噺");
+                    } else {
+                        headersField.push(option.cols[0][i].field);
+                    }
+                   
+                }
+            }
+            //鎶婃爣棰樻坊鍔犲埌excel琛ㄦ牸
+            headersField.forEach((header, idx) => {
+                var cellRef = XLSX.utils.encode_cell({ r: 0, c: idx }); // 琛�0涓鸿〃澶�
+                ws[cellRef] = { v: header, t: 's', z: "@" }; // t:'s' 浠h〃鏂囨湰鏍煎紡, z: "@" 鎸囧畾鍗曞厓鏍间负鏂囨湰绫诲瀷
+            });
+
+            // 濉厖鏁版嵁骞舵寚瀹氭瘡涓崟鍏冩牸鐨勬牸寮�
+            data.forEach((row, rowIdx) => {
+                var rowNum = rowIdx + 1; // 鏁版嵁浠庣2琛岋紙琛�1锛夊紑濮�
+                if (!row) return;
+                var Hname = "";
+                //鍗曞厓鏍兼暟鎹祴鍊�
+                for (var i = 0; i < headersTitle.length; i++) {
+                    Hname = headersTitle[i];
+                    ws[XLSX.utils.encode_cell({ r: rowNum, c: i })] = { v: row[Hname] || '', t: 's', z: "@" };
+                }
+
+                //// 鐢熶骇璁㈠崟鍙凤細鏂囨湰鏍煎紡
+                //ws[XLSX.utils.encode_cell({ r: rowNum, c: 0 })] = { v: row.閿�鍞鍗曞彿 || '', t: 's', z: "@" };
+                //ws[XLSX.utils.encode_cell({ r: rowNum, c: 1 })] = { v: row.鐢熶骇璁㈠崟鍙� || '', t: 's', z: "@" };
+            });
+
+            // 鍙�夛細璁剧疆鍒楀锛屾彁鍗囧鍑烘枃浠剁殑鍙鎬�
+            var HColWidth = [];
+            for (var i = 0; i < headersTitle.length; i++) {
+                HColWidth.push({ wch: 20 });
+            }
+            ws['!cols'] = HColWidth;
+            // 鏍囪鏁版嵁鑼冨洿锛堝叧閿細璁〦xcel璇嗗埆鏈夋暟鎹殑鍖哄煙锛�
+            ws['!ref'] = XLSX.utils.encode_range({
+                s: { r: 0, c: 0 }, // 璧峰锛氳0鍒�0
+                e: { r: data.length, c: headersTitle.length - 1 } // 缁撴潫锛氭渶鍚庝竴琛屾渶鍚庝竴鍒�
+            });
+
+            // 鏋勫缓宸ヤ綔绨垮苟瀵煎嚭
+            var wb = XLSX.utils.book_new();
+            XLSX.utils.book_append_sheet(wb, ws, '鎺掍骇淇℃伅');
+            XLSX.writeFile(wb, '鎺掍骇瀵煎嚭.xlsx');
+
+            for (let i = 22; i < option.cols[0].length - 45; i++) {
+                option.cols[0][i].title = Format(option.cols[0][i].title, 'MM.dd');
+            }
+        }
+
         function get_Export() {
             var data = option.data
             data.forEach((item) => {
@@ -3510,7 +3595,7 @@
             }
 
             // 姝ラ2锛氬畾涔夐渶瑕佹帓闄ょ殑瀛楁锛堜笉瀵煎嚭鐨勫瓧娈碉紝姝ゅ鎺掗櫎 operate 鍜� 鍙澶栨坊鍔犲叾浠栧瓧娈碉級
-            var excludeFields = ['閿佸畾宸ュ崟', '鏄ㄦ棩鏁伴噺', '瑕佽揣鏃ユ湡', '涓氬姟鐘舵��', '浜х嚎鍏ュ簱鏁伴噺', '鏈帓鏁伴噺', '閿�鍞鍗曞鏍告棩鏈�', '璁㈠崟绫诲瀷', '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', '璁㈠崟绛夌骇', '璁㈠崟浜よ揣鏈�', '璁㈠崟闇�姹傛暟閲�', '寮�宸ヤ綑閲�', '鐢熶骇鍛ㄦ湡', '鏈�杩熷紑宸ユ棩鏈�', '鏈�杩熷畬宸ユ棩鏈�', '婧愬崟涓诲唴鐮�', '婧愬崟瀛愬唴鐮�', 'hmainid', '璁¢噺鍗曚綅', '鎷嗗崟鏁伴噺', '鏈叆搴撴暟閲�', 'HICMOInterID', 'HGroupID', 'HGroupName', 'HMaterID', 'HSourceID', 'HWorkShopID', 'HUnitID', 'HProdORGID', 'HEmpID', '鎷嗗崟姹囨姤鏁伴噺', '閿�鍞鍗曟暟閲�', '鏃ヨ鍒掓暟閲忔�婚噺', '鎷嗗崟鏁伴噺', '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', '璁″垝寮�濮嬫棩鏈�', '璁″垝缁撴潫鏃ユ湡', '鏈�鏃╁紑宸ユ棩鏈�', '鎿嶄綔宸�', 'HMouldID', 'HMouldPCTime', '鎵�闇�宸ヤ綅鏁�', '浣跨敤宸ヨ'];
+            var excludeFields = ['閿佸畾宸ュ崟', '鏄ㄦ棩鏁伴噺', '瑕佽揣鏃ユ湡', '涓氬姟鐘舵��', '浜х嚎鍏ュ簱鏁伴噺', '鏈帓鏁伴噺', '閿�鍞鍗曞鏍告棩鏈�', '璁㈠崟绫诲瀷', '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', '璁㈠崟绛夌骇', '璁㈠崟浜よ揣鏈�', '璁㈠崟闇�姹傛暟閲�', '寮�宸ヤ綑閲�', '鐢熶骇鍛ㄦ湡', '鏈�杩熷紑宸ユ棩鏈�', '鏈�杩熷畬宸ユ棩鏈�', '婧愬崟涓诲唴鐮�', '婧愬崟瀛愬唴鐮�', 'hmainid', '鎷嗗崟鏁伴噺', '鏈叆搴撴暟閲�', 'HICMOInterID', 'HGroupID', 'HGroupName', 'HMaterID', 'HSourceID', 'HWorkShopID', 'HUnitID', 'HProdORGID', 'HEmpID', '鎷嗗崟姹囨姤鏁伴噺', '閿�鍞鍗曟暟閲�', '鏃ヨ鍒掓暟閲忔�婚噺', '鎷嗗崟鏁伴噺', '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', '璁″垝寮�濮嬫棩鏈�', '璁″垝缁撴潫鏃ユ湡', '鏈�鏃╁紑宸ユ棩鏈�', '鎿嶄綔宸�', 'HMouldID', 'HMouldPCTime', '鎵�闇�宸ヤ綅鏁�', '浣跨敤宸ヨ'];
 
             // 姝ラ3锛氱瓫閫夋暟鎹紝鐢熸垚浠呭寘鍚渶瀵煎嚭瀛楁鐨勬柊鏁版嵁
             var exportData = data.map(function (item) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_AllowedPrintProcExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_AllowedPrintProcExchangeBillList.html"
index f2d251f..1339c45 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_AllowedPrintProcExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_AllowedPrintProcExchangeBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/MESLanguage.js"></script>
     <script src="../../../layuiadmin/grwebapp.js"></script>
+    <script src="../../../layuiadmin/QueryScheme.js"></script>
 
 </head>
 <body>
@@ -44,31 +45,37 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label" style="width: 85px;">浜у搧浠g爜</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
                                     </div>
                                 </div>
                                 <div class="layui-inline" style="display:none;">
                                     <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
-                                        <input type="text" class="layui-input" name="HName" id="HName" style="width:150px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName" style="width:150px;">
                                     </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" name="HICMOBillNo" id="HICMOBillNo" style="width:150px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HICMOBillNo" id="HICMOBillNo" style="width:150px;">
                                     </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" name="HSerorderBillNo" id="HSerorderBillNo" style="width:150px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HSerorderBillNo" id="HSerorderBillNo" style="width:150px;">
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-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-row" style="margin-top:5px">
                                         <div class="layui-inline">
@@ -101,12 +108,12 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
-                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+                                            <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>
@@ -121,19 +128,19 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
-                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+                                                <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" lay-filter="Comparator2" style="width:190px;">
+                                            <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>
@@ -148,7 +155,7 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                         </div>
                                     </div>
                                 </div>
@@ -164,6 +171,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" id="btn_printBatch" lay-event="btn_printBatch"><i class="layui-icon layui-icon-print"></i>鎵归噺鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" 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" 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="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
@@ -206,6 +215,19 @@
             var Organization = sessionStorage["Organization"];
             //#endregion
 
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            window.HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鍙墦澶囨枡鍗�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             //鍒濆鍖栫晫闈�
             set_ClearBill();
@@ -239,6 +261,12 @@
                         var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                         var HBillType = "Sc_AllowedPrintProcExchangeBillList";
                         get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme(get_FastQuery);
                         break;
                 };
             });
@@ -277,11 +305,12 @@
             // 鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 2), "yyyy-MM-dd"));
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 set_InitGrid();
                 get_FastQuery();
-
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule(get_FastQuery);
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -367,7 +396,7 @@
                                     switch (data[i].Type) {
                                         //int
                                         case 'DateTime':
-                                            if (data[i].name == "鎵撳嵃鏃ユ湡") {
+                                            if (data[i].name == "娴佽浆鍗℃棩鏈�") {
                                                 col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                             }else {
                                                 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: 200 });
@@ -508,10 +537,10 @@
                     sWhere += " and " + ColName2 + " " + com2;
                 }
                 if (HBeginDate) {
-                    sWhere += " and CONVERT(varchar(100),鎵撳嵃鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                    sWhere += " and CONVERT(varchar(100),娴佽浆鍗℃棩鏈�, 23) >= '" + HBeginDate + "'";
                 }
                 if (HEndDate) {
-                    sWhere += " and CONVERT(varchar(100),鎵撳嵃鏃ユ湡, 23) <= '" + HEndDate + "'";
+                    sWhere += " and CONVERT(varchar(100),娴佽浆鍗℃棩鏈�, 23) <= '" + HEndDate + "'";
                 }
                 if (HNumber) {
                     sWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
@@ -527,7 +556,7 @@
                 }
                 get_DisplayPage(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-
+                form.render("select");
             }
             //閲嶇疆蹇�熸煡璇�
             function set_ClearQuery() {
@@ -543,7 +572,7 @@
                 $("#ColContent1").val("");
                 $("#ColName1").val("0");
                 $("#Comparator1").val("0");
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 2), "yyyy-MM-dd"));
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HICMOBillNo").val("");
                 $("#HSerorderBillNo").val("");

--
Gitblit v1.9.1