Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
b2535702
Commit
b2535702
authored
Mar 18, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
00313c54
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
138 deletions
+4
-138
index.tsx
src/components/DrawerTable/index.tsx
+1
-1
index.tsx
...t/tender/addBidRegister/components/ProjectModal/index.tsx
+0
-134
index.tsx
src/pages/procurement/tender/addBidRegister/index.tsx
+0
-0
index.tsx
...tender/addTender/components/relateProductDrawer/index.tsx
+1
-1
index.tsx
src/pages/procurement/tender/firstCheckedTender/index.tsx
+1
-1
index.tsx
src/pages/procurement/tender/secondCheckedTender/index.tsx
+1
-1
No files found.
src/components/DrawerTable/index.tsx
View file @
b2535702
...
@@ -97,7 +97,7 @@ const DrawerTable:React.FC<DrawerTableProps> = (props) => {
...
@@ -97,7 +97,7 @@ const DrawerTable:React.FC<DrawerTableProps> = (props) => {
<
Col
span=
{
24
}
>
<
Col
span=
{
24
}
>
<
Space
size=
{
[
16
,
0
]
}
>
<
Space
size=
{
[
16
,
0
]
}
>
<
Button
type=
"primary"
onClick=
{
onClick
}
>
保存
</
Button
>
<
Button
type=
"primary"
onClick=
{
onClick
}
>
保存
</
Button
>
<
Button
>
取消
</
Button
>
<
Button
onClick=
{
cancel
}
>
取消
</
Button
>
</
Space
>
</
Space
>
</
Col
>
</
Col
>
</
Row
>
</
Row
>
...
...
src/pages/procurement/tender/addBidRegister/components/ProjectModal/index.tsx
deleted
100644 → 0
View file @
00313c54
import
React
,
{
useEffect
}
from
'react'
import
{
ISchemaFormActions
,
ISchemaFormAsyncActions
}
from
'@formily/antd'
import
{
useModalTable
}
from
'../../model/useModalTable'
import
ModalTable
from
'@/components/ModalTable'
import
{
columnsSetMember
}
from
'../../constant'
import
{
PublicApi
}
from
'@/services/api'
import
{
formSearch
}
from
'../../schema/modal'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
ModalSearch
from
'@/components/NiceForm/components/Search'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
{
PageStatus
,
usePageStatus
}
from
'@/hooks/usePageStatus'
import
{
clearModalParams
}
from
'@/utils'
import
DrawerTable
from
'@/components/DrawerTable'
export
interface
MemberModalProps
{
type
?:
'radio'
|
'checkbox'
,
schemaAction
:
ISchemaFormActions
|
ISchemaFormAsyncActions
,
currentRef
?:
any
,
}
const
ProjectModal
:
React
.
FC
<
MemberModalProps
>
=
(
props
)
=>
{
const
{
type
=
"checkbox"
,
schemaAction
,
currentRef
,
...
restProps
}
=
props
const
{
visible
,
setVisible
,
rowSelection
,
rowSelectionCtl
,
}
=
useModalTable
({
type
,
customKey
:
"memberId"
})
const
{
id
,
preview
,
pageStatus
}
=
usePageStatus
()
useEffect
(()
=>
{
if
(
currentRef
)
{
currentRef
.
current
=
{
setVisible
,
visible
,
rowSelectionCtl
}
}
},
[])
// 添加会员
const
handleOkAddMember
=
()
=>
{
setVisible
(
false
)
if
(
pageStatus
===
PageStatus
.
EDIT
)
{
schemaAction
.
setFieldState
(
'commodityMemberList'
,
state
=>
{
state
.
isDelete
=
true
})
let
hasMember
:
any
=
schemaAction
.
getFieldValue
(
'commodityMemberList'
)
||
[]
schemaAction
.
setFieldValue
(
'commodityMemberList'
,
hasMember
.
concat
(
rowSelectionCtl
.
selectRow
))
rowSelectionCtl
.
setSelectedRowKeys
([])
rowSelectionCtl
.
setSelectRow
([])
}
else
{
schemaAction
.
setFieldValue
(
'commodityMemberList'
,
rowSelectionCtl
.
selectRow
)
schemaAction
.
setFieldState
(
'commodityMemberList'
,
state
=>
{
state
.
dataSource
=
rowSelectionCtl
.
selectRow
})
}
clearModalParams
()
}
const
handleCancelAddMember
=
()
=>
{
setVisible
(
false
)
clearModalParams
()
}
const
fetchMemberList
=
async
(
params
)
=>
{
const
excludeIds
=
await
PublicApi
.
getProductCommodityGetStrategyMemberByCommodityId
({
commodityId
:
schemaAction
.
getFieldValue
(
"productId"
)},
{
ctlType
:
'none'
})
let
checkedMember
=
schemaAction
.
getFieldValue
(
'commodityMemberList'
)
if
(
schemaAction
.
getFieldState
(
'commodityMemberList'
).
isDelete
)
{
params
.
excludeList
=
checkedMember
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
roleId
:
item
.
roleId
,
}))
}
else
{
params
.
excludeList
=
excludeIds
.
data
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
roleId
:
item
.
memberRoleId
,
}))
}
const
res
=
await
PublicApi
.
postMemberManageLowerConsumerPage
(
params
,
{
ctlType
:
'none'
});
return
res
.
data
}
return
(
<
ModalTable
modalTitle=
'选择项目'
confirm=
{
handleOkAddMember
}
cancel=
{
handleCancelAddMember
}
visible=
{
visible
}
columns=
{
columnsSetMember
}
rowSelection=
{
rowSelection
}
fetchTableData=
{
params
=>
fetchMemberList
(
params
)
}
formilyProps=
{
{
ctx
:
{
schema
:
formSearch
,
components
:
{
ModalSearch
,
Submit
,
},
effects
:
(
$
,
actions
)
=>
{
actions
.
reset
()
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'name'
,
FORM_FILTER_PATH
,
);
},
}
}
}
resetModal=
{
{
destroyOnClose
:
true
}
}
tableProps=
{
{
rowKey
:
'memberId'
}
}
/>
)
}
ProjectModal
.
defaultProps
=
{}
export
default
ProjectModal
src/pages/procurement/tender/addBidRegister/index.tsx
View file @
b2535702
This diff is collapsed.
Click to expand it.
src/pages/procurement/tender/addTender/components/relateProductDrawer/index.tsx
View file @
b2535702
...
@@ -184,7 +184,7 @@ export const RelevanceTenderProduct:React.FC<RelateProductDrawerProps> = ({
...
@@ -184,7 +184,7 @@ export const RelevanceTenderProduct:React.FC<RelateProductDrawerProps> = ({
actions=
{
formActions
}
actions=
{
formActions
}
// effects={($, ctx) => {
// effects={($, ctx) => {
// $('onFormMount').subscribe(() => {
// $('onFormMount').subscribe(() => {
//
ctx.setFieldValue('tenderProduct', {a: 1, b: 2, c: 'ds'})
//
// })
// })
// }}
// }}
schema=
{
relevanceSchema
}
schema=
{
relevanceSchema
}
...
...
src/pages/procurement/tender/firstCheckedTender/index.tsx
View file @
b2535702
...
@@ -37,7 +37,7 @@ const FirstCheckedTender:React.FC<FirstCheckedTenderProps> = (props) => {
...
@@ -37,7 +37,7 @@ const FirstCheckedTender:React.FC<FirstCheckedTenderProps> = (props) => {
const
handleSubmitBatch
=
async
()
=>
{
const
handleSubmitBatch
=
async
()
=>
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
)
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
)
{
message
.
error
(
'请先勾选
订单
'
)
message
.
error
(
'请先勾选
单据
'
)
return
;
return
;
}
}
const
canBitch
=
!
rowSelectionCtl
.
selectRow
.
some
(
v
=>
v
.
interiorState
!==
PurchaseOrderInsideWorkState
.
ONE_LEVEL_AUDIT_ORDER
)
const
canBitch
=
!
rowSelectionCtl
.
selectRow
.
some
(
v
=>
v
.
interiorState
!==
PurchaseOrderInsideWorkState
.
ONE_LEVEL_AUDIT_ORDER
)
...
...
src/pages/procurement/tender/secondCheckedTender/index.tsx
View file @
b2535702
...
@@ -37,7 +37,7 @@ const SecondCheckedTender:React.FC<SecondCheckedTenderProps> = (props) => {
...
@@ -37,7 +37,7 @@ const SecondCheckedTender:React.FC<SecondCheckedTenderProps> = (props) => {
const
handleSubmitBatch
=
async
()
=>
{
const
handleSubmitBatch
=
async
()
=>
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
)
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
)
{
message
.
error
(
'请先勾选
订单
'
)
message
.
error
(
'请先勾选
单据
'
)
return
;
return
;
}
}
const
canBitch
=
!
rowSelectionCtl
.
selectRow
.
some
(
v
=>
v
.
interiorState
!==
PurchaseOrderInsideWorkState
.
ONE_LEVEL_AUDIT_ORDER
)
const
canBitch
=
!
rowSelectionCtl
.
selectRow
.
some
(
v
=>
v
.
interiorState
!==
PurchaseOrderInsideWorkState
.
ONE_LEVEL_AUDIT_ORDER
)
...
...
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