From 7b156987df2fba8f47e38b89de4a23c35c913cf4 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 16 八月 2021 13:31:36 +0800
Subject: [PATCH] 合并
---
WebTM/views/PublicPage/UnitInformation.html | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/WebTM/views/PublicPage/UnitInformation.html b/WebTM/views/PublicPage/UnitInformation.html
index e45ee86..204f90c 100644
--- a/WebTM/views/PublicPage/UnitInformation.html
+++ b/WebTM/views/PublicPage/UnitInformation.html
@@ -87,7 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = "";
+ var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
tree.render({
elem: '#treeUnit',
@@ -156,7 +157,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UnitList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -175,18 +176,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UnitList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -199,7 +193,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +237,17 @@
return treeData;
}
-
+ function SeachFilter(sWhere1) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere1 += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere1 += " and HName like '%" + HName + "%'";
+ }
+ return sWhere1;
+ }
</script>
</body>
--
Gitblit v1.9.1