Yansen 2 年前
父节点
当前提交
872820a2d0

+ 1
- 1
src/components/page/style.less 查看文件

1
 
1
 
2
 .page-container {
2
 .page-container {
3
   margin: 24px;
3
   margin: 24px;
4
-  margin-bottom: 0;
4
+  // margin-bottom: 0;
5
 }
5
 }

+ 4
- 14
src/layouts/AuthLayout/components/Container.jsx 查看文件

6
 
6
 
7
 const { Content } = Layout;
7
 const { Content } = Layout;
8
 
8
 
9
-export default (props) => {  
10
-  const [footerHeight, setFooterHeight] = useState(0);
11
-
12
-  // 24 是 marginTop 的值
13
-  const contentStyle = useMemo(() => ({ height: footerHeight > 0 ? `calc(100% - ${footerHeight + 24}px)` : '100%' }), [footerHeight]);
14
-  
15
-  useEffect(() => {
16
-    const footerHeight = (document.querySelector('.ant-layout-footer') || {}).offsetHeight || 0;
17
-    setFooterHeight(footerHeight);
18
-  });
19
-
9
+export default (props) => {
20
   return (
10
   return (
21
     <div className='layout-container'>
11
     <div className='layout-container'>
22
-      <Content style={contentStyle}>
12
+      {/* <Content style={{ height: '100%' }}> */}
23
         {/* <PageTransition location={props.location}> */}
13
         {/* <PageTransition location={props.location}> */}
24
           <Outlet />
14
           <Outlet />
25
         {/* </PageTransition> */}
15
         {/* </PageTransition> */}
26
-      </Content>
27
-      {!props.noFooter && <Footer />}      
16
+      {/* </Content> */}
17
+      {/* {!noFooter && <Footer />} */}
28
     </div>
18
     </div>
29
   )
19
   )
30
 }
20
 }

+ 3
- 2
src/layouts/Container.jsx 查看文件

4
 import useRoute from '@/utils/hooks/useRoute';
4
 import useRoute from '@/utils/hooks/useRoute';
5
 
5
 
6
 const containerStyle = {
6
 const containerStyle = {
7
-  margin: '24px 24px 0 24px',
8
-  height: '100%',
7
+  // margin: '24px 24px 0 24px',
8
+  margin: '24px',
9
+  minHeight: 'calc(100% - 48px)',
9
 }
10
 }
10
 const { Title } = Typography;
11
 const { Title } = Typography;
11
 
12
 

+ 1
- 1
src/pages/dish/edit/index.jsx 查看文件

36
     console.log(values, '===');
36
     console.log(values, '===');
37
 
37
 
38
     addDish({ ...values, price: floatMultiply(values.price, 100), id }).then((res) => {
38
     addDish({ ...values, price: floatMultiply(values.price, 100), id }).then((res) => {
39
-      message.success('添加成功');
39
+      // message.success('添加成功');
40
       navigate(-1);
40
       navigate(-1);
41
     });
41
     });
42
 
42
 

+ 2
- 2
src/pages/dish/list/index.jsx 查看文件

15
   const updata = (row) => {
15
   const updata = (row) => {
16
     if (row.id) {
16
     if (row.id) {
17
       updataDish(row.id, { state: row.state === '1' ? '2' : '1' }).then((res) => {
17
       updataDish(row.id, { state: row.state === '1' ? '2' : '1' }).then((res) => {
18
-        message.success('修改成功');
18
+        // message.success('修改成功');
19
         actionRef.current.reload();
19
         actionRef.current.reload();
20
       });
20
       });
21
     }
21
     }
24
   const handleDelete = (id) => {
24
   const handleDelete = (id) => {
25
     if (id) {
25
     if (id) {
26
       deleteDish(id).then((res) => {
26
       deleteDish(id).then((res) => {
27
-        message.success('删除成功');
27
+        // message.success('删除成功');
28
         actionRef.current.reload();
28
         actionRef.current.reload();
29
       });
29
       });
30
     }
30
     }

+ 1
- 1
src/pages/evaluate/index.jsx 查看文件

21
   const handleDelete = (id) => {
21
   const handleDelete = (id) => {
22
     if (id) {
22
     if (id) {
23
       deleteGuaranteeTask(id).then((res) => {
23
       deleteGuaranteeTask(id).then((res) => {
24
-        message.success("删除成功");
24
+        // message.success("删除成功");
25
         actionRef.current.reload();
25
         actionRef.current.reload();
26
       });
26
       });
27
     }
27
     }

+ 1
- 1
src/pages/guaranteeTask/Edit/BasicForm.jsx 查看文件

41
     func({ ...values, startDate, endDate }, id).then(res => {
41
     func({ ...values, startDate, endDate }, id).then(res => {
42
       setLoading(false);
42
       setLoading(false);
43
       setDataSource(res);
43
       setDataSource(res);
44
-      notification.success({ message: '操作成功' })
44
+      // notification.success({ message: '操作成功' })
45
     }).catch(() => {
45
     }).catch(() => {
46
       setLoading(false);
46
       setLoading(false);
47
     });
47
     });

+ 1
- 1
src/pages/guaranteeTask/Edit/DishList.jsx 查看文件

85
     addGuaranteeDetailBatch(list, dataSource.id).then(res => {
85
     addGuaranteeDetailBatch(list, dataSource.id).then(res => {
86
       setLoading(false);
86
       setLoading(false);
87
       setList(res);
87
       setList(res);
88
-      notification.success({ message: '操作成功' });
88
+      // notification.success({ message: '操作成功' });
89
     }).catch(() => {
89
     }).catch(() => {
90
       setLoading(false);
90
       setLoading(false);
91
     });
91
     });

+ 1
- 1
src/pages/guaranteeTask/index.jsx 查看文件

21
   const handleDelete = (id) => {
21
   const handleDelete = (id) => {
22
     if (id) {
22
     if (id) {
23
       deleteGuaranteeTask(id).then((res) => {
23
       deleteGuaranteeTask(id).then((res) => {
24
-        message.success("删除成功");
24
+        // message.success("删除成功");
25
         actionRef.current.reload();
25
         actionRef.current.reload();
26
       });
26
       });
27
     }
27
     }

+ 1
- 1
src/pages/package/BasicForm.jsx 查看文件

18
     func(data, current.id).then(res => {
18
     func(data, current.id).then(res => {
19
       setLoading(false);
19
       setLoading(false);
20
       onChange(res);
20
       onChange(res);
21
-      notification.success({ message: '操作成功' })
21
+      // notification.success({ message: '操作成功' })
22
     }).catch(() => {
22
     }).catch(() => {
23
       setLoading(false);
23
       setLoading(false);
24
     });
24
     });

+ 2
- 2
src/pages/rotationChart/edit/index.jsx 查看文件

40
     if (id) {
40
     if (id) {
41
       // 修改
41
       // 修改
42
       updataBanner(id, { ...values }).then((res) => {
42
       updataBanner(id, { ...values }).then((res) => {
43
-        message.success("修改成功");
43
+        // message.success("修改成功");
44
         navigate(-1);
44
         navigate(-1);
45
       });
45
       });
46
     } else {
46
     } else {
47
       // 新增
47
       // 新增
48
       addBanner({ ...values }).then((res) => {
48
       addBanner({ ...values }).then((res) => {
49
-        message.success("添加成功");
49
+        // message.success("添加成功");
50
         navigate(-1);
50
         navigate(-1);
51
       });
51
       });
52
     }
52
     }

+ 1
- 1
src/pages/rotationChart/introduction/edit/index.jsx 查看文件

21
   const onFinish = async (values) => {
21
   const onFinish = async (values) => {
22
     //添加,修改
22
     //添加,修改
23
     addRegulation({ ...values, id }).then((res) => {
23
     addRegulation({ ...values, id }).then((res) => {
24
-      message.success('成功');
24
+      // message.success('成功');
25
       navigate(-1);
25
       navigate(-1);
26
     });
26
     });
27
     return false;
27
     return false;

+ 1
- 1
src/pages/rotationChart/introduction/index.jsx 查看文件

12
   const handleDelete = (id) => {
12
   const handleDelete = (id) => {
13
     if (id) {
13
     if (id) {
14
       deleteRegulation(id).then((res) => {
14
       deleteRegulation(id).then((res) => {
15
-        message.success('删除成功');
15
+        // message.success('删除成功');
16
         actionRef.current.reload();
16
         actionRef.current.reload();
17
       });
17
       });
18
     }
18
     }

+ 2
- 2
src/pages/rotationChart/list/index.jsx 查看文件

15
   const updata = (row) => {
15
   const updata = (row) => {
16
     if (row.id) {
16
     if (row.id) {
17
       updataBanner(row.id, { state: row.state === '1' ? '2' : '1' }).then((res) => {
17
       updataBanner(row.id, { state: row.state === '1' ? '2' : '1' }).then((res) => {
18
-        message.success('修改成功');
18
+        // message.success('修改成功');
19
         actionRef.current.reload();
19
         actionRef.current.reload();
20
       });
20
       });
21
     }
21
     }
24
   const handleDelete = (id) => {
24
   const handleDelete = (id) => {
25
     if (id) {
25
     if (id) {
26
       deleteBanner(id).then((res) => {
26
       deleteBanner(id).then((res) => {
27
-        message.success('删除成功');
27
+        // message.success('删除成功');
28
         actionRef.current.reload();
28
         actionRef.current.reload();
29
       });
29
       });
30
     }
30
     }

+ 2
- 2
src/pages/stock/edit/index.jsx 查看文件

26
     if (id) {
26
     if (id) {
27
       // 修改
27
       // 修改
28
       updataStore(id, { ...values }).then((res) => {
28
       updataStore(id, { ...values }).then((res) => {
29
-        message.success('修改成功');
29
+        // message.success('修改成功');
30
         navigate(-1);
30
         navigate(-1);
31
       });
31
       });
32
     } else {
32
     } else {
33
       // 新增
33
       // 新增
34
       addStore({ ...values }).then((res) => {
34
       addStore({ ...values }).then((res) => {
35
-        message.success('添加成功');
35
+        // message.success('添加成功');
36
         navigate(-1);
36
         navigate(-1);
37
       });
37
       });
38
     }
38
     }

+ 1
- 1
src/pages/stock/list/index.jsx 查看文件

20
   const handleDelete = (id) => {
20
   const handleDelete = (id) => {
21
     if (id) {
21
     if (id) {
22
       deleteStore(id).then((res) => {
22
       deleteStore(id).then((res) => {
23
-        message.success('删除成功');
23
+        // message.success('删除成功');
24
         actionRef.current.reload();
24
         actionRef.current.reload();
25
       });
25
       });
26
     }
26
     }

+ 2
- 2
src/pages/stockClassification/edit/index.jsx 查看文件

24
     if (id) {
24
     if (id) {
25
       // 修改
25
       // 修改
26
       updataStoreType(id, { ...values }).then((res) => {
26
       updataStoreType(id, { ...values }).then((res) => {
27
-        message.success('修改成功');
27
+        // message.success('修改成功');
28
         navigate(-1);
28
         navigate(-1);
29
       });
29
       });
30
     } else {
30
     } else {
31
       // 新增;
31
       // 新增;
32
       addStoreType({ ...values }).then((res) => {
32
       addStoreType({ ...values }).then((res) => {
33
-        message.success('添加成功');
33
+        // message.success('添加成功');
34
         navigate(-1);
34
         navigate(-1);
35
       });
35
       });
36
     }
36
     }

+ 1
- 1
src/pages/stockClassification/list/index.jsx 查看文件

15
   const handleDelete = (id) => {
15
   const handleDelete = (id) => {
16
     if (id) {
16
     if (id) {
17
       deleteStoreType(id).then((res) => {
17
       deleteStoreType(id).then((res) => {
18
-        message.success('删除成功');
18
+        // message.success('删除成功');
19
         actionRef.current.reload();
19
         actionRef.current.reload();
20
       });
20
       });
21
     }
21
     }

+ 1
- 1
src/regulation/edit/index.jsx 查看文件

25
     // if (id) {
25
     // if (id) {
26
     //添加,修改
26
     //添加,修改
27
     addRegulation({ ...values, id }).then((res) => {
27
     addRegulation({ ...values, id }).then((res) => {
28
-      message.success('成功');
28
+      // message.success('成功');
29
       navigate(-1);
29
       navigate(-1);
30
     });
30
     });
31
     return false;
31
     return false;

+ 1
- 1
src/regulation/index.jsx 查看文件

16
   const handleDelete = (id) => {
16
   const handleDelete = (id) => {
17
     if (id) {
17
     if (id) {
18
       deleteRegulation(id).then((res) => {
18
       deleteRegulation(id).then((res) => {
19
-        message.success('删除成功');
19
+        // message.success('删除成功');
20
         actionRef.current.reload();
20
         actionRef.current.reload();
21
       });
21
       });
22
     }
22
     }

+ 19
- 10
src/routes/routes.jsx 查看文件

65
  */
65
  */
66
 
66
 
67
 export const authRoutes = [
67
 export const authRoutes = [
68
+  {
69
+    path: "static",
70
+    element: <StatisCharts />,
71
+    meta: {
72
+      title: "数据分析",
73
+      noSiderBar: true,
74
+      noFooter: true,
75
+      permission: 'static',
76
+    },
77
+  },
68
   {
78
   {
69
     path: "task",
79
     path: "task",
70
     element: <Container />,
80
     element: <Container />,
232
           permission: 'purchase.instore',
242
           permission: 'purchase.instore',
233
         },
243
         },
234
       },
244
       },
245
+      {
246
+        path: "inStore/edit",
247
+        element: <PurchaseInStoreEdit />,
248
+        meta: {
249
+          title: "采购详情",
250
+          permission: 'purchase.detail',
251
+          hideInMenu: true,
252
+        },
253
+      },
235
     ],
254
     ],
236
   },
255
   },
237
   {
256
   {
334
       },
353
       },
335
     ],
354
     ],
336
   },
355
   },
337
-  {
338
-    path: "static",
339
-    element: <StatisCharts />,
340
-    meta: {
341
-      title: "数据分析",
342
-      noSiderBar: true,
343
-      noFooter: true,
344
-      permission: 'static',
345
-    },
346
-  },
347
   {
356
   {
348
     path: "system",
357
     path: "system",
349
     element: <Container />,
358
     element: <Container />,

+ 1
- 1
src/services/dish.js 查看文件

12
  * @param {*} params
12
  * @param {*} params
13
  * @returns
13
  * @returns
14
  */
14
  */
15
-export const getFoodIngredientsList = (params) => request('/foodIngredients', { params });
15
+export const getFoodIngredientsList = (params) => request('/foodIngredients', { params, successTip: false });
16
 
16
 
17
 /**
17
 /**
18
  * 详情
18
  * 详情

+ 2
- 2
src/services/package.js 查看文件

5
  * @param {*} params
5
  * @param {*} params
6
  * @returns
6
  * @returns
7
  */
7
  */
8
-export const getPackageList = (params) => request('/package', { params,successTip:false });
8
+export const getPackageList = (params) => request('/package', { params, successTip: false });
9
 
9
 
10
 
10
 
11
 /**
11
 /**
36
  * @param {*} params 
36
  * @param {*} params 
37
  * @returns 
37
  * @returns 
38
  */
38
  */
39
-export const getPackageDetailList = params => request('/packageDetail', { params });
39
+export const getPackageDetailList = params => request('/packageDetail', { params, successTip: false });
40
 
40
 
41
 
41
 
42
 /**
42
 /**