diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue
index 2f78bbe..889dc49 100644
--- a/src/views/hard/canteen-product-total/index.vue
+++ b/src/views/hard/canteen-product-total/index.vue
@@ -44,7 +44,7 @@
-
+
@@ -98,10 +98,10 @@ const state = reactive({
watch(() => [activeTab.value, productTotalTableByDayRef.value, productTotalTableByMonthRef.value], () => {
if (activeTab.value === "DAY" && productTotalTableByDayRef.value?.doSearch) {
- productTotalTableByDayRef.value.doSearch(state.queryForm)
+ search()
}
if (activeTab.value === "MONTH" && productTotalTableByMonthRef.value?.doSearch) {
- productTotalTableByMonthRef.value.doSearch(state.queryForm)
+ search()
}
})
@@ -115,6 +115,7 @@ onMounted(() => {
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
+ state.queryForm = { ...defaultQueryForm }
state.queryForm.deptId = ""
state.queryForm.userDeptIds = []
draggableDepTreeRef.value.resetData()
@@ -152,6 +153,7 @@ const search = () => {
if (activeTab.value === "MONTH") {
state.queryForm.createTimeList = []
}
+ console.log("queryForm:", state.queryForm);
switch (activeTab.value) {
case "DAY":
productTotalTableByDayRef.value.doSearch(state.queryForm)
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index df4a816..a661370 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -209,7 +209,7 @@ const state: BasicTableProps = reactive({
})
// table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
// 清空搜索条件
const resetQuery = () => {
@@ -222,7 +222,7 @@ const resetQuery = () => {
// 导出excel
const exportExcel = () => {
- downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "充值/扣款申请.xlsx")
+ postDownBlobFile("/wallet/wallet-recharge-apply/export", Object.assign(state.queryForm, { ids: selectObjs }), "充值/扣款申请.xlsx")
}
const doApply = async (row: any) => {