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
70a9048c
Commit
70a9048c
authored
Oct 16, 2023
by
“lixuyan”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
物料确认和工作说明在检验和适航执行中的适配
parent
56619fde
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
23 deletions
+42
-23
footer.vue
...views/taskExecution/components/ConfirmMaterial/footer.vue
+10
-3
header.vue
...views/taskExecution/components/ConfirmMaterial/header.vue
+11
-4
Table2.vue
...on/components/TechnicalRequirements/components/Table2.vue
+16
-15
index.vue
applications/dee-mes/src/views/taskExecution/index.vue
+5
-1
No files found.
applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/footer.vue
View file @
70a9048c
...
...
@@ -16,7 +16,7 @@
:cell-class-name=
"cellClassName"
>
<el-table-column
type=
"index"
:width=
"80"
label=
"序号"
align=
"center"
/>
<el-table-column
:width=
"120"
label=
"扫码录入"
align=
"center"
>
<el-table-column
v-if=
"flag"
:width=
"120"
label=
"扫码录入"
align=
"center"
>
<template
slot-scope=
"scope"
>
<el-popover
v-model=
"scope.row.popoverVisible"
...
...
@@ -44,6 +44,7 @@
</
template
>
</el-table-column>
<el-table-column
v-if=
"flag"
prop=
"extMaterial.isRecord"
label=
"是否记实"
align=
"center"
...
...
@@ -67,7 +68,7 @@
sortable
show-overflow-tooltip
/>
<el-table-column
:width=
"80"
label=
"操作"
align=
"center"
>
<el-table-column
v-if=
"flag"
:width=
"80"
label=
"操作"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<el-button
:disabled=
"scope.row.scanCodeRecordsState==='未确认'"
...
...
@@ -215,7 +216,8 @@ export default {
stripe
:
true
,
border
:
true
},
scanId
:
null
scanId
:
null
,
flag
:
false
}
},
created
()
{
...
...
@@ -232,6 +234,11 @@ export default {
},
// 初始化数据
init
()
{
if
(
this
.
$route
.
query
.
title
===
'装配任务执行'
)
{
this
.
flag
=
true
}
else
{
this
.
flag
=
false
}
// 设置数据
this
.
loading
=
true
this
.
tableData
=
[]
...
...
applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/header.vue
View file @
70a9048c
...
...
@@ -2,7 +2,7 @@
<section
class=
"confirm-material-header"
>
<p
class=
"confirm-material-header-title-table"
>
<span>
物料配套发放:
</span>
<span>
提示:当零件类型为外购成品时,实称重量/去除重量才可双击编辑!
</span>
<span
v-show=
"flag"
>
提示:当零件类型为外购成品时,实称重量/去除重量才可双击编辑!
</span>
</p>
<scan
v-show=
"false"
:id=
"onlyUuid"
@
getQrCode=
"getScanBar"
>
扫码录入
</scan>
<div>
...
...
@@ -16,7 +16,7 @@
@
cell-dblclick=
"deeTableEdit"
>
<el-table-column
type=
"index"
:width=
"80"
label=
"序号"
align=
"center"
/>
<el-table-column
:width=
"120"
label=
"扫码录入"
align=
"center"
>
<el-table-column
v-if=
"flag"
:width=
"120"
label=
"扫码录入"
align=
"center"
>
<template
slot-scope=
"scope"
>
<el-popover
v-model=
"scope.row.popoverVisible"
...
...
@@ -95,6 +95,7 @@
</
template
>
</el-table-column>
<el-table-column
v-if=
"flag"
prop=
"extMaterial.isRecord"
label=
"是否记实"
align=
"center"
...
...
@@ -324,7 +325,8 @@ export default {
scanId
:
[{
required
:
true
,
message
:
'请扫码录入'
}],
count
:
[{
required
:
true
,
message
:
'请输入数量'
}]
},
stateList
:
[]
stateList
:
[],
flag
:
false
}
},
created
()
{},
...
...
@@ -337,6 +339,11 @@ export default {
methods
:
{
// 初始化数据
init
()
{
if
(
this
.
$route
.
query
.
title
===
'装配任务执行'
)
{
this
.
flag
=
true
}
else
{
this
.
flag
=
false
}
// 设置数据
this
.
loading
=
true
this
.
tableData
=
[]
...
...
@@ -390,7 +397,7 @@ export default {
},
deeTableEdit
(
row
,
column
,
cell
,
event
)
{
var
that
=
this
if
(
row
.
extMaterial
.
resType2
.
typeName
!==
'外购成品'
||
!
row
.
jobResponseOutStorageVOS
)
return
if
(
row
.
extMaterial
.
resType2
.
typeName
!==
'外购成品'
||
!
row
.
jobResponseOutStorageVOS
||
!
this
.
flag
)
return
if
(
column
.
property
===
'actualWeight'
)
{
this
.
setRowValue
=
row
.
actualWeight
row
.
actualWeightSelect
=
true
...
...
applications/dee-mes/src/views/taskExecution/components/TechnicalRequirements/components/Table2.vue
View file @
70a9048c
<
template
>
<section>
<!-- 表格 -->
<!--
<dee-table
:loading=
"loading"
:index-row=
"indexRow"
:columns=
"tableColums"
:data=
"tableData"
:options=
"tableOptions"
/>
-->
<el-table
v-loading=
"loading"
:data=
"tableData"
...
...
@@ -28,12 +20,15 @@
>
<template
slot-scope=
"scope"
><el-button
class=
"seepdf"
size=
"mini"
type=
"text"
@
click=
"seePDF(scope.row)"
>
{{
scope
.
row
.
docNumber
}}
</el-button>
>
<el-button
v-if=
"flag"
class=
"seepdf"
size=
"mini"
type=
"text"
@
click=
"seePDF(scope.row)"
>
{{
scope
.
row
.
docNumber
}}
</el-button>
<span
v-else
>
{{
scope
.
row
.
docNumber
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"name"
label=
"名称"
header-align=
"center"
/>
...
...
@@ -104,7 +99,8 @@ export default {
tableOptions
:
{
stripe
:
true
,
border
:
true
}
},
flag
:
false
}
},
created
()
{
...
...
@@ -120,6 +116,11 @@ export default {
},
// 初始化数据
init
()
{
if
(
this
.
$route
.
query
.
title
===
'装配任务执行'
)
{
this
.
flag
=
true
}
else
{
this
.
flag
=
false
}
this
.
tableData
=
this
.
$parent
.
$parent
.
$parent
.
tableFile
||
[]
this
.
loading
=
false
},
...
...
applications/dee-mes/src/views/taskExecution/index.vue
View file @
70a9048c
...
...
@@ -423,7 +423,7 @@
class=
"gooey-menu-item"
content=
"工作说明"
:disabled=
"isOK"
@
click=
"!isOK && $refs.TechnicalRequirements.open()"
@
click=
"!isOK && $refs.TechnicalRequirements.open(
headerData
)"
>
<el-badge
:value=
"12"
class=
"item"
hidden
>
<svg
class=
"icon"
aria-hidden=
"true"
>
...
...
@@ -853,6 +853,10 @@ export default {
curRow
=
that
.
workingProcedure
.
find
(
(
p
)
=>
p
.
statusCode
===
'UnderTest'
)
}
else
if
(
this
.
$route
.
query
.
title
===
'检验任务执行'
)
{
curRow
=
that
.
workingProcedure
.
find
(
(
p
)
=>
p
.
statusCode
===
'Yes'
)
}
else
{
curRow
=
that
.
workingProcedure
.
find
(
(
p
)
=>
p
.
statusCode
===
'Not'
...
...
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