From 0600ab29100da647a5cd34c935c16f59b3e772e5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 17 三月 2025 11:14:39 +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 | 77 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/src/views/performance/manHour/work-time-management.vue b/src/views/performance/manHour/work-time-management.vue
index df4bd08..2f78cbe 100644
--- a/src/views/performance/manHour/work-time-management.vue
+++ b/src/views/performance/manHour/work-time-management.vue
@@ -150,26 +150,6 @@
</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"
@@ -492,7 +472,8 @@
collectWorkingHours,
selectshiftByUser,
selectAuxiliaryWorkingHoursByNumber,
- exportWorkingHours
+ exportWorkingHours,
+ deleteAuxiliaryWorkingHoursDay
} from "../../../api/business/manHour";
import { getYearAndMonthAndDays } from "../../../utils/date";
@@ -604,7 +585,42 @@
{
label: '鏃ユ湡',
prop: 'dateTime'
- }
+ },
+ {
+ dataType: "action",
+ fixed: "right",
+ label: "鎿嶄綔",
+ operation: [
+ {
+ name: "鍒犻櫎",
+ type: "text",
+ clickFun: (row) => {
+ this.del(row);
+ },
+ },
+ {
+ name: "缂栬緫",
+ type: "text",
+ clickFun: (row) => {
+ this.handleEdit(row);
+ },
+ },
+ {
+ name: "瀹℃牳",
+ type: "text",
+ clickFun: (row) => {
+ this.handleCheck(row);
+ },
+ },
+ {
+ name: "鎵瑰噯",
+ type: "text",
+ clickFun: (row) => {
+ this.handleRatify(row);
+ },
+ },
+ ],
+ },
],
tableLoading: false,
page: {
@@ -833,6 +849,22 @@
this.entityCopy1 = this.HaveJson(this.entity);
},
methods: {
+ 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('杈呭姪宸ユ椂');
@@ -1137,7 +1169,6 @@
this.$message.success("鎿嶄綔鎴愬姛");
this.checkVisible = false;
this.refreshTable("page");
- this.collectWorkingHours();
});
}
},
--
Gitblit v1.9.3