fix

src/views/message/message-record/email-record.tsx

@@ -79,8 +79,8 @@ export default defineComponent({
     const columns = (): any => {
       return [
         {
-          title: '消息名称',
-          key: 'description'
+          title: '标题',
+          key: 'title'
         },
         {
           title: '发送时间',
@@ -95,10 +95,6 @@ export default defineComponent({
           key: 'receiver'
         },
         {
-          title: '标题',
-          key: 'title'
-        },
-        {
           title: '正文',
           key: 'content',
           render: (row: any) => {
@@ -122,9 +118,9 @@ export default defineComponent({
                 saveKey="email-record"
                 onSetModel={(val: any) => (state.searchForm = val)}
             >
-              <NFormItem label="消息名称" path="title">
+              <NFormItem label="标题" path="title">
                 <NInput
-                    placeholder="请输入消息名称"
+                    placeholder="请输入标题"
                     v-model:value={state.searchForm.title}
                     clearable
                 />

src/views/message/message-record/push-record.tsx

@@ -6,6 +6,7 @@ import {getMapValueByKey, getSelectDataFromObj} from '@/utils/objectUtil'
 import {clientType, messageSenderFunctionModule} from '@/utils/constant'
 import {getTimes} from "@/utils/dateUtil";
 import {sysMessageConfigPage, sysMessagePage} from "@views/message/api";
+import TheTooltip from "@components/TheTooltip";
 
 export default defineComponent({
   name: 'push-record',
@@ -29,8 +30,9 @@ export default defineComponent({
       },
       searchForm: {
         title: null, //消息名称
+        receiver: null, // 接收人手机号
         clientId: null, //客户端
-        model: null, // 功能模块
+        group: null, // 功能模块
         sendTime: null // 发送时间
       },
       dataList: []
@@ -65,11 +67,9 @@ export default defineComponent({
         state.loading = true
         const {data} = await sysMessagePage({
           ...state.pagination,
-          title: state.searchForm.title,
-          clientId: state.searchForm.clientId,
-          model: state.searchForm.model,
+          ...state.searchForm,
           appKey: props.appKey,
-          sendMode:'PUSH',
+          sendMode: 'PUSH',
           ...getTimes(state.searchForm.sendTime, ['sendTimeStart', 'sendTimeEnd']),
         })
         state.pagination.pageTotal = Number(data.total)
@@ -82,24 +82,33 @@ export default defineComponent({
     const columns = (): any => {
       return [
         {
-          title: '消息名称',
-          key: 'description'
+          title: '标题',
+          key: 'title'
+        },
+        {
+          title: '推送内容',
+          key: 'content',
+          render: (row: any) => {
+            return (
+                <TheTooltip showContentWidth={400} content={row.content}/>
+            )
+          }
         },
         {
           title: '发送时间',
           key: 'sendTime'
         },
         {
-          title: '发送平台',
-          key: 'senderName'
+          title: '接收人姓名',
+          key: 'username'
         },
         {
-          title: '姓名',
-          key: 'username'
+          title: '接收人手机号',
+          key: 'receiver'
         },
         {
-          title: '消息名称',
-          key: 'title'
+          title: '发送平台',
+          key: 'senderName'
         },
         {
           title: '发送对象',
@@ -128,12 +137,13 @@ export default defineComponent({
           key: 'triggerCondition'
         },
         {
-          title: '推送标题',
-          key: 'title'
-        },
-        {
-          title: '推送内容',
-          key: 'content'
+          title: '消息模板描述',
+          key: 'description',
+          render: (row: any) => {
+            return (
+                <TheTooltip showContentWidth={400} content={row.description}/>
+            )
+          }
         },
       ]
     }
@@ -148,13 +158,20 @@ export default defineComponent({
                 saveKey="push-record"
                 onSetModel={(val: any) => (state.searchForm = val)}
             >
-              <NFormItem label="消息名称" path="title">
+              <NFormItem label="标题" path="title">
                 <NInput
-                    placeholder="请输入消息名称"
+                    placeholder="请输入标题"
                     v-model:value={state.searchForm.title}
                     clearable
                 />
               </NFormItem>
+              <NFormItem label="接收人手机号" path="receiver">
+                <NInput
+                    placeholder="请输入接收人手机号"
+                    v-model:value={state.searchForm.receiver}
+                    clearable
+                />
+              </NFormItem>
               <NFormItem label="发送对象" path="clientId">
                 <NSelect
                     placeholder="全部发送对象"
@@ -163,11 +180,11 @@ export default defineComponent({
                     clearable
                 />
               </NFormItem>
-              <NFormItem label="功能模块" path="model">
+              <NFormItem label="功能模块" path="group">
                 <NSelect
                     filterable
                     placeholder="全部功能模块"
-                    v-model:value={state.searchForm.model}
+                    v-model:value={state.searchForm.group}
                     options={getSelectDataFromObj(messageSenderFunctionModule)}
                     clearable
                 ></NSelect>

src/views/message/message-record/sms-record.tsx

@@ -83,16 +83,21 @@ export default defineComponent({
     const columns = (): any => {
       return [
         {
-          title: '消息名称',
-          key: 'description'
+          title: '标题',
+          key: 'title'
         },
         {
-          title: '发送时间',
-          key: 'sendTime'
+          title: '消息内容',
+          key: 'content',
+          render: (row: any) => {
+            return (
+                <TheTooltip showContentWidth={400} content={row.content}/>
+            )
+          }
         },
         {
-          title: '发送平台',
-          key: 'senderName'
+          title: '发送时间',
+          key: 'sendTime'
         },
         {
           title: '发送对象',
@@ -106,6 +111,18 @@ export default defineComponent({
           }
         },
         {
+          title: '接收人姓名',
+          key: 'username'
+        },
+        {
+          title: '接收人手机号',
+          key: 'receiver'
+        },
+        {
+          title: '发送平台',
+          key: 'senderName'
+        },
+        {
           title: '发送状态',
           key: 'status',
           render: (row: any) => {
@@ -117,14 +134,6 @@ export default defineComponent({
           }
         },
         {
-          title: '接收人姓名',
-          key: 'username'
-        },
-        {
-          title: '接收人手机号',
-          key: 'receiver'
-        },
-        {
           title: '读取状态',
           key: 'readStatus',
           render: (row: any) => {
@@ -151,15 +160,6 @@ export default defineComponent({
           key: 'triggerCondition'
         },
         {
-          title: '消息内容',
-          key: 'content',
-          render: (row: any) => {
-            return (
-                <TheTooltip showContentWidth={400} content={row.content}/>
-            )
-          }
-        },
-        {
           title: '错误信息',
           key: 'errorMsg',
           render: (row: any) => {
@@ -168,6 +168,10 @@ export default defineComponent({
             )
           }
         },
+        {
+          title: '消息名称',
+          key: 'description'
+        },
       ]
     }
 
@@ -181,9 +185,9 @@ export default defineComponent({
                 saveKey="sms-record"
                 onSetModel={(val: any) => (state.searchForm = val)}
             >
-              <NFormItem label="消息名称" path="title">
+              <NFormItem label="标题" path="title">
                 <NInput
-                    placeholder="请输入消息名称"
+                    placeholder="请输入标题"
                     v-model:value={state.searchForm.title}
                     clearable
                 />

src/views/message/message-record/wechat-record.tsx

@@ -80,8 +80,8 @@ export default defineComponent({
     const columns = (): any => {
       return [
         {
-          title: '消息名称',
-          key: 'description'
+          title: '标题',
+          key: 'title'
         },
         {
           title: '发送时间',
@@ -92,18 +92,14 @@ export default defineComponent({
           key: 'senderName'
         },
         {
-          title: '姓名',
+          title: '接收人姓名',
           key: 'username'
         },
         {
-          title: 'openID',
+          title: '接收人手机号',
           key: 'receiver'
         },
         {
-          title: '消息名称',
-          key: 'title'
-        },
-        {
           title: '消息内容',
           key: 'content',
           render: (row: any) => (
@@ -164,9 +160,9 @@ export default defineComponent({
                 saveKey="wechat-record"
                 onSetModel={(val: any) => (state.searchForm = val)}
             >
-              <NFormItem label="消息名称" path="title">
+              <NFormItem label="标题" path="title">
                 <NInput
-                    placeholder="请输入消息名称"
+                    placeholder="请输入标题"
                     v-model:value={state.searchForm.title}
                     clearable
                 />