From b42f3ddfb37d2cf54dad91d2271ec9da633fd8c1 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 16 四月 2021 20:08:32 +0800
Subject: [PATCH] fix(bug修复): 离职当月考勤的出勤数据可以到3位
---
src/views/user/archivesChange.vue | 8 ++++----
src/views/user/inemployees.vue | 2 +-
src/views/user/archivesEdit.vue | 8 ++++----
src/views/user/Informationinput.vue | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index f1fe56e..bb60e88 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -2291,10 +2291,10 @@
pattern: /^\d{1,2}(\.\d{1,1})?$/,
message: '出勤天数精确到1位小数'
}],
- overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
- overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
- leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
- absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
+ overtimeDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
+ overtimeHour: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
+ leaveDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
+ absenteeism: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
leaveInfoRules: {
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 16e6abc..4174d0a 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -2795,10 +2795,10 @@
pattern: /^\d{1,2}(\.\d{1,1})?$/,
message: '出勤天数精确到1位小数'
}],
- overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
- overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
- leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
- absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
+ overtimeDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
+ overtimeHour: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
+ leaveDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
+ absenteeism: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
leaveInfoRules: {
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index 168c90d..0f1d860 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -2956,10 +2956,10 @@
pattern: /^\d{1,2}(\.\d{1,1})?$/,
message: '出勤天数精确到1位小数'
}],
- overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
- overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
- leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
- absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
+ overtimeDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
+ overtimeHour: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
+ leaveDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
+ absenteeism: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
leaveInfoRules: {
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 3eda1c4..40c3a3e 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -611,7 +611,7 @@
<el-upload
ref="upload"
class="upload-demo"
- action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
+ action="http://127.0.0.1:8301/hr/empBaseInfo/importEmp"
accept=".xls, .xlsx, .excel"
:headers="headers()"
:file-list="fileList"
--
Gitblit v1.8.0