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 |  265 +++-------------------------------------------------
 1 files changed, 17 insertions(+), 248 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 1296dff..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,18 +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/soulTable.slim.js"></script>
     <script src="../../layuiadmin/HideButton_New.js"></script>
     <script src="../../layuiadmin/SetColumn.js"></script>
-    <script src="../../../layuiadmin/SetColumn.js"></script>
-    <script src="../../../layuiadmin/HideButton_New.js"></script>
     <style type="text/css">
         input.layui-input.layui-unselect {
             padding-right: 0;
@@ -52,14 +48,7 @@
                                         <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">
-                                        <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">
@@ -80,31 +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" style="padding: 0px; margin-left: 6%;">
-                                    <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="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>
+                                <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>
@@ -271,7 +236,7 @@
             var HBillType = "Sb_EquipMaintainPlanBillList";
             var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             var ins;                //鐢ㄤ簬瀵煎嚭excel
-            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["鍗曟嵁绫诲瀷","鎽樿","鍐呴儴鍗曟嵁鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var optionPage = [];
             var ins;                //鐢ㄤ簬瀵煎嚭excel
             var page = 1;//鍒嗛〉鏁版嵁
@@ -473,7 +438,8 @@
                 set_InitGrid1();
                 //鍒濆鍖栬〃鏍�(瀛愯〃2)
                 set_InitGrid2();
-              
+                //鏌ヨ
+                get_FastQuery();
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
             }
@@ -596,9 +562,8 @@
             //蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
-                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                var HBeginDate= $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val();
                 //浠绘剰瀛楁杩囨护
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
@@ -677,11 +642,11 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
-                if (BenginHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
                 }
-                if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
                 }
                 //get_Display(sWhere);
                 get_DisplayPage(sWhere);
@@ -692,8 +657,8 @@
             function set_ClearQuery() {
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
-                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#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");
@@ -800,6 +765,7 @@
                 $.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;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -869,84 +835,7 @@
                 });
             }
             //#endregion
-
-            //鍒嗛〉鏌ヨ
-            function get_DisplayPage(sWhere) {
-                var ajaxLoad = layer.load();
-                sWhere += addSWhereByOpenType();//娣诲姞鍗曟嵁妯″潡閫夋嫨鍩虹璧勬枡鏃剁殑杩囨护鏉′欢锛屽凡瀹℃牳鏈叧闂�
-                $.ajax({
-                    url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillListPage',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
-                    success: function (data1) {
-                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        optionPage.count = data1.count;
-                        if (data1.code == 1) {
-                            var data = [];
-                            var col = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {
-                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙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, []);
-                            ins = table.render(option);
-                            laypage.render(optionPage);
-
-                            layer.close(ajaxLoad);
-
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-
-                            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 });
-                    }
-                });
-            }
-
+       
             //鏂板
             function set_AddNew() {
                 //椤甸潰灞�-鑷畾涔�
@@ -1158,127 +1047,8 @@
             function set_Refresh() {
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
-                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#EndHCreateDate").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_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("");//鍗曟嵁绫诲瀷
-                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");
@@ -1291,8 +1061,7 @@
                 form.render('select');
                 sWhere = "";
                 $("#btnSearch").click();
-            }
-
+            }           
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';

--
Gitblit v1.9.1