From 3320c0ce9e8b8cb887ec64c944937c276f95a2a2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 28 Jul 2020 18:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96=E3=80=91?=
=?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96-=E7=8E=8B=E5=85=AC?=
=?UTF-8?q?=E5=B3=B0-2020-07-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/heart/actinfo-list.vue | 18 +-----------------
src/views/modules/message/mail-template.vue | 4 ++--
src/views/modules/sys/resources-list.vue | 2 ++
3 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
index 9b1f3f8a..2b32b2d4 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -128,23 +128,7 @@ export default {
actInfoDetailVisible: false,
actUserRelationVisible: false,
actInfoCancelVisible: false,
- actUserClockLogVisible: false,
- pickerBeginDateBefore: {
- disabledDate: (time) => {
- let beginDateVal = this.dataForm.startTime
- if (beginDateVal) {
- return time.getTime() > new Date(beginDateVal).getTime()
- }
- }
- },
- pickerBeginDateAfter: {
- disabledDate: (time) => {
- let EndDateVal = this.dataForm.endTime
- if (EndDateVal) {
- return time.getTime() < new Date(EndDateVal).getTime()
- }
- }
- }
+ actUserClockLogVisible: false
}
},
components: {
diff --git a/src/views/modules/message/mail-template.vue b/src/views/modules/message/mail-template.vue
index 2362784f..d9efe8e4 100644
--- a/src/views/modules/message/mail-template.vue
+++ b/src/views/modules/message/mail-template.vue
@@ -27,8 +27,8 @@
style="width: 100%;">
-
-
+
+
diff --git a/src/views/modules/sys/resources-list.vue b/src/views/modules/sys/resources-list.vue
index 7b7c2c24..3599fe93 100644
--- a/src/views/modules/sys/resources-list.vue
+++ b/src/views/modules/sys/resources-list.vue
@@ -31,12 +31,14 @@
label="资源编码"
header-align="center"
align="center"
+ show-overflow-tooltip
>