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/UserInformation.html | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/WebTM/views/PublicPage/UserInformation.html b/WebTM/views/PublicPage/UserInformation.html
index 3d7704b..5d472fb 100644
--- a/WebTM/views/PublicPage/UserInformation.html
+++ b/WebTM/views/PublicPage/UserInformation.html
@@ -33,7 +33,7 @@
<div class="layui-col-xs3 layui-inline" style="width: 23%;">
<div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
</div>
- <div class="layui-col-xs9 layui-inline">
+ <div class="layui-col-xs9 layui-inline" style="width: 74%;">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">浠ｇ爜</label>
@@ -87,7 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = " where HStopFlag=0 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";
+ 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: '#treeUser',
@@ -156,7 +157,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UserList',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -179,7 +180,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UserList',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -192,7 +193,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
@@ -205,7 +206,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaintenanceMode/UserLoadTree',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": sWhere },
async: false,
success: function (result) {
var data = result.data;
@@ -236,17 +237,18 @@
return treeData;
}
- function SeachFilter(sWhere)
+ function SeachFilter(sWhere1)
{
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ sWhere1 = " where 1=1 ";
if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
+ sWhere1 += " and HNumber like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
+ sWhere1 += " and HName like '%" + HName + "%'";
}
- return sWhere;
+ return sWhere1;
}
</script>
--
Gitblit v1.9.1