kts-component-invoice-operate 3.2.39 → 3.2.41

package/dist/index.esm.js

@@ -1776,12 +1776,12 @@ function _mergeDetails() {
           case 20:
             sum.lineAmountIncludeTax = _context.sent;
             _context.next = 23;
-            return calculatePriceExcludeTax(sum);
+            return calculatePriceExcludeTax(sum, state.calculatingDigits);
 
           case 23:
             sum.priceExcludeTax = _context.sent;
             _context.next = 26;
-            return calculatePriceIncludeTax(sum);
+            return calculatePriceIncludeTax(sum, state.calculatingDigits);
 
           case 26:
             sum.priceIncludeTax = _context.sent;
@@ -1797,16 +1797,15 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 40;
+            _context.next = 39;
             break;
 
           case 36:
             _context.prev = 36;
             _context.t0 = _context["catch"](5);
-            debugger;
             showError(_context.t0);
 
-          case 40:
+          case 39:
           case "end":
             return _context.stop();
         }
@@ -1816,14 +1815,15 @@ function _mergeDetails() {
   return _mergeDetails.apply(this, arguments);
 }
 
-function calculatePriceIncludeTax(_x2) {
+function calculatePriceIncludeTax(_x2, _x3) {
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
 /** 计算单价(不含税) */
 
 
 function _calculatePriceIncludeTax() {
-  _calculatePriceIncludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sum) {
+  _calculatePriceIncludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sum, calculatingDigits) {
+    var value;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -1836,9 +1836,10 @@ function _calculatePriceIncludeTax() {
             return _context2.abrupt("return", undefined);
 
           case 2:
-            return _context2.abrupt("return", chain$1(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
+            value = chain$1(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+            return _context2.abrupt("return", format15(value, calculatingDigits) || undefined);
 
-          case 3:
+          case 4:
           case "end":
             return _context2.stop();
         }
@@ -1848,14 +1849,15 @@ function _calculatePriceIncludeTax() {
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
 
-function calculatePriceExcludeTax(_x3) {
+function calculatePriceExcludeTax(_x4, _x5) {
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
 /** 合并金额(含税) */
 
 
 function _calculatePriceExcludeTax() {
-  _calculatePriceExcludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sum) {
+  _calculatePriceExcludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sum, calculatingDigits) {
+    var value;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -1868,9 +1870,10 @@ function _calculatePriceExcludeTax() {
             return _context3.abrupt("return", undefined);
 
           case 2:
-            return _context3.abrupt("return", chain$1(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
+            value = format15(chain$1(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
+            return _context3.abrupt("return", format15(value, calculatingDigits) || undefined);
 
-          case 3:
+          case 5:
           case "end":
             return _context3.stop();
         }
@@ -1880,7 +1883,7 @@ function _calculatePriceExcludeTax() {
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
 
-function mergeLineAmountIncludeTax(_x4) {
+function mergeLineAmountIncludeTax(_x6) {
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
 /** 合并金额(不含税) */
@@ -1909,7 +1912,7 @@ function _mergeLineAmountIncludeTax() {
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
 
-function mergeLineAmountExcludeTax(_x5) {
+function mergeLineAmountExcludeTax(_x7) {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 /** 合并数量 */
@@ -1938,7 +1941,7 @@ function _mergeLineAmountExcludeTax() {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 
-function mergeQuantity(_x6) {
+function mergeQuantity(_x8) {
   return _mergeQuantity.apply(this, arguments);
 }
 /** 填充行明细信息 */
@@ -1967,7 +1970,7 @@ function _mergeQuantity() {
   return _mergeQuantity.apply(this, arguments);
 }
 
-function fillingInformationGood(_x7, _x8) {
+function fillingInformationGood(_x9, _x10) {
   return _fillingInformationGood.apply(this, arguments);
 }
 /** 存在税率不一样的明细，不能合并 */
@@ -1998,7 +2001,7 @@ function _fillingInformationGood() {
   return _fillingInformationGood.apply(this, arguments);
 }
 
-function checkTaxTate(_x9) {
+function checkTaxTate(_x11) {
   return _checkTaxTate.apply(this, arguments);
 }
 /** 显示错误信息 */

package/dist/index.js

@@ -1786,12 +1786,12 @@ function _mergeDetails() {
           case 20:
             sum.lineAmountIncludeTax = _context.sent;
             _context.next = 23;
-            return calculatePriceExcludeTax(sum);
+            return calculatePriceExcludeTax(sum, state.calculatingDigits);
 
           case 23:
             sum.priceExcludeTax = _context.sent;
             _context.next = 26;
-            return calculatePriceIncludeTax(sum);
+            return calculatePriceIncludeTax(sum, state.calculatingDigits);
 
           case 26:
             sum.priceIncludeTax = _context.sent;
@@ -1807,16 +1807,15 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 40;
+            _context.next = 39;
             break;
 
           case 36:
             _context.prev = 36;
             _context.t0 = _context["catch"](5);
-            debugger;
             showError(_context.t0);
 
-          case 40:
+          case 39:
           case "end":
             return _context.stop();
         }
@@ -1826,14 +1825,15 @@ function _mergeDetails() {
   return _mergeDetails.apply(this, arguments);
 }
 
-function calculatePriceIncludeTax(_x2) {
+function calculatePriceIncludeTax(_x2, _x3) {
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
 /** 计算单价(不含税) */
 
 
 function _calculatePriceIncludeTax() {
-  _calculatePriceIncludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sum) {
+  _calculatePriceIncludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sum, calculatingDigits) {
+    var value;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -1846,9 +1846,10 @@ function _calculatePriceIncludeTax() {
             return _context2.abrupt("return", undefined);
 
           case 2:
-            return _context2.abrupt("return", mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber());
+            value = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber();
+            return _context2.abrupt("return", format15(value, calculatingDigits) || undefined);
 
-          case 3:
+          case 4:
           case "end":
             return _context2.stop();
         }
@@ -1858,14 +1859,15 @@ function _calculatePriceIncludeTax() {
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
 
-function calculatePriceExcludeTax(_x3) {
+function calculatePriceExcludeTax(_x4, _x5) {
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
 /** 合并金额(含税) */
 
 
 function _calculatePriceExcludeTax() {
-  _calculatePriceExcludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sum) {
+  _calculatePriceExcludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sum, calculatingDigits) {
+    var value;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -1878,9 +1880,10 @@ function _calculatePriceExcludeTax() {
             return _context3.abrupt("return", undefined);
 
           case 2:
-            return _context3.abrupt("return", mathjs.chain(mathjs.bignumber(sum.lineAmountExcludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber());
+            value = format15(mathjs.chain(mathjs.bignumber(sum.lineAmountExcludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber());
+            return _context3.abrupt("return", format15(value, calculatingDigits) || undefined);
 
-          case 3:
+          case 5:
           case "end":
             return _context3.stop();
         }
@@ -1890,7 +1893,7 @@ function _calculatePriceExcludeTax() {
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
 
-function mergeLineAmountIncludeTax(_x4) {
+function mergeLineAmountIncludeTax(_x6) {
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
 /** 合并金额(不含税) */
@@ -1919,7 +1922,7 @@ function _mergeLineAmountIncludeTax() {
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
 
-function mergeLineAmountExcludeTax(_x5) {
+function mergeLineAmountExcludeTax(_x7) {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 /** 合并数量 */
@@ -1948,7 +1951,7 @@ function _mergeLineAmountExcludeTax() {
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
 
-function mergeQuantity(_x6) {
+function mergeQuantity(_x8) {
   return _mergeQuantity.apply(this, arguments);
 }
 /** 填充行明细信息 */
@@ -1977,7 +1980,7 @@ function _mergeQuantity() {
   return _mergeQuantity.apply(this, arguments);
 }
 
-function fillingInformationGood(_x7, _x8) {
+function fillingInformationGood(_x9, _x10) {
   return _fillingInformationGood.apply(this, arguments);
 }
 /** 存在税率不一样的明细，不能合并 */
@@ -2008,7 +2011,7 @@ function _fillingInformationGood() {
   return _fillingInformationGood.apply(this, arguments);
 }
 
-function checkTaxTate(_x9) {
+function checkTaxTate(_x11) {
   return _checkTaxTate.apply(this, arguments);
 }
 /** 显示错误信息 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.39",
+  "version": "3.2.41",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -3,6 +3,7 @@ import { message } from 'kts-xui';
 import { chain, bignumber } from 'mathjs';
 import idGenerator from '../../tools/idGenerator';
 import { IGood, InvoiceControllerState, LineAttributeType } from '..';
+import { format15 } from '../../tools/calculate';
 
 export default async function mergeDetails(state: InvoiceControllerState) {
     if (state.goodsListState.editGood) return;
@@ -31,14 +32,14 @@ export default async function mergeDetails(state: InvoiceControllerState) {
         sum.lineAmountIncludeTax = await mergeLineAmountIncludeTax(goodsList);
 
         // 计算单价(不含税)
-        sum.priceExcludeTax = await calculatePriceExcludeTax(sum);
+        sum.priceExcludeTax = await calculatePriceExcludeTax(sum, state.calculatingDigits);
 
         // 计算单价(含税)
-        sum.priceIncludeTax = await calculatePriceIncludeTax(sum);
+        sum.priceIncludeTax = await calculatePriceIncludeTax(sum, state.calculatingDigits);
 
         // 计算税额
         sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
-        
+
         const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
         state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
         state.goodsListState.goodsList.splice(p, 0, sum);
@@ -46,21 +47,22 @@ export default async function mergeDetails(state: InvoiceControllerState) {
         state.goodsListState.goodsList.forEach(e => { state.goodsListState.goodsMap.set(e.$index, e) });
         state.goodsListState.selectedGoodIndex = [];
     } catch (error: any) {
-        debugger;
         showError(error)
     }
 }
 
 /** 计算单价(含税) */
-async function calculatePriceIncludeTax(sum: IGood) {
+async function calculatePriceIncludeTax(sum: IGood, calculatingDigits?: number) {
     if (!sum.quantity) return undefined;
-    return chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+    const value = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber()
+    return format15(value, calculatingDigits) || undefined;
 }
 
 /** 计算单价(不含税) */
-async function calculatePriceExcludeTax(sum: IGood) {
+async function calculatePriceExcludeTax(sum: IGood, calculatingDigits?: number) {
     if (!sum.quantity) return undefined;
-    return chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+    const value = format15(chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
+    return format15(value, calculatingDigits) || undefined;;
 }
 
 /** 合并金额(含税) */