调整路由

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

@@ -65,7 +65,7 @@ export const useSelfTable = () => {
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/preview?id=${record.id}`}>
             {text}
           </EyePreview>
         )

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

@@ -32,7 +32,7 @@ export const useSelfTable = () => {
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/readyReceivedOrder/preview?id=${record.id}`}>
             {text}
           </EyePreview>
         )
@@ -101,7 +101,6 @@ export const useSelfTable = () => {
   ]
 
   const handleConfirm = async (record) => {
-    // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=6&id=${record.id}&preview=0&orderDeliveryDetailsId=${record.orderDeliveryDetailsId}`)
     history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyReceiveOrder/detail?id=${record.id}&orderDeliveryDetailsId=${record.orderDeliveryDetailsId}`);
   }
 

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

@@ -11,7 +11,6 @@ export const useSelfTable = () => {
   const ref = useRef<any>({})
   const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
   const handleSubmit = async (id) => {
-    // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${id}&preview=0&page_type=3`)
     history.push(`/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/detail?id=${id}&preview=0`)
   }
 

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

@@ -10,7 +10,6 @@ export const useSelfTable = () => {
   const ref = useRef<any>({})
   const handleSubmit = async (record) => {
     if (record.interiorState === PurchaseOrderInsideWorkState.TWO_LEVEL_AUDIT_ORDER) {
-      // history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=2`)
       history.push(`/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/detail?id=${record.id}`)
     }
   }

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

@@ -13,7 +13,6 @@ export const useSelfTable = () => {
 
   const handleSubmit = async (record) => {
     if (record.purchaseOrderInteriorState === SaleOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER) {
-      // history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=1`)
       history.push(`/memberCenter/tranactionAbility/saleOrder/firstApprovedOrder/detail?id=${record.id}`)
     }
   }

src/pages/transaction/saleOrder/orderPreview/index.tsx

@@ -16,7 +16,7 @@ const OrderPreview: React.FC = () => {
 
         <OrderDetailWrapper>
           <PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
-            <OrderDetailSection formContext={formContext}/>
+            <OrderDetailSection formContext={formContext} type='saleOrder'/>
           </PreLoading>
         </OrderDetailWrapper>
       </OrderDetailContext.Provider>

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

@@ -22,7 +22,7 @@ export const useSelfTable = () => {
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder/preview?id=${record.id}`}>
             {text}
           </EyePreview>
         )

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

@@ -12,7 +12,6 @@ export const useSelfTable = () => {
   const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
 
   const handleSubmit = async (id) => {
-    // history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=0&id=${id}&preview=0`)
     history.push(`/memberCenter/tranactionAbility/saleOrder/readyApprovedOrder/detail?id=${id}`)
   }
 

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/detail/index.tsx

@@ -10,14 +10,16 @@ import OrderHandDeleved from '../../../components/orderHandDeleved';
 import { history } from 'umi'
 import { useHttpRequest } from '@/hooks/useHttpRequest';
 import OrderDetailSection from '../../../components/orderDetailSection';
-import { SaleOrderInsideWorkState } from '@/constants';
+import { SaleOrderInsideWorkState, DeliverySideState } from '@/constants';
 
 const ReadyConfirmDelevedOrderDetail: React.FC = () => {
   const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
 
   // 是否是手工发货
   const isHandDeleved = formContext && formContext.data && formContext.data.purchaseOrderInteriorState === SaleOrderInsideWorkState.HAND_DELEVED_ORDER
-
+  
+  // 所有发货单都是否已经发货了
+  const isShowBtn = formContext.data?.orderDeliveryDetailsResponses?.some(v => v.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER)
   const approvedRef = useRef<any>({})
 
   const handleClick = useCallback(() => {
@@ -33,7 +35,7 @@ const ReadyConfirmDelevedOrderDetail: React.FC = () => {
     <div>
       <OrderDetailContext.Provider value={formContext}>
         <OrderDetailHeader detailList={detailList} detailData={formContext.data} extraRight={
-          <Button type='primary' onClick={handleClick}>
+          isShowBtn && <Button type='primary' onClick={handleClick}>
             { isHandDeleved ? '确认手工发货' : '去发货' }
           </Button>
         } />

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

@@ -101,7 +101,6 @@ export const useSelfTable = () => {
   ]
 
   const handleConfirm = async (record) => {
-    // history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=7&id=${record.id}&preview=0&orderDeliveryDetailsId=${record.orderDeliveryDetailsId}`)
     history.push(`/memberCenter/tranactionAbility/saleOrder/readyConfirmDelevedOrder/detail?id=${record.id}&orderDeliveryDetailsId=${record.orderDeliveryDetailsId}`)
   }
 

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

@@ -6,7 +6,6 @@ import { baseOrderListColumns } from '../../constant'
 // 业务hooks, 待新增订单
 export const useSelfTable = () => {
   const handleConfirm = async (record) => {
-    // history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=3&id=${record.id}&preview=1`)
     history.push(`/memberCenter/tranactionAbility/saleOrder/readyConfirmOrder/detail?id=${record.id}`)
   }
   const secondColumns: any[] = baseOrderListColumns.concat([

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

@@ -32,7 +32,7 @@ export const useSelfTable = () => {
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/readyConfirmReturnOrder/preview?id=${record.id}`}>
             {text}
           </EyePreview>
         )

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

@@ -65,7 +65,7 @@ export const useSelfTable = () => {
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/readyPayResult/preview?id=${record.id}`}>
             {text}
           </EyePreview>
         )
@@ -140,7 +140,6 @@ export const useSelfTable = () => {
   ]
 
   const handleConfirm = async (record) => {
-    // history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=4&id=${record.id}&preview=0`)
     history.push(`/memberCenter/tranactionAbility/saleOrder/readyPayResult/detail?id=${record.id}`)
   }
 

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

@@ -13,7 +13,6 @@ export const useSelfTable = () => {
 
   const handleSubmit = async (record) => {
     if (record.purchaseOrderInteriorState === SaleOrderInsideWorkState.FILLING_ORDER) {
-      // history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=9`)
       history.push(`/memberCenter/tranactionAbility/saleOrder/readyReturnDocument/detail?id=${record.id}`)
     }
   }

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

@@ -10,7 +10,6 @@ export const useSelfTable = () => {
   const ref = useRef<any>({})
   const handleSubmit = async (record) => {
     if (record.purchaseOrderInteriorState === SaleOrderInsideWorkState.TWO_LEVEL_AUDIT_ORDER) {
-      // history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=2`)
       history.push(`/memberCenter/tranactionAbility/saleOrder/secondApprovedOrder/detail?id=${record.id}`)
     }
   }