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
linweijiong
jinfa-platform
Commits
54d2d7ef
Commit
54d2d7ef
authored
Dec 04, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
692ce8ea
b39718ee
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
70 additions
and
24 deletions
+70
-24
index.ts
src/constants/index.ts
+0
-0
index.tsx
...rvice/exchangeApplication/components/DetailInfo/index.tsx
+1
-1
index.tsx
...cation/exchangePrSubmit/components/ExchangeForm/index.tsx
+2
-0
index.ts
.../exchangePrSubmit/components/ExchangeForm/schema/index.ts
+1
-1
index.tsx
...terService/exchangeManage/components/DetailInfo/index.tsx
+2
-1
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+5
-1
index.tsx
src/pages/lxMall/order/index.tsx
+0
-1
index.tsx
src/pages/lxMall/purchaseOrder/index.tsx
+4
-3
index.less
...pages/member/memberLevel/components/DetailInfo/index.less
+0
-1
index.tsx
...eOrder/orderCollect/components/payInfoTableCell/index.tsx
+2
-1
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+1
-1
usePaymentInfo.tsx
...ction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
+1
-4
index.tsx
...action/purchaseOrder/secondApprovedOrder/detail/index.tsx
+0
-0
useSelfTable.tsx
...tion/saleOrder/addSaleDelevedOrder/model/useSelfTable.tsx
+1
-1
index.tsx
...transaction/saleOrder/firstApprovedOrder/detail/index.tsx
+3
-2
useSelfTable.tsx
...n/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx
+7
-1
useSelfTable.tsx
...saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx
+7
-1
useSelfTable.tsx
.../saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx
+7
-1
index.tsx
...ransaction/saleOrder/secondApprovedOrder/detail/index.tsx
+3
-2
useBusinessEffects.ts
.../bills/components/BillsForm/effects/useBusinessEffects.ts
+15
-1
index.tsx
...ion/stockSellStorage/bills/components/BillsForm/index.tsx
+8
-0
index.tsx
...ages/transaction/supplierEvaluation/unevaluated/index.tsx
+0
-0
No files found.
src/constants/index.ts
View file @
54d2d7ef
src/pages/afterService/exchangeApplication/components/DetailInfo/index.tsx
View file @
54d2d7ef
...
...
@@ -332,7 +332,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
Suspense
fallback=
{
null
}
>
<
ProductList
title=
"换货商品"
rowKey=
"
orderRecord
Id"
rowKey=
"
detail
Id"
columns=
{
productColumns
}
loading=
{
replaceGoodsLoading
}
dataSource=
{
replaceGoodsList
.
data
}
...
...
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx
View file @
54d2d7ef
...
...
@@ -299,6 +299,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
replaceId
:
id
||
0
,
supplierMemberId
:
supplierMember
[
0
].
memberId
,
supplierRoleId
:
supplierMember
[
0
].
roleId
,
supplierMemberName
:
supplierMember
[
0
].
name
,
replaceGoodsAddress
:
{
receiveAddress
:
deliveryAddress
.
fullAddress
||
''
,
receiveUserName
:
deliveryAddress
.
receiverName
||
''
,
...
...
@@ -422,6 +423,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
unit
:
item
.
costPrice
,
purchaseCount
:
item
.
purchaseCount
,
purchasePrice
:
item
.
price
,
purchaseAmount
:
+
(
item
.
price
*
item
.
purchaseCount
).
toFixed
(
2
),
replacedCount
:
item
.
replaceCount
||
item
.
purchaseCount
||
0
,
// 已换货数量
replaceReason
:
''
,
};
...
...
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/schema/index.ts
View file @
54d2d7ef
...
...
@@ -265,7 +265,7 @@ export const addBillSchema: ISchema = {
title
:
'采购单价'
,
'x-component'
:
'Text'
,
},
costPrice3
:
{
purchaseAmount
:
{
type
:
'string'
,
title
:
'采购金额'
,
'x-component'
:
'Text'
,
...
...
src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx
View file @
54d2d7ef
...
...
@@ -227,6 +227,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
};
const
handleReturnAddressSubmit
=
values
=>
{
console
.
log
(
'values'
,
values
)
setReturnAddress
(
values
);
};
...
...
@@ -381,7 +382,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
Suspense
fallback=
{
null
}
>
<
ProductList
title=
"换货商品"
rowKey=
"
orderRecord
Id"
rowKey=
"
detail
Id"
columns=
{
productColumns
}
loading=
{
replaceGoodsLoading
}
dataSource=
{
replaceGoodsList
.
data
}
...
...
src/pages/lxMall/commodityDetail/index.tsx
View file @
54d2d7ef
...
...
@@ -396,8 +396,10 @@ const CommodityDetail = (props) => {
const
directParam
:
any
=
{
productId
:
selectCommodityId
,
memberId
,
shopId
shopId
:
storeId
,
memberRoleId
:
commodityDetail
.
memberRoleId
}
PublicApi
.
postOrderDirectPayment
(
directParam
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
message
.
destroy
()
...
...
@@ -513,6 +515,8 @@ const CommodityDetail = (props) => {
const
param
:
any
=
{
productId
:
selectCommodityId
,
memberId
,
shopId
:
storeId
,
memberRoleId
:
commodityDetail
.
memberRoleId
}
PublicApi
.
postOrderDirectPayment
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
src/pages/lxMall/order/index.tsx
View file @
54d2d7ef
...
...
@@ -287,7 +287,6 @@ const Order: React.FC<OrderPropsType> = (props) => {
const
params
:
any
=
{
orderModel
:
getOrderMode
(),
// 下单模式
needTheInvoice
:
needTheInvoice
?
1
:
0
,
memberRoleId
:
userInfo
.
memberRoleId
,
shopId
:
storeId
}
...
...
src/pages/lxMall/purchaseOrder/index.tsx
View file @
54d2d7ef
...
...
@@ -393,7 +393,6 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
* @param ids
*/
const
deleteListItems
=
(
ids
:
number
[])
=>
{
console
.
log
(
ids
,
"ids"
)
const
newOrderList
=
JSON
.
parse
(
JSON
.
stringify
(
orderList
))
const
result
=
[]
for
(
const
item
of
newOrderList
)
{
...
...
@@ -600,14 +599,16 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
productIds
,
memberId
:
selectItem
.
memberId
,
shopId
:
storeId
,
memberRoleId
:
userInfo
.
memberRoleId
memberRoleId
:
selectItem
.
memberRoleId
,
}
PublicApi
.
postOrderIsWorkFlow
(
param
).
then
(
res
=>
{
setConfirmLoading
(
false
)
if
(
res
.
code
===
1000
)
{
message
.
destroy
()
PublicApi
.
postOrderDirectPayment
({
productId
:
productIds
[
0
],
memberId
:
selectItem
.
memberId
}).
then
(
res
=>
{
param
.
productId
=
productIds
[
0
]
param
.
productIds
=
undefined
PublicApi
.
postOrderDirectPayment
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
message
.
destroy
()
const
sessionKey
=
`
${
selectItem
.
id
}${
new
Date
().
getTime
()}
`
...
...
src/pages/member/memberLevel/components/DetailInfo/index.less
View file @
54d2d7ef
...
...
@@ -113,7 +113,6 @@
&-main {
position: relative;
width: 328px;
height: 38px;
padding-bottom: 8px;
&::after {
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/payInfoTableCell/index.tsx
View file @
54d2d7ef
...
...
@@ -87,7 +87,7 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
}
case
'select'
:
{
const
{
options
,
...
rest
}
=
formItemProps
console
.
log
(
originOptions
)
// 支付方式
if
(
dataIndex
===
'payWay'
)
{
return
<
Select
ref=
{
formItemRef
}
...
...
@@ -116,6 +116,7 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
}
}
console
.
log
(
type
,
originOptions
,
childOptions
)
}
let
childNode
=
children
;
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
54d2d7ef
...
...
@@ -63,7 +63,6 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
},
[
sum
,
freePrice
])
useEffect
(()
=>
{
// 存在商品 并且有选择收货地址,则开始计算运费
console
.
log
(
data
,
'ddd'
)
if
(
data
&&
data
.
length
>
0
&&
receiverAddressId
)
{
// 筛选配送方式为物流的商品并且使用了运费模板
const
logsiticsDataMaps
=
data
.
filter
(
v
=>
v
.
logistics
&&
v
.
logistics
.
useTemplate
&&
v
.
logistics
.
deliveryType
===
1
)
...
...
@@ -206,6 +205,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
// theInvoiceInfo: value.theInvoiceInfo
}
// 校验是否选择支付渠道
console
.
log
(
params
,
'params'
)
let
judgementByPay
=
params
.
paymentInformationResponses
.
map
(
item
=>
{
if
(
item
.
channel
&&
item
.
payWay
){
return
true
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
View file @
54d2d7ef
...
...
@@ -69,7 +69,6 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
// }, [])
useEffect
(()
=>
{
console
.
log
(
memberId
,
'memberId'
)
// 当选择报价单/会员/商品时有memberId传入时 调用支付方式api
if
(
memberId
)
{
getPayLists
(
memberId
)
...
...
@@ -100,9 +99,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
...
item
,
...
row
,
});
console
.
log
(
newData
)
console
.
log
(
productSumPrice
)
ctx
.
setFieldValue
(
'paymentInformationResponses'
,
newData
)
ctx
.
setFieldValue
(
'paymentInfor+mationResponses'
,
newData
)
resolve
({
item
,
newData
})
})
...
...
src/pages/transaction/purchaseOrder/secondApprovedOrder/detail/index.tsx
View file @
54d2d7ef
src/pages/transaction/saleOrder/addSaleDelevedOrder/model/useSelfTable.tsx
View file @
54d2d7ef
...
...
@@ -69,7 +69,7 @@ export const useSelfTable = () => {
align
:
'center'
,
dataIndex
:
'invoiceNumber'
,
key
:
'invoiceNumber'
,
render
:
(
text
,
record
)
=>
<
Link
to=
{
`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.
invoice
Id}&preview=1`
}
>
{
text
}
</
Link
>
render
:
(
text
,
record
)
=>
<
Link
to=
{
`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.
orderDeliveryDetails
Id}&preview=1`
}
>
{
text
}
</
Link
>
},
// { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) => text},
{
...
...
src/pages/transaction/saleOrder/firstApprovedOrder/detail/index.tsx
View file @
54d2d7ef
...
...
@@ -22,10 +22,11 @@ const FirstApprovedOrderDetail: React.FC = () => {
// 提交表单
const
handleSubmit
=
useCallback
(()
=>
{
approvedRef
.
current
.
actions
.
submit
().
then
(
async
()
=>
{
approvedRef
.
current
.
actions
.
submit
().
then
(
async
(
v
)
=>
{
const
params
=
{
id
:
Number
(
id
),
state
:
1
state
:
v
.
values
.
state
,
cause
:
v
.
values
.
cause
,
}
const
result
=
await
run
(
params
)
...
...
src/pages/transaction/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx
View file @
54d2d7ef
...
...
@@ -54,7 +54,13 @@ export const useSelfTable = () => {
},
{
title
:
'发货批次'
,
align
:
'center'
,
dataIndex
:
'shipmentBatch'
,
key
:
'shipmentBatch'
,
render
:
text
=>
text
?
`第
${
text
}
次`
:
''
},
// @todo 发货单号跳转
{
title
:
'发货单号'
,
align
:
'center'
,
dataIndex
:
'invoiceNumber'
,
key
:
'invoiceNumber'
,
render
:
text
=>
<
Link
to=
{
'/'
}
>
{
text
}
</
Link
>
},
{
title
:
'发货单号'
,
align
:
'center'
,
dataIndex
:
'invoiceNumber'
,
key
:
'invoiceNumber'
,
render
:
(
text
,
record
)
=>
<
Link
to=
{
`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`
}
>
{
text
}
</
Link
>
},
// { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) => text},
{
title
:
'订单类型'
,
...
...
src/pages/transaction/saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx
View file @
54d2d7ef
...
...
@@ -64,7 +64,13 @@ export const useSelfTable = () => {
},
{
title
:
'发货批次'
,
align
:
'center'
,
dataIndex
:
'shipmentBatch'
,
key
:
'shipmentBatch'
,
render
:
text
=>
text
?
`第
${
text
}
次`
:
''
},
// @todo 发货单号跳转
{
title
:
'发货单号'
,
align
:
'center'
,
dataIndex
:
'invoiceNumber'
,
key
:
'invoiceNumber'
,
render
:
text
=>
<
Link
to=
{
'/'
}
>
{
text
}
</
Link
>
},
{
title
:
'发货单号'
,
align
:
'center'
,
dataIndex
:
'invoiceNumber'
,
key
:
'invoiceNumber'
,
render
:
(
text
,
record
)
=>
<
Link
to=
{
`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`
}
>
{
text
}
</
Link
>
},
{
title
:
'订单类型'
,
align
:
'center'
,
...
...
src/pages/transaction/saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx
View file @
54d2d7ef
...
...
@@ -64,7 +64,13 @@ export const useSelfTable = () => {
},
{
title
:
'发货批次'
,
align
:
'center'
,
dataIndex
:
'shipmentBatch'
,
key
:
'shipmentBatch'
,
render
:
text
=>
text
?
`第
${
text
}
次`
:
''
},
// @todo 发货单号跳转
{
title
:
'发货单号'
,
align
:
'center'
,
dataIndex
:
'invoiceNumber'
,
key
:
'invoiceNumber'
,
render
:
text
=>
<
Link
to=
{
'/'
}
>
{
text
}
</
Link
>
},
{
title
:
'发货单号'
,
align
:
'center'
,
dataIndex
:
'invoiceNumber'
,
key
:
'invoiceNumber'
,
render
:
(
text
,
record
)
=>
<
Link
to=
{
`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`
}
>
{
text
}
</
Link
>
},
{
title
:
'订单类型'
,
align
:
'center'
,
...
...
src/pages/transaction/saleOrder/secondApprovedOrder/detail/index.tsx
View file @
54d2d7ef
...
...
@@ -22,10 +22,11 @@ const SecondApprovedOrderDetail: React.FC = () => {
// 提交表单
const
handleSubmit
=
useCallback
(()
=>
{
approvedRef
.
current
.
actions
.
submit
().
then
(
async
()
=>
{
approvedRef
.
current
.
actions
.
submit
().
then
(
async
(
v
)
=>
{
const
params
=
{
id
:
Number
(
id
),
state
:
approvedRef
.
current
.
actions
.
getFieldValue
(
'state'
)
state
:
v
.
values
.
state
,
cause
:
v
.
values
.
cause
,
}
const
result
=
await
run
(
params
)
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts
View file @
54d2d7ef
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-16 15:16:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-0
3 15:40:31
* @LastEditTime: 2020-12-0
4 16:59:25
* @Description: 联动逻辑相关
*/
import
{
Modal
}
from
'antd'
;
...
...
@@ -488,6 +488,20 @@ export const useBusinessEffects = (context, actions) => {
linkage
.
componentProps
(
'orderNo'
,
params
);
});
// 根据 单据类型 联动 对应单据所选项
context
(
'requestAsyncSelect'
).
subscribe
(
fieldState
=>
{
if
(
fieldState
.
name
===
'invoicesTypeId'
)
{
const
invoicesTypeIdState
=
getFieldState
(
'invoicesTypeId'
);
if
(
invoicesTypeIdState
.
value
)
{
const
current
=
invoicesTypeIdState
.
originAsyncData
.
find
(
item
=>
item
.
id
===
invoicesTypeIdState
.
value
);
if
(
current
)
{
linkage
.
value
(
'invoicesTypeCode'
,
current
.
number
);
}
};
}
});
// 对应仓库改变
onFieldInputChange$
(
'inventoryId'
).
subscribe
(
fieldState
=>
{
const
current
=
fieldState
.
originAsyncData
.
find
(
item
=>
item
.
id
===
fieldState
.
value
);
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
View file @
54d2d7ef
...
...
@@ -665,6 +665,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
id
,
orderNo
,
deliveryType
,
goodsCount
,
...
extraRest
},
itemName
,
...
...
@@ -677,6 +678,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
...
extraRest
,
goodsName
:
itemName
,
storageCount
:
productCount
,
productCount
:
goodsCount
,
};
}),
supplyMembersName
:
memberName
,
...
...
@@ -709,6 +711,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
id
,
orderNo
,
deliveryType
,
goodsCount
,
...
extraRest
},
itemName
,
...
...
@@ -721,6 +724,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
...
extraRest
,
goodsName
:
itemName
,
storageCount
:
productCount
,
productCount
:
goodsCount
,
};
}),
})
...
...
@@ -756,6 +760,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
id
,
orderNo
,
deliveryType
,
goodsCount
,
...
extraRest
},
itemName
,
...
...
@@ -768,6 +773,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
...
extraRest
,
goodsName
:
itemName
,
shipmentQuantity
:
productCount
,
productCount
:
goodsCount
,
};
}),
createMemberName
:
memberName
,
...
...
@@ -800,6 +806,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
id
,
orderNo
,
deliveryType
,
goodsCount
,
...
extraRest
},
itemName
,
...
...
@@ -812,6 +819,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
...
extraRest
,
goodsName
:
itemName
,
shipmentQuantity
:
productCount
,
productCount
:
goodsCount
,
};
}),
})
...
...
src/pages/transaction/supplierEvaluation/unevaluated/index.tsx
View file @
54d2d7ef
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