From 469f33b6fb6fcf301bc7d8e3ef9cfd8e7e54180f Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sat, 10 Jan 2026 23:16:43 +0800 Subject: [PATCH 1/2] remove icon import. --- .../customermanagement/CustomerTypeView.vue | 17 +++++------------ src/views/customermanagement/VipLevelView.vue | 15 +++++---------- src/views/finance/InternalFinanceView.vue | 7 +++---- .../HydroelectricityInfoView.vue | 13 ++++--------- .../materialmanagement/GoodsmanagementView.vue | 15 +++++---------- .../roominformation/ReserManagementView.vue | 17 +++++------------ src/views/roominformation/RoomConfigView.vue | 15 +++++---------- .../roominformation/RoomManagementView.vue | 15 +++++---------- 8 files changed, 37 insertions(+), 77 deletions(-) diff --git a/src/views/customermanagement/CustomerTypeView.vue b/src/views/customermanagement/CustomerTypeView.vue index cd81630..21e7661 100644 --- a/src/views/customermanagement/CustomerTypeView.vue +++ b/src/views/customermanagement/CustomerTypeView.vue @@ -3,21 +3,21 @@

{{ translatedPageTitle }}

- {{ $t("message.refreshData") }} + {{ $t("message.refreshData") }} - {{ $t("message.insertCustomerType") }} + {{ $t("message.insertCustomerType") }}
@@ -48,14 +48,14 @@ style="margin-right: 12px" @click="editCustomerType(record)" > - {{ $t("message.edit") }} + {{ $t("message.edit") }} - {{ $t("message.delete") }} + {{ $t("message.delete") }} @@ -124,13 +124,6 @@ import { updateCustomerType, deleteCustomerType, } from "@/api/customertypeapi"; -import { - SyncOutlined, - PlusOutlined, - EditOutlined, - DeleteOutlined, - CaretRightOutlined, -} from "@ant-design/icons-vue"; import { showErrorNotification, showSuccessNotification } from "@/utils/index"; import ListFilter from "@/components/common/ListFilter.vue"; import { getCustomerTypeFilterConfig } from "@/filters/customertype.filter.config"; diff --git a/src/views/customermanagement/VipLevelView.vue b/src/views/customermanagement/VipLevelView.vue index 7ff812b..340c599 100644 --- a/src/views/customermanagement/VipLevelView.vue +++ b/src/views/customermanagement/VipLevelView.vue @@ -4,20 +4,20 @@ {{ $t("message.refreshData") }} {{ $t("message.refreshData") }} {{ $t("message.insertVipRule") }} {{ $t("message.insertVipRule") }} @@ -47,14 +47,14 @@ v-perm="VipLevelPermissions.UPDATE" style="margin-right: 15px" @click="editVipRule(record)" - > {{ $t("message.edit") }} {{ $t("message.edit") }} {{ $t("message.delete") }} {{ $t("message.delete") }} @@ -140,11 +140,6 @@ import { VipLevelPermissions } from "@/common/permissioncode"; import { formatCurrency } from "@/utils/index"; import ListFilter from "@/components/common/ListFilter.vue"; import { getVipRuleFilterConfig } from "@/filters/viprule.filter.config"; -import { - SyncOutlined, - EditOutlined, - CaretRightOutlined, -} from "@ant-design/icons-vue"; const { t } = useI18n(); const route = useRoute(); diff --git a/src/views/finance/InternalFinanceView.vue b/src/views/finance/InternalFinanceView.vue index 6998525..63f40ae 100644 --- a/src/views/finance/InternalFinanceView.vue +++ b/src/views/finance/InternalFinanceView.vue @@ -4,19 +4,19 @@ {{ $t("message.refreshData") }} {{ $t("message.refreshData") }} {{ $t("message.insertInternalFinance") }} {{ $t("message.insertInternalFinance") }} @@ -185,7 +185,6 @@ import { InternalFinancePermissions } from "@/common/permissioncode"; import dayjs from "dayjs"; import ListFilter from "@/components/common/ListFilter.vue"; import { getInternalFinanceFilterConfig } from "@/filters/internalfinance.filter.config"; -import { DeleteOutlined } from "@ant-design/icons-vue"; const { t } = useI18n(); const route = useRoute(); diff --git a/src/views/hydroelectricity/HydroelectricityInfoView.vue b/src/views/hydroelectricity/HydroelectricityInfoView.vue index bf874f2..5238ed9 100644 --- a/src/views/hydroelectricity/HydroelectricityInfoView.vue +++ b/src/views/hydroelectricity/HydroelectricityInfoView.vue @@ -4,13 +4,13 @@ {{ $t("message.refreshData") }} {{ $t("message.refreshData") }} @@ -40,14 +40,14 @@ v-perm="HydroelectricityPermissions.UPDATE" style="margin-right: 15px" @click="editHydroelectricity(record)" - > {{ $t("message.edit") }} {{ $t("message.edit") }} {{ $t("message.delete") }} {{ $t("message.delete") }} @@ -137,11 +137,6 @@ import { HydroelectricityPermissions } from "@/common/permissioncode"; import dayjs from "dayjs"; import ListFilter from "@/components/common/ListFilter.vue"; import { getEnergyManagementFilterConfig } from "@/filters/energymanagement.filter.config"; -import { - SyncOutlined, - EditOutlined, - CaretRightOutlined, -} from "@ant-design/icons-vue"; const { t } = useI18n(); const route = useRoute(); diff --git a/src/views/materialmanagement/GoodsmanagementView.vue b/src/views/materialmanagement/GoodsmanagementView.vue index d2a5762..a2b1799 100644 --- a/src/views/materialmanagement/GoodsmanagementView.vue +++ b/src/views/materialmanagement/GoodsmanagementView.vue @@ -4,20 +4,20 @@ {{ $t("message.refreshData") }} {{ $t("message.refreshData") }} {{ $t("message.insertGoods") }} {{ $t("message.insertGoods") }} @@ -47,14 +47,14 @@ v-perm="GoodsManagementPermissions.UPDATE" style="margin-right: 15px" @click="editGoods(record)" - > {{ $t("message.edit") }} {{ $t("message.edit") }} {{ $t("message.delete") }} {{ $t("message.delete") }} @@ -131,11 +131,6 @@ import { showErrorNotification, showSuccessNotification } from "@/utils/index"; import generateSnowflakeId from "@/utils/snowflake"; import ListFilter from "@/components/common/ListFilter.vue"; import { getGoodsFilterConfig } from "@/filters/goods.filter.config"; -import { - SyncOutlined, - EditOutlined, - CaretRightOutlined, -} from "@ant-design/icons-vue"; const { t } = useI18n(); const route = useRoute(); diff --git a/src/views/roominformation/ReserManagementView.vue b/src/views/roominformation/ReserManagementView.vue index e505c80..eb364b1 100644 --- a/src/views/roominformation/ReserManagementView.vue +++ b/src/views/roominformation/ReserManagementView.vue @@ -4,19 +4,19 @@ {{ $t("message.refreshData") }} {{ $t("message.refreshData") }} {{ $t("message.insertReser") }} {{ $t("message.insertReser") }} @@ -45,14 +45,14 @@ v-perm="ReservationManagementPermissions.UPDATE" style="margin-right: 15px" @click="editReser(record)" - > {{ $t("message.edit") }} {{ $t("message.edit") }} {{ $t("message.delete") }} {{ $t("message.delete") }} @@ -143,13 +143,6 @@ import { import { RoomFields } from "@/entities/room.entity"; import { ConstantFields } from "@/entities/constant.entity"; import { useI18n } from "vue-i18n"; -import { - SyncOutlined, - PlusOutlined, - EditOutlined, - DeleteOutlined, - CaretRightOutlined, -} from "@ant-design/icons-vue"; import ListFilter from "@/components/common/ListFilter.vue"; import { getReserFilterConfig } from "@/filters/reser.filter.config"; import dayjs from "dayjs"; diff --git a/src/views/roominformation/RoomConfigView.vue b/src/views/roominformation/RoomConfigView.vue index c5dd353..028a15f 100644 --- a/src/views/roominformation/RoomConfigView.vue +++ b/src/views/roominformation/RoomConfigView.vue @@ -4,20 +4,20 @@ {{ $t("message.refreshData") }} {{ $t("message.refreshData") }} {{ $t("message.insertRoomConfig") }} {{ $t("message.insertRoomConfig") }} @@ -47,14 +47,14 @@ v-perm="RoomConfigPermissions.UPDATE" style="margin-right: 15px" @click="editRoomConfig(record)" - > {{ $t("message.edit") }} {{ $t("message.edit") }} {{ $t("message.delete") }} {{ $t("message.delete") }} @@ -131,11 +131,6 @@ import { RoomConfigPermissions } from "@/common/permissioncode"; import { formatCurrency } from "@/utils/index"; import ListFilter from "@/components/common/ListFilter.vue"; import { getRoomConfigFilterConfig } from "@/filters/roomconfig.filter.config"; -import { - SyncOutlined, - EditOutlined, - CaretRightOutlined, -} from "@ant-design/icons-vue"; const { t } = useI18n(); const route = useRoute(); diff --git a/src/views/roominformation/RoomManagementView.vue b/src/views/roominformation/RoomManagementView.vue index 87de82c..3187310 100644 --- a/src/views/roominformation/RoomManagementView.vue +++ b/src/views/roominformation/RoomManagementView.vue @@ -4,20 +4,20 @@ {{ $t("message.refreshData") }} {{ $t("message.refreshData") }} {{ $t("message.insertRoom") }} {{ $t("message.insertRoom") }} @@ -47,14 +47,14 @@ v-perm="RoomManagementPermissions.UPDATE" style="margin-right: 15px" @click="editRoom(record)" - > {{ $t("message.edit") }} {{ $t("message.edit") }} {{ $t("message.delete") }} {{ $t("message.delete") }} @@ -133,11 +133,6 @@ import { useI18n } from "vue-i18n"; import { RoomManagementPermissions } from "@/common/permissioncode"; import ListFilter from "@/components/common/ListFilter.vue"; import { getRoomFilterConfig } from "@/filters/room.filter.config"; -import { - SyncOutlined, - EditOutlined, - CaretRightOutlined, -} from "@ant-design/icons-vue"; const { t } = useI18n(); const route = useRoute(); -- Gitee From 6096ceecf080dc3d7bd8db1763c14f93f20b7bc4 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sun, 11 Jan 2026 00:20:51 +0800 Subject: [PATCH 2/2] fix Assignment to constant variable error. --- src/views/base/DepartmentView.vue | 23 +++++++------------ src/views/finance/InternalFinanceView.vue | 2 +- .../StaffManagementView.vue | 17 +++++--------- .../operationmanagement/OperationLogView.vue | 2 +- .../operationmanagement/RequestLogView.vue | 2 +- .../roominformation/ReserManagementView.vue | 2 +- 6 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/views/base/DepartmentView.vue b/src/views/base/DepartmentView.vue index bf168b5..0882e06 100644 --- a/src/views/base/DepartmentView.vue +++ b/src/views/base/DepartmentView.vue @@ -177,18 +177,14 @@ const formRef = ref(null); const sortedInfo = ref({ order: null, columnKey: null }); const departmentOptions = ref([]); const leaderOptions = ref([]); - -// 通用列表过滤配置与值 +const filterValues = ref({}); +const currentFilterParams = reactive({}); const departmentFilterConfig = computed(() => getDepartmentFilterConfig(t, departmentOptions.value, leaderOptions.value), ); -const filterValues = reactive({ [DepartmentFields.IS_DELETED]: 0 }); - -// 将过滤表单值转换为接口查询参数 -const currentFilterParams = reactive({}); const buildServerParamsFromFilters = () => { - const params = {}; + let params = {}; const fields = departmentFilterConfig.value?.fields || []; fields.forEach((f) => { const val = filterValues[f.name]; @@ -238,17 +234,14 @@ const handleFilterSearch = (vals) => { }; const handleFilterReset = (vals) => { - if (vals && typeof vals === "object") { - // filterValues is reactive - Object.keys(filterValues).forEach((k) => delete filterValues[k]); - Object.assign(filterValues, vals); - } else { - Object.keys(filterValues).forEach((k) => (filterValues[k] = null)); - } Object.keys(currentFilterParams).forEach( (k) => delete currentFilterParams[k], ); - pagination.current = 1; + if (vals && typeof vals === "object") { + filterValues.value = { ...vals }; + } else { + filterValues.value = {}; + } fetchDepartmentData(); }; diff --git a/src/views/finance/InternalFinanceView.vue b/src/views/finance/InternalFinanceView.vue index 63f40ae..f8604aa 100644 --- a/src/views/finance/InternalFinanceView.vue +++ b/src/views/finance/InternalFinanceView.vue @@ -207,7 +207,7 @@ const internalfinanceFilterConfig = computed(() => personOptions.value, ), ); -const filterValues = reactive({ [InternalFinanceFields.IS_DELETED]: 0 }); +const filterValues = ref({ [InternalFinanceFields.IS_DELETED]: 0 }); const currentFilterParams = reactive({}); const form = reactive({ ...initialFormValues }); diff --git a/src/views/humanresourcemanagement/StaffManagementView.vue b/src/views/humanresourcemanagement/StaffManagementView.vue index 3c02f9a..b931528 100644 --- a/src/views/humanresourcemanagement/StaffManagementView.vue +++ b/src/views/humanresourcemanagement/StaffManagementView.vue @@ -392,7 +392,7 @@ const employeeFilterConfig = computed(() => staffPositionOptions.value, ), ); -const filterValues = reactive({ [EmployeeFields.IS_DELETED]: 0 }); +const filterValues = ref({ [EmployeeFields.IS_DELETED]: 0 }); const viewDetail = (record) => { router.push({ @@ -472,7 +472,7 @@ const buildServerParamsFromFilters = () => { const params = {}; const fields = employeeFilterConfig.value?.fields || []; fields.forEach((f) => { - const val = filterValues[f.name]; + const val = filterValues.value[f.name]; if ( val === null || val === undefined || @@ -508,7 +508,7 @@ const buildServerParamsFromFilters = () => { }; const handleFilterSearch = (vals) => { - Object.assign(filterValues, vals); + filterValues.value = { ...vals }; const built = buildServerParamsFromFilters(); Object.keys(currentFilterParams).forEach( (k) => delete currentFilterParams[k], @@ -519,13 +519,8 @@ const handleFilterSearch = (vals) => { }; const handleFilterReset = (vals) => { - if (vals && typeof vals === "object") { - // filterValues is reactive - Object.keys(filterValues).forEach((k) => delete filterValues[k]); - Object.assign(filterValues, vals); - } else { - Object.keys(filterValues).forEach((k) => (filterValues[k] = null)); - } + // 使用ref的value属性更新值 + filterValues.value = vals ? { ...vals } : {}; Object.keys(currentFilterParams).forEach( (k) => delete currentFilterParams[k], ); @@ -539,7 +534,7 @@ const fetchStaffData = async () => { const result = await fetchEmployees({ [EmployeeFields.PAGE]: pagination.current, [EmployeeFields.PAGE_SIZE]: pagination.pageSize, - [EmployeeFields.IS_DELETED]: filterValues[EmployeeFields.IS_DELETED], + [EmployeeFields.IS_DELETED]: filterValues.value[EmployeeFields.IS_DELETED], ...currentFilterParams, }); if (result?.Items) { diff --git a/src/views/operationmanagement/OperationLogView.vue b/src/views/operationmanagement/OperationLogView.vue index 7924fa8..d0aba7a 100644 --- a/src/views/operationmanagement/OperationLogView.vue +++ b/src/views/operationmanagement/OperationLogView.vue @@ -97,7 +97,7 @@ const dateRange = ref([]); // 通用列表过滤配置与值 const logFilterConfig = computed(() => getLogFilterConfig(t)); -const filterValues = reactive({ [LogFields.IS_DELETED]: 0 }); +const filterValues = ref({ [LogFields.IS_DELETED]: 0 }); const pagination = reactive({ current: 1, diff --git a/src/views/operationmanagement/RequestLogView.vue b/src/views/operationmanagement/RequestLogView.vue index f6f28c5..176f156 100644 --- a/src/views/operationmanagement/RequestLogView.vue +++ b/src/views/operationmanagement/RequestLogView.vue @@ -63,7 +63,7 @@ const logs = ref([]); const logLevelFilter = ref(null); const dateRange = ref([]); -const filterValues = reactive({}); +const filterValues = ref({}); const currentFilterParams = reactive({}); const pagination = reactive({ diff --git a/src/views/roominformation/ReserManagementView.vue b/src/views/roominformation/ReserManagementView.vue index eb364b1..9c548b5 100644 --- a/src/views/roominformation/ReserManagementView.vue +++ b/src/views/roominformation/ReserManagementView.vue @@ -170,7 +170,7 @@ const currentFilterParams = reactive({}); const reserFilterConfig = computed(() => getReserFilterConfig(t, roomOptions.value, reserTypeOptions.value), ); -const filterValues = reactive({ [ReserFields.IS_DELETED]: 0 }); +const filterValues = ref({ [ReserFields.IS_DELETED]: 0 }); const displayResers = computed(() => { const items = resers.value || []; let fields = reserFilterConfig.value?.fields || []; -- Gitee