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-management.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/views/performance/manHour/work-time-management.vue b/src/views/performance/manHour/work-time-management.vue
index 2f78cbe..d2abcb7 100644
--- a/src/views/performance/manHour/work-time-management.vue
+++ b/src/views/performance/manHour/work-time-management.vue
@@ -124,6 +124,7 @@
type="primary"
@click="openAdd"
v-show="currentTable == 'ValueTable0'"
+ v-hasPermi="['performance:manHour:workTimeManagement:enterData']"
>褰曞叆鏁版嵁</el-button
>
<el-button
@@ -131,6 +132,7 @@
type="primary"
@click="handleOut"
:loading="outLoading"
+ v-hasPermi="['performance:manHour:workTimeManagement:export']"
>瀵� 鍑�</el-button
>
<el-button
@@ -138,6 +140,7 @@
type="primary"
v-show="currentTable == 'ValueTable0'"
@click="openBatchCheck(0)"
+ v-hasPermi="['performance:manHour:workTimeManagement:batchExamine']"
>鎵归噺瀹℃牳</el-button
>
<el-button
@@ -145,6 +148,7 @@
type="primary"
v-show="currentTable == 'ValueTable0'"
@click="openBatchCheck(1)"
+ v-hasPermi="['performance:manHour:workTimeManagement:batchApprove']"
>鎵归噺鎵瑰噯</el-button
>
</div>
@@ -158,7 +162,7 @@
:column="column"
:key="upIndex"
:tableLoading="tableLoading"
- :height="'calc(100vh - 270px)'"
+ :height="tableHeight+''"
:page="page"
@pagination="pagination"
></lims-table>
@@ -169,7 +173,7 @@
:column="column1"
:key="upIndex1"
:tableLoading="tableLoading1"
- :height="'calc(100vh - 270px)'"
+ :height="tableHeight+''"
:page="page1"
@pagination="pagination1"
></lims-table>
@@ -477,6 +481,8 @@
} from "../../../api/business/manHour";
import { getYearAndMonthAndDays } from "../../../utils/date";
+import auth from "@/plugins/auth.js";
+
import { getDicts } from "@/api/system/dict/data";
import Big from "big.js";
export default {
@@ -485,6 +491,7 @@
},
data() {
return {
+ tableHeight: "",
shiftList:[],
tableData: [],
column: [
@@ -597,6 +604,9 @@
clickFun: (row) => {
this.del(row);
},
+ showHide: () => {
+ return auth.hasPermi('performance:manHour:workTimeManagement:del');
+ }
},
{
name: "缂栬緫",
@@ -604,6 +614,9 @@
clickFun: (row) => {
this.handleEdit(row);
},
+ showHide: () => {
+ return auth.hasPermi('performance:manHour:workTimeManagement:edit');
+ }
},
{
name: "瀹℃牳",
@@ -611,6 +624,9 @@
clickFun: (row) => {
this.handleCheck(row);
},
+ showHide: () => {
+ return auth.hasPermi('performance:manHour:workTimeManagement:examine');
+ }
},
{
name: "鎵瑰噯",
@@ -618,6 +634,9 @@
clickFun: (row) => {
this.handleRatify(row);
},
+ showHide: () => {
+ return auth.hasPermi('performance:manHour:workTimeManagement:approve');
+ }
},
],
},
@@ -840,6 +859,7 @@
//褰撳彧鏈変骇閲忓伐鏃秚ab椤垫椂锛屽綋鍓嶉〉鏀逛负浜ч噺宸ユ椂椤�
this.selectEnumByCategory();
this.setDate();
+ this.getTableHeight();
},
mounted() {
console.log(11);
@@ -849,6 +869,9 @@
this.entityCopy1 = this.HaveJson(this.entity);
},
methods: {
+ getTableHeight() {
+ this.tableHeight = window.innerHeight -50 -46 - 63 - 80 - 41 -30 -30 -32;
+ },
del(row) {
console.log(row);
this.$confirm("姝ゆ搷浣滃皢姘镐箙鍒犻櫎, 鏄惁缁х画?", "鎻愮ず", {
@@ -889,8 +912,8 @@
console.log('浜ч噺宸ユ椂');
this.tableLoading1 = true;
let params = {
- current: this.page.current,
- size: this.page.size,
+ current: this.page1.current,
+ size: this.page1.size,
dateTime1: this.entity.dateTime[0],
dateTime2: this.entity.dateTime[1],
week: this.entity.week,
@@ -906,13 +929,13 @@
});
}
},
- pagination({ current, limit }) {
- this.page.current = current;
+ pagination({ page, limit }) {
+ this.page.current = page;
this.page.size = limit;
this.getData();
},
- pagination1({ current, limit }) {
- this.page1.current = current;
+ pagination1({ page, limit }) {
+ this.page1.current = page;
this.page1.size = limit;
this.getData();
},
--
Gitblit v1.9.3