From 34fdb0a5b70e6e6f5ec8169f7c964d42c42ed927 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 11 三月 2026 10:14:04 +0800
Subject: [PATCH] fix:安全培训-筛选日期有误，筛选出的内容也不对
---
src/pages/safeProduction/safetyTrainingAssessment/index.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/pages/safeProduction/safetyTrainingAssessment/index.vue b/src/pages/safeProduction/safetyTrainingAssessment/index.vue
index 44a99c7..fde745e 100644
--- a/src/pages/safeProduction/safetyTrainingAssessment/index.vue
+++ b/src/pages/safeProduction/safetyTrainingAssessment/index.vue
@@ -186,20 +186,22 @@
// 鑾峰彇瀛楀吀鏁版嵁
const { safe_training_methods } = useDict("safe_training_methods");
- // 鎼滅储鍏抽敭璇�
- const searchKeyword = ref("");
+ // 鎼滅储鍏抽敭璇嶏紝榛樿涓哄綋澶╂棩鏈�
+ const searchKeyword = ref(dayjs().format("YYYY-MM-DD"));
// 鏃ユ湡閫夋嫨鍣ㄧ姸鎬�
const trainingDateVisible = ref(false);
+ // 鏃ユ湡缁勪欢缁戝畾鍊硷紙鐢ㄤ簬鎺у埗榛樿閫変腑鏃ユ湡锛�
+ const trainingDateModel = ref(Date.now());
const tabList = reactive([
{ name: "鏈紑濮�", value: 0 },
{ name: "杩涜涓�", value: 1 },
{ name: "宸茬粨鏉�", value: 2 },
]);
- // 鎼滅储琛ㄥ崟
+ // 鎼滅储琛ㄥ崟锛屽煿璁棩鏈熼粯璁ゅ綋澶�
const searchForm = ref({
- state: 0, // 榛樿鏄剧ず宸茬粨鏉�
- trainingDate: "",
+ state: 0,
+ trainingDate: dayjs().format("YYYY-MM-DD"),
});
const tabhandleQuery = val => {
searchForm.value.state = val.value;
@@ -275,6 +277,7 @@
const clearDate = () => {
searchKeyword.value = "";
searchForm.value.trainingDate = "";
+ trainingDateModel.value = Date.now();
getList();
};
// 鏄剧ず鏃ユ湡閫夋嫨鍣�
@@ -284,8 +287,23 @@
// 澶勭悊鏃ユ湡閫夋嫨纭
const handleDateConfirm = e => {
- searchKeyword.value = dayjs(e.value).format("YYYY-MM-DD");
- searchForm.value.trainingDate = dayjs(e.value).format("YYYY-MM-DD");
+ const raw = e?.value;
+ // up-datetime-picker 鐨� value 鍙兘鏄� Date / 姣鏃堕棿鎴�(13浣�) / 绉掓椂闂存埑(10浣�) / 瀛楃涓�
+ const normalized =
+ typeof raw === "number"
+ ? raw < 1e12
+ ? raw * 1000
+ : raw
+ : typeof raw === "string" && /^\d+$/.test(raw)
+ ? raw.length === 10
+ ? Number(raw) * 1000
+ : Number(raw)
+ : raw;
+
+ const formatted = dayjs(normalized).format("YYYY-MM-DD");
+ searchKeyword.value = formatted;
+ searchForm.value.trainingDate = formatted;
+ trainingDateModel.value = typeof normalized === "undefined" ? Date.now() : normalized;
trainingDateVisible.value = false;
getList();
};
--
Gitblit v1.9.3