Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-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
mes
mes-ui
Commits
245a4d44
Commit
245a4d44
authored
Mar 11, 2024
by
张海景
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:修改班组管理样式
parent
cdfb1354
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
77 deletions
+76
-77
calendarType.vue
src/views/mes/cal/calendar/calendarType.vue
+24
-24
team.vue
src/views/mes/cal/calendar/team.vue
+22
-22
index.vue
src/views/mes/cal/plan/index.vue
+15
-16
index.vue
src/views/mes/cal/team/index.vue
+15
-15
No files found.
src/views/mes/cal/calendar/calendarType.vue
View file @
245a4d44
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<el-container>
<el-container>
<el-aside
width=
"
15
0px"
>
<el-aside
width=
"
20
0px"
>
<el-radio-group
v-model=
"selectedType"
class=
"x-fillitem el-group-list"
@
change=
"onSelected"
>
<el-radio-group
v-model=
"selectedType"
class=
"x-fillitem el-group-list"
@
change=
"onSelected"
>
<el-radio-button
<el-radio-button
v-for=
"dict in dict.type.mes_calendar_type"
v-for=
"dict in dict.type.mes_calendar_type"
:key=
"dict.value"
:key=
"dict.value"
:label=
"dict.value"
:label=
"dict.value"
>
{{
dict
.
label
}}
</el-radio-button>
>
{{
dict
.
label
}}
</el-radio-button>
</el-radio-group>
</el-radio-group>
</el-aside>
</el-aside>
<el-main>
<el-main>
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<div>
<div>
<el-row>
<el-row>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<div
class=
"solar"
>
<div
class=
"solar"
>
{{
data
.
day
.
split
(
'-'
)[
2
]
}}
{{
data
.
day
.
split
(
'-'
)[
2
]
}}
</div>
</div>
</el-col>
</el-col>
...
@@ -35,10 +35,10 @@
...
@@ -35,10 +35,10 @@
<el-button
v-if=
"teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'"
type=
"warning"
icon=
"el-icon-sunny"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'"
type=
"warning"
icon=
"el-icon-sunny"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'"
type=
"info"
icon=
"el-icon-moon"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'"
type=
"info"
icon=
"el-icon-moon"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'"
type=
"info"
icon=
"el-icon-moon"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'"
type=
"info"
icon=
"el-icon-moon"
>
{{
teamShift
.
teamName
}}
</el-button>
</div>
</div>
</el-col>
</el-col>
</el-row>
</el-row>
</div>
</div>
</
template
>
</
template
>
</el-calendar>
</el-calendar>
</el-main>
</el-main>
...
@@ -51,8 +51,8 @@ import { listCalholiday } from "@/api/mes/cal/calholiday";
...
@@ -51,8 +51,8 @@ import { listCalholiday } from "@/api/mes/cal/calholiday";
import
{
listCalendars
}
from
"@/api/mes/cal/calendar"
;
import
{
listCalendars
}
from
"@/api/mes/cal/calendar"
;
import
calendar
from
'@/utils/calendar'
;
import
calendar
from
'@/utils/calendar'
;
export
default
{
export
default
{
name
:
'CalendarTypeView'
,
name
:
'CalendarTypeView'
,
dicts
:[
'mes_calendar_type'
],
dicts
:[
'mes_calendar_type'
],
data
(){
data
(){
return
{
return
{
// 遮罩层
// 遮罩层
...
@@ -72,15 +72,15 @@ export default {
...
@@ -72,15 +72,15 @@ export default {
holidayType
:
null
,
holidayType
:
null
,
startTime
:
null
,
startTime
:
null
,
endTime
:
null
,
endTime
:
null
,
},
},
}
}
},
},
watch
:{
watch
:{
date
:{
date
:{
handler
(
newVal
,
oldVal
){
handler
(
newVal
,
oldVal
){
console
.
log
(
newVal
.
getFullYear
()
+
'-'
+
(
newVal
.
getMonth
()
+
1
)
+
'-'
+
newVal
.
getDate
());
console
.
log
(
newVal
.
getFullYear
()
+
'-'
+
(
newVal
.
getMonth
()
+
1
)
+
'-'
+
newVal
.
getDate
());
this
.
teamShiftQueryParams
.
date
=
newVal
.
getFullYear
()
+
'-'
+
(
newVal
.
getMonth
()
+
1
)
+
'-'
+
newVal
.
getDate
();
this
.
teamShiftQueryParams
.
date
=
newVal
.
getFullYear
()
+
'-'
+
(
newVal
.
getMonth
()
+
1
)
+
'-'
+
newVal
.
getDate
();
this
.
loading
=
true
;
this
.
loading
=
true
;
listCalendars
(
this
.
teamShiftQueryParams
).
then
(
response
=>
{
listCalendars
(
this
.
teamShiftQueryParams
).
then
(
response
=>
{
this
.
calendarDayList
=
response
.
data
;
this
.
calendarDayList
=
response
.
data
;
this
.
loading
=
false
;
this
.
loading
=
false
;
...
@@ -94,10 +94,10 @@ export default {
...
@@ -94,10 +94,10 @@ export default {
methods
:{
methods
:{
/** 查询节假日设置列表 */
/** 查询节假日设置列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
holidayList
=
[];
this
.
holidayList
=
[];
this
.
workdayList
=
[];
this
.
workdayList
=
[];
let
that
=
this
;
let
that
=
this
;
listCalholiday
(
this
.
queryParams
).
then
(
response
=>
{
listCalholiday
(
this
.
queryParams
).
then
(
response
=>
{
if
(
response
.
data
!=
null
){
if
(
response
.
data
!=
null
){
response
.
data
.
forEach
(
theDay
=>
{
response
.
data
.
forEach
(
theDay
=>
{
...
@@ -106,16 +106,16 @@ export default {
...
@@ -106,16 +106,16 @@ export default {
}
else
{
}
else
{
that
.
workdayList
.
push
(
theDay
.
theDay
);
that
.
workdayList
.
push
(
theDay
.
theDay
);
}
}
});
});
this
.
loading
=
false
;
this
.
loading
=
false
;
}
}
});
});
},
},
//点击班组类型
//点击班组类型
onSelected
(
calType
){
onSelected
(
calType
){
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
teamShiftQueryParams
.
calendarType
=
calType
;
this
.
teamShiftQueryParams
.
calendarType
=
calType
;
this
.
teamShiftQueryParams
.
date
=
this
.
date
;
this
.
teamShiftQueryParams
.
date
=
this
.
date
;
listCalendars
(
this
.
teamShiftQueryParams
).
then
(
response
=>
{
listCalendars
(
this
.
teamShiftQueryParams
).
then
(
response
=>
{
this
.
calendarDayList
=
response
.
data
;
this
.
calendarDayList
=
response
.
data
;
this
.
loading
=
false
;
this
.
loading
=
false
;
...
@@ -124,20 +124,20 @@ export default {
...
@@ -124,20 +124,20 @@ export default {
isFestival
(
slotDate
,
slotData
)
{
isFestival
(
slotDate
,
slotData
)
{
let
solarDayArr
=
slotData
.
day
.
split
(
'-'
);
let
solarDayArr
=
slotData
.
day
.
split
(
'-'
);
let
lunarDay
=
calendar
.
solar2lunar
(
solarDayArr
[
0
],
solarDayArr
[
1
],
solarDayArr
[
2
])
let
lunarDay
=
calendar
.
solar2lunar
(
solarDayArr
[
0
],
solarDayArr
[
1
],
solarDayArr
[
2
])
// 公历节日\农历节日\农历节气
// 公历节日\农历节日\农历节气
let
festAndTerm
=
[];
let
festAndTerm
=
[];
festAndTerm
.
push
(
lunarDay
.
festival
==
null
?
''
:
' '
+
lunarDay
.
festival
)
festAndTerm
.
push
(
lunarDay
.
festival
==
null
?
''
:
' '
+
lunarDay
.
festival
)
festAndTerm
.
push
(
lunarDay
.
lunarFestival
==
null
?
''
:
''
+
lunarDay
.
lunarFestival
)
festAndTerm
.
push
(
lunarDay
.
lunarFestival
==
null
?
''
:
''
+
lunarDay
.
lunarFestival
)
festAndTerm
.
push
(
lunarDay
.
Term
==
null
?
''
:
''
+
lunarDay
.
Term
)
festAndTerm
.
push
(
lunarDay
.
Term
==
null
?
''
:
''
+
lunarDay
.
Term
)
festAndTerm
=
festAndTerm
.
join
(
''
)
festAndTerm
=
festAndTerm
.
join
(
''
)
return
festAndTerm
!=
''
return
festAndTerm
!=
''
},
},
solarDate2lunar
(
solarDate
)
{
solarDate2lunar
(
solarDate
)
{
var
solar
=
solarDate
.
split
(
'-'
)
var
solar
=
solarDate
.
split
(
'-'
)
var
lunar
=
calendar
.
solar2lunar
(
solar
[
0
],
solar
[
1
],
solar
[
2
])
var
lunar
=
calendar
.
solar2lunar
(
solar
[
0
],
solar
[
1
],
solar
[
2
])
let
lunarMD
=
lunar
.
IMonthCn
+
lunar
.
IDayCn
;
let
lunarMD
=
lunar
.
IMonthCn
+
lunar
.
IDayCn
;
// 公历节日\农历节日\农历节气
// 公历节日\农历节日\农历节气
let
festAndTerm
=
[];
let
festAndTerm
=
[];
...
@@ -145,9 +145,9 @@ export default {
...
@@ -145,9 +145,9 @@ export default {
festAndTerm
.
push
(
lunar
.
lunarFestival
==
null
?
''
:
''
+
lunar
.
lunarFestival
)
festAndTerm
.
push
(
lunar
.
lunarFestival
==
null
?
''
:
''
+
lunar
.
lunarFestival
)
festAndTerm
.
push
(
lunar
.
Term
==
null
?
''
:
''
+
lunar
.
Term
)
festAndTerm
.
push
(
lunar
.
Term
==
null
?
''
:
''
+
lunar
.
Term
)
festAndTerm
=
festAndTerm
.
join
(
''
)
festAndTerm
=
festAndTerm
.
join
(
''
)
return
festAndTerm
==
''
?
lunarMD
:
festAndTerm
return
festAndTerm
==
''
?
lunarMD
:
festAndTerm
}
}
}
}
}
}
...
@@ -204,4 +204,4 @@ export default {
...
@@ -204,4 +204,4 @@ export default {
.el-calendar-table
.holiday
{
.el-calendar-table
.holiday
{
background-color
:
#88E325
;
background-color
:
#88E325
;
}
}
</
style
>
</
style
>
\ No newline at end of file
src/views/mes/cal/calendar/team.vue
View file @
245a4d44
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<el-container>
<el-container>
<el-aside
width=
"
15
0px"
>
<el-aside
width=
"
20
0px"
>
<el-radio-group
v-model=
"selectedType"
class=
"x-fillitem el-group-list"
@
change=
"onSelected"
>
<el-radio-group
v-model=
"selectedType"
class=
"x-fillitem el-group-list"
@
change=
"onSelected"
>
<el-radio-button
<el-radio-button
v-for=
"item in teamList"
v-for=
"item in teamList"
:key=
"item.teamId"
:key=
"item.teamId"
:label=
"item.teamId"
:label=
"item.teamId"
>
{{
item
.
teamName
}}
</el-radio-button>
>
{{
item
.
teamName
}}
</el-radio-button>
</el-radio-group>
</el-radio-group>
</el-aside>
</el-aside>
<el-main>
<el-main>
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<div>
<div>
<el-row>
<el-row>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<div
class=
"solar"
>
<div
class=
"solar"
>
{{
data
.
day
.
split
(
'-'
)[
2
]
}}
{{
data
.
day
.
split
(
'-'
)[
2
]
}}
</div>
</div>
</el-col>
</el-col>
...
@@ -35,10 +35,10 @@
...
@@ -35,10 +35,10 @@
<el-button
v-if=
"teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'"
type=
"warning"
icon=
"el-icon-sunny"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'"
type=
"warning"
icon=
"el-icon-sunny"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'"
type=
"info"
icon=
"el-icon-moon"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'"
type=
"info"
icon=
"el-icon-moon"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'"
type=
"info"
icon=
"el-icon-moon"
>
{{
teamShift
.
teamName
}}
</el-button>
<el-button
v-if=
"teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'"
type=
"info"
icon=
"el-icon-moon"
>
{{
teamShift
.
teamName
}}
</el-button>
</div>
</div>
</el-col>
</el-col>
</el-row>
</el-row>
</div>
</div>
</
template
>
</
template
>
</el-calendar>
</el-calendar>
</el-main>
</el-main>
...
@@ -52,8 +52,8 @@ import { listCalholiday } from "@/api/mes/cal/calholiday";
...
@@ -52,8 +52,8 @@ import { listCalholiday } from "@/api/mes/cal/calholiday";
import
{
listCalendars
}
from
"@/api/mes/cal/calendar"
;
import
{
listCalendars
}
from
"@/api/mes/cal/calendar"
;
import
calendar
from
'@/utils/calendar'
;
import
calendar
from
'@/utils/calendar'
;
export
default
{
export
default
{
name
:
'TeamView'
,
name
:
'TeamView'
,
dicts
:[
'mes_calendar_type'
],
dicts
:[
'mes_calendar_type'
],
data
(){
data
(){
return
{
return
{
// 遮罩层
// 遮罩层
...
@@ -73,15 +73,15 @@ export default {
...
@@ -73,15 +73,15 @@ export default {
holidayType
:
null
,
holidayType
:
null
,
startTime
:
null
,
startTime
:
null
,
endTime
:
null
,
endTime
:
null
,
},
},
}
}
},
},
watch
:{
watch
:{
date
:{
date
:{
handler
(
newVal
,
oldVal
){
handler
(
newVal
,
oldVal
){
console
.
log
(
newVal
.
getFullYear
()
+
'-'
+
(
newVal
.
getMonth
()
+
1
)
+
'-'
+
newVal
.
getDate
());
console
.
log
(
newVal
.
getFullYear
()
+
'-'
+
(
newVal
.
getMonth
()
+
1
)
+
'-'
+
newVal
.
getDate
());
this
.
teamShiftQueryParams
.
date
=
newVal
.
getFullYear
()
+
'-'
+
(
newVal
.
getMonth
()
+
1
)
+
'-'
+
newVal
.
getDate
();
this
.
teamShiftQueryParams
.
date
=
newVal
.
getFullYear
()
+
'-'
+
(
newVal
.
getMonth
()
+
1
)
+
'-'
+
newVal
.
getDate
();
this
.
loading
=
true
;
this
.
loading
=
true
;
listCalendars
(
this
.
teamShiftQueryParams
).
then
(
response
=>
{
listCalendars
(
this
.
teamShiftQueryParams
).
then
(
response
=>
{
this
.
calendarDayList
=
response
.
data
;
this
.
calendarDayList
=
response
.
data
;
this
.
loading
=
false
;
this
.
loading
=
false
;
...
@@ -101,10 +101,10 @@ export default {
...
@@ -101,10 +101,10 @@ export default {
},
},
/** 查询节假日设置列表 */
/** 查询节假日设置列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
holidayList
=
[];
this
.
holidayList
=
[];
this
.
workdayList
=
[];
this
.
workdayList
=
[];
let
that
=
this
;
let
that
=
this
;
listCalholiday
(
this
.
queryParams
).
then
(
response
=>
{
listCalholiday
(
this
.
queryParams
).
then
(
response
=>
{
if
(
response
.
data
!=
null
){
if
(
response
.
data
!=
null
){
response
.
data
.
forEach
(
theDay
=>
{
response
.
data
.
forEach
(
theDay
=>
{
...
@@ -113,14 +113,14 @@ export default {
...
@@ -113,14 +113,14 @@ export default {
}
else
{
}
else
{
that
.
workdayList
.
push
(
theDay
.
theDay
);
that
.
workdayList
.
push
(
theDay
.
theDay
);
}
}
});
});
this
.
loading
=
false
;
this
.
loading
=
false
;
}
}
});
});
},
},
//点击班组类型
//点击班组类型
onSelected
(
teamId
){
onSelected
(
teamId
){
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
teamShiftQueryParams
.
teamId
=
teamId
;
this
.
teamShiftQueryParams
.
teamId
=
teamId
;
this
.
teamShiftQueryParams
.
date
=
this
.
date
;
this
.
teamShiftQueryParams
.
date
=
this
.
date
;
listCalendars
(
this
.
teamShiftQueryParams
).
then
(
response
=>
{
listCalendars
(
this
.
teamShiftQueryParams
).
then
(
response
=>
{
...
@@ -131,20 +131,20 @@ export default {
...
@@ -131,20 +131,20 @@ export default {
isFestival
(
slotDate
,
slotData
)
{
isFestival
(
slotDate
,
slotData
)
{
let
solarDayArr
=
slotData
.
day
.
split
(
'-'
);
let
solarDayArr
=
slotData
.
day
.
split
(
'-'
);
let
lunarDay
=
calendar
.
solar2lunar
(
solarDayArr
[
0
],
solarDayArr
[
1
],
solarDayArr
[
2
])
let
lunarDay
=
calendar
.
solar2lunar
(
solarDayArr
[
0
],
solarDayArr
[
1
],
solarDayArr
[
2
])
// 公历节日\农历节日\农历节气
// 公历节日\农历节日\农历节气
let
festAndTerm
=
[];
let
festAndTerm
=
[];
festAndTerm
.
push
(
lunarDay
.
festival
==
null
?
''
:
' '
+
lunarDay
.
festival
)
festAndTerm
.
push
(
lunarDay
.
festival
==
null
?
''
:
' '
+
lunarDay
.
festival
)
festAndTerm
.
push
(
lunarDay
.
lunarFestival
==
null
?
''
:
''
+
lunarDay
.
lunarFestival
)
festAndTerm
.
push
(
lunarDay
.
lunarFestival
==
null
?
''
:
''
+
lunarDay
.
lunarFestival
)
festAndTerm
.
push
(
lunarDay
.
Term
==
null
?
''
:
''
+
lunarDay
.
Term
)
festAndTerm
.
push
(
lunarDay
.
Term
==
null
?
''
:
''
+
lunarDay
.
Term
)
festAndTerm
=
festAndTerm
.
join
(
''
)
festAndTerm
=
festAndTerm
.
join
(
''
)
return
festAndTerm
!=
''
return
festAndTerm
!=
''
},
},
solarDate2lunar
(
solarDate
)
{
solarDate2lunar
(
solarDate
)
{
var
solar
=
solarDate
.
split
(
'-'
)
var
solar
=
solarDate
.
split
(
'-'
)
var
lunar
=
calendar
.
solar2lunar
(
solar
[
0
],
solar
[
1
],
solar
[
2
])
var
lunar
=
calendar
.
solar2lunar
(
solar
[
0
],
solar
[
1
],
solar
[
2
])
let
lunarMD
=
lunar
.
IMonthCn
+
lunar
.
IDayCn
;
let
lunarMD
=
lunar
.
IMonthCn
+
lunar
.
IDayCn
;
// 公历节日\农历节日\农历节气
// 公历节日\农历节日\农历节气
let
festAndTerm
=
[];
let
festAndTerm
=
[];
...
@@ -152,9 +152,9 @@ export default {
...
@@ -152,9 +152,9 @@ export default {
festAndTerm
.
push
(
lunar
.
lunarFestival
==
null
?
''
:
''
+
lunar
.
lunarFestival
)
festAndTerm
.
push
(
lunar
.
lunarFestival
==
null
?
''
:
''
+
lunar
.
lunarFestival
)
festAndTerm
.
push
(
lunar
.
Term
==
null
?
''
:
''
+
lunar
.
Term
)
festAndTerm
.
push
(
lunar
.
Term
==
null
?
''
:
''
+
lunar
.
Term
)
festAndTerm
=
festAndTerm
.
join
(
''
)
festAndTerm
=
festAndTerm
.
join
(
''
)
return
festAndTerm
==
''
?
lunarMD
:
festAndTerm
return
festAndTerm
==
''
?
lunarMD
:
festAndTerm
}
}
}
}
}
}
...
@@ -211,4 +211,4 @@ export default {
...
@@ -211,4 +211,4 @@ export default {
.el-calendar-table
.holiday
{
.el-calendar-table
.holiday
{
background-color
:
#88E325
;
background-color
:
#88E325
;
}
}
</
style
>
</
style
>
\ No newline at end of file
src/views/mes/cal/plan/index.vue
View file @
245a4d44
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"
68
px"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"
100
px"
>
<el-form-item
label=
"班组类型"
prop=
"calendarType"
>
<el-form-item
label=
"班组类型"
prop=
"calendarType"
>
<el-select
v-model=
"queryParams.calendarType"
placeholder=
"请选择班组类型"
>
<el-select
v-model=
"queryParams.calendarType"
placeholder=
"请选择班组类型"
>
<el-option
<el-option
...
@@ -85,10 +85,10 @@
...
@@ -85,10 +85,10 @@
</el-row>
</el-row>
<el-table
v-loading=
"loading"
:data=
"calplanList"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
:data=
"calplanList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"计划编号"
align=
"center"
prop=
"planCode"
>
<el-table-column
label=
"计划编号"
align=
"center"
prop=
"planCode"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-button
<el-button
type=
"text"
type=
"text"
@
click=
"handleView(scope.row)"
@
click=
"handleView(scope.row)"
v-hasPermi=
"['mes:cal:calplan:query']"
v-hasPermi=
"['mes:cal:calplan:query']"
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
/el-table
>
<
/el-table
>
<
pagination
<
pagination
v
-
show
=
"total>0"
v
-
show
=
"total>0"
:
total
=
"total"
:
total
=
"total"
...
@@ -160,18 +160,17 @@
...
@@ -160,18 +160,17 @@
<
el
-
dialog
:
title
=
"title"
v
-
loading
=
"formLoading"
:
visible
.
sync
=
"open"
width
=
"960px"
append
-
to
-
body
>
<
el
-
dialog
:
title
=
"title"
v
-
loading
=
"formLoading"
:
visible
.
sync
=
"open"
width
=
"960px"
append
-
to
-
body
>
<
el
-
form
ref
=
"form"
:
model
=
"form"
:
rules
=
"rules"
label
-
width
=
"100px"
>
<
el
-
form
ref
=
"form"
:
model
=
"form"
:
rules
=
"rules"
label
-
width
=
"100px"
>
<
el
-
row
>
<
el
-
row
>
<
el
-
col
:
span
=
"
8
"
>
<
el
-
col
:
span
=
"
12
"
>
<
el
-
form
-
item
label
=
"计划编号"
prop
=
"planCode"
>
<
el
-
form
-
item
label
=
"计划编号"
prop
=
"planCode"
>
<
el
-
input
v
-
model
=
"form.planCode"
placeholder
=
"请输入计划编号"
/>
<
div
style
=
"display:flex;align-items: center;"
>
<
/el-form-item
>
<
el
-
input
v
-
model
=
"form.planCode"
placeholder
=
"请输入计划编号"
/>
<
/el-col
>
<
el
-
switch
v
-
model
=
"autoGenFlag"
<
el
-
col
:
span
=
"4"
>
active
-
color
=
"#13ce66"
<
el
-
form
-
item
label
-
width
=
"80"
>
active
-
text
=
"自动生成"
<
el
-
switch
v
-
model
=
"autoGenFlag"
style
=
"width:175px;margin-left:10px;"
active
-
color
=
"#13ce66"
@
change
=
"handleAutoGenChange(autoGenFlag)"
v
-
if
=
"optType != 'view'"
>
active
-
text
=
"自动生成"
<
/el-switch
>
@
change
=
"handleAutoGenChange(autoGenFlag)"
v
-
if
=
"optType != 'view'"
>
<
/div
>
<
/el-switch
>
<
/el-form-item
>
<
/el-form-item
>
<
/el-col
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
col
:
span
=
"12"
>
...
@@ -427,7 +426,7 @@ export default {
...
@@ -427,7 +426,7 @@ export default {
}
);
}
);
}
,
}
,
/** 提交按钮 */
/** 提交按钮 */
submitForm
()
{
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
valid
)
{
if
(
this
.
form
.
planId
!=
null
)
{
if
(
this
.
form
.
planId
!=
null
)
{
...
...
src/views/mes/cal/team/index.vue
View file @
245a4d44
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"
68
px"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"
100
px"
>
<el-form-item
label=
"班组类型"
prop=
"calendarType"
>
<el-form-item
label=
"班组类型"
prop=
"calendarType"
>
<el-select
v-model=
"queryParams.calendarType"
placeholder=
"请选择班组类型"
>
<el-select
v-model=
"queryParams.calendarType"
placeholder=
"请选择班组类型"
>
<el-option
<el-option
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"班组编号"
align=
"center"
prop=
"teamCode"
>
<el-table-column
label=
"班组编号"
align=
"center"
prop=
"teamCode"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-button
<el-button
type=
"text"
type=
"text"
@
click=
"handleView(scope.row)"
@
click=
"handleView(scope.row)"
v-hasPermi=
"['mes:cal:team:query']"
v-hasPermi=
"['mes:cal:team:query']"
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<pagination
<pagination
v-show=
"total>0"
v-show=
"total>0"
:total=
"total"
:total=
"total"
...
@@ -129,28 +129,28 @@
...
@@ -129,28 +129,28 @@
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"960px"
append-to-body
>
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"960px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"100px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"100px"
>
<el-row>
<el-row>
<el-col
:span=
"
8
"
>
<el-col
:span=
"
12
"
>
<el-form-item
label=
"班组编号"
prop=
"teamCode"
>
<el-form-item
label=
"班组编号"
prop=
"teamCode"
>
<el-input
v-model=
"form.teamCode"
placeholder=
"请输入班组编号"
/>
</el-form-item>
<div
style=
"display:flex;align-items: center;"
>
</el-col>
<el-input
v-model=
"form.teamCode"
placeholder=
"请输入班组编号"
/>
<el-col
:span=
"3"
>
<el-switch
v-model=
"autoGenFlag"
<el-form-item
label-width=
"80"
>
<el-switch
v-model=
"autoGenFlag"
active-color=
"#13ce66"
active-color=
"#13ce66"
active-text=
"自动生成"
active-text=
"自动生成"
@
change=
"handleAutoGenChange(autoGenFlag)"
v-if=
"optType != 'view'"
>
style=
"width:175px;margin-left:10px;"
@
change=
"handleAutoGenChange(autoGenFlag)"
v-if=
"optType != 'view'"
>
</el-switch>
</el-switch>
</div>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"
8
"
>
<el-col
:span=
"
12
"
>
<el-form-item
label=
"班组名称"
prop=
"teamName"
>
<el-form-item
label=
"班组名称"
prop=
"teamName"
>
<el-input
v-model=
"form.teamName"
placeholder=
"请输入班组名称"
/>
<el-input
v-model=
"form.teamName"
placeholder=
"请输入班组名称"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"
5
"
>
<el-col
:span=
"
12
"
>
<el-form-item
label=
"班组类型"
prop=
"calendarType"
>
<el-form-item
label=
"班组类型"
prop=
"calendarType"
>
<el-select
v-model=
"form.calendarType"
placeholder=
"请选择班组类型"
>
<el-select
style=
"width:100%;"
v-model=
"form.calendarType"
placeholder=
"请选择班组类型"
>
<el-option
<el-option
v-for=
"dict in dict.type.mes_calendar_type"
v-for=
"dict in dict.type.mes_calendar_type"
:key=
"dict.value"
:key=
"dict.value"
...
@@ -166,7 +166,7 @@
...
@@ -166,7 +166,7 @@
<el-form-item
label=
"备注"
prop=
"remark"
>
<el-form-item
label=
"备注"
prop=
"remark"
>
<el-input
v-model=
"form.remark"
type=
"textarea"
placeholder=
"请输入内容"
/>
<el-input
v-model=
"form.remark"
type=
"textarea"
placeholder=
"请输入内容"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form>
</el-form>
<el-divider
v-if=
"form.teamId !=null"
content-position=
"center"
>
项目组成员
</el-divider>
<el-divider
v-if=
"form.teamId !=null"
content-position=
"center"
>
项目组成员
</el-divider>
...
...
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