From c1e11c81658c786bb46154d73f331ae6b4a416ef Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 26 八月 2021 17:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/PublicPage/UserInformation.html | 116 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 66 insertions(+), 50 deletions(-)
diff --git a/WebTM/views/PublicPage/UserInformation.html b/WebTM/views/PublicPage/UserInformation.html
index 5d472fb..9a0753e 100644
--- a/WebTM/views/PublicPage/UserInformation.html
+++ b/WebTM/views/PublicPage/UserInformation.html
@@ -30,10 +30,10 @@
<div class="layui-colla-item">
<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
<div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+ <div class="layui-col-xs3 layui-inline" style="width: 23%; display:none;">
<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" style="width: 74%;">
+ <div class="layui-col-xs12 layui-inline">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">浠ｇ爜</label>
@@ -67,7 +67,16 @@
<script src="../../layuiadmin/layui/zgqlayui.js"></script>
<script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../layuiadmin/PubCustom.js"></script>
<script>
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var TreeFlag = true;//鎿嶄綔绫诲瀷
+ } else {
+ var TreeFlag = params[params[0]];//鎿嶄綔绫诲瀷
+ }
+
var treeCkData = { id: 0 };
var TagId = "";
var TagParentId = "";
@@ -89,52 +98,60 @@
, tree = layui.tree
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',
- data: getData(sWhere),
- showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- id: 'demoId',
- isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
- showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
- onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉
- click: function (obj) {
- //鐐瑰嚮楂樺厜
- if (obj.data.id !== treeCkData.id) {
- $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = obj.data;
- TagId = obj.data.id;
- TagParentId = obj.data.ParentID;
- }
- else {
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = { id: 0 };
- TagId = "";
- TagParentId = "";
- }
+ if (TreeFlag == "false")
+ {
+ //$(".layui-col-xs3").css("display", "none"); //闅愯棌鏍戝瀷
+ //$(".layui-col-xs9").css("width", "100%"); //璁剧疆瀹藉害
+ }
+ else
+ {
+ //tree.render({
+ // elem: '#treeUser',
+ // data: getData(sWhere),
+ // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
+ // id: 'demoId',
+ // isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+ // showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+ // onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉
+ // click: function (obj) {
+ // //鐐瑰嚮楂樺厜
+ // if (obj.data.id !== treeCkData.id) {
+ // $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+ // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+ // treeCkData = obj.data;
+ // TagId = obj.data.id;
+ // TagParentId = obj.data.ParentID;
+ // }
+ // else {
+ // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+ // treeCkData = { id: 0 };
+ // TagId = "";
+ // TagParentId = "";
+ // }
- $.ajax({
- url: GetWEBURL() + '/Gy_MaintenanceMode/UserCX',
- type: "GET",
- data: { "HInterID": obj.data.id },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- });
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_MaintenanceMode/UserCX',
+ // type: "GET",
+ // data: { "HInterID": obj.data.id },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.close(index);
+ // } else {
+ // layer.close(index);
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(index);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ // }
+ //});
+ }
+
var option = {
@@ -176,7 +193,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
-
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UserList',
type: "GET",
@@ -185,7 +202,7 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ /*layer.alert("鏌ヨ鎴愬姛", { icon: 1 });*/
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -237,8 +254,7 @@
return treeData;
}
- function SeachFilter(sWhere1)
- {
+ function SeachFilter(sWhere1) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
sWhere1 = " where 1=1 ";
--
Gitblit v1.9.1