kts-component-invoice-operate 3.2.205 → 3.2.207

package/dist/index.esm.js

@@ -22270,14 +22270,16 @@ var useColumns$1 = (function (form) {
               validator: function validator(rule, value, callback) {
                 //含税金额
                 var lineAmountIncludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountIncludeTax) || 0; //不含税金额
+                // const lineAmountExcludeTax = lineAmountIncludeTax-value;
 
-                var lineAmountExcludeTax = lineAmountIncludeTax - value;
+                var lineAmountExcludeTax = chain$1(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
                 var taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
 
                 if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
-                  var total = bignumber(lineAmountExcludeTax * taxRate / 100); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
+                  // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+                  var total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100)); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
 
-                  if (chain$1(total).subtract(bignumber(value)).done().toNumber() <= 0.01) {
+                  if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
                     callback();
                   } else {
                     callback('税额填写错误，请重新输入');

package/dist/index.js

@@ -22280,14 +22280,16 @@ var useColumns$1 = (function (form) {
               validator: function validator(rule, value, callback) {
                 //含税金额
                 var lineAmountIncludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountIncludeTax) || 0; //不含税金额
+                // const lineAmountExcludeTax = lineAmountIncludeTax-value;
 
-                var lineAmountExcludeTax = lineAmountIncludeTax - value;
+                var lineAmountExcludeTax = mathjs.chain(mathjs.bignumber(lineAmountIncludeTax || 0)).subtract(mathjs.bignumber(value || 0));
                 var taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
 
                 if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
-                  var total = mathjs.bignumber(lineAmountExcludeTax * taxRate / 100); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
+                  // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+                  var total = lineAmountExcludeTax.multiply(mathjs.bignumber(taxRate || 0)).divide(mathjs.bignumber(100)); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
 
-                  if (mathjs.chain(total).subtract(mathjs.bignumber(value)).done().toNumber() <= 0.01) {
+                  if (Math.abs(total.subtract(mathjs.bignumber(value || 0)).done().toNumber()) <= 0.01) {
                     callback();
                   } else {
                     callback('税额填写错误，请重新输入');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.205",
+  "version": "3.2.207",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

package/src/Invoice/Invoice-digtal/_test/easiest/index.tsx

@@ -1,12 +1,14 @@
 import React from 'react';
 import Invoice from '../../..';
 import 'antd/dist/antd.css';
-
+import { chain, bignumber } from 'mathjs';
 export default () => {
     const callback = (e: any) => {
         console.log(e.target.checked)
     }
-
+    console.log(chain(bignumber(null)))
+    console.log(chain(bignumber(5.01)).multiply(bignumber(5)).divide(bignumber(100)).done().toNumber())
+    console.log(Math.abs(chain(bignumber(5.01)).multiply(bignumber(5)).divide(bignumber(100)).subtract(bignumber(0.24)).done().toNumber()))
     const controller = React.useMemo(() => new Invoice.InvoiceController(), [])
 
     React.useEffect(() => {

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

@@ -522,12 +522,14 @@ export default (form: WrappedFormUtils) => {
                         //含税金额
                         const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
                         //不含税金额
-                        const lineAmountExcludeTax = lineAmountIncludeTax - value;
+                        // const lineAmountExcludeTax = lineAmountIncludeTax-value;
+                        const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax||0)).subtract(bignumber(value||0));
                         const taxRate = editGood?.taxRate;
                         if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
-                          const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+                          // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+                          const total = lineAmountExcludeTax.multiply(bignumber(taxRate||0)).divide(bignumber(100));
                           // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
-                          if (chain(total).subtract(bignumber(value)).done().toNumber() <= 0.01) {
+                          if (Math.abs(total.subtract(bignumber(value||0)).done().toNumber()) <= 0.01) {
                             callback();
                           } else {
                             callback('税额填写错误，请重新输入')