From 6029d9cca9e132c4ba7a64cefe3db5eeaaecdf74 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 十一月 2025 09:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/仓存管理/装箱单/Sc_PackUnionBillMain_Packing.html |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
index c4ec7d2..0ad2055 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
@@ -401,8 +401,7 @@
                 $("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                 $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
                 //鏌ヨ
-                get_Display(" and 1= 0")
-                ColFilter()
+                get_FastQuery()
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
             }
@@ -614,12 +613,14 @@
                             laypage.render(optionPage);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
-                            // if ($("#ColName option").length < 1) {
-                            //     ColFilter();
-                            //     get_DefaultModule();//鍔犺浇鏂规
-                            // }
                             ins = table.render(option);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                // get_DefaultModule();//鍔犺浇鏂规
+                            }
                             Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
@@ -900,7 +901,7 @@
                 });
                 return Permission;
             }
-        //#endregion
+            //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
@@ -940,7 +941,7 @@
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
                             //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
+                            // get_FastQuery()
                             form.render("select");
                         }
                     }, error: function () {

--
Gitblit v1.9.1