diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
new file mode 100644
index 0000000..0da5818
--- /dev/null
+++ b/src/components/common/datetime-range.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue
index 991299e..d4ba9b4 100644
--- a/src/components/common/search-form.vue
+++ b/src/components/common/search-form.vue
@@ -10,6 +10,7 @@ defineOptions({
interface Props {
model: Record;
+ btnSpan?: string;
}
const props = defineProps();
@@ -41,14 +42,14 @@ async function search() {
const btnSpan = computed(() => {
const keyNum = Object.keys(props.model).length - 2;
- return `24 m:12 m:${(4 - (keyNum % 4)) * 6}`;
+ return props.btnSpan || `24 m:12 m:${(4 - (keyNum % 4)) * 6}`;
});
-
+
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 0a8350e..9cc03cf 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1079,7 +1079,8 @@ declare namespace Api {
/** JobBatch search params */
type JobBatchSearchParams = CommonType.RecordNullable<
- Pick & CommonSearchParams
+ Pick &
+ CommonSearchParams & { beginDate: number; endDate: number }
>;
/** JobBatch list */
diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 075c640..d618a1d 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -26,7 +26,9 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
size: 10,
groupName: null,
jobName: null,
- taskBatchStatus: null
+ taskBatchStatus: null,
+ beginDate: null,
+ endDate: null
},
searchParams: {
jobName,
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 2df1836..d9e8fd7 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -26,7 +26,7 @@ function search() {
-
+
@@ -36,6 +36,9 @@ function search() {
+
+
+