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
9501ae3e
Commit
9501ae3e
authored
May 10, 2022
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2-220518-order' into 'v2-220518'
fix: 修复采购订单bug See merge request linkseeks-design/pro-platform!666
parents
c2e9d6f4
0d80f74b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
3 deletions
+35
-3
plus.png
...transaction/purchaseOrder/orderCollectSrm/images/plus.png
+0
-0
useMaterialTable.tsx
.../purchaseOrder/orderCollectSrm/model/useMaterialTable.tsx
+34
-2
index.ts
...transaction/purchaseOrder/orderCollectSrm/schema/index.ts
+1
-1
No files found.
src/pages/transaction/purchaseOrder/orderCollectSrm/images/plus.png
0 → 100644
View file @
9501ae3e
444 Bytes
src/pages/transaction/purchaseOrder/orderCollectSrm/model/useMaterialTable.tsx
View file @
9501ae3e
import
React
,
{
useRef
,
useState
}
from
'react'
import
{
ISchemaFormActions
,
ISchemaFormAsyncActions
}
from
'@formily/antd'
;
import
{
Button
,
message
}
from
'antd'
;
import
{
Button
,
Image
,
message
}
from
'antd'
;
import
{
materialInfoColumns
,
materialInfoColumnsByRequisition
}
from
'../constant'
;
import
MaterialTableCell
,
{
MaterialEditableRow
}
from
'../components/materialTableCell'
;
import
{
useModalTable
}
from
'./useModalTable'
;
...
...
@@ -8,6 +8,7 @@ import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
import
{
useIntl
}
from
'umi'
;
import
{
OrderModalType
}
from
'@/constants/order'
;
import
{
RequisitionModalTableRef
}
from
'../components/requisitionModalTable'
;
import
plusIcon
from
'../images/plus.png'
;
// 对象按key排序(运用于商城传过来的阶梯价格排序)
export
const
sortByKey
=
(
params
)
=>
{
...
...
@@ -101,7 +102,38 @@ export const useMaterialTable = (
}
}
const
materialAddButton
=
<
Button
onClick=
{
handleShowMaterial
}
block
type=
'default'
style=
{
{
margin
:
'24px auto'
}
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.orderCollect.requisition.button'
})
}
</
Button
>
const
materialAddButton
=
(()
=>
{
const
buttonStyles
:
React
.
CSSProperties
=
{
display
:
'flex'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
height
:
32
,
margin
:
'24px auto'
,
color
:
'#5C626A'
,
fontSize
:
12
,
background
:
'#FAFBFC'
,
border
:
'1px solid #EDEEEF'
,
borderRadius
:
'4px'
,
}
return
(
<
Button
type=
"default"
block
style=
{
{...
buttonStyles
}
}
onClick=
{
handleShowMaterial
}
>
<
img
src=
{
plusIcon
}
style=
{
{
width
:
16
,
height
:
16
,
marginRight
:
'8px'
,
}
}
/>
选择物料
</
Button
>
)
})()
const
materialComponents
=
{
body
:
{
row
:
MaterialEditableRow
,
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/schema/index.ts
View file @
9501ae3e
...
...
@@ -268,7 +268,7 @@ const submitInfo: ISchema = {
showTime
:
true
,
format
:
'YYYY-MM-DD HH:mm'
,
disabledDate
:
current
=>
{
return
current
&&
current
<
moment
().
startOf
(
'
day
'
)
return
current
&&
current
<
moment
().
startOf
(
'
m
'
)
}
}
},
...
...
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