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
2239de58
Commit
2239de58
authored
Jul 04, 2023
by
李鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限管理接口联调
parent
db85c473
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
453 deletions
+42
-453
src/components/login-by-account.vue
src/components/login-by-account.vue
+1
-3
src/page/main/authority/organization/directory-form.vue
src/page/main/authority/organization/directory-form.vue
+1
-1
src/page/main/authority/organization/index.vue
src/page/main/authority/organization/index.vue
+32
-426
src/page/main/authority/organization/org-detail/index.vue
src/page/main/authority/organization/org-detail/index.vue
+1
-1
src/page/main/authority/organization/org-form.vue
src/page/main/authority/organization/org-form.vue
+1
-12
src/page/main/authority/organization/org-user/org-account-form.vue
...main/authority/organization/org-user/org-account-form.vue
+1
-1
src/page/main/authority/organization/platform-user/index.vue
src/page/main/authority/organization/platform-user/index.vue
+1
-1
src/page/main/authority/organization/tree.vue
src/page/main/authority/organization/tree.vue
+4
-8
No files found.
src/components/login-by-account.vue
View file @
2239de58
...
...
@@ -120,9 +120,7 @@ const login = () => {
ElMessage
.
error
(
data
.
data
);
}
})
.
catch
((
error
)
=>
{
console
.
log
(
error
);
});
.
catch
((
error
)
=>
{});
};
const
getUserInfo
=
()
=>
{
return
axios
.
get
(
`/v1/api/user/getUserInfo`
);
...
...
src/page/main/authority/organization/directory-form.vue
View file @
2239de58
...
...
@@ -77,7 +77,7 @@ const treeProps = {
disabled
:
"
disabled
"
,
};
const
getOrgTree
=
()
=>
{
axios
.
get
(
`/
apaas/system/v5
/org/tree`
).
then
((
res
)
=>
{
axios
.
get
(
`/
v1/api
/org/tree`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
const
orgDataTemp
=
res
.
data
.
data
||
[];
orgDataTemp
.
shift
();
...
...
src/page/main/authority/organization/index.vue
View file @
2239de58
This diff is collapsed.
Click to expand it.
src/page/main/authority/organization/org-detail/index.vue
View file @
2239de58
...
...
@@ -149,7 +149,7 @@ const formatFile = (url) => {
const
getDetail
=
()
=>
{
axios
.
get
(
`/
apaas/system/v5
/org/detail?organization_id=
${
route
.
query
.
id
}
&key_word=&state=&limit=&page=&data_type=1`
)
.
get
(
`/
v1/api
/org/detail?organization_id=
${
route
.
query
.
id
}
&key_word=&state=&limit=&page=&data_type=1`
)
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
const
detail
=
res
.
data
.
data
.
org_info
;
...
...
src/page/main/authority/organization/org-form.vue
View file @
2239de58
...
...
@@ -22,16 +22,6 @@
<el-form-item
label=
"组织介绍"
prop=
"description"
>
<el-input
type=
"textarea"
:rows=
"3"
v-model=
"orgForm.description"
maxlength=
"300"
show-word-limit
/>
</el-form-item>
<el-form-item
label=
"组织附件"
prop=
"logo"
>
<bg-upload
v-model=
"orgForm.attachment"
customTips
:limit=
"3"
:fileTypes=
"['zip', 'rar', 'doc', 'docx', 'xlsx', 'xls', 'png', 'jpg']"
:otherInfo=
"'最多可上传三个附件,可上传zip,rar,doc,docx,xlsx,xls,png,jpg,可上传营业执照和相关协议文件等'"
>
<span>
将文件拖到此处,或 点击上传
</span>
</bg-upload>
</el-form-item>
</el-form>
</
template
>
...
...
@@ -51,7 +41,6 @@ const orgForm = reactive({
name
:
""
,
organization_code
:
""
,
description
:
""
,
attachment
:
[],
});
const
checkCode
=
(
rule
,
value
,
callback
)
=>
{
...
...
@@ -115,7 +104,7 @@ const treeProps = {
disabled
:
"
disabled
"
,
};
const
getOrgTree
=
()
=>
{
axios
.
get
(
`/
apaas/system/v5
/org/tree`
).
then
((
res
)
=>
{
axios
.
get
(
`/
v1/api
/org/tree`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
const
orgDataTemp
=
res
.
data
.
data
||
[];
orgDataTemp
.
shift
();
...
...
src/page/main/authority/organization/org-user/org-account-form.vue
View file @
2239de58
...
...
@@ -198,7 +198,7 @@ const treeProps = {
value
:
"
organization_id
"
,
};
const
getOrgTree
=
()
=>
{
axios
.
get
(
`/
apaas/system/v5
/org/tree`
).
then
((
res
)
=>
{
axios
.
get
(
`/
v1/api
/org/tree`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
orgData
.
value
=
res
.
data
.
data
||
[];
}
else
{
...
...
src/page/main/authority/organization/platform-user/index.vue
View file @
2239de58
...
...
@@ -211,7 +211,7 @@ const cancel = () => {
};
const
getOrgTree
=
()
=>
{
axios
.
get
(
`/
apaas/system/v5
/org/tree`
).
then
((
res
)
=>
{
axios
.
get
(
`/
v1/api
/org/tree`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
orgId
.
value
=
res
.
data
.
data
[
0
].
organization_id
;
}
else
{
...
...
src/page/main/authority/organization/tree.vue
View file @
2239de58
...
...
@@ -20,10 +20,7 @@
@click.stop="showAction($event, data, node)">
<bg-icon
class=
"tree-more"
icon=
"#bg-ic-s-more"
></bg-icon>
</span>
<span
v-else
class=
"tree-action-box"
@
click.stop=
"showAction($event, data, node)"
>
<span
v-else
class=
"tree-action-box"
@
click.stop=
"showAction($event, data, node)"
>
<bg-icon
class=
"tree-more"
icon=
"#bg-ic-s-more"
></bg-icon>
</span>
</div>
...
...
@@ -141,8 +138,8 @@
</template>
<
script
setup
>
import
{
re
active
,
toRefs
,
ref
,
computed
,
onBeforeMount
,
onBeforeUnmount
,
watch
,
nextTick
}
from
"
vue
"
;
import
{
useRoute
,
useRouter
}
from
"
vue-router
"
;
import
{
re
f
,
onBeforeMount
,
onBeforeUnmount
,
nextTick
}
from
"
vue
"
;
import
{
useRoute
}
from
"
vue-router
"
;
import
axios
from
"
@/request/http.js
"
;
import
{
ElMessage
}
from
"
element-plus
"
;
const
route
=
useRoute
();
...
...
@@ -174,10 +171,9 @@ const defaultProps = {
};
const
getOrgTree
=
(
data
)
=>
{
axios
.
get
(
`/
apaas/system/v5
/org/tree`
).
then
((
res
)
=>
{
axios
.
get
(
`/
v1/api
/org/tree`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
orgData
.
value
=
res
.
data
.
data
||
[];
console
.
log
(
route
.
query
.
id
);
if
(
route
.
query
.
id
)
{
searchItem
(
orgData
.
value
,
route
.
query
.
id
);
data
=
selectNodeObj
.
value
;
...
...
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