From 06963d397d023ba076508808c8a0ec55da85067e Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期三, 10 三月 2021 13:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/archivesEdit.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index 6f44f8d..4b10343 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -755,8 +755,8 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="leaveId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="beginTime" label="开始时间" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="endTime" label="结束时间" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="beginTime" label="开始时间" width="180" />
+ <el-table-column show-overflow-tooltip="true" prop="endTime" label="结束时间" width="180" />
<el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假天数" width="100" />
<el-table-column show-overflow-tooltip="true" prop="leaveType" label="请假类型" :formatter="leaveTypeFormat" />
<el-table-column show-overflow-tooltip="true" prop="returnDate" label="到岗时间" width="180" />
@@ -2824,7 +2824,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
@@ -6119,5 +6119,12 @@
.el-dialog.is-fullscreen {
overflow: hidden;
}
+
+.formjbxx {
+ .el-input.is-disabled .el-input__inner {
+ background-color: #fff !important;
+ color: #333 !important;
+ }
+}
</style>
--
Gitblit v1.8.0