Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pda-ui
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
pda
pda-ui
Commits
8f1b80df
Commit
8f1b80df
authored
Jul 16, 2024
by
沈翠玲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
排班计划查询详情bug
parent
911e9aa3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
index.vue
src/views/mes/cal/plan/index.vue
+2
-3
shift.vue
src/views/mes/cal/plan/shift.vue
+4
-4
team.vue
src/views/mes/cal/plan/team.vue
+3
-2
No files found.
src/views/mes/cal/plan/index.vue
View file @
8f1b80df
...
@@ -232,10 +232,10 @@
...
@@ -232,10 +232,10 @@
<
/el-form
>
<
/el-form
>
<
el
-
tabs
type
=
"border-card"
>
<
el
-
tabs
type
=
"border-card"
>
<
el
-
tab
-
pane
label
=
"班次"
>
<
el
-
tab
-
pane
label
=
"班次"
>
<
Shift
v
-
if
=
"open"
ref
=
"shiftTab"
:
plan
Code
=
"form.planCode
"
:
shiftType
=
"form.shiftType"
:
optType
=
"optType"
><
/Shift
>
<
Shift
v
-
if
=
"open"
ref
=
"shiftTab"
:
plan
Id
=
"form.planId
"
:
shiftType
=
"form.shiftType"
:
optType
=
"optType"
><
/Shift
>
<
/el-tab-pane
>
<
/el-tab-pane
>
<
el
-
tab
-
pane
v
-
if
=
"open"
label
=
"工作单元"
>
<
el
-
tab
-
pane
v
-
if
=
"open"
label
=
"工作单元"
>
<
Team
v
-
if
=
"open"
ref
=
"teamTab"
:
planId
=
"form.planId"
:
form
=
"form"
:
calendarType
=
"form.calendarType"
:
optType
=
"optType"
><
/Team
>
<
Team
v
-
if
=
"open"
ref
=
"teamTab"
:
planId
=
"form.planId"
:
planCode
=
"form.planCode"
:
form
=
"form"
:
calendarType
=
"form.calendarType"
:
optType
=
"optType"
><
/Team
>
<
/el-tab-pane
>
<
/el-tab-pane
>
<
/el-tabs
>
<
/el-tabs
>
<
div
slot
=
"footer"
class
=
"dialog-footer"
>
<
div
slot
=
"footer"
class
=
"dialog-footer"
>
...
@@ -383,7 +383,6 @@ export default {
...
@@ -383,7 +383,6 @@ export default {
const
planId
=
row
.
planId
||
this
.
ids
const
planId
=
row
.
planId
||
this
.
ids
getCalplan
(
planId
).
then
(
response
=>
{
getCalplan
(
planId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
form
=
response
.
data
;
console
.
log
(
'this.form'
,
this
.
form
)
this
.
open
=
true
;
this
.
open
=
true
;
this
.
title
=
"查看排班计划"
;
this
.
title
=
"查看排班计划"
;
this
.
optType
=
"view"
;
this
.
optType
=
"view"
;
...
...
src/views/mes/cal/plan/shift.vue
View file @
8f1b80df
...
@@ -150,7 +150,7 @@ export default {
...
@@ -150,7 +150,7 @@ export default {
dicts
:
[
'SHIFT_TYPE'
],
dicts
:
[
'SHIFT_TYPE'
],
props
:
{
props
:
{
shiftType
:
null
,
shiftType
:
null
,
plan
Code
:
null
,
plan
Id
:
null
,
optType
:
null
optType
:
null
},
},
watch
:
{
watch
:
{
...
@@ -159,7 +159,7 @@ export default {
...
@@ -159,7 +159,7 @@ export default {
handler
(
newName
,
oldName
)
{
handler
(
newName
,
oldName
)
{
console
.
log
(
newName
,
'shiftType'
)
console
.
log
(
newName
,
'shiftType'
)
if
(
newName
)
{
if
(
newName
)
{
if
(
this
.
plan
Code
&&!
this
.
editShiftType
)
{
if
(
this
.
plan
Id
&&!
this
.
editShiftType
)
{
this
.
getEditList
();
this
.
getEditList
();
}
else
if
((
this
.
optType
===
'view'
||
this
.
optType
===
'edit'
)
&&
(
this
.
editShiftType
&&
this
.
editShiftType
===
newName
))
{
}
else
if
((
this
.
optType
===
'view'
||
this
.
optType
===
'edit'
)
&&
(
this
.
editShiftType
&&
this
.
editShiftType
===
newName
))
{
this
.
getEditList
();
this
.
getEditList
();
...
@@ -170,7 +170,7 @@ export default {
...
@@ -170,7 +170,7 @@ export default {
},
},
immediate
:
true
immediate
:
true
},
},
plan
Code
:
{
plan
Id
:
{
handler
(
newName
,
oldName
)
{
handler
(
newName
,
oldName
)
{
if
(
newName
)
{
if
(
newName
)
{
this
.
editShiftType
=
this
.
shiftType
this
.
editShiftType
=
this
.
shiftType
...
@@ -254,7 +254,7 @@ export default {
...
@@ -254,7 +254,7 @@ export default {
/** 查询计划班次列表 */
/** 查询计划班次列表 */
getEditList
()
{
getEditList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
listEditShift
({
plan
Code
:
this
.
planCode
}).
then
(
response
=>
{
listEditShift
({
plan
Id
:
this
.
planId
}).
then
(
response
=>
{
this
.
shiftList
=
response
.
rows
;
this
.
shiftList
=
response
.
rows
;
this
.
loading
=
false
;
this
.
loading
=
false
;
});
});
...
...
src/views/mes/cal/plan/team.vue
View file @
8f1b80df
...
@@ -40,6 +40,7 @@ export default {
...
@@ -40,6 +40,7 @@ export default {
components
:{
TeamSelect
},
components
:{
TeamSelect
},
props
:{
props
:{
planId
:
null
,
planId
:
null
,
planCode
:
null
,
optType
:
null
,
optType
:
null
,
form
:
null
,
form
:
null
,
calendarType
:
null
calendarType
:
null
...
@@ -56,7 +57,7 @@ export default {
...
@@ -56,7 +57,7 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
plan
Id
:
this
.
planId
||
''
plan
Code
:
this
.
planCode
||
''
},
},
total
:
0
total
:
0
}
}
...
@@ -66,7 +67,7 @@ export default {
...
@@ -66,7 +67,7 @@ export default {
},
},
methods
:{
methods
:{
getTeamList
(){
getTeamList
(){
if
(
!
this
.
plan
Id
)
{
if
(
!
this
.
plan
Code
)
{
return
return
}
}
this
.
loading
=
true
;
this
.
loading
=
true
;
...
...
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