diff --git a/src/api/set/messageindex.ts b/src/api/set/messageindex.ts
index a673db4..323bd45 100644
--- a/src/api/set/messageindex.ts
+++ b/src/api/set/messageindex.ts
@@ -10,6 +10,15 @@ export const listlist = (query?: LeaveQuery): AxiosPromise => {
data: query
});
};
+//获取下拉列表
+export const listuserlist = (query?: string | number): AxiosPromise => {
+ return request({
+ url: `/system/message/user/list?keyword=${query}`,
+ method: 'get'
+ // params: query
+ });
+};
+
//获取消息管理列表
export const listAdd = (query?: LeaveListVO): AxiosPromise => {
return request({
@@ -22,7 +31,7 @@ export const listAdd = (query?: LeaveListVO): AxiosPromise => {
export const listtemplate = (query?: AccountQuery): AxiosPromise => {
return request({
url: '/system/message/template/list',
- method: 'post',
+ method: 'POST',
data: query
});
};
diff --git a/src/api/set/messagetype.ts b/src/api/set/messagetype.ts
index 6a541e2..cd9b8ba 100644
--- a/src/api/set/messagetype.ts
+++ b/src/api/set/messagetype.ts
@@ -6,6 +6,29 @@ export interface CategoryTreeVO {
children: CategoryTreeVO[];
}
+export interface optionListItem {
+ avatar: string;
+ createTime: string;
+ deptId: number;
+ deptName: string;
+ email: string;
+ loginDate: string;
+ loginIp: string;
+ nickName: string;
+ phonenumber: string;
+ postIds: string;
+ remark: string;
+ roleId: string;
+ roleIds: string;
+ roles: string;
+ sex: string;
+ status: string;
+ tenantId: string;
+ userId: number;
+ userName: string;
+ userType: string;
+}
+
export interface AccountQuery {
current: number;
size: number;
diff --git a/src/views/set/account.vue b/src/views/set/account.vue
index 61d5d7f..4ea19ba 100644
--- a/src/views/set/account.vue
+++ b/src/views/set/account.vue
@@ -39,7 +39,7 @@
>
-
+
{{ row.templateType == 1 ? '公告' : '通知' }}
diff --git a/src/views/set/message.vue b/src/views/set/message.vue
index 03906e4..f1caca4 100644
--- a/src/views/set/message.vue
+++ b/src/views/set/message.vue
@@ -53,8 +53,20 @@
{{ '指定角色' }}
{{ '指定具体人' }}
-
-
+
+
+
+
+
@@ -81,11 +93,11 @@