From 2ac3779ad688800718970cc26dcc66d0b7bd2023 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 06 八月 2025 09:10:32 +0800
Subject: [PATCH] 用户关联仓库 模块 添加 双击返回 多选返回 用户管理 模块 添加双击返回函数
---
WebTM/WebTM.csproj.user | 4
WebTM/views/系统管理/用户管理/Gy_UserStock.html | 90 ++++++++++++++++++++++++-----
WebTM/views/PublicPage/PeopleInformation.html | 30 ++++++++--
3 files changed, 100 insertions(+), 24 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 3c987b4..8cc4879 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/views/PublicPage/PeopleInformation.html b/WebTM/views/PublicPage/PeopleInformation.html
index 6288432..50063da 100644
--- a/WebTM/views/PublicPage/PeopleInformation.html
+++ b/WebTM/views/PublicPage/PeopleInformation.html
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>閫夋嫨鐢ㄦ埛璧勬枡</title>
@@ -20,6 +21,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -31,14 +33,16 @@
<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%; display:none;">
- <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+ <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box"
+ style="height: 580px; overflow: scroll;"></div>
</div>
<div class="layui-col-xs12 layui-inline">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input" name="HNumber"
+ id="HNumber">
</div>
</div>
<div class="layui-inline">
@@ -47,7 +51,8 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button"
+ lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -97,8 +102,8 @@
, util = layui.util
, tree = layui.tree
var sWhere1 = "where 1=1"; //鍒楄〃
-
-
+
+
var option = {
@@ -135,7 +140,19 @@
}
});
+ //
+ table.on('rowDouble(mainTable)', function (obj) {
+ if (window.parent == window) {
+ return
+ }
+ var data = [];
+ data.push(obj.data);
+ parent.GetPeopleInFormationValue(data)
+ var index = parent.layer.getFrameIndex(window.name);
+
+ parent.layer.close(index);
+ })
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
@@ -215,4 +232,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserStock.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserStock.html"
index 0bf98ba..efd6dad 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserStock.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserStock.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鐢ㄦ埛鍏宠仈浠撳簱</title>
@@ -11,8 +12,8 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style type="text/css">
-
/*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -31,6 +32,7 @@
}
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
@@ -39,8 +41,10 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
</div>
</div>
<div class="layui-card-body">
@@ -51,10 +55,14 @@
<div class="layui-inline">
<label class="layui-form-label">鐢ㄦ埛</label>
<div class="layui-input-inline">
- <input type="text" name="UserName" id="UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="UserID" id="UserID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" id="button_Edit" class="layui-btn" lay-filter="UserList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="UserName" id="UserName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="UserID" id="UserID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" id="button_Edit"
+ class="layui-btn" lay-filter="UserList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -80,11 +88,13 @@
</div>
</div>
</body>
+
</html>
<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script>
+ var optionData = []
//鑾峰彇鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -178,7 +188,7 @@
});
})
- //#endregion
+ //#endregion
//鐢ㄦ埛淇℃伅寮圭獥
form.on('submit(UserList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -241,20 +251,44 @@
content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
-
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
+ } else if (checkStatus.data.length === 1) {
+ //console.log(obj.data);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HItemID: checkStatus.data[0].HItemID,
+ HNumber: checkStatus.data[0].浠撳簱浠ｇ爜,
+ HName: checkStatus.data[0].浠撳簱鍚嶇О
+ });
+
+ } else {
+ // 澶氶�夎繑鍥�
+ let tableBak = table.cache['mainTable']
+ let tempArr = []
+ console.log(tableBak)
+ for (let tableOne of tableBak) {
+ if (isEmpty(tableOne.HItemID, true, true) === false) {
+ tempArr.push(tableOne)
+ }
+ }
+ for (let checkOne of checkStatus.data) {
+ if (tempArr.findIndex(e => e.HItemID == checkOne.HItemID) == -1) {
+ tempArr.push({
+ "HItemID": checkOne.HItemID
+ , "HNumber": checkOne.浠撳簱浠ｇ爜
+ , "HName": checkOne.浠撳簱鍚嶇О
+ })
+ }
+ }
+
+ table.reload('mainTable', {
+ data: tempArr
+ })
}
- //console.log(obj.data);
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HItemID: checkStatus.data[0].HItemID,
- HNumber: checkStatus.data[0].浠撳簱浠ｇ爜,
- HName: checkStatus.data[0].浠撳簱鍚嶇О
- });
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -263,7 +297,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (isEmpty(optionData) === false) {
+ obj.update({
+ HItemID: optionData[0].HItemID,
+ HNumber: optionData[0].浠撳簱浠ｇ爜,
+ HName: optionData[0].浠撳簱鍚嶇О
+ });
+ optionData = []
+ }
}
});
}
@@ -417,6 +459,7 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
+ console.log("NewRow: ", NewRow)
var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
buttonArr = [];//娓呯┖鏁扮粍
@@ -490,4 +533,19 @@
}
});
+
+ //#region 鍙屽嚮鍥炶皟鍑芥暟
+ // 浠撳簱
+ function GetHWHValue(data) {
+ optionData = data
+ }
+
+ // 鐢ㄦ埛
+ function GetPeopleInFormationValue(data) {
+ console.log("userData: ", data)
+ $("#UserName").val(data[0]['HName'])
+ $("#UserID").val(data[0]['HNumber'])
+ }
+
+ //#endregion
</script>
\ No newline at end of file
--
Gitblit v1.9.1