From 86ba9ccae07091b955349b1633ae99d1ffadc2ca Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 30 十一月 2021 17:40:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/系统管理/用户管理/Xt_UserList.html | 1 +
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
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/Xt_UserList.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/Xt_UserList.html"
index 0467195..29947b6 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/Xt_UserList.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/Xt_UserList.html"
@@ -172,6 +172,7 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鐢ㄦ埛缂栫爜', title: '鐢ㄦ埛缂栫爜' }
, { field: '鐢ㄦ埛鍚嶇О', title: '鐢ㄦ埛鍚嶇О' }
+ , { field: '瀵瑰簲鑱屽憳', title: '瀵瑰簲鑱屽憳' }
, { field: '瀵瑰簲淇濈', title: '瀵瑰簲淇濈' }
, { field: '瀵瑰簲楠屾敹', title: '瀵瑰簲楠屾敹' }
, { field: '瀵瑰簲涓氬姟鍛�', title: '瀵瑰簲涓氬姟鍛�' }
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/Xt_UserListEdit.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/Xt_UserListEdit.html"
index 154097c..f4b1c9a 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/Xt_UserListEdit.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/Xt_UserListEdit.html"
@@ -89,10 +89,10 @@
<textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="Explain" id="Explain"></textarea>
</div>
</div>
- <div class="layui-inline" style="display:none;">
+ <div class="layui-inline" >
<label class="layui-form-label">瀵瑰簲鑱屽憳</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -422,8 +422,10 @@
"Czybm": data.鐢ㄦ埛缂栫爜 //鐢ㄦ埛缂栫爜
, "Czymc": data.鐢ㄦ埛鍚嶇О //鐢ㄦ埛鍚嶇О
, "Czmm": data.瀵嗙爜 //瀵嗙爜
- , "Czyyz": "" //纭瀵嗙爜
+ , "Czyyz": data.瀵嗙爜 //纭瀵嗙爜
, "Explain": data.璇存槑 //璇存槑
+ , "HEmpID": data.HEmpID //
+ , "HEmpName": data.瀵瑰簲鑱屽憳 //
});
} else {
--
Gitblit v1.9.1