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

src/pages/dish/edit/index.jsx

@@ -1,16 +1,28 @@
-import { addDish, updataDish, getDishById, getDishList } from '@/services/api/dish';
+import { addDish, updataDish, getDishById, getDishList, getFoodIngredientsList } from '@/services/api/dish';
 import { queryTable } from '@/utils/request';
-import { PageContainer, ProForm, ProFormDigit, ProFormText, ModalForm, Select, Option } from '@ant-design/pro-components';
+import { PageContainer, ProForm, ProFormDigit, ProFormText, ModalForm, ProFormSelect } from '@ant-design/pro-components';
 import { history, useSearchParams } from '@umijs/max';
-import { Card, Col, message, Row, Space, Image } from 'antd';
+import { Card, Col, message, Row, Space, Image, Select, Option } from 'antd';
 import { values } from 'lodash';
 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 formRef = useRef();
+  useEffect(() => {
+
+    getFoodIngredientsList().then((res) => {
+      setDatas(res?.records?.map((x) => ({
+        label: x.name,
+        value: x.dishId
+      })))
+
+    });
+  }, [id]);
+
   useEffect(() => {
     if (id) {
       getDishById(id).then((res) => {
@@ -22,7 +34,7 @@ export default (props) => {
   }, [id]);
 
   const onFinish = async (values) => {
-    console.log(values)
+
 
     if (id) {
       // 修改
@@ -40,7 +52,7 @@ export default (props) => {
 
     return false;
   };
-
+  console.log("datas", datas)
   return (
     <PageContainer>
       <Card>
@@ -70,11 +82,9 @@ export default (props) => {
         >
           <ProFormText name="name" label="菜肴名称" placeholder="请输入菜肴名称" width={460} />
           <ProFormText name="unit" label="菜肴单位" placeholder="请输入菜肴单位" width={460} />
-          {/* <Select label="包含食材" mode="multiple" >
-            <Option></Option>
-            <Option></Option>
-          </Select> */}
-
+          <ProFormSelect mode="multiple" label="包含食材" placeholder="多选下拉" width={460}
+            options={datas}
+          />
         </ProForm>
       </Card>
     </PageContainer>

src/pages/dish/list/index.jsx

@@ -38,11 +38,13 @@ const DishList = (props) => {
     {
       title: '菜肴单位',
       dataIndex: 'unit',
+      search: false,
+    },
+    {
+      title: '包含食材(种)',
+      dataIndex: 'status',
+      search: false,
     },
-    // {
-    //   title: '包含食材(种)',
-    //   dataIndex: 'status',
-    // },
     {
       title: '操作',
       valueType: 'option',
@@ -88,7 +90,7 @@ const DishList = (props) => {
   return (
     <PageContainer>
       <ProTable
-        search={false}
+        search={true}
         actionRef={actionRef}
         rowKey="id"
         toolBarRender={() => [

src/pages/guaranteeTask/index.jsx

@@ -1,7 +1,142 @@
-import React from 'react'
+import { deleteGuaranteeTask, getGuaranteeTaskList } from '@/services/api/guaranteeTask';
+import { queryTable } from '@/utils/request';
+import { PageContainer, ProTable } from '@ant-design/pro-components';
+import { history } from '@umijs/max';
+import { Button, message, Popconfirm } from 'antd';
+import moment from 'moment';
+import { useRef, useState } from 'react';
+
+const GuaranteeTaskList = (props) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const [modalData, setModalData] = useState({});
+  // const [storeTypeDict, setStoreTypeDict] = useState([]);
+  const actionRef = useRef();
+  const formRef = useRef();
+
+  const handleDelete = (id) => {
+    if (id) {
+      deleteGuaranteeTask(id).then((res) => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const onCancel = () => {
+    setIsOpen(false);
+    setModalData({});
+  };
+
+  const columns = [
+    {
+      title: '保障序号',
+      dataIndex: 'guaranteeNo',
+    },
+    {
+      title: '受领人',
+      dataIndex: 'receiver',
+    },
+    {
+      title: '时间区间',
+      dataIndex: 'dateRange',
+      valueType: 'dateRange',
+      search: {
+        transform: (value) => {
+          console.log(value, value[0].valueOf(), 'valuevalue');
+
+          return {
+            startDate: moment(value[0]).format('yyyy-MM-DD'),
+            endDate: moment(value[1]).format('yyyy-MM-DD'),
+          };
+        },
+      },
+    },
+    {
+      title: '保障地点',
+      dataIndex: 'address',
+      search: false,
+    },
+    {
+      title: '保障人数',
+      dataIndex: 'totalPersonNum',
+      search: false,
+    },
+    {
+      title: '伙食标准',
+      dataIndex: 'standard',
+      search: false,
+    },
+
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 200,
+      render: (_, record) => [
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            history.push(`/guaranteeTask/edit?id=${record.id}`);
+          }}
+        >
+          修改
+        </Button>,
+
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+        <Button
+          key={4}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            history.push(`/guaranteeTask/print?id=${record.id}`);
+          }}
+        >
+          打印
+        </Button>,
+      ],
+    },
+  ];
 
-export default (props) => {
   return (
-    <div></div>
-  )
-}
+    <PageContainer>
+      <ProTable
+        actionRef={actionRef}
+        formRef={formRef}
+        postData={(data) => {
+          return data.map((x) => ({
+            dateRange: [x.startDate, x.endDate],
+            ...x,
+          }));
+        }}
+        rowKey="id"
+        toolBarRender={() => [
+          <Button
+            key="2"
+            type="primary"
+            onClick={() => {
+              history.push('/stock/add');
+            }}
+          >
+            新增
+          </Button>,
+        ]}
+        request={queryTable(getGuaranteeTaskList)}
+        columns={columns}
+      />
+    </PageContainer>
+  );
+};
+
+export default GuaranteeTaskList;

src/services/api/dish.js

@@ -7,6 +7,13 @@ import { request } from '@umijs/max';
  */
 export const getDishList = (params) => request('/dishes', { params });
 
+/**
+ * 查询食材列表
+ * @param {*} params
+ * @returns
+ */
+export const getFoodIngredientsList = (params) => request('/foodIngredients', { params });
+
 /**
  * 详情
  * @param {*} id

src/services/api/guaranteeTask.js

@@ -41,4 +41,20 @@ import { request } from '@umijs/max';
  * @param {*} data
  * @returns
  */
- export const deleteGuaranteeDetail = id => request(`/guaranteeDetail/${id}`, { method: 'delete' });
+ export const deleteGuaranteeDetail = id => request(`/guaranteeDetail/${id}`, { method: 'delete' });
+
+
+
+ /**
+ * 查询列表
+ * @param {*} params
+ * @returns
+ */
+export const getGuaranteeTaskList = (params) => request('/guaranteeTask', { params });
+
+/**
+ * 删除
+ * @param {*} data
+ * @returns
+ */
+ export const deleteGuaranteeTask = id => request(`/guaranteeTask/${id}`, { method: 'delete' });