From a3094611deac91e0ec35bcfe3f3fdd3bdf993466 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 26 四月 2024 16:18:40 +0800
Subject: [PATCH] 考勤统计模块 增加月份对应的星期的数据处理+对应考勤统计的样式调整
---
src/components/makepager/TableCommonView.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index bc0f088..482f74a 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -13,8 +13,9 @@
:show-summary="showSummary.show"
:summary-method="getSummaries"
:span-method="arraySpanMethod"
+ :class="tableList.headerHeight?'table-height-47px':''"
@selection-change="handleSelectionChange"
- :header-cell-style="{ background: '#f1f3f8', color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
+ :header-cell-style="{ background: '#f1f3f8', height:tableList.headerHeight?tableList.headerHeight:'37px',color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
size="mini"
@row-click="tableRowClick"
:row-class-name="tableRowClassName"
@@ -42,6 +43,7 @@
<template slot="header">
{{ item.label }}
+ <div v-if="item.weekDay">{{item.weekDay}}</div>
<span v-if="item.iconRight">
<i
:class="item.iconRight"
@@ -95,7 +97,7 @@
<span
v-else-if="item.isCommonClick && scope.row[item.prop]"
class="sel-name"
- @click="selCommonClick(scope.row)"
+ @click="selCommonClick(scope.row,item.prop,item)"
>
<div v-if="item.isCallMethod">
<span :class="item.isClass ? item.getClassName(scope.row[item.prop], scope.row) : ''">
@@ -236,7 +238,7 @@
this.showcol = newVal
},
immediate: true
- }
+ },
},
methods: {
onMaskClick() {
@@ -409,8 +411,8 @@
this.$emit("selServiceOrderClick", row)
},
// 鍏叡锛堥攢鍞満浼氥�佹姤浠峰崟銆侀攢鍞�诲崟銆侀攢鍞瓙鍗曘�傘�傘�傦級
- selCommonClick(row) {
- this.$emit("selCommonClick", row)
+ selCommonClick(row,prop,item) {
+ this.$emit("selCommonClick", row,prop,item)
},
// 琛岀偣鍑�
tableRowClick(row, column, event) {
@@ -488,9 +490,21 @@
font-weight: bold;
}
}
+ .el-table__fixed{
+ height:calc(100% - 8px)!important;
+ }
.el-table__fixed-body-wrapper{
top:37px!important;
}
+ .table-height-47px .el-table__fixed-body-wrapper{
+ top:47px!important;
+ }
+ .el-table__body-wrapper{
+ height:calc(100% - 38px)!important;
+ }
+ .table-height-47px .el-table__body-wrapper{
+ height:calc(100% - 48px)!important;
+ }
}
::v-deep .el-table .cell {
--
Gitblit v1.8.0