From cb2fc709d4e2aec6bbea3e6f4e8ccc24f3d27756 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期日, 06 十月 2024 17:27:08 +0800
Subject: [PATCH] 工艺路线工价

---
 WebTM/views/设备管理/设备投产检验验收单/Sb_EquipWorkBeforeCheckBillList.html |  169 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 146 insertions(+), 23 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247\346\243\200\351\252\214\351\252\214\346\224\266\345\215\225/Sb_EquipWorkBeforeCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247\346\243\200\351\252\214\351\252\214\346\224\266\345\215\225/Sb_EquipWorkBeforeCheckBillList.html"
index 2022095..3d416f1 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247\346\243\200\351\252\214\351\252\214\346\224\266\345\215\225/Sb_EquipWorkBeforeCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247\346\243\200\351\252\214\351\252\214\346\224\266\345\215\225/Sb_EquipWorkBeforeCheckBillList.html"
@@ -31,30 +31,86 @@
                                         <span>鏇村</span>
                                     </div>
                                 </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">杩囨护</label>
-                                    <div class="layui-input-block">
-                                        <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                <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" lay-filter="ColName" style="width:190px;">
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <select name="Comparator" id="Comparator" 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 class="layui-inline">
+                                        <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                    </div>
                                 </div>
-                                <div class="layui-inline">
-                                    <select name="Comparator" id="Comparator" 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 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-inline">
-                                    <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                <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>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -219,7 +275,7 @@
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
+                            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鍒�
@@ -230,6 +286,13 @@
                                         case 'DateTime':
                                             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 'long':
+                                        case 'Int32':
+                                        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: true, width: 200 });
                                     }
@@ -244,6 +307,7 @@
                                 , data: data1.data
                                 , height:800
                                 , page: true
+                                , totalRow: true
                                 , cellMinWidth: 90
                                 , limit: 50
                                 , limits: [50, 500, 5000, 20000]
@@ -440,6 +504,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) {
@@ -461,7 +532,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;
+                }
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
@@ -472,6 +584,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');
                 $("#btnSearch").click();
                 sWhere = "";
@@ -590,7 +708,8 @@
                 })
             }
 
-            //鍒楁槑鏄剧ず涓嬫媺妗�
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -600,6 +719,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion

--
Gitblit v1.9.1