fix

src/pages/guaranteeTask/index.jsx

@@ -1,11 +1,14 @@
-import { deleteGuaranteeTask, getGuaranteeTaskList } from '@/services/guaranteeTask';
-import { queryTable } from '@/utils/request';
-import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { Link, useNavigate } from 'react-router-dom';
+import {
+  deleteGuaranteeTask,
+  getGuaranteeTaskList,
+} from "@/services/guaranteeTask";
+import { queryTable } from "@/utils/request";
+import { PageContainer, ProTable } from "@ant-design/pro-components";
+import { Link, useNavigate } from "react-router-dom";
 
-import { Button, message, Popconfirm } from 'antd';
-import moment from 'moment';
-import { useRef, useState } from 'react';
+import { Button, message, Popconfirm } from "antd";
+import moment from "moment";
+import { useRef, useState } from "react";
 
 const GuaranteeTaskList = (props) => {
   const navigate = useNavigate();
@@ -18,7 +21,7 @@ const GuaranteeTaskList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteGuaranteeTask(id).then((res) => {
-        message.success('删除成功');
+        message.success("删除成功");
         actionRef.current.reload();
       });
     }
@@ -31,47 +34,47 @@ const GuaranteeTaskList = (props) => {
 
   const columns = [
     {
-      title: '保障序号',
-      dataIndex: 'guaranteeNo',
+      title: "保障序号",
+      dataIndex: "guaranteeNo",
     },
     {
-      title: '受领人',
-      dataIndex: 'receiver',
+      title: "受领人",
+      dataIndex: "receiver",
     },
     {
-      title: '时间区间',
-      dataIndex: 'dateRange',
-      valueType: 'dateRange',
+      title: "时间区间",
+      dataIndex: "dateRange",
+      valueType: "dateRange",
       search: {
         transform: (value) => {
-          console.log(value, value[0].valueOf(), 'valuevalue');
+          console.log(value, value[0].valueOf(), "valuevalue");
 
           return {
-            startDate: moment(value[0]).format('yyyy-MM-DD'),
-            endDate: moment(value[1]).format('yyyy-MM-DD'),
+            startDate: moment(value[0]).format("yyyy-MM-DD"),
+            endDate: moment(value[1]).format("yyyy-MM-DD"),
           };
         },
       },
     },
     {
-      title: '保障地点',
-      dataIndex: 'address',
+      title: "保障地点",
+      dataIndex: "address",
       search: false,
     },
     {
-      title: '保障人数',
-      dataIndex: 'totalPersonNum',
+      title: "保障人数",
+      dataIndex: "totalPersonNum",
       search: false,
     },
     {
-      title: '伙食标准',
-      dataIndex: 'standard',
+      title: "伙食标准",
+      dataIndex: "standard",
       search: false,
     },
 
     {
-      title: '操作',
-      valueType: 'option',
+      title: "操作",
+      valueType: "option",
       width: 200,
       render: (_, record) => [
         <Button
@@ -97,13 +100,13 @@ const GuaranteeTaskList = (props) => {
             删除
           </Button>
         </Popconfirm>,
-        <Button
+        <a
           key={4}
-          style={{ padding: 0 }}
-          type="link"
+          href={`${window.location.pathname}#/task/guaranteeTask/print?id=${record.id}`}
+          target="_blank"
         >
-          <Link target="_blank" to={`/task/guaranteeTask/print?id=${record.id}`}>打印</Link>
-        </Button>,
+          执行
+        </a>,
       ],
     },
   ];
@@ -125,7 +128,7 @@ const GuaranteeTaskList = (props) => {
             key="2"
             type="primary"
             onClick={() => {
-              history.push('/guaranteeTask/edit');
+              navigate(`/task/guaranteeTask/edit`);
             }}
           >
             新增

src/routes/routes.jsx

@@ -6,34 +6,34 @@ import {
   MenuFoldOutlined,
   MenuUnfoldOutlined,
   PieChartOutlined,
-} from '@ant-design/icons';
-import { Navigate } from 'react-router-dom';
-import AuthLayout from '@/layouts/AuthLayout';
-import Container from '@/layouts/Container';
-import Login from '@/pages/login';
-import Page404 from '@/pages/404';
-import Home from '@/pages/sample/home';
-import BasicForm from '@/pages/sample/form';
-import BasicTable from '@/pages/sample/table';
-import GuaranteeTaskList from '@/pages/guaranteeTask';
-import GuaranteeTaskEdit from '@/pages/guaranteeTask/Edit';
-import GuaranteeTaskPrint from '@/pages/guaranteeTask/print';
-import DishList from '@/pages/dish/list';
-import DishEdit from '@/pages/dish/edit';
-import PackageList from '@/pages/package/List';
-import StockList from '@/pages/stock/list';
-import StockEdit from '@/pages/stock/edit';
-import StockInOut from '@/pages/stock/outAndIn';
-import StockLog from '@/pages/stock/stockLog';
-import StockClassificationList from '@/pages/stockClassification/list';
-import StockClassificationEdit from '@/pages/stockClassification/edit';
-import RotationChartList from '@/pages/rotationChart/list';
-import RotationChartEdit from '@/pages/rotationChart/edit';
-import RotationChartIntroduction from '@/pages/rotationChart/introduction';
-import Roles from '@/pages/roles/index';
-import RegulationList from '@/regulation';
-import UserList from '@/pages/user';
-import UserEdit from '@/pages/user/Edit';
+} from "@ant-design/icons";
+import { Navigate } from "react-router-dom";
+import AuthLayout from "@/layouts/AuthLayout";
+import Container from "@/layouts/Container";
+import Login from "@/pages/login";
+import Page404 from "@/pages/404";
+import Home from "@/pages/sample/home";
+import BasicForm from "@/pages/sample/form";
+import BasicTable from "@/pages/sample/table";
+import GuaranteeTaskList from "@/pages/guaranteeTask";
+import GuaranteeTaskEdit from "@/pages/guaranteeTask/Edit";
+import GuaranteeTaskPrint from "@/pages/guaranteeTask/print";
+import DishList from "@/pages/dish/list";
+import DishEdit from "@/pages/dish/edit";
+import PackageList from "@/pages/package";
+import StockList from "@/pages/stock/list";
+import StockEdit from "@/pages/stock/edit";
+import StockInOut from "@/pages/stock/outAndIn";
+import StockLog from "@/pages/stock/stockLog";
+import StockClassificationList from "@/pages/stockClassification/list";
+import StockClassificationEdit from "@/pages/stockClassification/edit";
+import RotationChartList from "@/pages/rotationChart/list";
+import RotationChartEdit from "@/pages/rotationChart/edit";
+import RotationChartIntroduction from "@/pages/rotationChart/introduction";
+import Roles from "@/pages/roles/index";
+import RegulationList from "@/regulation";
+import UserList from "@/pages/user";
+import UserEdit from "@/pages/user/Edit";
 import PurchasePlanList from "@/pages/purchase/plan/list";
 import PurchasePlanEdit from "@/pages/purchase/plan/edit";
 import PurchaseBillEdit from "@/pages/purchase/bill/edit";
@@ -42,8 +42,8 @@ import EmergencyPlanList from "@/pages/cms/emergencyPlan/list";
 import EmergencyPlanEdit from "@/pages/cms/emergencyPlan/edit";
 import EmergencyPlanDetail from "@/pages/cms/emergencyPlan/detail";
 import FilesList from "@/pages/cms/files/list";
-import MessageList from '@/pages/message';
-import MessageDetail from '@/pages/message/detail';
+import MessageList from "@/pages/message";
+import MessageDetail from "@/pages/message/detail";
 
 /**
  * meta 用来扩展自定义数据数据
@@ -58,151 +58,158 @@ import MessageDetail from '@/pages/message/detail';
 
 export const authRoutes = [
   {
-    path: 'task',
+    path: "task",
     element: <Container />,
     meta: {
-      title: '军供任务',
+      title: "军供任务",
       icon: <AppstoreOutlined />,
     },
     children: [
       {
         index: true,
-        element: <Navigate to='guaranteeTask' replace />,
+        element: <Navigate to="guaranteeTask" replace />,
       },
       {
-        path: 'guaranteeTask',
+        path: "guaranteeTask",
         element: <GuaranteeTaskList />,
         meta: {
-          title: '军供通报',
+          title: "军供通报",
         },
       },
       {
-        path: 'guaranteeTask/edit',
+        path: "guaranteeTask/edit",
         element: <GuaranteeTaskEdit />,
         meta: {
-          title: '任务配置',
+          title: "任务配置",
         },
       },
       {
-        path: 'guaranteeTask/print',
+        path: "guaranteeTask/print",
         element: <GuaranteeTaskPrint />,
         meta: {
           hideInMenu: true,
           noLayout: true,
-          target: '_blank',
-          title: '任务执行',
+          target: "_blank",
+          title: "任务执行",
         },
-      }
-    ]
+      },
+      {
+        path: "guaranteeTask/print",
+        element: <GuaranteeTaskPrint />,
+        meta: {
+          title: "任务评价",
+        },
+      },
+    ],
   },
   {
-    path: 'material',
+    path: "material",
     element: <Container />,
     meta: {
-      title: '物资管理',
+      title: "物资管理",
       icon: <AppstoreOutlined />,
     },
     children: [
       {
         index: true,
-        element: <Navigate to='dish/list' replace />,
+        element: <Navigate to="dish/list" replace />,
       },
       {
-        path: 'dish/list',
+        path: "dish/list",
         element: <DishList />,
         meta: {
-          title: '菜肴管理',
+          title: "菜肴管理",
         },
       },
       {
-        path: 'dish/edit',
+        path: "dish/edit",
         element: <DishEdit />,
         meta: {
           hideInMenu: true,
-          title: '菜肴维护',
+          title: "菜肴维护",
         },
       },
       {
-        path: 'package/list',
+        path: "package/list",
         element: <PackageList />,
         meta: {
-          title: '套餐管理',
+          title: "套餐管理",
         },
       },
-    ]
+    ],
   },
   {
-    path: 'stock',
+    path: "stock",
     element: <Container />,
     meta: {
-      title: '库存管理',
+      title: "库存管理",
       icon: <AppstoreOutlined />,
     },
     children: [
       {
         index: true,
-        element: <Navigate to='list' replace />,
+        element: <Navigate to="list" replace />,
       },
       {
-        path: 'list',
+        path: "list",
         element: <StockList />,
         meta: {
-          title: '库存列表',
+          title: "库存列表",
         },
       },
       {
-        path: 'add',
+        path: "add",
         element: <StockEdit />,
         meta: {
-          title: '库存维护',
+          title: "库存维护",
         },
       },
     ],
   },
   {
-    path: 'cms',
+    path: "cms",
     element: <Container />,
     meta: {
-      title: '公告文件',
+      title: "公告文件",
     },
     children: [
       {
         index: true,
-        element: <Navigate to='rotationChart/list' replace />,
+        element: <Navigate to="rotationChart/list" replace />,
       },
       {
-        path: 'station',
+        path: "station",
         element: null,
         meta: {
-          title: '本站信息',
+          title: "本站信息",
         },
       },
       {
-        path: 'rotationChart/list',
+        path: "rotationChart/list",
         element: <RotationChartList />,
         meta: {
-          title: '公告内容',
+          title: "公告内容",
         },
       },
       {
-        path: 'rotationChart/add',
+        path: "rotationChart/add",
         element: <RotationChartEdit />,
         meta: {
-          title: '公告维护',
+          title: "公告维护",
         },
       },
       {
-        path: 'rotationChart/introduction',
+        path: "rotationChart/introduction",
         element: <RotationChartIntroduction />,
         meta: {
-          title: '本站信息简介',
+          title: "本站信息简介",
         },
       },
       {
-        path: 'regulation',
+        path: "regulation",
         element: null,
         meta: {
-          title: '规章制度',
+          title: "规章制度",
         },
       },
       {
@@ -236,86 +243,85 @@ export const authRoutes = [
           title: "文件管理",
         },
       },
-     
     ],
   },
   {
-    path: 'static',
+    path: "static",
     element: <Container />,
     meta: {
-      title: '数据分析',
+      title: "数据分析",
     },
   },
   {
-    path: 'system',
+    path: "system",
     element: <Container />,
     meta: {
-      title: '系统管理',
+      title: "系统管理",
     },
     children: [
       {
         index: true,
-        element: <Navigate to='stockClassification/list' replace />,
+        element: <Navigate to="stockClassification/list" replace />,
       },
       {
-        path: 'stockClassification/list',
+        path: "stockClassification/list",
         element: <StockClassificationList />,
         meta: {
-          title: '库存分类',
+          title: "库存分类",
         },
       },
       {
-        path: 'stockClassification/edit',
+        path: "stockClassification/edit",
         element: <StockClassificationEdit />,
         meta: {
-          title: '库存分类维护',
+          title: "库存分类维护",
           hideInMenu: true,
         },
       },
       {
-        path: 'log',
+        path: "log",
         element: <StockLog />,
         meta: {
-          title: '操作日志',
+          title: "操作日志",
         },
       },
       {
-        path: 'roles',
+        path: "roles",
         element: <Roles />,
         meta: {
-          title: '角色管理',
+          title: "角色管理",
         },
       },
       {
-        path: 'user',
+        path: "user",
         element: <UserList />,
         meta: {
-          title: '用户管理',
+          title: "用户管理",
         },
       },
       {
-        path: 'user/edit',
+        path: "user/edit",
         element: <UserEdit />,
         meta: {
           hideInMenu: true,
-          title: '系统用户编辑',
+          title: "系统用户编辑",
         },
       },
       {
-        path: 'message',
+        path: "message",
         element: <MessageList />,
         meta: {
-          title: '消息列表',
+          title: "消息列表",
         },
       },
       {
-        path: 'message/detail',
+        path: "message/detail",
         element: <MessageDetail />,
         meta: {
-          title: '消息详情',
+          title: "消息详情",
           hideInMenu: true,
         },
-      }
+      },
     ],
   },
   {
@@ -368,7 +374,7 @@ export const authRoutes = [
       },
       {
         path: "inStore/edit",
-        element: <PurchaseInStoreEdit  />,
+        element: <PurchaseInStoreEdit />,
         meta: {
           title: "采购入库维护",
           hideInMenu: true,
@@ -376,11 +382,11 @@ export const authRoutes = [
       },
     ],
   },
-]
+];
 
 export const defaultRoutes = [
   {
-    path: '/',
+    path: "/",
     element: <AuthLayout />,
     children: [
       {
@@ -388,30 +394,30 @@ export const defaultRoutes = [
         element: <Home />,
       },
       {
-        path: 'home',
+        path: "home",
         element: <Home />,
         meta: {
-          title: '首页',
+          title: "首页",
           icon: <DesktopOutlined />,
         },
       },
       {
-        path: '*',
-        element: <Page404 />
-      }
+        path: "*",
+        element: <Page404 />,
+      },
     ],
   },
   {
-    path: '/login',
+    path: "/login",
     element: <Login />,
   },
   {
-    path: '*',
-    element: <Page404 />
-  }
+    path: "*",
+    element: <Page404 />,
+  },
 ];
 
-export function mergeAuthRoutes (r1, r2) {
+export function mergeAuthRoutes(r1, r2) {
   const r = r1.slice();
   const children = r1[0].children.slice();
   r[0].children = children.concat(r2);
@@ -421,21 +427,22 @@ export function mergeAuthRoutes (r1, r2) {
 // 全部路由
 export const routes = mergeAuthRoutes(defaultRoutes, authRoutes);
 
-function getPath(parent = '/', current = '') {
-  if (current.indexOf('/') === 0 || current.indexOf('http') === 0) return current;
-  return `${parent}/${current}`.replace(/\/\//g, '/');
+function getPath(parent = "/", current = "") {
+  if (current.indexOf("/") === 0 || current.indexOf("http") === 0)
+    return current;
+  return `${parent}/${current}`.replace(/\/\//g, "/");
 }
 
 // 路由数组, 一维数组
 export const routeArr = (() => {
-  const flatten = (routes, parentPath = '/') => {
+  const flatten = (routes, parentPath = "/") => {
     return routes.reduce((acc, route) => {
       const path = getPath(parentPath, route.path);
       const children = route.children ? flatten(route.children, path) : [];
-      
+
       return acc.concat([{ ...route, path }].concat(children));
     }, []);
-  }
+  };
 
   return flatten(routes);
 })();

src/services/dish.js

@@ -5,7 +5,7 @@ import request from '@/utils/request';
  * @param {*} params
  * @returns
  */
-export const getDishList = (params) => request('/dishes', { params });
+export const getDishList = (params) => request('/dishes', { params,successTip:false });
 
 /**
  * 查询食材列表

src/services/guaranteeTask.js

@@ -50,7 +50,7 @@ import request from '@/utils/request';
  * @param {*} params
  * @returns
  */
-export const getGuaranteeTaskList = (params) => request('/guaranteeTask', { params });
+export const getGuaranteeTaskList = (params) => request('/guaranteeTask', { 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 });
+export const getPackageList = (params) => request('/package', { params,successTip:false });
 
 
 /**