Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
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
李俊赕
self-support
Commits
d72ab46b
Commit
d72ab46b
authored
Jul 01, 2021
by
Damon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 材料工艺金额计算
parent
14aec756
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
complete.vue
src/pages/order/complete.vue
+7
-6
material.vue
src/pages/order/material.vue
+1
-3
No files found.
src/pages/order/complete.vue
View file @
d72ab46b
...
...
@@ -644,12 +644,13 @@
let
amount
=
0
if
(
arr
){
arr
.
forEach
(
item
=>
{
if
(
Number
(
item
.
useLength
)
&&
Number
(
item
.
freeLength
)
&&
Number
(
item
.
unitAmt
))
{
amount
+=
Math
.
max
(
Number
(
item
.
useLength
)
-
Number
(
item
.
freeLength
),
0
)
*
Number
(
item
.
unitAmt
)
}
if
(
Number
(
item
.
extraAmt
)){
amount
+=
Number
(
item
.
extraAmt
)
}
const
useLength
=
Number
(
item
.
useLength
)
||
0
const
freeLength
=
Number
(
item
.
freeLength
)
||
0
const
unitAmt
=
Number
(
item
.
unitAmt
)
||
0
amount
+=
Math
.
max
(
useLength
-
freeLength
,
0
)
*
unitAmt
if
(
item
.
extraAmt
)
{
amount
+=
Number
(
item
.
extraAmt
)
}
})
}
return
amount
...
...
src/pages/order/material.vue
View file @
d72ab46b
...
...
@@ -107,9 +107,7 @@
money
()
{
// 总额
var
amount
=
0
for
(
var
item
of
this
.
list
)
{
if
(
Number
(
item
.
useLength
)
&&
Number
(
item
.
freeLength
)
&&
Number
(
item
.
unitAmt
))
{
amount
+=
Math
.
max
(
Number
(
item
.
useLength
)
-
Number
(
item
.
freeLength
),
0
)
*
Number
(
item
.
unitAmt
)
}
amount
+=
Math
.
max
(
Number
(
item
.
useLength
)
-
Number
(
item
.
freeLength
),
0
)
*
Number
(
item
.
unitAmt
)
}
for
(
var
item
of
this
.
other
)
{
if
(
item
.
extraAmt
&&
Number
(
item
.
extraAmt
))
{
...
...
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