From 5e063a3884e28a7b45756c660ab8fe0231982fa0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 30 Jan 2026 20:51:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/canteen-product-total/index.vue |  5 ++---
 src/views/hard/hard-sh/index.vue               | 14 +++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue
index 889dc49..ee7b19e 100644
--- a/src/views/hard/canteen-product-total/index.vue
+++ b/src/views/hard/canteen-product-total/index.vue
@@ -33,9 +33,8 @@
 						</el-row>
 					</el-form>
 					<el-row class="flex">
-						<el-tabs class="flex-1" v-model="activeTab">
-							<el-tab-pane v-for="(v) in tabPane" :key="v.name" :label="v.label" :name="v.name"
-								@tab-click="tabClick" />
+						<el-tabs class="flex-1" v-model="activeTab" @tab-click="tabClick">
+							<el-tab-pane v-for="(v) in tabPane" :key="v.name" :label="v.label" :name="v.name" />
 						</el-tabs>
 						<div class="mb8">
 							<right-toolbar :search="false" v-model:showSearch="showSearch"
diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue
index 9a95517..2d165f2 100644
--- a/src/views/hard/hard-sh/index.vue
+++ b/src/views/hard/hard-sh/index.vue
@@ -39,9 +39,8 @@
 						</el-row>
 					</el-form>
 					<el-row class="flex">
-						<el-tabs class="flex-1" v-model="activeTab">
-							<el-tab-pane v-for="(v) in tabPane" :key="v.name" :label="v.label" :name="v.name"
-								@tab-click="tabClick" />
+						<el-tabs class="flex-1" v-model="activeTab" @tab-click="tabClick">
+							<el-tab-pane v-for="(v) in tabPane" :key="v.name" :label="v.label" :name="v.name" />
 						</el-tabs>
 						<div class="mb8">
 							<right-toolbar :search="false" v-model:showSearch="showSearch"
@@ -59,6 +58,7 @@
 
 <script setup lang="ts" name="hard-sb">
 import { ElMessage } from "element-plus"
+import dayjs from "dayjs"
 
 import other from "/@/utils/other"
 import { formatDate } from '/@/utils/formatTime';
@@ -90,6 +90,7 @@ const tabPane = ref([
 const activeTab = ref("MCH")
 
 const defaultQueryForm = {
+	payTimeYearStr: dayjs().format("YYYY"),
 }
 const state = reactive<any>({
 	queryForm: { ...defaultQueryForm },
@@ -123,17 +124,18 @@ const exportExcel = () => {
 }
 
 const tabClick = () => {
+	console.log(123123);
+
 	cancel()
 }
 
 const search = () => {
 	if (activeTab.value === "MCH") {
-		state.queryForm.createTimeYearStr = ""
+		state.queryForm.payTimeYearStr = ""
 	}
 	if (activeTab.value === "MONTH") {
 		state.queryForm.createTimeList = []
 	}
-	console.log("queryForm:", state.queryForm);
 	switch (activeTab.value) {
 		case "MCH":
 			hardShByDayRef.value.doSearch(state.queryForm)
@@ -146,6 +148,8 @@ const search = () => {
 
 const cancel = () => {
 	state.queryForm = { ...defaultQueryForm }
+	console.log("state.queryForm:", state.queryForm);
+
 	switch (activeTab.value) {
 		case "MCH":
 			hardShByDayRef.value.doCancel(state.queryForm)