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 | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 3668eb0..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,9 +106,11 @@
order: 'asc'
}
},
+ row: 2,
isIndex: true,
showSelect: false,
select: false,
+ init:false,
do: [{
id: 'update',
font: '缂栬緫',
@@ -136,23 +147,24 @@
select: []
}
},
- cascaderField:{
- name:{
+ /* cascaderField:{
+ departId:{
tree:[]
},
// 瀛楁閰嶇疆
props:{
value:'id',
label:'name',
+ checkStrictly: true
}
- },
+ }, */
requiredAdd:['account','name','state','roleId','password'],
+ requiredUp:['account','name','state','roleId'],
addUpload:['pictureUrl','signatureUrl'],
addUploadConfig:{
accept:'.png, .jpg, .jpeg, .gif',
url:this.$api.deviceScope.uploadFile
},
- requiredUp:['account','name','state','roleId']
},
entityCopy: {},
upIndex: 0,
@@ -161,6 +173,7 @@
}
},
mounted() {
+ this.selectTreeList()
this.selectRole()
this.entityCopy = this.HaveJson(this.componentData.entity)
this.getPower()
@@ -191,6 +204,22 @@
opeaAdd(){
this.$refs.ValueTable.openAddDia(this.$api.user.addUser);
},
+ selectTreeList(){
+ /* this.$axios.get(this.$api.department.selectDepartment).then(res => {
+ this.componentData.cascaderField.departId.tree = this.handleTree(res.data[0].children)
+ }) */
+ this.$refs.ValueTable.selectList()
+ },
+ handleTree(arr){
+ arr.forEach(a => {
+ if(a.children.length==0){
+ a.children = null;
+ }else{
+ this.handleTree(a.children)
+ }
+ })
+ return arr
+ },
// 鏉冮檺鍒嗛厤
getPower(){
let power = JSON.parse(sessionStorage.getItem('power'))
--
Gitblit v1.9.3