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
db7bf890
Commit
db7bf890
authored
Jul 08, 2021
by
高铭波
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf(order):勘察材料检验逻辑修改
parent
361c6fc7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
9 deletions
+23
-9
XhServiceMore.vue
src/components/createCom/XhServiceMore.vue
+13
-1
complete.vue
src/pages/order/complete.vue
+8
-6
material.vue
src/pages/order/material.vue
+2
-2
No files found.
src/components/createCom/XhServiceMore.vue
View file @
db7bf890
...
...
@@ -48,7 +48,19 @@ export default {
return
process
.
uniEnv
.
qn_base_url
+
"mixing.png"
;
},
arrowText
()
{
return
this
.
dataValue
&&
this
.
dataValue
.
length
>
0
?
"已选择"
:
"请选择"
;
if
(
this
.
$u
.
test
.
isEmpty
(
this
.
dataValue
))
return
"请选择"
;
if
(
this
.
item
.
fieldsName
==
"materialList"
)
{
let
hasMate
=
false
var
newData
=
this
.
dataValue
.
find
((
item
)
=>
{
if
(
!
this
.
$u
.
test
.
isEmpty
(
item
.
useLength
))
{
hasMate
=
true
return
item
.
useLength
!=
'0'
}
})
if
(
hasMate
&&
this
.
$u
.
test
.
isEmpty
(
newData
))
return
"请选择"
}
return
"已选择"
;
},
},
watch
:
{},
...
...
src/pages/order/complete.vue
View file @
db7bf890
...
...
@@ -289,6 +289,7 @@ import XhParts from "@/components/createCom/XhParts"
import
takePhoto
from
"@/components/take/index.vue"
;
import
baseFile
from
"@/components/upload/index"
;
import
Detail
from
"@/components/order/detail.vue"
;
import
returnPartsVue
from
'../parts/returnParts.vue'
;
// 表单类型map
const
formType
=
new
Map
([
...
...
@@ -676,13 +677,14 @@ export default {
panelResult
.
submitted
++
;
}
else
if
(
value
&&
Array
.
isArray
(
value
)
&&
value
.
length
>
0
)
{
if
(
ele
.
fieldsName
===
"materialList"
)
{
let
materRow
=
value
.
find
((
val
)
=>
{
return
(
val
.
hasOwnProperty
(
"useLength"
)
&&
!
this
.
$u
.
test
.
isEmpty
(
val
.
useLength
)
);
let
hasMate
=
false
let
mateRow
=
value
.
find
((
mate
)
=>
{
if
(
mate
.
hasOwnProperty
(
"useLength"
))
{
hasMate
=
true
return
!
this
.
$u
.
test
.
isEmpty
(
mate
.
useLength
)
}
});
if
(
!
this
.
$u
.
test
.
isEmpty
(
mater
Row
))
{
if
(
!
hasMate
||
!
this
.
$u
.
test
.
isEmpty
(
mate
Row
))
{
panelResult
.
submitted
++
;
}
}
else
{
...
...
src/pages/order/material.vue
View file @
db7bf890
...
...
@@ -270,9 +270,9 @@ export default {
validateForm
()
{
if
(
this
.
isMaterial
)
{
let
row
=
this
.
list
.
find
((
item
)
=>
{
return
!
this
.
$u
.
test
.
isEmpty
(
item
.
useLength
);
return
!
this
.
$u
.
test
.
isEmpty
(
item
.
useLength
)
&&
item
.
useLength
!=
'0'
;
});
if
(
this
.
$u
.
test
.
isEmpty
(
row
))
{
if
(
!
this
.
$u
.
test
.
isEmpty
(
this
.
list
)
&&
this
.
$u
.
test
.
isEmpty
(
row
))
{
this
.
$refs
.
uToast
.
show
({
title
:
"请填写电缆、漏保、空开等用量"
,
type
:
"error"
,
...
...
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