From 89ed2434ea3882acfc5b9e095ce3ea1ba1b706a1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 28 二月 2024 17:18:25 +0800
Subject: [PATCH] 高级过滤优化 销售订单 高级过滤 物料高级过滤 生产订单高级过滤 生产订单、生产订单变更单、开班单、停工挂起单、结班单,生产汇报单、产量汇报单,工序流转卡、工序进站接收单、工序出站汇报单、工序流转卡派工单、工序返工记录单、工序返工申请单 工序委外派工单、工序委外接收单、工序委外发出单

---
 WebTM/views/基础资料/公用基础资料/Gy_Material.html |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index 3f93dcf..026bb5e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -9,11 +9,11 @@
     <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/layui/layui.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/layui/layui1.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
     <style>
         /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
         .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
@@ -127,7 +127,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_QueryCondition"><i class="layui-icon layuiiconform"></i>楂樼骇杩囨护</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>楂樼骇杩囨护</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><iclass="layuiiconlayuiicon-circle"></i>棰勮</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
@@ -843,7 +843,7 @@
                 var colName = "";
                 var contentUrl = "";
                 for (var i = 0; i < option.cols[0].length; i++) {
-                    if (option.cols[0][i]["field"] != undefined) {
+                    if (option.cols[0][i]["field"] != undefined && option.cols[0][i]["hide"] != true) {
                         colName += option.cols[0][i]["title"] + ",";
                     }
                 }
@@ -854,9 +854,9 @@
                 }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
 
-                HModName = "h_v_Gy_MaterialList";//绛変簬璇ュ垪琛ㄧ殑瑙嗗浘
+               var HModBillName = "h_v_Gy_MaterialList";//绛変簬璇ュ垪琛ㄧ殑瑙嗗浘
 
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_QueryCondition.html?HModName=' + HModName + '&colName=' + colName;
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_QueryCondition.html?HModName=' + HModBillName + '&colName=' + colName;
 
                 layer.open({
                     type: 2
@@ -875,9 +875,14 @@
                             return layer.msg("璇疯緭鍏ヨ繃婊ゆ潯浠�!");
                         }
                         var myIframe = window[laero.find('iframe')[0]['name']];
+                        GetDataCols += "and (";
                         for (var i = 0; i < checkStatus.length; i++) {
                             GetDataCols += myIframe.get_FastQuery(checkStatus[i]); //get_FastQuery()涓哄瓙椤甸潰鐨勬柟娉�
+                            if ((i + 1) < checkStatus.length) {
+                                GetDataCols += " " + checkStatus[i]["HRelationCol"] + " ";
+                            }
                         }
+                        GetDataCols += ")";
                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                         layer.close(index);//鍏抽棴寮圭獥
                     }

--
Gitblit v1.9.1