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
2c8cd070
Commit
2c8cd070
authored
Apr 07, 2022
by
前端-彭佳文
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2-220418' into 'v2-220418'
V2 220418 See merge request linkseeks-design/pro-platform!149
parents
e2316c0e
5791af8e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
9 deletions
+20
-9
index.tsx
src/pages/priceManage/priceLibrary/index.tsx
+11
-7
index.tsx
src/pages/transaction/stockSellStorage/bills/index.tsx
+8
-1
index.ts
...Storage/billsType/components/BillTypeForm/schema/index.ts
+1
-1
No files found.
src/pages/priceManage/priceLibrary/index.tsx
View file @
2c8cd070
...
...
@@ -84,12 +84,8 @@ const PriceLibrary: React.FC<{}> = () => {
id
:
'priceManage.priceStrategy.columns.currency'
,
})
}
defaultValue=
{
text
}
onPressEnter=
{
(
e
:
any
)
=>
updatePrice
({
goodsPriceId
:
record
.
id
,
marketPrice
:
e
.
target
.
value
,
})
}
onBlur=
{
(
e
:
any
)
=>
updatePrice
(
record
,
e
)
}
onPressEnter=
{
(
e
:
any
)
=>
updatePrice
(
record
,
e
)
}
/>
);
},
...
...
@@ -174,7 +170,15 @@ const PriceLibrary: React.FC<{}> = () => {
`
${
history
.
location
.
pathname
}
/detail?goodsPriceId=
${
record
.
id
}
`
,
);
};
const
updatePrice
=
params
=>
{
const
updatePrice
=
(
record
,
e
)
=>
{
const
val
=
e
.
target
.
value
;
if
(
!
val
||
val
===
record
.
marketPrice
)
{
return
;
}
const
params
=
{
goodsPriceId
:
record
.
id
,
marketPrice
:
val
,
};
getProductPriceManagementAddGoodsPrice
(
params
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
message
.
success
(
res
.
message
);
...
...
src/pages/transaction/stockSellStorage/bills/index.tsx
View file @
2c8cd070
import
React
,
{
useState
,
useRef
,
useEffect
}
from
'react'
;
import
{
getIntl
,
history
}
from
'umi'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
Button
,
Card
,
Dropdown
,
Menu
,
Space
,
Badge
,
Popconfirm
}
from
'antd'
;
import
{
Button
,
Card
,
Dropdown
,
Menu
,
Space
,
Badge
,
Popconfirm
,
message
}
from
'antd'
;
import
{
PlusOutlined
,
DownOutlined
,
...
...
@@ -98,9 +98,16 @@ const Bills: React.FC<{}> = () => {
postProductInvoicesBatchReview
({
ids
,
reviewType
,
},
{
ctlType
:
'none'
,
})
.
then
(
res
=>
{
if
(
res
.
code
!==
1000
)
{
if
(
res
.
code
===
9999
)
{
message
.
info
(
res
.
message
)
}
else
{
message
.
info
(
intl
.
formatMessage
({
id
:
`
${
res
.
code
}
`
,
defaultMessage
:
res
.
message
}))
}
return
;
}
if
(
callback
)
{
...
...
src/pages/transaction/stockSellStorage/billsType/components/BillTypeForm/schema/index.ts
View file @
2c8cd070
...
...
@@ -47,8 +47,8 @@ export const billsTypeDetailSchema: ISchema = {
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.zuichang20gezifu10ge'
}),
},
required
:
true
,
'x-rules'
:
[
{
required
:
true
},
{
limitByte
:
true
,
// 自定义校验规则
maxByte
:
20
,
...
...
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