From 0a92f32efa1bc652351ffa855dc2a6180173af3d Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 30 Oct 2024 15:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8decimal=E5=BA=93=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                         |  1 +
 src/views/dashboard/index.vue                        |  6 +++---
 src/views/finance/components/examineRegistration.vue | 12 +++---------
 src/views/inOut/expenseAccount.vue                   |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 9ade414..cff7839 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "axios": "0.18.1",
     "core-js": "3.6.5",
+    "decimal.js": "^10.4.3",
     "echarts": "^4.9.0",
     "element-resize-detector": "^1.2.4",
     "element-ui": "2.13.2",
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 3ce8bda..4d3387f 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -192,7 +192,7 @@
     </el-row>
 
     <div class="demo-split" v-if="allowAuth">
-      <Split v-model="split" style="height: 440px">
+      <Split v-model="split" style="height: 570px">
         <template #left>
           <div class="demo-split-pane" style="padding-right: 5px">
             <div ref="lxHeader" v-if="statistic.departmentList">
@@ -206,7 +206,7 @@
                 <slot>
                   <div style="width: 100%">
                     <xy-table
-                      :height="380"
+                      :height="488"
                       :list="statistic.departmentList"
                       :table-item="departmentTable"
                     >
@@ -246,7 +246,7 @@
                 <slot>
                   <div style="width: 100%">
                     <xy-table
-                      :height="380"
+                      :height="488"
                       :list="statistic.typeList"
                       :table-item="typeTable"
                     >
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index fd8cace..6cf334a 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -250,7 +250,7 @@ import {
     moneyFormatter
   } from "@/utils";
 import { listdeptNoAuth } from '@/api/system/department'
-
+import { Decimal } from 'decimal.js'
   export default {
     data() {
       return {
@@ -553,16 +553,10 @@ import { listdeptNoAuth } from '@/api/system/department'
         this.payment = res.data
       },
 
-      add (num1, num2) {
-        const num1Digits = (num1.toString().split('.')[1] || '').length;
-        const num2Digits = (num2.toString().split('.')[1] || '').length;
-        const baseNum = Math.pow(10, Math.max(num1Digits, num2Digits));
-        return (num1 * baseNum + num2 * baseNum) / baseNum;
-      },
-
       //确认审核
+      // this.add(pre, Number(cur.use_money))
       editor() {
-        let total = this.planSelection.reduce((pre,cur) => this.add(pre, Number(cur.use_money)),0)
+        let total = this.planSelection.reduce((pre,cur) => new Decimal(pre).add(new Decimal(cur.use_money)),0).toNumber()
         console.log(Number(this.paymentRegistrationForm.actMoney),total)
         if (Number(this.paymentRegistrationForm.actMoney) !== total) {
           this.$message({
diff --git a/src/views/inOut/expenseAccount.vue b/src/views/inOut/expenseAccount.vue
index 04fd8b1..abbfd63 100644
--- a/src/views/inOut/expenseAccount.vue
+++ b/src/views/inOut/expenseAccount.vue
@@ -567,7 +567,7 @@ export default {
       this.planTotal = res.list.total || 0;
 
       this.toggleSelection(
-        this.plan.map((item) => {
+        this.plan?.map((item) => {
           return item.value.plan_id;
         }),
         1