From 5808f76456ca0d40de5074f132b73a5a488e3e13 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:12:03 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/system/user.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index c4104e5..a4782da 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -26,9 +26,9 @@
<el-button type="danger" plain icon="el-icon-delete" v-if="permission.user_delete && !auditMode"
@click="handleDelete">删 除
</el-button>
- <el-button type="primary" plain icon="el-icon-operation"
- v-if="userInfo.role_name.includes('admin') && !auditMode" @click="handleAudit">审 核
- </el-button>
+<!-- <el-button type="primary" plain icon="el-icon-operation"-->
+<!-- v-if="userInfo.role_name.includes('admin') && !auditMode" @click="handleAudit">审 核-->
+<!-- </el-button>-->
<el-button type="success" plain icon="el-icon-check"
v-if="userInfo.role_name.includes('admin') && auditMode" @click="handleAuditPass">通 过
</el-button>
@@ -44,9 +44,9 @@
<el-button type="info" plain v-if="permission.user_reset && !auditMode" icon="el-icon-refresh"
@click="handleReset">密码重置
</el-button>
- <el-button type="info" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
- icon="el-icon-setting" @click="handlePlatform">平台配置
- </el-button>
+<!-- <el-button type="info" plain v-if="userInfo.role_name.includes('admin') && !auditMode"-->
+<!-- icon="el-icon-setting" @click="handlePlatform">平台配置-->
+<!-- </el-button>-->
<el-button type="info" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
icon="el-icon-coordinate" @click="handleLock">账号解封
</el-button>
@@ -490,7 +490,7 @@
label: '所属部门',
prop: 'deptId',
type: 'tree',
- multiple: true,
+ multiple: false,
dicData: [],
// props: {
// label: 'title',
@@ -519,6 +519,7 @@
column: [
{
label: '到期时间',
+ labelWidth: 110,
prop: 'expireTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
@@ -526,12 +527,14 @@
},
{
label: '次数限制',
+ labelWidth: 110,
prop: 'maxLoginNum',
type: 'input',
},
{
label: '飞行开始时间',
+ labelWidth: 110,
prop: 'flightStartTime',
type: 'time',
format: 'HH:mm',
@@ -546,6 +549,7 @@
},
{
label: '飞行结束时间',
+ labelWidth: 110,
prop: 'flightEndTime',
type: 'time',
format: 'HH:mm',
@@ -789,7 +793,7 @@
}
}
- row.deptId = func.join(row.deptId)
+ // row.deptId = func.join(row.deptId)
row.roleId = func.join(row.roleId)
row.postId = func.join(row.postId)
row.name = row.realName
@@ -832,7 +836,7 @@
}
}
- row.deptId = func.join(row.deptId)
+ // row.deptId = func.join(row.deptId)
row.roleId = func.join(row.roleId)
row.postId = func.join(row.postId)
row.name = row.realName
@@ -1057,9 +1061,9 @@
if (['edit', 'view'].includes(type)) {
getUser(this.form.id).then(res => {
this.form = res.data.data
- if (this.form.hasOwnProperty('deptId')) {
- this.form.deptId = func.split(this.form.deptId)
- }
+ // if (this.form.hasOwnProperty('deptId')) {
+ // this.form.deptId = func.split(this.form.deptId)
+ // }
if (this.form.hasOwnProperty('roleId')) {
this.form.roleId = func.split(this.form.roleId)
}
--
Gitblit v1.9.3