From 56b7f5dd6fda8c39f0b7038a265d507e0d22227c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 24 七月 2024 14:56:35 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b3-work-time-management/work-time-statistics.vue | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 70f7bc3..d7d6d4c 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -99,6 +99,7 @@
requiredAdd: [],
requiredUp: [],
accept:聽'.xlsx',
+ sort: false,
inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
cellSpecialStyle:{
redColorByKey:'Hours'
@@ -114,6 +115,7 @@
order: 'desc'
}
},
+ sort: false,
isIndex: true,
showSelect: false,
select: false,
--
Gitblit v1.9.3