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
7faf08c3
Commit
7faf08c3
authored
Nov 23, 2020
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改需求发布 需求报价 确认需求报价得外部内部状态显示
parent
f09618ac
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
524 additions
and
337 deletions
+524
-337
externalState.tsx
src/pages/transaction/common/externalState.tsx
+15
-5
interiorState.tsx
src/pages/transaction/common/interiorState.tsx
+20
-9
reviewList.tsx
...transaction/confirmInquiryQuote/components/reviewList.tsx
+2
-2
index.tsx
...s/transaction/confirmInquiryQuote/pendingSubmit/index.tsx
+2
-2
index.tsx
...saction/confirmInquiryQuote/pendingSubmitReview/index.tsx
+2
-2
index.tsx
...ages/transaction/confirmInquiryQuote/quoteOrder/index.tsx
+2
-2
index.tsx
src/pages/transaction/confirmInquiryQuote/schema/index.tsx
+3
-3
index.tsx
src/pages/transaction/enquiryOffer/components/index.tsx
+29
-6
index.tsx
...ges/transaction/enquiryOffer/enquiryOfferSearch/index.tsx
+100
-88
index.tsx
src/pages/transaction/enquiryOffer/enquirySearch/index.tsx
+100
-77
index.tsx
src/pages/transaction/enquiryOffer/schema/index.tsx
+25
-9
detail.tsx
src/pages/transaction/enquiryOffer/toAddSubmit/detail.tsx
+3
-3
index.tsx
src/pages/transaction/enquiryOffer/toAddSubmit/index.tsx
+0
-0
formleftIndex.tsx
...nsaction/enquiryOfferConfirm/components/formleftIndex.tsx
+32
-9
index.tsx
...ages/transaction/enquiryOfferConfirm/components/index.tsx
+0
-0
index.tsx
src/pages/transaction/enquiryOfferConfirm/schema/index.tsx
+16
-5
index.tsx
src/pages/transaction/enquirySubmit/components/index.tsx
+0
-0
index.tsx
src/pages/transaction/enquirySubmit/enquirySearch/index.tsx
+92
-77
index.tsx
src/pages/transaction/enquirySubmit/schema/index.tsx
+24
-0
index.tsx
src/pages/transaction/enquirySubmit/toAddSubmit/index.tsx
+0
-0
index.tsx
src/pages/transaction/goodsOffer/addEnquiryOrder/index.tsx
+2
-2
reviewList.tsx
src/pages/transaction/goodsOffer/components/reviewList.tsx
+2
-2
index.tsx
src/pages/transaction/goodsOffer/enquiryOrder/index.tsx
+32
-13
index.tsx
src/pages/transaction/goodsOffer/pendingSubmit/index.tsx
+2
-2
index.tsx
src/pages/transaction/goodsOffer/schema/index.tsx
+1
-1
pendingReview.tsx
src/pages/transaction/goodsOffer/schema/pendingReview.tsx
+1
-1
attached.tsx
...tion/inquiryQuote/addInquiryOrder/components/attached.tsx
+2
-2
flowRecord.tsx
...on/inquiryQuote/addInquiryOrder/components/flowRecord.tsx
+4
-4
index.tsx
src/pages/transaction/inquiryQuote/addInquiryOrder/index.tsx
+2
-2
reviewList.tsx
src/pages/transaction/inquiryQuote/components/reviewList.tsx
+2
-2
index.tsx
src/pages/transaction/inquiryQuote/enquiryOrder/index.tsx
+1
-1
index.tsx
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
+2
-2
index.tsx
src/pages/transaction/inquiryQuote/quoteOrder/index.tsx
+2
-2
index.tsx
src/pages/transaction/inquiryQuote/schema/index.tsx
+1
-1
pendingReview.tsx
src/pages/transaction/inquiryQuote/schema/pendingReview.tsx
+1
-1
No files found.
src/pages/transaction/common/externalState.tsx
View file @
7faf08c3
// 内部状态
import
React
,
{
use
Effect
,
useState
}
from
'react'
;
import
React
,
{
use
State
,
useEffect
}
from
'react'
;
import
{
Tag
}
from
'antd'
;
import
{
PublicApi
}
from
'@/services/api'
;
interface
params
{
state
?:
any
,
data
:
Array
<
any
>
data
:
Array
<
any
>
,
colorType
?:
number
}
const
ExternalState
:
React
.
FC
<
params
>
=
(
props
)
=>
{
const
{
state
,
data
}
=
props
;
const
color
=
[
'default'
,
'processing'
,
'warning'
,
'success'
,
'error'
]
const
{
state
,
data
,
colorType
}
=
props
;
const
[
color
,
setcolor
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
switch
(
colorType
)
{
case
1
:
setcolor
([
''
,
'default'
,
'warning'
,
'default'
,
'warning'
,
'success'
,
'error'
,
'error'
,
'error'
])
break
;
case
2
:
setcolor
([
''
,
'default'
,
'processing'
,
'warning'
,
'success'
,
'error'
])
break
;
}
},[])
return
(
<>
{
data
.
length
>
0
&&
data
.
map
((
item
:
any
)
=>
{
...
...
src/pages/transaction/common/interiorState.tsx
View file @
7faf08c3
// 外部状态
import
React
from
'react'
;
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
Badge
}
from
'antd'
;
interface
params
{
state
?:
any
,
data
:
Array
<
any
>
data
:
Array
<
any
>
,
colorType
?:
number
}
const
InteriorState
:
React
.
FC
<
params
>
=
(
props
)
=>
{
const
{
state
,
data
}
=
props
;
const
color
:
any
=
[
'default'
,
'warning'
,
'processing'
,
'success'
,
'error'
]
const
{
state
,
data
,
colorType
}
=
props
;
const
[
color
,
setcolor
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
switch
(
colorType
)
{
case
1
:
setcolor
([
''
,
'default'
,
'warning'
,
'warning'
,
'processing'
,
'success'
,
'error'
,
'error'
])
break
;
case
2
:
setcolor
([
''
,
'default'
,
'warning'
,
'warning'
,
'success'
,
'success'
,
'error'
])
break
;
}
},
[])
return
(
<>
{
data
.
length
>
0
&&
data
.
map
((
item
:
any
)
=>
{
return
(
state
===
item
.
state
&&
<
Badge
status=
{
color
[
item
.
state
]
}
text=
{
item
.
name
}
key=
{
item
.
state
}
/>
<
Badge
status=
{
color
[
item
.
state
]
}
text=
{
item
.
name
}
key=
{
item
.
state
}
/>
)
})
}
</>
...
...
src/pages/transaction/confirmInquiryQuote/components/reviewList.tsx
View file @
7faf08c3
...
...
@@ -77,13 +77,13 @@ const ReviewList: React.FC<parmas> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/confirmInquiryQuote/pendingSubmit/index.tsx
View file @
7faf08c3
...
...
@@ -58,13 +58,13 @@ const PendingSubmit: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/confirmInquiryQuote/pendingSubmitReview/index.tsx
View file @
7faf08c3
...
...
@@ -58,13 +58,13 @@ const PendingSubmitReview: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},{
title
:
'操作'
,
key
:
'options'
,
...
...
src/pages/transaction/confirmInquiryQuote/quoteOrder/index.tsx
View file @
7faf08c3
...
...
@@ -56,13 +56,13 @@ const EnquiryOrder: React.FC<{}> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
}];
//交易能力 询价报价 询价单查询
const
fetchData
=
(
params
?:
any
)
=>
{
...
...
src/pages/transaction/confirmInquiryQuote/schema/index.tsx
View file @
7faf08c3
...
...
@@ -73,13 +73,13 @@ export const commonEnquieryOfferSchema: ISchema = {
details
:{
type
:
'string'
,
"x-component-props"
:{
placeholder
:
'
询
价单摘要'
placeholder
:
'
报
价单摘要'
}
},
memberName
:{
type
:
'string'
,
"x-component-props"
:{
placeholder
:
'
被
询价会员'
placeholder
:
'询价会员'
}
},
voucherTime
:{
...
...
@@ -463,7 +463,7 @@ export const quoteFormSearch: ISchema = {
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'
外
部状态'
,
placeholder
:
'
内
部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
...
...
src/pages/transaction/enquiryOffer/components/index.tsx
View file @
7faf08c3
...
...
@@ -46,6 +46,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
commonEnquieryOfferSchema
}
from
'../schema'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
values
,
action
}
from
'mobx'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
/**
* @description: type: 1.待审核1级,2.待审核2级,3.待提交报价单
* @param {type}
...
...
@@ -156,17 +158,13 @@ const List: React.FC<listParams> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
align
:
'center'
,
render
:
(
text
:
any
,
reconds
)
=>
enquiryOfferSearchexternalState
(
text
)
render
:
text
=>
<
GeneralExternalState
colorType=
{
1
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
enquiryOfferSearchInteriorState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
1
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
@@ -292,6 +290,31 @@ const List: React.FC<listParams> = (props) => {
</
Col
>
</
Row
>
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
//查询需求单外部状态枚举列表
PublicApi
.
getOrderRequisitionFormExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 查询需求单内部状态枚举列表
PublicApi
.
getOrderRequisitionFormInteriorStateEnum
().
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/enquiryOffer/enquiryOfferSearch/index.tsx
View file @
7faf08c3
This diff is collapsed.
Click to expand it.
src/pages/transaction/enquiryOffer/enquirySearch/index.tsx
View file @
7faf08c3
...
...
@@ -10,7 +10,7 @@
* @param {type}
* @return {type}
*/
import
React
,
{
ReactNode
,
useRef
,
useState
,
useEffect
}
from
'react'
;
import
React
,
{
ReactNode
,
useRef
,
useState
,
useEffect
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
Button
,
...
...
@@ -24,7 +24,7 @@ import {
}
from
'antd'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
PlusOutlined
,
DownOutlined
,
DeleteOutlined
PlusOutlined
,
DownOutlined
,
DeleteOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
...
...
@@ -34,27 +34,30 @@ import {
}
from
'god/dist/src/standard-table/TableController'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
StatusSwitch
from
'@/components/StatusSwitch'
;
import
{
demandQuoteExternalState
}
from
'../../common/tableStatusList'
import
{
demandQuoteExternalState
}
from
'../../common/tableStatusList'
import
statuStyle
from
'../../common/colorTag'
import
NiceForm
from
'@/components/NiceForm'
;
import
{
timeRange
}
from
'@/utils/index'
import
{
filterInteriorStateList
,
filterExternalStateList
}
from
'./../../common/statusList'
import
{
timeRange
}
from
'@/utils/index'
import
{
filterInteriorStateList
,
filterExternalStateList
}
from
'./../../common/statusList'
import
moment
from
'moment'
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
PageStatus
}
from
'@/hooks/usePageStatus'
import
{
PageStatus
}
from
'@/hooks/usePageStatus'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
searchSelectGetSelectCategoryOptionEffect
}
from
'../../effect/index'
import
{
searchSelectGetSelectCategoryOptionEffect
}
from
'../../effect/index'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
enquierySearchSchema
}
from
'../schema'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
values
,
action
}
from
'mobx'
;
export
interface
listParams
{
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
export
interface
listParams
{
type
:
number
;
des
?:
string
;
}
const
formActions
=
createFormActions
();
const
List
:
React
.
FC
<
{
listParams
}
>
=
(
props
)
=>
{
const
List
:
React
.
FC
<
{
listParams
}
>
=
(
props
)
=>
{
const
ref
=
useRef
<
any
>
({})
const
[
more
,
setmore
]
=
useState
(
false
)
const
[
selectRow
,
setSelectRow
]
=
useState
([])
...
...
@@ -65,7 +68,7 @@ const List:React.FC<{listParams}> = (props) => {
const
fetchData
=
async
(
params
:
any
)
=>
{
const
res
=
await
PublicApi
.
getOrderQuotationRequisitionFormList
(
params
);
return
res
.
data
}
/**
...
...
@@ -73,81 +76,76 @@ const List:React.FC<{listParams}> = (props) => {
* @param {type} 可以根据props.type处理
* @return {type}
*/
const
handleToDetail
=
(
id
)
=>
{
const
handleToDetail
=
(
id
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/enquiryOffer/enquirySearch/preview?id=
${
id
}
`
)
}
const
columns
:
ColumnType
<
any
>
[]
=
[
const
columns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'需求单号'
,
key
:
'requisitionFormNo'
,
dataIndex
:
'requisitionFormNo'
,
align
:
'center'
,
render
:
(
text
:
any
,
records
:
any
)
=>
<
EyePreview
type=
"button"
handleClick=
{
()
=>
{
title
:
'需求单号'
,
key
:
'requisitionFormNo'
,
dataIndex
:
'requisitionFormNo'
,
align
:
'center'
,
render
:
(
text
:
any
,
records
:
any
)
=>
<
EyePreview
type=
"button"
handleClick=
{
()
=>
{
handleToDetail
(
records
.
id
)
}
}
>
{
text
}
</
EyePreview
>
},
{
title
:
'需求摘要'
,
key
:
'details'
,
dataIndex
:
'details'
,
align
:
'left'
title
:
'需求摘要'
,
key
:
'details'
,
dataIndex
:
'details'
,
align
:
'left'
},
{
title
:
'品类'
,
key
:
'category'
,
dataIndex
:
'category'
,
align
:
'left'
title
:
'品类'
,
key
:
'category'
,
dataIndex
:
'category'
,
align
:
'left'
},
{
title
:
'需求会员'
,
key
:
'demandMembers'
,
dataIndex
:
'demandMembers'
,
align
:
'left'
title
:
'需求会员'
,
key
:
'demandMembers'
,
dataIndex
:
'demandMembers'
,
align
:
'left'
},
{
title
:
'交付日期'
,
key
:
'deliveryTime'
,
dataIndex
:
'deliveryTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
title
:
'交付日期'
,
key
:
'deliveryTime'
,
dataIndex
:
'deliveryTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
},
{
title
:
'报价截至时间'
,
key
:
'quotationAsTime'
,
dataIndex
:
'quotationAsTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
title
:
'报价截至时间'
,
key
:
'quotationAsTime'
,
dataIndex
:
'quotationAsTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
},
{
title
:
'单据时间'
,
key
:
'voucherTime'
,
dataIndex
:
'voucherTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
title
:
'单据时间'
,
key
:
'voucherTime'
,
dataIndex
:
'voucherTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
},
{
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
align
:
'center'
,
filters
:
filterExternalStateList
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
(
text
:
any
,
reconds
)
=>
demandQuoteExternalState
(
text
)
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
colorType=
{
1
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'操作'
,
key
:
'option'
,
dataIndex
:
'option'
,
align
:
'center'
,
render
:
(
text
:
any
,
reconds
)
=>
<
Button
type=
'link'
disabled=
{
reconds
.
externalState
!==
3
&&
reconds
.
externalState
!==
6
}
onClick=
{
()
=>
handleQuote
(
reconds
.
externalState
,
reconds
.
id
)
}
>
报价
title
:
'操作'
,
key
:
'option'
,
dataIndex
:
'option'
,
align
:
'center'
,
render
:
(
text
:
any
,
reconds
)
=>
<
Button
type=
'link'
disabled=
{
reconds
.
externalState
!==
3
&&
reconds
.
externalState
!==
6
}
onClick=
{
()
=>
handleQuote
(
reconds
.
externalState
,
reconds
.
id
)
}
>
报价
</
Button
>
}
]
...
...
@@ -157,39 +155,39 @@ const List:React.FC<{listParams}> = (props) => {
history
.
push
(
`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/quote?id=
${
id
}
`
);
}
useEffect
(()
=>
{
},[])
useEffect
(()
=>
{
},
[])
/**
* @description: 删除
* @param {type}
* @return {type}
*/
const
handleDelete
=
(
arr
:
number
[]
|
string
[])
=>
{
const
handleDelete
=
(
arr
:
number
[]
|
string
[])
=>
{
PublicApi
.
postOrderRequisitionFormDeleteAll
({
ids
:
arr
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
}
//提交审核
const
handleSubmit
=
(
id
)
=>
{
PublicApi
.
postOrderNewRequisitionFormAudit
({
id
:
id
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
}
const
handleSumbit
=
(
values
:
any
)
=>
{
if
(
values
.
voucherTime
)
{
const
handleSumbit
=
(
values
:
any
)
=>
{
if
(
values
.
voucherTime
)
{
values
.
startVoucherTime
=
timeRange
(
values
.
voucherTime
).
st
values
.
endVoucherTime
=
timeRange
(
values
.
voucherTime
).
et
delete
values
.
voucherTime
}
console
.
log
(
'values'
,
values
)
console
.
log
(
'values'
,
values
)
ref
.
current
.
reload
(
values
)
}
const
handleBatchDel
=
(
e
:
any
)
=>
{
const
handleBatchDel
=
(
e
:
any
)
=>
{
}
}
const
rowSelection
=
{
selectedRowKeys
:
selectedRowKeys
,
onChange
:
(
selectedRowKeys
:
any
,
selectedRows
:
any
)
=>
{
...
...
@@ -201,7 +199,32 @@ const List:React.FC<{listParams}> = (props) => {
const
controllerBtns
=
<
Row
>
<
Col
span=
{
24
}
>
</
Col
>
</
Row
>
</
Row
>
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
//查询需求单外部状态枚举列表
PublicApi
.
getOrderRequisitionFormExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 查询需求单内部状态枚举列表
PublicApi
.
getOrderRequisitionFormInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},
[])
return
(
<
PageHeaderWrapper
>
...
...
@@ -209,17 +232,17 @@ const List:React.FC<{listParams}> = (props) => {
<
StandardTable
currentRef=
{
ref
}
columns=
{
columns
}
tableProps=
{
{
rowKew
:
'id'
}
}
tableProps=
{
{
rowKew
:
'id'
}
}
fetchTableData=
{
(
params
:
any
)
=>
fetchData
(
params
)
}
// rowSelection={rowSelection}
controlRender=
{
<
NiceForm
actions=
{
formActions
}
onSubmit=
{
values
=>
handleSumbit
(
values
)
}
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'requisitionFormNo'
,
FORM_FILTER_PATH
)
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'requisitionFormNo'
,
FORM_FILTER_PATH
)
FormEffectHooks
.
onFieldChange$
(
'category'
).
subscribe
(
state
=>
{
searchSelectGetSelectCategoryOptionEffect
(
actions
,
'category'
)
searchSelectGetSelectCategoryOptionEffect
(
actions
,
'category'
)
})
}
}
schema=
{
enquierySearchSchema
}
...
...
src/pages/transaction/enquiryOffer/schema/index.tsx
View file @
7faf08c3
...
...
@@ -2,6 +2,7 @@ import { ISchema} from '@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
TimeList
,
demandQuoteExternalState
,
demandQuoteInteriorState
}
from
'../../common/statusList'
import
TranactionRoute
from
'config/routes/tranactionRoute'
import
{
PublicApi
}
from
'@/services/api'
/**
* @description: 公用
...
...
@@ -200,10 +201,15 @@ export const enquierySearchSchema: ISchema = {
},
externalState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderRequisitionFormExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
demandQuoteExternalState
},
voucherTime
:{
type
:
'string'
,
...
...
@@ -296,21 +302,31 @@ export const enquieryOfferSearchSchema: ISchema = {
placeholder
:
'需求会员'
}
},
voucherTim
e
:{
externalStat
e
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderRequisitionFormExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
demandQuoteExternalState
},
externalState
:{
interiorState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'内部状态'
placeholder
:
'内部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderRequisitionFormInteriorStateEnum
,
style
:
{
width
:
160
}
},
enum
:
demandQuoteInteriorState
},
interiorStat
e
:{
voucherTim
e
:{
type
:
'string'
,
"x-component-props"
:{
placeholder
:
'请选择单据时间'
...
...
src/pages/transaction/enquiryOffer/toAddSubmit/detail.tsx
View file @
7faf08c3
...
...
@@ -680,7 +680,7 @@ const Detail: React.FC<{}> = () => {
*/
const
interiorTextState
=
(
text
)
=>
{
let
name
=
''
dataInfo
.
interior
RequisitionForm
StateResponses
.
forEach
(
element
=>
{
dataInfo
.
interior
Quotation
StateResponses
.
forEach
(
element
=>
{
if
(
element
.
state
===
text
)
{
name
=
element
.
operationalProcess
}
...
...
@@ -1156,10 +1156,10 @@ const Detail: React.FC<{}> = () => {
</Radio.Group> */
}
<
Tabs
type=
"card"
size=
"small"
defaultActiveKey=
'1'
>
<
TabPane
tab=
'外部单据'
key=
"1"
>
<
Table
rowKey=
{
'id'
}
dataSource=
{
dataInfo
.
externalRequisitionForms
||
[]
}
columns=
{
externalColumn
(
formTime
,
externalTextState
)
}
/>
<
Table
rowKey=
{
'id'
}
dataSource=
{
dataInfo
.
externalRequisitionForm
Response
s
||
[]
}
columns=
{
externalColumn
(
formTime
,
externalTextState
)
}
/>
</
TabPane
>
<
TabPane
tab=
'内部单据'
key=
"2"
>
<
Table
rowKey=
{
'id'
}
dataSource=
{
dataInfo
.
interior
RequisitionForm
s
||
[]
}
columns=
{
interiorColumn
(
formTime
,
interiorTextState
)
}
/>
<
Table
rowKey=
{
'id'
}
dataSource=
{
dataInfo
.
interior
QuotationLogResponse
s
||
[]
}
columns=
{
interiorColumn
(
formTime
,
interiorTextState
)
}
/>
</
TabPane
>
</
Tabs
>
</
TabPane
>
...
...
src/pages/transaction/enquiryOffer/toAddSubmit/index.tsx
View file @
7faf08c3
This diff is collapsed.
Click to expand it.
src/pages/transaction/enquiryOfferConfirm/components/formleftIndex.tsx
View file @
7faf08c3
...
...
@@ -48,6 +48,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
enquieryOfferSearchSchema
}
from
'../schema'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
values
,
action
}
from
'mobx'
;
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
export
interface
listParams
{
type
:
number
;
des
?:
string
;
...
...
@@ -96,8 +98,8 @@ const List: React.FC<listParams> = (props) => {
// 确认报价
const
hendleSubmitQuote
=
(
id
:
any
)
=>
{
PublicApi
.
postOrderToBeConfirmed
({
id
,
state
:
1
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
PublicApi
.
postOrderToBeConfirmed
({
id
,
state
:
1
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
ref
.
current
.
reload
();
}
})
...
...
@@ -180,17 +182,13 @@ const List: React.FC<listParams> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
demandExternalState
(
text
)
render
:
text
=>
<
GeneralExternalState
colorType=
{
1
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
demandInteriorState
(
text
)
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
1
}
state=
{
text
}
data=
{
interiorState
}
/>
},
columnsFn
()
]
...
...
@@ -203,7 +201,7 @@ const List: React.FC<listParams> = (props) => {
* @param {type}
* @return {type}
*/
const
handleDelete
=
(
arr
:
any
)
=>
{
const
handleDelete
=
(
arr
:
any
)
=>
{
PublicApi
.
postOrderRequisitionFormDeleteAll
({
ids
:
arr
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
...
...
@@ -241,6 +239,31 @@ const List: React.FC<listParams> = (props) => {
</
Col
>
</
Row
>
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
//查询需求单外部状态枚举列表
PublicApi
.
getOrderRequisitionFormExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 查询需求单内部状态枚举列表
PublicApi
.
getOrderRequisitionFormInteriorStateEnum
().
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/enquiryOfferConfirm/components/index.tsx
View file @
7faf08c3
This diff is collapsed.
Click to expand it.
src/pages/transaction/enquiryOfferConfirm/schema/index.tsx
View file @
7faf08c3
...
...
@@ -2,6 +2,7 @@ import { ISchema} from '@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
TimeList
,
confirmDemandQuoteExternalState
,
confirmDemandQuoteInteriorState
}
from
'../../common/statusList'
import
TranactionRoute
from
'config/routes/tranactionRoute'
import
{
PublicApi
}
from
'@/services/api'
/**
* @description: 公用
...
...
@@ -297,17 +298,27 @@ export const enquieryOfferSearchSchema: ISchema = {
},
externalState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderRequisitionFormExternalStateEnum
,
style
:
{
width
:
160
}
},
enum
:
confirmDemandQuoteExternalState
},
interiorState
:{
interiorState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'内部状态'
placeholder
:
'内部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderRequisitionFormInteriorStateEnum
,
style
:
{
width
:
160
}
},
enum
:
confirmDemandQuoteInteriorState
},
}
},
...
...
src/pages/transaction/enquirySubmit/components/index.tsx
View file @
7faf08c3
This diff is collapsed.
Click to expand it.
src/pages/transaction/enquirySubmit/enquirySearch/index.tsx
View file @
7faf08c3
...
...
@@ -10,7 +10,7 @@
* @param {type}
* @return {type}
*/
import
React
,
{
ReactNode
,
useRef
,
useState
,
useEffect
}
from
'react'
;
import
React
,
{
ReactNode
,
useRef
,
useState
,
useEffect
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
Button
,
...
...
@@ -24,7 +24,7 @@ import {
}
from
'antd'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
PlusOutlined
,
DownOutlined
,
DeleteOutlined
PlusOutlined
,
DownOutlined
,
DeleteOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
...
...
@@ -34,27 +34,29 @@ import {
}
from
'god/dist/src/standard-table/TableController'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
StatusSwitch
from
'@/components/StatusSwitch'
;
import
{
demandQuoteExternalState
,
demandQuoteInteriorState
}
from
'../../common/tableStatusList'
import
{
demandQuoteExternalState
,
demandQuoteInteriorState
}
from
'../../common/tableStatusList'
import
statuStyle
from
'../../common/colorTag'
import
NiceForm
from
'@/components/NiceForm'
;
import
{
timeRange
}
from
'@/utils/index'
import
{
filterInteriorStateList
,
filterExternalStateList
}
from
'./../../common/statusList'
import
{
timeRange
}
from
'@/utils/index'
import
{
filterInteriorStateList
,
filterExternalStateList
}
from
'./../../common/statusList'
import
moment
from
'moment'
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
PageStatus
}
from
'@/hooks/usePageStatus'
import
{
PageStatus
}
from
'@/hooks/usePageStatus'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
searchSelectGetSelectCategoryOptionEffect
}
from
'../../effect/index'
import
{
searchSelectGetSelectCategoryOptionEffect
}
from
'../../effect/index'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
enquierySchema
,
enquierySearchSchema
}
from
'../schema'
;
import
{
enquierySchema
,
enquierySearchSchema
}
from
'../schema'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
values
,
action
}
from
'mobx'
;
export
interface
listParams
{
import
GeneralExternalState
from
'@/pages/transaction/common/externalState'
;
import
GeneralInteriorState
from
'@/pages/transaction/common/interiorState'
;
export
interface
listParams
{
type
:
number
;
des
?:
string
;
}
const
formActions
=
createFormActions
();
const
List
:
React
.
FC
<
{
listParams
}
>
=
(
props
)
=>
{
const
List
:
React
.
FC
<
{
listParams
}
>
=
(
props
)
=>
{
const
ref
=
useRef
<
any
>
({})
const
[
more
,
setmore
]
=
useState
(
false
)
const
[
selectRow
,
setSelectRow
]
=
useState
([])
...
...
@@ -64,8 +66,8 @@ const List:React.FC<{listParams}> = (props) => {
}
const
fetchData
=
(
params
:
any
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getOrderRequisitionFormList
({
...
params
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
PublicApi
.
getOrderRequisitionFormList
({
...
params
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
...
...
@@ -77,112 +79,100 @@ const List:React.FC<{listParams}> = (props) => {
* @param {type} 可以根据props.type处理
* @return {type}
*/
const
handleToDetail
=
(
id
)
=>
{
const
handleToDetail
=
(
id
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/enquirySubmit/enquirySearch/preview?id=
${
id
}
`
)
}
const
columns
:
ColumnType
<
any
>
[]
=
[
const
columns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'需求单号'
,
key
:
'requisitionFormNo'
,
dataIndex
:
'requisitionFormNo'
,
align
:
'center'
,
render
:
(
text
:
any
,
records
:
any
)
=>
<
EyePreview
type=
"button"
handleClick=
{
()
=>
{
title
:
'需求单号'
,
key
:
'requisitionFormNo'
,
dataIndex
:
'requisitionFormNo'
,
align
:
'center'
,
render
:
(
text
:
any
,
records
:
any
)
=>
<
EyePreview
type=
"button"
handleClick=
{
()
=>
{
handleToDetail
(
records
.
id
)
}
}
>
{
text
}
</
EyePreview
>
},
{
title
:
'需求摘要'
,
key
:
'details'
,
dataIndex
:
'details'
,
align
:
'left'
title
:
'需求摘要'
,
key
:
'details'
,
dataIndex
:
'details'
,
align
:
'left'
},
{
title
:
'品类'
,
key
:
'category'
,
dataIndex
:
'category'
,
align
:
'left'
title
:
'品类'
,
key
:
'category'
,
dataIndex
:
'category'
,
align
:
'left'
},
{
title
:
'交付日期'
,
key
:
'deliveryTime'
,
dataIndex
:
'deliveryTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
title
:
'交付日期'
,
key
:
'deliveryTime'
,
dataIndex
:
'deliveryTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
},
{
title
:
'报价截至时间'
,
key
:
'quotationAsTime'
,
dataIndex
:
'quotationAsTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
title
:
'报价截至时间'
,
key
:
'quotationAsTime'
,
dataIndex
:
'quotationAsTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
},
{
title
:
'单据时间'
,
key
:
'voucherTime'
,
dataIndex
:
'voucherTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
title
:
'单据时间'
,
key
:
'voucherTime'
,
dataIndex
:
'voucherTime'
,
align
:
'center'
,
render
:
(
text
:
any
)
=>
format
(
text
)
},
{
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
align
:
'center'
,
filters
:
filterExternalStateList
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
externalState
===
value
,
render
:
(
text
:
any
,
reconds
)
=>
demandQuoteExternalState
(
text
)
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
colorType=
{
1
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
align
:
'left'
,
filters
:
filterInteriorStateList
,
filterMultiple
:
false
,
onFilter
:
(
value
,
record
)
=>
record
.
interiorState
===
value
,
render
:(
text
:
any
)
=>
demandQuoteInteriorState
(
text
)
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
1
}
state=
{
text
}
data=
{
interiorState
}
/>
}
]
]
useEffect
(()
=>
{
},[])
useEffect
(()
=>
{
},
[])
/**
* @description: 删除
* @param {type}
* @return {type}
*/
const
handleDelete
=
(
arr
:
number
[]
|
string
[])
=>
{
const
handleDelete
=
(
arr
:
number
[]
|
string
[])
=>
{
PublicApi
.
postOrderRequisitionFormDeleteAll
({
ids
:
arr
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
}
//提交审核
const
handleSubmit
=
(
id
)
=>
{
PublicApi
.
postOrderNewRequisitionFormAudit
({
id
:
id
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
}
const
handleSumbit
=
(
values
:
any
)
=>
{
if
(
values
.
voucherTime
)
{
const
handleSumbit
=
(
values
:
any
)
=>
{
if
(
values
.
voucherTime
)
{
values
.
startVoucherTime
=
timeRange
(
values
.
voucherTime
).
st
values
.
endVoucherTime
=
timeRange
(
values
.
voucherTime
).
et
delete
values
.
voucherTime
}
console
.
log
(
'values'
,
values
)
console
.
log
(
'values'
,
values
)
ref
.
current
.
reload
(
values
)
}
const
handleBatchDel
=
(
e
:
any
)
=>
{
const
handleBatchDel
=
(
e
:
any
)
=>
{
}
}
const
rowSelection
=
{
selectedRowKeys
:
selectedRowKeys
,
onChange
:
(
selectedRowKeys
:
any
,
selectedRows
:
any
)
=>
{
...
...
@@ -194,7 +184,32 @@ const List:React.FC<{listParams}> = (props) => {
const
controllerBtns
=
<
Row
>
<
Col
span=
{
24
}
>
</
Col
>
</
Row
>
</
Row
>
const
[
externalState
,
setExternalState
]
=
useState
<
any
>
([]);
const
[
interiorState
,
setInteriorState
]
=
useState
<
any
>
([]);
useEffect
(()
=>
{
const
external
=
new
Promise
(
resolve
=>
{
//查询需求单外部状态枚举列表
PublicApi
.
getOrderRequisitionFormExternalStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
const
interior
=
new
Promise
(
resolve
=>
{
// 查询需求单内部状态枚举列表
PublicApi
.
getOrderRequisitionFormInteriorStateEnum
().
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
})
Promise
.
all
([
external
,
interior
]).
then
(
res
=>
{
setExternalState
(
res
[
0
])
setInteriorState
(
res
[
1
])
})
},
[])
return
(
<
PageHeaderWrapper
>
...
...
@@ -202,17 +217,17 @@ const List:React.FC<{listParams}> = (props) => {
<
StandardTable
currentRef=
{
ref
}
columns=
{
columns
}
tableProps=
{
{
rowKew
:
'id'
}
}
tableProps=
{
{
rowKew
:
'id'
}
}
fetchTableData=
{
(
params
:
any
)
=>
fetchData
(
params
)
}
// rowSelection={rowSelection}
controlRender=
{
<
NiceForm
actions=
{
formActions
}
onSubmit=
{
values
=>
handleSumbit
(
values
)
}
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'requisitionFormNo'
,
FORM_FILTER_PATH
)
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'requisitionFormNo'
,
FORM_FILTER_PATH
)
FormEffectHooks
.
onFieldChange$
(
'category'
).
subscribe
(
state
=>
{
searchSelectGetSelectCategoryOptionEffect
(
actions
,
'category'
)
searchSelectGetSelectCategoryOptionEffect
(
actions
,
'category'
)
})
}
}
schema=
{
enquierySearchSchema
}
...
...
src/pages/transaction/enquirySubmit/schema/index.tsx
View file @
7faf08c3
...
...
@@ -177,6 +177,30 @@ export const enquierySearchSchema: ISchema = {
},
enum
:
TimeList
},
externalState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'外部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderRequisitionFormExternalStateEnum
,
style
:
{
width
:
160
}
},
},
interiorState
:{
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'内部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderRequisitionFormInteriorStateEnum
,
style
:
{
width
:
160
}
},
},
}
},
sumbit
:
{
...
...
src/pages/transaction/enquirySubmit/toAddSubmit/index.tsx
View file @
7faf08c3
This diff is collapsed.
Click to expand it.
src/pages/transaction/goodsOffer/addEnquiryOrder/index.tsx
View file @
7faf08c3
...
...
@@ -68,13 +68,13 @@ const AddEnquiryOrder: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/goodsOffer/components/reviewList.tsx
View file @
7faf08c3
...
...
@@ -83,13 +83,13 @@ const ReviewList: React.FC<parmas> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/goodsOffer/enquiryOrder/index.tsx
View file @
7faf08c3
import
React
,
{
useRef
,
useEffect
}
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
)
=>
{
...
...
@@ -55,19 +55,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
colorType=
{
2
}
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
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
}];
//交易能力 询价报价 询价单查询
const
fetchData
=
(
params
?:
any
)
=>
{
...
...
@@ -87,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/goodsOffer/pendingSubmit/index.tsx
View file @
7faf08c3
...
...
@@ -63,13 +63,13 @@ const PendingSubmit: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/goodsOffer/schema/index.tsx
View file @
7faf08c3
...
...
@@ -271,7 +271,7 @@ export const enquieryOfferSearchSchema: ISchema = {
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'
外
部状态'
,
placeholder
:
'
内
部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
...
...
src/pages/transaction/goodsOffer/schema/pendingReview.tsx
View file @
7faf08c3
...
...
@@ -94,7 +94,7 @@ export const pendingReviewSchema: ISchema = {
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'
外
部状态'
,
placeholder
:
'
内
部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
...
...
src/pages/transaction/inquiryQuote/addInquiryOrder/components/attached.tsx
View file @
7faf08c3
...
...
@@ -29,7 +29,7 @@ const Attached: React.FC<parmas> = (props) => {
}
// 上传回调
const
handleChange
=
({
file
})
=>
{
const
arr
:
any
=
[]
;
const
arr
:
any
=
files
;
if
(
file
.
response
)
{
if
(
file
.
response
.
code
===
1000
)
{
arr
.
push
({
...
...
@@ -38,7 +38,7 @@ const Attached: React.FC<parmas> = (props) => {
})
}
}
setFiles
([...
files
,
...
arr
])
setFiles
([...
arr
])
handleGetEnclosureUrls
(
arr
);
}
// 删除附件
...
...
src/pages/transaction/inquiryQuote/addInquiryOrder/components/flowRecord.tsx
View file @
7faf08c3
...
...
@@ -72,7 +72,7 @@ const FlowRecord: React.FC<parmas> = (props) => {
*/
const
externalTextState
=
(
text
)
=>
{
let
name
=
''
editData
.
external
InquiryList
StateResponses
.
forEach
(
element
=>
{
editData
.
external
Quotation
StateResponses
.
forEach
(
element
=>
{
if
(
element
.
state
===
text
)
{
name
=
element
.
operationalProcess
}
...
...
@@ -87,7 +87,7 @@ const FlowRecord: React.FC<parmas> = (props) => {
*/
const
interiorTextState
=
(
text
)
=>
{
let
name
=
''
editData
.
interior
RequisitionForm
StateResponses
.
forEach
(
element
=>
{
editData
.
interior
Quotation
StateResponses
.
forEach
(
element
=>
{
if
(
element
.
state
===
text
)
{
name
=
element
.
operationalProcess
}
...
...
@@ -102,14 +102,14 @@ const FlowRecord: React.FC<parmas> = (props) => {
</
Radio
.
Group
>
{
radio
===
'outer'
?
<
PolymericTable
dataSource=
{
editData
.
external
InquiryListLog
Responses
}
dataSource=
{
editData
.
external
RequisitionForm
Responses
}
columns=
{
outerColumns
}
loading=
{
false
}
pagination=
{
null
}
/>
:
<
PolymericTable
dataSource=
{
editData
.
interior
InquiryList
LogResponses
}
dataSource=
{
editData
.
interior
Quotation
LogResponses
}
columns=
{
insideColumns
}
loading=
{
false
}
pagination=
{
null
}
...
...
src/pages/transaction/inquiryQuote/addInquiryOrder/index.tsx
View file @
7faf08c3
...
...
@@ -60,13 +60,13 @@ const AddInquiryOrder: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/inquiryQuote/components/reviewList.tsx
View file @
7faf08c3
...
...
@@ -76,13 +76,13 @@ const ReviewList: React.FC<parmas> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/inquiryQuote/enquiryOrder/index.tsx
View file @
7faf08c3
...
...
@@ -56,7 +56,7 @@ const EnquiryOrder: React.FC<{}> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'操作'
,
key
:
'options'
,
...
...
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
View file @
7faf08c3
...
...
@@ -58,13 +58,13 @@ const PendingSubmit: React.FC<{}> = () => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/inquiryQuote/quoteOrder/index.tsx
View file @
7faf08c3
...
...
@@ -56,13 +56,13 @@ const EnquiryOrder: React.FC<{}> = (props) => {
title
:
'外部状态'
,
key
:
'externalState'
,
dataIndex
:
'externalState'
,
render
:
text
=>
<
GeneralExternalState
state=
{
text
}
data=
{
externalState
}
/>
render
:
text
=>
<
GeneralExternalState
colorType=
{
2
}
state=
{
text
}
data=
{
externalState
}
/>
},
{
title
:
'内部状态'
,
key
:
'interiorState'
,
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
state=
{
text
}
data=
{
interiorState
}
/>
render
:
(
text
:
any
)
=>
<
GeneralInteriorState
colorType=
{
2
}
state=
{
text
}
data=
{
interiorState
}
/>
}];
//交易能力 询价报价 询价单查询
const
fetchData
=
(
params
?:
any
)
=>
{
...
...
src/pages/transaction/inquiryQuote/schema/index.tsx
View file @
7faf08c3
...
...
@@ -493,7 +493,7 @@ export const quoteFormSearch: ISchema = {
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'
外
部状态'
,
placeholder
:
'
内
部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
...
...
src/pages/transaction/inquiryQuote/schema/pendingReview.tsx
View file @
7faf08c3
...
...
@@ -193,7 +193,7 @@ export const inquiryQuoteSchema: ISchema = {
type
:
'string'
,
"x-component"
:
'Select'
,
"x-component-props"
:{
placeholder
:
'
外
部状态'
,
placeholder
:
'
内
部状态'
,
className
:
'fixed-ant-selected-down'
,
// 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch
:
PublicApi
.
getOrderProductInquiryInteriorStateEnum
,
style
:
{
...
...
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