feats

src/components/page/style.less

@@ -1,5 +1,5 @@
 
 .page-container {
   margin: 24px;
-  margin-bottom: 0;
+  // margin-bottom: 0;
 }

src/layouts/AuthLayout/components/Container.jsx

@@ -6,25 +6,15 @@ import Footer from './Footer';
 
 const { Content } = Layout;
 
-export default (props) => {  
-  const [footerHeight, setFooterHeight] = useState(0);
-
-  // 24 是 marginTop 的值
-  const contentStyle = useMemo(() => ({ height: footerHeight > 0 ? `calc(100% - ${footerHeight + 24}px)` : '100%' }), [footerHeight]);
-  
-  useEffect(() => {
-    const footerHeight = (document.querySelector('.ant-layout-footer') || {}).offsetHeight || 0;
-    setFooterHeight(footerHeight);
-  });
-
+export default (props) => {
   return (
     <div className='layout-container'>
-      <Content style={contentStyle}>
+      {/* <Content style={{ height: '100%' }}> */}
         {/* <PageTransition location={props.location}> */}
           <Outlet />
         {/* </PageTransition> */}
-      </Content>
-      {!props.noFooter && <Footer />}      
+      {/* </Content> */}
+      {/* {!noFooter && <Footer />} */}
     </div>
   )
 }

src/layouts/Container.jsx

@@ -4,8 +4,9 @@ import { Outlet } from 'react-router-dom';
 import useRoute from '@/utils/hooks/useRoute';
 
 const containerStyle = {
-  margin: '24px 24px 0 24px',
-  height: '100%',
+  // margin: '24px 24px 0 24px',
+  margin: '24px',
+  minHeight: 'calc(100% - 48px)',
 }
 const { Title } = Typography;
 

src/pages/dish/edit/index.jsx

@@ -36,7 +36,7 @@ export default (props) => {
     console.log(values, '===');
 
     addDish({ ...values, price: floatMultiply(values.price, 100), id }).then((res) => {
-      message.success('添加成功');
+      // message.success('添加成功');
       navigate(-1);
     });
 

src/pages/dish/list/index.jsx

@@ -15,7 +15,7 @@ const DishList = (props) => {
   const updata = (row) => {
     if (row.id) {
       updataDish(row.id, { state: row.state === '1' ? '2' : '1' }).then((res) => {
-        message.success('修改成功');
+        // message.success('修改成功');
         actionRef.current.reload();
       });
     }
@@ -24,7 +24,7 @@ const DishList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteDish(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/pages/evaluate/index.jsx

@@ -21,7 +21,7 @@ const GuaranteeTaskList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteGuaranteeTask(id).then((res) => {
-        message.success("删除成功");
+        // message.success("删除成功");
         actionRef.current.reload();
       });
     }

src/pages/guaranteeTask/Edit/BasicForm.jsx

@@ -41,7 +41,7 @@ export default (props) => {
     func({ ...values, startDate, endDate }, id).then(res => {
       setLoading(false);
       setDataSource(res);
-      notification.success({ message: '操作成功' })
+      // notification.success({ message: '操作成功' })
     }).catch(() => {
       setLoading(false);
     });

src/pages/guaranteeTask/Edit/DishList.jsx

@@ -85,7 +85,7 @@ export default (props) => {
     addGuaranteeDetailBatch(list, dataSource.id).then(res => {
       setLoading(false);
       setList(res);
-      notification.success({ message: '操作成功' });
+      // notification.success({ message: '操作成功' });
     }).catch(() => {
       setLoading(false);
     });

src/pages/guaranteeTask/index.jsx

@@ -21,7 +21,7 @@ const GuaranteeTaskList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteGuaranteeTask(id).then((res) => {
-        message.success("删除成功");
+        // message.success("删除成功");
         actionRef.current.reload();
       });
     }

src/pages/package/BasicForm.jsx

@@ -18,7 +18,7 @@ export default (props) => {
     func(data, current.id).then(res => {
       setLoading(false);
       onChange(res);
-      notification.success({ message: '操作成功' })
+      // notification.success({ message: '操作成功' })
     }).catch(() => {
       setLoading(false);
     });

src/pages/rotationChart/edit/index.jsx

@@ -40,13 +40,13 @@ export default (props) => {
     if (id) {
       // 修改
       updataBanner(id, { ...values }).then((res) => {
-        message.success("修改成功");
+        // message.success("修改成功");
         navigate(-1);
       });
     } else {
       // 新增
       addBanner({ ...values }).then((res) => {
-        message.success("添加成功");
+        // message.success("添加成功");
         navigate(-1);
       });
     }

src/pages/rotationChart/introduction/edit/index.jsx

@@ -21,7 +21,7 @@ export default (props) => {
   const onFinish = async (values) => {
     //添加,修改
     addRegulation({ ...values, id }).then((res) => {
-      message.success('成功');
+      // message.success('成功');
       navigate(-1);
     });
     return false;

src/pages/rotationChart/introduction/index.jsx

@@ -12,7 +12,7 @@ const IntroductionList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteRegulation(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/pages/rotationChart/list/index.jsx

@@ -15,7 +15,7 @@ const RotationChartList = (props) => {
   const updata = (row) => {
     if (row.id) {
       updataBanner(row.id, { state: row.state === '1' ? '2' : '1' }).then((res) => {
-        message.success('修改成功');
+        // message.success('修改成功');
         actionRef.current.reload();
       });
     }
@@ -24,7 +24,7 @@ const RotationChartList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteBanner(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/pages/stock/edit/index.jsx

@@ -26,13 +26,13 @@ export default (props) => {
     if (id) {
       // 修改
       updataStore(id, { ...values }).then((res) => {
-        message.success('修改成功');
+        // message.success('修改成功');
         navigate(-1);
       });
     } else {
       // 新增
       addStore({ ...values }).then((res) => {
-        message.success('添加成功');
+        // message.success('添加成功');
         navigate(-1);
       });
     }

src/pages/stock/list/index.jsx

@@ -20,7 +20,7 @@ const StockList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteStore(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/pages/stockClassification/edit/index.jsx

@@ -24,13 +24,13 @@ export default (props) => {
     if (id) {
       // 修改
       updataStoreType(id, { ...values }).then((res) => {
-        message.success('修改成功');
+        // message.success('修改成功');
         navigate(-1);
       });
     } else {
       // 新增;
       addStoreType({ ...values }).then((res) => {
-        message.success('添加成功');
+        // message.success('添加成功');
         navigate(-1);
       });
     }

src/pages/stockClassification/list/index.jsx

@@ -15,7 +15,7 @@ const StockList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteStoreType(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/regulation/edit/index.jsx

@@ -25,7 +25,7 @@ export default (props) => {
     // if (id) {
     //添加,修改
     addRegulation({ ...values, id }).then((res) => {
-      message.success('成功');
+      // message.success('成功');
       navigate(-1);
     });
     return false;

src/regulation/index.jsx

@@ -16,7 +16,7 @@ const RegulationList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteRegulation(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/routes/routes.jsx

@@ -65,6 +65,16 @@ import StatisCharts from "@/pages/statis/charts";
  */
 
 export const authRoutes = [
+  {
+    path: "static",
+    element: <StatisCharts />,
+    meta: {
+      title: "数据分析",
+      noSiderBar: true,
+      noFooter: true,
+      permission: 'static',
+    },
+  },
   {
     path: "task",
     element: <Container />,
@@ -232,6 +242,15 @@ export const authRoutes = [
           permission: 'purchase.instore',
         },
       },
+      {
+        path: "inStore/edit",
+        element: <PurchaseInStoreEdit />,
+        meta: {
+          title: "采购详情",
+          permission: 'purchase.detail',
+          hideInMenu: true,
+        },
+      },
     ],
   },
   {
@@ -334,16 +353,6 @@ export const authRoutes = [
       },
     ],
   },
-  {
-    path: "static",
-    element: <StatisCharts />,
-    meta: {
-      title: "数据分析",
-      noSiderBar: true,
-      noFooter: true,
-      permission: 'static',
-    },
-  },
   {
     path: "system",
     element: <Container />,

src/services/dish.js

@@ -12,7 +12,7 @@ export const getDishList = (params) => request('/dishes', { params,successTip:fa
  * @param {*} params
  * @returns
  */
-export const getFoodIngredientsList = (params) => request('/foodIngredients', { params });
+export const getFoodIngredientsList = (params) => request('/foodIngredients', { params, successTip: false });
 
 /**
  * 详情

src/services/package.js

@@ -5,7 +5,7 @@ import request from '@/utils/request';
  * @param {*} params
  * @returns
  */
-export const getPackageList = (params) => request('/package', { params,successTip:false });
+export const getPackageList = (params) => request('/package', { params, successTip: false });
 
 
 /**
@@ -36,7 +36,7 @@ export const deletePackage = id => request(`/package/${id}`, { method: 'delete'
  * @param {*} params 
  * @returns 
  */
-export const getPackageDetailList = params => request('/packageDetail', { params });
+export const getPackageDetailList = params => request('/packageDetail', { params, successTip: false });
 
 
 /**