From 1ebeb893cede178f4a21284b161a6727990c8974 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 May 2021 11:12:14 +0800
Subject: [PATCH] 考勤页面天气列删除，考勤时间格式修改
---
src/views/attendance/attendance.vue | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/views/attendance/attendance.vue b/src/views/attendance/attendance.vue
index 13e3c16..ae5b1cd 100644
--- a/src/views/attendance/attendance.vue
+++ b/src/views/attendance/attendance.vue
@@ -54,7 +54,7 @@
</template>
<template slot-scope="{ row }" slot="attendancetype">
<el-tag>{{
- row.attendancetype == "0" ? "正常" : row.attendancetype == "1" ? "迟到" : "早退"
+ row.attendancetype == "0" ? "正常" : row.attendancetype == "1" ? "迟到" : row.attendancetype == "2" ? "早退" : "无效"
}}
</el-tag>
</template>
@@ -178,8 +178,8 @@
label: "考勤时间",
prop: "releaseTimeRange",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
searchSpan: 6,
searchRange:true,
hide: true,
@@ -198,8 +198,8 @@
prop: "clocktime",
type: "date",
width: 200,
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
rules: [{
required: true,
message: "请输入clocktime",
@@ -215,15 +215,15 @@
trigger: "blur"
}]
},
- {
- label: "天气",
- prop: "weather",
- rules: [{
- required: true,
- message: "请输入天气",
- trigger: "blur"
- }]
- },
+ // {
+ // label: "天气",
+ // prop: "weather",
+ // rules: [{
+ // required: true,
+ // message: "请输入天气",
+ // trigger: "blur"
+ // }]
+ // },
{
label: "经度",
prop: "jd",
@@ -291,6 +291,10 @@
{
label: "早退",
value: "2"
+ },
+ {
+ label: "无效",
+ value: "4"
}
]
},
--
Gitblit v1.9.3