From 3962ea78b4fa9f8ea66626e6837cd860855aabc8 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 30 Sep 2025 17:20:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/supermarketerp/profitMarginReport.ts | 1 +
.../integrated/meeting/meetingRoom/form.vue | 68 +++++++++----------
.../integrated/meeting/meetingRoom/index.vue | 8 +--
.../jsxs/components/ProductRankingTable.vue | 1 +
.../report/jsxs/components/SalesChart.vue | 1 +
.../report/jsxs/components/SummaryCard.vue | 1 +
.../report/jsxs/components/index.ts | 1 +
.../report/jsxs/constants/index.ts | 1 +
.../report/jsxs/utils/exportUtils.ts | 1 +
.../supermarketerp/report/jsxs/utils/index.ts | 1 +
src/views/supermarketerp/report/mlr/README.md | 1 +
11 files changed, 47 insertions(+), 38 deletions(-)
diff --git a/src/api/supermarketerp/profitMarginReport.ts b/src/api/supermarketerp/profitMarginReport.ts
index a50ab2d..3c32665 100644
--- a/src/api/supermarketerp/profitMarginReport.ts
+++ b/src/api/supermarketerp/profitMarginReport.ts
@@ -88,3 +88,4 @@ export function exportProfitMarginReport(params?: object) {
responseType: 'blob'
})
}
+
diff --git a/src/views/integrated/meeting/meetingRoom/form.vue b/src/views/integrated/meeting/meetingRoom/form.vue
index 3383e78..77e771c 100644
--- a/src/views/integrated/meeting/meetingRoom/form.vue
+++ b/src/views/integrated/meeting/meetingRoom/form.vue
@@ -32,27 +32,27 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -86,11 +86,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -340,9 +340,9 @@ const openDialog = (id: string) => {
// 获取用户下拉数据（保洁和会务人员）
getUserOptions()
-
+
// 获取管理员用户数据
- getAdminUserOptions()
+ // getAdminUserOptions()
// 获取meetingRoom信息
if (id) {
@@ -356,7 +356,7 @@ const getUserOptions = async () => {
try {
const res = await dropdown()
const allUsers = Array.isArray(res.data) ? res.data : []
-
+
// 根据type字段分别赋值（type为字符串类型）
cleanUserOptions.value = allUsers.filter(user => user.type === '1') // type: '1' 为保洁
serviceUserOptions.value = allUsers.filter(user => user.type === '2') // type: '2' 为会务人员
@@ -370,23 +370,23 @@ const getAdminUserOptions = async (searchKeyword?: string) => {
try {
adminUserLoading.value = true
const params: any = {}
-
+
// 如果有搜索关键词，添加到参数中
if (searchKeyword) {
params.name = searchKeyword
params.mobile = searchKeyword
}
-
+
const res = await getSimpleUserAll(params)
let allUsers = Array.isArray(res.data) ? res.data : []
-
+
// 如果接口不支持搜索参数，在前端进行过滤
if (searchKeyword && allUsers.length > 0) {
- allUsers = allUsers.filter(user =>
+ allUsers = allUsers.filter(user =>
user.nameWithMobile.toLowerCase().includes(searchKeyword.toLowerCase())
)
}
-
+
adminUserOptions.value = allUsers
} catch (err: any) {
console.error('获取管理员用户列表失败:', err)
diff --git a/src/views/integrated/meeting/meetingRoom/index.vue b/src/views/integrated/meeting/meetingRoom/index.vue
index 9552cfd..21c2ea9 100644
--- a/src/views/integrated/meeting/meetingRoom/index.vue
+++ b/src/views/integrated/meeting/meetingRoom/index.vue
@@ -31,12 +31,12 @@
-
+
-
-
-
+
+
+
{
}
+
diff --git a/src/views/supermarketerp/report/jsxs/components/SalesChart.vue b/src/views/supermarketerp/report/jsxs/components/SalesChart.vue
index bc27fdc..c33fff7 100644
--- a/src/views/supermarketerp/report/jsxs/components/SalesChart.vue
+++ b/src/views/supermarketerp/report/jsxs/components/SalesChart.vue
@@ -190,3 +190,4 @@ defineExpose({
}
+
diff --git a/src/views/supermarketerp/report/jsxs/components/SummaryCard.vue b/src/views/supermarketerp/report/jsxs/components/SummaryCard.vue
index e2174a6..c991858 100644
--- a/src/views/supermarketerp/report/jsxs/components/SummaryCard.vue
+++ b/src/views/supermarketerp/report/jsxs/components/SummaryCard.vue
@@ -202,3 +202,4 @@ const trendClass = computed(() => {
}
+
diff --git a/src/views/supermarketerp/report/jsxs/components/index.ts b/src/views/supermarketerp/report/jsxs/components/index.ts
index ab24741..5eac805 100644
--- a/src/views/supermarketerp/report/jsxs/components/index.ts
+++ b/src/views/supermarketerp/report/jsxs/components/index.ts
@@ -6,3 +6,4 @@ export { default as SalesChart } from './SalesChart.vue';
export { default as SummaryCard } from './SummaryCard.vue';
export { default as ProductRankingTable } from './ProductRankingTable.vue';
+
diff --git a/src/views/supermarketerp/report/jsxs/constants/index.ts b/src/views/supermarketerp/report/jsxs/constants/index.ts
index 726226d..fcd3482 100644
--- a/src/views/supermarketerp/report/jsxs/constants/index.ts
+++ b/src/views/supermarketerp/report/jsxs/constants/index.ts
@@ -206,3 +206,4 @@ export const SUCCESS_MESSAGES = {
CACHE_REFRESHED: '缓存刷新成功',
};
+
diff --git a/src/views/supermarketerp/report/jsxs/utils/exportUtils.ts b/src/views/supermarketerp/report/jsxs/utils/exportUtils.ts
index 0a7630a..5e79494 100644
--- a/src/views/supermarketerp/report/jsxs/utils/exportUtils.ts
+++ b/src/views/supermarketerp/report/jsxs/utils/exportUtils.ts
@@ -135,3 +135,4 @@ export function formatTimePeriodDataForExport(data: any[]) {
增长率: `${item.growthRate || 0}%`
}));
}
+
diff --git a/src/views/supermarketerp/report/jsxs/utils/index.ts b/src/views/supermarketerp/report/jsxs/utils/index.ts
index 1a82696..af9017c 100644
--- a/src/views/supermarketerp/report/jsxs/utils/index.ts
+++ b/src/views/supermarketerp/report/jsxs/utils/index.ts
@@ -195,3 +195,4 @@ export const TABLE_CONFIG = {
showOverflowTooltip: true,
};
+
diff --git a/src/views/supermarketerp/report/mlr/README.md b/src/views/supermarketerp/report/mlr/README.md
index 255dc51..c973c2f 100644
--- a/src/views/supermarketerp/report/mlr/README.md
+++ b/src/views/supermarketerp/report/mlr/README.md
@@ -365,3 +365,4 @@ class ProfitMarginReportServiceTest {
7. **测试覆盖**: 完善单元测试和集成测试
这样重构后的代码将更加清晰、可维护，并且性能更好。
+