From 65968b3e0e9e03ef0904de35b78872224b9ce00a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 23 九月 2025 14:15:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/验收入库/委外入库/Kf_EntrustInBillList.html |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
index eba2abd..5b6cf92 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
@@ -148,9 +148,9 @@
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
                                                 <option value="<=">
-                                                    <=< /option>
+                                                    <= </option>
                                                 <option value="<">
-                                                    << /option>
+                                                    < </option>
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -183,9 +183,9 @@
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
                                                 <option value="<=">
-                                                    <=< /option>
+                                                    <= </option>
                                                 <option value="<">
-                                                    << /option>
+                                                    < </option>
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -218,9 +218,9 @@
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
                                                 <option value="<=">
-                                                    <=< /option>
+                                                    <= </option>
                                                 <option value="<">
-                                                    << /option>
+                                                    < </option>
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -470,10 +470,10 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                // get_Display(sWhere);
+                get_FastQuery()
 
                 //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
-                ColFilter();
+                // ColFilter();
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
@@ -568,13 +568,18 @@
                             }
 
                             option.data = data1.data;
+                            DisPlay_HideColumn()
                             table.render(option);
-                            layer.close(index);
 
+                            if($("#ColName option").length < 1){
+                                ColFilter()
+                            }
+                            
                             //鍒锋柊鎸夐挳鏄剧ず
-                            // var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            // var HBillType = "1210";
-                            // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "1210";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                            layer.close(index);
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1246,7 +1251,7 @@
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
                             ////鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
+                            // get_FastQuery()
                             form.render("select");
                         }
                     }, error: function () {

--
Gitblit v1.9.1