From 97d82e75fb950adf126eb7a8824e38b1d6deac2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwangzihua=E2=80=9D?= Date: Tue, 13 Jan 2026 15:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service-count/quarter-statistics.vue | 8 +++---- .../components/side-expand-menu/top-menu.vue | 2 +- src/layout/components/side-menu/index.vue | 2 +- .../top-expand-menu/recursion-menu.vue | 2 +- src/layout/components/top-menu/index.vue | 2 +- .../business/erp/cost/firm-reports-form.vue | 2 +- .../service/service-applications-count.vue | 2 +- .../erp/service/service-applications-list.vue | 23 ++++++++++++++----- 8 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/components/system/service-count/quarter-statistics.vue b/src/components/system/service-count/quarter-statistics.vue index 525a942..f4db44e 100644 --- a/src/components/system/service-count/quarter-statistics.vue +++ b/src/components/system/service-count/quarter-statistics.vue @@ -26,11 +26,11 @@ - + @@ -43,10 +43,10 @@ 重置 - + diff --git a/src/layout/components/side-expand-menu/top-menu.vue b/src/layout/components/side-expand-menu/top-menu.vue index f8a744a..762bfb0 100644 --- a/src/layout/components/side-expand-menu/top-menu.vue +++ b/src/layout/components/side-expand-menu/top-menu.vue @@ -37,7 +37,7 @@ import { router } from '/@/router'; import { useAppConfigStore } from '/@/store/modules/system/app-config'; import { useUserStore } from '/@/store/modules/system/user'; - import logoImg from '/@/assets/images/logo/smart-admin-logo.png'; + import logoImg from '/@/assets/images/logo/logo-min.png'; import menuEmitter from './side-expand-menu-mitt'; const websiteName = computed(() => useAppConfigStore().websiteName); diff --git a/src/layout/components/side-menu/index.vue b/src/layout/components/side-menu/index.vue index a8586ce..da10529 100644 --- a/src/layout/components/side-menu/index.vue +++ b/src/layout/components/side-menu/index.vue @@ -24,7 +24,7 @@ import { computed, nextTick, ref, watch } from 'vue'; import { useRouter } from 'vue-router'; import RecursionMenu from './recursion-menu.vue'; - import logoImg from '/@/assets/images/logo/smart-admin-logo.png'; + import logoImg from '/@/assets/images/logo/logo-min.png'; import { HOME_PAGE_NAME } from '/@/constants/system/home-const'; import { useAppConfigStore } from '/@/store/modules/system/app-config'; diff --git a/src/layout/components/top-expand-menu/recursion-menu.vue b/src/layout/components/top-expand-menu/recursion-menu.vue index 94a4e29..d18b92c 100644 --- a/src/layout/components/top-expand-menu/recursion-menu.vue +++ b/src/layout/components/top-expand-menu/recursion-menu.vue @@ -47,7 +47,7 @@ import menuEmitter from './top-expand-menu-mitt'; import { useAppConfigStore } from '/@/store/modules/system/app-config'; import { useUserStore } from '/@/store/modules/system/user'; - import logoImg from '/@/assets/images/logo/smart-admin-logo.png'; + import logoImg from '/@/assets/images/logo/logo-min.png'; const websiteName = computed(() => useAppConfigStore().websiteName); const theme = computed(() => useAppConfigStore().$state.sideMenuTheme); diff --git a/src/layout/components/top-menu/index.vue b/src/layout/components/top-menu/index.vue index 918ed3d..ca98e48 100644 --- a/src/layout/components/top-menu/index.vue +++ b/src/layout/components/top-menu/index.vue @@ -36,7 +36,7 @@ import { computed, ref, watch } from 'vue'; import { useRouter } from 'vue-router'; import RecursionMenu from './recursion-menu.vue'; - import logoImg from '/@/assets/images/logo/smart-admin-logo.png'; + import logoImg from '/@/assets/images/logo/logo-min.png'; import { HOME_PAGE_NAME } from '/@/constants/system/home-const'; import { useAppConfigStore } from '/@/store/modules/system/app-config'; import HeaderAvatar from '../header-user-space/header-avatar.vue'; diff --git a/src/views/business/erp/cost/firm-reports-form.vue b/src/views/business/erp/cost/firm-reports-form.vue index f240e95..89cb3be 100644 --- a/src/views/business/erp/cost/firm-reports-form.vue +++ b/src/views/business/erp/cost/firm-reports-form.vue @@ -174,7 +174,7 @@ // 将分转换为万元（API返回的是分单位） const costInYuan = response.data; // 分转元 //const costInWanYuan = costInYuan / 10000; // 元转万元 - form.publicWelfareCost = costInYuan.toFixed(2); + form.publicWelfareCost = costInYuan; console.log('转换后的公益成本:', form.publicWelfareCost, '万元'); calculateCosts(); diff --git a/src/views/business/erp/service/service-applications-count.vue b/src/views/business/erp/service/service-applications-count.vue index 74fbf99..c6ec32a 100644 --- a/src/views/business/erp/service/service-applications-count.vue +++ b/src/views/business/erp/service/service-applications-count.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/business/erp/service/service-applications-list.vue b/src/views/business/erp/service/service-applications-list.vue index f10c436..676ff94 100644 --- a/src/views/business/erp/service/service-applications-list.vue +++ b/src/views/business/erp/service/service-applications-list.vue @@ -390,11 +390,7 @@ import { loginApi } from '/@/api/system/login-api'; dataIndex: 'associationAuditUserName', ellipsis: true, }, - { - title: '协会审核时间', - dataIndex: 'associationAuditTime', - ellipsis: true, - }, + { title: '操作', dataIndex: 'action', @@ -903,9 +899,24 @@ function showAuditModal(record) { return; } + // 获取选中的记录 + const selectedRecords = tableData.value.filter(record => + selectedRowKeyList.value.includes(record.applicationId) + ); + + // 检查是否有不符合删除条件的记录 + const invalidRecords = selectedRecords.filter(record => + record.firmAuditStatus !== 0 && record.firmAuditStatus !== 4 + ); + + if (invalidRecords.length > 0) { + message.warning('只能删除未提交或拒绝状态的数据'); + return; + } + Modal.confirm({ title: '提示', - content: '确定要批量删除这些数据吗?', + content: '确定要批量删除这些未提交或拒绝状态的数据吗?', okText: '删除', okType: 'danger', onOk() {