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
dfaafe7d
Commit
dfaafe7d
authored
Nov 03, 2020
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
b3d824d9
f1282ef6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
26 deletions
+2
-26
productModal.tsx
...ages/transaction/enquiryOffer/components/productModal.tsx
+1
-26
detail.tsx
src/pages/transaction/enquirySubmit/components/detail.tsx
+1
-0
No files found.
src/pages/transaction/enquiryOffer/components/productModal.tsx
View file @
dfaafe7d
...
...
@@ -12,7 +12,6 @@ import ModalTable from '@/components/ModalTable'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
PageStatus
,
usePageStatus
}
from
'@/hooks/usePageStatus'
import
{
ColumnType
}
from
'antd/lib/table/interface'
import
{
ISchema
}
from
'@formily/antd'
import
{
LinkOutlined
}
from
'@ant-design/icons'
const
{
TabPane
}
=
Tabs
const
{
Option
}
=
Select
...
...
@@ -233,26 +232,6 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
</
Button
>
)
const
formSearch
:
ISchema
=
{
type
:
'object'
,
properties
:
{
name
:
{
type
:
'string'
,
"x-component"
:
"Search"
,
"x-component-props"
:
{
placeholder
:
'输入关键字搜索'
}
},
roleId
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'选择会员角色'
},
enum
:
[]
}
}
}
const
placeholderText
=
'请先选择对应需求单号'
let
ButtonList
=
[
<
Button
onClick=
{
()
=>
props
.
onCancel
()
}
>
...
...
@@ -432,11 +411,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
columns=
{
columns
}
rowSelection=
{
productRowSelection
}
fetchTableData=
{
params
=>
fetchData
(
params
)
}
formilyProps=
{
{
ctx
:
{
schema
:
formSearch
}
}
}
modalType=
'productByMember'
tableProps=
{
{
rowKey
:
'id'
}
}
...
...
src/pages/transaction/enquirySubmit/components/detail.tsx
View file @
dfaafe7d
...
...
@@ -584,6 +584,7 @@ const detailInfo: React.FC<parmas> = (props) => {
</
div
>
<
Row
className=
{
style
[
'mainCol-rows'
]
}
>
{
dataInfo
.
requisitionFormAddress
&&
dataInfo
.
requisitionFormAddress
.
length
>
0
?
dataInfo
.
requisitionFormAddress
...
...
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