From 5766dc81d12ff48db63d03355d4bfb8e370856eb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 2 Dec 2023 20:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20notify=20?=
 =?UTF-8?q?=E5=9C=A8=20IDEA=20=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/notify/message/index.ts               |  1 +
 src/api/system/notify/template/index.ts              |  2 +-
 .../system/notify/message/NotifyMessageDetail.vue    |  2 +-
 src/views/system/notify/message/index.vue            |  4 ++--
 src/views/system/notify/my/MyNotifyMessageDetail.vue |  2 +-
 src/views/system/notify/my/index.vue                 |  2 +-
 .../system/notify/template/NotifyTemplateForm.vue    | 12 ++++++------
 .../notify/template/NotifyTemplateSendForm.vue       |  4 ++--
 src/views/system/notify/template/index.vue           |  2 +-
 9 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/api/system/notify/message/index.ts b/src/api/system/notify/message/index.ts
index 29036b95..e407c77d 100644
--- a/src/api/system/notify/message/index.ts
+++ b/src/api/system/notify/message/index.ts
@@ -13,6 +13,7 @@ export interface NotifyMessageVO {
   templateParams: string
   readStatus: boolean
   readTime: Date
+  createTime: Date
 }
 
 // 查询站内信消息列表
diff --git a/src/api/system/notify/template/index.ts b/src/api/system/notify/template/index.ts
index cd0e1223..44355dff 100644
--- a/src/api/system/notify/template/index.ts
+++ b/src/api/system/notify/template/index.ts
@@ -6,7 +6,7 @@ export interface NotifyTemplateVO {
   nickname: string
   code: string
   content: string
-  type: number
+  type?: number
   params: string
   status: number
   remark: string
diff --git a/src/views/system/notify/message/NotifyMessageDetail.vue b/src/views/system/notify/message/NotifyMessageDetail.vue
index 837f5e31..8472351d 100644
--- a/src/views/system/notify/message/NotifyMessageDetail.vue
+++ b/src/views/system/notify/message/NotifyMessageDetail.vue
@@ -49,7 +49,7 @@ defineOptions({ name: 'SystemNotifyMessageDetail' })
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
-const detailData = ref() // 详情数据
+const detailData = ref({} as NotifyMessageApi.NotifyMessageVO) // 详情数据
 
 /** 打开弹窗 */
 const open = async (data: NotifyMessageApi.NotifyMessageVO) => {
diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue
index 94844118..99f145c5 100644
--- a/src/views/system/notify/message/index.vue
+++ b/src/views/system/notify/message/index.vue
@@ -28,7 +28,7 @@
         >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
-            :key="dict.value"
+            :key="dict.value as number"
             :label="dict.label"
             :value="dict.value"
           />
@@ -52,7 +52,7 @@
         >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE)"
-            :key="dict.value"
+            :key="dict.value as number"
             :label="dict.label"
             :value="dict.value"
           />
diff --git a/src/views/system/notify/my/MyNotifyMessageDetail.vue b/src/views/system/notify/my/MyNotifyMessageDetail.vue
index 19f606ce..0bfa30c4 100644
--- a/src/views/system/notify/my/MyNotifyMessageDetail.vue
+++ b/src/views/system/notify/my/MyNotifyMessageDetail.vue
@@ -31,7 +31,7 @@ defineOptions({ name: 'MyNotifyMessageDetailDetail' })
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
-const detailData = ref() // 详情数据
+const detailData = ref({} as NotifyMessageApi.NotifyMessageVO) // 详情数据
 
 /** 打开弹窗 */
 const open = async (data: NotifyMessageApi.NotifyMessageVO) => {
diff --git a/src/views/system/notify/my/index.vue b/src/views/system/notify/my/index.vue
index ae4b9c52..af77aba7 100644
--- a/src/views/system/notify/my/index.vue
+++ b/src/views/system/notify/my/index.vue
@@ -19,7 +19,7 @@
         >
           <el-option
             v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
+            :key="dict.value as number"
             :label="dict.label"
             :value="dict.value"
           />
diff --git a/src/views/system/notify/template/NotifyTemplateForm.vue b/src/views/system/notify/template/NotifyTemplateForm.vue
index 919c6549..87516025 100644
--- a/src/views/system/notify/template/NotifyTemplateForm.vue
+++ b/src/views/system/notify/template/NotifyTemplateForm.vue
@@ -23,7 +23,7 @@
         <el-select v-model="formData.type" placeholder="请选择类型">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE)"
-            :key="dict.value"
+            :key="dict.value as number"
             :label="dict.label"
             :value="dict.value"
           />
@@ -33,7 +33,7 @@
         <el-radio-group v-model="formData.status">
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="dict.value"
+            :key="dict.value as number"
             :label="dict.value as string"
           >
             {{ dict.label }}
@@ -61,12 +61,12 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型
 const formData = ref<NotifyTemplateApi.NotifyTemplateVO>({
-  id: null,
+  id: undefined,
   name: '',
   nickname: '',
   code: '',
   content: '',
-  type: null,
+  type: undefined,
   params: '',
   status: CommonStatusEnum.ENABLE,
   remark: ''
@@ -126,12 +126,12 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    id: null,
+    id: undefined,
     name: '',
     nickname: '',
     code: '',
     content: '',
-    type: null,
+    type: undefined,
     params: '',
     status: CommonStatusEnum.ENABLE,
     remark: ''
diff --git a/src/views/system/notify/template/NotifyTemplateSendForm.vue b/src/views/system/notify/template/NotifyTemplateSendForm.vue
index 964f6b98..53089d1a 100644
--- a/src/views/system/notify/template/NotifyTemplateSendForm.vue
+++ b/src/views/system/notify/template/NotifyTemplateSendForm.vue
@@ -19,7 +19,7 @@
         <el-radio-group v-model="formData.userType">
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
-            :key="dict.value"
+            :key="dict.value as number"
             :label="dict.value as number"
           >
             {{ dict.label }}
@@ -71,7 +71,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formData = ref({
   content: '',
   params: {},
-  userId: null,
+  userId: undefined,
   userType: 1,
   templateCode: '',
   templateParams: new Map()
diff --git a/src/views/system/notify/template/index.vue b/src/views/system/notify/template/index.vue
index 5aef80d2..eb0e73a6 100644
--- a/src/views/system/notify/template/index.vue
+++ b/src/views/system/notify/template/index.vue
@@ -37,7 +37,7 @@
         >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="dict.value"
+            :key="dict.value as number"
             :label="dict.label"
             :value="dict.value"
           />