From 368b525db5f3f4f82b13c074341708a46b9a4111 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 11 三月 2025 09:11:29 +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 | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index 2f10f73..60eaac8 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/src/views/performance/manHour/workTimeManagement.vue
@@ -220,7 +220,6 @@
</template>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
import { getYearAndMonthAndDays } from "@/utils/date";
import {
selectAuxiliaryWorkingHoursDay,
@@ -238,7 +237,6 @@
import limsTable from "@/components/Table/lims-table.vue";
export default {
components: {
- ValueTable,
limsTable,
},
dicts: ["sys_class_type"],
@@ -518,9 +516,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;
@@ -637,7 +636,6 @@
})
.then(() => {
deleteAuxiliaryWorkingHoursDay({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refreshTable("page");
});
@@ -660,7 +658,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 = "";
@@ -675,7 +672,6 @@
} else {
updateAuxiliaryWorkingHoursDay(this.formData).then((res) => {
this.addLoad = false;
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.formData.number = "";
this.formData.amount = "";
@@ -728,9 +724,6 @@
});
approve({ auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays }).then(
(res) => {
- if (res.code === 201) {
- return;
- }
this.submitBatchCheckDialog();
this.$message.success("鎿嶄綔鎴愬姛");
}
@@ -767,7 +760,6 @@
} else {
this.checkLoadY = false;
}
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.checkVisible = false;
this.refreshTable("page");
--
Gitblit v1.9.3