Merge branch 'dev' of http://git.ycjcjy.com/jgz/admin into dev

src/components/Wangeditor/index.jsx

@@ -5,7 +5,16 @@ import { Editor, Toolbar } from "@wangeditor/editor-for-react";
 // 工具栏配置参考
 // https://www.cnblogs.com/-roc/p/16400965.html
 
+const defaultStyle = {
+  border: "1px solid #ccc",
+  zIndex: 100,
+  marginTop: "15px"
+}
+
 function MyEditor(props) {
+
+  const style = React.useMemo(() => ({ ...defaultStyle, ...(props.style || {}) }), [props.style])
+
   const {
     value = "",
     onChange = (e) => {
@@ -46,25 +55,30 @@ function MyEditor(props) {
     console.log(editor.getHtml());
   }
 
+  const handleChange = (editor) => {
+    const raw = editor.getHtml();
+    if (raw !== '<p><br></p>') {
+      onChange(raw)
+    }
+  }
+
   return !readonly ? (
-    <>
-      <div style={{ border: "1px solid #ccc", zIndex: 100, marginTop: "15px" }}>
-        <Toolbar
-          editor={editor}
-          defaultConfig={toolbarConfig}
-          mode="default"
-          style={{ borderBottom: "1px solid #ccc" }}
-        />
-        <Editor
-          defaultConfig={editorConfig}
-          value={html}
-          onCreated={setEditor}
-          onChange={(editor) => onChange(editor.getHtml())}
-          mode="default"
-          style={{ height: "500px" }}
-        />
-      </div>
-    </>
+    <div className={props.className} style={style}>
+      <Toolbar
+        editor={editor}
+        defaultConfig={toolbarConfig}
+        mode="default"
+        style={{ borderBottom: "1px solid #ccc" }}
+      />
+      <Editor
+        defaultConfig={editorConfig}
+        value={html}
+        onCreated={setEditor}
+        onChange={handleChange}
+        mode="default"
+        style={{ height: "500px" }}
+      />
+    </div>
   ) : (
     <div dangerouslySetInnerHTML={{ __html: value }}></div>
   );

src/pages/dish/edit/Detail.jsx

@@ -0,0 +1,39 @@
+import React from 'react';
+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 navigate = useNavigate();
+
+  React.useEffect(() => {
+    if (id) {
+      getDishById(id).then((res) => {
+        setDish(res);
+      });
+    }
+  }, [id]);
+
+  return (
+    <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', maxWidth: '480px' }} src={dish.thumb} />
+        </Col>
+      </Row>
+    </Card>
+  )
+}

src/pages/dish/edit/Edit.jsx

@@ -0,0 +1,49 @@
+import { getStoreList, getStoreTypeList } from '@/services/stock';
+import { Alert, Row, Col } from 'antd';
+import { useEffect, useState, useMemo } from 'react';
+import Form from './Form';
+
+export default (props) => {
+  const { dish, onFinish } = props;
+
+  const [ingredientsList, setIngredientsList] = useState([]);
+  const [storeList, setStoreList] = useState([]);
+  const [storeTypeList, setStoreTypeList] = useState([]);
+  
+  const foodDict = useMemo(() => storeList.map(x => ({ label: x.name, value: x.id, })), [storeList]);
+  const Nutrition = useMemo(() => {
+    if (!ingredientsList.length
+      || !storeList.length
+      || !storeTypeList.length
+      ) return [];
+
+    return ingredientsList.map(x => storeList.filter(y => y.id === x)[0])
+      .map(x => storeTypeList.filter(y => y.id === x.typeId)[0].nutrition)
+      .map((it, inx) => (<p key={inx}>{it}</p>));
+  }, [ingredientsList, storeList, storeTypeList]);
+  
+  useEffect(() => {
+    getStoreList({ isDish: 1, pageSize: 9999 }).then((res) => {
+      setStoreList(res?.records || []);
+    });
+    getStoreTypeList({ isFood: 1, pageSize: 9999 }).then((res) => {
+      setStoreTypeList(res?.records || []);
+    });
+  }, []);
+
+  useEffect(() => {
+    const { ingredientsIdList } = dish || {};
+    setIngredientsList(ingredientsIdList || [])
+  }, [dish]);
+
+  return (
+    <Row gutter={48}>
+      <Col span={12}>
+        <Form dish={dish} onFinish={onFinish} foodDict={foodDict} onIngredientsChange={setIngredientsList} />         
+      </Col>
+      <Col span={12}>
+        <Alert message="营养元素" description={Nutrition} type="info" />
+      </Col>
+    </Row>
+  );
+};

src/pages/dish/edit/Form.jsx

@@ -0,0 +1,88 @@
+import { addDish } from '@/services/dish';
+import { ProForm, ProFormSelect, ProFormText, ProFormMoney } from '@ant-design/pro-components';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { Row, Col, Space } from 'antd';
+import { useEffect, useRef, useState, useMemo } from 'react';
+import UploadFile from '@/components/UploadFile';
+import Wangeditor from "@/components/Wangeditor";
+import { floatMultiply, floatDivide } from "@/utils/float";
+
+export default (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get('id');
+  const navigate = useNavigate();
+
+  const formRef = useRef();
+
+  useEffect(() => {
+    if (props.dish) {
+      formRef.current.setFieldsValue({ ...props.dish, price: floatDivide(props.dish.price, 100) });
+    }
+  }, [props.dish]);
+
+  const onFinish = async (values) => {
+    addDish({ ...values, price: floatMultiply(values.price, 100), id }).then((res) => {
+      props.onFinish(res);
+    });
+
+    return false;
+  };
+
+  return (
+    <ProForm
+      formRef={formRef}
+      layout={'horizontal'}
+      labelCol={{ span: 4 }}
+      wrapperCol={{ span: 20 }}
+      onFinish={onFinish}
+      initialValues={{ type: '1', state: '1' }}
+      submitter={{
+        searchConfig: {
+          resetText: '返回',
+        },
+        onReset: () => navigate(-1),
+        render: (props, doms) => {
+          return (
+            <Row>
+              <Col span={8} offset={8}>
+                <Space>{doms}</Space>
+              </Col>
+            </Row>
+          );
+        },
+      }}
+    >
+      <ProFormText
+        name="name"
+        label="名称"
+        placeholder="请输入菜肴名称"
+        rules={[{ required: true, message: '请输入菜肴名称' }]}
+      />
+      <ProFormText
+        name="unit"
+        label="单位"
+        placeholder="请输入菜肴单位"
+        rules={[{ required: true, message: '请输入菜肴单位' }]}
+      />
+      <ProFormMoney
+        name="price"
+        label="价格"
+        rules={[{ required: true, message: '请输入菜肴价格' }]}
+      />
+      <ProFormSelect
+        mode="multiple"
+        name="ingredientsIdList"
+        label="食材"
+        placeholder="请选择包含食材"
+        options={props.foodDict}
+        onChange={props.onIngredientsChange}
+      />
+      <ProForm.Item name="thumb" label="图片">
+        <UploadFile preview={true} />
+      </ProForm.Item>
+      <ProForm.Item name="content" label="做法">
+        <Wangeditor></Wangeditor>
+      </ProForm.Item>
+    </ProForm>
+  );
+};

src/pages/dish/edit/index.jsx

@@ -1,115 +1,33 @@
-import { addDish, getDishById } from '@/services/dish';
-import { getStoreList } from '@/services/stock';
-import { PageContainer, ProForm, ProFormSelect, ProFormText, ProFormMoney, ProFormDigit } from '@ant-design/pro-components';
+import { getDishById } from '@/services/dish';
+import { PageContainer } from '@ant-design/pro-components';
 import { useNavigate, useSearchParams } from 'react-router-dom';
-import { Card, Col, message, Row, Space } from 'antd';
-import { useEffect, useRef, useState } from 'react';
-import { floatMultiply, floatDivide } from "@/utils/float";
+import { Alert, Card, Row, Col, message, Space, Button } from 'antd';
+import { useEffect, useRef, useState, useMemo } from 'react';
+import Edit from './Edit';
 
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get('id');
-  const [foodDict, setFoodDict] = useState([]);
+  const [dish, setDish] = useState();
   const navigate = useNavigate();
-
-  const formRef = useRef();
-  useEffect(() => {
-    getStoreList({ isDish: 1, pageSize: 9999 }).then((res) => {
-      setFoodDict(
-        res?.records?.map((x) => ({
-          label: x.name,
-          value: x.id,
-        })),
-      );
-    });
-  }, [id]);
-
+  
   useEffect(() => {
     if (id) {
       getDishById(id).then((res) => {
-        formRef.current.setFieldsValue({ ...res, price: floatDivide(res.price, 100) });
+        setDish(res);
       });
     }
   }, [id]);
 
-  const onFinish = async (values) => {
-    console.log(values, '===');
-
-    addDish({ ...values, price: floatMultiply(values.price, 100), id }).then((res) => {
-      // message.success('添加成功');
-      navigate(-1);
-    });
-
-    return false;
+  const onFinish = (values) => {
+    setDish(values);
+    navigate(-1);
   };
 
   return (
     <PageContainer>
-      <Card>
-        <ProForm
-          formRef={formRef}
-          layout={'horizontal'}
-          labelCol={{ span: 8 }}
-          wrapperCol={{ span: 16 }}
-          onFinish={onFinish}
-          initialValues={{ type: '1', state: '1' }}
-          submitter={{
-            searchConfig: {
-              resetText: '返回',
-            },
-            onReset: () => navigate(-1),
-            render: (props, doms) => {
-              return (
-                <Row>
-                  <Col span={8} offset={8}>
-                    <Space>{doms}</Space>
-                  </Col>
-                </Row>
-              );
-            },
-          }}
-        >
-          <ProFormText
-            name="name"
-            label="菜肴名称"
-            placeholder="请输入菜肴名称"
-            rules={[{ required: true, message: '请输入菜肴名称' }]}
-            width={460}
-          />
-          <ProFormText
-            name="unit"
-            label="菜肴单位"
-            placeholder="请输入菜肴单位"
-            rules={[{ required: true, message: '请输入菜肴单位' }]}
-            width={460}
-          />
-          <ProFormMoney
-            name="price"
-            label="价格"
-            rules={[{ required: true, message: '请输入菜肴价格' }]}
-            width={460}
-          />
-          <ProFormSelect
-            mode="multiple"
-            name="ingredientsIdList"
-            label="包含食材"
-            placeholder="请选择包含食材"
-            rules={[{ required: true, message: '请选择包含食材' }]}
-            width={460}
-            options={foodDict}
-          />
-          <ProFormDigit
-            label="元素"
-            name="calorie"
-            min={0}
-            width={460}
-            placeholder="卡路里"
-            fieldProps={{
-              addonAfter: '卡',
-              precision: '4'
-            }}
-          />
-        </ProForm>
+      <Card style={{ paddingTop: '24px' }}>
+        <Edit dish={dish} onFinish={onFinish} />
       </Card>
     </PageContainer>
   );

src/pages/dish/list/components/DishCotent.jsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import { Card } from 'antd';
+
+const { Meta } = Card;
+
+export default (props) => {
+
+  const { dish = {} } = props;
+
+  const style = {
+    height: dish.thumb ? '160px' : '400px',
+    overflowY: 'auto',
+  }
+
+  return (
+    <Card cover={<img alt='' src={dish.thumb} />} style={{ width: '360px', height: '480px' }}>
+      <Meta
+        title={dish.name}
+        description={<div dangerouslySetInnerHTML={{ __html: dish.content }} style={style} />} />
+    </Card>
+  )
+}

src/pages/dish/list/index.jsx

@@ -1,9 +1,10 @@
 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 { Button, message, Popconfirm } from 'antd';
+import { useNavigate, Link } from 'react-router-dom';
+import { Button, message, Popconfirm, Popover } from 'antd';
 import { useRef, useState } from 'react';
+import DishCotent from './components/DishCotent';
 
 const DishList = (props) => {
   console.log(props, '===');
@@ -34,6 +35,11 @@ const DishList = (props) => {
     {
       title: '菜肴名称',
       dataIndex: 'name',
+      render: (t, row) => (
+        <Popover placement="right" content={<DishCotent dish={row} />}>
+          <Link to={`/stock/dish/detail?id=${row.id}`}>{t}</Link>
+        </Popover>
+      )
     },
 
     {
@@ -52,6 +58,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/evaluate/index.jsx

@@ -9,6 +9,7 @@ import { Link, useNavigate } from "react-router-dom";
 import { Button, message, Popconfirm } from "antd";
 import moment from "moment";
 import { useRef, useState } from "react";
+import AddeValuate from "./evaluateList/addeValuate";
 
 const GuaranteeTaskList = (props) => {
   const navigate = useNavigate();
@@ -77,6 +78,16 @@ const GuaranteeTaskList = (props) => {
       valueType: "option",
       width: 200,
       render: (_, record) => [
+        <Button
+          key={1}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            navigate(`/task/evaluate/list?id=${record.id}`);
+          }}
+        >
+          评价列表
+        </Button>,
         <Button
           key={2}
           style={{ padding: 0 }}
@@ -85,7 +96,7 @@ const GuaranteeTaskList = (props) => {
             navigate(`/task/evaluate/list?id=${record.id}`);
           }}
         >
-          评价
+          新增评价
         </Button>,
       ],
     },

src/pages/guarantee/list/index.jsx

@@ -62,7 +62,7 @@ const GuaranteeList = (props) => {
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            navigate(`/task/guarantee/edit?id=${record.id}`);
+            navigate(`/task/guaranteeUnits/edit?id=${record.id}`);
           }}
         >
           修改
@@ -83,7 +83,7 @@ const GuaranteeList = (props) => {
          style={{ padding: 0 }}
          type="link"
          onClick={() => {
-           navigate(`/task/guarantee/personnel/list?id=${record.id}`);
+           navigate(`/task/guaranteePerson?id=${record.id}`);
          }}
        >
          人员
@@ -103,7 +103,7 @@ const GuaranteeList = (props) => {
             key="2"
             type="primary"
             onClick={() => {
-              navigate("/task/guarantee/edit");
+              navigate("/task/guaranteeUnits/edit");
             }}
           >
             新增

src/pages/guarantee/personnel/list/index.jsx

@@ -96,7 +96,7 @@ const GuaranteePersonnelList = (props) => {
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            navigate(`/task/guarantee/personnel/edit?id=${record.id}`);
+            navigate(`/task/guaranteePerson/edit?id=${record.id}`);
           }}
         >
           修改
@@ -130,7 +130,7 @@ const GuaranteePersonnelList = (props) => {
             type="primary"
             onClick={() => {
               navigate(
-                "/task/guarantee/personnel/edit" + (id ? `?orgId=${id}` : "")
+                "/task/guaranteePerson/edit" + (id ? `?orgId=${id}` : "")
               );
             }}
           >

src/pages/guaranteeTask/Edit/DishList.jsx

@@ -19,12 +19,12 @@ export default (props) => {
   const packageRef = useRef();
   const dishRef = useRef();
 
-  const calorie = useMemo(() => {
-    return list.reduce((acc, it) => {
-      const dish = dishRef.current.filterItem(it.dishId) || {};
-      return acc + dish.calorie || 0;
-    }, 0);
-  }, [list]);
+  // const calorie = useMemo(() => {
+  //   return list.reduce((acc, it) => {
+  //     const dish = dishRef.current.filterItem(it.dishId) || {};
+  //     return acc + dish.calorie || 0;
+  //   }, 0);
+  // }, [list]);
 
   const handlePackageSubmit = ({item, amount}) => {
     packageRef.current = item;
@@ -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,
             })
           }
         }
@@ -144,7 +145,7 @@ export default (props) => {
       </Col>
       <Col span={16}>
         <Card
-          title={`已选菜肴 共计${calorie}卡`}
+          title="已选菜肴"
           loading={loading}
           extra={<Button disabled={!dataSource} type='primary' loading={loading} onClick={onSubmit}>保存</Button>}
         >

src/pages/package/DishList.jsx

@@ -1,15 +1,22 @@
-import React, { useEffect, useState, useRef } from 'react';
-import { Button, List, Popconfirm, Select } from 'antd';
+import React, { useEffect, useState, useRef, forwardRef, useImperativeHandle } from 'react';
+import { Button, Modal, List, Popconfirm, Form, Select, InputNumber } from 'antd';
 import classNames from 'classnames';
+import useBool from '@/utils/hooks/useBool';
 import { getPackageDetailList, addPackageDetail, deletePackageDetail } from '@/services/package';
 import { getDishList } from '@/services/dish';
 
 const { Option } = Select;
+const defaultKind = 2;
 
-const Header = props => {
+const AddDish = props => {
   const { onChange } = props;
   const [data, setData] = useState([]);
-  const [value, setValue] = useState();
+  const [form] = Form.useForm();
+
+  const onFinish = (values) => {
+    const it = data.filter(x => x.id === values.dishId)[0] || {};
+    onChange({...it, ...values });
+  };
 
   const handleSearch = (newValue) => {
     if (newValue) {
@@ -21,52 +28,65 @@ const Header = props => {
     }
   };
 
-  const handleChange = (newValue) => {
-    setValue(newValue);
-    if (newValue) {
-      onChange(data.filter(x => x.id === newValue)[0]);
-    }
-  };
-
   const options = data.map(d => <Option key={d.id} value={d.id}>{d.name}</Option>);
 
   const initList = () => {
-    getDishList({ pageNum: 1, pageSize: 10 }).then(res => {
+    getDishList({ pageNum: 1, pageSize: 20 }).then(res => {
       setData(res.records || []);
     });
   }
 
   useEffect(() => {
     initList();
+    form.setFieldsValue({ dishKind: 2, amount: 1 });
   }, [])
 
   return (
-    <Select
-      style={{ width: '100%' }}
-      allowClear
-      showSearch
-      value={value}
-      placeholder='请选择菜肴'
-      defaultActiveFirstOption={false}
-      showArrow={false}
-      filterOption={false}
-      onSearch={handleSearch}
-      onChange={handleChange}
-      notFoundContent={null}
-      onClear={initList}
-    >
-      {options}
-    </Select>
+    <Form form={form} layout="vertical" onFinish={onFinish}>
+      <Form.Item name="dishId" label="选择菜肴" rules={[{ required: true, message: '请选择菜肴' }]}>
+        <Select
+          allowClear
+          showSearch
+          placeholder='请选择菜肴, 可输入汉字搜索'
+          defaultActiveFirstOption={false}
+          showArrow={false}
+          filterOption={false}
+          onSearch={handleSearch}
+          // onChange={handleChange}
+          notFoundContent={null}
+          onClear={initList}
+        >
+          {options}
+        </Select>
+      </Form.Item>
+      <Form.Item name="dishKind" label="菜肴类型">
+        <Select allowClear defaultValue={defaultKind}>
+          <Select.Option value={1}>主食</Select.Option>
+          <Select.Option value={2}>菜肴</Select.Option>
+        </Select>
+      </Form.Item>
+      <Form.Item name="amount" label="菜肴数量" rules={[{ required: true, message: '请设置数量' }]}>
+        <InputNumber style={{ width: '100%' }} min={1} />
+      </Form.Item>
+      <Form.Item>
+        <Button type='primary' htmlType='sumbit'>确定</Button>
+      </Form.Item>
+    </Form>
   );
 }
 
+const kindDict = {
+  '1': '主食',
+  '2': '菜肴',
+}
 
-export default (props) => {
+export default forwardRef((props, ref) => {
   const { current, setCurrent } = props;
 
   const packageId = (current || {}).id;
 
   const [loading, setLoading] = useState(false);
+  const [open, setVisible, hide ] = useBool();
   const [list, setList] = useState([]);
   const [detail, setDetail] = useState({});
   const listRef = useRef();
@@ -74,10 +94,11 @@ export default (props) => {
 
   const onAdd = item => {
     setLoading(true);
-    addPackageDetail({ packageId, dishId: item.id }).then(res => {
+    addPackageDetail({ ...item, packageId, dishId: item.id }).then(res => {
       setLoading(false);
       const newList = listRef.current.concat(res);
       setList(newList);
+      hide();
     }).catch(() => {
       setLoading(false);
     });
@@ -108,30 +129,44 @@ export default (props) => {
 
   }, [packageId]);
 
+  useImperativeHandle(ref, () => ({
+    new: () => setVisible(),
+  }));
+
   return (
-    <List
-      style={{ minHeight: '300px' }}
-      header={<Header onChange={onAdd} />}
-      bordered
-      loading={loading}
-      dataSource={list}
-      renderItem={item => (
-        <List.Item
-          className={classNames({ active: detail.id === item.id })}
-          onClick={() => setDetail(item)}
-          actions={[
-            <Popconfirm
-              key="delete"
-              title="确认删除?"
-              onConfirm={() => onDelete(item)}
-              >
-              <a href="#">删除</a>
-            </Popconfirm>
-          ]}
-        >
-          {item.name}
-        </List.Item>
-      )}
-    />
+    <>
+      <List
+        style={{ minHeight: '300px' }}
+        loading={loading}
+        dataSource={list}
+        renderItem={item => (
+          <List.Item
+            className={classNames({ active: detail.id === item.id })}
+            onClick={() => setDetail(item)}
+            actions={[
+              <Popconfirm
+                key="delete"
+                title="确认删除?"
+                onConfirm={() => onDelete(item)}
+                >
+                <a href="#">删除</a>
+              </Popconfirm>
+            ]}
+          >
+            {`【${kindDict[`${item.dishKind}`]}】${item.name} x ${item.amount}`}
+          </List.Item>
+        )}
+      />
+      <Modal
+        title="添加菜肴"
+        open={open}
+        onCancel={hide}
+        maskClosable={false}
+        footer={null}
+        destroyOnClose
+      >
+        <AddDish onChange={onAdd} />
+      </Modal>
+    </>
   );
-}
+})

src/pages/package/List.jsx

@@ -1,13 +1,17 @@
-import React, { useState, useEffect, useRef } from 'react';
-import { Row, Col, Button, List, Popconfirm, Input } from 'antd';
+import React, { useState, useEffect, useRef, forwardRef, useImperativeHandle } from 'react';
+import { Modal, Button, List, Popconfirm, Input } from 'antd';
 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 (props) => {
+export default forwardRef((props, ref) => {
   const { current, setCurrent } = props;
-  const [loading, setLoading] = useState(false);
-  const [hasMore, setHasMore] = useState(true);
-  const [filter, setFilter] = useState({ pageNum: 1, pageSize: 10, total: 0 });
+  const [loading, startLoading, stopLoading] = useBool();
+  const [open, setVisible, hide] = useBool();
+  const [hasMore, setHasMore] = useState(false);
+  const [filter, setFilter] = useState({ pageNum: 1, pageSize: 20, total: 0 });
   const [list, setList] = useState([]);
   const listRef = useRef();
   listRef.current = list;
@@ -40,10 +44,15 @@ export default (props) => {
     })
   }
 
+  const onEdit = (val = {}) => {
+    setCurrent(val);
+    setVisible();
+  }
+
   const onDelete = (item) => {
-    setLoading(true);
+    startLoading();
     deletePackage(item.id).then(res => {
-      setLoading(false);
+      stopLoading();
 
       const newList = listRef.current.filter(x => x.id !== item.id);
       setList(newList);
@@ -51,14 +60,19 @@ export default (props) => {
         setCurrent(newList[0] || {});
       }
     }).catch(() => {
-      setLoading(false);
+      stopLoading();
     });
   };
 
+  const handleForm = (val) => {
+    setCurrent(val);
+    hide()
+  }
+
   useEffect(() => {
-    setLoading(true);
+    startLoading();
     getPackageList(filter).then(res => {
-      setLoading(false);
+      stopLoading();
 
       const { records = [], current, total, pages } = res
 
@@ -71,7 +85,7 @@ export default (props) => {
 
       setHasMore(current < pages)
     }).catch(() => {
-      setLoading(false);
+      stopLoading();
     });
   }, [filter]);
 
@@ -95,36 +109,45 @@ export default (props) => {
     setList(newList);
   }, [current])
 
+  useImperativeHandle(ref, () => ({
+    new: () => onEdit(),
+  }));
+
   return (
+    <>
     <List
       style={{ minHeight: '600px' }}
       bordered
-      header={
-        <Input.Group compact>
-          <Input.Search allowClear placeholder="请输入筛选名称" onSearch={onSearch} style={{ width: 'calc(100% - 60px)' }} />
-          <Button type='link' onClick={() => setCurrent({})} >新增</Button>
-        </Input.Group>
-      }
+      header={<Input.Search allowClear placeholder="请输入筛选名称" onSearch={onSearch} />}
       dataSource={list}
       loading={loading}
       loadMore={loadMore}
-      renderItem={item => (
-        <List.Item
-          className={classNames({ active: current.id === item.id })}
-          onClick={() => setCurrent(item)}
-          actions={[
-            <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>
+    </Modal>
+    </>
   )
-}
+})

src/pages/package/index.jsx

@@ -1,6 +1,6 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { PageContainer } from '@ant-design/pro-components';
-import { Row, Col, Card } from 'antd';
+import { Button, Row, Col, Card } from 'antd';
 import List from './List';
 import BasicForm from './BasicForm';
 import DishList from './DishList';
@@ -8,23 +8,25 @@ import DishList from './DishList';
 import './style.less';
 
 export default (props) => {
-  const [current, setCurrent] = useState({});
+  const [current, setCurrent] = React.useState({});
+  const pkgRef = React.useRef();
+  const dishRef = React.useRef();
+
+  const onAdd = () => pkgRef.current.new();
+  const onDishAdd = () => dishRef.current.new();
 
   return (
-    <PageContainer>
-      <Card>
-        <Row gutter={100}>
-          <Col span={8}>
-            <List current={current} setCurrent={setCurrent}/>
-          </Col>
-          <Col span={8}>
-            <BasicForm current={current} onChange={it => setCurrent(it)} />
-            <div style={{ marginTop: '24px' }}>
-              <DishList current={current} />
-            </div>
-          </Col>
-        </Row>
-      </Card>
-    </PageContainer>
+    <Row gutter={24}>
+      <Col span={12}>
+        <Card title="套餐列表" extra={<Button type='primary' onClick={onAdd}>新增</Button>}>
+          <List ref={pkgRef} current={current} setCurrent={setCurrent}/>
+        </Card>
+      </Col>
+      <Col span={12}>
+        <Card title={`${current.name || '套餐'} 明细`} extra={<Button onClick={onDishAdd}>新增</Button>}>
+          <DishList current={current} ref={dishRef} />
+        </Card>
+      </Col>
+    </Row>
   )
 }

src/pages/stockClassification/edit/index.jsx

@@ -1,9 +1,11 @@
 import { addStoreType, getStoreTypeById, updataStoreType } from '@/services/stock';
-import { PageContainer, ProForm, ProFormSelect, ProFormText } from '@ant-design/pro-components';
+import { PageContainer, ProForm, ProFormSelect, ProFormText, ProFormTextArea } from '@ant-design/pro-components';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Card, Col, message, Row, Space } from 'antd';
 import { useEffect, useRef } from 'react';
 
+const width = 540;
+
 export default (props) => {
   const [searchParams, setSearchParams] = useSearchParams();
   const id = searchParams.get('id');
@@ -44,7 +46,7 @@ export default (props) => {
         <ProForm
           formRef={formRef}
           layout={'horizontal'}
-          labelCol={{ span: 8 }}
+          labelCol={{ span: 4 }}
           wrapperCol={{ span: 16 }}
           onFinish={onFinish}
           submitter={{
@@ -67,7 +69,7 @@ export default (props) => {
             name="name"
             label="分类名称"
             placeholder="请输入名称"
-            width={460}
+            width={width}
             allowClear={false}
             rules={[{ required: true, message: '请输入名称' }]}
           />
@@ -79,7 +81,7 @@ export default (props) => {
               { label: '否', value: 0 },
             ]}
             placeholder="请选择"
-            width={460}
+            width={width}
             allowClear={false}
             rules={[{ required: true, message: '请选择是否食材' }]}
           />
@@ -91,10 +93,17 @@ export default (props) => {
               { label: '否', value: 0 },
             ]}
             placeholder="请选择"
-            width={460}
+            width={width}
             allowClear={false}
             rules={[{ required: true, message: '请选择是否设备' }]}
           />
+          <ProFormTextArea
+            name="nutrition"
+            label="营养元素"
+            placeholder="请输入名称"
+            width={width}
+            allowClear={true}
+          />
         </ProForm>
       </Card>
     </PageContainer>

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";
@@ -91,14 +92,6 @@ export const authRoutes = [
         index: true,
         element: <Navigate to="guaranteeTask" replace />,
       },
-      {
-        path: "guaranteeTask",
-        element: <GuaranteeTaskList />,
-        meta: {
-          title: "军供通报",
-          permission: 'guaranteeTask',
-        },
-      },
       {
         path: "guaranteeTask/edit",
         element: <GuaranteeTaskEdit />,
@@ -107,6 +100,14 @@ export const authRoutes = [
           permission: 'guaranteeTask.edit',
         },
       },
+      {
+        path: "guaranteeTask",
+        element: <GuaranteeTaskList />,
+        meta: {
+          title: "军供通报",
+          permission: 'guaranteeTask',
+        },
+      },
       {
         path: "guaranteeTask/print",
         element: <GuaranteeTaskPrint />,
@@ -136,37 +137,37 @@ export const authRoutes = [
         },
       },
       {
-        path: "guarantee/list",
+        path: "guaranteeUnits/list",
         element: <GuaranteeList />,
         meta: {
           title: "保障机构",
-          // permission: 'guaranteeTask.guarantee',
+          permission: 'guaranteeUnits',
         },
       },
       {
-        path: "guarantee/edit",
+        path: "guaranteeUnits/edit",
         element: <GuaranteeEdit />,
         meta: {
           title: "机构维护",
           hideInMenu: true,
-          // permission: 'guaranteeTask.guarantee',
+          permission: 'guaranteeUnits.edit',
         },
       },
       {
-        path: "guarantee/personnel/list",
+        path: "guaranteePerson",
         element: <GuaranteePersonnelList />,
         meta: {
           title: "机构人员",
-          // permission: 'guaranteeTask.guarantee',
+          permission: 'guaranteePerson',
         },
       },
       {
-        path: "guarantee/personnel/edit",
+        path: "guaranteePerson/edit",
         element: <GuaranteePersonnelEdit />,
         meta: {
           title: "机构人员维护",
           hideInMenu: true,
-          // permission: 'guaranteeTask.guarantee',
+          permission: 'guaranteePerson.edit',
         },
       },
       {
@@ -174,7 +175,7 @@ export const authRoutes = [
         element: <Supportability />,
         meta: {
           title: "保障能力",
-          permission: 'guaranteeTask.evaluate.list',
+          permission: 'supportability',
         },
       },
     ],
@@ -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 />,