From 2d55ed180fddd028bf4f839345bf0ef4d2f032e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 13:34:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/performance/manHour/workTimeManagement.vue | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index 9e7a9c0..8be8062 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/src/views/performance/manHour/workTimeManagement.vue
@@ -518,9 +518,10 @@
param = { ...entity, ...this.page };
} else {
param = { ...this.entity, ...this.page };
- param.dateTime = JSON.stringify(param.dateTime);
+ param.dateTime = param.dateTime?.length > 0 ? JSON.stringify(param.dateTime) : null;
}
delete param.total;
+ console.log('11111111111111111')
selectAuxiliaryWorkingHoursDay({ ...param })
.then((res) => {
this.tableLoading = false;
@@ -659,7 +660,6 @@
if (!this.formData.id) {
insertAuxiliaryWorkingHoursDay(this.formData).then((res) => {
this.addLoad = false;
- if (res.code == 201) return;
this.$message.success("宸叉彁浜�");
this.formData.number = "";
this.formData.amount = "";
@@ -674,7 +674,6 @@
} else {
updateAuxiliaryWorkingHoursDay(this.formData).then((res) => {
this.addLoad = false;
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.formData.number = "";
this.formData.amount = "";
@@ -727,9 +726,6 @@
});
approve({ auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays }).then(
(res) => {
- if (res.code === 201) {
- return;
- }
this.submitBatchCheckDialog();
this.$message.success("鎿嶄綔鎴愬姛");
}
@@ -766,7 +762,6 @@
} else {
this.checkLoadY = false;
}
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.checkVisible = false;
this.refreshTable("page");
--
Gitblit v1.9.3