From dbfd4bc96205dd957827ee16c1149058fc2b88bb Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 04 三月 2026 15:31:14 +0800
Subject: [PATCH] perf:
---
ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 16 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue b/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue
index 2c64d93..ce8a1d2 100644
--- a/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue
+++ b/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import { toRaw } from 'vue';
+import { onMounted, ref, toRaw, watch } from 'vue';
import { jsonClone } from '@sa/utils';
import { useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
@@ -24,9 +24,55 @@
Object.assign(model.value, defaultModel);
}
+function getDefaultRange(): [string, string] {
+ const now = new Date();
+ const threeDaysAgo = new Date(now.getTime() - 3 * 24 * 60 * 60 * 1000);
+ const todayStart = `${threeDaysAgo.getFullYear()}-${String(threeDaysAgo.getMonth() + 1).padStart(2, '0')}-${String(threeDaysAgo.getDate()).padStart(2, '0')} 00:00:00`;
+ const todayEnd = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} 23:59:59`;
+ return [todayStart, todayEnd];
+}
+
+const dateRange = ref<[string, string] | null>(null);
+
+onMounted(() => {
+ if (model.value.params?.beginTime && model.value.params?.endTime) {
+ dateRange.value = [model.value.params.beginTime as string, model.value.params.endTime as string];
+ } else {
+ dateRange.value = getDefaultRange();
+ if (!model.value.params) {
+ model.value.params = {};
+ }
+ model.value.params.beginTime = dateRange.value[0];
+ model.value.params.endTime = dateRange.value[1];
+ }
+});
+
+watch(
+ dateRange,
+ val => {
+ if (!model.value.params) {
+ model.value.params = {};
+ }
+ if (val && val[0] && val[1]) {
+ model.value.params.beginTime = val[0];
+ model.value.params.endTime = val[1];
+ } else {
+ model.value.params.beginTime = null;
+ model.value.params.endTime = null;
+ }
+ },
+ { deep: true }
+);
+
async function reset() {
await restoreValidation();
resetModel();
+ dateRange.value = getDefaultRange();
+ if (!model.value.params) {
+ model.value.params = {};
+ }
+ model.value.params.beginTime = dateRange.value[0];
+ model.value.params.endTime = dateRange.value[1];
emit('search');
}
@@ -42,13 +88,25 @@
<NCollapseItem :title="$t('common.search')" name="analy-store-silk-search">
<NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
<NGrid responsive="screen" item-responsive>
- <NFormItemGi span="24 s:12 m:6" label="鐗屽彿" label-width="auto" path="materialname" class="pr-24px">
+ <NFormItemGi
+ span="24 s:12 m:8 l:8 xl:8"
+ label="鐗屽彿"
+ label-width="auto"
+ path="materialname"
+ class="pr-24px"
+ >
<NInput v-model:value="model.materialname" placeholder="璇疯緭鍏ョ墝鍙�" />
</NFormItemGi>
- <NFormItemGi span="24 s:12 m:6" label="鎵规鍙�" label-width="auto" path="batchcode" class="pr-24px">
+ <NFormItemGi span="24 s:12 m:8 l:8 xl:8" label="鎵规鍙�" label-width="auto" path="batchcode" class="pr-24px">
<NInput v-model:value="model.batchcode" placeholder="璇疯緭鍏ユ壒娆″彿" />
</NFormItemGi>
- <NFormItemGi span="24 s:12 m:6" label="鎶曟枡鏃ユ湡" label-width="auto" path="actualstarttime" class="pr-24px">
+ <NFormItemGi
+ span="24 s:12 m:8 l:8 xl:8"
+ label="鎶曟枡鏃ユ湡"
+ label-width="auto"
+ path="actualstarttime"
+ class="pr-24px"
+ >
<NDatePicker
v-model:formatted-value="model.actualstarttime"
type="datetime"
@@ -56,23 +114,28 @@
clearable
/>
</NFormItemGi>
- <NFormItemGi span="24 s:12 m:6" label="鍌ㄤ笣鏌滃嚭鏂欏紑濮嬫椂闂�" label-width="auto" path="distimebegin" class="pr-24px">
+ <NFormItemGi
+ span="24 s:12 m:8 l:8 xl:8"
+ label="鍑烘枡缁撴潫鏃堕棿"
+ label-width="auto"
+ path="params.beginTime"
+ class="pr-24px"
+ >
<NDatePicker
- v-model:formatted-value="model.distimebegin"
- type="datetime"
+ v-model:formatted-value="dateRange"
+ type="datetimerange"
+ :default-time="['00:00:00', '23:59:59']"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</NFormItemGi>
- <NFormItemGi span="24 s:12 m:6" label="鍌ㄤ笣鏌滃嚭鏂欑粨鏉熸椂闂�" label-width="auto" path="distimeend" class="pr-24px">
- <NDatePicker
- v-model:formatted-value="model.distimeend"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- clearable
- />
- </NFormItemGi>
- <NFormItemGi span="24 s:12 m:6" label="鏌滃瓙鍙�(鏈綅)" label-width="auto" path="siloid" class="pr-24px">
+ <NFormItemGi
+ span="24 s:12 m:8 l:8 xl:8"
+ label="鏌滃瓙鍙�(鏈綅)"
+ label-width="auto"
+ path="siloid"
+ class="pr-24px"
+ >
<NInput v-model:value="model.siloid" placeholder="璇疯緭鍏ユ煖瀛愬彿(鏈綅)" />
</NFormItemGi>
<NFormItemGi :show-feedback="false" span="24" class="pr-24px">
--
Gitblit v1.9.3