From 3b434cdc16b71dbc981b364d41a7337fa3f4d43c Mon Sep 17 00:00:00 2001 From: zhaowc <526854230@qq.com> Date: 星期六, 23 八月 2025 13:10:41 +0800 Subject: [PATCH] 新增页面用户名显示 --- HTML/views/BaseSetting/Materials.html | 93 ++++++++++++----------- HTML/views/HouseWithinSetting/HopperTransport.html | 2 Wms/Wms/appsettings.json | 6 HTML/views/index.html | 27 ++++++ HTML/views/WareHouseSetting/LocateFrom.html | 8 +- Wms/WMS.IDAL/ISysInterface/IUserInforRepository.cs | 6 + HTML/views/BaseSetting/MaterialsForm.html | 29 +++---- Wms/WMS.DAL/SysInfrastructure/UserInforRepository.cs | 12 +++ Wms/Wms/Controllers/BasisController.cs | 23 +++++ HTML/views/WareHouseSetting/Locate.html | 8 +- 10 files changed, 136 insertions(+), 78 deletions(-) diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html index a28aba1..e1988fe 100644 --- a/HTML/views/BaseSetting/Materials.html +++ b/HTML/views/BaseSetting/Materials.html @@ -36,8 +36,9 @@ <input type="text" id="SkuName" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off" class="layui-input"> </div> </div> - <div class="layui-inline"> - <!-- 瀹℃牳鐘舵�� --> + <!-- 瀹℃牳鐘舵�� --> + <!-- <div class="layui-inline"> + <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">瀹℃牳鐘舵��</label> <div class="layui-input-inline"> @@ -48,9 +49,10 @@ </select> </div> </div> - </div> - <div class="layui-inline"> - <!-- 绫诲瀷 --> + </div> --> + <!-- 绫诲瀷 --> + <!-- <div class="layui-inline"> + <label class="layui-form-label" style="width: 60px;">绫诲瀷</label> <div class="layui-input-inline"> <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search> @@ -62,9 +64,9 @@ <option value="4">涓棿鍝�</option> </select> </div> - </div> + </div> --> <!-- 鏄惁鍙楁帶 --> - <div class="layui-inline"> + <!-- <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">鏄惁鍙楁帶</label> <div class="layui-input-inline"> <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search> @@ -73,9 +75,9 @@ <option value="1">闈炲彈鎺�</option> </select> </div> - </div> + </div> --> <!-- 鏄惁鍏嶆 --> - <div class="layui-inline"> + <!-- <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">鏄惁鍏嶆</label> <div class="layui-input-inline"> <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search> @@ -84,21 +86,22 @@ <option value="1">鏄�</option> </select> </div> - </div> + </div> --> <!-- 瀛樺偍鐜 --> - <div class="layui-inline"> + <!-- <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">瀛樺偍鐜</label> <div class="layui-input-inline"> <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search> <option value=""></option> <option value="0">甯告俯</option> <option value="1">浣庢俯</option> - <!-- <option value="3">骞茬嚗閫氶</option> --> + </select> </div> - </div> - <div class="layui-inline"> - <!-- 鐗╂枡绫诲埆 --> + </div> --> + <!-- 鐗╂枡绫诲埆 --> + <!-- <div class="layui-inline"> + <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">鐗╂枡绫诲埆</label> <div class="layui-input-inline"> @@ -107,7 +110,7 @@ </select> </div> </div> - </div> + </div> --> <div class="layui-inline"> <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储 @@ -337,42 +340,42 @@ field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',width: 130 }, - { - field: 'Type',title: '绫诲瀷',align: 'center',templet: '#buttonType',width: 100 - }, - { - field: 'IsControlled',templet: '#buttonIsControlled',title: '鏄惁鍙楁帶',align: 'center',width: 100 - }, - { - field: 'IsInspect',title: '鏄惁鍏嶆',align: 'center',templet: '#buttonIsInspect',width: 100 - }, - { - field: 'IsPasteCode',title: '鏄惁璐存爣',align: 'center',templet: '#buttonIsPasteCode',width: 100 - }, - { - field: 'Origin',title: '鏉ユ簮',align: 'center',width: 200 - }, + // { + // field: 'Type',title: '绫诲瀷',align: 'center',templet: '#buttonType',width: 100 + // }, + // { + // field: 'IsControlled',templet: '#buttonIsControlled',title: '鏄惁鍙楁帶',align: 'center',width: 100 + // }, + // { + // field: 'IsInspect',title: '鏄惁鍏嶆',align: 'center',templet: '#buttonIsInspect',width: 100 + // }, + // { + // field: 'IsPasteCode',title: '鏄惁璐存爣',align: 'center',templet: '#buttonIsPasteCode',width: 100 + // }, + // { + // field: 'Origin',title: '鏉ユ簮',align: 'center',width: 200 + // }, { field: 'UnitName',title: '鍗曚綅',align: 'center',width: 100 }, - { - field: 'PackagName',title: '鍖呰',align: 'center',width: 100 - }, - { - field: 'Environment',title: '瀛樺偍鐜',align: 'center',templet: '#buttonEnvironment',width: 120 - }, - { - field: 'CategoryName',title: '鐗╂枡绫诲埆',align: 'center',width: 120 - }, + // { + // field: 'PackagName',title: '鍖呰',align: 'center',width: 100 + // }, + // { + // field: 'Environment',title: '瀛樺偍鐜',align: 'center',templet: '#buttonEnvironment',width: 120 + // }, + // { + // field: 'CategoryName',title: '鐗╂枡绫诲埆',align: 'center',width: 120 + // }, { field: 'Weight',title: '鐞嗚閲嶉噺',align: 'center',width: 135 }, { field: 'Warranty',title: '淇濊川鏈�(澶�)',align: 'center',width: 140 }, - { - field: 'UnpackWarranty',title: '鎷嗗寘鏁堟湡(澶�)',align: 'center',width: 140 - }, + // { + // field: 'UnpackWarranty',title: '鎷嗗寘鏁堟湡(澶�)',align: 'center',width: 140 + // }, { field: 'AdventTime',title: '涓存湡(澶�)',align: 'center',width: 140 @@ -421,7 +424,7 @@ title: '娣诲姞鐗╂枡淇℃伅', content: 'MaterialsForm.html', maxmin: true, - area: ['640px', '746px'], + area: ['640px', '450px'], btn: ['纭畾', '鍙栨秷'], yes: function(index, layero) { var iframeWindow = window['layui-layer-iframe' + index], @@ -603,7 +606,7 @@ title: '缂栬緫鐗╂枡淇℃伅', content: 'MaterialsForm.html?id=' + cusId, maxmin: true, - area: ['640px', '746px'], + area: ['640px', '450px'], btn: ['纭畾', '鍙栨秷'], yes: function(index, layero) { var iframeWindow = window['layui-layer-iframe' + index], diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html index a2ee30a..b10b199 100644 --- a/HTML/views/BaseSetting/MaterialsForm.html +++ b/HTML/views/BaseSetting/MaterialsForm.html @@ -55,16 +55,15 @@ class="layui-input"> </div> </div> - <div class="layui-inline" id="IsPasteCodeshow"> + <!-- <div class="layui-inline" id="IsPasteCodeshow"> <label class="layui-form-label">鏄惁璐存爣</label> <div class="layui-input-block" style="width: 182px;"> <select name="IsPasteCode" id="IsPasteCode" lay-verify="" lay-verify="" lay-search> - <!-- <option value=""></option> --> <option value="1">鏄�</option> <option value="0">鍚�</option> </select> </div> - </div> + </div> --> <!-- 娣诲姞涓嶆樉绀� --> <!-- <div class="layui-inline" id="Auditishow"> <label class="layui-form-label">瀹℃牳鐘舵��</label> @@ -77,8 +76,8 @@ </select> </div> </div> --> - </div> - <div class="layui-form-item"> + + <!-- <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">绫诲瀷</label> <div class="layui-input-block" style="width: 182px;"> @@ -96,7 +95,6 @@ <label class="layui-form-label">鏄惁鍙楁帶</label> <div class="layui-input-block" style="width: 182px;"> <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search> - <!-- <option value=""></option> --> <option value="0">鍙楁帶</option> <option value="1">闈炲彈鎺�</option> </select> @@ -106,7 +104,6 @@ <label class="layui-form-label">鏄惁鍏嶆</label> <div class="layui-input-block" style="width: 182px;"> <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search> - <!-- <option value=""></option> --> <option value="0">鍚�</option> <option value="1">鏄�</option> </select> @@ -120,8 +117,8 @@ </div> </div> </div> - <div class="layui-form-item"> - <!-- 鍗曚綅 --> + <div class="layui-form-item">--> + <!-- 鍗曚綅 <div class="layui-inline"> <label class="layui-form-label">鍗曚綅</label> <div class="layui-input-block" style="width: 182px;"> @@ -130,7 +127,7 @@ </select> </div> </div> - <!-- 鍖呰 --> + 鍖呰 <div class="layui-inline"> <label class="layui-form-label">鍖呰 <strong style="color: red;font-size: 18px;">*</strong></label> <div class="layui-input-block" style="width: 182px;"> @@ -139,8 +136,8 @@ </select> </div> </div> - </div> - <div class="layui-form-item"> + </div> --> + <!-- <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">瀛樺偍鐜</label> <div class="layui-input-block" style="width: 182px;"> @@ -148,7 +145,6 @@ <option value=""></option> <option value="0">甯告俯</option> <option value="1">浣庢俯</option> - <!-- <option value="3">骞茬嚗閫氶</option> --> </select> </div> </div> @@ -159,8 +155,7 @@ lay-verify="" autocomplete="off" class="layui-input"> </div> </div> - </div> - <div class="layui-form-item"> + </div> --> <div class="layui-inline"> <label class="layui-form-label" style="width: 70px;">淇濊川鏈�(澶�)</label> <div class="layui-input-block" style="width: 182px;"> @@ -168,12 +163,12 @@ lay-verify="" autocomplete="off" class="layui-input"> </div> </div> - <div class="layui-inline"> + <!-- <div class="layui-inline"> <label class="layui-form-label" style="width: 70px;">鎷嗗寘鏁堟湡(澶�)</label> <div class="layui-input-block" style="width: 182px;"> <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="UnpackWarranty" placeholder="璇疯緭鍏ユ媶鍖呮晥鏈�" lay-verify="" autocomplete="off" class="layui-input"> </div> - </div> + </div> --> <!-- <div class="layui-inline"> <label class="layui-form-label">鐞嗚鍗曚环</label> <div class="layui-input-block" style="width: 182px;"> diff --git a/HTML/views/HouseWithinSetting/HopperTransport.html b/HTML/views/HouseWithinSetting/HopperTransport.html index 34badbf..57b295a 100644 --- a/HTML/views/HouseWithinSetting/HopperTransport.html +++ b/HTML/views/HouseWithinSetting/HopperTransport.html @@ -50,7 +50,7 @@ <ul class="layui-tab-title" id="tab"> <li class="layui-this">鍙枡</li> <li>鍙溅</li> - <li>杞﹂棿鍒拌溅闂�</li> + <!-- <li>杞﹂棿鍒拌溅闂�</li> --> </ul> <div class="layui-tab-content"> diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html index 4783145..0213ea4 100644 --- a/HTML/views/WareHouseSetting/Locate.html +++ b/HTML/views/WareHouseSetting/Locate.html @@ -40,14 +40,14 @@ </select> </div> </div> - <div class="layui-inline"> + <!-- <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</label> <div class="layui-input-inline"> <select name="RoadwayNo" id="RoadwayNo" lay-filter="getRoadwayNo" lay-search> <option value=""></option> </select> </div> - </div> + </div> --> <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鐘舵��</label> <div class="layui-input-inline"> @@ -195,7 +195,7 @@ title: '缂栬緫鍌ㄤ綅鐘舵�侀泦鍚�', content: 'LocateFrom.html?WareHouseNo='+WareNo, maxmin: true, - area: ['560px', '510px'], + area: ['560px', '410px'], btn: ['纭畾', '鍙栨秷'], yes: function (index, layero) { var iframeWindow = window['layui-layer-iframe' + index], @@ -454,7 +454,7 @@ title: '鍌ㄤ綅淇℃伅绠$悊', content: 'LocateFrom.html?id=' + id, maxmin: true, - area: ['560px', '510px'], + area: ['560px', '410px'], btn: ['纭畾', '鍙栨秷'], yes: function(index, layero) { var iframeWindow = window['layui-layer-iframe' + index], diff --git a/HTML/views/WareHouseSetting/LocateFrom.html b/HTML/views/WareHouseSetting/LocateFrom.html index 9e2c617..d1d6be6 100644 --- a/HTML/views/WareHouseSetting/LocateFrom.html +++ b/HTML/views/WareHouseSetting/LocateFrom.html @@ -78,12 +78,12 @@ </div> <div class="layui-form-item"> - <label class="layui-form-label">鎵�灞炲贩閬�</label> + <!-- <label class="layui-form-label">鎵�灞炲贩閬�</label> <div class="layui-input-inline"> <select name="RoadwayNo" id="RoadwayNo" lay-filter="getRoadwayNo" lay-search disabled=""> <option value=""></option> </select> - </div> + </div> --> <label class="layui-form-label">  鍌ㄥ眰</label> <div class="layui-input-inline"> @@ -93,7 +93,7 @@ </div> - <div class="layui-form-item"> + <!-- <div class="layui-form-item"> <label class="layui-form-label">鍌ㄤ綅楂樺害</label> <div class="layui-input-inline"> <input type="text" id="Height" name="Height" placeholder="鍌ㄤ綅楂樺害路路路" autocomplete="off" @@ -114,7 +114,7 @@ </select> </div> - </div> + </div> --> <!-- --> <div class="layui-form-item layui-hide"> <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" diff --git a/HTML/views/index.html b/HTML/views/index.html index 8600cec..f6f3c78 100644 --- a/HTML/views/index.html +++ b/HTML/views/index.html @@ -30,7 +30,13 @@ </ul> <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right"> - + <li class="layui-nav-item layui-hide layui-show-md-inline-block"> + <!-- <a href="javascript:;"> + <class="layui-nav-img"> --> + <a id="username2">涓汉淇℃伅</a> + <i class="layui-icon layui-icon-down layui-nav-more"></i></a> + + </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a href="javascript:;" layadmin-event="theme"> <i class="layui-icon layui-icon-theme"></i> @@ -223,7 +229,24 @@ area: ['500px', '30%'] }); } - }); + }); + + var name = localStorage.getItem('keyUserName'); + var param = { + username: name + }; + sendData(IP + "/Basis/GetUserrealname", param, 'get', function(res) { + if (res.code == 0) { //鎴愬姛 + $("#username2").html("褰撳墠鐢ㄦ埛锛�"+res.data); + } else { //涓嶆垚鍔� + layer.msg('鑾峰彇褰撳墠鐧诲綍浜虹敤鎴峰悕淇℃伅澶辫触', { + icon: 2, + time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 + }, function() { + //鍥炶皟 + }); + } + }); // var dataList; // sendData(IP + "/IndexEchar/ImportTaskDayList", param, 'post', function(res) { // if (res.code == 0) { //鎴愬姛 diff --git a/Wms/WMS.DAL/SysInfrastructure/UserInforRepository.cs b/Wms/WMS.DAL/SysInfrastructure/UserInforRepository.cs index 4f3c116..27b0767 100644 --- a/Wms/WMS.DAL/SysInfrastructure/UserInforRepository.cs +++ b/Wms/WMS.DAL/SysInfrastructure/UserInforRepository.cs @@ -162,6 +162,18 @@ } /// <summary> + /// 鑾峰彇鐢ㄦ埛濮撳悕 + /// </summary> + /// <param username="username"></param> + /// <returns></returns> + public string GetUserRealname(string username) + { + + string name = Db.Queryable<SysUserInfor>().First(w => w.UserName == username && w.IsDel == "0").RealName; + return name; + } + + /// <summary> /// 淇敼鐢ㄦ埛瀵嗙爜 /// </summary> /// <param name="pwdOld">鍘熷瘑鐮�</param> diff --git a/Wms/WMS.IDAL/ISysInterface/IUserInforRepository.cs b/Wms/WMS.IDAL/ISysInterface/IUserInforRepository.cs index 4f87b80..3bc2ab4 100644 --- a/Wms/WMS.IDAL/ISysInterface/IUserInforRepository.cs +++ b/Wms/WMS.IDAL/ISysInterface/IUserInforRepository.cs @@ -50,6 +50,12 @@ /// <returns></returns> Task<int> UpdateUserinfo(SysUserInfor userlist); + /// <summary> + /// 鑾峰彇鐢ㄦ埛濮撳悕 + /// </summary> + /// <param name="username"></param> + /// <returns></returns> + string GetUserRealname(string username); /// <summary> /// 鏍规嵁id鑾峰彇鐢ㄦ埛淇℃伅鍒楄〃 diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs index f059a89..823b2a9 100644 --- a/Wms/Wms/Controllers/BasisController.cs +++ b/Wms/Wms/Controllers/BasisController.cs @@ -20,6 +20,7 @@ using System.Security.Cryptography; using System.Data; using Model.ModelDto.LogDto; +using WMS.IDAL.ISysInterface; namespace Wms.Controllers { @@ -45,6 +46,8 @@ private readonly IInterfaceServer _interface;//鎺ュ彛绠$悊 private readonly IOperationSysServer _operation; //鎿嶄綔鏃ュ織 private readonly IRoleWareHouseServer _roleWareSvs; //鎿嶄綔鏃ュ織 + + private readonly IUserInforRepository _userInforRepository; /// <summary> /// 鏋勯�犲嚱鏁� /// </summary> @@ -59,11 +62,12 @@ /// <param name="department">閮ㄩ棬</param> /// <param name="setting">鍔熻兘璁惧畾</param> /// <param name="operation">鎿嶄綔鏃ュ織</param> - public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, IInterfaceServer interfaceS, IOperationSysServer operation, IRoleWareHouseServer roleWareSvs) + public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, IUserInforRepository userInfor, IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, IInterfaceServer interfaceS, IOperationSysServer operation, IRoleWareHouseServer roleWareSvs) { _customerSvc = customerSvc;//瀹㈡埛Svc _logisticsSvc = logisticsSvc;//鐗╂祦Svc _userInforServer = userInforServer;//鐢ㄦ埛 + _userInforRepository = userInfor; _rolesServer = rolesServer;//瑙掕壊 _roleRightServer = roleRightServer;//瑙掕壊鏉冮檺 _rBACServer = rBACServer;//RBAC @@ -118,7 +122,22 @@ msg = "鎴愬姛" }); } - + /// <summary> + /// 鑾峰彇鐢ㄦ埛濮撳悕鍒楄〃 + /// </summary> + /// <param name="id">鐢ㄦ埛id</param> + /// <returns></returns> + [HttpGet] + public IActionResult GetUserrealname(string username) + { + string userinfo = _userInforRepository.GetUserRealname(username); + return Ok(new + { + data = userinfo, + code = 0, + msg = "鎴愬姛" + }); + } /// <summary> /// 鏂板鐢ㄦ埛淇℃伅 diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json index 8324399..831f5a6 100644 --- a/Wms/Wms/appsettings.json +++ b/Wms/Wms/appsettings.json @@ -11,9 +11,9 @@ //"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;", //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;", //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;", - //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC37;User ID=sa;Password=sql2019;Integrated Security=False;" - //"ConnectionString": "Server=.;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;" - "ConnectionString": "Data Source=192.168.10.201\\WMSSQLSERVER;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;" + // "ConnectionString": "Server=192.168.62.200;Database=WMS_JC37;User ID=sa;Password=sql2019;Integrated Security=False;" + "ConnectionString": "Server=.;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;" + //"ConnectionString": "Data Source=192.168.10.201\\WMSSQLSERVER;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;" //"ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC23-2;User Id=sa;Password=admin2023@;" // SqlServer 搴撹繛鎺ュ瓧绗︿覆 //"ConnectionString": "Server=172.16.105.10;Database=WMS_JC23-2;User ID=sa;Password=sql2019;Integrated Security=False;" //"ConnectionString": "Server=172.16.105.2;Database=WMS_JC23-2;User ID=sa;Password=boxline@2024;Integrated Security=False;" -- Gitblit v1.8.0