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
38f3cb90
Commit
38f3cb90
authored
Nov 27, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:新增订单外部状态
parent
d2a39371
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
6 deletions
+30
-6
index.ts
src/constants/index.ts
+20
-2
index.ts
...s/transaction/purchaseOrder/orderCollect/effects/index.ts
+4
-3
useSelfTable.tsx
...action/purchaseOrder/readyPayOrder/model/useSelfTable.tsx
+6
-1
No files found.
src/constants/index.ts
View file @
38f3cb90
...
@@ -542,7 +542,22 @@ export enum PurchaseOrderOutWorkState {
...
@@ -542,7 +542,22 @@ export enum PurchaseOrderOutWorkState {
/**
/**
* 货品数量还没有全部发货重新发货
* 货品数量还没有全部发货重新发货
*/
*/
PRODUCT_ACOUNT_NOT_SEND
PRODUCT_ACOUNT_NOT_SEND
,
/**
* 待支付尾款
*/
NOT_PAYMENT_FINAL
,
/**
* 待确认支付结果
*/
NOT_CONFIRM_PAYMENT_RESULT
,
/**
* 确认未到账
*/
CONFIRM_WITHOUT_ARRIVED_ACCOUNT
}
}
// 采购订单内部工作流状态
// 采购订单内部工作流状态
...
@@ -787,7 +802,10 @@ export const PurchaseOrderOutWorkStateTexts = {
...
@@ -787,7 +802,10 @@ export const PurchaseOrderOutWorkStateTexts = {
14
:
'完成订单'
,
14
:
'完成订单'
,
20
:
'不接受订单'
,
20
:
'不接受订单'
,
21
:
'确认没到账'
,
21
:
'确认没到账'
,
22
:
'货品未全部发货'
22
:
'货品未全部发货'
,
23
:
'待支付尾款'
,
24
:
'待确认支付结果'
,
25
:
'确认未到账'
,
}
}
// 采购订单内部
// 采购订单内部
...
...
src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts
View file @
38f3cb90
...
@@ -125,13 +125,14 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
...
@@ -125,13 +125,14 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
state
.
props
.
enum
=
state
.
props
.
enum
.
map
(
v
=>
{
state
.
props
.
enum
=
state
.
props
.
enum
.
map
(
v
=>
{
const
assign
:
any
=
Object
.
assign
({},
v
)
const
assign
:
any
=
Object
.
assign
({},
v
)
// 过滤服务提供者
// 过滤服务提供者
if
(
auth
.
memberRoleType
===
2
)
{
if
(
auth
.
memberRoleType
===
2
)
{
// 采购商
// 企业+个人
// 企业+个人
if
((
auth
.
memberType
===
1
||
auth
.
memberType
===
2
)
&&
assign
.
value
>
9
)
{
// if ((auth.memberType === 1 || auth.memberType === 2) && (assign.value > 9 && assign.value !== 24)) {
if
((
auth
.
memberType
===
1
||
auth
.
memberType
===
2
)
&&
assign
.
value
>
9
)
{
assign
.
disabled
=
true
assign
.
disabled
=
true
}
}
// 渠道(企业+个人)
// 渠道(企业+个人)
if
((
auth
.
memberType
===
3
||
auth
.
memberType
===
4
)
&&
assign
.
value
<
10
)
{
if
((
auth
.
memberType
===
3
||
auth
.
memberType
===
4
)
&&
assign
.
value
<
10
)
{
assign
.
disabled
=
true
assign
.
disabled
=
true
}
}
// 商城下单
// 商城下单
...
...
src/pages/transaction/purchaseOrder/readyPayOrder/model/useSelfTable.tsx
View file @
38f3cb90
...
@@ -153,7 +153,12 @@ export const useSelfTable = (props) => {
...
@@ -153,7 +153,12 @@ export const useSelfTable = (props) => {
render
:
(
text
,
record
)
=>
<>
render
:
(
text
,
record
)
=>
<>
{
{
record
.
currentPayments
!==
record
.
sum
&&
record
.
currentPayments
!==
record
.
sum
&&
(
record
.
externalState
===
PurchaseOrderOutWorkState
.
PAY_ORDER
||
record
.
externalState
===
PurchaseOrderOutWorkState
.
CONFIRM_NOT_ARRIVED_ACCOUNT
)
&&
(
record
.
externalState
===
PurchaseOrderOutWorkState
.
PAY_ORDER
||
record
.
externalState
===
PurchaseOrderOutWorkState
.
CONFIRM_NOT_ARRIVED_ACCOUNT
||
record
.
externalState
===
PurchaseOrderOutWorkState
.
NOT_PAYMENT_FINAL
||
record
.
externalState
===
PurchaseOrderOutWorkState
.
CONFIRM_WITHOUT_ARRIVED_ACCOUNT
)
&&
<
Link
to=
{
`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail?id=${record.id}`
}
>
去支付
</
Link
>
<
Link
to=
{
`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail?id=${record.id}`
}
>
去支付
</
Link
>
}
}
{
{
...
...
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