diff --git a/src/views/system/notify/message/detail.vue b/src/views/system/notify/message/detail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..0b146113f89a58ca751f01805b96e4968d463826
--- /dev/null
+++ b/src/views/system/notify/message/detail.vue
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue
index 93a8ed6803a21c477c569602334ff4bbd6b33c05..06f98c62e679dc72a7f791bd409a3e9080310083 100644
--- a/src/views/system/notify/message/index.vue
+++ b/src/views/system/notify/message/index.vue
@@ -1,67 +1,217 @@
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.templateParams }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
diff --git a/src/views/system/notify/message/message.data.ts b/src/views/system/notify/message/message.data.ts
deleted file mode 100644
index 665311d2726a020b76f4239d8888ad308bb1b051..0000000000000000000000000000000000000000
--- a/src/views/system/notify/message/message.data.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
-
-// CrudSchema
-const crudSchemas = reactive({
- primaryKey: 'id', // 默认的主键ID
- primaryTitle: '编号', // 默认显示的值
- primaryType: 'id', // 默认为seq,序号模式
- action: true,
- actionWidth: '200', // 3个按钮默认200,如有删减对应增减即可
- columns: [
- {
- title: '用户编号',
- field: 'userId',
- isSearch: true
- },
- {
- title: '用户类型',
- field: 'userType',
- dictType: DICT_TYPE.USER_TYPE,
- dictClass: 'string',
- isSearch: true,
- table: {
- width: 80
- }
- },
- {
- title: '模版编号',
- field: 'templateId'
- },
- {
- title: '模板编码',
- field: 'templateCode',
- isSearch: true,
- table: {
- width: 80
- }
- },
- {
- title: '发送人名称',
- field: 'templateNickname',
- table: {
- width: 120
- }
- },
- {
- title: '模版内容',
- field: 'templateContent',
- table: {
- width: 200
- }
- },
- {
- title: '模版类型',
- field: 'templateType',
- dictType: DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE,
- dictClass: 'number',
- isSearch: true,
- table: {
- width: 80
- }
- },
- {
- title: '模版参数',
- field: 'templateParams',
- isTable: false
- },
- {
- title: '是否已读',
- field: 'readStatus',
- dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
- dictClass: 'boolean',
- table: {
- width: 80
- }
- },
- {
- title: '阅读时间',
- field: 'readTime',
- formatter: 'formatDate',
- table: {
- width: 180
- }
- },
- {
- title: '创建时间',
- field: 'createTime',
- isForm: false,
- formatter: 'formatDate',
- search: {
- show: true,
- itemRender: {
- name: 'XDataTimePicker'
- }
- },
- table: {
- width: 180
- }
- }
- ]
-})
-export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/src/views/system/notify/my/detail.vue b/src/views/system/notify/my/detail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ea9ae96189a6ae0503dc2f2af29f8021706484a3
--- /dev/null
+++ b/src/views/system/notify/my/detail.vue
@@ -0,0 +1,46 @@
+
+
+
+
diff --git a/src/views/system/notify/my/index.vue b/src/views/system/notify/my/index.vue
index 9f3e9b102a0def47855a12a8f236f8d080580e06..d889e18421fb7fe2797018bac370c72aabbb9698 100644
--- a/src/views/system/notify/my/index.vue
+++ b/src/views/system/notify/my/index.vue
@@ -1,58 +1,250 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+ 搜索
+ 重置
+ 标记已读
+ 全部已读
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.readStatus ? '详情' : '查阅' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/notify/my/my.data.ts b/src/views/system/notify/my/my.data.ts
deleted file mode 100644
index 103ed8eff01149807517e08645c4edb63749b70f..0000000000000000000000000000000000000000
--- a/src/views/system/notify/my/my.data.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
-
-// CrudSchema
-const crudSchemas = reactive({
- primaryKey: 'id',
- primaryTitle: ' ',
- primaryType: 'checkbox',
- action: true,
- actionWidth: '200', // 3个按钮默认200,如有删减对应增减即可
- columns: [
- {
- title: '发送人名称',
- field: 'templateNickname',
- table: {
- width: 120
- }
- },
- {
- title: '发送时间',
- field: 'createTime',
- isForm: false,
- formatter: 'formatDate',
- search: {
- show: true,
- itemRender: {
- name: 'XDataTimePicker'
- }
- },
- table: {
- width: 180
- }
- },
- {
- title: '类型',
- field: 'templateType',
- dictType: DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE,
- dictClass: 'number',
- table: {
- width: 80
- }
- },
- {
- title: '内容',
- field: 'templateContent'
- },
- {
- title: '是否已读',
- field: 'readStatus',
- dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
- dictClass: 'boolean',
- table: {
- width: 80
- },
- isSearch: true
- }
- ]
-})
-export const { allSchemas } = useVxeCrudSchemas(crudSchemas)