优化订单

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

@@ -16,19 +16,22 @@ export const baseOrderListColumns: any[] = [
       return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
       {text}
       </EyePreview>
-    }
+    },
+    ellipsis: true,
   },
   {
     title: '订单摘要',
     align: 'center',
     dataIndex: 'orderThe',
     key: 'orderThe',
+    ellipsis: true,
   },
   {
     title: '供应会员',
     align: 'center',
     dataIndex: 'supplyMembersName',
     key: 'supplyMembersName',
+    ellipsis: true,
   },
   {
     title: '下单时间',
@@ -42,6 +45,7 @@ export const baseOrderListColumns: any[] = [
     align: 'center',
     dataIndex: 'sumPrice',
     key: 'sumPrice',
+    ellipsis: true,
   },
   {
     title: '订单类型',

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

@@ -111,6 +111,14 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
         break;
       }
 
+      case PURCHASE_ORDER_STATUS.READY_RETURN_DOCUMENT: {
+        const params = {
+          id: parseInt(id),
+        }
+        result = await PublicApi.postOrderFiledOrderAdd(params)
+        break;
+      }
+
       // 确认收货
       // case PURCHASE_ORDER_STATUS.READY_DELEVED_ORDER: {
       //   const params = {
@@ -148,6 +156,10 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     if (page_type === PURCHASE_ORDER_STATUS.READY_CONFIRM_ELECTRON_ORDER) {
       handleSubmit({})
     }
+
+    if (page_type === PURCHASE_ORDER_STATUS.READY_RETURN_DOCUMENT) {
+      handleSubmit({})
+    }
   }
 
   const extraRight = formData && pageStatus !== PageStatus.PREVIEW && <div>

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

-import React from 'react'
+import React, { useRef } from 'react'
 import { Button } from 'antd'
 import { baseOrderListColumns } from '../../constant'
+import { history } from 'umi'
+import { PublicApi } from '@/services/api'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
 
-// 业务hooks, 待新增订单
+// 业务hooks
 export const useSelfTable = () => {
+  const ref = useRef<any>({})
+  const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
+
+  const handleSubmit = async (record) => {
+    if (record.interiorState === PurchaseOrderInsideWorkState.FILLING_ORDER) {
+      history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=${record.id}&preview=0&page_type=7`)
+    }
+  }
   const secondColumns: any[] = baseOrderListColumns.concat([
     {
       title: '操作',
@@ -11,12 +23,18 @@ export const useSelfTable = () => {
       dataIndex: 'ctl',
       key: 'ctl',
       render: (text, record) => <>
-        <Button type='link'>提交审核</Button>
+      {
+        record.interiorState === PurchaseOrderInsideWorkState.FILLING_ORDER &&
+        <Button type='link' onClick={() => handleSubmit(record)}>归档</Button>
+      }
       </>
     }
   ])
 
   return {
-    columns: secondColumns
+    columns: secondColumns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
   }
 }

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

@@ -109,6 +109,24 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
         result = await PublicApi.postOrderConfirmShipmentOrder(params)
         break;
       }
+
+      // 确认全部回单
+      case SALE_ORDER_STATUS.CONFIRM_RETURN_ORDER: {
+        const params = {
+          id: parseInt(id)
+        }
+        result = await PublicApi.postOrderReceiptOrderConfirmedAll(params)
+        break;
+      }
+
+      // 待归档
+      case SALE_ORDER_STATUS.RETURN_DOCUMENT_ORDER: {
+        const params = {
+          id: parseInt(id)
+        }
+        result = await PublicApi.postOrderOfOrdersToBeFiled(params)
+        break;
+      }
       
     }
 
@@ -126,9 +144,23 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     handleSubmit()
   }
 
-  const extraRight = formData && SaleOrderInsideWorkState.CONFIRM_DELIVERY_ORDER !== formData.purchaseOrderInteriorState && 
-  SaleOrderInsideWorkState.CONFIRM_RECEIPT !== formData.purchaseOrderInteriorState && 
-  <Button type='primary' onClick={startPush}>提交审核</Button>
+  const renderExtra = () => {
+    if (!formData) {
+      return null
+    }
+    switch(formData.purchaseOrderInteriorState) {
+      case SaleOrderInsideWorkState.CONFIRM_DELIVERY_ORDER: {
+        return <Button type='primary' onClick={startPush}>确认全部已发货</Button>
+      }
+      case SaleOrderInsideWorkState.CONFIRM_RECEIPT: {
+        return <Button type='primary' onClick={startPush}>确认全部已回单</Button>
+      }
+      default: {
+        return <Button type='primary' onClick={startPush}>提交审核</Button>
+      }
+    }
+  }
+  
   const detailList = [
     { label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
     { label: '订单摘要', name: 'orderThe', span: 8 },
@@ -147,7 +179,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
   return formData ? (
     <div>
       <OrderDetailContext.Provider value={formContext}>
-        <OrderDetailHeader headerTitle={headerTiTle} detailList={detailList} detailData={formData} extraRight={extraRight}/>
+        <OrderDetailHeader headerTitle={headerTiTle} detailList={detailList} detailData={formData} extraRight={renderExtra()}/>
         <OrderDetailWrapper>
           <div className='gray-wrap'>
             {/* 工作流进度 */}

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

@@ -99,7 +99,7 @@ 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/orderPreview?page_type=8&id=${record.id}&preview=0&orderDeliveryDetailsId=${record.orderDeliveryDetailsId}`)
   }
 
   return {

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

@@ -15,7 +15,7 @@ import { DatePicker } from '@formily/antd-components'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
 import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
 
-// 待确认回单
+// 待归档订单
 
 export interface FirstApprovedOrderProps {}
 

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

@@ -6,14 +6,14 @@ import { PublicApi } from '@/services/api'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
 import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
 
-// 业务hooks, 待新增订单
+// 业务hooks
 export const useSelfTable = () => {
   const ref = useRef<any>({})
   const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
 
   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`)
+    if (record.purchaseOrderInteriorState === SaleOrderInsideWorkState.FILLING_ORDER) {
+      history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=9`)
     }
   }
   const secondColumns: any[] = baseOrderListColumns.concat([
@@ -24,7 +24,7 @@ export const useSelfTable = () => {
       key: 'ctl',
       render: (text, record) => <>
       {
-        record.purchaseOrderInteriorState === SaleOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER &&
+        record.purchaseOrderInteriorState === SaleOrderInsideWorkState.FILLING_ORDER &&
         <Button type='link' onClick={() => handleSubmit(record)}>提交审核</Button>
       }
       </>