Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/transaction/components/orderDeleveRecord/index.tsx

-import React, { useContext, useRef } from 'react'
+import React, { useContext, useRef, useState } from 'react'
 import { Tabs, Table, Button } from 'antd'
 import StatusColors from '@/pages/transaction/components/StatusColors'
 import { formatTimeString } from '@/utils'
@@ -22,6 +22,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
   const isReturn = pathname.indexOf('readyConfirmReturnOrder') !== -1
   // 用于储存已经修改过的订单id
   const dataRef = useRef<any>([])
+  const [disabled, setDisabled] = useState<boolean>(false)
 
   const { data, reloadFormData } = useContext(OrderDetailContext)
   const { orderReceivingStatisticsResponses, orderDeliveryDetailsResponses, orderModel } = data
@@ -226,8 +227,8 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
       key: 'ctl',
       render: (text, record) => <>
       {/* todo 需根据内部状态判断显示哪个按钮 */}
-      { !isPreview && isReturn && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' onClick={() => handleReturn(record)}>确认回单</Button> }
-      { !isPreview && isReceived && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.WAREHOUSE_ORDER &&  <Button type='link' onClick={() => handleConfirm(record)}>确认收货</Button> }
+      { !isPreview && isReturn && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' disabled={disabled} onClick={() => handleReturn(record)}>确认回单</Button> }
+      { !isPreview && isReceived && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.WAREHOUSE_ORDER &&  <Button type='link' disabled={disabled} onClick={() => handleConfirm(record)}>确认收货</Button> }
       </>
     },
   ]
@@ -238,11 +239,14 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
       orderId: record.orderId,
       id: record.id
     }
-
+    setDisabled(true)
     const { code } = await PublicApi.postOrderConfirmReceipt(params)
     if (code === 1000) {
       dataRef.current.push(record.id)
       reloadFormData && reloadFormData()
+      setDisabled(false)
+    } else {
+      setDisabled(false)
     }
   }
 
@@ -252,11 +256,14 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
       orderId: record.orderId,
       id: record.id
     }
-
+    setDisabled(true)
     const { code } = await PublicApi.postOrderReceiptOrderConfirmed(params)
     if (code === 1000) {
       dataRef.current.push(record.id)
       reloadFormData && reloadFormData()
+      setDisabled(false)
+    } else {
+      setDisabled(false)
     }
 
   }

src/pages/transaction/components/orderSaleRecord/index.tsx

@@ -25,7 +25,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
   const isDeleved = pathname.indexOf('readyConfirmDelevedOrder') !== -1
   // 是否是确认回单页
   const isReturn = pathname.indexOf('readyConfirmReturnOrder') !== -1
-
+  const [disabled, setDisabled] = useState<boolean>(false)
   // 用于储存已经修改过的订单id
   const dataRef = useRef<any>([])
   const { data, reloadFormData } = useContext(OrderDetailContext)
@@ -230,8 +230,8 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       align: 'center',
       key: 'ctl',
       render: (text, record) => <>
-      { !isPreview && isReturn && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' onClick={() => handleReturn(record)}>确认回单</Button> }
-      { !isPreview && isDeleved && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER &&  <Button type='link' onClick={() => handleConfirm(record)}>确认发货</Button> }
+      { !isPreview && isReturn && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' disabled={disabled} onClick={() => handleReturn(record)}>确认回单</Button> }
+      { !isPreview && isDeleved && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER &&  <Button type='link' disabled={disabled} onClick={() => handleConfirm(record)}>确认发货</Button> }
       </>
     },
   ]
@@ -257,11 +257,14 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       orderId: record.orderId,
       id: record.id
     }
-
+    setDisabled(true)
     const { code } = await PublicApi.postOrderConfirmShipmentOrder(params)
     if (code === 1000) {
       dataRef.current.push(record.id)
       reloadFormData && reloadFormData()
+      setDisabled(false)
+    } else {
+      setDisabled(false)
     }
   }
 
@@ -271,11 +274,14 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       orderId: record.orderId,
       id: record.id
     }
-
+    setDisabled(true)
     const { code } = await PublicApi.postOrderReceiptOrderConfirmed(params)
     if (code === 1000) {
       dataRef.current.push(record.id)
       reloadFormData && reloadFormData()
+      setDisabled(false)
+    } else {
+      setDisabled(false)
     }
   }
 

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

@@ -113,7 +113,7 @@ export const useSelfTable = () => {
   const handleConfirm = async (record) => {
     const modal = Modal.confirm({
       title: '确认审核操作',
-      content: `是否确认审核发货单号为${record.invoiceNumber}的销售发货单?`,
+      content: `是否确认审核发货单号为${record.deliverNo}的销售发货单?`,
       onOk: async () => {
         const { code } = await PublicApi.postOrderAuditSalesInvoiceOrder({
           id: record.orderDeliveryDetailsId,