From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/views/system/user.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 55bdd5e..1cade52 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -191,7 +191,12 @@
lazy: true,
treeLoad: function (node, resolve) {
const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree(parentId).then(res => {
+ console.log(node,666)
+ const param = {
+ parentId:parentId,
+ level:node.level
+ }
+ getDeptLazyTree(param).then(res => {
resolve(
res.data.data.map(item => {
return {
@@ -358,6 +363,13 @@
viewDisplay: false,
rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
},
+ {
+ label: '到期时间',
+ prop: 'expireTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ },
],
},
{
--
Gitblit v1.9.3