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
shenshaokai
jinfa-platform
Commits
d3886d74
Commit
d3886d74
authored
Nov 12, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 移除资金账户列表会员等级列,处理编辑订单id和productId数据异常
parent
99d38b3e
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
18 deletions
+26
-18
index.tsx
...dSettle/amountAccountManage/memberAccountManage/index.tsx
+6
-6
index.tsx
...pages/payandSettle/capitalAccounts/accountLists/index.tsx
+6
-6
index.tsx
...pages/transaction/components/orderDetailSection/index.tsx
+7
-0
index.tsx
src/pages/transaction/components/orderProductTable/index.tsx
+1
-1
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+4
-3
useProductTable.tsx
...tion/purchaseOrder/orderCollect/model/useProductTable.tsx
+1
-1
No files found.
src/pages/payandSettle/amountAccountManage/memberAccountManage/index.tsx
View file @
d3886d74
...
...
@@ -53,12 +53,12 @@ const AccountLists: React.FC<{}> = () => {
dataIndex
:
'memberRoleName'
,
key
:
'memberRoleName'
,
},
{
title
:
'会员等级'
,
dataIndex
:
'memberLevel'
,
key
:
'memberLevel'
,
render
:
(
t
,
r
)
=>
<
LevelBrand
level=
{
r
.
level
}
/>
},
//
{
//
title: '会员等级',
//
dataIndex: 'memberLevel',
//
key: 'memberLevel',
//
render: (t, r) => <LevelBrand level={r.level} />
//
},
{
title
:
'账户余额'
,
dataIndex
:
'accountBalance'
,
...
...
src/pages/payandSettle/capitalAccounts/accountLists/index.tsx
View file @
d3886d74
...
...
@@ -43,12 +43,12 @@ const AccountLists: React.FC<{}> = () => {
dataIndex
:
'memberRoleName'
,
key
:
'memberRoleName'
,
},
{
title
:
'所属会员等级'
,
dataIndex
:
'memberLevel'
,
key
:
'memberLevel'
,
render
:
(
t
,
r
)
=>
<
LevelBrand
level=
{
r
.
memberLevel
}
/>
},
//
{
//
title: '所属会员等级',
//
dataIndex: 'memberLevel',
//
key: 'memberLevel',
//
render: (t, r) => <LevelBrand level={r.memberLevel} />
//
},
{
title
:
'会员等级类型'
,
dataIndex
:
'memberLevelType'
,
...
...
src/pages/transaction/components/orderDetailSection/index.tsx
View file @
d3886d74
...
...
@@ -15,6 +15,13 @@ export interface OrderDetailSectionProps {
}
const
OrderDetailSection
:
React
.
FC
<
OrderDetailSectionProps
>
=
({
formContext
,
type
=
'purchaseOrder'
})
=>
{
// console.log(findLastIndexFlowState(formContext.data.interiorWorkflowFlowRecordLogResponses) - 1)
// console.log(formContext.data.interiorWorkflowFlowRecordLogResponses ?
// formContext.data.interiorWorkflowFlowRecordLogResponses.map(item => ({
// ...item,
// status: item.isExecute ? 'finish' : 'wait',
// })) :
// [])
return
(
formContext
.
data
&&
<
div
className=
'gray-wrap'
>
<
AuditProcess
...
...
src/pages/transaction/components/orderProductTable/index.tsx
View file @
d3886d74
...
...
@@ -68,7 +68,7 @@ export const MoneyTotalBox = ({ dataSource, preview }) => {
// // 筛选配送方式为物流的商品并且使用了运费模板
// const logsiticsDataMaps = orderProductRequests.filter(v => v.logistics && v.logistics.useTemplate && v.logistics.deliveryType === 1)
// if (logsiticsDataMaps.length > 0) {
// PublicApi.postLogisticsFreight
RemoteAddDetail
({
// PublicApi.postLogisticsFreight
TemplateCalFreightPrice
({
// orderProductList: logsiticsDataMaps.map(v => ({
// templateId: v.templateId,
// weight: v.weight
...
...
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
d3886d74
...
...
@@ -107,7 +107,7 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
// 筛选配送方式为物流的商品并且使用了运费模板
const
logsiticsDataMaps
=
orderProductRequests
.
filter
(
v
=>
v
.
logistics
&&
v
.
logistics
.
useTemplate
&&
v
.
logistics
.
deliveryType
===
1
)
if
(
logsiticsDataMaps
.
length
>
0
)
{
PublicApi
.
postLogisticsFreight
RemoteAddDetail
({
PublicApi
.
postLogisticsFreight
TemplateCalFreightPrice
({
orderProductList
:
logsiticsDataMaps
.
map
(
v
=>
({
templateId
:
v
.
templateId
,
weight
:
v
.
weight
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
d3886d74
...
...
@@ -65,7 +65,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
// 筛选配送方式为物流的商品并且使用了运费模板
const
logsiticsDataMaps
=
data
.
filter
(
v
=>
v
.
logistics
&&
v
.
logistics
.
useTemplate
&&
v
.
logistics
.
deliveryType
===
1
)
if
(
logsiticsDataMaps
.
length
>
0
)
{
PublicApi
.
postLogisticsFreight
RemoteAddDetail
({
PublicApi
.
postLogisticsFreight
TemplateCalFreightPrice
({
orderProductList
:
logsiticsDataMaps
.
map
(
v
=>
({
templateId
:
v
.
logistics
.
templateId
,
weight
:
v
.
logistics
.
weight
...
...
@@ -160,6 +160,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
},
[])
const
handleSubmit
=
async
(
value
)
=>
{
console
.
log
(
value
,
'value'
)
try
{
let
fnResult
=
null
// 可做新增/修改的判断
...
...
@@ -209,8 +210,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
if
(
judgement
.
includes
(
false
)){
throw
new
Error
(
'请选择支付方式或者支付渠道'
)
}
setBtnLoading
(
true
)
fnResult
=
id
?
await
PublicApi
.
postOrderProcurementOrderUpdate
({...
params
,
id
})
:
await
PublicApi
.
postOrderProcurementOrderAddReinsurancePolicy
(
params
)
//
setBtnLoading(true)
//
fnResult = id ? await PublicApi.postOrderProcurementOrderUpdate({...params, id}) : await PublicApi.postOrderProcurementOrderAddReinsurancePolicy(params)
break
;
}
}
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/useProductTable.tsx
View file @
d3886d74
...
...
@@ -81,7 +81,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
const
index
=
newData
.
findIndex
(
item
=>
row
.
id
===
item
.
id
);
const
item
=
newData
[
index
];
row
[
'money'
]
=
getUnitPriceTotal
(
row
)
row
[
'productId'
]
=
row
.
i
d
row
[
'productId'
]
=
row
.
productI
d
newData
.
splice
(
index
,
1
,
{
...
item
,
...
row
,
...
...
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