Merge branch 'func_eccs_2334' into 'test'

fix: 增加大数值计算

See merge request !57

package.json

@@ -12,6 +12,7 @@
     "axios": "^0.24.0",
     "babel-plugin-import": "^1.13.3",
     "babel-plugin-lodash": "^3.3.4",
+    "big.js": "^6.2.1",
     "core-js": "^3.6.5",
     "lodash": "^4.17.21",
     "lodash-webpack-plugin": "^0.11.6",

src/views/charge-query/lpjManageDetail.vue

@@ -111,11 +111,11 @@
             <div class="total-div flex">
              <div>
                 <span>记账总单数：</span>
-                <span>{{ totalListNum }}</span>个
+                <span>{{ totalListNum + selectedRowKeys.length }}</span>个
               </div>
               <div>
                 <span>账单总金额：</span>
-                <span>{{totalActualAmount}}</span>元
+                <span>{{ totalAmount }}</span>元
               </div>  
             </div>
             <a-form-model-item label="button">
@@ -202,7 +202,8 @@
 import Goback from "@/components/CUSTOMER/goback";
 import BurtPagination from "@/components/CUSTOMER/pagation";
 import moment from 'moment'
-import { numValid } from "@/utils/index"
+import Big from 'big.js';
+// import { numValid } from "@/utils/index"
 
 export default {
   data() {
@@ -257,7 +258,8 @@ export default {
         }
       ],
       totalActualAmount: 0,
-      totalListNum: 0
+      totalListNum: 0,
+      selectActualAmount: 0
     };
   },
   components: {
@@ -265,6 +267,11 @@ export default {
     BurtPagination,
   },
   computed: {
+    totalAmount(){
+      
+      console.log(this.totalActualAmount,this.selectActualAmount,Number(this.totalActualAmount * 100) + this.selectActualAmount * 100)
+      return  Big(this.totalActualAmount).plus(this.selectActualAmount)
+    },
     columns() {
         const base = [
             { title: "账单日期", dataIndex: "receiptDate", width: 120,fixed: "left",scopedSlots: { customRender: "receiptDate" } },
@@ -307,6 +314,7 @@ export default {
     moment,
     onSelectChange(selectedRowKeys) {
       let arr = [];
+      this.selectActualAmount = 0
       for(let i=0; i<selectedRowKeys.length; i++){
         let idx = selectedRowKeys[i];
         if(this.dataList[idx].sendBatchNo){
@@ -314,6 +322,8 @@ export default {
           this.$message.warning('寄送批号已存在')
         }else{
           arr.push(idx);
+         
+          this.selectActualAmount = Big(this.selectActualAmount).plus(this.dataList[idx].actualAmount)
         }
       }
       this.selectedRowKeys = arr;
@@ -565,13 +575,13 @@ export default {
                 }
             })
         }
-        for(let i = 0; i < ciReceiptSendVos.length; i ++) {
-            const selfpaidAmount = ciReceiptSendVos[i].selfpaidAmount
-            if(selfpaidAmount && !numValid.test(selfpaidAmount)){
-                this.$message.warning("请输入正确的客户自付金额");
-                return false;
-            }
-        }
+        // for(let i = 0; i < ciReceiptSendVos.length; i ++) {
+        //     const selfpaidAmount = ciReceiptSendVos[i].selfpaidAmount
+        //     if(selfpaidAmount && !numValid.test(selfpaidAmount)){
+        //         this.$message.warning("请输入正确的客户自付金额");
+        //         return false;
+        //     }
+        // }
         return {
             ...this.form,
             ciReceiptSendVos: ciReceiptSendVos,

yarn.lock

@@ -2114,6 +2114,11 @@ big.js@^5.2.2:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
+big.js@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.npmmirror.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f"
+  integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==
+
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"