From a2574099d74dbc873b9a8316500bdd79da516e68 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 15 七月 2024 10:07:44 +0800
Subject: [PATCH] 1

---
 WebTM/views/模治具管理/上模单/Sc_MouldUpperBillList.html |  119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 116 insertions(+), 3 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
index 46559ad..7dcf7e0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
@@ -82,6 +82,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>
@@ -267,6 +321,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) {
@@ -287,6 +348,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 (HBillNo) {
@@ -349,7 +452,7 @@
                             , data: data1.data
                             , height: 'full-110'
                             , page: true
-                            , limits: [50, 500, 5000, 50000]
+                            , limits: [50, 500, 5000, 20000]
                             , limit: 50
                             , cellMinWidth: 90
                         }
@@ -596,6 +699,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 = "";
             get_FastQuery();
@@ -988,7 +1097,7 @@
             })
         }
 
-        //鍒楁槑鏄剧ず涓嬫媺妗�
+        //#region 鍒楁槑鏄剧ず涓嬫媺妗�
         function ColFilter() {
             var Organization = '<option  value="0" selected="selected" ></option>';
             for (var i = 1; i < option.cols[0].length; i++) {
@@ -998,10 +1107,14 @@
             }
             $("#ColName").empty();
             $("#ColName").append(Organization);
+            $("#ColName1").empty();
+            $("#ColName1").append(Organization);
+            $("#ColName2").empty();
+            $("#ColName2").append(Organization);
             form.render('select');
         }
+            //#endregion
 
-        //#endregion
         //浠ヤ笂鏄痩ayui妯″潡
     });
     function GetDataCol(data) {

--
Gitblit v1.9.1