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
806133fc
Commit
806133fc
authored
Mar 22, 2024
by
张海景
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:修改排班日历显示和刀模版申请单字段问题
parent
92179471
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
calendarType.vue
src/views/mes/cal/calendar/calendarType.vue
+3
-1
team.vue
src/views/mes/cal/calendar/team.vue
+3
-1
index.vue
src/views/mes/tm/toolrequest/index.vue
+2
-2
No files found.
src/views/mes/cal/calendar/calendarType.vue
View file @
806133fc
...
@@ -22,7 +22,9 @@
...
@@ -22,7 +22,9 @@
<el-row
v-for=
"calendarDay in calendarDayList "
:key=
"calendarDay.theDay"
>
<el-row
v-for=
"calendarDay in calendarDayList "
:key=
"calendarDay.theDay"
>
<el-col
:span=
"24"
v-if=
"calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1"
>
<el-col
:span=
"24"
v-if=
"calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1"
>
<div
v-for=
"(teamShift,index) in calendarDay.calPlanWorkunitList"
:key=
"index"
class=
"grid-content"
>
<div
v-for=
"(teamShift,index) in calendarDay.calPlanWorkunitList"
:key=
"index"
class=
"grid-content"
>
<el-button
type=
"success"
icon=
"el-icon-sunrise"
>
{{
teamShift
.
workunitName
}}
</el-button>
<el-button
type=
"primary"
v-if=
"teamShift.shiftName === '白班'"
icon=
"el-icon-sunny"
>
{{
teamShift
.
workunitName
}}
</el-button>
<el-button
type=
"success"
v-else-if=
"teamShift.shiftName === '中班'"
icon=
"el-icon-sunrise"
>
{{
teamShift
.
workunitName
}}
</el-button>
<el-button
type=
"warning"
v-else-if=
"teamShift.shiftName === '夜班'"
icon=
"el-icon-moon"
>
{{
teamShift
.
workunitName
}}
</el-button>
</div>
</div>
</el-col>
</el-col>
</el-row>
</el-row>
...
...
src/views/mes/cal/calendar/team.vue
View file @
806133fc
...
@@ -31,7 +31,9 @@
...
@@ -31,7 +31,9 @@
<el-row
v-for=
"calendarDay in calendarDayList "
:key=
"calendarDay.theDay"
>
<el-row
v-for=
"calendarDay in calendarDayList "
:key=
"calendarDay.theDay"
>
<el-col
:span=
"24"
v-if=
"calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1"
>
<el-col
:span=
"24"
v-if=
"calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1"
>
<div
v-for=
"(teamShift,index) in calendarDay.calPlanWorkunitList"
:key=
"index"
class=
"grid-content"
>
<div
v-for=
"(teamShift,index) in calendarDay.calPlanWorkunitList"
:key=
"index"
class=
"grid-content"
>
<el-button
type=
"success"
icon=
"el-icon-sunrise"
>
{{
teamShift
.
workunitName
}}
</el-button>
<el-button
type=
"primary"
v-if=
"teamShift.shiftName === '白班'"
icon=
"el-icon-sunny"
>
{{
teamShift
.
workunitName
}}
</el-button>
<el-button
type=
"success"
v-else-if=
"teamShift.shiftName === '中班'"
icon=
"el-icon-sunrise"
>
{{
teamShift
.
workunitName
}}
</el-button>
<el-button
type=
"warning"
v-else-if=
"teamShift.shiftName === '夜班'"
icon=
"el-icon-moon"
>
{{
teamShift
.
workunitName
}}
</el-button>
</div>
</div>
</el-col>
</el-col>
</el-row>
</el-row>
...
...
src/views/mes/tm/toolrequest/index.vue
View file @
806133fc
...
@@ -132,12 +132,12 @@
...
@@ -132,12 +132,12 @@
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"预计开始时间"
align
=
"center"
prop
=
"startTime"
width
=
"180"
>
<
el
-
table
-
column
label
=
"预计开始时间"
align
=
"center"
prop
=
"startTime"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
startTime
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
span
>
{{
parseTime
(
scope
.
row
.
startTime
)
}}
<
/span
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"预计结束时间"
align
=
"center"
prop
=
"endTime"
width
=
"180"
>
<
el
-
table
-
column
label
=
"预计结束时间"
align
=
"center"
prop
=
"endTime"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
endTime
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
span
>
{{
parseTime
(
scope
.
row
.
endTime
,)
}}
<
/span
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"总数量"
align
=
"center"
prop
=
"requestNum"
/>
<
el
-
table
-
column
label
=
"总数量"
align
=
"center"
prop
=
"requestNum"
/>
...
...
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