From e8aa5b7991595f8b5bdb3e862cfa668cf96fa0ff Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 25 十一月 2024 17:34:26 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/Sb_EquipMaintainBillList.html |  320 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 266 insertions(+), 54 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index 8c5f95e..af85918 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -10,8 +10,8 @@
     <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
     <script src="../../layuiadmin/layui/layui.js"></script>
     <script src="../../layuiadmin/HideButton.js"></script>
-    <script src="../../../layuiadmin/soulTable.slim.js"></script>
-    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../layuiadmin/PageTitle.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -33,15 +33,15 @@
                                     </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>-->
+                <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">
@@ -70,7 +70,7 @@
                                     <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>
@@ -109,11 +109,66 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                         </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="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" 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" 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>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" 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" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
 
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div id="page" style="position: relative; bottom: 0;"></div>
                         <div class="layui-tab layui-tab-card">
                             <ul class="layui-tab-title">
                                 <li class="layui-this">淇濆吇椤逛俊鎭�</li>
@@ -189,6 +244,8 @@
 
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var page = 1;//鍒嗛〉鏁版嵁
+            var size = 50;
             var option = [];
             var option1 = [];
             var option2 = [];
@@ -200,7 +257,7 @@
             var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
         //#endregion
 
-            var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "琛ㄥご澶囨敞", "閰嶄欢浠g爜", "hsubid", "琛屽叧闂汉", "琛ㄤ綋澶囨敞", "鍒跺崟浜�", "淇敼浜�", "浣滃簾鏃ユ湡", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HEquipID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鍗曚綅ID", "璐熻矗浜篒D", "HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "琛ㄥご澶囨敞", "閰嶄欢浠g爜", "hsubid", "琛屽叧闂汉", "琛ㄤ綋澶囨敞", "鍒跺崟浜�", "淇敼浜�", "浣滃簾鏃ユ湡", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HEquipID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鍗曚綅ID", "璐熻矗浜篒D", "HBillType", "sorderid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //杩囨护鏉′欢鐨刢lass绫� 
@@ -286,36 +343,18 @@
                 };
             });
 
-            //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
-            table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
-                var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
-                var linterid = datas.hmainid;
-                $.ajax({
-                    url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
-                    type: "GET",
-                    data: { "HInterID": linterid },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option1.data = data1.list[0];
-                            table1.render(option1);
-                            option2.data = data1.list[1];
-                            table2.render(option2);
-                        } else {
-                            layer.alert("鑾峰彇澶辫触", { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                    }
-                });
-            });
-
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
             });
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option);
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery(table, option);
+                }
+                
             });
 
 
@@ -331,7 +370,7 @@
                 //鍒濆鍖栬〃鏍�(瀛愯〃2)
                 set_InitGrid2();
                 //鏌ヨ
-                get_Display(sWhere);
+                //get_Display(sWhere);
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
             }
@@ -341,13 +380,13 @@
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , height: '400'
-                    , page: true
+                    , page: false
                     , totalRow: true
                     , cellMinWidth: 90
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
                     , cols: [[
-                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
                         , { field: 'hmainid', title: 'hmainid', hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
@@ -363,33 +402,51 @@
                         , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 115, hide: true }
                         , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
                         , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
-                        , { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 200, totalRow: true}
-                        , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 , totalRow: true}
+                        , { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 200, totalRow: true }
+                        , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200, totalRow: true }
                         , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
                         , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                         , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 , totalRow: true}
-                        , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200, totalRow: true}
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200, totalRow: true }
+                        , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200, totalRow: true }
                         , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
                         , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
                         , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>", hide: true }
                         , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
                         , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
                         , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
                         , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
                         , { field: 'hbilltype', title: 'hbilltype', width: 200 }
                     ]]
+                };
+                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);
             }
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -408,6 +465,26 @@
                 layui.each(table.cache.mainTable, function (i, l) {
                     if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                         l.LAY_CHECKED = flag;
+                    }
+                });
+
+                var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+                var linterid = datas.hmainid;
+                $.ajax({
+                    url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option1.data = data1.list[0];
+                            table1.render(option1);
+                            option2.data = data1.list[1];
+                            table2.render(option2);
+                        } else {
+                            layer.alert("鑾峰彇澶辫触", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                     }
                 });
             })
@@ -438,10 +515,10 @@
                         , { field: 'HManagerName', title: '璐熻矗浜�', width: 200 }
                         , { field: 'HRemark', title: '澶囨敞', width: 200 }
                     ]]
-                };
+                };                               
                 option1.data = [];
                 table1.render(option1);
-                layer.close(ajaxLoad);
+                layer.close(ajaxLoad);              
             }
             //鍒濆鍖栬〃鏍�(瀛愯〃2)
             function set_InitGrid2() {
@@ -566,6 +643,78 @@
                     }
                 })
             }
+
+            //#region 鍒嗛〉鏌ヨ
+            function get_DisplayPage(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage',
+                    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;
+                            laypage.render(optionPage);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
 
 
             var index = layer.load(0);
@@ -702,6 +851,7 @@
                             data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
+                                    get_FastQuery();
                                     layer.msg(result.Message, { icon: 1 });
                                     layer.close(wait);
                                 } else {
@@ -761,6 +911,13 @@
                 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) {
@@ -782,6 +939,48 @@
                     }
                     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 = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
@@ -794,7 +993,9 @@
                 if (EndHCreateDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
                 }
-                get_Display(sWhere);
+                //get_Display(sWhere);
+                //鏁版嵁搴撳垎椤�
+                get_DisplayPage(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
             //閲嶇疆杩囨护鏉′欢
@@ -808,12 +1009,18 @@
                 $("#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();
             }
 
-            //鍒楁槑鏄剧ず涓嬫媺妗�
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -823,8 +1030,13 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
+            //#endregion
 
             //闅愯棌鍒楄缃�
             function get_HideColumn() {

--
Gitblit v1.9.1