调整采购订单路由

config/routes/tranactionRoute.ts

@@ -477,13 +477,29 @@ const TranactionRoute: RouterChild = {
           path: '/memberCenter/tranactionAbility/purchaseOrder/orderList',
           name: 'purchaseOrderSearch',
           component: '@/pages/transaction/purchaseOrder'
-        }, 
+        },
+        // 订单查询-查看
+        {
+          path: '/memberCenter/tranactionAbility/purchaseOrder/orderList/preview',
+          name: 'orderPreview',
+          hideInMenu: true,
+          noMargin: true,
+          component: '@/pages/transaction/purchaseOrder/orderPreview'
+        },
         // 待新增订单
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder',
           name: 'readyAddOrder',
           component: '@/pages/transaction/purchaseOrder/readyAddOrder'
         },
+        // 待新增订单-查看
+        {
+          path: '/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/preview',
+          name: 'orderPreview',
+          hideInMenu: true,
+          noMargin: true,
+          component: '@/pages/transaction/purchaseOrder/orderPreview'
+        },
         // 待新增订单-新增订单
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/add',
@@ -498,27 +514,21 @@ const TranactionRoute: RouterChild = {
           component: '@/pages/transaction/purchaseOrder/readyAddOrderForm', 
           hideInMenu: true, 
         }, 
-        // 待新增订单-查看
+        
+        // 一级审核
         {
-          path: '/memberCenter/tranactionAbility/purchaseOrder/orderDetail',
-          name: 'orderDetail',
-          hideInMenu: true,
-          component: '@/pages/transaction/purchaseOrder/orderDetail'
+          path: '/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder',
+          name: 'firstApprovedOrder',
+          component: '@/pages/transaction/purchaseOrder/firstApprovedOrder'
         },
-        // 订单查看
+        // 一级审核-查看
         {
-          path: '/memberCenter/tranactionAbility/purchaseOrder/orderPreview',
+          path: '/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/preview',
           name: 'orderPreview',
           hideInMenu: true,
           noMargin: true,
           component: '@/pages/transaction/purchaseOrder/orderPreview'
         },
-        // 一级审核
-        {
-          path: '/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder',
-          name: 'firstApprovedOrder',
-          component: '@/pages/transaction/purchaseOrder/firstApprovedOrder'
-        },
         // 一级审核-详情
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/detail',
@@ -533,6 +543,14 @@ const TranactionRoute: RouterChild = {
           name: 'secondApprovedOrder',
           component: '@/pages/transaction/purchaseOrder/secondApprovedOrder'
         },
+        // 二级审核-查看
+        {
+          path: '/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/preview',
+          name: 'orderPreview',
+          hideInMenu: true,
+          noMargin: true,
+          component: '@/pages/transaction/purchaseOrder/orderPreview'
+        },
         // 二级审核-详情
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/detail',
@@ -547,6 +565,14 @@ const TranactionRoute: RouterChild = {
           name: 'readySubmitOrder',
           component: '@/pages/transaction/purchaseOrder/readySubmitOrder'
         },
+        // 待提交订单-查看
+        {
+          path: '/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/preview',
+          name: 'orderPreview',
+          hideInMenu: true,
+          noMargin: true,
+          component: '@/pages/transaction/purchaseOrder/orderPreview'
+        },
         // 待提交订单-详情
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/detail',
@@ -561,6 +587,14 @@ const TranactionRoute: RouterChild = {
           name: 'readyConfirmContract',
           component: '@/pages/transaction/purchaseOrder/readyConfirmContract'
         },
+        // 待确认电子合同-查看
+        {
+          path: '/memberCenter/tranactionAbility/purchaseOrder/readyConfirmContract/preview',
+          name: 'orderPreview',
+          hideInMenu: true,
+          noMargin: true,
+          component: '@/pages/transaction/purchaseOrder/orderPreview'
+        },
         // 待确认电子合同-详情
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/readyConfirmContract/detail',
@@ -575,6 +609,14 @@ const TranactionRoute: RouterChild = {
           name: 'readyPayOrder',
           component: '@/pages/transaction/purchaseOrder/readyPayOrder'
         },
+        // 待支付订单-查看
+        {
+          path: '/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/preview',
+          name: 'orderPreview',
+          hideInMenu: true,
+          noMargin: true,
+          component: '@/pages/transaction/purchaseOrder/orderPreview'
+        },
         // 待支付订单-详情
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail',
@@ -595,6 +637,14 @@ const TranactionRoute: RouterChild = {
           name: 'readyReceiveOrder',
           component: '@/pages/transaction/purchaseOrder/readyReceiveOrder'
         },
+        // 待收货订单-查看
+        {
+          path: '/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder/preview',
+          name: 'orderPreview',
+          hideInMenu: true,
+          noMargin: true,
+          component: '@/pages/transaction/purchaseOrder/orderPreview'
+        },
         // 待收货订单-详情
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder/detail',
@@ -609,6 +659,14 @@ const TranactionRoute: RouterChild = {
           name: 'readyFileOrder',
           component: '@/pages/transaction/purchaseOrder/readyFileOrder'
         },
+        // 待归档订单-查看
+        {
+          path: '/memberCenter/tranactionAbility/purchaseOrder/readyFileOrder/preview',
+          name: 'orderPreview',
+          hideInMenu: true,
+          noMargin: true,
+          component: '@/pages/transaction/purchaseOrder/orderPreview'
+        },
         // 待归档订单-详情
         {
           path: '/memberCenter/tranactionAbility/purchaseOrder/readyFileOrder/detail',

config/utils/index.ts

@@ -17,6 +17,7 @@ export interface RouterChild {
   name: string
   icon?: string
   routes?: RouterChild[]
+  key?: string
   component?: string
 
   /**

src/layouts/BasicLayout.tsx

@@ -102,6 +102,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
       location.pathname || '/',
       basicInfo.menuData || [],
     );
+
     const animationFrameId = requestAnimationFrame(() => {
       setSelectedKeys(keys);
     });

src/layouts/components/MenuSlider.tsx

@@ -51,7 +51,7 @@ const MenuSlider: React.FC<MenuSliderProps> = (props) => {
           )
         }
         return (
-          <Menu.Item key={item.path} className={hasChildren ? styles.menuItem : ""}>
+          <Menu.Item key={item.key || item.path} className={hasChildren ? styles.menuItem : ""}>
             {
               hasChildren && <BorderOutlined rotate={45} style={{ fontSize: 6, verticalAlign: 'middle' }} />
             }

src/pages/transaction/purchaseOrder/addPurchaseWarehouseOrder/model/useSelfTable.tsx

@@ -7,17 +7,6 @@ import { formatTimeString } from '@/utils'
 import { ORDER_TYPE, PurchaseOrderInsideWorkState, DOC_TYPE_PURCHASE_RECEIPT, DOC_TYPE_SALES_INVOICE } from '@/constants'
 import StatusColors from '@/pages/transaction/components/StatusColors'
 import { FieldTimeOutlined } from '@ant-design/icons'
-import {
-  Chart,
-  Interval,
-  Axis,
-  Tooltip,
-  Coordinate,
-  Legend,
-  View,
-  Annotation,
-} from 'bizcharts';
-import DataSet from "@antv/data-set";
 
 // 业务hooks, 待支付订单
 export const useSelfTable = () => {
@@ -32,10 +21,7 @@ export const useSelfTable = () => {
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
         return (
-          // <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
-          //   {text}
-          // </EyePreview>
-          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/addPurchaseWarehouseOrder/preview?id=${record.id}`}>
             {text}
           </EyePreview>
         )

src/pages/transaction/purchaseOrder/constant/index.tsx

 import React from 'react'
+import { history } from 'umi'
 import { formatTimeString } from '@/utils'
 import { ORDER_TYPE } from '@/constants'
 import StatusColors from '../components/StatusColors'
@@ -14,10 +15,7 @@ export const baseOrderListColumns: any[] = [
     render: (text, record) => {
       // 查看订单, 需根据状态显示不同schema
       return (
-        // <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
-        //   {text}
-        // </EyePreview>
-        <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`}>
+        <EyePreview url={`${history.location.pathname}/preview?id=${record.id}`}>
           {text}
         </EyePreview>
       )

src/pages/transaction/purchaseOrder/firstApprovedOrder/model/useSelfTable.tsx

@@ -14,7 +14,6 @@ export const useSelfTable = () => {
 
   const handleSubmit = async (record) => {
     if (record.interiorState === PurchaseOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER) {
-      // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=${PURCHASE_ORDER_STATUS.ONE_LEVEL_APPROVED_ORDER}`)
       history.push(`/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/detail?id=${record.id}`)
     }
     // await PublicApi.postOrderQuotationBeReviewed({id})

src/pages/transaction/saleOrder/readyPayResult/model/useSelfTable.tsx

@@ -137,7 +137,7 @@ export const useSelfTable = () => {
       key: 'ctl',
       render: (text, record) => <>
         <Button type='link' onClick={() => handleConfirm(record)}>确认</Button>
-        <Button type='link' onClick={() => handleCancel(record.id)}>取消订单</Button>
+        {/* <Button type='link' onClick={() => handleCancel(record.id)}>取消订单</Button> */}
       </>
     }
   ]