From 58faef5c48c7491fe14e2a3ec0a0db4dba8967a6 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 23 七月 2024 17:23:49 +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 | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 8f32955..70f7bc3 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
@@ -44,21 +44,24 @@
<el-button size="small" type="primary" @click="handleUp" v-show="currentTable == 'value1'&&up">瀵� 鍏�</el-button>
</div>
</div>
- <el-radio-group v-model="currentTable" size="small" :key="'111'" style="margin-top: 10px;">
- <el-radio-button label="value0">
- 鍘熷宸ユ椂
- </el-radio-button>
- <el-radio-button label="value1">
- 淇宸ユ椂
- </el-radio-button>
- </el-radio-group>
+ <div style="text-align: left">
+ <el-radio-group v-model="currentTable" size="small" :key="'111'" style="margin-top: 10px;">
+ <el-radio-button label="value0">
+ 鍘熷宸ユ椂
+ </el-radio-button>
+ <el-radio-button label="value1">
+ 淇宸ユ椂
+ </el-radio-button>
+ </el-radio-group>
+ </div>
<div class="table">
<ValueTable ref="ValueTable0"
- v-if="currentTable == 'value0'"
+ v-if="currentTable == 'value0'" :isColumnWidth="true"
+ :isShowZero="true"
:url="$api.auxiliaryOriginalHours.selectAuxiliaryOriginalHours"
:componentData="componentData" :key="upIndex" />
- <ValueTable ref="ValueTable1"
- v-if="currentTable == 'value1'"
+ <ValueTable ref="ValueTable1" :isShowZero="true"
+ v-if="currentTable == 'value1'" :isColumnWidth="true"
:url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
:inputUrl="$api.auxiliaryCorrectionHours.upload"
:componentData="componentData0"
--
Gitblit v1.9.3