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
9264a81d
Commit
9264a81d
authored
Jul 08, 2021
by
高铭波
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf(order):勘查材料金额计算逻辑修改
parent
2023fc1c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
113 deletions
+33
-113
complete.vue
src/pages/order/complete.vue
+19
-18
material.vue
src/pages/order/material.vue
+14
-95
No files found.
src/pages/order/complete.vue
View file @
9264a81d
...
@@ -673,16 +673,19 @@ export default {
...
@@ -673,16 +673,19 @@ export default {
if
(
value
&&
!
Array
.
isArray
(
value
))
{
if
(
value
&&
!
Array
.
isArray
(
value
))
{
panelResult
.
submitted
++
;
panelResult
.
submitted
++
;
}
else
if
(
value
&&
Array
.
isArray
(
value
)
&&
value
.
length
>
0
)
{
}
else
if
(
value
&&
Array
.
isArray
(
value
)
&&
value
.
length
>
0
)
{
if
(
ele
.
fieldsName
===
'materialList'
)
{
if
(
ele
.
fieldsName
===
"materialList"
)
{
let
materRow
=
value
.
find
((
val
)
=>
{
let
materRow
=
value
.
find
((
val
)
=>
{
return
val
.
useLength
>
0
return
(
})
val
.
hasOwnProperty
(
"useLength"
)
&&
if
(
!
this
.
$u
.
test
.
isEmpty
(
materRow
))
{
!
this
.
$u
.
test
.
isEmpty
(
val
.
useLength
)
panelResult
.
submitted
++
;
)
;
}
});
}
else
{
if
(
!
this
.
$u
.
test
.
isEmpty
(
materRow
))
{
panelResult
.
submitted
++
;
panelResult
.
submitted
++
;
}
}
}
else
{
panelResult
.
submitted
++
;
}
}
else
if
(
first
)
{
}
else
if
(
first
)
{
// 记录第一个 为空 并且需要必填的项 用于定位
// 记录第一个 为空 并且需要必填的项 用于定位
first
=
false
;
first
=
false
;
...
@@ -861,16 +864,14 @@ export default {
...
@@ -861,16 +864,14 @@ export default {
let
amount
=
0
;
let
amount
=
0
;
if
(
arr
)
{
if
(
arr
)
{
arr
.
forEach
((
item
)
=>
{
arr
.
forEach
((
item
)
=>
{
if
(
let
useLength
=
Number
(
item
.
useLength
)
&&
(
item
.
hasOwnProperty
(
"useLength"
)
&&
Number
(
item
.
useLength
))
||
0
;
Number
(
item
.
freeLength
)
&&
let
freeLength
=
Number
(
item
.
unitAmt
)
(
item
.
hasOwnProperty
(
"freeLength"
)
&&
Number
(
item
.
freeLength
))
||
0
;
)
{
let
unitAmt
=
amount
+=
(
item
.
hasOwnProperty
(
"unitAmt"
)
&&
Number
(
item
.
unitAmt
))
||
0
;
Math
.
max
(
Number
(
item
.
useLength
)
-
Number
(
item
.
freeLength
),
0
)
*
amount
+=
Math
.
max
(
useLength
-
freeLength
,
0
)
*
unitAmt
;
Number
(
item
.
unitAmt
);
if
(
item
.
hasOwnProperty
(
"extraAmt"
)
&&
Number
(
item
.
extraAmt
))
{
}
if
(
Number
(
item
.
extraAmt
))
{
amount
+=
Number
(
item
.
extraAmt
);
amount
+=
Number
(
item
.
extraAmt
);
}
}
});
});
...
...
src/pages/order/material.vue
View file @
9264a81d
...
@@ -175,15 +175,10 @@ export default {
...
@@ -175,15 +175,10 @@ export default {
// 总额
// 总额
var
amount
=
0
;
var
amount
=
0
;
for
(
var
item
of
this
.
list
)
{
for
(
var
item
of
this
.
list
)
{
if
(
let
useLength
=
Number
(
item
.
useLength
)
||
0
;
this
.
$u
.
test
.
number
(
item
.
useLength
)
&&
let
freeLength
=
Number
(
item
.
freeLength
)
||
0
;
this
.
$u
.
test
.
number
(
item
.
freeLength
)
&&
let
unitAmt
=
Number
(
item
.
unitAmt
)
||
0
;
this
.
$u
.
test
.
number
(
item
.
unitAmt
)
amount
+=
Math
.
max
(
useLength
-
freeLength
,
0
)
*
unitAmt
;
)
{
amount
+=
Math
.
max
(
Number
(
item
.
useLength
)
-
Number
(
item
.
freeLength
),
0
)
*
Number
(
item
.
unitAmt
);
}
}
}
for
(
var
item
of
this
.
other
)
{
for
(
var
item
of
this
.
other
)
{
if
(
item
.
extraAmt
&&
Number
(
item
.
extraAmt
))
{
if
(
item
.
extraAmt
&&
Number
(
item
.
extraAmt
))
{
...
@@ -218,80 +213,6 @@ export default {
...
@@ -218,80 +213,6 @@ export default {
self
.
formatServiceMoreList
(
data
);
self
.
formatServiceMoreList
(
data
);
}
}
});
});
this
.
list
=
[
{
matType
:
"02"
,
priceType
:
"01"
,
matName
:
"开孔厚40cm以上,直径11cm以下"
,
matUnit
:
"个"
,
freeLength
:
0
,
unitAmt
:
10
,
useLength
:
0
,
},
{
matType
:
"02"
,
priceType
:
"01"
,
matName
:
"验收完成后移动安装地点"
,
matUnit
:
"次"
,
freeLength
:
0
,
unitAmt
:
20
,
useLength
:
0
,
},
{
matType
:
"02"
,
priceType
:
"01"
,
matName
:
"北京地区报装"
,
matUnit
:
"次"
,
freeLength
:
0
,
unitAmt
:
30
,
useLength
:
0
,
},
{
matType
:
"02"
,
priceType
:
"01"
,
matName
:
"墙面开墙及恢复"
,
matUnit
:
"米"
,
freeLength
:
0
,
unitAmt
:
40
,
useLength
:
0
,
},
{
matType
:
"02"
,
priceType
:
"01"
,
matName
:
"安装位置单次往返经销商距离"
,
matUnit
:
"千米"
,
freeLength
:
0
,
unitAmt
:
50
,
useLength
:
0
,
},
{
matType
:
"02"
,
priceType
:
"01"
,
matName
:
"开孔厚40cm以上,直径11cm以下"
,
matUnit
:
"个"
,
freeLength
:
1
,
unitAmt
:
60
,
useLength
:
0
,
},
{
matType
:
"02"
,
priceType
:
"01"
,
matName
:
"桥架50mm*50mm"
,
matUnit
:
"米"
,
freeLength
:
2
,
unitAmt
:
70
,
useLength
:
0
,
},
{
matType
:
"02"
,
priceType
:
"01"
,
matName
:
"铺装庭院开挖(复合材料)"
,
matUnit
:
"米"
,
freeLength
:
3
,
unitAmt
:
220
,
useLength
:
0
,
},
];
},
},
created
()
{},
created
()
{},
mounted
()
{},
mounted
()
{},
...
@@ -348,8 +269,8 @@ export default {
...
@@ -348,8 +269,8 @@ export default {
},
},
validateForm
()
{
validateForm
()
{
if
(
this
.
isMaterial
)
{
if
(
this
.
isMaterial
)
{
let
row
=
this
.
list
.
find
((
item
,
index
)
=>
{
let
row
=
this
.
list
.
find
((
item
)
=>
{
return
item
.
useLength
!=
0
;
return
!
this
.
$u
.
test
.
isEmpty
(
item
.
useLength
)
;
});
});
if
(
this
.
$u
.
test
.
isEmpty
(
row
))
{
if
(
this
.
$u
.
test
.
isEmpty
(
row
))
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
...
@@ -367,19 +288,17 @@ export default {
...
@@ -367,19 +288,17 @@ export default {
if
(
!
this
.
validateForm
())
{
if
(
!
this
.
validateForm
())
{
return
false
;
return
false
;
}
}
for
(
let
item
of
this
.
other
)
{
if
(
this
.
other
.
length
>
1
&&
!
item
.
otherExplain
)
{
this
.
$refs
.
uToast
.
show
({
title
:
"请输入其他项说明"
,
type
:
"warning"
,
});
return
;
}
}
let
pages
=
getCurrentPages
();
let
pages
=
getCurrentPages
();
let
prevPage
=
pages
[
pages
.
length
-
2
];
//上一个页面
let
prevPage
=
pages
[
pages
.
length
-
2
];
//上一个页面
let
data
=
{};
let
data
=
{};
data
[
this
.
fieldName
]
=
this
.
list
.
concat
(
this
.
other
);
// 将list合并给上以页面
let
tmps
=
[];
this
.
other
.
map
((
item
)
=>
{
if
(
!
this
.
$u
.
test
.
isEmpty
(
item
.
otherExplain
))
{
item
.
extraAmt
=
item
.
extraAmt
||
0
;
tmps
.
push
(
item
);
}
});
data
[
this
.
fieldName
]
=
this
.
list
.
concat
(
tmps
);
// 将list合并给上以页面
prevPage
.
$vm
.
setData
(
data
);
//直接调用上一个页面的setData()方法,把数据存到上一个页面中去
prevPage
.
$vm
.
setData
(
data
);
//直接调用上一个页面的setData()方法,把数据存到上一个页面中去
uni
.
navigateBack
();
uni
.
navigateBack
();
},
},
...
...
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