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
2eaf1cbf
Commit
2eaf1cbf
authored
Jun 04, 2024
by
沈翠玲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
排版日历改成树形,样式优化
parent
16034126
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
22 deletions
+33
-22
team.js
src/api/mes/cal/team.js
+7
-7
team.vue
src/views/mes/cal/calendar/team.vue
+26
-14
index.vue
src/views/mes/md/product/index.vue
+0
-1
No files found.
src/api/mes/cal/team.js
View file @
2eaf1cbf
import
request
from
'@/utils/request'
import
request
from
'@/utils/request'
// 查询工作单元列表
// 查询工作单元列表
export
function
listTeam
(
query
)
{
export
function
listTeam
(
query
)
{
return
request
({
return
request
({
url
:
"/md/cal/workunit/unSelectList"
,
url
:
"/md/cal/workunit/unSelectList"
,
method
:
"get"
,
method
:
"get"
,
...
@@ -10,15 +10,15 @@ export function listTeam(query) {
...
@@ -10,15 +10,15 @@ export function listTeam(query) {
}
}
// 查询工作单元列表
// 查询工作单元列表
export
function
listAllTeam
()
{
export
function
listAllTeam
()
{
return
request
({
return
request
({
url
:
"/md/cal/workunit/
calWorkunitList
"
,
url
:
"/md/cal/workunit/
treeMenu
"
,
method
:
"get"
,
method
:
"get"
,
});
});
}
}
// 查询班组详细
// 查询班组详细
export
function
getTeam
(
teamId
)
{
export
function
getTeam
(
teamId
)
{
return
request
({
return
request
({
url
:
'/mes/cal/team/'
+
teamId
,
url
:
'/mes/cal/team/'
+
teamId
,
method
:
'get'
method
:
'get'
...
@@ -26,7 +26,7 @@ export function getTeam(teamId) {
...
@@ -26,7 +26,7 @@ export function getTeam(teamId) {
}
}
// 新增班组
// 新增班组
export
function
addTeam
(
data
)
{
export
function
addTeam
(
data
)
{
return
request
({
return
request
({
url
:
'/mes/cal/team'
,
url
:
'/mes/cal/team'
,
method
:
'post'
,
method
:
'post'
,
...
@@ -35,7 +35,7 @@ export function addTeam(data) {
...
@@ -35,7 +35,7 @@ export function addTeam(data) {
}
}
// 修改班组
// 修改班组
export
function
updateTeam
(
data
)
{
export
function
updateTeam
(
data
)
{
return
request
({
return
request
({
url
:
'/mes/cal/team'
,
url
:
'/mes/cal/team'
,
method
:
'put'
,
method
:
'put'
,
...
@@ -44,7 +44,7 @@ export function updateTeam(data) {
...
@@ -44,7 +44,7 @@ export function updateTeam(data) {
}
}
// 删除班组
// 删除班组
export
function
delTeam
(
teamId
)
{
export
function
delTeam
(
teamId
)
{
return
request
({
return
request
({
url
:
'/mes/cal/team/'
+
teamId
,
url
:
'/mes/cal/team/'
+
teamId
,
method
:
'delete'
method
:
'delete'
...
...
src/views/mes/cal/calendar/team.vue
View file @
2eaf1cbf
...
@@ -2,14 +2,11 @@
...
@@ -2,14 +2,11 @@
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<el-container
class=
"el-container-cal"
>
<el-container
class=
"el-container-cal"
>
<el-aside
width=
"200px"
class=
"el-aside-cal"
>
<el-aside
width=
"200px"
class=
"el-aside-cal"
>
<el-radio-group
v-model=
"selectedType"
class=
"x-fillitem el-group-list"
@
change=
"onSelected"
>
<el-tree
:data=
"teamList"
:props=
"defaultProps"
:expand-on-click-node=
"false"
class=
"el-tree-pro"
node-key=
"id"
<el-radio-button
:filter-node-method=
"filterNode"
ref=
"tree"
:default-expanded-keys=
"defaultExpandedKeys"
@
node-click=
"onSelected"
>
v-for=
"(item, index) in teamList"
<span
slot-scope=
"
{ data }" :title="data.label"
:title=
"item"
>
{{
data
.
label
}}
</span>
:key=
"index"
</el-tree>
:label=
"item"
>
{{
item
}}
</el-radio-button>
</el-radio-group>
</el-aside>
</el-aside>
<el-main>
<el-main>
<el-calendar
v-loading=
"loading"
v-model=
"date"
>
<el-calendar
v-loading=
"loading"
v-model=
"date"
>
...
@@ -61,6 +58,11 @@ export default {
...
@@ -61,6 +58,11 @@ export default {
return
{
return
{
// 遮罩层
// 遮罩层
loading
:
false
,
loading
:
false
,
defaultExpandedKeys
:
[],
defaultProps
:
{
children
:
"children"
,
label
:
"label"
,
},
date
:
new
Date
(),
date
:
new
Date
(),
teamList
:
[],
//所有的班组
teamList
:
[],
//所有的班组
holidayList
:[],
//假日
holidayList
:[],
//假日
...
@@ -90,9 +92,17 @@ export default {
...
@@ -90,9 +92,17 @@ export default {
this
.
getTeams
();
this
.
getTeams
();
},
},
methods
:{
methods
:{
// 筛选节点
filterNode
(
value
,
data
)
{
if
(
!
value
)
return
true
;
return
data
.
label
.
indexOf
(
value
)
!==
-
1
;
},
getTeams
(){
getTeams
(){
listAllTeam
().
then
(
response
=>
{
listAllTeam
().
then
(
response
=>
{
this
.
teamList
=
response
.
data
;
this
.
teamList
=
response
.
data
;
if
(
response
.
data
.
length
>
0
)
{
this
.
defaultExpandedKeys
.
push
(
response
.
data
[
0
]?.
id
)
}
});
});
},
},
/** 查询节假日设置列表 */
/** 查询节假日设置列表 */
...
@@ -119,11 +129,13 @@ export default {
...
@@ -119,11 +129,13 @@ export default {
});
});
},
},
//点击班组类型
//点击班组类型
onSelected
(
teamId
){
onSelected
(
data
){
this
.
loading
=
true
;
if
(
data
[
'level'
]
===
4
){
this
.
queryParams
.
workunitName
=
teamId
;
this
.
loading
=
true
;
this
.
queryParams
.
theDay
=
this
.
date
.
getFullYear
()
+
'-'
+
(
this
.
date
.
getMonth
()
+
1
)
+
'-'
+
this
.
date
.
getDate
();
this
.
queryParams
.
workunitName
=
data
[
'label'
];
this
.
getList
()
this
.
queryParams
.
theDay
=
this
.
date
.
getFullYear
()
+
'-'
+
(
this
.
date
.
getMonth
()
+
1
)
+
'-'
+
this
.
date
.
getDate
();
this
.
getList
()
}
},
},
isFestival
(
slotDate
,
slotData
)
{
isFestival
(
slotDate
,
slotData
)
{
let
solarDayArr
=
slotData
.
day
.
split
(
'-'
);
let
solarDayArr
=
slotData
.
day
.
split
(
'-'
);
...
@@ -161,7 +173,7 @@ export default {
...
@@ -161,7 +173,7 @@ export default {
max-height
:
700px
;
max-height
:
700px
;
padding
:
0
;
padding
:
0
;
}
}
.el-aside-cal
.el-
radio-button__inner
{
.el-aside-cal
.el-
tree-node__content
span
{
white-space
:
nowrap
;
white-space
:
nowrap
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
...
...
src/views/mes/md/product/index.vue
View file @
2eaf1cbf
...
@@ -508,7 +508,6 @@ export default {
...
@@ -508,7 +508,6 @@ export default {
this
.
itemTypeOptions
=
response
.
data
;
this
.
itemTypeOptions
=
response
.
data
;
if
(
response
.
data
.
length
>
0
)
{
if
(
response
.
data
.
length
>
0
)
{
this
.
defaultExpandedKeys
.
push
(
response
.
data
[
0
]?.
id
)
this
.
defaultExpandedKeys
.
push
(
response
.
data
[
0
]?.
id
)
console
.
log
(
'this.defaultExpandedKeys'
,
this
.
defaultExpandedKeys
)
}
}
});
});
},
},
...
...
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