feats

src/pages/dish/edit/Detail.jsx

@@ -1,27 +1,40 @@
 import React from 'react';
-import { Row, Col, Divider, Typography, Image } from 'antd';
+import { Button, Row, Col, Card, Typography, Image } from 'antd';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { getDishById } from '@/services/dish';
 
 const { Title, Paragraph } = Typography;
 
 export default (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get('id');
+  const [dish, setDish] = React.useState({});
 
-  const { dish = {} } = props;
+  const navigate = useNavigate();
+
+  React.useEffect(() => {
+    if (id) {
+      getDishById(id).then((res) => {
+        setDish(res);
+        console.log(res)
+      });
+    }
+  }, [id]);
 
   return (
-    <Row gutter={24}>
-      <Col span={12}>
-        <Typography>
-          {/* <Title level={3}>
-            五花肉
-          </Title> */}
-          <Paragraph>
-            <div dangerouslySetInnerHTML={{ __html: dish.content }}  style={{ fontSize: '16px', lineHeight: '2em' }} />
-          </Paragraph>
-        </Typography>
-      </Col>
-      <Col span={12}>
-        <Image src={dish.thumb} />
-      </Col>
-    </Row>
+    <Card title={dish.name} extra={<Button onClick={() => navigate(-1)}>返回</Button>}>
+      <Row gutter={24}>
+        <Col span={12}>
+          <Typography>
+            <Paragraph>
+              <div dangerouslySetInnerHTML={{ __html: dish.content }}  style={{ fontSize: '16px', lineHeight: '2em' }} />
+            </Paragraph>
+          </Typography>
+        </Col>
+        <Col span={12}>
+          <Image style={{ minWidth: '240px' }} src={dish.thumb} />
+        </Col>
+      </Row>
+    </Card>
   )
 }

src/pages/dish/edit/index.jsx

@@ -3,14 +3,12 @@ import { PageContainer } from '@ant-design/pro-components';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Alert, Card, Row, Col, message, Space, Button } from 'antd';
 import { useEffect, useRef, useState, useMemo } from 'react';
-import Detail from './Detail';
 import Edit from './Edit';
 
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get('id');
   const [dish, setDish] = useState();
-  const [isPreivw, setIsPreview] = useState(!!id);
   const navigate = useNavigate();
   
   useEffect(() => {
@@ -23,17 +21,13 @@ export default (props) => {
 
   const onFinish = (values) => {
     setDish(values);
-    // navigate(-1);
+    navigate(-1);
   };
 
   return (
     <PageContainer>
-      <Card
-        title={(dish || {}).name}
-        extra={<Button type='link' disabled={!id} onClick={() => setIsPreview(!isPreivw)}>{ isPreivw ? '编辑' : '图文' }</Button>}>
-        {
-          isPreivw ? <Detail dish={dish} /> : <Edit dish={dish} onFinish={onFinish} />
-        }
+      <Card style={{ paddingTop: '24px' }}>
+        <Edit dish={dish} onFinish={onFinish} />
       </Card>
     </PageContainer>
   );

src/pages/dish/list/index.jsx

@@ -1,7 +1,7 @@
 import { getDishList, addDish, updataDish, deleteDish } from '@/services/dish';
 import { queryTable } from '@/utils/request';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, Link } from 'react-router-dom';
 import { Button, message, Popconfirm } from 'antd';
 import { useRef, useState } from 'react';
 
@@ -34,6 +34,7 @@ const DishList = (props) => {
     {
       title: '菜肴名称',
       dataIndex: 'name',
+      render: (t, row) => <Link to={`/stock/dish/detail?id=${row.id}`}>{t}</Link>
     },
 
     {
@@ -52,6 +53,17 @@ const DishList = (props) => {
       width: 200,
       render: (_, record) => [
 
+        <Button
+          key={1}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            navigate(`/stock/dish/detail?id=${record.id}`);
+          }}
+        >
+          详情
+        </Button>,
+
         <Button
           key={2}
           style={{ padding: 0 }}

src/pages/guaranteeTask/Edit/DishList.jsx

@@ -35,16 +35,17 @@ export default (props) => {
       const { records = [] } = res;
       if (records.length > 0) {
         for (let it of records) {
+          const dishAmount = (it.amount || 1) * amount;
           const found = list.filter(x => x.dishId === it.id)[0]
           if (found) {
-            found.dishAmount = amount;
+            found.dishAmount = dishAmount;
           } else {
             list.push({
               guaranteeId: dataSource.id,
               dishId: it.id,
               dishName: it.name,
               dishUnit: it.unit,
-              dishAmount: amount,
+              dishAmount: dishAmount,
             })
           }
         }

src/pages/package/List.jsx

@@ -4,13 +4,14 @@ import classNames from 'classnames';
 import BasicForm from './BasicForm';
 import { getPackageList, deletePackage } from '@/services/package';
 import useBool from '@/utils/hooks/useBool';
+import { floatDivide } from '@/utils/float';
 
 export default forwardRef((props, ref) => {
   const { current, setCurrent } = props;
   const [loading, startLoading, stopLoading] = useBool();
   const [open, setVisible, hide] = useBool();
   const [hasMore, setHasMore] = useState(false);
-  const [filter, setFilter] = useState({ pageNum: 1, pageSize: 10, total: 0 });
+  const [filter, setFilter] = useState({ pageNum: 1, pageSize: 20, total: 0 });
   const [list, setList] = useState([]);
   const listRef = useRef();
   listRef.current = list;
@@ -121,24 +122,28 @@ export default forwardRef((props, ref) => {
       dataSource={list}
       loading={loading}
       loadMore={loadMore}
-      renderItem={item => (
-        <List.Item
-          className={classNames({ active: current.id === item.id })}
-          onClick={() => setCurrent(item)}
-          actions={[
-            <Button key="edit" type='link' onClick={() => onEdit(item)}>编辑</Button>,
-            <Popconfirm
-              key="delete"
-              title="确认删除?"
-              onConfirm={() => onDelete(item)}
-              >
-              <a href="#">删除</a>
-            </Popconfirm>
-          ]}
-        >
-          {item.name}
-        </List.Item>
-      )}
+      renderItem={item => {
+        const price = item.price ? floatDivide(item.price, 100) : 0;
+
+        return (
+          <List.Item
+            className={classNames({ active: current.id === item.id })}
+            onClick={() => setCurrent(item)}
+            actions={[
+              <Button key="edit" type='link' onClick={() => onEdit(item)}>编辑</Button>,
+              <Popconfirm
+                key="delete"
+                title="确认删除?"
+                onConfirm={() => onDelete(item)}
+                >
+                <a href="#">删除</a>
+              </Popconfirm>
+            ]}
+          >
+            {`${item.name} ￥${price}元`}
+          </List.Item>
+        )
+      }}
     />
     <Modal open={open} title="套餐维护" footer={null} onCancel={hide} maskClosable={false} >
       <BasicForm current={current} onChange={handleForm}></BasicForm>

src/routes/routes.jsx

@@ -24,6 +24,7 @@ import GuaranteePersonnelList from "@/pages/guarantee/personnel/list";
 import GuaranteePersonnelEdit from "@/pages/guarantee/personnel/edit";
 import DishList from "@/pages/dish/list";
 import DishEdit from "@/pages/dish/edit";
+import DishDetail from "@/pages/dish/edit/detail";
 import PackageList from "@/pages/package";
 import StockList from "@/pages/stock/list";
 import StockEdit from "@/pages/stock/edit";
@@ -208,6 +209,15 @@ export const authRoutes = [
           permission: 'dish.edit',
         },
       },
+      {
+        path: "dish/detail",
+        element: <DishDetail />,
+        meta: {
+          hideInMenu: true,
+          title: "菜肴详情",
+          // permission: 'dish.detail',
+        },
+      },
       {
         path: "package/list",
         element: <PackageList />,