diff --git a/dist.zip b/dist.zip index eff17dc..acdb435 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index 94c3b43..6438b09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.141", + "version": "4.5.143", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/travelMember/BookingMealOrder/components/orderDetailModal.tsx b/src/pages/travelMember/BookingMealOrder/components/orderDetailModal.tsx index 0faa08c..3e60110 100644 --- a/src/pages/travelMember/BookingMealOrder/components/orderDetailModal.tsx +++ b/src/pages/travelMember/BookingMealOrder/components/orderDetailModal.tsx @@ -478,7 +478,8 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || currentRow?.PaymentMethod || "", TAKE_TYPE: data.TAKE_TYPE === 1000 ? "自提" : data.TAKE_TYPE === 3000 ? '免发货' : '邮寄', SALEBILL_STATE: currentRow?.SALEBILL_STATE || data?.SALEBILL_STATE, - SALEBILL_CODELIST: currentRow?.SALEBILL_CODE || currentRow?.OrderCode || '' + SALEBILL_CODELIST: currentRow?.SALEBILL_CODE || currentRow?.OrderCode || '', + CompanyName: currentRow?.CompanyName || "" } } else { const req: any = { @@ -513,7 +514,8 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || currentRow?.PaymentMethod || "", TAKE_TYPE: res.TAKE_TYPE === 1000 ? "自提" : res.TAKE_TYPE === 3000 ? '免发货' : '邮寄', SALEBILL_STATE: currentRow?.SALEBILL_STATE || data?.SALEBILL_STATE, - SALEBILL_CODELIST: currentRow?.SALEBILL_CODE || currentRow?.OrderCode || '' + SALEBILL_CODELIST: currentRow?.SALEBILL_CODE || currentRow?.OrderCode || '', + CompanyName: currentRow?.CompanyName || "" } } else { message.error('当前订单数据异常,请联系管理员!') @@ -810,7 +812,16 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy */} - + { + comeType === 'TradingLedger' ?