Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄庭坚
jinfa-platform
Commits
5d3c8ca3
Commit
5d3c8ca3
authored
Nov 24, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理价格策略商城显示异常,所有类型下单添加街道字段,处理下单更新地址时街道字段选择异常。
parent
d16fb273
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
92 additions
and
42 deletions
+92
-42
index.tsx
src/pages/priceManage/effect/index.tsx
+1
-3
setStrategy.tsx
src/pages/priceManage/priceStrategy/setStrategy.tsx
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/constant/index.tsx
+7
-7
index.tsx
src/pages/transaction/purchaseOrder/index.tsx
+7
-0
index.tsx
...seOrder/orderCollectB2b/components/addressModal/index.tsx
+10
-4
index.tsx
...pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
+1
-0
index.ts
.../transaction/purchaseOrder/orderCollectCash/apis/index.ts
+1
-1
index.tsx
...eOrder/orderCollectCash/components/addressModal/index.tsx
+10
-4
index.tsx
...saction/purchaseOrder/orderCollectCash/constant/index.tsx
+1
-1
index.tsx
...ages/transaction/purchaseOrder/orderCollectCash/index.tsx
+1
-0
index.tsx
...orderCollectRequisition/components/addressModal/index.tsx
+10
-4
index.tsx
...ansaction/purchaseOrder/orderCollectRequisition/index.tsx
+1
-0
index.tsx
...seOrder/orderCollectSrm/components/addressModal/index.tsx
+10
-4
index.tsx
...pages/transaction/purchaseOrder/orderCollectSrm/index.tsx
+1
-0
index.ts
src/pages/transaction/saleOrder/agentOrder/apis/index.ts
+1
-1
index.tsx
...on/saleOrder/agentOrder/components/addressModal/index.tsx
+13
-4
index.tsx
...pages/transaction/saleOrder/agentOrder/constant/index.tsx
+3
-3
index.tsx
src/pages/transaction/saleOrder/agentOrder/index.tsx
+1
-0
index.tsx
src/pages/transaction/saleOrder/constant/index.tsx
+5
-5
index.tsx
src/pages/transaction/saleOrder/index.tsx
+7
-0
No files found.
src/pages/priceManage/effect/index.tsx
View file @
5d3c8ca3
...
...
@@ -135,9 +135,7 @@ export const transformDataForNiceForm = (value: any, ctx: ISchemaFormActions | I
roleId
:
item
.
memberRoleId
,
roleName
:
item
.
memberRoleName
,
}))
let
shopInfo
=
GlobalConfig
.
web
.
shopInfo
.
filter
(
item
=>
item
[
"type"
]
===
value
[
"type"
]
&&
item
[
"environment"
]
===
value
[
"environment"
])
initValue
[
"shopId"
]
=
shopInfo
[
0
][
"id"
]
initValue
[
"shopId"
]
=
value
[
"shopId"
]
// Edit使用
initValue
[
"memberUnitPriceList"
]
=
value
[
"memberUnitPriceList"
]
...
...
src/pages/priceManage/priceStrategy/setStrategy.tsx
View file @
5d3c8ca3
import
React
,
{
useCallback
,
useState
}
from
'react'
import
{
Button
,
message
,
Card
,
}
from
'antd'
import
{
Button
,
Card
,
}
from
'antd'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
history
}
from
"umi"
import
ReutrnEle
from
'@/components/ReturnEle'
...
...
src/pages/transaction/purchaseOrder/constant/index.tsx
View file @
5d3c8ca3
...
...
@@ -61,13 +61,13 @@ export const baseOrderListColumns: any = () => {
dataIndex
:
'orderTypeName'
,
key
:
'orderTypeName'
,
},
{
title
:
'送货地址'
,
dataIndex
:
'deliverAddress'
,
key
:
'deliverAddress'
,
width
:
164
,
ellipsis
:
true
,
},
//
{
//
title: '送货地址',
//
dataIndex: 'deliverAddress',
//
key: 'deliverAddress',
//
width: 164,
//
ellipsis: true,
//
},
{
title
:
'外部状态'
,
align
:
'center'
,
...
...
src/pages/transaction/purchaseOrder/index.tsx
View file @
5d3c8ca3
...
...
@@ -175,6 +175,13 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
const
secondColumns
=
()
=>
{
const
alreadyColumns
=
baseOrderListColumns
()
if
(
alreadyColumns
)
{
alreadyColumns
.
splice
(
6
,
0
,
{
title
:
'送货地址'
,
dataIndex
:
'deliverAddress'
,
key
:
'deliverAddress'
,
width
:
164
,
ellipsis
:
true
,
});
return
alreadyColumns
.
concat
([
{
title
:
'操作'
,
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/components/addressModal/index.tsx
View file @
5d3c8ca3
...
...
@@ -46,10 +46,10 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
}
const
handleSubmit
=
async
(
value
)
=>
{
const
provinceName
=
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
provinceName
=
value
?.
provinceName
?
value
.
provinceName
:
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
value
?.
cityName
?
value
.
cityName
:
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
value
?.
districtName
?
value
.
districtName
:
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
?.
streetName
?
value
.
streetName
:
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
params
=
{
...
value
,
...
...
@@ -84,6 +84,12 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
const
useChainEffects
=
(
$
,
ctx
)
=>
{
// 初始省份选择
renderSelectOption
(
'provinceCode'
,
ctx
)
if
(
selfInitValue
)
{
const
{
provinceCode
,
cityCode
,
districtCode
}
=
selfInitValue
renderSelectOption
(
'cityCode'
,
ctx
,
{
pcode
:
provinceCode
})
renderSelectOption
(
'districtCode'
,
ctx
,
{
pcode
:
cityCode
})
districtCode
&&
renderSelectOption
(
'streetCode'
,
ctx
,
{
pcode
:
districtCode
})
}
// 市
$
(
'onFieldValueChange'
,
'provinceCode'
).
subscribe
(({
value
})
=>
{
if
(
value
)
{
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
View file @
5d3c8ca3
...
...
@@ -310,6 +310,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = () => {
provinceCode
:
addressDetail
.
provinceCode
,
cityCode
:
addressDetail
.
cityCode
,
districtCode
:
addressDetail
.
districtCode
,
streetCode
:
addressDetail
.
streetCode
,
address
:
addressDetail
.
address
,
postalCode
:
addressDetail
.
postalCode
,
countryCode
:
addressDetail
.
areaCode
,
...
...
src/pages/transaction/purchaseOrder/orderCollectCash/apis/index.ts
View file @
5d3c8ca3
...
...
@@ -8,7 +8,7 @@ import { getTransactionEnquiryProductAll, getTransactionProductQuotationList } f
export
const
fetchOrderApi
=
{
/** 弹窗获取商品列表 */
async
getProductList
(
params
)
{
const
{
data
}
=
await
getProductCommodityCommonGetCommodityListByBuyer
(
params
,
{
useCache
:
true
,
ttl
:
10
*
1000
}
)
const
{
data
}
=
await
getProductCommodityCommonGetCommodityListByBuyer
(
params
)
return
data
},
...
...
src/pages/transaction/purchaseOrder/orderCollectCash/components/addressModal/index.tsx
View file @
5d3c8ca3
...
...
@@ -47,10 +47,10 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
}
const
handleSubmit
=
async
(
value
)
=>
{
const
provinceName
=
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
provinceName
=
value
?.
provinceName
?
value
.
provinceName
:
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
value
?.
cityName
?
value
.
cityName
:
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
value
?.
districtName
?
value
.
districtName
:
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
?.
streetName
?
value
.
streetName
:
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
params
=
{
...
value
,
...
...
@@ -85,6 +85,12 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
const
useChainEffects
=
(
$
,
ctx
)
=>
{
// 初始省份选择
renderSelectOption
(
'provinceCode'
,
ctx
)
if
(
selfInitValue
)
{
const
{
provinceCode
,
cityCode
,
districtCode
}
=
selfInitValue
renderSelectOption
(
'cityCode'
,
ctx
,
{
pcode
:
provinceCode
})
renderSelectOption
(
'districtCode'
,
ctx
,
{
pcode
:
cityCode
})
districtCode
&&
renderSelectOption
(
'streetCode'
,
ctx
,
{
pcode
:
districtCode
})
}
// 市
$
(
'onFieldValueChange'
,
'provinceCode'
).
subscribe
(({
value
})
=>
{
if
(
value
)
{
...
...
src/pages/transaction/purchaseOrder/orderCollectCash/constant/index.tsx
View file @
5d3c8ca3
...
...
@@ -103,7 +103,7 @@ export const procurementProcessField = (value) => {
weight
:
item
.
logistics
.
weight
,
stock
:
item
.
stockCount
,
discount
:
item
.
isMemberPrice
?
item
.
memberPrice
:
1
,
// 字段需求 无折扣为1
price
:
item
.
isMemberPrice
?
item
.
money
/
item
.
purchaseCount
/
item
.
memberPrice
:
item
.
money
/
item
.
purchaseCount
,
price
:
item
.
isMemberPrice
?
Number
((
item
.
money
/
item
.
purchaseCount
/
item
.
memberPrice
).
toFixed
(
2
))
:
Number
((
item
.
money
/
item
.
purchaseCoun
).
toFixed
(
2
))
,
tax
:
item
.
taxRate
>
0
,
vendorMemberId
:
item
.
memberId
,
vendorRoleId
:
item
.
memberRoleId
,
...
...
src/pages/transaction/purchaseOrder/orderCollectCash/index.tsx
View file @
5d3c8ca3
...
...
@@ -270,6 +270,7 @@ const AgentOrderDetail:React.FC<AgentOrderDetailProps> = () => {
provinceCode
:
addressDetail
.
provinceCode
,
cityCode
:
addressDetail
.
cityCode
,
districtCode
:
addressDetail
.
districtCode
,
streetCode
:
addressDetail
.
streetCode
,
address
:
addressDetail
.
address
,
postalCode
:
addressDetail
.
postalCode
,
countryCode
:
addressDetail
.
areaCode
,
...
...
src/pages/transaction/purchaseOrder/orderCollectRequisition/components/addressModal/index.tsx
View file @
5d3c8ca3
...
...
@@ -46,10 +46,10 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
}
const
handleSubmit
=
async
(
value
)
=>
{
const
provinceName
=
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
provinceName
=
value
?.
provinceName
?
value
.
provinceName
:
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
value
?.
cityName
?
value
.
cityName
:
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
value
?.
districtName
?
value
.
districtName
:
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
?.
streetName
?
value
.
streetName
:
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
params
=
{
...
value
,
...
...
@@ -84,6 +84,12 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
const
useChainEffects
=
(
$
,
ctx
)
=>
{
// 初始省份选择
renderSelectOption
(
'provinceCode'
,
ctx
)
if
(
selfInitValue
)
{
const
{
provinceCode
,
cityCode
,
districtCode
}
=
selfInitValue
renderSelectOption
(
'cityCode'
,
ctx
,
{
pcode
:
provinceCode
})
renderSelectOption
(
'districtCode'
,
ctx
,
{
pcode
:
cityCode
})
districtCode
&&
renderSelectOption
(
'streetCode'
,
ctx
,
{
pcode
:
districtCode
})
}
// 市
$
(
'onFieldValueChange'
,
'provinceCode'
).
subscribe
(({
value
})
=>
{
if
(
value
)
{
...
...
src/pages/transaction/purchaseOrder/orderCollectRequisition/index.tsx
View file @
5d3c8ca3
...
...
@@ -235,6 +235,7 @@ const AddRequisitionOrder:React.FC<AddRequisitionOrderProps> = (props) => {
provinceCode
:
addressDetail
.
provinceCode
,
cityCode
:
addressDetail
.
cityCode
,
districtCode
:
addressDetail
.
districtCode
,
streetCode
:
addressDetail
.
streetCode
,
address
:
addressDetail
.
address
,
postalCode
:
addressDetail
.
postalCode
,
countryCode
:
addressDetail
.
areaCode
,
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/components/addressModal/index.tsx
View file @
5d3c8ca3
...
...
@@ -46,10 +46,10 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
}
const
handleSubmit
=
async
(
value
)
=>
{
const
provinceName
=
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
provinceName
=
value
?.
provinceName
?
value
.
provinceName
:
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
value
?.
cityName
?
value
.
cityName
:
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
value
?.
districtName
?
value
.
districtName
:
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
?.
streetName
?
value
.
streetName
:
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
params
=
{
...
value
,
...
...
@@ -84,6 +84,12 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
const
useChainEffects
=
(
$
,
ctx
)
=>
{
// 初始省份选择
renderSelectOption
(
'provinceCode'
,
ctx
)
if
(
selfInitValue
)
{
const
{
provinceCode
,
cityCode
,
districtCode
}
=
selfInitValue
renderSelectOption
(
'cityCode'
,
ctx
,
{
pcode
:
provinceCode
})
renderSelectOption
(
'districtCode'
,
ctx
,
{
pcode
:
cityCode
})
districtCode
&&
renderSelectOption
(
'streetCode'
,
ctx
,
{
pcode
:
districtCode
})
}
// 市
$
(
'onFieldValueChange'
,
'provinceCode'
).
subscribe
(({
value
})
=>
{
if
(
value
)
{
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/index.tsx
View file @
5d3c8ca3
...
...
@@ -212,6 +212,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
provinceCode
:
addressDetail
.
provinceCode
,
cityCode
:
addressDetail
.
cityCode
,
districtCode
:
addressDetail
.
districtCode
,
streetCode
:
addressDetail
.
streetCode
,
address
:
addressDetail
.
address
,
postalCode
:
addressDetail
.
postalCode
,
countryCode
:
addressDetail
.
areaCode
,
...
...
src/pages/transaction/saleOrder/agentOrder/apis/index.ts
View file @
5d3c8ca3
...
...
@@ -8,7 +8,7 @@ import { getTransactionEnquiryProductAll, getTransactionProductQuotationList } f
export
const
fetchOrderApi
=
{
/** 弹窗获取商品列表 */
async
getProductList
(
params
)
{
const
{
data
}
=
await
getProductCommodityCommonGetCommodityListByBuyer
(
params
,
{
useCache
:
true
,
ttl
:
10
*
1000
}
)
const
{
data
}
=
await
getProductCommodityCommonGetCommodityListByBuyer
(
params
)
return
data
},
...
...
src/pages/transaction/saleOrder/agentOrder/components/addressModal/index.tsx
View file @
5d3c8ca3
...
...
@@ -49,10 +49,10 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
}
const
handleSubmit
=
async
(
value
)
=>
{
const
provinceName
=
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
provinceName
=
value
?.
provinceName
?
value
.
provinceName
:
addressSchemaAction
.
getFieldState
(
'provinceCode'
)[
'values'
][
1
][
'title'
]
const
cityName
=
value
?.
cityName
?
value
.
cityName
:
addressSchemaAction
.
getFieldState
(
'cityCode'
)[
'values'
][
1
][
'title'
]
const
districtName
=
value
?.
districtName
?
value
.
districtName
:
addressSchemaAction
.
getFieldState
(
'districtCode'
)[
'values'
][
1
][
'title'
]
const
streetName
=
value
?.
streetName
?
value
.
streetName
:
value
[
'streetCode'
]
?
addressSchemaAction
.
getFieldState
(
'streetCode'
)[
'values'
][
1
][
'title'
]
:
null
const
roleId
=
ctx
.
getFieldValue
(
'buyerRoleId'
)
const
memberId
=
ctx
.
getFieldValue
(
'buyerMemberId'
)
...
...
@@ -96,9 +96,16 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
const
useChainEffects
=
(
$
,
ctx
)
=>
{
// 初始省份选择
renderSelectOption
(
'provinceCode'
,
ctx
)
if
(
selfInitValue
)
{
const
{
provinceCode
,
cityCode
,
districtCode
}
=
selfInitValue
renderSelectOption
(
'cityCode'
,
ctx
,
{
pcode
:
provinceCode
})
renderSelectOption
(
'districtCode'
,
ctx
,
{
pcode
:
cityCode
})
districtCode
&&
renderSelectOption
(
'streetCode'
,
ctx
,
{
pcode
:
districtCode
})
}
// 市
$
(
'onFieldValueChange'
,
'provinceCode'
).
subscribe
(({
value
})
=>
{
if
(
value
)
{
console
.
log
(
value
)
ctx
.
setFieldValue
(
'cityCode'
,
null
)
ctx
.
setFieldValue
(
'districtCode'
,
null
)
ctx
.
setFieldValue
(
'streetCode'
,
null
)
...
...
@@ -108,6 +115,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
// 区/县
$
(
'onFieldValueChange'
,
'cityCode'
).
subscribe
(({
value
})
=>
{
if
(
value
)
{
console
.
log
(
value
)
ctx
.
setFieldValue
(
'districtCode'
,
null
)
ctx
.
setFieldValue
(
'streetCode'
,
null
)
renderSelectOption
(
'districtCode'
,
ctx
,
{
pcode
:
value
})
...
...
@@ -116,6 +124,7 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
// 街道/乡/镇
$
(
'onFieldValueChange'
,
'districtCode'
).
subscribe
(({
value
})
=>
{
if
(
value
)
{
console
.
log
(
value
)
ctx
.
setFieldValue
(
'streetCode'
,
null
)
renderSelectOption
(
'streetCode'
,
ctx
,
{
pcode
:
value
})
}
...
...
src/pages/transaction/saleOrder/agentOrder/constant/index.tsx
View file @
5d3c8ca3
...
...
@@ -22,7 +22,7 @@ export const PriceComp = (props) => {
</
div
>
}
/**
修改b2b询价报价
下单 初始值转换 */
/**
代客
下单 初始值转换 */
export
const
procurmentRenderInit
=
(
initValue
:
any
)
=>
{
return
{
...
...
@@ -48,7 +48,7 @@ export const procurmentRenderInit = (initValue: any) => {
}
}
/**
修改b2b询价报价
下单 回显商品字段转换 */
/**
代客
下单 回显商品字段转换 */
export
const
procurementRenderField
=
(
data
)
=>
{
const
_orderProductRequests
=
data
.
product
.
products
return
_orderProductRequests
.
map
(
item
=>
{
...
...
@@ -94,7 +94,7 @@ export const procurementProcessField = (value) => {
weight
:
item
.
logistics
.
weight
,
stock
:
item
.
stockCount
,
discount
:
item
.
isMemberPrice
?
item
.
memberPrice
:
1
,
// 字段需求 无折扣为1
price
:
item
.
isMemberPrice
?
item
.
money
/
item
.
purchaseCount
/
item
.
memberPrice
:
item
.
money
/
item
.
purchaseCount
,
price
:
item
.
isMemberPrice
?
Number
((
item
.
money
/
item
.
purchaseCount
/
item
.
memberPrice
).
toFixed
(
2
))
:
Number
((
item
.
money
/
item
.
purchaseCount
).
toFixed
(
2
))
,
tax
:
item
.
taxRate
>
0
,
vendorMemberId
:
item
.
memberId
,
vendorRoleId
:
item
.
memberRoleId
,
...
...
src/pages/transaction/saleOrder/agentOrder/index.tsx
View file @
5d3c8ca3
...
...
@@ -273,6 +273,7 @@ const AgentOrderDetail:React.FC<AgentOrderDetailProps> = (props) => {
provinceCode
:
addressDetail
.
provinceCode
,
cityCode
:
addressDetail
.
cityCode
,
districtCode
:
addressDetail
.
districtCode
,
streetCode
:
addressDetail
.
streetCode
,
address
:
addressDetail
.
address
,
postalCode
:
addressDetail
.
postalCode
,
countryCode
:
addressDetail
.
areaCode
,
...
...
src/pages/transaction/saleOrder/constant/index.tsx
View file @
5d3c8ca3
...
...
@@ -120,11 +120,11 @@ export const baseOrderListColumns: any = () => {
key
:
'amount'
,
render
:
(
t
,
r
)
=>
(
r
.
orderType
===
ORDER_TYPE_POINTS
||
r
.
orderType
===
ORDER_TYPE_CHANNEL_POINTS
)
?
t
:
`¥
${
t
}
`
},
{
title
:
'订单类型'
,
dataIndex
:
'orderTypeName'
,
key
:
'orderTypeName'
,
},
//
{
//
title: '订单类型',
//
dataIndex: 'orderTypeName',
//
key: 'orderTypeName',
//
},
{
title
:
'送货地址'
,
dataIndex
:
'deliverAddress'
,
...
...
src/pages/transaction/saleOrder/index.tsx
View file @
5d3c8ca3
...
...
@@ -199,6 +199,13 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
const
secondColumns
=
()
=>
{
const
alreadyColumns
=
baseOrderListColumns
()
if
(
alreadyColumns
)
{
alreadyColumns
.
splice
(
6
,
0
,
{
title
:
'送货地址'
,
dataIndex
:
'deliverAddress'
,
key
:
'deliverAddress'
,
width
:
164
,
ellipsis
:
true
,
})
return
alreadyColumns
.
concat
([
{
title
:
'操作'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment