MES-WEB-LayUI.git

parent: f2e1cd96 | 补丁 | 提交 | ignore whitespace

chenhaozhe

2025-08-06 2ac3779ad688800718970cc26dcc66d0b7bd2023

用户关联仓库 模块 添加 双击返回 多选返回
用户管理 模块 添加双击返回函数

3个文件已修改

	WebTM/WebTM.csproj.user	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/PublicPage/PeopleInformation.html	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/系统管理/用户管理/Gy_UserStock.html	90 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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 />

 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>

 WebTM/views/ÏµÍ³¹ÜÀí/ÓÃ»§¹ÜÀí/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çelem:"#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); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                            }
@@ -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>

			@@ -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 />

			@@ -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>

			@@ -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çelem:"#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); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -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>