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
2bdc11b6
Commit
2bdc11b6
authored
Nov 19, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
2265c151
12b88f36
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
60 additions
and
46 deletions
+60
-46
index.ts
src/constants/index.ts
+1
-1
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+2
-1
index.tsx
src/pages/lxMall/pay/components/balance/index.tsx
+6
-1
index.tsx
src/pages/lxMall/pay/index.tsx
+10
-17
index.tsx
src/pages/lxMall/purchaseOrder/index.tsx
+1
-1
index.tsx
...ayandSettle/amountAccountManage/paymentWithdraw/index.tsx
+0
-1
constant.ts
src/pages/transaction/_public/order/constant.ts
+2
-1
useOrderDetail.tsx
...ages/transaction/_public/order/effects/useOrderDetail.tsx
+3
-1
index.tsx
src/pages/transaction/components/orderPayTabs/index.tsx
+1
-1
index.tsx
...ges/transaction/components/orderTransformRecord/index.tsx
+29
-20
index.tsx
src/pages/transaction/purchaseOrder/index.tsx
+1
-0
index.ts
...s/transaction/purchaseOrder/orderCollect/effects/index.ts
+0
-1
usePaymentInfo.tsx
...ction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
+3
-0
index.tsx
src/pages/transaction/saleOrder/index.tsx
+1
-0
No files found.
src/constants/index.ts
View file @
2bdc11b6
...
...
@@ -828,7 +828,7 @@ export const SaleOrderInsideWorkStateTexts = {
19
:
'待新增物流单'
,
20
:
'订单发货待确认'
,
23
:
'待确认回单'
,
24
:
'订单
待
归档'
,
24
:
'订单归档'
,
25
:
'待审核发货单'
,
26
:
'待审核物流单'
,
27
:
'待手工发货'
...
...
src/pages/lxMall/commodityDetail/index.tsx
View file @
2bdc11b6
...
...
@@ -1007,7 +1007,8 @@ const CommodityDetail = (props) => {
<
div
className=
{
styles
.
product_info_line_label
}
>
支付方式
</
div
>
<
div
className=
{
styles
.
product_info_line_brief
}
>
{
payWayList
.
map
((
item
,
index
)
=>
<
span
key=
{
`pay_way_item_${index}`
}
className=
{
styles
.
text
}
>
{
item
.
payVal
}
</
span
>)
commodityDetail
?.
priceType
===
3
?
<
span
className=
{
styles
.
text
}
>
积分支付
</
span
>
:
payWayList
.
map
((
item
,
index
)
=>
<
span
key=
{
`pay_way_item_${index}`
}
className=
{
styles
.
text
}
>
{
item
.
payVal
}
</
span
>)
}
</
div
>
</
div
>
...
...
src/pages/lxMall/pay/components/balance/index.tsx
View file @
2bdc11b6
...
...
@@ -22,7 +22,7 @@ interface BablancePayWayPropsType {
}
const
BablancePayWay
:
React
.
FC
<
BablancePayWayPropsType
>
=
(
props
)
=>
{
const
{
payInfo
,
orderId
,
orderInfo
,
layoutType
,
shopUrlParam
}
=
props
const
{
payInfo
,
orderId
,
orderInfo
,
layoutType
,
shopUrlParam
,
onChange
}
=
props
const
[
balanceInfo
,
setBalanceInfo
]
=
useState
<
GetPayAssetAccountGetUserBalanceResponse
>
(
0
)
const
[
securityInfo
,
setSecurityInfo
]
=
useState
<
GetMemberSecurityGetResponse
>
()
const
[
payPassword
,
setPayPassword
]
=
useState
<
string
>
(
''
)
...
...
@@ -51,7 +51,12 @@ const BablancePayWay: React.FC<BablancePayWayPropsType> = (props) => {
if
(
res
.
code
===
1000
)
{
setBalanceInfo
(
res
.
data
)
setPageLoading
(
false
)
}
else
{
setPageLoading
(
false
)
onChange
(
true
,
res
.
message
)
}
}).
catch
(()
=>
{
})
}
...
...
src/pages/lxMall/pay/index.tsx
View file @
2bdc11b6
...
...
@@ -90,8 +90,10 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
})
}
const
handlePayChangge
=
(
state
)
=>
{
const
handlePayChangge
=
(
state
,
errMsg
?)
=>
{
console
.
log
(
state
,
"state"
)
setPayState
(
state
)
errMsg
&&
setErrMsg
(
errMsg
)
}
const
renderPayWay
=
()
=>
{
...
...
@@ -101,17 +103,17 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
switch
(
payInfo
.
paymentChannelsId
)
{
case
PayWayType
.
point
:
return
<
PointPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
PointPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
case
PayWayType
.
balance
:
return
<
BablancePayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
BablancePayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
case
PayWayType
.
credit
:
return
<
CreditPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
CreditPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
case
PayWayType
.
wechat
:
return
<
WechatPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
WechatPayWay
payInfo=
{
payInfo
}
orderInfo=
{
orderInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
case
PayWayType
.
bank
:
return
<
BankPayWay
/>
case
PayWayType
.
transfer
:
return
<
TransferPayWay
payInfo=
{
payInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
)
=>
handlePayChangge
(
state
)
}
{
...
props
}
/>
return
<
TransferPayWay
payInfo=
{
payInfo
}
orderId=
{
orderId
}
onChange=
{
(
state
,
errMsg
)
=>
handlePayChangge
(
state
,
errMsg
)
}
{
...
props
}
/>
default
:
return
null
}
...
...
@@ -133,16 +135,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
}
</
div
>
</
div
>
)
:
(<
div
>
<
CommonHeader
logoUrl=
{
(
layoutType
===
LAYOUT_TYPE
.
channel
||
layoutType
===
LAYOUT_TYPE
.
ichannel
)
?
shopInfo
?.
logo
:
mallInfo
.
logoUrl
}
title=
"支付成功"
/>
<
div
className=
{
styles
.
errmsg
}
>
<
p
>
支付成功
</
p
>
<
Button
type=
"primary"
className=
{
styles
.
backbtn
}
onClick=
{
()
=>
backHome
()
}
>
继续购物
</
Button
>
</
div
>
</
div
>)
:
loading
?
null
:
(
)
:
loading
?
null
:
(
<
div
>
<
CommonHeader
logoUrl=
{
(
layoutType
===
LAYOUT_TYPE
.
channel
||
layoutType
===
LAYOUT_TYPE
.
ichannel
)
?
shopInfo
?.
logo
:
mallInfo
.
logoUrl
}
...
...
@@ -153,7 +146,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
<
Button
type=
"primary"
className=
{
styles
.
backbtn
}
onClick=
{
()
=>
backHome
()
}
>
返回首页
</
Button
>
</
div
>
</
div
>
)
)
:
null
}
...
...
src/pages/lxMall/purchaseOrder/index.tsx
View file @
2bdc11b6
...
...
@@ -736,7 +736,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
}
</
div
>
<
div
className=
{
cx
(
styles
.
order_list_item_item
,
styles
.
count
)
}
>
<
InputNumber
max=
{
childItem
.
stockCount
||
0
}
min=
{
childItem
.
commodityUnitPrice
.
commodity
.
minOrder
||
1
}
value=
{
childItem
.
count
}
onChange=
{
(
value
)
=>
handleCountChange
(
value
,
childItem
.
id
)
}
/>
<
InputNumber
max=
{
childItem
.
stockCount
||
0
}
disabled=
{
childItem
.
stockCount
===
0
}
min=
{
childItem
.
commodityUnitPrice
.
commodity
.
minOrder
||
1
}
value=
{
childItem
.
count
}
onChange=
{
(
value
)
=>
handleCountChange
(
value
,
childItem
.
id
)
}
/>
<
div
className=
{
styles
.
stock
}
>
<
span
>
(库存
{
numFormat
(
childItem
.
stockCount
)
}{
childItem
.
commodityUnitPrice
.
commodity
.
unitName
}
)
</
span
>
</
div
>
...
...
src/pages/payandSettle/amountAccountManage/paymentWithdraw/index.tsx
View file @
2bdc11b6
...
...
@@ -71,7 +71,6 @@ const PaymentWithdraw: React.FC<{}> = () => {
]
const
fetchData
=
(
params
:
any
)
=>
{
console
.
log
(
params
)
return
new
Promise
((
resolve
,
reject
)
=>
{
let
obj
=
{
...
params
}
PublicApi
.
getPayMemberAssetAccountGetPayCashOutList
(
obj
).
then
(
res
=>
{
...
...
src/pages/transaction/_public/order/constant.ts
View file @
2bdc11b6
import
{
ISchema
}
from
'@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
moment
from
'moment'
export
const
orderTypeLabel
=
[
''
,
'询价采购'
,
...
...
@@ -62,7 +63,7 @@ export const tableListSchema: ISchema = {
"supplyMembersName"
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'请输入
供应
会员名称'
placeholder
:
'请输入
采购
会员名称'
}
},
"[startCreateTime,endCreateTime]"
:
{
...
...
src/pages/transaction/_public/order/effects/useOrderDetail.tsx
View file @
2bdc11b6
...
...
@@ -28,7 +28,7 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
const
dataRef
=
useRef
<
any
>
([
{
label
:
'对应报价单号'
,
name
:
'quotationNo'
,
span
:
8
,
render
:
text
=>
<
Link
to=
{
'/'
}
>
{
text
}
</
Link
>
},
{
label
:
'订单摘要'
,
name
:
'orderThe'
,
span
:
8
},
{
label
:
'供应会员'
,
name
:
'supplyMembersName'
,
span
:
8
},
{
label
:
type
===
'saleOrder'
?
'采购会员'
:
'供应会员'
,
name
:
type
===
'saleOrder'
?
'createMemberName'
:
'supplyMembersName'
,
span
:
8
},
{
label
:
'下单模式'
,
name
:
'orderModel'
,
span
:
8
,
render
:
text
=>
GlobalConfig
.
web
.
orderMode
.
find
(
v
=>
v
.
value
===
text
)?.
label
||
''
},
{
label
:
'订单类型'
,
name
:
'type'
,
span
:
8
,
render
:
text
=>
orderTypeLabel
[
text
]
},
{
label
:
'下单时间'
,
name
:
'createTime'
,
span
:
8
,
render
:
text
=>
formatTimeString
(
text
)
},
...
...
@@ -64,6 +64,8 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
const
{
code
,
data
}
=
res
if
(
code
===
1000
)
{
setPaylist
(
data
)
}
else
{
message
.
error
(
res
.
message
)
}
})
}
...
...
src/pages/transaction/components/orderPayTabs/index.tsx
View file @
2bdc11b6
...
...
@@ -17,7 +17,7 @@ const TabHeader = ({dataSource}) => {
<
div
className=
{
style
.
smallnumber
}
>
¥
{
dataSource
.
payPrice
||
0
}
</
div
>
</
Col
>
<
Col
>
<
StatusColors
status=
{
dataSource
.
externalState
}
type=
'
o
ut'
/>
<
StatusColors
status=
{
dataSource
.
externalState
}
type=
'
payO
ut'
/>
</
Col
>
</
Row
>
}
...
...
src/pages/transaction/components/orderTransformRecord/index.tsx
View file @
2bdc11b6
...
...
@@ -162,26 +162,35 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = ({type}) => {
const
{
data
}
=
useContext
(
OrderDetailContext
)
const
{
externalProcurementOrderLogResponses
,
interiorProcurementOrderLogResponses
}
=
data
return
(
<
MellowCard
style=
{
{
marginTop
:
24
}
}
bordered=
{
false
}
>
<
Tabs
defaultActiveKey=
"1"
>
<
Tabs
.
TabPane
tab=
'外部订单流转记录'
key=
"1"
>
<
Table
columns=
{
outOrderCols
}
dataSource=
{
externalProcurementOrderLogResponses
}
pagination=
{
false
}
rowKey=
"id"
/>
</
Tabs
.
TabPane
>
<
Tabs
.
TabPane
tab=
'内部订单流转记录'
key=
"2"
>
<
Table
columns=
{
type
===
'saleOrder'
?
SaleSideOrderCols
:
PurchaseSideOrderCols
}
dataSource=
{
interiorProcurementOrderLogResponses
}
pagination=
{
false
}
rowKey=
"id"
/>
</
Tabs
.
TabPane
>
</
Tabs
>
</
MellowCard
>
<>
{
(
externalProcurementOrderLogResponses
?.
length
>
0
||
interiorProcurementOrderLogResponses
?.
length
>
0
)
&&
<
MellowCard
style=
{
{
marginTop
:
24
}
}
bordered=
{
false
}
>
<
Tabs
defaultActiveKey=
"1"
>
{
externalProcurementOrderLogResponses
?.
length
>
0
&&
<
Tabs
.
TabPane
tab=
'外部订单流转记录'
key=
"1"
>
<
Table
columns=
{
outOrderCols
}
dataSource=
{
externalProcurementOrderLogResponses
}
pagination=
{
false
}
rowKey=
"id"
/>
</
Tabs
.
TabPane
>
}
{
interiorProcurementOrderLogResponses
?.
length
>
0
&&
<
Tabs
.
TabPane
tab=
'内部订单流转记录'
key=
"2"
>
<
Table
columns=
{
type
===
'saleOrder'
?
SaleSideOrderCols
:
PurchaseSideOrderCols
}
dataSource=
{
interiorProcurementOrderLogResponses
}
pagination=
{
false
}
rowKey=
"id"
/>
</
Tabs
.
TabPane
>
}
</
Tabs
>
</
MellowCard
>
}
</>
)
}
...
...
src/pages/transaction/purchaseOrder/index.tsx
View file @
2bdc11b6
...
...
@@ -17,6 +17,7 @@ import Submit from '@/components/NiceForm/components/Submit'
export
interface
PurchaseOrderProps
{
}
const
fetchTableData
=
async
(
params
)
=>
{
console
.
log
(
params
,
'params'
)
const
{
data
}
=
await
PublicApi
.
getOrderProcurementOrderList
(
params
)
return
data
}
...
...
src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts
View file @
2bdc11b6
import
{
productColumns
}
from
'./../../../../afterService/exchangeGoods/waitAddLogisticsOrder/opration/component/selectProductModal.tsx/index'
;
import
{
ISchemaFormActions
,
FormEffectHooks
,
IFieldState
,
ISchemaFormAsyncActions
,
createEffectHook
}
from
'@formily/antd'
;
import
{
usePageStatus
,
PageStatus
}
from
'@/hooks/usePageStatus'
;
import
{
useLinkageUtils
}
from
'@/utils/formEffectUtils'
;
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
View file @
2bdc11b6
...
...
@@ -4,6 +4,7 @@ import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'
import
{
useEffect
,
useState
,
useRef
,
useContext
}
from
'react'
import
{
PublicApi
}
from
'@/services/api'
import
{
ReadyAddOrderDetailContext
}
from
'../../context'
import
{
message
}
from
'antd'
export
const
usePaymentInfo
=
(
ctx
:
ISchemaFormActions
|
ISchemaFormAsyncActions
,
memberId
:
any
):
any
=>
{
const
paywayData
=
useRef
<
any
>
({})
...
...
@@ -84,6 +85,8 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
paywayData
.
current
=
data
setColumns
(
newColumns
)
}
else
{
message
.
error
(
res
.
message
)
}
})
}
...
...
src/pages/transaction/saleOrder/index.tsx
View file @
2bdc11b6
...
...
@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
DatePicker
}
from
'@formily/antd-components'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
moment
from
'moment'
// 销售订单查询
...
...
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