From b5196ecfbda5236f3fd3f0213a5e6911d291bda4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 26 七月 2024 17:12:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b3-work-time-management/work-time-statistics.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 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 cd0f643..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
@@ -57,9 +57,10 @@
<div class="table">
<ValueTable ref="ValueTable0"
v-if="currentTable == 'value0'" :isColumnWidth="true"
+ :isShowZero="true"
:url="$api.auxiliaryOriginalHours.selectAuxiliaryOriginalHours"
:componentData="componentData" :key="upIndex" />
- <ValueTable ref="ValueTable1"
+ <ValueTable ref="ValueTable1" :isShowZero="true"
v-if="currentTable == 'value1'" :isColumnWidth="true"
:url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
:inputUrl="$api.auxiliaryCorrectionHours.upload"
@@ -98,6 +99,7 @@
requiredAdd: [],
requiredUp: [],
accept:聽'.xlsx',
+ sort: false,
inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
cellSpecialStyle:{
redColorByKey:'Hours'
@@ -113,6 +115,7 @@
order: 'desc'
}
},
+ sort: false,
isIndex: true,
showSelect: false,
select: false,
--
Gitblit v1.9.3