kts-component-invoice-operate 3.2.108 → 3.2.110

package/dist/Invoice/tools/calculate/index.d.ts

@@ -1,7 +1,7 @@
 /** 格式化 保留2位小数 */
 export declare const format2: (value: number | string) => number | "";
 /** 格式化 保留15位数字 */
-export declare const format15: (value: number | string, defaultFractionDigits?: number) => number | "";
+export declare const format15: (value: number | string, defaultFractionDigits?: number) => number | "" | undefined;
 /**
  * 金额(含税) = 数量 * 单价(含税)
  * @param quantity 数量

package/dist/index.esm.js

@@ -1389,7 +1389,7 @@ var format15 = function format15(value) {
   if ("".concat(value) === 'NaN') return '';
   if (typeof value === 'string') value = parseFloat(value);
   var fractionDigits = 15 - "".concat(value || 0).indexOf('.');
-  return parseFloat(value.toFixed(fractionDigits > defaultFractionDigits ? defaultFractionDigits : fractionDigits));
+  return onScientificNotation(value, fractionDigits > defaultFractionDigits ? defaultFractionDigits : fractionDigits);
 };
 /**
  * 金额(含税) = 数量 * 单价(含税)
@@ -1456,6 +1456,24 @@ function countQuantity(amount, price, calculatingDigits) {
   if (!price && price !== 0) return undefined;
   return format15(chain$1(bignumber(amount)).divide(bignumber(price)).done().toNumber(), calculatingDigits);
 }
+/** 不用可续计数法 */
+
+function onScientificNotation(e, fractionDigits) {
+  var arr = e.toFixed(fractionDigits).split('');
+
+  for (; arr.length > 0;) {
+    if (arr[arr.length - 1] === '0') {
+      arr.pop();
+    } else if (arr[arr.length - 1] === '.') {
+      arr.pop();
+      return arr.join('');
+    } else {
+      return arr.join('');
+    }
+  }
+
+  return '0';
+}
 
 var calculator = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -1855,7 +1873,7 @@ function _mergeDetails() {
                       case 9:
                         sum = _context.sent;
                         _context.next = 12;
-                        return mergeQuantity(goodsList);
+                        return mergeQuantity(goodsList, state.calculatingDigits);
 
                       case 12:
                         sum.quantity = _context.sent;
@@ -1917,7 +1935,7 @@ function _mergeDetails() {
               return _merge.apply(this, arguments);
             };
 
-            merge = function _merge2(_x14) {
+            merge = function _merge2(_x15) {
               return _merge.apply(this, arguments);
             };
 
@@ -2036,10 +2054,10 @@ function _calculatePriceExcludeTax() {
             return _context4.abrupt("return", undefined);
 
           case 2:
-            value = format15(chain$1(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
+            value = chain$1(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
             return _context4.abrupt("return", format15(value, calculatingDigits) || undefined);
 
-          case 5:
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -2107,14 +2125,14 @@ function _mergeLineAmountExcludeTax() {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 
-function mergeQuantity(_x9) {
+function mergeQuantity(_x9, _x10) {
   return _mergeQuantity.apply(this, arguments);
 }
 /** 填充行明细信息 */
 
 
 function _mergeQuantity() {
-  _mergeQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(goodsList) {
+  _mergeQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(goodsList, calculatingDigits) {
     var sum;
     return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) {
@@ -2124,7 +2142,7 @@ function _mergeQuantity() {
             goodsList.forEach(function (e) {
               sum = sum.add(bignumber(e.quantity || 0));
             });
-            return _context7.abrupt("return", sum.done().toNumber() || undefined);
+            return _context7.abrupt("return", format15(sum.done().toNumber() || undefined, calculatingDigits));
 
           case 3:
           case "end":
@@ -2136,7 +2154,7 @@ function _mergeQuantity() {
   return _mergeQuantity.apply(this, arguments);
 }
 
-function fillingInformationGood(_x10, _x11) {
+function fillingInformationGood(_x11, _x12) {
   return _fillingInformationGood.apply(this, arguments);
 }
 /** 存在税率不一样的明细，不能合并 */
@@ -2167,7 +2185,7 @@ function _fillingInformationGood() {
   return _fillingInformationGood.apply(this, arguments);
 }
 
-function checkTaxTate(_x12) {
+function checkTaxTate(_x13) {
   return _checkTaxTate.apply(this, arguments);
 }
 /** 校验数据 是否数量和金额是否同号 */
@@ -2211,7 +2229,7 @@ function _checkTaxTate() {
   return _checkTaxTate.apply(this, arguments);
 }
 
-function checkSameNumber(_x13) {
+function checkSameNumber(_x14) {
   return _checkSameNumber.apply(this, arguments);
 }
 /** 显示错误信息 */
@@ -13656,7 +13674,7 @@ var useColumns = (function (form) {
               style: {
                 padding: '0 10px'
               }
-            });
+            }, e);
         }
       }
     }, {

package/dist/index.js

@@ -1399,7 +1399,7 @@ var format15 = function format15(value) {
   if ("".concat(value) === 'NaN') return '';
   if (typeof value === 'string') value = parseFloat(value);
   var fractionDigits = 15 - "".concat(value || 0).indexOf('.');
-  return parseFloat(value.toFixed(fractionDigits > defaultFractionDigits ? defaultFractionDigits : fractionDigits));
+  return onScientificNotation(value, fractionDigits > defaultFractionDigits ? defaultFractionDigits : fractionDigits);
 };
 /**
  * 金额(含税) = 数量 * 单价(含税)
@@ -1466,6 +1466,24 @@ function countQuantity(amount, price, calculatingDigits) {
   if (!price && price !== 0) return undefined;
   return format15(mathjs.chain(mathjs.bignumber(amount)).divide(mathjs.bignumber(price)).done().toNumber(), calculatingDigits);
 }
+/** 不用可续计数法 */
+
+function onScientificNotation(e, fractionDigits) {
+  var arr = e.toFixed(fractionDigits).split('');
+
+  for (; arr.length > 0;) {
+    if (arr[arr.length - 1] === '0') {
+      arr.pop();
+    } else if (arr[arr.length - 1] === '.') {
+      arr.pop();
+      return arr.join('');
+    } else {
+      return arr.join('');
+    }
+  }
+
+  return '0';
+}
 
 var calculator = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -1865,7 +1883,7 @@ function _mergeDetails() {
                       case 9:
                         sum = _context.sent;
                         _context.next = 12;
-                        return mergeQuantity(goodsList);
+                        return mergeQuantity(goodsList, state.calculatingDigits);
 
                       case 12:
                         sum.quantity = _context.sent;
@@ -1927,7 +1945,7 @@ function _mergeDetails() {
               return _merge.apply(this, arguments);
             };
 
-            merge = function _merge2(_x14) {
+            merge = function _merge2(_x15) {
               return _merge.apply(this, arguments);
             };
 
@@ -2046,10 +2064,10 @@ function _calculatePriceExcludeTax() {
             return _context4.abrupt("return", undefined);
 
           case 2:
-            value = format15(mathjs.chain(mathjs.bignumber(sum.lineAmountExcludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber());
+            value = mathjs.chain(mathjs.bignumber(sum.lineAmountExcludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber();
             return _context4.abrupt("return", format15(value, calculatingDigits) || undefined);
 
-          case 5:
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -2117,14 +2135,14 @@ function _mergeLineAmountExcludeTax() {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 
-function mergeQuantity(_x9) {
+function mergeQuantity(_x9, _x10) {
   return _mergeQuantity.apply(this, arguments);
 }
 /** 填充行明细信息 */
 
 
 function _mergeQuantity() {
-  _mergeQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(goodsList) {
+  _mergeQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(goodsList, calculatingDigits) {
     var sum;
     return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) {
@@ -2134,7 +2152,7 @@ function _mergeQuantity() {
             goodsList.forEach(function (e) {
               sum = sum.add(mathjs.bignumber(e.quantity || 0));
             });
-            return _context7.abrupt("return", sum.done().toNumber() || undefined);
+            return _context7.abrupt("return", format15(sum.done().toNumber() || undefined, calculatingDigits));
 
           case 3:
           case "end":
@@ -2146,7 +2164,7 @@ function _mergeQuantity() {
   return _mergeQuantity.apply(this, arguments);
 }
 
-function fillingInformationGood(_x10, _x11) {
+function fillingInformationGood(_x11, _x12) {
   return _fillingInformationGood.apply(this, arguments);
 }
 /** 存在税率不一样的明细，不能合并 */
@@ -2177,7 +2195,7 @@ function _fillingInformationGood() {
   return _fillingInformationGood.apply(this, arguments);
 }
 
-function checkTaxTate(_x12) {
+function checkTaxTate(_x13) {
   return _checkTaxTate.apply(this, arguments);
 }
 /** 校验数据 是否数量和金额是否同号 */
@@ -2221,7 +2239,7 @@ function _checkTaxTate() {
   return _checkTaxTate.apply(this, arguments);
 }
 
-function checkSameNumber(_x13) {
+function checkSameNumber(_x14) {
   return _checkSameNumber.apply(this, arguments);
 }
 /** 显示错误信息 */
@@ -13666,7 +13684,7 @@ var useColumns = (function (form) {
               style: {
                 padding: '0 10px'
               }
-            });
+            }, e);
         }
       }
     }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.108",
+  "version": "3.2.110",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

package/src/Invoice/InvoiceController/fns/mergeDetails.ts

@@ -57,7 +57,7 @@ export default async function mergeDetails(state: InvoiceControllerState, select
             sum = await fillingInformationGood(goodsList, sum);
 
             // 合并数量
-            sum.quantity = await mergeQuantity(goodsList);
+            sum.quantity = await mergeQuantity(goodsList, state.calculatingDigits);
 
             // 合并金额(不含税)
             sum.lineAmountExcludeTax = await mergeLineAmountExcludeTax(goodsList);
@@ -100,8 +100,8 @@ async function calculatePriceIncludeTax(sum: IGood, calculatingDigits?: number)
 /** 计算单价(不含税) */
 async function calculatePriceExcludeTax(sum: IGood, calculatingDigits?: number) {
     if (!sum.quantity) return undefined;
-    const value = format15(chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
-    return format15(value, calculatingDigits) || undefined;;
+    const value = chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+    return format15(value, calculatingDigits) || undefined;
 }
 
 /** 合并金额(含税) */
@@ -123,12 +123,13 @@ async function mergeLineAmountExcludeTax(goodsList: IGood[]) {
 }
 
 /** 合并数量 */
-async function mergeQuantity(goodsList: IGood[]) {
+async function mergeQuantity(goodsList: IGood[], calculatingDigits?: number) {
     let sum = chain(bignumber(0));
     goodsList.forEach(e => {
         sum = sum.add(bignumber(e.quantity || 0))
     })
-    return sum.done().toNumber() || undefined;
+    
+    return format15(sum.done().toNumber() || undefined, calculatingDigits) as any;
 }
 
 /** 填充行明细信息 */

package/src/Invoice/_test/endowCode/index.tsx

@@ -69,6 +69,7 @@ class MyController1 extends Invoice.InvoiceController {
     this.state.goodsListState.isMergeDiscount = true;
     this.state.goodsListState.isSalesGifts = true;
     this.state.goodsListState.drag.isStart = true;
+    this.state.calculatingDigits = 15;
     this.state.goodsListState.columnshide = [];
   }
 
@@ -99,6 +100,7 @@ class MyController2 extends Invoice.InvoiceController {
     this.state.goodsListState.isMergeDiscount = true;
     this.state.goodsListState.isSalesGifts = true;
     this.state.goodsListState.drag.isStart = true;
+    this.state.calculatingDigits = 15;
     this.state.goodsListState.columnshide = [];
   }
 
@@ -150,7 +152,7 @@ const lines: any[] = [
     "unit": "套",
     "quantity": 1.0000000000001,
     "taxRate": 0.06,
-    "priceExcludeTax": 2,
+    "priceExcludeTax": 0.0000000000001,
     "priceIncludeTax": 2.12,
     "amountTax": 0.3,
     "lineAmountExcludeTax": 5,
@@ -173,13 +175,13 @@ const lines: any[] = [
     "itemName": "技术服务费",
     "itemCode": "z",
     "unit": "",
-    "quantity": null,
+    "quantity": -1,
     "taxRate": 0.06,
     "priceExcludeTax": null,
     "priceIncludeTax": null,
     "amountTax": -0.06,
-    "lineAmountExcludeTax": 5,
-    "lineAmountIncludeTax": 5.3,
+    "lineAmountExcludeTax": 2,
+    "lineAmountIncludeTax": 2.3,
     "lineAttribute": LineAttributeType.折扣行,
     "discountGroup": "1714491422291693568",
     "favouredPolicyMark": false,

package/src/Invoice/tools/calculate/index.ts

@@ -1,5 +1,5 @@
 
-import { chain, bignumber } from 'mathjs';
+import { chain, bignumber, number } from 'mathjs';
 
 
 /** 格式化 保留2位小数 */
@@ -18,7 +18,7 @@ export const format15 = (value: number | string, defaultFractionDigits: number =
     if (typeof value === 'string') value = parseFloat(value);
 
     const fractionDigits = 15 - `${value || 0}`.indexOf('.');
-    return parseFloat(value.toFixed(fractionDigits > defaultFractionDigits ? defaultFractionDigits : fractionDigits));
+    return onScientificNotation(value, fractionDigits > defaultFractionDigits ? defaultFractionDigits : fractionDigits) as number | undefined | '';
 };
 
 
@@ -60,7 +60,7 @@ export function countAmountExcludeTax(amountIncludeTax: string | number, taxAmou
  * @returns 税额
  */
 export function countTaxAmount(amountIncludeTax: string | number, deduction: number, taxRate: number): number | undefined {
-    
+
     if (!amountIncludeTax && amountIncludeTax !== 0) return undefined;
     if (!deduction && deduction !== 0) return undefined;
     if (!taxRate && taxRate !== 0) return undefined;
@@ -109,4 +109,17 @@ export function countQuantity(amount: string | number, price: string | number, c
 
 
 
-
+/** 不用可续计数法 */
+function onScientificNotation(e: number, fractionDigits: number) {
+    const arr = e.toFixed(fractionDigits).split('');
+    for (; arr.length > 0;) {
+        if (arr[arr.length - 1] === '0') {
+            arr.pop();
+        } else if (arr[arr.length - 1] === '.') {
+            arr.pop(); return arr.join('');
+        } else {
+            return arr.join('');
+        }
+    }
+    return '0';
+}

package/src/Invoice/ui/default/GoodsList/hook/useColumns/index.tsx

@@ -552,7 +552,7 @@ export default (form: WrappedFormUtils) => {
             case LineAttributeType.正常:
               return <span style={{ padding: '0 10px' }}>正常行</span>
             default:
-              return <span style={{ padding: '0 10px' }}></span>
+              return <span style={{ padding: '0 10px' }}>{e}</span>
           }
         }
       },