From 13a60da2424da8cd50e52e35e0126e23e34ea6f3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/performance/manHour/workTimeStatistics.vue | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/views/performance/manHour/workTimeStatistics.vue b/src/views/performance/manHour/workTimeStatistics.vue
index 21dff0b..8f7dc37 100644
--- a/src/views/performance/manHour/workTimeStatistics.vue
+++ b/src/views/performance/manHour/workTimeStatistics.vue
@@ -37,20 +37,16 @@
</div>
</div>
<div class="table">
- <TableCard :showForm="false" :showTitle="false">
- <template v-slot:table>
- <limsTable
- :column="tableColumn"
- :table-data="tableData"
- :table-loading="tableLoading"
- :page="page"
- style="padding: 0 15px"
- :height="'calc(100vh - 290px)'"
- @pagination="pagination"
- >
- </limsTable>
- </template>
- </TableCard>
+ <limsTable
+ :column="tableColumn"
+ :table-data="tableData"
+ :table-loading="tableLoading"
+ :page="page"
+ style="padding: 0 15px"
+ :height="'calc(100vh - 290px)'"
+ @pagination="pagination"
+ >
+ </limsTable>
</div>
</div>
</div>
@@ -58,13 +54,11 @@
<script>
import { getYearAndMonthAndDays } from "@/utils/date";
-import TableCard from "@/components/TableCard/index.vue";
import limsTable from "@/components/Table/lims-table.vue";
import { selectAuxiliaryAllByMonth } from "@/api/performance/manHour";
export default {
components: {
- limsTable,
- TableCard,
+ limsTable
},
data() {
return {
--
Gitblit v1.9.3