From 7a0ae6ead96c7c68f949cf1f2b6bfaec7f301e6a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 02 四月 2025 10:03:47 +0800
Subject: [PATCH] 合并
---
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 13 ++++++++-----
1 files changed, 8 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_Unit.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_Unit.html"
index fe8889f..cba7ddc 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_Unit.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_Unit.html"
@@ -133,7 +133,7 @@
var Organization = sessionStorage["Organization"]
var HModName = "Gy_Unit";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID","hparentid"];
+ var titleData = ["HItemID","HParentID"];
var ins; //鐢ㄤ簬瀵煎嚭excel
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -183,7 +183,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery()
//杩囨护鏂规鏌ヨ
get_DefaultModule();
}
@@ -813,9 +813,12 @@
var addSWhere = "";
- if (openType != undefined && HOrgName != "undefined") {
- addSWhere = " and 绂佺敤鏍囪 = '' ";
- Organization = HOrgName.toString();
+ if (typeof (openType) != "undefined") {
+ addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜�!='' ";
+ if (HOrgName != "undefined") {
+ Organization = HOrgName.toString();
+ }
+
}
return addSWhere;
}
--
Gitblit v1.9.1