Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
so-manage-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
smart-operation
so-manage-ui
Commits
4b01a411
Commit
4b01a411
authored
Oct 31, 2022
by
何小勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
系统账号管理
parent
9e68d8fe
Changes
18
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
148 additions
and
117 deletions
+148
-117
package.json
package.json
+1
-1
src/bg-ui/bg-upload.vue
src/bg-ui/bg-upload.vue
+1
-1
src/bg-ui/index.scss
src/bg-ui/index.scss
+4
-0
src/page/main/develop/account/add/contact-form.vue
src/page/main/develop/account/add/contact-form.vue
+3
-0
src/page/main/develop/account/add/index.vue
src/page/main/develop/account/add/index.vue
+3
-25
src/page/main/develop/account/add/system-form.vue
src/page/main/develop/account/add/system-form.vue
+6
-4
src/page/main/develop/account/detail/index.vue
src/page/main/develop/account/detail/index.vue
+1
-1
src/page/main/develop/account/index.vue
src/page/main/develop/account/index.vue
+8
-8
src/page/main/system/organization/directory-form.vue
src/page/main/system/organization/directory-form.vue
+29
-7
src/page/main/system/organization/index.vue
src/page/main/system/organization/index.vue
+15
-13
src/page/main/system/organization/org-detail/index.vue
src/page/main/system/organization/org-detail/index.vue
+2
-2
src/page/main/system/organization/org-form.vue
src/page/main/system/organization/org-form.vue
+22
-6
src/page/main/system/organization/org-user/index.vue
src/page/main/system/organization/org-user/index.vue
+4
-3
src/page/main/system/organization/org-user/org-account-form.vue
...ge/main/system/organization/org-user/org-account-form.vue
+6
-3
src/page/main/system/organization/platform-user/index.vue
src/page/main/system/organization/platform-user/index.vue
+4
-4
src/page/main/system/organization/tree.vue
src/page/main/system/organization/tree.vue
+1
-1
src/page/main/system/organization/user-detail/index.vue
src/page/main/system/organization/user-detail/index.vue
+1
-1
yarn.lock
yarn.lock
+37
-37
No files found.
package.json
View file @
4b01a411
...
...
@@ -14,7 +14,7 @@
"
clipboard
"
:
"
^2.0.11
"
,
"
crypto-js
"
:
"
^4.1.1
"
,
"
echarts
"
:
"
^5.3.3
"
,
"
element-plus
"
:
"
^2.2.9
"
,
"
element-plus
"
:
"
^2.2.
1
9
"
,
"
html2canvas
"
:
"
^1.4.1
"
,
"
sass
"
:
"
^1.35.1
"
,
"
uuid
"
:
"
^8.3.2
"
,
...
...
src/bg-ui/bg-upload.vue
View file @
4b01a411
...
...
@@ -127,7 +127,7 @@ export default {
},
computed
:
{
actionDisabled
()
{
return
this
.
disabled
||
this
.
fileList
.
length
===
this
.
limit
;
return
this
.
disabled
;
//|| this.fileList.length === this.limit; 文件数量 === limit 会导致无法删除已上传文件
},
},
watch
:
{
...
...
src/bg-ui/index.scss
View file @
4b01a411
...
...
@@ -1813,6 +1813,7 @@ a {
}
}
&
.is-easy
{
>
div
{
max-width
:
unset
!
important
;
...
...
@@ -1833,6 +1834,9 @@ a {
}
}
}
.el-upload__tip
{
line-height
:
18px
;
}
}
.bg-upload-image
{
...
...
src/page/main/develop/account/add/contact-form.vue
View file @
4b01a411
...
...
@@ -51,6 +51,9 @@ const contactFormRules = reactive({
{
required
:
true
,
message
:
'
请输入联系人手机号
'
,
trigger
:
'
blur
'
},
{
validator
:
checkPhone
,
trigger
:
'
blur
'
},
],
contact_email
:
[
{
type
:
'
email
'
,
message
:
'
请输入正确的邮箱
'
,
trigger
:
'
blur
'
},
]
})
const
contactRef
=
ref
(
null
)
const
emit
=
defineEmits
([
'
action
'
])
...
...
src/page/main/develop/account/add/index.vue
View file @
4b01a411
...
...
@@ -134,17 +134,7 @@ const getContactFormData = (data) => {
let
params
=
{
...
formData
,
id
:
parseInt
(
route
.
query
.
id
),
// business_name: formData.value.business_name,
// system_account: formData.value.system_account,
// contact_email: formData.value.contact_email,
// contact_phone: formData.value.contact_phone,
// contact_name: formData.value.contact_name,
logo
:
formData
.
logo
&&
formData
.
logo
.
length
>
0
?
formData
.
logo
[
0
].
url
:
''
,
// state: formData.value.state,
// business_desc: formData.value.business_desc,
// develop_id: formData.value.develop_id,
// access_address: formData.value.access_address,
// remark: formData.value.remark
}
$axios
.
post
(
`/apaas/system/v5/user/update`
,
params
)
.
then
((
res
)
=>
{
...
...
@@ -152,26 +142,14 @@ const getContactFormData = (data) => {
successFlag
.
value
=
true
;
step
.
value
=
3
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
else
{
let
params
=
{
...
formData
,
// organization_id: formData.value.organization_id,
logo
:
formData
.
logo
&&
formData
.
logo
.
length
>
0
?
formData
.
logo
[
0
].
url
:
''
,
password
:
CryptoJS
.
AES
.
encrypt
(
formData
.
password
,
"
swuE9cmCZQwrkYRV
"
).
toString
(),
// business_code: formData.value.business_code,
// business_name: formData.value.business_name,
// business_desc: formData.value.business_desc,
// system_account: formData.value.system_account,
// access_address: formData.value.access_address,
// develop_id: formData.value.develop_id,
// state: formData.value.state,
// contact_name: formData.value.contact_name,
// contact_phone: formData.value.contact_phone,
// contact_email: formData.value.contact_email,
// remark: formData.value.remark,
}
$axios
.
put
(
`/apaas/system/v5/user/create`
,
params
)
.
then
((
res
)
=>
{
...
...
@@ -179,7 +157,7 @@ const getContactFormData = (data) => {
successFlag
.
value
=
true
;
step
.
value
=
3
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -233,7 +211,7 @@ const getDetail = () => {
remark
:
form
.
remark
,
})
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
src/page/main/develop/account/add/system-form.vue
View file @
4b01a411
...
...
@@ -10,7 +10,7 @@
<el-form-item
label=
"所属机构"
prop=
"organization_id"
>
<el-tree-select
v-model=
"systemForm.organization_id"
:data=
"orgData"
:props=
"treeProps"
:render-after-expand=
"false"
:disabled=
"formType"
style=
"width: 100%;"
/>
</el-form-item>
<el-form-item
label=
"业务系统编码"
prop=
"business_code"
>
<el-form-item
label=
"业务系统编码"
prop=
"business_code"
v-if=
"formType"
>
<el-input
v-model=
"systemForm.business_code"
:disabled=
"formType"
/>
</el-form-item>
<el-form-item
label=
"业务系统名称"
prop=
"business_name"
>
...
...
@@ -155,7 +155,7 @@ const validateSystemAccount = (rule, value, callback) => {
const
formRules
=
reactive
({
organization_id
:
[
{
required
:
true
,
message
:
'
请选择组织机构
'
,
trigger
:
'
blur
'
},
{
required
:
true
,
message
:
'
请选择组织机构
'
,
trigger
:
'
change
'
},
],
business_name
:
[
{
required
:
true
,
message
:
'
请输入业务系统名称
'
,
trigger
:
'
blur
'
},
...
...
@@ -214,9 +214,11 @@ const getOrgTree = () => {
$axios
.
get
(
`/apaas/system/v5/org/tree`
)
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
orgData
.
value
=
res
.
data
.
data
||
[];
const
orgDataTemp
=
res
.
data
.
data
||
[]
orgDataTemp
.
shift
()
orgData
.
value
=
orgDataTemp
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
src/page/main/develop/account/detail/index.vue
View file @
4b01a411
...
...
@@ -170,7 +170,7 @@ const baseInfo = reactive(
logo
.
value
=
detail
.
logo
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
src/page/main/develop/account/index.vue
View file @
4b01a411
...
...
@@ -310,7 +310,7 @@ import CryptoJS from "crypto-js";
tableRows
.
value
=
res
.
data
.
data
||
[]
tableTotal
.
value
=
res
.
data
.
total
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -351,7 +351,7 @@ import CryptoJS from "crypto-js";
})
getTableRows
()
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -391,7 +391,7 @@ import CryptoJS from "crypto-js";
if
(
res
.
data
.
code
==
200
)
{
getTableRows
()
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -456,7 +456,7 @@ import CryptoJS from "crypto-js";
$message
.
success
(
res
.
data
.
msg
)
getTableRows
()
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseDelete
();
})
...
...
@@ -471,7 +471,7 @@ import CryptoJS from "crypto-js";
$message
.
success
(
res
.
data
.
msg
)
getTableRows
()
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseRowDelete
();
})
...
...
@@ -509,7 +509,7 @@ import CryptoJS from "crypto-js";
$message
.
success
(
res
.
data
.
msg
)
getTableRows
()
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseReset
();
})
...
...
@@ -540,7 +540,7 @@ import CryptoJS from "crypto-js";
if
(
res
.
data
.
code
==
200
)
{
$message
.
success
(
res
.
data
.
msg
)
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseEdit
();
})
...
...
@@ -589,7 +589,7 @@ import CryptoJS from "crypto-js";
.tree
{
overflow
:
auto
;
height
:
calc
(
100%
-
65px
);
padding
:
5px
;
}
.tree
:deep
()
.el-tree-node
>
.el-tree-node__children
{
overflow
:
unset
;
...
...
src/page/main/system/organization/directory-form.vue
View file @
4b01a411
...
...
@@ -9,7 +9,14 @@
>
<el-form-item
label=
"上级目录"
prop=
"p_organization_id"
v-if=
"formType === 'create'"
>
<!--
<el-input
v-model=
"directoryForm.p_organization_id"
style=
"width: 80%;"
/>
-->
<el-tree-select
v-model=
"directoryForm.p_organization_id"
:data=
"orgData"
:props=
"treeProps"
:render-after-expand=
"false"
:filter-node-method=
"filterNode"
:disabled=
"directoryForm.level"
:check-strictly=
"true"
style=
"width: 80%;"
/>
<el-tree-select
v-model=
"directoryForm.p_organization_id"
:data=
"orgData"
:props=
"treeProps"
:render-aftertreeProps-expand=
"false"
:filter-node-method=
"filterNode"
:check-strictly=
"true"
style=
"width: 80%;"
/>
<el-form-item
label=
""
style=
"padding-left: 16px"
>
<el-checkbox
v-model=
"directoryForm.level"
@
change=
"isTop"
label=
"顶级"
/>
</el-form-item>
...
...
@@ -72,22 +79,37 @@ import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance, nextTick }
const
treeProps
=
{
label
:
'
name
'
,
children
:
'
Child
'
,
value
:
'
organization_id
'
value
:
'
organization_id
'
,
disabled
:
'
disabled
'
}
const
getOrgTree
=
()
=>
{
$axios
.
get
(
`/apaas/system/v5/org/tree`
)
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
orgData
.
value
=
res
.
data
.
data
||
[];
// nextTick(() => {
// filterNode();
// })
const
orgDataTemp
=
res
.
data
.
data
||
[]
orgDataTemp
.
shift
()
orgData
.
value
=
filterOrg
(
orgDataTemp
);
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
const
filterOrg
=
(
data
)
=>
{
if
(
data
.
length
>
0
)
{
data
.
forEach
(
item
=>
{
item
.
disabled
=
item
.
data_type
===
0
?
false
:
true
;
if
(
item
.
Child
){
filterOrg
(
item
.
Child
)
}
else
{
return
}
})
}
return
data
;
}
const
filterNode
=
(
value
,
data
)
=>
{
return
data
.
data_type
===
0
...
...
src/page/main/system/organization/index.vue
View file @
4b01a411
...
...
@@ -431,11 +431,13 @@ import { downloadFileFormatNew } from '@/services/helper'
],
})
const
addAccount
=
(
params
)
=>
{
const
addAccount
=
()
=>
{
if
(
selectTreeDataType
.
value
===
1
)
{
router
.
push
({
path
:
"
/system/organization/org-user
"
,
query
:
{
orgId
:
selectTreeData
.
value
.
organization_id
}
})
}
else
{
router
.
push
({
...
...
@@ -506,7 +508,7 @@ import { downloadFileFormatNew } from '@/services/helper'
$message
.
success
(
res
.
data
.
msg
)
orgTree
.
value
.
getOrgTree
();
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseDirectory
()
})
...
...
@@ -521,7 +523,7 @@ import { downloadFileFormatNew } from '@/services/helper'
$message
.
success
(
res
.
data
.
msg
)
orgTree
.
value
.
getOrgTree
();
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseDirectory
()
})
...
...
@@ -556,7 +558,7 @@ import { downloadFileFormatNew } from '@/services/helper'
$message
.
success
(
res
.
data
.
msg
)
orgTree
.
value
.
getOrgTree
();
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseOrg
()
})
...
...
@@ -575,7 +577,7 @@ import { downloadFileFormatNew } from '@/services/helper'
$message
.
success
(
res
.
data
.
msg
)
orgTree
.
value
.
getOrgTree
();
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseOrg
()
})
...
...
@@ -595,7 +597,7 @@ import { downloadFileFormatNew } from '@/services/helper'
$message
.
success
(
res
.
data
.
msg
)
orgTree
.
value
.
getOrgTree
();
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseDelNode
()
})
...
...
@@ -608,7 +610,7 @@ import { downloadFileFormatNew } from '@/services/helper'
$message
.
success
(
res
.
data
.
msg
)
orgTree
.
value
.
getOrgTree
();
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -698,7 +700,7 @@ import { downloadFileFormatNew } from '@/services/helper'
console
.
log
(
baseInfo
)
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -725,7 +727,7 @@ import { downloadFileFormatNew } from '@/services/helper'
if
(
res
.
data
.
code
==
200
)
{
getTableRows
()
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -755,7 +757,7 @@ import { downloadFileFormatNew } from '@/services/helper'
if
(
res
.
data
.
code
==
200
)
{
$message
.
success
(
res
.
data
.
msg
)
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseEdit
();
})
...
...
@@ -787,7 +789,7 @@ import { downloadFileFormatNew } from '@/services/helper'
$message
.
success
(
res
.
data
.
msg
)
getTableRows
()
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseRowDelete
();
})
...
...
@@ -863,7 +865,7 @@ import { downloadFileFormatNew } from '@/services/helper'
$message
.
success
(
res
.
data
.
msg
)
getTableRows
()
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
handleCloseReset
();
})
...
...
src/page/main/system/organization/org-detail/index.vue
View file @
4b01a411
...
...
@@ -170,7 +170,7 @@ const baseInfo = reactive(
baseInfo
[
4
].
value
=
detail
.
description
;
fileList
.
value
=
detail
.
attachment
?
detail
.
attachment
.
split
(
'
,
'
)
:
[];
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -184,7 +184,7 @@ const baseInfo = reactive(
tableRows
.
value
=
res
.
data
.
data
||
[];
tableTotal
.
value
=
res
.
data
.
total
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
src/page/main/system/organization/org-form.vue
View file @
4b01a411
...
...
@@ -90,21 +90,37 @@ import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from 'vue
const
treeProps
=
{
label
:
'
name
'
,
children
:
'
Child
'
,
value
:
'
organization_id
'
value
:
'
organization_id
'
,
disabled
:
'
disabled
'
}
const
getOrgTree
=
()
=>
{
$axios
.
get
(
`/apaas/system/v5/org/tree`
)
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
orgData
.
value
=
res
.
data
.
data
||
[];
// nextTick(() => {
// filterNode();
// })
const
orgDataTemp
=
res
.
data
.
data
||
[]
orgDataTemp
.
shift
()
orgData
.
value
=
filterOrg
(
orgDataTemp
);
}
else
{
$message
.
error
(
res
.
data
.
data
)
}
})
}
const
filterOrg
=
(
data
)
=>
{
if
(
data
.
length
>
0
)
{
data
.
forEach
(
item
=>
{
item
.
disabled
=
item
.
data_type
===
0
?
false
:
true
;
if
(
item
.
Child
){
filterOrg
(
item
.
Child
)
}
else
{
$message
.
error
(
res
.
data
.
msg
)
return
}
})
}
return
data
;
}
const
filterNode
=
(
value
,
data
)
=>
{
...
...
src/page/main/system/organization/org-user/index.vue
View file @
4b01a411
...
...
@@ -108,6 +108,7 @@ const formData = reactive({
});
//账号信息表单+个人信息表单
const
successFlag
=
ref
(
false
)
const
orgId
=
ref
(
''
)
// 下一步
const
nextStep
=
()
=>
{
...
...
@@ -138,7 +139,7 @@ const getOrgPersonFormData = (data) => {
successFlag
.
value
=
true
;
step
.
value
=
3
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
...
...
@@ -155,7 +156,7 @@ const getOrgPersonFormData = (data) => {
successFlag
.
value
=
true
;
step
.
value
=
3
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -204,7 +205,7 @@ const getDetail = () => {
remark
:
form
.
remark
,
})
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
src/page/main/system/organization/org-user/org-account-form.vue
View file @
4b01a411
...
...
@@ -8,7 +8,7 @@
style=
"max-width: 66%"
>
<el-form-item
label=
"所属组织机构"
prop=
"organization_id"
>
<el-tree-select
v-model=
"orgAccountForm.organization_id"
:data=
"orgData"
:props=
"treeProps"
:render-after-expand=
"false"
:disabled=
"
formTyp
e"
style=
"width: 100%;"
/>
<el-tree-select
v-model=
"orgAccountForm.organization_id"
:data=
"orgData"
:props=
"treeProps"
:render-after-expand=
"false"
:disabled=
"
tru
e"
style=
"width: 100%;"
/>
<!--
<el-input
v-model=
"orgAccountForm.organization_id"
/>
-->
</el-form-item>
<el-form-item
label=
"角色"
prop=
"select_role"
v-if=
"!formType"
>
...
...
@@ -45,9 +45,11 @@
</
template
>
<
script
setup
>
import
{
reactive
,
ref
,
onMounted
,
onBeforeMount
,
getCurrentInstance
}
from
'
vue
'
import
{
reactive
,
ref
,
onMounted
,
onBeforeMount
,
getCurrentInstance
}
from
'
vue
'
;
import
{
useRoute
}
from
'
vue-router
'
;
const
{
proxy
}
=
getCurrentInstance
()
const
{
$axios
,
$message
}
=
proxy
const
route
=
useRoute
();
const
props
=
defineProps
({
formType
:
{
type
:
Boolean
,
...
...
@@ -189,7 +191,7 @@ const getOrgTree = () => {
if
(
res
.
data
.
code
==
200
)
{
orgData
.
value
=
res
.
data
.
data
||
[];
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -209,6 +211,7 @@ const getRoleList = () => {
onBeforeMount
(()
=>
{
getOrgTree
()
getRoleList
()
orgAccountForm
.
organization_id
=
route
.
query
.
orgId
;
})
...
...
src/page/main/system/organization/platform-user/index.vue
View file @
4b01a411
...
...
@@ -130,7 +130,7 @@ const getPlatformAccountFormData = (data) => {
successFlag
.
value
=
true
;
step
.
value
=
3
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
else
{
...
...
@@ -174,7 +174,7 @@ const getPlatformPersonFormData = (data) => {
successFlag
.
value
=
true
;
step
.
value
=
3
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -206,7 +206,7 @@ const getOrgTree = () => {
if
(
res
.
data
.
code
==
200
)
{
orgId
.
value
=
res
.
data
.
data
[
0
].
organization_id
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
@@ -226,7 +226,7 @@ const getDetail = () => {
remark
:
form
.
remark
,
})
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
src/page/main/system/organization/tree.vue
View file @
4b01a411
...
...
@@ -93,7 +93,7 @@ import { useRouter } from 'vue-router';
})
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
src/page/main/system/organization/user-detail/index.vue
View file @
4b01a411
...
...
@@ -176,7 +176,7 @@ const accountInfo = reactive(
accountType
.
value
=
detail
.
is_admin
;
}
else
{
$message
.
error
(
res
.
data
.
msg
)
$message
.
error
(
res
.
data
.
data
)
}
})
}
...
...
yarn.lock
View file @
4b01a411
...
...
@@ -24,17 +24,17 @@
resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.6.tgz"
integrity sha512-lPpG8hYkjL/Z97DH5Ei6w6o22Z4YdNglWCNYOPcB33JCF2A4wye6HFgSI7hEt9zdLyxlSpiqtgf9XcYU+m5mew==
"@floating-ui/core@^
0.7.3
":
version "
0.7.3
"
resolved "https://
registry.npmmirror.com/@floating-ui/core/-/core-0.7.3.tgz
"
integrity sha512-b
uc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg
==
"@floating-ui/core@^
1.0.1
":
version "
1.0.1
"
resolved "https://
mirrors.cloud.tencent.com/npm/@floating-ui%2fcore/-/core-1.0.1.tgz#00e64d74e911602c8533957af0cce5af6b2e93c8
"
integrity sha512-b
O37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA
==
"@floating-ui/dom@^
0.5.4
":
version "
0.5
.4"
resolved "https://
registry.npmmirror.com/@floating-ui/dom/-/dom-0.5.4.tgz
"
integrity sha512-
419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrt
g==
"@floating-ui/dom@^
1.0.1
":
version "
1.0
.4"
resolved "https://
mirrors.cloud.tencent.com/npm/@floating-ui%2fdom/-/dom-1.0.4.tgz#cc0f2a03db7193b1b932b90d09c5c81235682a60
"
integrity sha512-
maYJRv+sAXTy4K9mzdv0JPyNW5YPVHrqtY90tEdI6XNpuLOP26Ci2pfwPsKBA/Wh4Z3FX5sUrtUFTdMYj9v+u
g==
dependencies:
"@floating-ui/core" "^
0.7.3
"
"@floating-ui/core" "^
1.0.1
"
"@intlify/core-base@9.1.10":
version "9.1.10"
...
...
@@ -119,10 +119,10 @@
resolved "https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.182.tgz"
integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
"@types/web-bluetooth@^0.0.1
4
":
version "0.0.1
4
"
resolved "https://
registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz
"
integrity sha512-
5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A
==
"@types/web-bluetooth@^0.0.1
6
":
version "0.0.1
6
"
resolved "https://
mirrors.cloud.tencent.com/npm/@types%2fweb-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8
"
integrity sha512-
oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ
==
"@uppy/companion-client@^2.2.2":
version "2.2.2"
...
...
@@ -357,25 +357,25 @@
resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.38.tgz#e823f0cb2e85b6bf43430c0d6811b1441c300f3c"
integrity sha512-dTyhTIRmGXBjxJE+skC8tTWCGLCVc4wQgRRLt8+O9p5ewBAjoBwtCAkLPrtToSr1xltoe3st21Pv953aOZ7alg==
"@vueuse/core@^
8.7.5
":
version "
8.9.4
"
resolved "https://
registry.npmmirror.com/@vueuse/core/-/core-8.9.4.tgz
"
integrity sha512-
B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3
Q==
"@vueuse/core@^
9.1.0
":
version "
9.4.0
"
resolved "https://
mirrors.cloud.tencent.com/npm/@vueuse%2fcore/-/core-9.4.0.tgz#afb30f9494b0954e51a489526566b14f1e2c5fb3
"
integrity sha512-
JzgenGj1ZF2BHOen5rsFiAyyI9sXAv7aKhNLlm9b7SwYQeKTcxTWdhudonURCSP3Egl9NQaRBzes2lv/1JUt/
Q==
dependencies:
"@types/web-bluetooth" "^0.0.1
4
"
"@vueuse/metadata" "
8.9.4
"
"@vueuse/shared" "
8.9.4
"
"@types/web-bluetooth" "^0.0.1
6
"
"@vueuse/metadata" "
9.4.0
"
"@vueuse/shared" "
9.4.0
"
vue-demi "*"
"@vueuse/metadata@
8.9.4
":
version "
8.9.4
"
resolved "https://
registry.npmmirror.com/@vueuse/metadata/-/metadata-8.9.4.tgz
"
integrity sha512-
IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw
==
"@vueuse/metadata@
9.4.0
":
version "
9.4.0
"
resolved "https://
mirrors.cloud.tencent.com/npm/@vueuse%2fmetadata/-/metadata-9.4.0.tgz#5c8eb105a8ad9eb7b47f78a226ff993560d0bd7f
"
integrity sha512-
7GKMdGAsJyQJl35MYOz/RDpP0FxuiZBRDSN79QIPbdqYx4Sd0sVTnIC68KJ6Oln0t0SouvSUMvRHuno216Ud2Q
==
"@vueuse/shared@
8.9.4
":
version "
8.9.4
"
resolved "https://
registry.npmmirror.com/@vueuse/shared/-/shared-8.9.4.tgz
"
integrity sha512-
wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag
==
"@vueuse/shared@
9.4.0
":
version "
9.4.0
"
resolved "https://
mirrors.cloud.tencent.com/npm/@vueuse%2fshared/-/shared-9.4.0.tgz#634022fe42b3d5ece1d81d749724966f5071c8c3
"
integrity sha512-
fTuem51KwMCnqUKkI8B57qAIMcFovtGgsCtAeqxIzH3i6nE9VYge+gVfneNHAAy7lj8twbkNfqQSygOPJTm4tQ
==
dependencies:
vue-demi "*"
...
...
@@ -578,18 +578,18 @@ echarts@^5.3.3:
tslib "2.3.0"
zrender "5.3.2"
element-plus@^2.2.9:
version "2.2.9"
resolved "https://
registry.npmmirror.com/element-plus/-/element-plus-2.2.9.tgz
"
integrity sha512-
jYbL0JkCdv95rkT6trZJjCAizLPySa0qcd2cgq+57SKQnCZAcNDDq4GbTuFRnNavdoeCJnuM3HIficTIUpsMOQ
==
element-plus@^2.2.
1
9:
version "2.2.
1
9"
resolved "https://
mirrors.cloud.tencent.com/npm/element-plus/-/element-plus-2.2.19.tgz#c11cb84b35b7698b2f5fa7ec0fd98034f6861a9e
"
integrity sha512-
uN0gt9lUus/IHzu5J6vkbYoYJgUtU05osdtFv9RO27bHKOG5GN7dH6uA3OKfkQQ6R2sV8ZxY1rc9PH1X8Dgrow
==
dependencies:
"@ctrl/tinycolor" "^3.4.1"
"@element-plus/icons-vue" "^2.0.6"
"@floating-ui/dom" "^
0.5.4
"
"@floating-ui/dom" "^
1.0.1
"
"@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7"
"@types/lodash" "^4.14.182"
"@types/lodash-es" "^4.17.6"
"@vueuse/core" "^
8.7.5
"
"@vueuse/core" "^
9.1.0
"
async-validator "^4.2.5"
dayjs "^1.11.3"
escape-html "^1.0.3"
...
...
@@ -597,7 +597,7 @@ element-plus@^2.2.9:
lodash-es "^4.17.21"
lodash-unified "^1.0.2"
memoize-one "^6.0.0"
normalize-wheel-es "^1.
1.2
"
normalize-wheel-es "^1.
2.0
"
es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.14:
version "0.10.62"
...
...
@@ -984,9 +984,9 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
resolved "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
normalize-wheel-es@^1.
1.2
:
normalize-wheel-es@^1.
2.0
:
version "1.2.0"
resolved "https://
registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz
"
resolved "https://
mirrors.cloud.tencent.com/npm/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz#0fa2593d619f7245a541652619105ab076acf09e
"
integrity sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==
path-parse@^1.0.7:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment