Commit ff9706a3 authored by yanzhengyang's avatar yanzhengyang

填报工时页面代码空白行删除

parent fdd3f2cc
......@@ -3,7 +3,6 @@
<div class="model2">
<div class="write1">
<el-row>
<span>
<div class="title">
<div>
......@@ -12,23 +11,17 @@
</div>
<label class="write1-2">{{ currentWeekRange }}</label>
</div>
</span>
<span >
<div class="timedate">
<label class="timedate-1">可填报工时周期:本周五、周六、周日</label>
</div>
</span>
<span>
<label class="sumtime">当前周期总工时:</label>
<label class="sumtime2">{{sumTime}}</label>
</span>
</el-row>
</div>
<div class="back" >
......@@ -51,7 +44,6 @@
<label v-if="project.approvalState === 3 " class="state">审核中</label>
<label v-show="project.approvalState === 0" class="state2">{{ project.approvalNote }}</label>
</p>
</div>
</template>
<span class="timesheet">工时明细</span>
......@@ -69,7 +61,6 @@
<el-col :span="24" class="row-container">
<label class="d1-date">{{ day.workWeek }}</label>
</el-col>
</el-row>
<el-row class="d1-2">
<el-input class="d1-input"
......@@ -86,9 +77,7 @@
<span v-else>{{ day.hours }}</span>
</el-row>
</div>
</el-row>
</div>
<template #footer>
<div class="foot" >
......@@ -120,12 +109,8 @@
</div>
</template>
</el-dialog>
</div>
</div>
</div>
</div>
</template>
......@@ -228,7 +213,6 @@ setTimeout(() => {
currentWeekRange.value = getCurrentWeekRange();
}, 1000);
// 计算所有项目的总工时之和
const sumTime = computed(() => {
return personalTimesheetList.value.reduce((total, project) => {
......@@ -236,9 +220,6 @@ const sumTime = computed(() => {
}, 0);
});
// 判断当前是否为允许提交的日期(周五、周六、周日)
const isAllowedDay = computed(() => {
const day = new Date().getDay(); // 0(周日)到6(周六)
......@@ -259,9 +240,6 @@ function updateProjectTotalHours(project) {
}, 0);
}
//提交按钮
const submit = (index) => {
selectedProject.value = index;
......@@ -297,8 +275,6 @@ const submitProject = async () => {
}
};
/** 查询工时记录列表 */
function getList(employId) {
loading.value = true;
......@@ -347,17 +323,10 @@ onMounted(async () => {
});
});
watch(currentWeekRange, (newVal) => {
console.log('currentWeekRange updated:', newVal);
});
// 取消按钮
function cancel() {
open.value = false;
......@@ -472,7 +441,6 @@ function handleExport() {
}, `timesheet_${new Date().getTime()}.xlsx`)
}
</script>
<style scoped>
......@@ -494,10 +462,6 @@ function handleExport() {
color: #0062FF;
}
.timesheet{
margin-left: 22px;
margin-top: 47px;
......@@ -511,8 +475,6 @@ function handleExport() {
line-height: 12px;
}
.manager{
font-family: PingFangSC-Regular;
letter-spacing: 0;
......@@ -523,8 +485,6 @@ function handleExport() {
color: #0D162A;
}
.depart{
margin-left: 16px;
font-weight: 400;
......@@ -532,10 +492,6 @@ function handleExport() {
color: #0D162A;
}
.table-head th, tbody td {
/*padding: 10px;*/ /* 单元格内边距 */
/* 移除了边框相关的代码 */
......@@ -557,8 +513,6 @@ tbody td {
font-size: 18px; /* 单元格内容字号设为18px */
}
.foot1{
margin-left: 28px;
margin-top: auto;
......@@ -578,8 +532,6 @@ tbody td {
line-height: 12px;
}
.model2{
position: relative; /* 确保子元素基于此容器定位 */
margin-top: 10px;
......@@ -590,8 +542,6 @@ tbody td {
border-radius: 2px;
}
/*提交*/
.button-submit{
font-size: 13px;
......@@ -666,8 +616,6 @@ tbody td {
text-align: center;
}
.manager{
min-width: 220px;
width: 220px;
......@@ -677,14 +625,12 @@ tbody td {
border-radius: 2px;
}
/* 使用深度选择器穿透scoped样式 */
.custom-datepicker ::v-deep .el-input__inner {
width: 220px; /* 设置宽度 */
height: 40px; /* 设置高度 */
}
.cards-container {
display: flex;
flex-wrap: wrap;
......@@ -693,8 +639,6 @@ tbody td {
width: 100%;
}
/*底部*/
.back{
display: flex;
......@@ -737,7 +681,6 @@ tbody td {
gap: 10px; /* 子元素之间的间距 */
}
.timedate{
position: relative;
display: flex; /* 将.timedate设为flex容器 */
......@@ -751,7 +694,6 @@ tbody td {
border-radius: 4px;
}
.timedate-1{
width: 272px;
font-family: PingFangSC-Regular;
......@@ -808,8 +750,6 @@ th, td {
text-align: left;
}
.timedetile{
display: flex;
gap: 5px;
......@@ -818,7 +758,6 @@ th, td {
.d1{
margin-top: 16px;
background: #F9F9FA;
}
......@@ -841,11 +780,8 @@ th, td {
height: 60px;
background: #F9F9FA;
border: 1px solid #DEDEDE;
}
.d1-input{
text-align: center;
width: 120px;
......@@ -873,7 +809,4 @@ th, td {
color: #333333;
text-align: center;
}
</style>
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