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

src/pages/dish/edit/index.jsx

-import { addDish, updataDish, getDishById, getDishList, getFoodIngredientsList } from '@/services/api/dish';
-import { queryTable } from '@/utils/request';
-import { PageContainer, ProForm, ProFormDigit, ProFormText, ModalForm, ProFormSelect } from '@ant-design/pro-components';
+import { addDish, getDishById } from '@/services/api/dish';
+import { getStoreList } from '@/services/api/stock';
+import { PageContainer, ProForm, ProFormSelect, ProFormText } from '@ant-design/pro-components';
 import { history, useSearchParams } from '@umijs/max';
-import { Card, Col, message, Row, Space, Image, Select, Option } from 'antd';
-import { values } from 'lodash';
+import { Card, Col, message, Row, Space } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get('id');
-  const [datas, setDatas] = useState([]);
-  const [data, setData] = useState({});
+  const [foodDict, setFoodDict] = useState([]);
+
   const formRef = useRef();
   useEffect(() => {
-
-    getFoodIngredientsList().then((res) => {
-      setDatas(res?.records?.map((x) => ({
-        label: x.name,
-        value: x.dishId
-      })))
-
+    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) => {
-        setData(res);
-
         formRef.current.setFieldsValue(res);
       });
     }
   }, [id]);
 
   const onFinish = async (values) => {
+    console.log(values, '===');
 
-
-    if (id) {
-      // 修改
-      updataDish(id, { ...values }).then((res) => {
-        message.success('修改成功');
-        history.back();
-      });
-    } else {
-      // 新增
-      addDish({ ...values }).then((res) => {
-        message.success('添加成功');
-        history.back();
-      });
-    }
+    addDish({ ...values, id }).then((res) => {
+      message.success('添加成功');
+      history.back();
+    });
 
     return false;
   };
-  console.log("datas", datas)
+
   return (
     <PageContainer>
       <Card>
                 <Row>
                   <Col span={8} offset={8}>
                     <Space>{doms}</Space>
-
                   </Col>
                 </Row>
               );
             },
           }}
         >
-          <ProFormText name="name" label="菜肴名称" placeholder="请输入菜肴名称" width={460} />
-          <ProFormText name="unit" label="菜肴单位" placeholder="请输入菜肴单位" width={460} />
-          <ProFormSelect mode="multiple" label="包含食材" placeholder="多选下拉" width={460}
-            options={datas}
+          <ProFormText
+            name="name"
+            label="菜肴名称"
+            placeholder="请输入菜肴名称"
+            rules={[{ required: true, message: '请输入菜肴名称' }]}
+            width={460}
+          />
+          <ProFormText
+            name="unit"
+            label="菜肴单位"
+            placeholder="请输入菜肴单位"
+            rules={[{ required: true, message: '请输入菜肴单位' }]}
+            width={460}
+          />
+          <ProFormSelect
+            mode="multiple"
+            name="ingredientsIdList"
+            label="包含食材"
+            placeholder="请选择包含食材"
+            rules={[{ required: true, message: '请选择包含食材' }]}
+            width={460}
+            options={foodDict}
           />
         </ProForm>
       </Card>
     </PageContainer>
-
   );
-};
+};

src/pages/dish/list/index.jsx

     },
     {
       title: '包含食材(种)',
-      dataIndex: 'status',
+      dataIndex: 'foodNum',
       search: false,
     },
     {
       valueType: 'option',
       width: 200,
       render: (_, record) => [
-        <Button
-          key={1}
-          style={{ padding: 0 }}
-          type="link"
-          onClick={() => {
-            updata(record);
-          }}
-        >
-          {/* {record.state === '1' ? '下架' : '上架'} */}
-        </Button>,
+
         <Button
           key={2}
           style={{ padding: 0 }}