From 083b65c625ddfd238b4d325f856ab3bf706f71a4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 14 Apr 2025 15:26:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/TaskManage/SearchBox.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/views/TaskManage/SearchBox.vue b/src/views/TaskManage/SearchBox.vue
index 19af07f..a68978c 100644
--- a/src/views/TaskManage/SearchBox.vue
+++ b/src/views/TaskManage/SearchBox.vue
@@ -71,7 +71,9 @@
import { deptsByAreaCode, getDockInfo } from '@/api/home/common';
import TaskAlgorithmBusiness from './components/TaskAlgorithmBusiness.vue';
import dayjs from 'dayjs';
+import { useStore } from 'vuex'
+const store = useStore()
const isExpand = ref(false);
const toggleExpand = () => {
isExpand.value = !isExpand.value;
@@ -102,11 +104,14 @@
const emit = defineEmits(['search','addTask']);
const handleSearch = () => {
- emit('search', {
+ // 提交至store
+ let params = {
...searchForm,
start_date: dateRange.value.length ? `${dateRange.value[0]} 00:00:00` : null,
end_date: dateRange.value.length ? `${dateRange.value[1]} 23:59:59` : null
- });
+ }
+ store.commit('setTaskSearchParams', params);
+ emit('search', params);
};
const handleReset = () => {
@@ -187,7 +192,7 @@
checked.value = item;
// model.value = dateRanges[item];
// emit('change', dateRanges[item],timeListEnum[index]);
- searchForm.value.date_enum = timeListEnum[index];
+ searchForm.date_enum = timeListEnum[index];
};
--
Gitblit v1.9.3