Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Y
yishuju-ui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
何远江
yishuju-ui
Commits
85f4d2c0
Commit
85f4d2c0
authored
Jan 22, 2025
by
沈翠玲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调解中心优化
parent
284f9a1a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
14 deletions
+46
-14
authMenuList.json
src/assets/json/authMenuList.json
+1
-1
index.vue
src/components/TenantModal/index.vue
+7
-3
user.js
src/stores/modules/user.js
+2
-2
index.js
src/utils/http/index.js
+1
-1
index.vue
src/views/login/index.vue
+6
-6
TenantFormModal.vue
src/views/system/tenantManage/components/TenantFormModal.vue
+15
-1
index.vue
src/views/system/tenantManage/index.vue
+14
-0
No files found.
src/assets/json/authMenuList.json
View file @
85f4d2c0
...
...
@@ -291,7 +291,7 @@
"component"
:
"/system/tenantManage/index"
,
"meta"
:
{
"icon"
:
""
,
"title"
:
"
租户
管理"
,
"title"
:
"
调解中心
管理"
,
"isLink"
:
""
,
"isHide"
:
false
,
"isFull"
:
false
,
...
...
src/components/TenantModal/index.vue
View file @
85f4d2c0
<
template
>
<vxe-modal
v-model=
"showModal"
title=
"
租户
选择"
show-footer
>
<vxe-modal
v-model=
"showModal"
title=
"
调解中心
选择"
show-footer
>
<div
v-for=
"tenant in
getUserTenants
"
v-for=
"tenant in
tenantList
"
:key=
"tenant.code"
@
click=
"handleClick(tenant)"
class=
"p-2 mb-2 rounded flex items-center justify-between text-center border hover:cursor-pointer hover:bg-gray-100"
...
...
@@ -24,6 +24,7 @@
const
emits
=
defineEmits
([
'cancel'
,
'select'
]);
const
showModal
=
ref
(
false
);
const
tenantList
=
ref
([]);
const
{
getUserTenants
}
=
useUserStore
();
const
handleCancel
=
()
=>
{
...
...
@@ -35,7 +36,10 @@
emits
(
'select'
,
tenant
);
};
const
openModal
=
()
=>
(
showModal
.
value
=
true
);
const
openModal
=
(
tenants
)
=>
{
showModal
.
value
=
true
tenantList
.
value
=
tenants
};
defineExpose
({
openModal
,
});
...
...
src/stores/modules/user.js
View file @
85f4d2c0
...
...
@@ -7,8 +7,8 @@ export const useUserStore = defineStore({
state
:
()
=>
({
token
:
''
,
userInfo
:
null
,
isTenant
:
false
,
// 是否操作了
租户
tenant
:
null
,
// 当前
租户
isTenant
:
false
,
// 是否操作了
调解中心
tenant
:
null
,
// 当前
调解中心
}),
getters
:
{
getUserTenants
()
{
...
...
src/utils/http/index.js
View file @
85f4d2c0
...
...
@@ -31,7 +31,7 @@ class RequestClient {
config
.
cancel
&&
axiosCanceler
.
addPending
(
config
);
const
{
tenant
}
=
useUserStore
();
// 设置
租户
请求头
// 设置
调解中心
请求头
config
.
headers
[
'tenantId'
]
=
tenant
?.
id
;
if
(
config
.
method
.
toLocaleUpperCase
()
==
'GET'
)
{
...
...
src/views/login/index.vue
View file @
85f4d2c0
...
...
@@ -101,17 +101,17 @@
});
/**
* 取消
租户
选择
* 取消
调解中心
选择
*/
const
onCancelTenant
=
()
=>
{
// 取消选择
租户
,执行退出登录
// 取消选择
调解中心
,执行退出登录
userStore
.
logout
();
loginLoading
.
value
=
false
;
};
/**
* 选择
租户
* @param tenant
租户
* 选择
调解中心
* @param tenant
调解中心
*/
const
onSelectTenant
=
async
(
tenant
)
=>
{
userStore
.
setIsTenant
(
true
);
...
...
@@ -148,9 +148,9 @@
let
url
=
`ws://8.152.205.9:8080/websocket/
${
userInfo
.
id
}
`
;
socketStore
.
connection
(
url
);
// 如果有多个
租户,需要选择租户
进入系统
// 如果有多个
调解中心,需要选择调解中心
进入系统
if
(
userInfo
.
tenants
.
length
>
1
)
{
tenantRef
.
value
.
openModal
();
tenantRef
.
value
.
openModal
(
userInfo
.
tenants
);
}
else
{
await
onSelectTenant
(
userInfo
.
tenants
[
0
]
||
null
);
}
...
...
src/views/system/tenantManage/components/TenantFormModal.vue
View file @
85f4d2c0
...
...
@@ -8,7 +8,7 @@
show-footer
esc-closable
>
<el-form
ref=
"formRef"
:model=
"form"
:rules=
"rules"
inline
label-width=
"
8
0px"
>
<el-form
ref=
"formRef"
:model=
"form"
:rules=
"rules"
inline
label-width=
"
11
0px"
>
<el-row
:gutter=
"10"
>
<el-col
:span=
"24"
>
<el-form-item
class=
"w-full"
label=
"调解中心名称"
prop=
"name"
>
...
...
@@ -20,6 +20,16 @@
<el-input
v-model=
"form.code"
placeholder=
"调解中心编码"
/>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
class=
"w-full"
label=
"负责人"
prop=
"adminUser"
>
<el-input
v-model=
"form.adminUser"
placeholder=
"负责人"
/>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
class=
"w-full"
label=
"负责人手机"
prop=
"phone"
>
<el-input
v-model=
"form.phone"
placeholder=
"负责人手机"
/>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
class=
"w-full"
label=
"状态"
prop=
"status"
>
<el-radio-group
v-model=
"form.status"
>
...
...
@@ -54,6 +64,8 @@
const
form
=
ref
({
name
:
''
,
code
:
''
,
adminUser
:
''
,
phone
:
''
,
status
:
'enable'
,
});
const
rules
=
ref
({
...
...
@@ -82,6 +94,8 @@
form
.
value
=
{
name
:
''
,
code
:
''
,
adminUser
:
''
,
phone
:
''
,
status
:
'enable'
,
};
formRef
.
value
.
clearValidate
();
...
...
src/views/system/tenantManage/index.vue
View file @
85f4d2c0
...
...
@@ -28,6 +28,20 @@
{
type
:
'checkbox'
,
width
:
50
},
{
field
:
'name'
,
title
:
'调解中心名称'
,
search
:
{
el
:
'input'
}
},
{
field
:
'code'
,
title
:
'调解中心编码'
,
search
:
{
el
:
'input'
}
},
{
field
:
'adminUser'
,
title
:
'负责人'
},
{
field
:
'phone'
,
title
:
'负责人手机'
},
{
field
:
''
,
title
:
'成员数量'
,
width
:
80
,
slots
:
{
default
:
({
row
})
=>
{
return
(
<
div
>
{
row
.
users
.
length
}
<
/div
>
);
},
},
},
{
field
:
'status'
,
title
:
'状态'
,
...
...
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