From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/performance/manHour/work-time-config.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/views/performance/manHour/work-time-config.vue b/src/views/performance/manHour/work-time-config.vue
index abe1b42..131ad9a 100644
--- a/src/views/performance/manHour/work-time-config.vue
+++ b/src/views/performance/manHour/work-time-config.vue
@@ -54,18 +54,16 @@
type="primary"
style="position: absolute; right: 50px"
@click="openAdd()"
+ v-hasPermi="['performance:manHour:workTimeConfig:add']"
>鏂� 澧�</el-button
>
</div>
<div class="table">
- <!-- <ValueTable ref="ValueTable0"
- :url="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours" :upUrl="$api.auxiliaryWorkingHours.upAuxiliaryWorkingHours"
- :delUrl="$api.auxiliaryWorkingHours.deleteAuxiliaryWorkingHours" :componentData="componentData" :key="upIndex" /> -->
<lims-table
:tableData="tableData"
:column="column"
:tableLoading="tableLoading"
- :height="'calc(100vh - 270px)'"
+ :height="tableHeight"
:page="page"
@pagination="pagination"
></lims-table>
@@ -172,6 +170,8 @@
} from "../../../api/business/manHour";
import { getYearAndMonthAndDays } from "../../../utils/date";
+import auth from "@/plugins/auth.js";
+
import { getDicts } from "@/api/system/dict/data";
import { number } from "echarts";
export default {
@@ -180,6 +180,7 @@
},
data() {
return {
+ tableHeight: "",
rules: {
number: [{ required: true, message: "璇疯緭鍏ョ紪鍙�", trigger: "blur" }],
auxiliaryProject: [
@@ -273,12 +274,18 @@
clickFun: (row) => {
this.openAdd(row);
},
+ showHide: (row) => {
+ return auth.hasPermi("performance:manHour:workTimeConfig:edit");
+ },
},
{
name: "鍒犻櫎",
type: "text",
clickFun: (row) => {
this.del(row);
+ },
+ showHide: (row) => {
+ return auth.hasPermi("performance:manHour:workTimeConfig:del");
},
},
],
@@ -302,7 +309,9 @@
addPower: true,
};
},
- created() {},
+ created() {
+ this.getTableHeight();
+ },
mounted() {
this.entityCopy = this.HaveJson(this.entity);
this.obtainItemParameterList();
@@ -310,6 +319,9 @@
this.getData();
},
methods: {
+ getTableHeight() {
+ this.tableHeight = window.innerHeight -50 -46 - 63 - 80 - 41 -30 -30 -32 + '';
+ },
getData() {
this.tableLoading = true;
this.page.total = 0;
--
Gitblit v1.9.3