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
5ac2d562
Commit
5ac2d562
authored
Oct 26, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善订单查询页
parent
413a4c17
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
138 additions
and
4 deletions
+138
-4
constant.ts
src/pages/transaction/_public/order/constant.ts
+58
-0
index.tsx
src/pages/transaction/purchaseOrder/index.tsx
+40
-2
index.tsx
src/pages/transaction/saleOrder/index.tsx
+40
-2
No files found.
src/pages/transaction/_public/order/constant.ts
View file @
5ac2d562
import
{
ISchema
}
from
'@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
export
const
orderTypeLabel
=
[
''
,
export
const
orderTypeLabel
=
[
''
,
'询价采购'
,
'询价采购'
,
'需求采购'
,
'需求采购'
,
...
@@ -24,4 +27,58 @@ export enum SALE_ORDER_STATUS {
...
@@ -24,4 +27,58 @@ export enum SALE_ORDER_STATUS {
CONFIRM_DELIVE_GOODS_ORDER
,
CONFIRM_DELIVE_GOODS_ORDER
,
CONFIRM_RETURN_ORDER
,
CONFIRM_RETURN_ORDER
,
RETURN_DOCUMENT_ORDER
RETURN_DOCUMENT_ORDER
}
/**
* 除了订单必填字段, 默认
*/
export
const
tableListSchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
orderNo
:
{
type
:
'string'
,
"x-component"
:
'SearchFilter'
,
'x-component-props'
:
{
placeholder
:
'请输入订单编号'
,
align
:
'flex-end'
,
},
},
[
FORM_FILTER_PATH
]:
{
type
:
'object'
,
'x-component'
:
'flex-layout'
,
'x-component-props'
:
{
inline
:
true
,
colStyle
:
{
marginLeft
:
20
}
},
properties
:
{
orderThe
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'请输入订单摘要'
,
}
},
"supplyMembersName"
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'请输入供应会员名称'
}
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'daterangepicker'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
},
submit
:
{
'x-component'
:
'Submit'
,
'x-component-props'
:
{
children
:
'查询'
,
},
},
},
},
}
}
}
\ No newline at end of file
src/pages/transaction/purchaseOrder/index.tsx
View file @
5ac2d562
...
@@ -4,6 +4,13 @@ import { StandardTable } from 'god'
...
@@ -4,6 +4,13 @@ import { StandardTable } from 'god'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
import
{
baseOrderListColumns
}
from
'./constant'
import
{
baseOrderListColumns
}
from
'./constant'
import
{
PurchaseOrderOutWorkState
}
from
'@/constants'
import
{
history
}
from
'umi'
import
{
tableListSchema
}
from
'../_public/order/constant'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
DatePicker
}
from
'@formily/antd-components'
import
Submit
from
'@/components/NiceForm/components/Submit'
// 订单查询
// 订单查询
...
@@ -25,7 +32,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
...
@@ -25,7 +32,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
}
}
const
handleEvaluate
=
(
id
)
=>
{
const
handleEvaluate
=
(
id
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/purchaserEvaluation/unevaluated`
)
}
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
...
@@ -35,7 +42,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
...
@@ -35,7 +42,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
dataIndex
:
'ctl'
,
dataIndex
:
'ctl'
,
key
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<>
render
:
(
text
,
record
)
=>
<>
<
Button
type=
'link'
onClick=
{
()
=>
handleEvaluate
(
record
.
id
)
}
>
评价
</
Button
>
{
record
.
externalState
===
PurchaseOrderOutWorkState
.
FINISH_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleEvaluate
(
record
.
id
)
}
>
评价
</
Button
>
}
{
/* todo */
}
{
/* todo */
}
{
/* <Button type='link' onClick={() => handleSaleAfter(record.id)}>售后</Button> */
}
{
/* <Button type='link' onClick={() => handleSaleAfter(record.id)}>售后</Button> */
}
</>
</>
...
@@ -48,6 +55,37 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
...
@@ -48,6 +55,37 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
<
StandardTable
<
StandardTable
fetchTableData=
{
params
=>
fetchTableData
(
params
)
}
fetchTableData=
{
params
=>
fetchTableData
(
params
)
}
columns=
{
secondColumns
}
columns=
{
secondColumns
}
rowKey=
{
'orderNo'
}
formilyLayouts=
{
{
justify
:
'space-between'
}
}
formilyChilds=
{
{
layouts
:
{
order
:
2
},
children
:
<
Button
style=
{
{
width
:
140
}
}
onClick=
{
()
=>
{}
}
type=
'default'
>
导出
</
Button
>
}
}
formilyProps=
{
{
layouts
:
{
order
:
3
},
ctx
:
{
inline
:
false
,
schema
:
tableListSchema
,
effects
:
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'orderNo'
,
FORM_FILTER_PATH
,
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
Submit
}
}
}
}
/>
/>
</
Card
>
</
Card
>
</
PageHeaderWrapper
>
</
PageHeaderWrapper
>
...
...
src/pages/transaction/saleOrder/index.tsx
View file @
5ac2d562
...
@@ -4,6 +4,13 @@ import { StandardTable } from 'god'
...
@@ -4,6 +4,13 @@ import { StandardTable } from 'god'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
import
{
baseOrderListColumns
}
from
'./constant'
import
{
baseOrderListColumns
}
from
'./constant'
import
{
history
}
from
'umi'
import
{
PurchaseOrderInsideWorkState
,
PurchaseOrderOutWorkState
}
from
'@/constants'
import
{
tableListSchema
}
from
'../_public/order/constant'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
DatePicker
}
from
'@formily/antd-components'
import
Submit
from
'@/components/NiceForm/components/Submit'
// 销售订单查询
// 销售订单查询
...
@@ -25,7 +32,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
...
@@ -25,7 +32,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
}
}
const
handleEvaluate
=
(
id
)
=>
{
const
handleEvaluate
=
(
id
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/supplierEvaluation/unevaluated`
)
}
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
...
@@ -35,7 +42,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
...
@@ -35,7 +42,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
dataIndex
:
'ctl'
,
dataIndex
:
'ctl'
,
key
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<>
render
:
(
text
,
record
)
=>
<>
<
Button
type=
'link'
onClick=
{
()
=>
handleEvaluate
(
record
.
id
)
}
>
评价
</
Button
>
{
record
.
externalState
===
PurchaseOrderOutWorkState
.
FINISH_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleEvaluate
(
record
.
id
)
}
>
评价
</
Button
>
}
{
/* todo */
}
{
/* todo */
}
{
/* <Button type='link' onClick={() => handleSaleAfter(record.id)}>售后</Button> */
}
{
/* <Button type='link' onClick={() => handleSaleAfter(record.id)}>售后</Button> */
}
</>
</>
...
@@ -47,6 +54,37 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
...
@@ -47,6 +54,37 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
<
StandardTable
<
StandardTable
fetchTableData=
{
params
=>
fetchTableData
(
params
)
}
fetchTableData=
{
params
=>
fetchTableData
(
params
)
}
columns=
{
secondColumns
}
columns=
{
secondColumns
}
rowKey=
{
'orderNo'
}
formilyLayouts=
{
{
justify
:
'space-between'
}
}
formilyChilds=
{
{
layouts
:
{
order
:
2
},
children
:
<
Button
style=
{
{
width
:
140
}
}
onClick=
{
()
=>
{}
}
type=
'default'
>
导出
</
Button
>
}
}
formilyProps=
{
{
layouts
:
{
order
:
3
},
ctx
:
{
inline
:
false
,
schema
:
tableListSchema
,
effects
:
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'orderNo'
,
FORM_FILTER_PATH
,
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
Submit
}
}
}
}
/>
/>
</
Card
>
</
Card
>
</
PageHeaderWrapper
>
</
PageHeaderWrapper
>
...
...
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