Commit 78c783f3 authored by 邓超's avatar 邓超

fix: 节假日管理优化

parent 76515a30
Pipeline #65103 passed with stages
...@@ -30,7 +30,7 @@ const AddModal = props => { ...@@ -30,7 +30,7 @@ const AddModal = props => {
dayName: validate.dayName, dayName: validate.dayName,
startDate: validate.dayTime[0].format('YYYY-MM-DD'), startDate: validate.dayTime[0].format('YYYY-MM-DD'),
endDate: validate.dayTime[1].format('YYYY-MM-DD'), endDate: validate.dayTime[1].format('YYYY-MM-DD'),
dayType: validate.dayType, dayType: 1,
}).then(res => { }).then(res => {
if (res.code === 0) { if (res.code === 0) {
message.success('新增成功'); message.success('新增成功');
...@@ -63,12 +63,12 @@ const AddModal = props => { ...@@ -63,12 +63,12 @@ const AddModal = props => {
<Input placeholder="请输入假日名称" /> <Input placeholder="请输入假日名称" />
</Form.Item> </Form.Item>
<Form.Item label="节假日类型" name="dayType" initialValue={1}> {/* <Form.Item label="节假日类型" name="dayType" initialValue={1}>
<Radio.Group> <Radio.Group>
<Radio value={1}>休息</Radio> <Radio value={1}>休息</Radio>
<Radio value={3}>法定</Radio> <Radio value={3}>法定</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item> */}
<Form.Item <Form.Item
label="假期时间" label="假期时间"
name="dayTime" name="dayTime"
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
.calendarCell { .calendarCell {
position: relative; position: relative;
width: 160px; width: 159px;
height: 88px; height: 88px;
.tiemBox { .tiemBox {
...@@ -97,6 +97,15 @@ ...@@ -97,6 +97,15 @@
background: #FFF2F2; background: #FFF2F2;
.tips {
position: absolute;
top: 5px;
right: 10px;
width: 10px;
height: 10px;
}
.tiemBox { .tiemBox {
p:nth-of-type(1) { p:nth-of-type(1) {
...@@ -157,6 +166,7 @@ ...@@ -157,6 +166,7 @@
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center;
} }
.right { .right {
...@@ -208,13 +218,14 @@ ...@@ -208,13 +218,14 @@
align-items: center; align-items: center;
.workTimeBox { .workTimeBox {
display: flex; display: flex;
align-items: center; align-items: center;
// justify-content: center; // justify-content: center;
width: 358px; width: 358px;
height: 123px; height: 123px;
transition: transform 0.5s;
cursor: pointer;
.left { .left {
margin-left: 38px; margin-left: 38px;
margin-right: 20px; margin-right: 20px;
...@@ -238,6 +249,10 @@ ...@@ -238,6 +249,10 @@
} }
} }
.workTimeBox:hover {
transform: scale(1.05);
}
.mor { .mor {
background: url("../../../../assets/images/holidays/mor.png"); background: url("../../../../assets/images/holidays/mor.png");
background-size: 100% 100%; background-size: 100% 100%;
......
...@@ -13,10 +13,12 @@ export const AddFlowHoliday = param => ...@@ -13,10 +13,12 @@ export const AddFlowHoliday = param =>
get(`${PUBLISH_SERVICE}/WorkDayManage/AddFlowHoliday`, param); get(`${PUBLISH_SERVICE}/WorkDayManage/AddFlowHoliday`, param);
// 导入节假日 // 导入节假日
export const ImportFlowHoliday = param => export const ImportFlowHoliday = param =>
get(`${PUBLISH_SERVICE}/WorkDayManage/ImportFlowHoliday`, param); post(`${PUBLISH_SERVICE}/WorkDayManage/ImportFlowHoliday`, param);
// 导出节假日 // 导出节假日
export const DownLoadFlowHoliday = query => export const DownLoadFlowHoliday = query =>
`${PUBLISH_SERVICE}/WorkDayManage/DownLoadFlowHoliday?year=${query.year}`; `${PUBLISH_SERVICE}/WorkDayManage/DownLoadFlowHoliday?year=${query.year}`;
// export const DownLoadFlowHoliday = param =>
// get(`${PUBLISH_SERVICE}/WorkDayManage/DownLoadFlowHoliday`, param);
// 初始化节假日 // 初始化节假日
export const InitializationFlowHoliday = param => export const InitializationFlowHoliday = param =>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment