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
d8da3d03
Commit
d8da3d03
authored
Apr 22, 2022
by
rainbowmorel@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文案
parent
5676bae6
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
harver-material.tsx
src/pages/order/assets/context/harver-material.tsx
+2
-2
add.tsx
src/pages/order/deliveryNotice/create/add.tsx
+12
-3
details.tsx
src/pages/order/receivingNote/deliveryNoteManage/details.tsx
+1
-1
No files found.
src/pages/order/assets/context/harver-material.tsx
View file @
d8da3d03
...
...
@@ -39,13 +39,13 @@ export function HarvestMaterialInput(props: {
}
// 存在小数点 且 字符串必须大于 . +1 才执行
if
(
targetVal
.
includes
(
'.'
)
&&
targetVal
.
length
!=
targetVal
.
indexOf
(
'.'
))
{
const
reg
=
new
RegExp
(
"((^[
1
-9][0-9]{0,8})+(.?[0-9]{1,3})?$)"
)
const
reg
=
new
RegExp
(
"((^[
0
-9][0-9]{0,8})+(.?[0-9]{1,3})?$)"
)
const
test
=
reg
.
test
(
targetVal
)
if
(
!
test
)
{
return
;
}
}
else
{
const
reg
=
new
RegExp
(
"((^[
1
-9][0-9]{0,8})+(.?[0-9]{1,3})?$)"
)
const
reg
=
new
RegExp
(
"((^[
0
-9][0-9]{0,8})+(.?[0-9]{1,3})?$)"
)
const
test
=
reg
.
test
(
targetVal
)
if
(
!
test
)
{
return
;
...
...
src/pages/order/deliveryNotice/create/add.tsx
View file @
d8da3d03
...
...
@@ -261,16 +261,25 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</
Radio
.
Group
>
</
FormItem
>
<
FormItem
hidden=
{
isLogistics
}
label=
{
LogisticsCarNoLabel
}
name=
"executorVO.carNumbers"
>
<
Input
maxLength=
{
20
}
/>
<
FormItem
rules=
{
[
{
max
:
20
,
message
:
"最长20个字符"
}
]
}
hidden=
{
isLogistics
}
label=
{
LogisticsCarNoLabel
}
name=
"executorVO.carNumbers"
>
<
Input
/>
</
FormItem
>
<
FormItem
hidden=
{
isLogistics
}
label=
{
LogisticsCompanyLabel
}
name=
"logisticsCompanyInt"
>
<
LogisticsCompanyMerchantsSelect
/>
</
FormItem
>
<
FormItem
rules=
{
[
{
max
:
20
,
message
:
"最长20个字符"
}
]
}
hidden=
{
isLogistics
}
label=
{
LogisticsNoLabel
}
name=
"logisticsNo"
>
<
Input
maxLength=
{
20
}
/>
<
Input
/>
</
FormItem
>
</
ContentBox
>
...
...
src/pages/order/receivingNote/deliveryNoteManage/details.tsx
View file @
d8da3d03
...
...
@@ -77,7 +77,7 @@ const DeliveryNoteManageDetails: React.FC = () => {
{
info
?.
buyerMemberName
}
</
ListInfoItem
>
<
ListInfoItem
label=
'
送
货单摘要'
>
<
ListInfoItem
label=
'
收
货单摘要'
>
{
info
?.
digest
}
</
ListInfoItem
>
...
...
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