Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
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
ReactWeb5
CivManage
Commits
78c783f3
Commit
78c783f3
authored
2 years ago
by
邓超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 节假日管理优化
parent
76515a30
master
dev-database
dev-达梦
No related merge requests found
Pipeline
#65103
passed with stages
Changes
4
Pipelines
1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
7 deletions
+24
-7
AddModal.jsx
...ages/bsmanager/workOrder/holidays/components/AddModal.jsx
+3
-3
holidays.jsx
src/pages/bsmanager/workOrder/holidays/holidays.jsx
+0
-0
holidays.less
src/pages/bsmanager/workOrder/holidays/holidays.less
+18
-3
holidays.js
src/services/holidays/holidays.js
+3
-1
No files found.
src/pages/bsmanager/workOrder/holidays/components/AddModal.jsx
View file @
78c783f3
...
...
@@ -30,7 +30,7 @@ const AddModal = props => {
dayName
:
validate
.
dayName
,
startDate
:
validate
.
dayTime
[
0
].
format
(
'YYYY-MM-DD'
),
endDate
:
validate
.
dayTime
[
1
].
format
(
'YYYY-MM-DD'
),
dayType
:
validate
.
dayType
,
dayType
:
1
,
}).
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
message
.
success
(
'新增成功'
);
...
...
@@ -63,12 +63,12 @@ const AddModal = props => {
<
Input
placeholder=
"请输入假日名称"
/>
</
Form
.
Item
>
<
Form
.
Item
label=
"节假日类型"
name=
"dayType"
initialValue=
{
1
}
>
{
/*
<Form.Item label="节假日类型" name="dayType" initialValue={1}>
<Radio.Group>
<Radio value={1}>休息</Radio>
<Radio value={3}>法定</Radio>
</Radio.Group>
</
Form
.
Item
>
</Form.Item>
*/
}
<
Form
.
Item
label=
"假期时间"
name=
"dayTime"
...
...
This diff is collapsed.
Click to expand it.
src/pages/bsmanager/workOrder/holidays/holidays.jsx
View file @
78c783f3
This diff is collapsed.
Click to expand it.
src/pages/bsmanager/workOrder/holidays/holidays.less
View file @
78c783f3
...
...
@@ -46,7 +46,7 @@
.calendarCell {
position: relative;
width: 1
60
px;
width: 1
59
px;
height: 88px;
.tiemBox {
...
...
@@ -97,6 +97,15 @@
background: #FFF2F2;
.tips {
position: absolute;
top: 5px;
right: 10px;
width: 10px;
height: 10px;
}
.tiemBox {
p:nth-of-type(1) {
...
...
@@ -157,6 +166,7 @@
height: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.right {
...
...
@@ -208,13 +218,14 @@
align-items: center;
.workTimeBox {
display: flex;
align-items: center;
// justify-content: center;
width: 358px;
height: 123px;
transition: transform 0.5s;
cursor: pointer;
.left {
margin-left: 38px;
margin-right: 20px;
...
...
@@ -238,6 +249,10 @@
}
}
.workTimeBox:hover {
transform: scale(1.05);
}
.mor {
background: url("../../../../assets/images/holidays/mor.png");
background-size: 100% 100%;
...
...
This diff is collapsed.
Click to expand it.
src/services/holidays/holidays.js
View file @
78c783f3
...
...
@@ -13,10 +13,12 @@ export const AddFlowHoliday = param =>
get
(
`
${
PUBLISH_SERVICE
}
/WorkDayManage/AddFlowHoliday`
,
param
);
// 导入节假日
export
const
ImportFlowHoliday
=
param
=>
ge
t
(
`
${
PUBLISH_SERVICE
}
/WorkDayManage/ImportFlowHoliday`
,
param
);
pos
t
(
`
${
PUBLISH_SERVICE
}
/WorkDayManage/ImportFlowHoliday`
,
param
);
// 导出节假日
export
const
DownLoadFlowHoliday
=
query
=>
`
${
PUBLISH_SERVICE
}
/WorkDayManage/DownLoadFlowHoliday?year=
${
query
.
year
}
`
;
// export const DownLoadFlowHoliday = param =>
// get(`${PUBLISH_SERVICE}/WorkDayManage/DownLoadFlowHoliday`, param);
// 初始化节假日
export
const
InitializationFlowHoliday
=
param
=>
...
...
This diff is collapsed.
Click to expand it.
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