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
c7a0090f
Commit
c7a0090f
authored
Dec 25, 2023
by
jingnan
👀
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://94.191.100.41/tfmom/tf-mom-web
into dev
parents
1e37bbe2
388d1817
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
index.vue
...views/assemblyPlanManagement/inspectionDispatch/index.vue
+1
-0
index.vue
...views/assemblyPlanManagement/instructionsIssued/index.vue
+1
-1
index.vue
applications/dee-mes/src/views/taskExecution/index.vue
+8
-7
No files found.
applications/dee-mes/src/views/assemblyPlanManagement/inspectionDispatch/index.vue
View file @
c7a0090f
...
...
@@ -124,6 +124,7 @@
<
script
>
import
{
post
}
from
'@/utils/http'
export
default
{
name
:
'DeeMesInspectionDispatch'
,
provide
()
{
return
{
searchFormData
:
this
.
searchFormData
...
...
applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/index.vue
View file @
c7a0090f
...
...
@@ -19,7 +19,7 @@
import
missingParts
from
'./components/missingParts'
import
stationPlanList
from
'./components/stationPlanList'
export
default
{
name
:
'InstructionsIssued'
,
name
:
'
DeeMes
InstructionsIssued'
,
components
:
{
missingParts
,
stationPlanList
},
data
()
{
return
{
...
...
applications/dee-mes/src/views/taskExecution/index.vue
View file @
c7a0090f
...
...
@@ -735,6 +735,7 @@ export default {
if
(
res
&&
res
.
items
.
content
.
length
)
{
var
data
=
res
.
items
.
content
[
0
]
const
inspectPerson
=
[]
if
(
data
.
prodTask
)
{
data
.
prodTask
.
forEach
(
element
=>
{
if
(
element
.
subTypeName
===
'CheckOut'
)
{
if
(
element
.
extProcessSkillUser
)
{
...
...
@@ -742,7 +743,7 @@ export default {
}
}
})
console
.
log
(
3434
,
inspectPerson
)
}
that
.
headerData
=
{
id
:
data
.
id
,
serialNumber
:
data
.
extProcessPlan
.
serialNumber
,
...
...
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