n20-common-lib 2.4.23 → 2.4.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.4.23",
+  "version": "2.4.25",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Filters/index.vue

@@ -17,6 +17,7 @@
       v-click-outside="clickOut"
       class="n20-filter p-a-s p-b-0"
       :label-width="labelWidth ? labelWidth : labelWidthAs + 'px'"
+      @keyup.enter.native="filter"
       @submit.native.prevent
     >
       <template v-if="!type">

package/src/components/Upload/uploadMsg.vue

@@ -43,7 +43,7 @@
         <template v-if="validateResult.errorList.length">
           <div class="bd-t bd-l bd-r">
             <div class="m-t m-b p-l">{{ '无效数据详情' | $lc }}</div>
-            <el-table :data="errorList">
+            <el-table :data="errorList" border style="width: 100%">
               <el-table-column
                 v-for="column in columnsList"
                 :key="column.prop"

package/src/utils/amountInWords.js

@@ -3,55 +3,41 @@ const CHINESE_NUMERALS = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒'
 /**
  *
  * @param {number|string} num 需转换的金额
- * @param {object} options 配置项
- * @param options.prefix 前缀
- * @param options.suffix 后缀
- * @returns {string} 转换后的金额
  */
-export const convert = (amount) => {
-  const units = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
-  const levels = ['', '万', '亿', '万亿']
-  const decimals = ['角', '分']
-  const digits = ['仟', '佰', '拾', '', '块']
-
-  if (typeof amount === 'string') {
-    amount = amount.replace(/,/g, '')
-  }
-  let [integerPart, decimalPart] = String(amount).split('.')
-  let result = ''
-
-  // 转换整数部分
-  for (let i = integerPart.length - 1, level = 0; i >= 0; i -= 4, level++) {
-    let group = integerPart.slice(Math.max(0, i - 3), i + 1)
-    let groupResult = ''
-
-    for (let j = 0; j < group.length; j++) {
-      let digit = Number(group[j])
-
-      if (digit !== 0) {
-        groupResult += units[digit] + digits[j]
-      }
-    }
-
-    if (groupResult !== '') {
-      result = groupResult + levels[level] + result
-    }
+export const convert = (n) => {
+  var fraction = ['角', '分']
+  var digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
+  var unit = [
+    ['元', '万', '亿'],
+    ['', '拾', '佰', '仟']
+  ]
+  var head = n < 0 ? '欠' : ''
+  n = Math.abs(n)
+
+  var s = ''
+
+  for (var i = 0; i < fraction.length; i++) {
+    s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '')
   }
-
-  // 转换小数部分
-  if (decimalPart !== undefined) {
-    for (let k = 0; k < decimalPart.length; k++) {
-      let digit = Number(decimalPart[k])
-
-      if (digit !== 0) {
-        result += units[digit] + decimals[k]
-      }
+  s = s || '整'
+  n = Math.floor(n)
+
+  for (var i = 0; i < unit[0].length && n > 0; i++) {
+    var p = ''
+    for (var j = 0; j < unit[1].length && n > 0; j++) {
+      p = digit[n % 10] + unit[1][j] + p
+      n = Math.floor(n / 10)
     }
+    s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s
   }
-
-  return result === '' ? '' : result + '元整'
+  return (
+    head +
+    s
+      .replace(/(零.)*零元/, '元')
+      .replace(/(零.)+/g, '零')
+      .replace(/^整$/, '零元整')
+  )
 }
-
 /**
  * 单个数字转换
  * @param {number | string} number