diff --git a/dist.zip b/dist.zip index 1483f99..11d57b7 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/components/system/service-count/excel-statistics-detail.vue b/src/components/system/service-count/excel-statistics-detail.vue index c0d1075..5cd213d 100644 --- a/src/components/system/service-count/excel-statistics-detail.vue +++ b/src/components/system/service-count/excel-statistics-detail.vue @@ -165,11 +165,10 @@ const summaryData = computed(() => { }; tableData.value.forEach((item, index) => { - - summary.totalQuarterlyDuration += quarterlyDuration; - summary.totalQuarterlyCost += quarterlyCost; - summary.totalAnnualDuration += annualDuration; - summary.totalAnnualCost += annualCost; + summary.totalQuarterlyDuration += item.quarterlyServiceDuration || 0; + summary.totalQuarterlyCost += item.quarterlyServiceCost || 0; + summary.totalAnnualDuration += item.annualServiceDuration || 0; + summary.totalAnnualCost += item.annualServiceCost || 0; }); return summary; @@ -209,14 +208,15 @@ async function handleQuery() { // 根据实际返回字段映射 lawyerName: item.lawyerName || '-', certificateNumber: item.certificateNumber || '-', - quarterlyServiceDuration: item.quarterlyServiceDuration || 0, - quarterlyServiceCost: item.quarterlyServiceCost || 0, - annualServiceDuration: item.annualServiceDuration || 0, - annualServiceCost: item.annualServiceCost || 0 + quarterlyServiceDuration: Number(item.quarterlyServiceDuration) || 0, + quarterlyServiceCost: Number(item.quarterlyServiceCost) || 0, + annualServiceDuration: Number(item.annualServiceDuration) || 0, + annualServiceCost: Number(item.annualServiceCost) || 0 })); + console.log('处理后的表格数据:', tableData.value); // 关闭查询成功提示 - // message.success(`查询成功,共 ${res.data.total} 条数据`); + // message.success(`查询成功,共 ${res.data.length} 条数据`); } else { tableData.value = []; } diff --git a/src/constants/system/review-const.js b/src/constants/system/review-const.js index a7f58df..a429c2b 100644 --- a/src/constants/system/review-const.js +++ b/src/constants/system/review-const.js @@ -10,10 +10,6 @@ export const REVIEW_ENUM = { value: 1, desc: '待审核', }, - REVIEW: { - value: 2, - desc: '审核中', - }, PASS: { value: 3, desc: '已通过', diff --git a/src/views/business/erp/cost/firm-reports-list.vue b/src/views/business/erp/cost/firm-reports-list.vue index efed0d7..1eaf647 100644 --- a/src/views/business/erp/cost/firm-reports-list.vue +++ b/src/views/business/erp/cost/firm-reports-list.vue @@ -170,12 +170,6 @@ title: '营业收入(万元)', dataIndex: 'revenue', ellipsis: true, - customRender: ({ text }) => { - if (text === null || text === undefined || text === '') return ''; - const num = parseFloat(text); - if (isNaN(num)) return text; - return num.toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g, ','); - }, }, //{ // title: '总成本支出(万元)', @@ -186,12 +180,6 @@ title: '公益成本支出(单位:万元)', dataIndex: 'publicWelfareCost', ellipsis: true, - customRender: ({ text }) => { - if (text === null || text === undefined || text === '') return ''; - const num = parseFloat(text); - if (isNaN(num)) return text; - return num.toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g, ','); - }, }, { title: '成本收入比', diff --git a/src/views/business/erp/service/law-firm-statistics.vue b/src/views/business/erp/service/law-firm-statistics.vue index 0c59e2f..a7c5216 100644 --- a/src/views/business/erp/service/law-firm-statistics.vue +++ b/src/views/business/erp/service/law-firm-statistics.vue @@ -8,7 +8,7 @@