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
3d75d4ee
Commit
3d75d4ee
authored
Dec 02, 2024
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 排班日历悬停显示排班情况逻辑修改
parent
329ca749
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
388 additions
and
267 deletions
+388
-267
calholiday.js
src/api/mes/cal/calholiday.js
+11
-0
team.vue
src/views/mes/cal/calendar/team.vue
+377
-266
index.vue
src/views/mes/tm/toolrequestuse/index.vue
+0
-1
No files found.
src/api/mes/cal/calholiday.js
View file @
3d75d4ee
...
...
@@ -26,6 +26,15 @@ export function getCalWorkunits(query) {
});
}
// 查询当前工作日的具体时间
export
function
getCalWorkunitsDetailApi
(
query
)
{
return
request
({
url
:
"/mes/cal/calendar/getCalWorkunitsDetail"
,
method
:
"post"
,
data
:
query
});
}
// 查询上班数据工作单元列表
export
function
listItem
(
query
)
{
return
request
({
...
...
@@ -68,3 +77,5 @@ export function delCalholiday(holidayId) {
method
:
'delete'
})
}
src/views/mes/cal/calendar/team.vue
View file @
3d75d4ee
This diff is collapsed.
Click to expand it.
src/views/mes/tm/toolrequestuse/index.vue
View file @
3d75d4ee
...
...
@@ -345,7 +345,6 @@
@
click
=
"$refs['selectSnRef'].showFlag = true, currentInfo = scope.row"
><
/el-button
>
<
/el-input
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"领用位置"
prop
=
"location"
/>
...
...
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