From 8696b4d4c235a73f2bc5c030e20f1ad7c0a7166e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 25 二月 2025 14:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/performance/manHour/workTimeConfig.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/performance/manHour/workTimeConfig.vue b/src/views/performance/manHour/workTimeConfig.vue
index 5364c89..4fcad16 100644
--- a/src/views/performance/manHour/workTimeConfig.vue
+++ b/src/views/performance/manHour/workTimeConfig.vue
@@ -30,8 +30,8 @@
v-if="checkPermi(['performance:manHour:workTimeConfig:add'])">鏂� 澧�</el-button>
</div>
<div class="table">
- <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
- :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
+ <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 290px)'"
+ :page="page" @pagination="pagination"></lims-table>
</div>
<!-- 鏂板/缂栬緫 -->
<el-dialog :title="title" :visible.sync="timeDia" width="500px">
--
Gitblit v1.9.3