From 3f4362c22608464d251936b9bc4feabe3286aa5e Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 15:07:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b3-work-time-management/work-time-statistics.vue | 82 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 42 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 d7d6d4c..29a8650 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
@@ -84,50 +84,48 @@
down:false,
up:false,
componentData: {
- entity: {
- month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
- name: null,
- departLims: null,
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [],
- tagField: {},
- linkEvent: {},
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- accept:聽'.xlsx',
- sort: false,
- inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- cellSpecialStyle:{
- redColorByKey:'Hours'
- }
+ entity: {
+ month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
+ name: null,
+ departLims: null,
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [],
+ tagField: {},
+ linkEvent: {},
+ selectField: {},
+ requiredAdd: [],
+ requiredUp: [],
+ accept:聽'.xlsx',
+ inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ cellSpecialStyle:{
+ redColorByKey:'Hours'
+ },
},
componentData0: {
- entity: {
- month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
- name: null,
- departLims: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- sort: false,
- isIndex: true,
- showSelect: false,
- select: false,
- do: [],
- tagField: {},
- linkEvent: {
- },
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- accept:聽'.xlsx',
- inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+ entity: {
+ month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
+ name: null,
+ departLims: null,
+ orderBy: {
+ field: 'id',
+ order: 'desc'
+ }
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [],
+ tagField: {},
+ linkEvent: {
+ },
+ selectField: {},
+ requiredAdd: [],
+ requiredUp: [],
+ accept:聽'.xlsx',
+ inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
},
entity:{
month:getYearAndMonthAndDays(),
--
Gitblit v1.9.3