diff --git a/src/views/oa/erp/budgetInfo/index.vue b/src/views/oa/erp/budgetInfo/index.vue
index 7749340..5a00d63 100644
--- a/src/views/oa/erp/budgetInfo/index.vue
+++ b/src/views/oa/erp/budgetInfo/index.vue
@@ -450,12 +450,16 @@ const handleDelete = async (row?: budgetInfoVO) => {
const handleExport = (row?: budgetInfoVO) => {
const budgetId = row.budgetId;
const projectName = row.projectName;
+ const projectCode = row.projectCode;
+ const projectCategory = row.projectCategory;
+ const fileNamePrefix =
+ projectCategory === PROJECT_CATEGORY.MARKET || projectCategory === PROJECT_CATEGORY.MARKET_PART ? '市场项目经费预算表-' : '研发项目经费预算表-';
proxy?.download(
'oa/erp/budgetInfo/exportBudgetInfo',
{
budgetId: budgetId
},
- projectName + `_${new Date().getTime()}.xlsx`
+ fileNamePrefix + projectName + `(` + projectCode + `)` + `.xlsx`
);
};
diff --git a/src/views/oa/erp/budgetInfo/market/TravelCost.vue b/src/views/oa/erp/budgetInfo/market/TravelCost.vue
index 03338dc..69b41da 100644
--- a/src/views/oa/erp/budgetInfo/market/TravelCost.vue
+++ b/src/views/oa/erp/budgetInfo/market/TravelCost.vue
@@ -72,9 +72,9 @@
{{ formatNumber(scope.row.subsidyCosts) }}
-
+
- {{ format2TenThousandNumber(scope.row.subtotalCosts) }}
+ {{ formatNumber(scope.row.subtotalCosts) }}
@@ -127,9 +127,9 @@
{{ formatNumber(scope.row.reduceSubsidyCosts) }}
-
+
- {{ format2TenThousandNumber(scope.row.reduceSubtotalCosts) }}
+ {{ formatNumber(scope.row.reduceSubtotalCosts) }}
@@ -334,7 +334,7 @@ const getSummaries = (param: any) => {
}, 0);
if (column.property === 'subtotalCosts' || column.property === 'reduceSubtotalCosts') {
- sums[index] = format2TenThousandNumber(sums[index]);
+ sums[index] = formatNumber(sums[index]);
} else {
sums[index] = formatNumber(sums[index]);
}