From 9a14ff05099ed85dcd2113eaba097a51a7c0bca9 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 18 七月 2024 16:32:26 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/Sb_EqpConkBookBillList.html |  141 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 133 insertions(+), 8 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
index a077065..044f718 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
@@ -10,7 +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/soulTable.slim.js"></script>
+    <script src="../../layuiadmin/PageTitle.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -116,6 +117,60 @@
                                             <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>
@@ -170,6 +225,15 @@
             var HModName = "Sb_EqpConkBookBillList";
             var option = [];
             var col = [];
+
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3907";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+        //#endregion
+
+
             var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "HEquipID", "HConkTypeID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkReasonID", "HManagerID1", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var index = layer.load(0);
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -266,7 +330,7 @@
                         layer.open({
                             type: 2,
                             skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板璁惧鏁呴殰鐧昏鍗�',
+                            title: '鏂板' + HPageTitle,
                             closeBtn: 1,
                             shift: 2,
                             area: ['100%', '100%'],
@@ -290,7 +354,7 @@
                             layer.open({
                                 type: 2
                                 , area: ['100%', '100%']
-                                , title: '缂栬緫璁惧鏁呴殰鐧昏鍗�'
+                                , title: '缂栬緫' + HPageTitle
                                 , closeBtn: 1
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -407,7 +471,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                get_Display(sWhere);
+                //get_Display(sWhere);
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
             }
@@ -460,7 +524,7 @@
                                 , toolbar: '#toolbarDemo'
                                 , cols: [col]
                                 , data: data1.data
-                                , height: 550
+                                , height: 780
                                 , page: true
                                 , totalRow: true
                                 , cellMinWidth: 90
@@ -505,6 +569,12 @@
                 $("#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 = "";
             });
@@ -528,6 +598,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) {
@@ -548,6 +625,48 @@
                             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 = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
                 }
                 if (HDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
@@ -578,7 +697,7 @@
                             data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
-                                    //get_FastQuery();
+                                    get_FastQuery();
                                     layer.msg(result.Message, { icon: 1 });
                                     layer.close(wait);
                                 } else {
@@ -611,6 +730,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 {
@@ -748,7 +868,8 @@
                 })
             }
 
-            //鍒楁槑鏄剧ず涓嬫媺妗�
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -758,9 +879,13 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
-
+            //#endregion
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�

--
Gitblit v1.9.1