三期内容提交

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;
+}

ruoyi-ui/src/views/oa/finance-detail/index.vue

@@ -2,7 +2,6 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item>
-
         <el-form-item label="项目名" prop="projectName">
           <el-input
             v-model="queryParams.projectName"
@@ -17,7 +16,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -25,13 +23,25 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" align="center" type="index"/>
       <el-table-column label="项目名" align="center" prop="projectName"/>
-      <el-table-column label="人力花费" align="center" prop="userCost"/>
+      <el-table-column label="人力花费" align="center" prop="userCost">
+        <template slot-scope="scope">
+          <div>{{formatNumberToWan(scope.row.userCost)}}万元</div>
+        </template>
+      </el-table-column>
       <el-table-column label="人天计算" align="center" prop="peopleDay"/>
-      <el-table-column label="报销花费" align="center" prop="claimCost"/>
-      <el-table-column label="物料花费" align="center" prop="materialCost"/>
+      <el-table-column label="报销花费" align="center" prop="claimCost">
+        <template slot-scope="scope">
+          <div>{{formatNumberToWan(scope.row.claimCost)}}万元</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料花费" align="center" prop="materialCost">
+        <template slot-scope="scope">
+          <div>{{formatNumberToWan(scope.row.materialCost)}}万元</div>
+        </template>
+      </el-table-column>
       <el-table-column label="综合成本" align="center" prop="cost">
         <template slot-scope="scope">
-          <div>{{scope.row.materialCost+scope.row.userCost+scope.row.claimCost}}</div>
+          <div>{{formatNumberToWan(scope.row.materialCost+scope.row.userCost+scope.row.claimCost)}}万元</div>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -165,7 +175,11 @@
           <el-table v-loading="loading" :data="detailData.claimList">
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column label="索引" align="center" type="index"/>
-            <el-table-column label="花费" align="center" prop="cost"/>
+            <el-table-column label="花费" align="center" prop="cost">
+              <template slot-scope="scope">
+                <div>{{scope.row.cost}}元</div>
+              </template>
+            </el-table-column>
             <el-table-column label="申请人" align="center" prop="nickName"/>
             <el-table-column label="备注" align="center" prop="remark"/>
           </el-table>
@@ -175,7 +189,11 @@
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column label="索引" align="center" type="index"/>
             <el-table-column label="材料编号" align="center" prop="materialId"/>
-            <el-table-column label="材料单价" align="center" prop="price"/>
+            <el-table-column label="材料单价" align="center" prop="price">
+              <template slot-scope="scope">
+                <div>{{scope.row.price}}元</div>
+              </template>
+            </el-table-column>
             <el-table-column label="物料名" align="center" prop="name"/>
             <el-table-column label="出库数量" align="center" prop="amount"/>
           </el-table>
@@ -185,8 +203,12 @@
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column label="索引" align="center" type="index"/>
             <el-table-column label="人员名称" align="center" prop="nickName"/>
-            <el-table-column label="人员成本" align="center" prop="laborCost"/>
-            <el-table-column label="签到次数" align="center" prop="attendanceNum"/>
+            <el-table-column label="人员成本" align="center" prop="laborCost">
+              <template slot-scope="scope">
+                <div>{{scope.row.laborCost}}元</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="人天计算" align="center" prop="attendanceNum"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -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;

ruoyi-ui/src/views/system/user/profile/index.vue

@@ -78,13 +78,13 @@
       </el-col>
     </el-row>
 
-    <el-drawer :title="`${user.nickName} - 文件管理`" 
-              :visible.sync="fileDrawerVisible" 
-              size="800px" 
-              direction="rtl" 
+    <el-drawer :title="`${user.nickName} - 文件管理`"
+              :visible.sync="fileDrawerVisible"
+              size="800px"
+              direction="rtl"
               append-to-body>
-      <user-file-manager 
-        :user-id="user.userId" 
+      <user-file-manager
+        :user-id="user.userId"
         :read-only="true"
         v-if="fileDrawerVisible" />
     </el-drawer>