update
This commit is contained in:
parent
143fc41f4b
commit
3d9b2740a6
@ -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": {
|
||||
|
||||
@ -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
|
||||
</Col> */}
|
||||
|
||||
|
||||
|
||||
{
|
||||
comeType === 'TradingLedger' ? <Col span={8} className="memberInfoDetailItem">
|
||||
<ProFormText
|
||||
name={"CompanyName"}
|
||||
label={"会员单位"}
|
||||
readonly
|
||||
style={{ marginBottom: '16px' }}
|
||||
/>
|
||||
</Col> : ""
|
||||
}
|
||||
|
||||
{
|
||||
detailType === 'food' ? '' :
|
||||
@ -823,6 +834,9 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
|
||||
/>
|
||||
</Col>
|
||||
}
|
||||
|
||||
|
||||
|
||||
<Col span={8} className="memberInfoDetailItem">
|
||||
<ProFormText
|
||||
name={"SALEBILL_DESC"}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// 由 scripts/writeVersion.js 自动生成
|
||||
export const VERSION = "4.5.141";
|
||||
export const GIT_HASH = "15379a9";
|
||||
export const BUILD_TIME = "2026-01-30T07:18:59.167Z";
|
||||
export const VERSION = "4.5.143";
|
||||
export const GIT_HASH = "143fc41";
|
||||
export const BUILD_TIME = "2026-02-03T01:59:55.104Z";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user