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
f4f4cb49
Commit
f4f4cb49
authored
Jan 12, 2022
by
卢均锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix : [19525] 本次对账数量需要限时不能输入负数和0
-请款金额,本次核销金额同样处理
parent
5bba90e7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
13 deletions
+34
-13
add.tsx
src/pages/balance/businessReconciliation/readyAdd/add.tsx
+22
-12
add.tsx
src/pages/balance/businessRequestFunds/admin/add.tsx
+6
-0
index.tsx
src/pages/balance/components/WriteOffDrawer/index.tsx
+6
-1
No files found.
src/pages/balance/businessReconciliation/readyAdd/add.tsx
View file @
f4f4cb49
...
...
@@ -25,6 +25,8 @@ const TABLINK = [
{
id
:
'fileLayout'
,
title
:
intl
.
formatMessage
({
id
:
'balance.fujian'
}),
},
]
const
reg
=
/
(
^
[
1-9
]{1}[
0-9
]
*$
)
|
(
^
[
0-9
]
*
\.[
0-9
]{0,3}
$
)
/
const
Add
=
()
=>
{
const
{
query
:
{
...
...
@@ -90,19 +92,21 @@ const Add = () => {
}
}]
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.beizhu'
}),
name
:
'remark'
,
placeholder
:
'请输入对备注'
,
rules
:
[
{
validator
:
(
_
,
value
)
=>
{
let
_str
=
value
;
_str
=
_str
.
replace
(
/
[\u
4E00-
\u
9FA5
]
/g
,
"AA"
);
if
(
value
.
length
>
60
*
2
)
{
return
Promise
.
reject
(
new
Error
(
`
${
intl
.
formatMessage
({
id
:
'detail.purchase.tips19'
})}${
60
*
2
}${
intl
.
formatMessage
({
id
:
'detail.purchase.tips20'
})}
`
))
}
else
{
return
Promise
.
resolve
();
{
label
:
intl
.
formatMessage
({
id
:
'balance.beizhu'
}),
name
:
'remark'
,
placeholder
:
'请输入对备注'
,
rules
:
[
{
validator
:
(
_
,
value
)
=>
{
let
_str
=
value
;
_str
=
_str
.
replace
(
/
[\u
4E00-
\u
9FA5
]
/g
,
"AA"
);
if
(
value
.
length
>
60
*
2
)
{
return
Promise
.
reject
(
new
Error
(
`
${
intl
.
formatMessage
({
id
:
'detail.purchase.tips19'
})}${
60
*
2
}${
intl
.
formatMessage
({
id
:
'detail.purchase.tips20'
})}
`
))
}
else
{
return
Promise
.
resolve
();
}
}
}
}
]
},
]
},
]
const
basicFormColRight
=
[
...
...
@@ -281,7 +285,13 @@ const Add = () => {
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'balance.qingshuruduizhangshuliang'
})
},
{
validator
:
(
_
,
value
)
=>
{
return
value
>
record
.
reconciliationQuantity
?
Promise
.
reject
(
new
Error
(
'不能大于待对账数量'
))
:
Promise
.
resolve
()
if
(
!
reg
.
test
(
value
))
{
return
Promise
.
reject
(
new
Error
(
'数量需要大于0'
))
}
if
(
value
>
record
.
reconciliationQuantity
){
return
Promise
.
reject
(
new
Error
(
'不能大于待对账数量'
))
}
return
Promise
.
resolve
()
}
},
]
}
...
...
src/pages/balance/businessRequestFunds/admin/add.tsx
View file @
f4f4cb49
...
...
@@ -43,6 +43,9 @@ const TABLINK = [
{
id
:
'billLayout'
,
title
:
'请款明细'
},
]
const
reg
=
/
(
^
[
1-9
]{1}[
0-9
]
*$
)
|
(
^
[
0-9
]
*
\.[
0-9
]{0,3}
$
)
/
const
createMonthOrDays
=
(
number
:
number
,
type
:
string
)
=>
{
let
_list
=
[];
for
(
let
i
=
1
;
i
<=
number
;
i
++
)
{
...
...
@@ -510,6 +513,9 @@ const Add = () => {
rules=
{
[
{
validator
:
(
_
,
value
)
=>
{
if
(
!
reg
.
test
(
value
))
{
return
Promise
.
reject
(
new
Error
(
'请款金额需要大于0'
))
}
if
(
value
>
(
record
.
billAmount
-
record
.
paid
-
record
.
appliedUnpaid
))
{
return
Promise
.
reject
(
new
Error
(
'请款金额不能超过单据金额减去已付款及已请款待付款的和'
))
}
...
...
src/pages/balance/components/WriteOffDrawer/index.tsx
View file @
f4f4cb49
...
...
@@ -16,6 +16,8 @@ interface WriteOffDrawerProps {
onOk
?:
(
rows
:
any
[])
=>
void
}
const
intl
=
getIntl
();
const
reg
=
/
(
^
[
1-9
]{1}[
0-9
]
*$
)
|
(
^
[
0-9
]
*
\.[
0-9
]{0,3}
$
)
/
const
WriteOffDrawer
:
React
.
FC
<
WriteOffDrawerProps
>
=
(
props
:
WriteOffDrawerProps
)
=>
{
const
{
visible
,
record
,
editAble
=
false
,
onClose
,
onOk
}
=
props
;
const
ref
=
useRef
<
any
>
({})
...
...
@@ -119,7 +121,10 @@ const WriteOffDrawer: React.FC<WriteOffDrawerProps> = (props: WriteOffDrawerProp
rules=
{
[
{
validator
:
(
_
,
value
)
=>
{
return
value
>
record
.
canWriteAmount
?
Promise
.
reject
(
new
Error
(
'可以核销金额'
))
:
Promise
.
resolve
()
if
(
!
reg
.
test
(
value
))
{
return
Promise
.
reject
(
new
Error
(
'本次核销金额需要大于0'
))
}
return
value
>
record
.
canWriteAmount
?
Promise
.
reject
(
new
Error
(
'本次核销金额不能大于可以核销金额'
))
:
Promise
.
resolve
()
}
},
]
}
...
...
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