From 0577500bbbc511733fdce75ad511377012ac98f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=AC=E9=8B=86=E5=B1=BE?= <804461479@qq.com>
Date: Tue, 8 Aug 2023 15:48:38 +0800
Subject: [PATCH] tui
---
.../admin/src/components/SearchForm.vue | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/attendance-performance-manager-ui/admin/src/components/SearchForm.vue b/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
index 48cbb832..70fafb64 100644
--- a/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
+++ b/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
@@ -180,7 +180,7 @@
import Qs from "qs";
import { type } from "@/assets/utils";
import { isArray } from "util";
-
+import { getFirstDay, getLastDay } from "@/assets/utils/dateFormat.js";
export default {
props: {
search: {
@@ -295,8 +295,21 @@ export default {
}
}
+ if (this.form.summaryTimeStart && this.form.summaryTimeEnd) {
+ let startValue = Date.parse(this.form.summaryTimeStart);
+ let endValue = Date.parse(this.form.summaryTimeEnd);
+ if (startValue > endValue) {
+ this.$message.error("鏌ヨ-缁撴潫鐨勬棩鏈熼渶澶т簬寮€濮嬫棩鏈�");
+ this.form.summaryTimeEnd = "";
+ return false;
+ }
+ } else {
+ this.form.summaryTimeStart = getFirstDay();
+ this.form.summaryTimeEnd = getLastDay();
+ }
+
let params = JSON.parse(JSON.stringify(this.form)); //涓嶆洿鏀瑰師濮嬫暟鎹�
- console.log(this.form,'form鍙傛暟')
+ console.log(this.form, "form鍙傛暟");
let data = this.decode(params);
// Object.assign({}, query, data)
this.$router.push({
@@ -344,7 +357,6 @@ export default {
let newData = { page: 1 };
Object.keys(data).forEach((item) => {
let val = data[item];
- console.log(item,this.search)
this.search.forEach((obj) => {
if (
obj.name === item &&
--
2.24.3