From 3e714a0bc8d11bd6772194df5c81fbdc0685698b Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 10 Sep 2024 16:38:04 +0800
Subject: [PATCH 1/4] sc
---
src/config/axios/service.ts | 2 ++
src/views/Basic/User/DeptTree.vue | 8 --------
src/views/Basic/User/UserForm.vue | 17 +++++++++++++----
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index a4a7ec7..e11c1e1 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -205,6 +205,8 @@ service.interceptors.response.use(
if (msg === '无效的刷新令牌') {
// hard coding：忽略这个提示，直接登出
console.log(msg)
+ } else if (code == 18888) {
+ return { data }
} else {
ElNotification.error({ title: msg })
if (code == 403) {
diff --git a/src/views/Basic/User/DeptTree.vue b/src/views/Basic/User/DeptTree.vue
index c7bc14b..3a3a028 100644
--- a/src/views/Basic/User/DeptTree.vue
+++ b/src/views/Basic/User/DeptTree.vue
@@ -1,11 +1,4 @@
<template>
- <div class="head-container">
- <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
- <template #prefix>
- <Icon icon="ep:search" />
- </template>
- </el-input>
- </div>
<div class="head-container">
<el-tree
ref="treeRef"
@@ -26,7 +19,6 @@ import { ElTree } from 'element-plus'
import * as DeptApi from '@/api/system/dept'
import { defaultProps, handleTree } from '@/utils/tree'
-const deptName = ref('')
const deptList = ref<Tree[]>([]) // 树形结构
const treeRef = ref<InstanceType<typeof ElTree>>()
diff --git a/src/views/Basic/User/UserForm.vue b/src/views/Basic/User/UserForm.vue
index a745737..360f958 100644
--- a/src/views/Basic/User/UserForm.vue
+++ b/src/views/Basic/User/UserForm.vue
@@ -139,7 +139,8 @@ const formData = ref({
remark: '',
status: CommonStatusEnum.ENABLE,
roleIds: [],
- hireDate: ''
+ hireDate: '',
+ isNewUserConfirm: false
})
const formRules = ref<any>({
username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
@@ -192,8 +193,15 @@ const submitForm = async () => {
try {
const data = formData.value as unknown as UserApi.UserVO
if (formType.value === 'create') {
- await UserApi.createUser(data)
- message.success(t('common.createSuccess'))
+ const resp = await UserApi.createUser(data)
+ debugger
+ if (resp.code == 18888) {
+ await message.confirm(resp.msg)
+ formData.value.isNewUserConfirm = true
+ submitForm()
+ } else {
+ message.success(t('common.createSuccess'))
+ }
} else {
await UserApi.updateUser(data)
message.success(t('common.updateSuccess'))
@@ -220,7 +228,8 @@ const resetForm = () => {
remark: '',
status: CommonStatusEnum.ENABLE,
roleIds: [],
- hireDate: formatDate(new Date(), 'YYYY-MM-DD')
+ hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
+ isNewUserConfirm: undefined
}
formRef.value?.resetFields()
}
From 7de4adeaad44194566afa808aedcf8e5eeb04822 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 10 Sep 2024 16:58:25 +0800
Subject: [PATCH 2/4] sc
---
src/views/Profile/NotifyMessage.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/Profile/NotifyMessage.vue b/src/views/Profile/NotifyMessage.vue
index a1e99dc..5d5169e 100644
--- a/src/views/Profile/NotifyMessage.vue
+++ b/src/views/Profile/NotifyMessage.vue
@@ -100,7 +100,7 @@ const queryFormRef = ref() // 搜索的表单
const getList = async () => {
loading.value = true
try {
- const data = await NotifyMessageApi.getNotifyMessagePage(queryParams)
+ const data = await NotifyMessageApi.getMyNotifyMessagePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
From 8a857e03afba1c4e87b09a49862c80898d6b9216 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 10 Sep 2024 17:00:39 +0800
Subject: [PATCH 3/4] sc
---
src/api/system/notify/message/index.ts | 4 ++--
src/views/Profile/NotifyMessage.vue | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/api/system/notify/message/index.ts b/src/api/system/notify/message/index.ts
index 2e8d76a..3ef0237 100644
--- a/src/api/system/notify/message/index.ts
+++ b/src/api/system/notify/message/index.ts
@@ -15,12 +15,12 @@ export interface NotifyMessageVO {
}
// 查询站内信消息列表
-export const getNotifyMessagePage = async (params: PageParam) => {
+export const getNotifyMessagePage = async (params: any) => {
return await request.get({ url: '/admin-api/system/notify-message/page', params })
}
// 获得我的站内信分页
-export const getMyNotifyMessagePage = async (params: PageParam) => {
+export const getMyNotifyMessagePage = async (params: any) => {
return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
}
diff --git a/src/views/Profile/NotifyMessage.vue b/src/views/Profile/NotifyMessage.vue
index 5d5169e..7d1baf6 100644
--- a/src/views/Profile/NotifyMessage.vue
+++ b/src/views/Profile/NotifyMessage.vue
@@ -100,7 +100,10 @@ const queryFormRef = ref() // 搜索的表单
const getList = async () => {
loading.value = true
try {
- const data = await NotifyMessageApi.getMyNotifyMessagePage(queryParams)
+ const data = await NotifyMessageApi.getMyNotifyMessagePage({
+ ...queryParams,
+ roleId: userStore.getUser?.currentRole
+ })
list.value = data.list
total.value = data.total
} finally {
From fb466e207c4f3511dd41ccc2750ad821eed33e95 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 10 Sep 2024 18:05:19 +0800
Subject: [PATCH 4/4] sc
---
src/layout/components/Message/src/Message.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
index 9b75fa8..f5d362f 100644
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -101,7 +101,7 @@ onUnmounted(() => {
.message-item {
display: flex;
align-items: center;
- padding: 0;
+ padding: 5px 0;
border-bottom: 1px solid var(--el-border-color-light);
&:last-child {