Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄成意
/
php_frq_api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
96d6a0e3
authored
Mar 27, 2021
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整导入报价
parent
2dab6b04
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
app/Model/QuoteModel.php
app/Model/QuoteModel.php
View file @
96d6a0e3
...
@@ -475,12 +475,12 @@ class QuoteModel extends Model
...
@@ -475,12 +475,12 @@ class QuoteModel extends Model
array_walk
(
$excel
,
function
(
$val
,
$key
)
use
(
$required
,
$required_keys
,
&
$err
)
{
array_walk
(
$excel
,
function
(
$val
,
$key
)
use
(
$required
,
$required_keys
,
&
$err
)
{
// 跳过第一条
// 跳过第一条
if
(
$key
!=
0
)
{
if
(
$key
!=
0
)
{
if
(
$val
[
'price_origin'
]
<=
0
)
{
if
(
$val
[
'
currency'
]
==
'USD'
&&
$val
[
'
price_origin'
]
<=
0
)
{
$err
[]
=
'第'
.
(
$key
+
1
)
.
'行,单价等于或小于0'
;
$err
[]
=
'第'
.
(
$key
+
1
)
.
'行,单价等于或小于0'
;
return
;
return
;
}
}
if
(
!
preg_match
(
'/^\d{0,9}(\.\d{0,6})?$/'
,
$val
[
'price_origin'
]))
{
if
(
$val
[
'currency'
]
==
'USD'
&&
!
preg_match
(
'/^\d{0,9}(\.\d{0,6})?$/'
,
$val
[
'price_origin'
]))
{
$err
[]
=
'第'
.
(
$key
+
1
)
.
'行,单价格式错误'
;
$err
[]
=
'第'
.
(
$key
+
1
)
.
'行,单价格式错误'
;
return
;
return
;
}
}
...
...
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