From ee38779810cfbe512788f71679aaaaa7fedb1775 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期二, 18 三月 2025 11:19:00 +0800
Subject: [PATCH] 表格合并以及权限添加
---
src/views/performance/manHour/work-time-statistics.vue | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/views/performance/manHour/work-time-statistics.vue b/src/views/performance/manHour/work-time-statistics.vue
index 86aac14..e57b4d3 100644
--- a/src/views/performance/manHour/work-time-statistics.vue
+++ b/src/views/performance/manHour/work-time-statistics.vue
@@ -95,24 +95,13 @@
</el-radio-group>
</div>
<div class="table">
- <!-- <ValueTable ref="ValueTable0"
- v-if="currentTable == 'value0' && isPermission('selectAuxiliaryOriginalHours')" :isColumnWidth="true"
- :isShowZero="true"
- :url="$api.auxiliaryOriginalHours.selectAuxiliaryOriginalHours"
- :componentData="componentData" :key="upIndex" />
- <ValueTable ref="ValueTable1" :isShowZero="true"
- v-if="currentTable == 'value1' && isPermission('selectAuxiliaryCorrectionHours')" :isColumnWidth="true"
- :url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
- :inputUrl="$api.auxiliaryCorrectionHours.upload"
- :componentData="componentData0"
- :key="upIndex1" /> -->
<lims-table
v-if="currentTable == 'value0'"
:tableData="tableData"
:column="column"
:key="upIndex"
:tableLoading="tableLoading"
- :height="'calc(100vh - 270px)'"
+ :height="tableHeight+''"
:page="page"
@pagination="pagination"
></lims-table>
@@ -123,7 +112,7 @@
:column="column1"
:key="upIndex1"
:tableLoading="tableLoading1"
- :height="'calc(100vh - 270px)'"
+ :height="tableHeight+''"
:page="page1"
@pagination="pagination1"
></lims-table>
@@ -151,6 +140,7 @@
computed: {},
data() {
return {
+ tableHeight: "",
column: [
{
label: "濮撳悕",
@@ -468,7 +458,9 @@
outLoading: false,
};
},
- created() {},
+ created() {
+ this.getTableHeight();
+ },
mounted() {
this.entityCopy = this.HaveJson(this.entity);
this.entityCopy0 = this.HaveJson(this.entity);
@@ -480,6 +472,9 @@
},
},
methods: {
+ getTableHeight() {
+ this.tableHeight = window.innerHeight -50 -46 - 63 - 80 - 41 -30 -30 -32;
+ },
getData() {
if (this.currentTable == "value0") {
console.log('value0');
@@ -505,13 +500,13 @@
pagination({ page, limit }) {
this.page.current = page;
this.page.size = limit;
- this.getList();
+ this.getData();
},
// 杩斿洖鍒嗛〉鍊�
pagination1({ page, limit }) {
this.page1.current = page;
this.page1.size = limit;
- this.getList();
+ this.getData();
},
refresh() {
this.entity = {
--
Gitblit v1.9.3