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
7ee57775
Commit
7ee57775
authored
Jan 08, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
物料对照表保存参数修改
parent
b59356e9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
14 deletions
+24
-14
addForm.vue
...ponents/MaterialReferenceLinkTable/components/addForm.vue
+12
-10
index.vue
...omponents/components/MaterialReferenceLinkTable/index.vue
+12
-4
No files found.
applications/dee-mes/src/privateComponents/components/MaterialReferenceLinkTable/components/addForm.vue
View file @
7ee57775
...
@@ -273,11 +273,12 @@ export default {
...
@@ -273,11 +273,12 @@ export default {
// 带出物料相关默认值
// 带出物料相关默认值
const
SELECT_MATERIAL
=
this
.
optionsA
.
find
((
item
)
=>
item
.
resCode
===
v
)
const
SELECT_MATERIAL
=
this
.
optionsA
.
find
((
item
)
=>
item
.
resCode
===
v
)
if
(
SELECT_MATERIAL
)
{
if
(
SELECT_MATERIAL
)
{
this
.
sourceForm
.
modelNo
=
SELECT_MATERIAL
.
modelNo
||
''
this
.
sourceForm
=
SELECT_MATERIAL
this
.
sourceForm
.
techSpec
=
SELECT_MATERIAL
.
techSpec
||
''
// this.sourceForm.modelNo = SELECT_MATERIAL.modelNo || ''
this
.
sourceForm
.
spec
=
SELECT_MATERIAL
.
spec
||
''
// this.sourceForm.techSpec = SELECT_MATERIAL.techSpec || ''
this
.
sourceForm
.
supplyStatus
=
SELECT_MATERIAL
.
supplyStatus
||
''
// this.sourceForm.spec = SELECT_MATERIAL.spec || ''
this
.
sourceForm
.
resName
=
SELECT_MATERIAL
.
resName
||
''
// this.sourceForm.supplyStatus = SELECT_MATERIAL.supplyStatus || ''
// this.sourceForm.resName = SELECT_MATERIAL.resName || ''
}
}
},
},
// 切换物料下拉
// 切换物料下拉
...
@@ -285,11 +286,12 @@ export default {
...
@@ -285,11 +286,12 @@ export default {
// 带出物料相关默认值
// 带出物料相关默认值
const
SELECT_MATERIAL
=
this
.
optionsB
.
find
((
item
)
=>
item
.
resCode
===
v
)
const
SELECT_MATERIAL
=
this
.
optionsB
.
find
((
item
)
=>
item
.
resCode
===
v
)
if
(
SELECT_MATERIAL
)
{
if
(
SELECT_MATERIAL
)
{
this
.
targetForm
.
modelNo
=
SELECT_MATERIAL
.
modelNo
||
''
this
.
targetForm
=
SELECT_MATERIAL
this
.
targetForm
.
techSpec
=
SELECT_MATERIAL
.
techSpec
||
''
// this.targetForm.modelNo = SELECT_MATERIAL.modelNo || ''
this
.
targetForm
.
spec
=
SELECT_MATERIAL
.
spec
||
''
// this.targetForm.techSpec = SELECT_MATERIAL.techSpec || ''
this
.
targetForm
.
supplyStatus
=
SELECT_MATERIAL
.
supplyStatus
||
''
// this.targetForm.spec = SELECT_MATERIAL.spec || ''
this
.
targetForm
.
resName
=
SELECT_MATERIAL
.
resName
||
''
// this.targetForm.supplyStatus = SELECT_MATERIAL.supplyStatus || ''
// this.targetForm.resName = SELECT_MATERIAL.resName || ''
}
}
},
},
submitEvent
()
{
submitEvent
()
{
...
...
applications/dee-mes/src/privateComponents/components/MaterialReferenceLinkTable/index.vue
View file @
7ee57775
...
@@ -75,7 +75,7 @@ export default {
...
@@ -75,7 +75,7 @@ export default {
},
width
:
100
},
},
width
:
100
},
{
{
title
:
'物料A'
,
children
:
[
title
:
'物料A'
,
children
:
[
{
title
:
'物料'
,
key
:
'source.resType2.typeName'
,
align
:
'center'
},
{
title
:
'物料
类型
'
,
key
:
'source.resType2.typeName'
,
align
:
'center'
},
{
title
:
'物料编码'
,
key
:
'source.resCode'
,
align
:
'center'
},
{
title
:
'物料编码'
,
key
:
'source.resCode'
,
align
:
'center'
},
{
title
:
'物料名称'
,
key
:
'source.resName'
,
align
:
'center'
},
{
title
:
'物料名称'
,
key
:
'source.resName'
,
align
:
'center'
},
{
title
:
'牌号/型号/件号'
,
width
:
'120'
,
key
:
'source.modelNo'
,
align
:
'center'
},
{
title
:
'牌号/型号/件号'
,
width
:
'120'
,
key
:
'source.modelNo'
,
align
:
'center'
},
...
@@ -86,7 +86,7 @@ export default {
...
@@ -86,7 +86,7 @@ export default {
},
},
{
{
title
:
'物料B'
,
children
:
[
title
:
'物料B'
,
children
:
[
{
title
:
'物料'
,
key
:
'target.resType2.typeName'
,
align
:
'center'
},
{
title
:
'物料
类型
'
,
key
:
'target.resType2.typeName'
,
align
:
'center'
},
{
title
:
'物料编码'
,
key
:
'target.resCode'
,
align
:
'center'
},
{
title
:
'物料编码'
,
key
:
'target.resCode'
,
align
:
'center'
},
{
title
:
'物料名称'
,
key
:
'target.resName'
,
align
:
'center'
},
{
title
:
'物料名称'
,
key
:
'target.resName'
,
align
:
'center'
},
{
title
:
'牌号/型号/件号'
,
width
:
'120'
,
key
:
'target.modelNo'
,
align
:
'center'
},
{
title
:
'牌号/型号/件号'
,
width
:
'120'
,
key
:
'target.modelNo'
,
align
:
'center'
},
...
@@ -182,12 +182,20 @@ export default {
...
@@ -182,12 +182,20 @@ export default {
const
params
=
{
const
params
=
{
'pageFrom'
:
this
.
pagination
.
currentPage
,
'pageFrom'
:
this
.
pagination
.
currentPage
,
'pageSize'
:
this
.
pagination
.
pageSize
,
'pageSize'
:
this
.
pagination
.
pageSize
,
'searchItems'
:
{
}
'searchItems'
:
{
},
'sortItem'
:
[
{
'fieldName'
:
'modifyTime'
,
'sortOrder'
:
'desc'
}
]
}
}
if
(
searchForm
)
{
if
(
searchForm
)
{
params
.
searchItems
=
searchForm
params
.
searchItems
=
searchForm
}
}
params
.
openProps
=
[{
name
:
'target'
},
{
name
:
'source'
}]
params
.
openProps
=
[
{
name
:
'target'
,
'openProps'
:
[{
name
:
'resType2'
}]
},
{
name
:
'source'
,
'openProps'
:
[{
name
:
'resType2'
}]
}]
this
.
$api
.
searchApi
(
'MaterialReferenceLink'
,
params
).
then
(
res
=>
{
this
.
$api
.
searchApi
(
'MaterialReferenceLink'
,
params
).
then
(
res
=>
{
if
(
res
.
items
&&
res
.
items
.
content
)
{
if
(
res
.
items
&&
res
.
items
.
content
)
{
this
.
tableData
=
res
.
items
.
content
this
.
tableData
=
res
.
items
.
content
...
...
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