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-management.vue | 116 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 31 deletions(-)
diff --git a/src/views/performance/manHour/work-time-management.vue b/src/views/performance/manHour/work-time-management.vue
index df4bd08..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,31 +148,12 @@
type="primary"
v-show="currentTable == 'ValueTable0'"
@click="openBatchCheck(1)"
+ v-hasPermi="['performance:manHour:workTimeManagement:batchApprove']"
>鎵归噺鎵瑰噯</el-button
>
</div>
</div>
<div class="table">
- <!-- <ValueTable
- ref="ValueTable0"
- v-if="currentTable == 'ValueTable0'"
- :isColumnWidth="true"
- :url="$api.auxiliaryWorkingHoursDay.selectAuxiliaryWorkingHoursDay"
- :delUrl="$api.auxiliaryWorkingHoursDay.deleteAuxiliaryWorkingHoursDay"
- :componentData="componentData"
- :key="upIndex"
- @delete="handleDelete"
- /> -->
- <!-- <ValueTable
- ref="ValueTable1"
- v-if="currentTable == 'ValueTable1'"
- :isColumnWidth="true"
- :url="
- $api.auxiliaryOutputWorkingHours.selectAuxiliaryOutputWorkingHours
- "
- :componentData="componentData1"
- :key="upIndex1"
- /> -->
<lims-table
v-if="currentTable == 'ValueTable0'"
:tableData="tableData"
@@ -178,7 +162,7 @@
:column="column"
:key="upIndex"
:tableLoading="tableLoading"
- :height="'calc(100vh - 270px)'"
+ :height="tableHeight+''"
:page="page"
@pagination="pagination"
></lims-table>
@@ -189,7 +173,7 @@
:column="column1"
:key="upIndex1"
:tableLoading="tableLoading1"
- :height="'calc(100vh - 270px)'"
+ :height="tableHeight+''"
:page="page1"
@pagination="pagination1"
></lims-table>
@@ -492,9 +476,12 @@
collectWorkingHours,
selectshiftByUser,
selectAuxiliaryWorkingHoursByNumber,
- exportWorkingHours
+ exportWorkingHours,
+ deleteAuxiliaryWorkingHoursDay
} 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";
@@ -504,6 +491,7 @@
},
data() {
return {
+ tableHeight: "",
shiftList:[],
tableData: [],
column: [
@@ -604,7 +592,54 @@
{
label: '鏃ユ湡',
prop: 'dateTime'
- }
+ },
+ {
+ dataType: "action",
+ fixed: "right",
+ label: "鎿嶄綔",
+ operation: [
+ {
+ name: "鍒犻櫎",
+ type: "text",
+ clickFun: (row) => {
+ this.del(row);
+ },
+ showHide: () => {
+ return auth.hasPermi('performance:manHour:workTimeManagement:del');
+ }
+ },
+ {
+ name: "缂栬緫",
+ type: "text",
+ clickFun: (row) => {
+ this.handleEdit(row);
+ },
+ showHide: () => {
+ return auth.hasPermi('performance:manHour:workTimeManagement:edit');
+ }
+ },
+ {
+ name: "瀹℃牳",
+ type: "text",
+ clickFun: (row) => {
+ this.handleCheck(row);
+ },
+ showHide: () => {
+ return auth.hasPermi('performance:manHour:workTimeManagement:examine');
+ }
+ },
+ {
+ name: "鎵瑰噯",
+ type: "text",
+ clickFun: (row) => {
+ this.handleRatify(row);
+ },
+ showHide: () => {
+ return auth.hasPermi('performance:manHour:workTimeManagement:approve');
+ }
+ },
+ ],
+ },
],
tableLoading: false,
page: {
@@ -824,6 +859,7 @@
//褰撳彧鏈変骇閲忓伐鏃秚ab椤垫椂锛屽綋鍓嶉〉鏀逛负浜ч噺宸ユ椂椤�
this.selectEnumByCategory();
this.setDate();
+ this.getTableHeight();
},
mounted() {
console.log(11);
@@ -833,6 +869,25 @@
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("姝ゆ搷浣滃皢姘镐箙鍒犻櫎, 鏄惁缁х画?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }).then(() => {
+ deleteAuxiliaryWorkingHoursDay({id:row.id}).then((res) => {
+ this.$message({
+ type: "success",
+ message: "鍒犻櫎鎴愬姛!",
+ });
+ this.refreshTable();
+ });
+ });
+ },
getData() {
if (this.currentTable == "ValueTable0") {
console.log('杈呭姪宸ユ椂');
@@ -857,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,
@@ -874,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();
},
@@ -1137,7 +1192,6 @@
this.$message.success("鎿嶄綔鎴愬姛");
this.checkVisible = false;
this.refreshTable("page");
- this.collectWorkingHours();
});
}
},
--
Gitblit v1.9.3