Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

package-lock.json

@@ -1139,6 +1139,11 @@
       "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=",
       "dev": true
     },
+    "bignumber.js": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
+      "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.2.0.tgz?cache=0&sync_timestamp=1610299293319&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-2.2.0.tgz",

package.json

@@ -16,7 +16,8 @@
     "lodash": "^4.17.21",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0",
-    "vuex": "^3.4.0"
+    "vuex": "^3.4.0",
+    "bignumber.js": "^9.0.1"
   },
   "engines": {
     "node": ">=6"

src/components/BigNumber.js

-export default class BigNumber{
-    constructor(value) {
-        this.value = value;
-    }
-    static comparedTo(value){
-        if (this.value > value){
-            return 1;
-        }else if(this.value === value){
-            return 0;
-        }else{
-            return -1;
-        }
-    }
-}
-// module.exports = {
-//     'name': 'bignumber',
-//     'category': 'Construction',
-//     'syntax': [
-//         'bignumber(x)'
-//     ],
-//     method:{
-//         comparedTo(value){
-//             if (this.value > value){
-//                 return 1;
-//             }else if(this.value === value){
-//                 return 0;
-//             }else{
-//                 return -1;
-//             }
-//         }
-//     },
-//     'description':
-//         'Create a big number from a number or string.',
-//     'examples': [
-//         '0.1 + 0.2',
-//         'bignumber(0.1) + bignumber(0.2)',
-//         'bignumber("7.2")',
-//         'bignumber("7.2e500")',
-//         'bignumber([0.1, 0.2, 0.3])'
-//     ],
-//     'seealso': [
-//         'boolean', 'complex', 'fraction', 'index', 'matrix', 'string', 'unit'
-//     ]
-// };

src/components/InputCurrency.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import BigNumber from "./bignumber";
+import BigNumber from "bignumber.js";
 export default {
   props: {
     value: {
@@ -42,7 +42,7 @@ export default {
     },
     id: {
       type: String,
-      default: undefined
+      default: ""
     }
   },
   data() {

src/components/InputCurrencyMin.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import BigNumber from "./bignumber";
+import BigNumber from "bignumber.js";
 export default {
   props: {
     value: {
@@ -42,7 +42,7 @@ export default {
     },
     id: {
       type: String,
-      default: undefined
+      default: ""
     }
   },
   data() {

src/views/Business/Ditopn/Ccvpan.vue

@@ -295,7 +295,7 @@ export default {
       dialogTableVisible: false,
       stmData: {
         columns: [
-          '1 1:1 "Ref." 120',
+          '1 1:1 "Ref" 120',
           '2 2:1 "User" 80',
           '3 3:1 "Applicant" 196',
           '4 4:1 "Account" 120',