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
7a872995
Commit
7a872995
authored
Oct 21, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:加入订单筛选功能
parent
ef9b14db
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
8 deletions
+40
-8
index.tsx
src/pages/transaction/purchaseOrder/constant/index.tsx
+20
-4
index.tsx
src/pages/transaction/saleOrder/constant/index.tsx
+20
-4
No files found.
src/pages/transaction/purchaseOrder/constant/index.tsx
View file @
7a872995
import
React
from
'react'
import
React
from
'react'
import
{
history
}
from
'umi'
import
{
history
}
from
'umi'
import
{
formatTimeString
}
from
'@/utils'
import
{
formatTimeString
}
from
'@/utils'
import
{
ORDER_TYPE
}
from
'@/constants'
import
{
ORDER_TYPE
,
PurchaseOrderOutWorkStateTexts
,
PurchaseOrderInsideWorkStateTexts
}
from
'@/constants'
import
StatusColors
from
'../components/StatusColors'
import
StatusColors
from
'../components/StatusColors'
import
EyePreview
from
'@/components/EyePreview'
import
EyePreview
from
'@/components/EyePreview'
...
@@ -55,20 +55,35 @@ export const baseOrderListColumns: any[] = [
...
@@ -55,20 +55,35 @@ export const baseOrderListColumns: any[] = [
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'type'
,
dataIndex
:
'type'
,
key
:
'type'
,
key
:
'type'
,
render
:
(
text
)
=>
ORDER_TYPE
[
text
]
render
:
(
text
)
=>
ORDER_TYPE
[
text
],
filters
:
[
{
text
:
'询价采购'
,
value
:
1
},
{
text
:
'需求采购'
,
value
:
2
},
{
text
:
'现货采购'
,
value
:
3
},
{
text
:
'集采'
,
value
:
4
},
{
text
:
'积分兑换'
,
value
:
5
},
{
text
:
'渠道直采'
,
value
:
6
},
{
text
:
'渠道现货'
,
value
:
7
},
{
text
:
'渠道积分兑换'
,
value
:
8
},
],
onFilter
:
(
value
,
record
)
=>
value
===
record
.
type
,
},
},
{
{
title
:
'外部状态'
,
title
:
'外部状态'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'externalState'
,
dataIndex
:
'externalState'
,
key
:
'externalState'
,
key
:
'externalState'
,
render
:
text
=>
<
StatusColors
status=
{
text
}
type=
'out'
/>
render
:
text
=>
<
StatusColors
status=
{
text
}
type=
'out'
/>,
filters
:
Object
.
entries
(
PurchaseOrderOutWorkStateTexts
).
map
(([
key
,
value
])
=>
({
text
:
value
,
value
:
Number
(
key
)})),
onFilter
:
(
value
,
record
)
=>
value
===
record
.
externalState
,
},
},
{
{
title
:
'内部状态'
,
title
:
'内部状态'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'interiorState'
,
dataIndex
:
'interiorState'
,
key
:
'interiorState'
,
key
:
'interiorState'
,
render
:
(
text
)
=>
<
StatusColors
status=
{
text
}
type=
'inside'
/>
render
:
(
text
)
=>
<
StatusColors
status=
{
text
}
type=
'inside'
/>,
filters
:
Object
.
entries
(
PurchaseOrderInsideWorkStateTexts
).
map
(([
key
,
value
])
=>
({
text
:
value
,
value
:
Number
(
key
)})),
onFilter
:
(
value
,
record
)
=>
value
===
record
.
interiorState
,
},
},
]
]
\ No newline at end of file
src/pages/transaction/saleOrder/constant/index.tsx
View file @
7a872995
import
React
from
'react'
import
React
from
'react'
import
{
formatTimeString
}
from
'@/utils'
import
{
formatTimeString
}
from
'@/utils'
import
{
ORDER_TYPE
}
from
'@/constants'
import
{
ORDER_TYPE
,
PurchaseOrderInsideWorkStateTexts
,
SaleOrderInsideWorkStateTexts
,
PurchaseOrderOutWorkStateTexts
}
from
'@/constants'
import
StatusColors
from
'@/pages/transaction/components/StatusColors'
import
StatusColors
from
'@/pages/transaction/components/StatusColors'
import
EyePreview
from
'@/components/EyePreview'
import
EyePreview
from
'@/components/EyePreview'
import
{
history
}
from
'umi'
import
{
history
}
from
'umi'
...
@@ -51,20 +51,35 @@ export const baseOrderListColumns: any[] = [
...
@@ -51,20 +51,35 @@ export const baseOrderListColumns: any[] = [
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'type'
,
dataIndex
:
'type'
,
key
:
'type'
,
key
:
'type'
,
render
:
(
text
)
=>
ORDER_TYPE
[
text
]
render
:
(
text
)
=>
ORDER_TYPE
[
text
],
filters
:
[
{
text
:
'询价采购'
,
value
:
1
},
{
text
:
'需求采购'
,
value
:
2
},
{
text
:
'现货采购'
,
value
:
3
},
{
text
:
'集采'
,
value
:
4
},
{
text
:
'积分兑换'
,
value
:
5
},
{
text
:
'渠道直采'
,
value
:
6
},
{
text
:
'渠道现货'
,
value
:
7
},
{
text
:
'渠道积分兑换'
,
value
:
8
},
],
onFilter
:
(
value
,
record
)
=>
value
===
record
.
type
,
},
},
{
{
title
:
'外部状态'
,
title
:
'外部状态'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'externalState'
,
dataIndex
:
'externalState'
,
key
:
'externalState'
,
key
:
'externalState'
,
render
:
text
=>
<
StatusColors
status=
{
text
}
type=
'out'
/>
render
:
text
=>
<
StatusColors
status=
{
text
}
type=
'out'
/>,
filters
:
Object
.
entries
(
PurchaseOrderOutWorkStateTexts
).
map
(([
key
,
value
])
=>
({
text
:
value
,
value
:
Number
(
key
)})),
onFilter
:
(
value
,
record
)
=>
value
===
record
.
externalState
,
},
},
{
{
title
:
'内部状态'
,
title
:
'内部状态'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'purchaseOrderInteriorState'
,
dataIndex
:
'purchaseOrderInteriorState'
,
key
:
'purchaseOrderInteriorState'
,
key
:
'purchaseOrderInteriorState'
,
render
:
(
text
)
=>
<
StatusColors
status=
{
text
}
type=
'saleInside'
/>
render
:
(
text
)
=>
<
StatusColors
status=
{
text
}
type=
'saleInside'
/>,
filters
:
Object
.
entries
(
SaleOrderInsideWorkStateTexts
).
map
(([
key
,
value
])
=>
({
text
:
value
,
value
:
Number
(
key
)})),
onFilter
:
(
value
,
record
)
=>
value
===
record
.
purchaseOrderInteriorState
,
},
},
]
]
\ No newline at end of file
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