Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
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
TFMOM
TF-MOM-WEB
Commits
a1fd0407
Commit
a1fd0407
authored
Jan 04, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
三期入库明细新增列表接口参数修改为器材编码模糊查询
parent
5fa88e21
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
6 deletions
+28
-6
index.vue
...ts/components/AddPutStorageMaterialDetailDialog/index.vue
+7
-3
index.vue
...s/src/privateComponents/components/materialType/index.vue
+21
-3
No files found.
applications/dee-mes/src/privateComponents/components/AddPutStorageMaterialDetailDialog/index.vue
View file @
a1fd0407
...
@@ -33,6 +33,10 @@ export default {
...
@@ -33,6 +33,10 @@ export default {
basicData
:
{
basicData
:
{
type
:
Object
,
type
:
Object
,
default
:
()
=>
{}
default
:
()
=>
{}
},
parentTableData
:
{
type
:
Object
,
default
:
()
=>
{}
}
}
},
},
data
()
{
data
()
{
...
@@ -71,9 +75,9 @@ export default {
...
@@ -71,9 +75,9 @@ export default {
}
}
if
(
this
.
basicData
.
materialType
)
{
if
(
this
.
basicData
.
materialType
)
{
val
.
items
.
push
({
val
.
items
.
push
({
fieldName
:
'inventory.jobResponse.jobOrder.extMaterial.resType2
Id
'
,
fieldName
:
'inventory.jobResponse.jobOrder.extMaterial.resType2
.typeCode
'
,
operator
:
'
EQ
'
,
operator
:
'
LIKE
'
,
value
:
this
.
basicData
.
materialType
value
:
this
.
parentTableData
&&
this
.
parentTableData
.
materialType
?
this
.
parentTableData
.
materialType
.
typeCode
:
this
.
basicData
.
materialType
&&
this
.
basicData
.
materialType
.
includes
(
'-'
)
?
this
.
basicData
.
materialType
.
split
(
'-'
)[
1
]
+
'%'
:
this
.
basicData
.
materialType
})
})
}
}
val
.
items
.
push
({
val
.
items
.
push
({
...
...
applications/dee-mes/src/privateComponents/components/materialType/index.vue
View file @
a1fd0407
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
v-for=
"(item,i) in materialTypeOptions"
v-for=
"(item,i) in materialTypeOptions"
:key=
"i"
:key=
"i"
:label=
"item.typeName"
:label=
"item.typeName"
:value=
"item.
id
"
:value=
"item.
value
"
/>
/>
</el-select>
</el-select>
</div>
</div>
...
@@ -20,10 +20,21 @@ export default {
...
@@ -20,10 +20,21 @@ export default {
name
:
'MaterialType'
,
name
:
'MaterialType'
,
components
:
{},
components
:
{},
props
:
{
props
:
{
form
:
{},
form
:
{
type
:
Object
,
default
:
null
},
itemObj
:
{
itemObj
:
{
type
:
Object
,
type
:
Object
,
default
:
null
default
:
null
},
typeKey
:
{
type
:
String
,
default
:
''
},
formAttrs
:
{
type
:
Object
,
default
:
null
}
}
},
},
data
()
{
data
()
{
...
@@ -67,7 +78,14 @@ export default {
...
@@ -67,7 +78,14 @@ export default {
getMaterialType
(
val
)
{
getMaterialType
(
val
)
{
this
.
isFirst
=
false
this
.
isFirst
=
false
getParentData
({
billTypeCode
:
val
}).
then
(
res
=>
{
getParentData
({
billTypeCode
:
val
}).
then
(
res
=>
{
this
.
materialTypeOptions
=
res
.
items
.
content
||
[]
this
.
materialTypeOptions
=
res
.
items
.
content
.
map
(
item
=>
{
if
(
this
.
formAttrs
&&
this
.
formAttrs
.
layoutType
===
'basicInfo_new_sanqiruku'
)
{
item
.
value
=
`
${
item
.
id
}
-
${
item
.
typeName
}
`
}
else
{
item
.
value
=
item
.
id
}
return
item
})
})
})
}
}
}
}
...
...
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