feat:通知增加查看功能

@@ -26,10 +26,9 @@ enum NotifyManagerApi {
 //  * 获取详情
 //  * 获取详情
 //  * @param
 //  * @param
 //  */
 //  */
-export const screenLinkPageByDeptIdGetDevice = (params: NoticeByIdParams) => {
+export const noticeByIdGetInfo = (id: string) => {
   return defHttp.get({
   return defHttp.get({
-    url: NotifyManagerApi.NOTICE_GET_DETAIL_URL,
-    params,
+    url: `${NotifyManagerApi.NOTICE_GET_DETAIL_URL}/${id}`,
   });
   });
 };
 };
 
 

@@ -10,34 +10,49 @@
 
 
   const schema: DescItem[] = [
   const schema: DescItem[] = [
     {
     {
+      field: 'creator',
+      label: '创建者',
+    },
+    {
       field: 'title',
       field: 'title',
       label: '标题',
       label: '标题',
     },
     },
     {
     {
-      field: 'content',
-      label: '内容',
+      field: 'updateTime',
+      label: '更新时间',
     },
     },
     {
     {
       field: 'senderName',
       field: 'senderName',
       label: '发送者',
       label: '发送者',
     },
     },
     {
     {
-      field: 'createTime',
-      label: '发送时间',
+      field: 'readDate',
+      label: '阅读时间',
+    },
+    {
+      field: 'readStatus',
+      label: '阅读状态',
+      render: (_, data) => {
+        return data.readStatus === 0 ? '草稿' : data.readStatus === 1 ? '已读' : '其他';
+      },
     },
     },
     {
     {
       field: 'type',
       field: 'type',
       label: '类型',
       label: '类型',
       render: (_, data) => {
       render: (_, data) => {
-        return data.type === 'MEETING'
+        return data.type === 'NOTICE'
           ? '公告'
           ? '公告'
-          : data.type === 'MEETING1'
+          : data.type === 'MEETING'
           ? '会议'
           ? '会议'
-          : data.type === 'MEETING2'
+          : data.type === 'OTHER'
           ? '其他'
           ? '其他'
           : '';
           : '';
       },
       },
     },
     },
+    {
+      field: 'updater',
+      label: '更新者',
+    },
   ];
   ];
   export default defineComponent({
   export default defineComponent({
     components: { Description, PageWrapper },
     components: { Description, PageWrapper },

@@ -4,36 +4,78 @@
     @register="registerDrawer"
     @register="registerDrawer"
     :showFooter="false"
     :showFooter="false"
     :title="getTitle"
     :title="getTitle"
-    width="800px"
+    width="1000px"
   >
   >
     <DetailChild :emitChildData="childData" />
     <DetailChild :emitChildData="childData" />
+    <BasicTable :columns="columns" :dataSource="tableData">
+      <span></span>
+    </BasicTable>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';
   import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import DetailChild from './child/index.vue';
   import DetailChild from './child/index.vue';
-  import { notifyMyGetDetailApi } from '/@/api/stationnotification/stationnotifyApi';
-
-  // import { useMessage } from '/@/hooks/web/useMessage';
+  import {
+    notifyMyGetrReadApi,
+    notifyMyGetDetailApi,
+  } from '/@/api/stationnotification/stationnotifyApi';
+  import { BasicTable } from '/@/components/Table';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'ConfigDrawer',
     name: 'ConfigDrawer',
-    components: { BasicDrawer, DetailChild },
+    components: { BasicDrawer, DetailChild, BasicTable },
     emits: ['success', 'register'],
     emits: ['success', 'register'],
     setup() {
     setup() {
-      // const { createMessage } = useMessage();
       const isUpdate = ref(true);
       const isUpdate = ref(true);
-      let childData: any = ref(null);
+      const childData: any = ref(null);
+      const tableData = ref([]);
+      const columns: BasicColumn[] = [
+        {
+          title: '创建时间',
+          dataIndex: 'createTime',
+        },
+        {
+          title: '阅读状态',
+          dataIndex: 'readStatus',
+          format: (_text: string, record: Recordable) => {
+            return record.readStatus === 0 ? '草稿' : record.readStatus === 1 ? '已读' : '其他';
+          },
+        },
+        {
+          title: '阅读时间',
+          dataIndex: 'readDate',
+        },
+        {
+          title: '发送者',
+          dataIndex: 'senderName',
+        },
+        {
+          title: '类型',
+          dataIndex: 'type',
+          render: (_, data) => {
+            return data.type === 'NOTICE'
+              ? '公告'
+              : data.type === 'MEETING'
+              ? '会议'
+              : data.type === 'OTHER'
+              ? '其他'
+              : '';
+          },
+        },
+      ];
+      // const { createMessage } = useMessage();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
-        console.log(data.record);
         if (data.record) {
         if (data.record) {
-          // console.log(data.record.id);
           let getData = await notifyMyGetDetailApi(data.record.id);
           let getData = await notifyMyGetDetailApi(data.record.id);
           childData.value = getData;
           childData.value = getData;
-          // createMessage.success()
+          let tableGet = await notifyMyGetrReadApi({
+            page: 1,
+            pageSize: 10,
+          });
+          tableData.value = tableGet.items;
         }
         }
         //编辑
         //编辑
         if (unref(isUpdate)) {
         if (unref(isUpdate)) {
@@ -47,6 +89,8 @@
       };
       };
 
 
       return {
       return {
+        tableData,
+        columns,
         childData,
         childData,
         handleCancel,
         handleCancel,
         getTitle,
         getTitle,

@@ -9,88 +9,86 @@
     <PageWrapper title="站内通知详情">
     <PageWrapper title="站内通知详情">
       <Description @register="register1" class="mt-4" />
       <Description @register="register1" class="mt-4" />
     </PageWrapper>
     </PageWrapper>
-    <BasicTable :columns="columns" :dataSource="tableData">
-      <span></span>
-    </BasicTable>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';
   import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTable } from '/@/components/Table';
   import { Description, DescItem, useDescription } from '/@/components/Description/index';
   import { Description, DescItem, useDescription } from '/@/components/Description/index';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
+  import { noticeByIdGetInfo } from '/@/api/stationnotification/stationnotifyApi';
 
 
+  const schema: DescItem[] = [
+    {
+      field: 'title',
+      label: '标题',
+    },
+    {
+      field: 'content',
+      label: '内容',
+    },
+    {
+      field: 'senderName',
+      label: '发送者',
+    },
+    {
+      field: 'senderDate',
+      label: '发送时间',
+    },
+    {
+      field: 'type',
+      label: '类型',
+      render: (_, data) => {
+        return data.type === 'MEETING'
+          ? '公告'
+          : data.type === 'MEETING1'
+          ? '会议'
+          : data.type === 'MEETING2'
+          ? '其他'
+          : '';
+      },
+    },
+    {
+      field: 'status',
+      label: '状态',
+    },
+    {
+      field: 'updateTime',
+      label: '更新时间',
+    },
+    {
+      field: 'receiverType',
+      label: '接收类型',
+    },
+    {
+      field: 'createTime',
+      label: '创建时间',
+    },
+  ];
   export default defineComponent({
   export default defineComponent({
     name: 'ConfigDrawer',
     name: 'ConfigDrawer',
-    components: { BasicDrawer, BasicTable, Description, PageWrapper },
+    components: { BasicDrawer, Description, PageWrapper },
     emits: ['success', 'register'],
     emits: ['success', 'register'],
     setup() {
     setup() {
-      let tableData = ref([]);
-      const schema: DescItem[] = [
-        {
-          field: 'title',
-          label: '标题',
-        },
-        {
-          field: 'content',
-          label: '内容',
-        },
-        {
-          field: 'senderName',
-          label: '发送者',
-        },
-        {
-          field: 'senderDate',
-          label: '发送时间',
-        },
-        {
-          field: 'type',
-          label: '类型',
-          render: (_, data) => {
-            return data.type === 'MEETING'
-              ? '公告'
-              : data.type === 'MEETING1'
-              ? '会议'
-              : data.type === 'MEETING2'
-              ? '其他'
-              : '';
-          },
-        },
-      ];
-
-      const columns: BasicColumn[] = [
-        {
-          title: '接收者',
-          dataIndex: 'senderName',
-        },
-        {
-          title: '阅读状态',
-          dataIndex: 'status',
-        },
-        {
-          title: '阅读时间',
-          dataIndex: 'createTime',
-        },
-      ];
+      let descInfo = ref(null);
       const isUpdate = ref(true);
       const isUpdate = ref(true);
+
       const [registerDrawer, { setDrawerProps }] = useDrawerInner(async (data) => {
       const [registerDrawer, { setDrawerProps }] = useDrawerInner(async (data) => {
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
-        tableData.value.push(data.record);
+        let getDescInfo = await noticeByIdGetInfo(data.record.id);
+        descInfo.value = getDescInfo;
       });
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '查看通知' : '查看通知'));
       const getTitle = computed(() => (!unref(isUpdate) ? '查看通知' : '查看通知'));
       const [register1] = useDescription({
       const [register1] = useDescription({
         title: '详情',
         title: '详情',
         bordered: false,
         bordered: false,
-        data: tableData,
+        data: descInfo,
         schema: schema,
         schema: schema,
       });
       });
       return {
       return {
         register1,
         register1,
-        tableData,
         getTitle,
         getTitle,
-        columns,
         registerDrawer,
         registerDrawer,
       };
       };
     },
     },