From df3e719955cc93b4e762ac75fbb61737fbf3b7a8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 六月 2025 08:38:12 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html |  402 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 200 insertions(+), 202 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index 95653cd..98ff6b6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -9,10 +9,14 @@
     <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/soulTable.slim.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/PageTitle.js"></script>
-    <script src="../../../layuiadmin/SetColumn.js"></script>
-    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../layuiadmin/SetColumn.js"></script>
     <style type="text/css">
         input.layui-input.layui-unselect {
             padding-right: 0;
@@ -32,26 +36,10 @@
                                         <span>鏇村</span>
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
-                                    <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
-                                    <div class="layui-input-block">
-                                        <select name="HBillType" id="HBillType">
-                                            <option value="">鎵�鏈�</option>
-                                            <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
-                                            <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
-                                        </select>
-                                    </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>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">鍒跺崟浜�</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy" id="HCreateBy">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -60,7 +48,7 @@
                                         <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                         </select>
                                     </div>
-                                </div>
+                                </div>                                
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫椂闂�</label>
                                     <div class="layui-input-block">
@@ -81,12 +69,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">
-                                    <div class="layui-inline">
-                                        <div class="layui-inline">
-                                            <span>鍏朵粬鏉′欢></span>
-                                        </div>
-                                    </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">                                   
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
@@ -187,8 +170,11 @@
                                 </div>
                             </div>
                         </div>
+                        <div id="page" style="position: relative; bottom: 0;"></div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <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="Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
@@ -201,9 +187,11 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="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="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" 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" 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_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
@@ -218,12 +206,6 @@
             </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 src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -248,8 +230,13 @@
             var option = [];
             var option1 = [];
             var option2 = [];
+            var page = 1;//鍒嗛〉鏁版嵁
+            var size = 50;
             var HModName = "Sb_EquipMaintainPlanBillList";
-            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var HBillType = "Sb_EquipMaintainPlanBillList";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var titleData = ["鍗曟嵁绫诲瀷","鎽樿","鍐呴儴鍗曟嵁鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var optionPage = [];
             var ins;                //鐢ㄤ簬瀵煎嚭excel
             var page = 1;//鍒嗛〉鏁版嵁
@@ -288,6 +275,9 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鏂板鎸夐挳
                     case 'btn-Add':
                         set_AddNew();
@@ -389,10 +379,20 @@
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery();
+                }
             });
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery();
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery();
+                }
             })
             //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
             form.on('select(HInitTimeCycle)', function (data) {
@@ -439,7 +439,7 @@
                 //鍒濆鍖栬〃鏍�(瀛愯〃2)
                 set_InitGrid2();
                 //鏌ヨ
-                //get_Display(sWhere);
+                get_FastQuery();
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
             }
@@ -457,38 +457,23 @@
                     , done: function (res, curr, count) {
                         soulTable.render(this);
                     }
-                    , cols: [[
-                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                        , { field: 'hmainid', title: 'hmainid', hide: true, sort: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true, sort: true }
-                        , { field: 'HEquipID', title: '璁惧ID', width: 160, hide: true, sort: true }
-                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200, sort: true }
-                        , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, sort: true }
-                        , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200, sort: true }
-                        , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200, sort: true }
-                        , { field: '鎽樿', title: '鎽樿', width: 200, sort: true }
-                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200, sort: true }
-                        , { field: '澶囨敞', title: '澶囨敞', width: 200, sort: true }
-                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, sort: true }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200, sort: true }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, sort: true }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200, sort: true }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true, sort: true }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true, sort: true }
-                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true, sort: true }
-                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true, sort: true }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200, sort: true }
-                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200, sort: true }
-                        , { field: 'hbilltype', title: 'hbilltype', width: 200, sort: true }
-                    ]]
+                };
+                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();
+                        }
+                    }
                 }
 
                 optionPage = {
@@ -574,11 +559,125 @@
                 layer.close(ajaxLoad);
             }
 
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HBeginDate= $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val();
+                //浠绘剰瀛楁杩囨护
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+                }
+                //get_Display(sWhere);
+                get_DisplayPage(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+                $("#btnSearch").click();
+            }
+
+
             //鍔犺浇鏁版嵁鍒扮綉鏍�
             function get_Display(sWhere) {
                 var index = layer.load(0);
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
                     type: "GET",
                     async: false,
@@ -636,18 +735,19 @@
                                 , done: function (res, curr, count) {
                                     soulTable.render(this);
                                 }
-                            }
-                            table.render(option);
+                            }                      
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
 
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            //DisPlay_HideColumn();
-
+                            ins = table.render(option);
                             //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "3902";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             layer.close(index);
+
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -659,18 +759,18 @@
                 });
             }
 
-            //鍒嗛〉鏌ヨ
+            //#region 鍒嗛〉鏌ヨ
             function get_DisplayPage(sWhere) {
                 var ajaxLoad = layer.load();
-                sWhere += addSWhereByOpenType();//娣诲姞鍗曟嵁妯″潡閫夋嫨鍩虹璧勬枡鏃剁殑杩囨护鏉′欢锛屽凡瀹℃牳鏈叧闂�
                 $.ajax({
                     url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillListPage',
                     type: "GET",
+                    async: false,
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                     success: function (data1) {
                         option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        optionPage.count = data1.count;
                         if (data1.code == 1) {
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             var data = [];
                             var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
@@ -684,47 +784,46 @@
                                 }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            col.push({ type: 'checkbox', fixed: 'left' });
                             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 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: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            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 });
                                             break;
-                                        case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
-                                            break;
+                                        case 'long':
                                         case 'Int32':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                             break;
                                         default:
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                     }
                                 }
                             }
-
-                            columns = col;
                             option.cols = [col];
                             option.data = data1.data;
                             option.totalRow = true;
-                            //鍒楄缃�
-                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
                             ins = table.render(option);
                             laypage.render(optionPage);
-
-                            layer.close(ajaxLoad);
 
                             //鍒锋柊鎸夐挳鏄剧ず
                             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 });
@@ -735,7 +834,8 @@
                     }
                 });
             }
-
+            //#endregion
+       
             //鏂板
             function set_AddNew() {
                 //椤甸潰灞�-鑷畾涔�
@@ -817,6 +917,7 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             }
+
             //缂栬緫
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -927,6 +1028,7 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
+
             //鎵撳嵃
             function get_PrintReport() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -940,116 +1042,13 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
+
             //鍒锋柊
             function set_Refresh() {
-                $("#btnSearch").click();
-            }
-            //蹇�熻繃婊�
-            function get_FastQuery(table, option) {
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                var HBeginDate = $("#HBeginDate").val();//寮�濮嬪埗鍗曟椂闂�
-                var HEndDate = $("#HEndDate").val();//缁撴潫鍒跺崟鏃堕棿
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").val();
-                var ColName1 = $("#ColName1").val();//澶嶉�夋
-                var Comparator1 = $("#Comparator1").val()
-                var ColContent1 = $("#ColContent1").val();
-                var ColName2 = $("#ColName2").val();//澶嶉�夋
-                var Comparator2 = $("#Comparator2").val()
-                var ColContent2 = $("#ColContent2").val();
-
-                if (ColName != 0 && Comparator != 0) {
-                    var com = "";
-                    switch (Comparator) {
-                        case "7":
-                            com = "like'%" + ColContent + "%'";
-                            break;
-                        case "8":
-                            com = "like'%" + ColContent + "'";
-                            break;
-                        case "9":
-                            com = "like'" + ColContent + "%'";
-                            break;
-                        case "10":
-                            com = "not like'%" + ColContent + "%'";
-                            break;
-                        default:
-                            com = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName + " " + com;
-                }
-                if (ColName1 != 0 && Comparator1 != 0) {
-                    var com1 = "";
-                    switch (Comparator1) {
-                        case "7":
-                            com1 = "like'%" + ColContent1 + "%'";
-                            break;
-                        case "8":
-                            com1 = "like'%" + ColContent1 + "'";
-                            break;
-                        case "9":
-                            com1 = "like'" + ColContent1 + "%'";
-                            break;
-                        case "10":
-                            com1 = "not like'%" + ColContent1 + "%'";
-                            break;
-                        default:
-                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName1 + " " + com1;
-                }
-                if (ColName2 != 0 && Comparator2 != 0) {
-                    var com2 = "";
-                    switch (Comparator2) {
-                        case "7":
-                            com2 = "like'%" + ColContent2 + "%'";
-                            break;
-                        case "8":
-                            com2 = "like'%" + ColContent2 + "'";
-                            break;
-                        case "9":
-                            com2 = "like'" + ColContent2 + "%'";
-                            break;
-                        case "10":
-                            com2 = "not like'%" + ColContent2 + "%'";
-                            break;
-                        default:
-                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName2 + " " + com2;
-                }
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                if (HCreateBy) {
-                    sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
-                }
-                if (HBeginDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
-                }
-                if (HEndDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
-                }
-                get_DisplayPage(sWhere);
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            }
-            //閲嶇疆杩囨护鏉′欢鏂规硶
-            function set_ClearQuery() {
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
+                $("#HBillNo").val("");//鍗曟嵁鍙�
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
-                $("#HBillNo").val("");//鍗曟嵁鍙�
-                $("#HSourceBillNo").val("");//婧愬崟鍙�
-                $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#HBeginDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                $("#HEndDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
@@ -1062,8 +1061,7 @@
                 form.render('select');
                 sWhere = "";
                 $("#btnSearch").click();
-            }
-
+            }           
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';

--
Gitblit v1.9.1