From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/person-manage.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 4bb927d..5d37c93 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -35,6 +35,15 @@
padding: 20px;
}
</style>
+<style>
+ .el-upload--text{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+</style>
<template>
<div class="person_manage">
@@ -97,6 +106,7 @@
order: 'asc'
}
},
+ row: 2,
isIndex: true,
showSelect: false,
select: false,
@@ -137,7 +147,7 @@
select: []
}
},
- cascaderField:{
+ /* cascaderField:{
departId:{
tree:[]
},
@@ -147,9 +157,9 @@
label:'name',
checkStrictly: true
}
- },
- requiredAdd:['account','name','state','roleId','password','departId'],
- requiredUp:['account','name','state','roleId','departId'],
+ }, */
+ requiredAdd:['account','name','state','roleId','password'],
+ requiredUp:['account','name','state','roleId'],
addUpload:['pictureUrl','signatureUrl'],
addUploadConfig:{
accept:'.png, .jpg, .jpeg, .gif',
@@ -195,10 +205,10 @@
this.$refs.ValueTable.openAddDia(this.$api.user.addUser);
},
selectTreeList(){
- this.$axios.get(this.$api.department.selectDepartment).then(res => {
+ /* this.$axios.get(this.$api.department.selectDepartment).then(res => {
this.componentData.cascaderField.departId.tree = this.handleTree(res.data[0].children)
- this.$refs.ValueTable.selectList()
- })
+ }) */
+ this.$refs.ValueTable.selectList()
},
handleTree(arr){
arr.forEach(a => {
--
Gitblit v1.9.3