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
852f02fd
Commit
852f02fd
authored
Nov 23, 2020
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改询价商品,询价报价,确认询价报价 外部和内部状态文字
parent
a00f45dd
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
643 additions
and
225 deletions
+643
-225
Select.tsx
src/components/NiceForm/components/Select.tsx
+105
-0
index.tsx
src/components/NiceForm/index.tsx
+2
-0
orderSearchDetail.tsx
src/pages/logistics/components/orderSearchDetail.tsx
+7
-4
externalState.tsx
src/pages/transaction/common/externalState.tsx
+32
-0
interiorState.tsx
src/pages/transaction/common/interiorState.tsx
+30
-0
statusList.ts
src/pages/transaction/common/statusList.ts
+3
-0
tableStatusList.tsx
src/pages/transaction/common/tableStatusList.tsx
+1
-22
reviewList.tsx
...transaction/confirmInquiryQuote/components/reviewList.tsx
+33
-16
index.tsx
...s/transaction/confirmInquiryQuote/pendingSubmit/index.tsx
+32
-13
index.tsx
...saction/confirmInquiryQuote/pendingSubmitReview/index.tsx
+33
-13
index.tsx
...ages/transaction/confirmInquiryQuote/quoteOrder/index.tsx
+33
-14
index.tsx
src/pages/transaction/confirmInquiryQuote/schema/index.tsx
+15
-4
index.tsx
src/pages/transaction/goodsOffer/addEnquiryOrder/index.tsx
+30
-12
reviewList.tsx
src/pages/transaction/goodsOffer/components/reviewList.tsx
+32
-12
index.tsx
src/pages/transaction/goodsOffer/pendingSubmit/index.tsx
+32
-13
index.tsx
src/pages/transaction/goodsOffer/schema/index.tsx
+15
-25
pendingReview.tsx
src/pages/transaction/goodsOffer/schema/pendingReview.tsx
+15
-8
index.tsx
src/pages/transaction/inquiryQuote/addInquiryOrder/index.tsx
+32
-13
reviewList.tsx
src/pages/transaction/inquiryQuote/components/reviewList.tsx
+31
-13
index.tsx
src/pages/transaction/inquiryQuote/enquiryOrder/index.tsx
+29
-7
index.tsx
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
+31
-12
index.tsx
src/pages/transaction/inquiryQuote/quoteOrder/index.tsx
+32
-13
index.tsx
src/pages/transaction/inquiryQuote/schema/index.tsx
+23
-7
pendingReview.tsx
src/pages/transaction/inquiryQuote/schema/pendingReview.tsx
+15
-4
No files found.
src/components/NiceForm/components/Select.tsx
0 → 100644
View file @
852f02fd
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
import
{
Select
,
Input
,
Row
,
Button
}
from
'antd'
;
import
{
useDebounceFn
}
from
'@umijs/hooks'
;
import
{
ISchemaFieldComponentProps
,
FormPath
,
useFormEffects
,
createFormActions
,
createAsyncFormActions
}
from
'@formily/antd'
import
pinyin
from
'pinyin'
// 自定义搜索型下拉框
const
SingleSelect
=
(
props
:
ISchemaFieldComponentProps
)
=>
{
const
ref
=
useRef
<
any
>
({})
const
{
schema
,
form
,
path
,
mutators
,
editable
}
=
props
const
dataSourceRef
=
useRef
<
any
[]
>
([])
const
pinyinRef
=
useRef
<
any
[]
>
([])
// 可选参数 fetchSearch, select为search
// multiple 是否开启多选
const
{
fetchSearch
,
fetchParams
=
'name'
,
fetchFormat
,
multiple
=
false
,
...
resetProps
}
=
schema
.
getExtendsComponentProps
()
const
[
dataSource
,
setDataSource
]
=
useState
<
any
[]
>
([])
const
[
loading
,
setLoading
]
=
useState
(
false
)
const
[
openSelect
,
setOpenSelect
]
=
useState
(
false
)
const
fuzzyQuery
=
(
keyword
)
=>
{
const
pinyinArr
=
pinyinRef
.
current
// 获取拼音处理后的结果
const
pinyinResult
=
pinyinArr
.
reduce
((
prev
,
next
)
=>
{
if
(
next
.
label
.
includes
(
keyword
.
toLowerCase
()))
{
prev
.
push
(
next
.
value
)
}
return
prev
},
[])
const
result
=
dataSourceRef
.
current
.
filter
(
v
=>
pinyinResult
.
includes
(
v
.
value
))
return
result
}
const
resetField
=
()
=>
{
form
.
setFieldValue
(
path
,
multiple
?
[]
:
''
)
}
const
confirm
=
(
e
)
=>
{
e
.
preventDefault
()
setOpenSelect
(
false
)
}
useEffect
(()
=>
{
if
(
!
editable
)
{
return
;
}
setLoading
(
true
)
fetchSearch
({
[
fetchParams
]:
''
}).
then
(({
data
=
[]})
=>
{
const
transformData
=
data
.
map
(
v
=>
({
label
:
v
.
name
,
value
:
v
.
state
}))
dataSourceRef
.
current
=
transformData
pinyinRef
.
current
=
transformData
.
map
(
v
=>
{
return
{
label
:
pinyin
(
v
.
label
,
{
style
:
pinyin
.
STYLE_NORMAL
}).
join
(
''
).
toLowerCase
(),
value
:
v
.
value
}
})
setDataSource
(
transformData
)
}).
finally
(()
=>
{
setLoading
(
false
)
})
},
[])
const
handleChange
=
e
=>
{
const
{
value
}
=
e
.
target
const
filterDataSource
=
fuzzyQuery
(
value
)
setDataSource
(
filterDataSource
)
}
const
multipleProps
=
multiple
?
{
open
:
openSelect
,
onFocus
:
()
=>
setOpenSelect
(
true
),
}
:
{}
return
(
<
Select
ref=
{
ref
}
mode=
{
multiple
?
'multiple'
:
null
}
onChange=
{
e
=>
mutators
.
change
(
e
)
}
filterOption=
{
false
}
loading=
{
loading
}
options=
{
dataSource
}
disabled=
{
!
editable
}
getPopupContainer=
{
()
=>
document
.
getElementById
(
'root'
)
}
/* 处理option被遮挡 */
value=
{
props
.
value
}
{
...
multipleProps
}
{
...
resetProps
}
>
</
Select
>
)
}
SingleSelect
.
defaultProps
=
{}
SingleSelect
.
isFieldComponent
=
true
;
export
default
SingleSelect
\ No newline at end of file
src/components/NiceForm/index.tsx
View file @
852f02fd
...
...
@@ -19,6 +19,7 @@ import Children from './components/Children';
import
CircleBox
from
'./components/CircleBox'
;
import
Phone
from
'./components/Phone'
;
import
CustomRadio
from
'./components/CustomRadio'
;
import
Select
from
'./components/Select'
;
import
SearchSelect
from
'./components/SearchSelect'
;
import
TableTagList
from
'./components/TableTagList'
;
import
'./index.less'
...
...
@@ -94,6 +95,7 @@ export const componentExport = {
SchemaFormButtonGroup
,
FlexBox
,
Phone
,
Select
,
SearchSelect
,
DateRangePicker
:
DatePicker
.
RangePicker
,
TableTagList
,
...
...
src/pages/logistics/components/orderSearchDetail.tsx
View file @
852f02fd
...
...
@@ -216,6 +216,9 @@ const detailInfo: React.FC<{}> = () => {
},
];
// 获取路由link
const
{
pathname
}
=
history
.
location
;
const
type
=
pathname
.
split
(
'/'
)[
pathname
.
split
(
'/'
).
length
-
1
];
//在这做逻辑判断 判断路由 是由哪个页面进来的
useEffect
(()
=>
{
let
pathname
=
history
.
location
.
pathname
...
...
@@ -253,7 +256,9 @@ const detailInfo: React.FC<{}> = () => {
}
//待确认物流单
if
(
pathname
===
'/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail'
)
{
if
(
pathname
===
'/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail'
||
pathname
===
'/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/option'
)
{
PublicApi
.
getLogisticsOrderWaitConfirmGet
({
id
:
id
}).
then
(
res
=>
{
setdataInfo
(
res
.
data
)
...
...
@@ -288,9 +293,7 @@ const detailInfo: React.FC<{}> = () => {
history
.
goBack
()
}
// 获取路由link
const
{
pathname
}
=
history
.
location
;
const
type
=
pathname
.
split
(
'/'
)[
pathname
.
split
(
'/'
).
length
-
1
];
const
[
freightPrice
,
setfreightPrice
]
=
useState
<
any
>
(
null
);
// 输入报价价格
const
inputOnchange
=
(
e
:
any
)
=>
{
...
...
src/pages/transaction/common/externalState.tsx
0 → 100644
View file @
852f02fd
// 内部状态
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
{
Tag
}
from
'antd'
;
import
{
PublicApi
}
from
'@/services/api'
;
interface
params
{
state
?:
any
,
data
:
Array
<
any
>
}
const
ExternalState
:
React
.
FC
<
params
>
=
(
props
)
=>
{
const
{
state
,
data
}
=
props
;
const
color
=
[
'default'
,
'processing'
,
'warning'
,
'success'
,
'error'
]
return
(
<>
{
data
.
length
>
0
&&
data
.
map
((
item
:
any
)
=>
{
return
(
state
===
item
.
state
&&
<
Tag
color=
{
color
[
item
.
state
]
}
key=
{
item
.
state
}
>
{
item
.
name
}
</
Tag
>
)
})
}
</>
)
}
export
default
ExternalState
\ No newline at end of file
src/pages/transaction/common/interiorState.tsx
0 → 100644
View file @
852f02fd
// 外部状态
import
React
from
'react'
;
import
{
Badge
}
from
'antd'
;
interface
params
{
state
?:
any
,
data
:
Array
<
any
>
}
const
InteriorState
:
React
.
FC
<
params
>
=
(
props
)
=>
{
const
{
state
,
data
}
=
props
;
const
color
:
any
=
[
'default'
,
'warning'
,
'processing'
,
'success'
,
'error'
]
return
(
<>
{
data
.
length
>
0
&&
data
.
map
((
item
:
any
)
=>
{
return
(
state
===
item
.
state
&&
<
Badge
status=
{
color
[
item
.
state
]
}
text=
{
item
.
name
}
key=
{
item
.
state
}
/>
)
})
}
</>
)
}
export
default
InteriorState
\ No newline at end of file
src/pages/transaction/common/statusList.ts
View file @
852f02fd
import
React
,
{
useEffect
}
from
'react'
import
{
PublicApi
}
from
'@/services/api'
/*
* @Author: LeeJiancong
* @Date: 2020-08-01 11:06:09
...
...
src/pages/transaction/common/tableStatusList.tsx
View file @
852f02fd
import
React
,
{
Component
,
ReactNode
}
from
'react'
;
import
React
,
{
ReactNode
,
useState
}
from
'react'
;
import
{
Badge
,
Tag
}
from
'antd'
import
statuStyle
from
'./colorTag'
import
{
PublicApi
}
from
'@/services/api'
;
...
...
@@ -261,24 +261,3 @@ export const demandQuoteInteriorState = (text:any) => {
}
/********************************需求发布******************************* */
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
export
const
generalExternalState
=
(
status
:
any
)
=>
{
let
component
:
ReactNode
=
null
;
PublicApi
.
getOrderQuotationExternalStateEnum
().
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
console
.
log
(
res
.
data
)
}
})
}
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
export
const
generalInteriorState
=
(
status
:
any
)
=>
{
let
component
:
ReactNode
=
null
;
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
console
.
log
(
res
.
data
)
}
})
}
src/pages/transaction/confirmInquiryQuote/components/reviewList.tsx
View file @
852f02fd
...
...
@@ -7,16 +7,15 @@ import moment from 'moment';
import
{
timeRange
}
from
'@/utils/index'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
confirmFilterInteriorState
,
confirmFilterExternalState
}
from
'./../../common/statusList'
;
import
{
confirmExternalState
,
confirmInteriorState
}
from
'../../common/tableStatusList'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
pendingReviewSchema
}
from
'../schema/pendingReview'
;
import
{
PageStatus
}
from
'@/hooks/usePageStatus'
;
import
{
values
,
action
}
from
'mobx'
;
import
AuditModal
from
'./auditModel'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
import
{
PublicApi
}
from
'@/services/api'
;
const
formActions
=
createFormActions
();
export
interface
parmas
{
...
...
@@ -78,19 +77,13 @@ const ReviewList: React.FC<parmas> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
confirmFilterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
confirmExternalState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
confirmFilterInteriorState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
confirmInteriorState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -139,6 +132,30 @@ const ReviewList: React.FC<parmas> = (props) => {
},
500
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
...
...
@@ -154,7 +171,7 @@ const ReviewList: React.FC<parmas> = (props) => {
actions=
{
formActions
}
onSubmit=
{
values
=>
search
(
values
)
}
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'
quotation
No'
,
FORM_FILTER_PATH
)
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'
inquiryList
No'
,
FORM_FILTER_PATH
)
}
}
expressionScope=
{
{
controllerBtns
...
...
src/pages/transaction/confirmInquiryQuote/pendingSubmit/index.tsx
View file @
852f02fd
...
...
@@ -12,11 +12,10 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
pendingReviewSchema
}
from
'../schema/pendingReview'
;
import
{
confirmFilterInteriorState
,
confirmFilterExternalState
}
from
'./../../common/statusList'
;
import
{
confirmExternalState
,
confirmInteriorState
}
from
'../../common/tableStatusList'
;
import
StatusColors
from
'@/pages/transaction/components/StatusColors'
;
import
AuditModal
from
'../components/auditModel'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
PendingSubmit
:
React
.
FC
<
{}
>
=
()
=>
{
...
...
@@ -59,19 +58,13 @@ const PendingSubmit: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
confirmFilterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
confirmExternalState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
confirmFilterInteriorState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
confirmInteriorState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -135,6 +128,32 @@ const PendingSubmit: React.FC<{}> = () => {
ref
.
current
.
reload
();
},
500
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/confirmInquiryQuote/pendingSubmitReview/index.tsx
View file @
852f02fd
import
React
,
{
useRef
,
useState
}
from
'react'
;
import
React
,
{
useRef
,
useState
,
useEffect
}
from
'react'
;
import
{
history
,
Link
}
from
'umi'
;
import
{
Button
,
Card
,
Space
,
Row
,
Col
,
message
}
from
'antd'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
StandardTable
}
from
'god'
;
import
{
confirmFilterInteriorState
,
confirmFilterExternalState
}
from
'./../../common/statusList'
;
import
{
confirmExternalState
,
confirmInteriorState
}
from
'../../common/tableStatusList'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
moment
from
'moment'
;
import
{
timeRange
}
from
'@/utils/index'
;
...
...
@@ -16,6 +14,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
commonEnquieryOfferSchema
}
from
'../schema'
;
import
AuditModal
from
'../components/auditModel'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
PendingSubmitReview
:
React
.
FC
<
{}
>
=
()
=>
{
...
...
@@ -58,19 +58,13 @@ const PendingSubmitReview: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
confirmFilterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
confirmExternalState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
confirmFilterInteriorState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
confirmInteriorState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},{
title
:
'操作'
,
key
:
'options'
,
...
...
@@ -137,6 +131,32 @@ const PendingSubmitReview: React.FC<{}> = () => {
ref
.
current
.
reload
();
},
500
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/confirmInquiryQuote/quoteOrder/index.tsx
View file @
852f02fd
import
React
,
{
useRef
,
useEffect
}
from
'react'
;
import
React
,
{
useRef
,
useEffect
,
useState
}
from
'react'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
Card
,
Button
}
from
'antd'
;
import
{
StandardTable
}
from
'god'
;
...
...
@@ -9,12 +9,12 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
searchSelectGetSelectCategoryOptionEffect
}
from
'../../effect/index'
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
confirmFilterInteriorState
,
confirmFilterExternalState
}
from
'./../../common/statusList'
;
import
{
confirmExternalState
,
confirmInteriorState
}
from
'../../common/tableStatusList'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
moment
from
'moment'
;
import
{
timeRange
}
from
'@/utils/index'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
EnquiryOrder
:
React
.
FC
<
{}
>
=
(
props
)
=>
{
...
...
@@ -52,23 +52,17 @@ const EnquiryOrder: React.FC<{}> = (props) => {
key
:
'createTime'
,
dataIndex
:
'createTime'
,
render
:
(
text
:
any
,
record
:
any
)
=>
format
(
text
)
},
{
},
{
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
confirmFilterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
confirmExternalState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
confirmFilterInteriorState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
confirmInteriorState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
}];
//交易能力 询价报价 询价单查询
const
fetchData
=
(
params
?:
any
)
=>
{
...
...
@@ -88,6 +82,31 @@ const EnquiryOrder: React.FC<{}> = (props) => {
ref
.
current
.
reload
(
values
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/confirmInquiryQuote/schema/index.tsx
View file @
852f02fd
...
...
@@ -2,6 +2,7 @@ import { ISchema} from '@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
TimeList
,
searchFilterExternalState
,
searchFilterInteriorState
}
from
'../../common/statusList'
import
TranactionRoute
from
'config/routes/tranactionRoute'
import
{
PublicApi
}
from
'@/services/api'
/**
* @description: 公用
...
...
@@ -448,17 +449,27 @@ export const quoteFormSearch: ISchema = {
},
externalState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
searchFilterExternalState
},
interiorState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'内部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
width
:
160
}
},
enum
:
searchFilterInteriorState
},
}
},
...
...
src/pages/transaction/goodsOffer/addEnquiryOrder/index.tsx
View file @
852f02fd
import
React
,
{
useRef
,
useState
}
from
'react'
;
import
React
,
{
useRef
,
useState
,
useEffect
}
from
'react'
;
import
{
history
,
Link
}
from
'umi'
;
import
{
Button
,
Card
,
Space
,
Row
,
Col
,
Dropdown
,
Menu
,
Popconfirm
,
message
}
from
'antd'
;
import
{
PlusOutlined
,
DownOutlined
,
DeleteOutlined
}
from
'@ant-design/icons'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
StandardTable
}
from
'god'
;
import
{
filterInternalState
,
filterExternalState
}
from
'./../../common/statusList'
;
import
{
quoteOrderInternalState
,
inquiryQuoteOuterState
}
from
'../../common/tableStatusList'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
moment
from
'moment'
;
import
{
timeRange
}
from
'@/utils/index'
;
...
...
@@ -17,6 +15,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
commonEnquieryOfferSchema
}
from
'../schema'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
AuditModal
from
'../components/auditModel'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
AddEnquiryOrder
:
React
.
FC
<
{}
>
=
()
=>
{
...
...
@@ -68,20 +68,13 @@ const AddEnquiryOrder: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
filterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
inquiryQuoteOuterState
(
text
)
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
filterInternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
quoteOrderInternalState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -200,6 +193,31 @@ const AddEnquiryOrder: React.FC<{}> = () => {
ref
.
current
.
reload
(
values
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/goodsOffer/components/reviewList.tsx
View file @
852f02fd
...
...
@@ -9,12 +9,13 @@ import { ColumnType } from 'antd/lib/table/interface';
import
NiceForm
from
'@/components/NiceForm'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
filterInternalState
,
filterExternalState
}
from
'./../../common/statusList'
;
import
{
quoteOrderInternalState
,
inquiryQuoteOuterState
}
from
'../../common/tableStatusList'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
pendingReviewSchema
}
from
'../schema/pendingReview'
;
import
AuditModal
from
'./auditModel'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
export
interface
parmas
{
...
...
@@ -82,19 +83,13 @@ const ReviewList: React.FC<parmas> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
filterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
inquiryQuoteOuterState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
filterInternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
quoteOrderInternalState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -143,6 +138,31 @@ const ReviewList: React.FC<parmas> = (props) => {
},
500
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/goodsOffer/pendingSubmit/index.tsx
View file @
852f02fd
...
...
@@ -12,10 +12,9 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
pendingReviewSchema
}
from
'../schema/pendingReview'
;
import
{
filterInternalState
,
filterExternalState
}
from
'./../../common/statusList'
;
import
{
quoteOrderInternalState
,
inquiryQuoteOuterState
}
from
'../../common/tableStatusList'
;
import
AuditModal
from
'../components/auditModel'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
PendingSubmit
:
React
.
FC
<
{}
>
=
()
=>
{
...
...
@@ -64,19 +63,13 @@ const PendingSubmit: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
filterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
inquiryQuoteOuterState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
filterInternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
quoteOrderInternalState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -154,6 +147,32 @@ const PendingSubmit: React.FC<{}> = () => {
ref
.
current
.
reload
();
},
500
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/goodsOffer/schema/index.tsx
View file @
852f02fd
...
...
@@ -2,6 +2,7 @@ import { ISchema} from '@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
TimeList
,
filterExternalStateLabelList
,
filterInternalStateLabelList
}
from
'../../common/statusList'
import
TranactionRoute
from
'config/routes/tranactionRoute'
import
{
PublicApi
}
from
'@/services/api'
/**
* @description: 公用
...
...
@@ -69,25 +70,6 @@ export const commonEnquieryOfferSchema: ISchema = {
placeholder
:
'被询价会员'
}
},
// category:{
// type:'string',
// 'x-component': 'CustomInputSearch',
// 'x-component-props': {
// placeholder: '商品品类',
// showSearch: true,
// showArrow: true,
// defaultActiveFirstOption: false,
// filterOption: false,
// notFoundContent: null,
// style: { width: '174px', lineHeight: '32px' },
// searchValue: null,
// dataoption: []
// }
// // "x-component-props":{
// // placeholder:'请选择品类'
// // },
// // enum:[]
// },
voucherTime
:{
type
:
'string'
,
default
:
0
,
...
...
@@ -275,19 +257,27 @@ export const enquieryOfferSearchSchema: ISchema = {
},
externalState
:{
type
:
'string'
,
// default: 0
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterExternalStateLabelList
},
interiorState
:{
type
:
'string'
,
// default: 0
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'内部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterInternalStateLabelList
},
}
},
...
...
src/pages/transaction/goodsOffer/schema/pendingReview.tsx
View file @
852f02fd
import
{
ISchema
}
from
'@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
TimeList
,
filterExternalStateLabelList
,
filterInternalStateLabelList
}
from
'../../common/statusList'
import
TranactionRoute
from
'config/routes/tranactionRoute'
import
{
PublicApi
}
from
'@/services/api'
;
/**
* @description: 待审核询价单
* @param {type}
...
...
@@ -81,19 +80,27 @@ export const pendingReviewSchema: ISchema = {
},
externalState
:{
type
:
'string'
,
// default: 0
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterExternalStateLabelList
},
interiorState
:{
type
:
'string'
,
// default: 0
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'内部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterInternalStateLabelList
},
}
},
...
...
src/pages/transaction/inquiryQuote/addInquiryOrder/index.tsx
View file @
852f02fd
import
React
,
{
useRef
,
useState
}
from
'react'
;
import
React
,
{
useRef
,
useState
,
useEffect
}
from
'react'
;
import
{
history
,
Link
}
from
'umi'
;
import
{
Button
,
Card
,
Space
,
Row
,
Col
,
Dropdown
,
Menu
,
Popconfirm
,
message
}
from
'antd'
;
import
{
PlusOutlined
,
DownOutlined
,
DeleteOutlined
}
from
'@ant-design/icons'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
StandardTable
}
from
'god'
;
import
{
filterInternalState
,
filterExternalState
}
from
'./../../common/statusList'
;
import
{
quoteOrderInternalState
,
inquiryQuoteOuterState
}
from
'../../common/tableStatusList'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
moment
from
'moment'
;
import
{
timeRange
}
from
'@/utils/index'
;
...
...
@@ -17,6 +15,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
inquiryQuoteSchema
}
from
'../schema/pendingReview'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
AuditModal
from
'../components/auditModel'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
AddInquiryOrder
:
React
.
FC
<
{}
>
=
()
=>
{
...
...
@@ -60,19 +60,13 @@ const AddInquiryOrder: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
filterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
inquiryQuoteOuterState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
filterInternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
quoteOrderInternalState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -184,6 +178,31 @@ const AddInquiryOrder: React.FC<{}> = () => {
},
1000
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/inquiryQuote/components/reviewList.tsx
View file @
852f02fd
...
...
@@ -9,12 +9,12 @@ import { ColumnType } from 'antd/lib/table/interface';
import
NiceForm
from
'@/components/NiceForm'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
filterInternalState
,
filterExternalState
}
from
'./../../common/statusList'
;
import
{
quoteOrderInternalState
,
inquiryQuoteOuterState
}
from
'../../common/tableStatusList'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
inquiryQuoteSchema
}
from
'../schema/pendingReview'
;
import
AuditModal
from
'./auditModel'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
export
interface
parmas
{
...
...
@@ -76,19 +76,13 @@ const ReviewList: React.FC<parmas> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
filterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
inquiryQuoteOuterState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
filterInternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
quoteOrderInternalState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -132,6 +126,30 @@ const ReviewList: React.FC<parmas> = (props) => {
},
500
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
...
...
src/pages/transaction/inquiryQuote/enquiryOrder/index.tsx
View file @
852f02fd
import
React
,
{
useRef
,
useEffect
}
from
'react'
;
import
React
,
{
useRef
,
useEffect
,
useState
}
from
'react'
;
import
{
Link
}
from
'umi'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
Card
,
Button
}
from
'antd'
;
...
...
@@ -10,12 +10,12 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
searchSelectGetSelectCategoryOptionEffect
}
from
'../../effect/index'
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
filterExternalState
}
from
'./../../common/statusList'
;
import
{
inquiryQuoteOuterState
}
from
'../../common/tableStatusList'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
timeRange
}
from
'@/utils/index'
;
import
moment
from
'moment'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
EnquiryOrder
:
React
.
FC
<
{}
>
=
(
props
)
=>
{
...
...
@@ -56,10 +56,7 @@ const EnquiryOrder: React.FC<{}> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
filterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
inquiryQuoteOuterState
(
text
)
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'操作'
,
key
:
'options'
,
...
...
@@ -84,6 +81,31 @@ const EnquiryOrder: React.FC<{}> = (props) => {
ref
.
current
.
reload
(
values
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
View file @
852f02fd
...
...
@@ -12,10 +12,10 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
inquiryQuoteSchema
}
from
'../schema/pendingReview'
;
import
{
filterInternalState
,
filterExternalState
}
from
'./../../common/statusList'
;
import
{
quoteOrderInternalState
,
inquiryQuoteOuterState
}
from
'../../common/tableStatusList'
;
import
AuditModal
from
'../components/auditModel'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
PendingSubmit
:
React
.
FC
<
{}
>
=
()
=>
{
...
...
@@ -58,19 +58,13 @@ const PendingSubmit: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
filterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
inquiryQuoteOuterState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
filterInternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
quoteOrderInternalState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -136,6 +130,31 @@ const PendingSubmit: React.FC<{}> = () => {
},
500
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/inquiryQuote/quoteOrder/index.tsx
View file @
852f02fd
import
React
,
{
useRef
}
from
'react'
;
import
React
,
{
useRef
,
useEffect
,
useState
}
from
'react'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
Card
}
from
'antd'
;
import
{
StandardTable
}
from
'god'
;
...
...
@@ -9,12 +9,12 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
searchSelectGetSelectCategoryOptionEffect
}
from
'../../effect/index'
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
filterInternalState
,
filterExternalState
}
from
'./../../common/statusList'
;
import
{
quoteOrderInternalState
,
inquiryQuoteOuterState
}
from
'../../common/tableStatusList'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
timeRange
}
from
'@/utils/index'
;
import
moment
from
'moment'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
const
formActions
=
createFormActions
();
const
EnquiryOrder
:
React
.
FC
<
{}
>
=
(
props
)
=>
{
...
...
@@ -56,19 +56,13 @@ const EnquiryOrder: React.FC<{}> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
filters
:
filterExternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
text
=>
inquiryQuoteOuterState
(
text
)
},
{
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
filters
:
filterInternalState
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:
(
text
:
any
)
=>
quoteOrderInternalState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
}];
//交易能力 询价报价 询价单查询
const
fetchData
=
(
params
?:
any
)
=>
{
...
...
@@ -88,6 +82,31 @@ const EnquiryOrder: React.FC<{}> = (props) => {
ref
.
current
.
reload
(
values
)
}
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用外部状态
PublicApi
.
getOrderProductInquiryExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 询价查询, 询价报价, 确认询价报价单 通用内部状态
PublicApi
.
getOrderProductInquiryInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},[])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/inquiryQuote/schema/index.tsx
View file @
852f02fd
...
...
@@ -2,6 +2,7 @@ import { ISchema} from '@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
TimeList
,
filterExternalStateLabelList
,
filterInternalStateLabelList
}
from
'../../common/statusList'
import
TranactionRoute
from
'config/routes/tranactionRoute'
import
{
PublicApi
}
from
'@/services/api'
/**
* @description: 公用
...
...
@@ -292,11 +293,16 @@ export const enquieryOfferSearchSchema: ISchema = {
},
externalState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterExternalStateLabelList
},
}
}
},
sumbit
:{
...
...
@@ -473,17 +479,27 @@ export const quoteFormSearch: ISchema = {
},
externalState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterExternalStateLabelList
},
interiorState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'内部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterInternalStateLabelList
},
}
},
...
...
src/pages/transaction/inquiryQuote/schema/pendingReview.tsx
View file @
852f02fd
...
...
@@ -2,6 +2,7 @@ import { ISchema } from '@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
TimeList
,
filterExternalStateLabelList
,
filterInternalStateLabelList
}
from
'../../common/statusList'
import
TranactionRoute
from
'config/routes/tranactionRoute'
import
{
PublicApi
}
from
'@/services/api'
/**
* @description: 待审核询价单
...
...
@@ -178,17 +179,27 @@ export const inquiryQuoteSchema: ISchema = {
},
externalState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterExternalStateLabelList
},
interiorState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'内部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
width
:
160
}
},
enum
:
filterInternalStateLabelList
},
}
},
...
...
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