From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/performance/manHour/workTimeManagement.vue | 79 +++++++++++++++++++++++----------------
1 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index c32c29e..f5b7942 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/src/views/performance/manHour/workTimeManagement.vue
@@ -47,23 +47,23 @@
<el-radio-button label="ValueTable1"> 浜ч噺宸ユ椂 </el-radio-button>
</el-radio-group>
<div style="display: flex; align-items: center">
- <p style="font-size: 14px; margin-right: 30px">
- 鎬诲伐鏃舵眹鎬伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{
- totalInfo["浜ч噺宸ユ椂姹囨��"] + totalInfo["杈呭姪宸ユ椂姹囨��"]
- ? Number(
- totalInfo["浜ч噺宸ユ椂姹囨��"] + totalInfo["杈呭姪宸ユ椂姹囨��"]
- ).tofixed(4)
- : 0
- }}</span> 浜ч噺宸ユ椂姹囨�伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{
- totalInfo["浜ч噺宸ユ椂姹囨��"]
- ? Number(totalInfo["浜ч噺宸ユ椂姹囨��"]).tofixed(4)
- : 0
- }}</span> 杈呭姪宸ユ椂姹囨�伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{
- totalInfo["杈呭姪宸ユ椂姹囨��"]
- ? Number(totalInfo["杈呭姪宸ユ椂姹囨��"]).tofixed(4)
- : 0
- }}</span>
- </p>
+<!-- <p style="font-size: 14px; margin-right: 30px">-->
+<!-- 鎬诲伐鏃舵眹鎬伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{-->
+<!-- totalInfo["浜ч噺宸ユ椂姹囨��"] + totalInfo["杈呭姪宸ユ椂姹囨��"]-->
+<!-- ? Number(-->
+<!-- totalInfo["浜ч噺宸ユ椂姹囨��"] + totalInfo["杈呭姪宸ユ椂姹囨��"]-->
+<!-- ).tofixed(4)-->
+<!-- : 0-->
+<!-- }}</span> 浜ч噺宸ユ椂姹囨�伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{-->
+<!-- totalInfo["浜ч噺宸ユ椂姹囨��"]-->
+<!-- ? Number(totalInfo["浜ч噺宸ユ椂姹囨��"]).tofixed(4)-->
+<!-- : 0-->
+<!-- }}</span> 杈呭姪宸ユ椂姹囨�伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{-->
+<!-- totalInfo["杈呭姪宸ユ椂姹囨��"]-->
+<!-- ? Number(totalInfo["杈呭姪宸ユ椂姹囨��"]).tofixed(4)-->
+<!-- : 0-->
+<!-- }}</span>-->
+<!-- </p>-->
<el-button v-show="currentTable == 'ValueTable0' &&
checkPermi(['performance:manHour:workTimeManagement:add'])
" size="small" type="primary" @click="openAdd">褰曞叆鏁版嵁</el-button>
@@ -250,13 +250,13 @@
down: false,
addFileVisible: false,
weekList: [
- { label: "鍛ㄤ竴", value: "鍛ㄤ竴", type: "primary" },
- { label: "鍛ㄤ簩", value: "鍛ㄤ簩", type: "primary" },
- { label: "鍛ㄤ笁", value: "鍛ㄤ笁", type: "primary" },
- { label: "鍛ㄥ洓", value: "鍛ㄥ洓", type: "primary" },
- { label: "鍛ㄤ簲", value: "鍛ㄤ簲", type: "primary" },
- { label: "鍛ㄥ叚", value: "鍛ㄥ叚", type: "primary" },
- { label: "鍛ㄦ棩", value: "鍛ㄦ棩", type: "primary" },
+ { label: "鍛ㄤ竴", value: "1", type: "primary" },
+ { label: "鍛ㄤ簩", value: "2", type: "primary" },
+ { label: "鍛ㄤ笁", value: "3", type: "primary" },
+ { label: "鍛ㄥ洓", value: "4", type: "primary" },
+ { label: "鍛ㄤ簲", value: "5", type: "primary" },
+ { label: "鍛ㄥ叚", value: "6", type: "primary" },
+ { label: "鍛ㄦ棩", value: "0", type: "primary" },
],
currentTable: "ValueTable0",
addVisible: false,
@@ -354,10 +354,23 @@
label: "鐝",
prop: "shift",
dataType: "tag",
- formatData: this.shifList,
+ formatData: (params) => {
+ if (this.shifList.find(m => m.value == params)) {
+ return this.shifList.find(m => m.value == params).label
+ } else {
+ return null
+ }
+ },
},
{ label: "鍛ㄦ", prop: "week" },
- { label: "鏄熸湡", prop: "weekDay" },
+ {
+ label: "鏄熸湡",
+ prop: "weekDay",
+ dataType: "tag",
+ formatData: (params) => {
+ return this.weekList.find(m => m.value == params).label
+ },
+ },
{ label: "鍒涘缓鏃堕棿", prop: "createTime" },
{ label: "鏃ユ湡", prop: "dateTime" },
{
@@ -505,7 +518,7 @@
},
mounted() {
this.getCurrentWeekNumber();
- this.collectWorkingHours();
+ // this.collectWorkingHours();
this.selectshiftByUser();
this.searchList()
},
@@ -612,10 +625,12 @@
this.page0.current = 1;
this.getList0(entity);
}
- this.collectWorkingHours();
+ // this.collectWorkingHours();
},
refresh() {
this.entity = {};
+ this.entity.dateTime = []
+ this.setDate()
this.refreshTable();
},
openAdd() {
@@ -677,7 +692,7 @@
this.formData.auxiliaryProject = "";
this.addVisible = false;
this.refreshTable("page");
- this.collectWorkingHours();
+ // this.collectWorkingHours();
});
} else {
updateAuxiliaryWorkingHoursDay(this.formData).then((res) => {
@@ -690,7 +705,7 @@
this.formData.nonproductiveTime = "";
this.formData.auxiliaryProject = "";
this.refreshTable("page");
- this.collectWorkingHours();
+ // this.collectWorkingHours();
});
}
},
@@ -745,7 +760,7 @@
submitBatchCheckDialog() {
this.batchCheckDialog = false;
this.refreshTable("page");
- this.collectWorkingHours();
+ // this.collectWorkingHours();
},
submitCheck(e) {
if (!this.formData0.number) {
@@ -773,7 +788,7 @@
this.$message.success("鎿嶄綔鎴愬姛");
this.checkVisible = false;
this.refreshTable("page");
- this.collectWorkingHours();
+ // this.collectWorkingHours();
});
},
getCurrentWeekNumber(now = new Date()) {
--
Gitblit v1.9.3