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
cb41e392
Commit
cb41e392
authored
Sep 14, 2023
by
旭艳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
执行派工页面和接口联调
parent
75cc6a28
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
47 deletions
+39
-47
dispatching.png
applications/architecture-dee/public/images/dispatching.png
+0
-0
index.vue
...ews/assemblyPlanManagement/instructionsDispatch/index.vue
+37
-45
index.vue
...views/assemblyPlanManagement/instructionsIssued/index.vue
+2
-2
No files found.
applications/architecture-dee/public/images/dispatching.png
0 → 100644
View file @
cb41e392
14.7 KB
applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue
View file @
cb41e392
<
template
>
<
template
>
<div
class=
"instructions-
issued
"
>
<div
class=
"instructions-
disptach
"
>
<div
class=
"instructions-issued-top"
>
<div
class=
"instructions-issued-top"
>
<el-form
:inline=
"true"
:model=
"searchFormData"
class=
"instructions-issued-search"
label-width=
"50px"
>
<el-form
:inline=
"true"
:model=
"searchFormData"
class=
"instructions-issued-search"
label-width=
"50px"
>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"班组:"
>
<el-form-item
label=
"班组:"
>
<el-select
v-model=
"searchFormData.group"
placeholder=
"班组"
@
change=
"change
Postion
"
>
<el-select
v-model=
"searchFormData.group"
placeholder=
"班组"
@
change=
"change
Group
"
>
<el-option
<el-option
v-for=
"(item, i) in groupList"
v-for=
"(item, i) in groupList"
:key=
"item.value + i"
:key=
"item.value + i"
...
@@ -53,20 +53,20 @@
...
@@ -53,20 +53,20 @@
执行派工
执行派工
</div>
</div>
<div
class=
"group-list"
>
<div
class=
"group-list"
>
<div
v-for=
"(item, index) in groupUserList"
:key=
"index"
class=
"group-list-box"
:class=
"
{'active': group===item.id}" @click="changeGroup(item)">
<div
v-for=
"(item, index) in groupUserList"
:key=
"index"
class=
"group-list-box"
:class=
"
{'active': group===item.id}" @click="changeGroup
User
(item)">
<div
class=
"left"
>
<div
class=
"left"
>
<div
class=
"left-text"
>
{{
item
.
resName
}}
</div>
<div
class=
"left-text"
>
{{
item
.
resName
}}
</div>
</div>
</div>
<div
class=
"right"
>
<div
class=
"right"
>
<div
class=
"right-text"
><span>
操作工人数:
</span><span>
{{
item
.
userCount
}}
人
</span></div>
<div
class=
"right-text"
><span>
未完成任务:
</span><span>
{{
item
.
notFinishCount
}}
项
</span></div>
<div
class=
"right-text"
><span>
未完成任务:
</span><span>
{{
item
.
notFinishCount
}}
项
</span></div>
<div
class=
"right-text"
><span>
未完成工时:
</span><span>
{{
item
.
notFinishWork
}}
(h)
</span></div>
<div
class=
"right-text"
><span>
未完成工时:
</span><span>
{{
item
.
notFinishWork
}}
(h)
</span></div>
<div
class=
"right-text"
><span>
当月完成任务:
</span><span>
{{
item
.
finishCount
}}
项
</span></div>
<div
class=
"right-text"
><span>
当月完成工时:
</span><span>
{{
item
.
finishWork
}}
(h)
</span></div>
<div
class=
"right-text"
><span>
当月完成工时:
</span><span>
{{
item
.
finishWork
}}
(h)
</span></div>
<el-tooltip
placement=
"top"
>
<div
class=
"right-text"
><span>
专业:
</span><span>
{{
item
.
extProcessSkill
.
resName
}}
</span></div>
<div
class=
"right-text"
><span>
上岗有效期:
</span><span>
{{
item
.
postValidity
}}
</span></div>
<!--
<el-tooltip
placement=
"top"
>
<div
slot=
"content"
>
<div
slot=
"content"
>
<span
v-for=
"user in item.extProcessSkillUsers"
:key=
"user.id"
>
<span
v-for=
"user in item.extProcessSkillUsers"
:key=
"user.id"
>
{{
user
.
dxUserInfo
.
name
}
}
{{
user
.
dxUserInfo
.
name
}
<
/span
>
<
/span
>
<
/div
>
<
/div
>
<
div
class
=
"right-text overfllowhind"
>
<
div
class
=
"right-text overfllowhind"
>
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
{{
user
.
dxUserInfo
.
name
}}
{{
user
.
dxUserInfo
.
name
}}
<
/span
>
<
/span
>
<
/div
>
<
/div
>
</el-tooltip>
<
/el-tooltip>
--
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
@@ -180,7 +180,7 @@ export default {
...
@@ -180,7 +180,7 @@ export default {
layConfigAlready
()
{
layConfigAlready
()
{
return
{
return
{
typeName
:
'JoExecutePlan'
,
typeName
:
'JoExecutePlan'
,
layKey
:
'instructionsIssued
List
Already'
layKey
:
'instructionsIssued
Dispatch
Already'
}
}
}
}
}
,
}
,
...
@@ -243,23 +243,17 @@ export default {
...
@@ -243,23 +243,17 @@ export default {
}
)
}
)
this
.
$set
(
this
.
searchFormData
,
'group'
,
this
.
groupList
[
0
].
value
)
this
.
$set
(
this
.
searchFormData
,
'group'
,
this
.
groupList
[
0
].
value
)
this
.
$set
(
this
.
searchFormData
,
'groupName'
,
this
.
groupList
[
0
].
label
)
this
.
$set
(
this
.
searchFormData
,
'groupName'
,
this
.
groupList
[
0
].
label
)
this
.
getInstructionsDispatchList
()
this
.
getGroupUser
()
this
.
getGroupUser
()
}
}
}
)
}
)
}
,
}
,
changePostion
()
{
changeGroup
()
{
const
postion
=
this
.
postionList
.
find
(
r
=>
r
.
value
===
this
.
searchFormData
.
postion
)
const
group
=
this
.
groupList
.
find
(
r
=>
r
.
value
===
this
.
searchFormData
.
group
)
this
.
$set
(
this
.
searchFormData
,
'postionName'
,
postion
&&
postion
.
label
||
''
)
this
.
$set
(
this
.
searchFormData
,
'groupName'
,
group
&&
group
.
label
||
''
)
this
.
$set
(
this
.
searchFormData
,
'postionId'
,
postion
&&
postion
.
id
||
''
)
this
.
$set
(
this
.
searchFormData
,
'group'
,
group
&&
group
.
value
||
''
)
this
.
getSortiesList
()
this
.
getInstructionsDispatchList
()
this
.
getGroupList
()
this
.
getGroupUser
()
},
changeSorties
()
{
const
sorties
=
this
.
sortiesData
.
find
(
r
=>
r
.
value
===
this
.
searchFormData
.
sorties
)
this
.
$set
(
this
.
searchFormData
,
'sortiesName'
,
sorties
&&
sorties
.
label
||
''
)
this
.
$set
(
this
.
searchFormData
,
'workId'
,
sorties
&&
sorties
.
postionId
||
''
)
this
.
status
=
sorties
.
status
this
.
getTableData
()
}
,
}
,
tabClick
(
tab
)
{
tabClick
(
tab
)
{
this
.
activeName
=
tab
.
index
this
.
activeName
=
tab
.
index
...
@@ -276,10 +270,10 @@ export default {
...
@@ -276,10 +270,10 @@ export default {
this
.
$refs
.
detailComAlready
.
$children
[
0
].
getData
()
this
.
$refs
.
detailComAlready
.
$children
[
0
].
getData
()
}
}
}
else
{
}
else
{
this
.
getInstructions
IssuedListTo
()
this
.
getInstructions
DispatchList
()
}
}
}
,
}
,
getInstructions
IssuedListTo
()
{
getInstructions
DispatchList
()
{
const
params
=
{
const
params
=
{
'pageFrom'
:
this
.
pagination
.
currentPage
,
'pageFrom'
:
this
.
pagination
.
currentPage
,
'pageSize'
:
this
.
pagination
.
pageSize
,
'pageSize'
:
this
.
pagination
.
pageSize
,
...
@@ -288,19 +282,23 @@ export default {
...
@@ -288,19 +282,23 @@ export default {
{
{
'items'
:
[
'items'
:
[
{
{
'fieldName'
:
'extProcess
Plan.sorties
'
,
'fieldName'
:
'extProcess
SkillId
'
,
'operator'
:
'EQ'
,
'operator'
:
'EQ'
,
'value'
:
this
.
searchFormData
.
sortiesName
'value'
:
this
.
searchFormData
.
group
}
,
}
,
{
{
'fieldName'
:
'
extProcessPlan.positionNumber
'
,
'fieldName'
:
'
planState
'
,
'operator'
:
'EQ'
,
'operator'
:
'EQ'
,
'value'
:
this
.
searchFormData
.
postionName
'value'
:
'Issued'
}
,
}
,
{
{
'fieldName'
:
'planState'
,
'fieldName'
:
'extProcessPlan.id'
,
'operator'
:
'EQ'
,
'operator'
:
'NOTNULL'
'value'
:
'Yes'
}
,
{
'fieldName'
:
'dmirStatus'
,
'operator'
:
'NEQ'
,
'value'
:
'Y'
}
}
],
],
'operator'
:
'AND'
'operator'
:
'AND'
...
@@ -311,12 +309,7 @@ export default {
...
@@ -311,12 +309,7 @@ export default {
}
,
}
,
'openProps'
:
[
'openProps'
:
[
{
{
'name'
:
'extProcessPlan'
,
'name'
:
'extProcessPlan'
'openProps'
:
[
{
'name'
:
'extSupportings'
}
]
}
}
],
],
'sortItem'
:
[
'sortItem'
:
[
...
@@ -326,10 +319,9 @@ export default {
...
@@ -326,10 +319,9 @@ export default {
}
}
]
]
}
}
post
(
'/JoExecutePlan/
getProductionPrepare
'
,
params
).
then
(
res
=>
{
post
(
'/JoExecutePlan/
search
'
,
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
// this.$set(this, 'group', res.items[0] && res.items[0].id || '')
}
}
}
)
}
)
}
,
}
,
...
@@ -349,7 +341,7 @@ export default {
...
@@ -349,7 +341,7 @@ export default {
}
)
}
)
this
.
selectionRow
=
val
this
.
selectionRow
=
val
}
,
}
,
changeGroup
(
val
)
{
changeGroup
User
(
val
)
{
this
.
$set
(
this
,
'group'
,
val
.
id
||
''
)
this
.
$set
(
this
,
'group'
,
val
.
id
||
''
)
this
.
$set
(
this
,
'groupType'
,
val
.
subTypeName
||
''
)
this
.
$set
(
this
,
'groupType'
,
val
.
subTypeName
||
''
)
if
(
this
.
selectionRow
.
length
>
0
)
{
if
(
this
.
selectionRow
.
length
>
0
)
{
...
@@ -404,7 +396,7 @@ export default {
...
@@ -404,7 +396,7 @@ export default {
}
}
<
/script
>
<
/script
>
<
style
lang
=
"scss"
>
<
style
lang
=
"scss"
>
.instructions-
issued
{
.
instructions
-
disptach
{
background
:
#
ffff
;
background
:
#
ffff
;
height
:
100
%
;
height
:
100
%
;
.
group
-
list
{
.
group
-
list
{
...
@@ -413,10 +405,10 @@ export default {
...
@@ -413,10 +405,10 @@ export default {
margin
-
bottom
:
20
px
;
margin
-
bottom
:
20
px
;
.
group
-
list
-
box
{
.
group
-
list
-
box
{
box
-
sizing
:
border
-
box
;
box
-
sizing
:
border
-
box
;
background
:
url("/images/
tasks
.png")
no-repeat
;
background
:
url
(
"/images/
dispatching
.png"
)
no
-
repeat
;
background
-
size
:
100
%
100
%
;
background
-
size
:
100
%
100
%
;
padding
:
10
px
;
padding
:
10
px
;
margin
:
10px
2
0px
;
margin
:
10
px
1
0
px
;
box
-
shadow
:
0
4
px
8
px
0
rgba
(
0
,
0
,
0
,
0.2
),
0
6
px
20
px
0
rgba
(
0
,
0
,
0
,
0.19
);
box
-
shadow
:
0
4
px
8
px
0
rgba
(
0
,
0
,
0
,
0.2
),
0
6
px
20
px
0
rgba
(
0
,
0
,
0
,
0.19
);
border
-
radius
:
10
px
;
border
-
radius
:
10
px
;
font
-
size
:
14
px
;
font
-
size
:
14
px
;
...
@@ -443,9 +435,9 @@ export default {
...
@@ -443,9 +435,9 @@ export default {
}
}
}
}
.
active
{
.
active
{
color
:
#cf9236
;
color
:
rgb
(
64
,
87
,
141
)
;
font
-
weight
:
700
;
font
-
weight
:
700
;
border
:
3px
solid
#cf9236
;
border
:
3
px
solid
rgb
(
64
,
87
,
141
)
;
}
}
}
}
.
instructions
-
issued
-
top
{
.
instructions
-
issued
-
top
{
...
...
applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/index.vue
View file @
cb41e392
...
@@ -304,7 +304,7 @@ export default {
...
@@ -304,7 +304,7 @@ export default {
getStation
()
{
getStation
()
{
this
.
postionList
=
[]
this
.
postionList
=
[]
this
.
$set
(
this
.
searchFormData
,
'postion'
,
''
)
this
.
$set
(
this
.
searchFormData
,
'postion'
,
''
)
//
const userId = localStorage.getItem('userId') || ''
const
userId
=
localStorage
.
getItem
(
'userId'
)
||
''
const
params
=
{
const
params
=
{
'searchItems'
:
{
'searchItems'
:
{
'children'
:
[
'children'
:
[
...
@@ -313,7 +313,7 @@ export default {
...
@@ -313,7 +313,7 @@ export default {
{
{
'fieldName'
:
'targetId'
,
'fieldName'
:
'targetId'
,
'operator'
:
'EQ'
,
'operator'
:
'EQ'
,
'value'
:
1626782149352
'value'
:
userId
}
}
],
],
'operator'
:
'AND'
'operator'
:
'AND'
...
...
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