From d21116144299b7c0c49454bb9216dc3709d781e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=AC=E9=8B=86=E5=B1=BE?= <804461479@qq.com>
Date: Thu, 16 May 2024 11:24:23 +0800
Subject: [PATCH] tui
---
.../admin/src/views/attendance/stat/list.vue | 38 ++++++++++++++-----
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue b/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
index b508e15e..40fdd32f 100644
--- a/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
@@ -66,7 +66,7 @@
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
- <div class="mt20" style="text-align:right">
+ <div class="mt20" style="text-align: right">
<el-button @click="handleCancel(1)">鍙栨秷</el-button>
<el-button type="primary" @click="handleSubmit(1)">纭畾</el-button>
</div>
@@ -85,7 +85,7 @@
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
- <div class="mt20" style="text-align:right">
+ <div class="mt20" style="text-align: right">
<el-button @click="handleCancel(2)">鍙栨秷</el-button>
<el-button type="primary" @click="handleSubmit(2)">纭畾</el-button>
</div>
@@ -102,9 +102,7 @@
<div>鎵撳崱璁板綍姹囨€�</div>
<el-button type="text">瀵煎嚭鎴愬姛</el-button>
</div>
- <div class="times">
- 瀵煎嚭鏃堕棿锛�2020-08-13
- </div>
+ <div class="times">瀵煎嚭鏃堕棿锛�2020-08-13</div>
</div>
</div>
</el-drawer>
@@ -197,10 +195,15 @@ export default {
</el-tag>
)
) : (
- "-"
+ "姝ｅ父"
);
} else {
- return "-";
+ if (currentTime < timestampToTime(new Date(), 3)) {
+ return "姝ｅ父";
+ } else {
+ return "--";
+ }
+ // return "姝ｅ父";
}
},
restTable() {
@@ -226,7 +229,11 @@ export default {
) {
return this.handleArr(row.attendanceStaffStatEntities, item);
} else {
- return "-";
+ if (item < timestampToTime(new Date(), 3)) {
+ return "姝ｅ父";
+ } else {
+ return "--";
+ }
}
},
};
@@ -445,6 +452,7 @@ export default {
prop: "windowCategory",
fixed: "left",
width: 100,
+ formatter: this.formatter,
show: true,
},
@@ -455,8 +463,18 @@ export default {
width: 100,
show: true,
},
- { label: "澶у巺", prop: "salaName", show: true },
- { label: "閮ㄩ棬", prop: "deptName", show: true },
+ {
+ label: "澶у巺",
+ prop: "salaName",
+ formatter: this.formatter,
+ show: true,
+ },
+ {
+ label: "閮ㄩ棬",
+ prop: "deptName",
+ formatter: this.formatter,
+ show: true,
+ },
{
label: "搴斿埌",
prop: "workDays",
--
2.24.3