diff --git a/ruoyi-ui/src/utils/currencyFormatter.js b/ruoyi-ui/src/utils/currencyFormatter.js
index aa365f7..280235b 100644
--- a/ruoyi-ui/src/utils/currencyFormatter.js
+++ b/ruoyi-ui/src/utils/currencyFormatter.js
@@ -106,3 +106,11 @@ export function numberToCNY(money) {
}
return chineseStr;
}
+
+
+export function formatNumberToWan(num) {
+ if (num === 0) return 0;
+ const wanNum = num / 10000;
+ const roundedNum = Math.round(wanNum * 100) / 100; // 保留两位小数,四舍五入
+ return roundedNum;
+}
diff --git a/ruoyi-ui/src/views/oa/finance-detail/index.vue b/ruoyi-ui/src/views/oa/finance-detail/index.vue
index f8eff31..dde9af9 100644
--- a/ruoyi-ui/src/views/oa/finance-detail/index.vue
+++ b/ruoyi-ui/src/views/oa/finance-detail/index.vue
@@ -2,7 +2,6 @@
-
-
@@ -25,13 +23,25 @@
-
+
+
+ {{formatNumberToWan(scope.row.userCost)}}万元
+
+
-
-
+
+
+ {{formatNumberToWan(scope.row.claimCost)}}万元
+
+
+
+
+ {{formatNumberToWan(scope.row.materialCost)}}万元
+
+
- {{scope.row.materialCost+scope.row.userCost+scope.row.claimCost}}
+ {{formatNumberToWan(scope.row.materialCost+scope.row.userCost+scope.row.claimCost)}}万元
@@ -165,7 +175,11 @@
-
+
+
+ {{scope.row.cost}}元
+
+
@@ -175,7 +189,11 @@
-
+
+
+ {{scope.row.price}}元
+
+
@@ -185,8 +203,12 @@
-
-
+
+
+ {{scope.row.laborCost}}元
+
+
+
@@ -274,6 +296,7 @@
import {listProject} from "@/api/oa/project";
import {listByMultiQuery, listOaWarehouse} from "../../../api/oa/oaWarehouse";
import { createCostDetail, getCostDetailById, getCostDetailList } from "../../../api/oa/finance";
+import {formatNumberToWan} from "../../../utils/currencyFormatter";
export default {
name: "OaOutWarehouse",
@@ -354,6 +377,7 @@ export default {
this.getList();
},
methods: {
+ formatNumberToWan,
/** 查询仓库出库列表 */
getList() {
this.loading = true;
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index 70b9baa..2feb32f 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -78,13 +78,13 @@
-
-