From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
index b5a5f92..3c3ed88 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
@@ -32,6 +32,7 @@
return {1:"是",0:"否"}[data]
}
},
+ {title: '注册时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
{title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
formatter:function (data) {
return {1:"正常",2:"冻结",3:"已注销"}[data]
@@ -39,8 +40,14 @@
];
};
TQuestion.close = function() {
- parent.layer.close(window.parent.TQuestion.layerIndex);
- window.close();
+ // window.parent.layer.close();
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+
+
+ // parent.layer.close(window.parent.parent.TQuestion.layerIndex);
+ // console.log("======"+window.parent.TQuestion.layerIndex)
+ // window.close();
}
/**
* 检查是否选中
--
Gitblit v1.7.1