feats

src/pages/message/detail.jsx

@@ -0,0 +1,40 @@
+import React from 'react';
+import { Button, Card, Typography } from 'antd';
+import { useSearchParams, Link } from 'react-router-dom';
+import { getMessage } from '@/services/message';
+import useBool from '@/utils/hooks/useBool';
+
+export default (props) => {
+  const [searchParams] = useSearchParams();
+  const [loading, startLoading, cancelLoading] = useBool(false);
+
+  const [detail, setDetail] = React.useState({});
+  const id = searchParams.get('id');
+
+  React.useEffect(() => {
+    if (id) {
+      startLoading()
+      getMessage(id).then((res) => {
+        setDetail(res);
+        cancelLoading();
+      }).catch(() => {
+        cancelLoading();
+      });
+    }
+  }, [id]);
+
+  return (
+    <Card
+      loading={loading}
+      title={detail.createDate}
+      actions={[
+        <Button key={1} type="link" disabled={detail.isReaded}>设为已读</Button>,
+        <Link>去处理</Link>
+      ]}
+    >
+      <Typography.Paragraph>
+        {detail.message}
+      </Typography.Paragraph>
+    </Card>
+  )
+}

src/pages/message/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, Link } from 'react-router-dom';
 import { queryTable } from '@/utils/request';
 import { ProTable } from '@ant-design/pro-components';
 import { Button, message, Popconfirm } from 'antd';
@@ -9,16 +9,12 @@ const queryMessage = queryTable(getMessageList);
 
 export default (props) => {
   const columns = [
-    {
-      title: 'id',
-      dataIndex: 'id',
-      search: false,
-    },
     {
       title: '时间',
       dataIndex: 'createDate',
       valueType: 'date',
       search: false,
+      width: 160,
     },
     {
       title: '时间',
@@ -42,12 +38,13 @@ export default (props) => {
       title: '状态',
       dataIndex: 'isReaded',
       search: false,
+      width: 120,
       valueEnum: {
-        1: {
+        true: {
           text: '已读',
           status: 'Processing',
         },
-        0: {
+        false: {
           text: '未读',
           status: 'Error',
         },
@@ -57,18 +54,26 @@ export default (props) => {
       title: '操作',
       valueType: 'option',
       width: 200,
-      render: (_, record) => [
-        <Button
-          key={2}
-          style={{ padding: 0 }}
-          type="link"
-          onClick={() => {
-            navigate(`/system/message/detail?id=${record.id}`);
-          }}
-        >
-          详情
-        </Button>,
-      ],
+      render: (_, record) => {
+        const doUrl = record.targetType === 'store' ?
+        `/stock/list?id=${record.targetId}` : undefined;
+
+        return [
+          <Button
+            key={1}
+            type="link"
+            disabled={record.isReaded}
+          >
+            设为已读
+          </Button>,
+          <Link
+            key={2}
+            to={doUrl}
+          >
+            去处理
+          </Link>,
+        ]
+      },
     },
   ]
 

src/pages/stock/list/index.jsx

@@ -1,29 +1,21 @@
 import { deleteStore, getStoreList, getStoreTypeList, storeExport } from '@/services/stock';
 import { queryDict, queryTable } from '@/utils/request';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Button, message, Modal, Popconfirm } from 'antd';
 import { useRef, useState } from 'react';
 import OutAndIn from '../outAndIn';
+import './style.less';
 
 const StockList = (props) => {
   const [isOpen, setIsOpen] = useState(false);
   const [modalData, setModalData] = useState({});
-  // const [storeTypeDict, setStoreTypeDict] = useState([]);
   const actionRef = useRef();
   const formRef = useRef();
   const navigate = useNavigate();
-  
-  // useEffect(() => {
-  //   getStoreTypeList({ pageSize: 9999, pageNum: 1 }).then((res) => {
-  //     setStoreTypeDict(
-  //       res?.records?.map((x) => ({
-  //         label: x.name,
-  //         value: x.id,
-  //       })) || [],
-  //     );
-  //   });
-  // }, []);
+  const [searchParams] = useSearchParams();
+
+  const id = searchParams.get('id');
 
   const handleDelete = (id) => {
     if (id) {
@@ -44,14 +36,10 @@ const StockList = (props) => {
   };
 
   const columns = [
-    // {
-    //   title: 'id',
-    //   dataIndex: 'id',
-    //   search: false,
-    // },
     {
       title: '名称',
       dataIndex: 'name',
+      render: (t, row) => row.warnAmount >= row.amount ? `${t} (库存不足)` : t
     },
     {
       title: '单位',
@@ -70,7 +58,6 @@ const StockList = (props) => {
       dataIndex: 'amount',
       search: false,
     },
-
     {
       title: '操作',
       valueType: 'option',
@@ -120,7 +107,9 @@ const StockList = (props) => {
       <ProTable
         actionRef={actionRef}
         formRef={formRef}
+        params={{ id }}
         rowKey="id"
+        rowClassName={(row) => row.warnAmount >= row.amount ? 'store-danger' : ''}
         toolBarRender={() => [
           <Button
             key="2"

src/pages/stock/list/style.less

@@ -0,0 +1,4 @@
+
+.store-danger {
+  color: #ff4d4f;
+}

src/routes/routes.jsx

@@ -43,6 +43,7 @@ import EmergencyPlanEdit from "@/pages/cms/emergencyPlan/edit";
 import EmergencyPlanDetail from "@/pages/cms/emergencyPlan/detail";
 import FilesList from "@/pages/cms/files/list";
 import MessageList from '@/pages/message';
+import MessageDetail from '@/pages/message/detail';
 
 /**
  * meta 用来扩展自定义数据数据
@@ -305,6 +306,14 @@ export const authRoutes = [
         meta: {
           title: '消息列表',
         },
+      },
+      {
+        path: 'message/detail',
+        element: <MessageDetail />,
+        meta: {
+          title: '消息详情',
+          hideInMenu: true,
+        },
       }
     ],
   },

src/services/message.js

@@ -2,8 +2,10 @@ import { restful } from '@/utils/request';
 
 const [
   getMessageList,
+  getMessage,
 ] = restful("/noticeMessage");
 
 export {
   getMessageList,
+  getMessage,
 }