From 5ebd6758ee61497b0d485c2145c2d49b33951ed3 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 18 一月 2024 10:17:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/系统管理/用户管理/Gy_UserByUser.html | 66 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 5 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/Gy_UserByUser.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_UserByUser.html"
index 766f02a..4f69208 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_UserByUser.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_UserByUser.html"
@@ -56,7 +56,7 @@
<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="" class="layui-btn" lay-filter="UserList" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" id="UserList" lay-filter="UserList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -131,6 +131,7 @@
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
+ $('#UserList').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -183,12 +184,24 @@
$("#UserID").val(checkStatus.data[0].HNumber);
$.ajax({
- url: GetWEBURL() + "/Xt_User/UserPlaylist",
+ url: GetWEBURL() + "Gy_UserByUserEdit",
type: "GET",
- data: { "HUserID": checkStatus.data[0].HNumber },
+ async: false,
+ data: { "HID": checkStatus.data[0].HNumber },
success: function (data) {
if (data.data != null && data.data != "") {
- option.data = data.data;
+ //option.data = data.data;
+ //table.render(option);
+ var arr = [];
+ for (var i = 0; i < data.data.h_v_Gy_UserByUserRelationList.length; i++) {
+ arr.push({
+ "HUserID2": data.data.h_v_Gy_UserByUserRelationList[i].HUserID2,
+ "HUserNumber2": data.data.h_v_Gy_UserByUserRelationList[i].鍏宠仈鐢ㄦ埛缂栫爜,
+ "HUserName2": data.data.h_v_Gy_UserByUserRelationList[i].鍏宠仈鐢ㄦ埛鍚嶇О,
+ });
+
+ }
+ option.data = arr;
table.render(option);
}
else {
@@ -243,7 +256,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
console.log(checkStatus.data[0])
obj.update({
- HUserID2: checkStatus.data[0].HEmpID,
+ HUserID2: checkStatus.data[0].鐢ㄦ埛缂栫爜,
HUserNumber2: checkStatus.data[0].鐢ㄦ埛缂栫爜,
HUserName2: checkStatus.data[0].鐢ㄦ埛鍚嶇О
});
@@ -364,6 +377,49 @@
table.render(option);
}
+ //缂栬緫
+ function set_EditFromGrid(linterid) {
+
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ }
+
+ //缂栬緫鍔犺浇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Gy_UserByUserEdit",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Gy_UserByUserRelationList[0];
+ $("#UserID").val(data.鐢ㄦ埛浠ｇ爜);//鐢ㄦ埛浠ｇ爜
+ $("#UserName ").val(data.鐢ㄦ埛);//鐢ㄦ埛鍚嶇О
+
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ var arr = [];
+ for (var i = 0; i < result.data.h_v_Gy_UserByUserRelationList.length; i++) {
+ arr.push({
+ "HUserID2": result.data.h_v_Gy_UserByUserRelationList[i].HUserID2,
+ "HUserNumber2": result.data.h_v_Gy_UserByUserRelationList[i].鍏宠仈鐢ㄦ埛缂栫爜,
+ "HUserName2": result.data.h_v_Gy_UserByUserRelationList[i].鍏宠仈鐢ㄦ埛鍚嶇О,
+ });
+
+ }
+ option.data = arr;
+ table.render(option);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
--
Gitblit v1.9.1