npm - kts-component-invoice-operate - Versions diffs - 3.2.121-2 → 3.2.122 - Mend

kts-component-invoice-operate 3.2.121-2 → 3.2.122

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.d.ts CHANGED Viewed

@@ -14,6 +14,8 @@ export default class GoodsListState {
     goodMax?: number;
     /** 是否可以切换(含税/不含税)状态 */
     isSwitchTax?: boolean;
+    /** 切换含税时是否重新计算 */
+    isRecalculateWhenSwitchTax: boolean;
     /** 是否能添加折扣行 */
     isAddDiscount?: boolean;
     /** 是否可以添加行 */

package/dist/index.esm.js CHANGED Viewed

@@ -1089,6 +1089,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.deduction = 0;
   this.goodMax = void 0;
   this.isSwitchTax = void 0;
+  this.isRecalculateWhenSwitchTax = false;
   this.isAddDiscount = void 0;
   this.isAddRow = true;
   this.isRemRow = true;
@@ -9334,32 +9335,62 @@ var onChangeItemCode = /*#__PURE__*/function () {
 /** 修改了含税开关 重新计算 */
 var onChangeSwitchTax = /*#__PURE__*/function () {
-  var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(controller, isTaxIncluded) {
+  var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(controller, isTaxIncluded) {
     var calculatingDigits;
-    return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+    return _regeneratorRuntime().wrap(function _callee22$(_context22) {
       while (1) {
-        switch (_context21.prev = _context21.next) {
+        switch (_context22.prev = _context22.next) {
           case 0:
+            if (controller.state.goodsListState.isRecalculateWhenSwitchTax) {
+              _context22.next = 3;
+              break;
+            }
+            controller.pipeline( /*#__PURE__*/function () {
+              var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(s) {
+                return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+                  while (1) {
+                    switch (_context20.prev = _context20.next) {
+                      case 0:
+                        s.goodsListState = _objectSpread2(_objectSpread2({}, s.goodsListState), {}, {
+                          isTaxIncluded: isTaxIncluded
+                        });
+                      case 1:
+                      case "end":
+                        return _context20.stop();
+                    }
+                  }
+                }, _callee20);
+              }));
+              return function (_x40) {
+                return _ref21.apply(this, arguments);
+              };
+            }())();
+            return _context22.abrupt("return");
+          case 3:
             calculatingDigits = controller.state.calculatingDigits;
-            _context21.next = 3;
+            _context22.next = 6;
             return controller.saveEditGood();
-          case 3:
-            _context21.next = 5;
+          case 6:
+            _context22.next = 8;
             return controller.wait();
-          case 5:
-            _context21.next = 7;
+          case 8:
+            _context22.next = 10;
             return controller.run( /*#__PURE__*/function () {
-              var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(s) {
-                var _s$goodsListState, needRefresh, newGoodList;
+              var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(s) {
+                var _s$goodsListState, needRefresh, newGoodsList;
-                return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+                return _regeneratorRuntime().wrap(function _callee21$(_context21) {
                   while (1) {
-                    switch (_context20.prev = _context20.next) {
+                    switch (_context21.prev = _context21.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context20.next = 3;
+                          _context21.next = 3;
                           break;
                         }
@@ -9367,7 +9398,7 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                           content: '你正在编辑一个货物',
                           key: '你正在编辑一个货物'
                         });
-                        return _context20.abrupt("return");
+                        return _context21.abrupt("return");
                       case 3:
                         s.goodsListState.isTaxIncluded = isTaxIncluded;
@@ -9376,7 +9407,7 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                           needRefresh = false;
                           if (((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : _s$goodsListState.goodsList) && s.goodsListState.goodsList.length) {
-                            newGoodList = s.goodsListState.goodsList.map(function (good) {
+                            newGoodsList = s.goodsListState.goodsList.map(function (good) {
                               var sourceQuantity = good.quantity,
                                   sourcePriceExcludeTax = good.priceExcludeTax,
                                   sourcePriceIncludeTax = good.priceIncludeTax,
@@ -9390,11 +9421,9 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                                 if (!taxRate && taxRate !== 0) return good;
                                 if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
-                                  console.log('equal');
                                   return good;
                                 } else {
                                   needRefresh = true;
-                                  console.log('not equal');
                                 }
                                 var quantity = format15(sourceQuantity, calculatingDigits);
@@ -9410,18 +9439,14 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                                   priceExcludeTax: priceExcludeTax
                                 });
                               } else {
-                                var _s$goodsListState$for;
                                 if (!sourceQuantity && sourceQuantity !== 0) return good;
                                 if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
                                 if (!taxRate && taxRate !== 0) return good;
                                 if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
-                                  console.log('equal');
                                   return good;
                                 } else {
                                   needRefresh = true;
-                                  console.log('not equal');
                                 }
                                 var _quantity5 = format15(sourceQuantity, calculatingDigits);
@@ -9436,7 +9461,6 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                                 var _taxAmount = evaluate("".concat(_lineAmountIncludeTax3, " - ").concat(_lineAmountExcludeTax3));
-                                console.log((_s$goodsListState$for = s.goodsListState.form) === null || _s$goodsListState$for === void 0 ? void 0 : _s$goodsListState$for.getFieldsValue(), 'goodsListState');
                                 return _objectSpread2(_objectSpread2({}, good), {}, {
                                   lineAmountExcludeTax: _lineAmountExcludeTax3,
                                   lineAmountIncludeTax: _lineAmountIncludeTax3,
@@ -9447,7 +9471,7 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                             });
                             if (needRefresh) {
-                              s.goodsListState.goodsList = newGoodList;
+                              s.goodsListState.goodsList = newGoodsList;
                             }
                           }
                         } catch (e) {
@@ -9456,23 +9480,23 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                       case 5:
                       case "end":
-                        return _context20.stop();
+                        return _context21.stop();
                     }
                   }
-                }, _callee20);
+                }, _callee21);
               }));
-              return function (_x40) {
-                return _ref21.apply(this, arguments);
+              return function (_x41) {
+                return _ref22.apply(this, arguments);
               };
             }());
-          case 7:
+          case 10:
           case "end":
-            return _context21.stop();
+            return _context22.stop();
         }
       }
-    }, _callee21);
+    }, _callee22);
   }));
   return function onChangeSwitchTax(_x38, _x39) {
@@ -18826,32 +18850,62 @@ var onChangeItemName$1 = /*#__PURE__*/function () {
 /** 修改了含税开关 重新计算 */
 var onChangeSwitchTax$1 = /*#__PURE__*/function () {
-  var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(controller, isTaxIncluded) {
+  var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(controller, isTaxIncluded) {
     var calculatingDigits;
-    return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+    return _regeneratorRuntime().wrap(function _callee20$(_context20) {
       while (1) {
-        switch (_context19.prev = _context19.next) {
+        switch (_context20.prev = _context20.next) {
           case 0:
+            if (controller.state.goodsListState.isRecalculateWhenSwitchTax) {
+              _context20.next = 3;
+              break;
+            }
+            controller.pipeline( /*#__PURE__*/function () {
+              var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(s) {
+                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+                  while (1) {
+                    switch (_context18.prev = _context18.next) {
+                      case 0:
+                        s.goodsListState = _objectSpread2(_objectSpread2({}, s.goodsListState), {}, {
+                          isTaxIncluded: isTaxIncluded
+                        });
+                      case 1:
+                      case "end":
+                        return _context18.stop();
+                    }
+                  }
+                }, _callee18);
+              }));
+              return function (_x36) {
+                return _ref19.apply(this, arguments);
+              };
+            }())();
+            return _context20.abrupt("return");
+          case 3:
             calculatingDigits = controller.state.calculatingDigits;
-            _context19.next = 3;
+            _context20.next = 6;
             return controller.saveEditGood();
-          case 3:
-            _context19.next = 5;
+          case 6:
+            _context20.next = 8;
             return controller.wait();
-          case 5:
-            _context19.next = 7;
+          case 8:
+            _context20.next = 10;
             return controller.run( /*#__PURE__*/function () {
-              var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(s) {
-                var _s$goodsListState, needRefresh, newGoodList;
+              var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(s) {
+                var _s$goodsListState, needRefresh, newGoodsList;
-                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+                return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) {
-                    switch (_context18.prev = _context18.next) {
+                    switch (_context19.prev = _context19.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context18.next = 3;
+                          _context19.next = 3;
                           break;
                         }
@@ -18859,7 +18913,7 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                           content: '你正在编辑一个货物',
                           key: '你正在编辑一个货物'
                         });
-                        return _context18.abrupt("return");
+                        return _context19.abrupt("return");
                       case 3:
                         s.goodsListState.isTaxIncluded = isTaxIncluded;
@@ -18868,7 +18922,7 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                           needRefresh = false;
                           if (((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : _s$goodsListState.goodsList) && s.goodsListState.goodsList.length) {
-                            newGoodList = s.goodsListState.goodsList.map(function (good) {
+                            newGoodsList = s.goodsListState.goodsList.map(function (good) {
                               var sourceQuantity = good.quantity,
                                   sourcePriceExcludeTax = good.priceExcludeTax,
                                   sourcePriceIncludeTax = good.priceIncludeTax,
@@ -18882,11 +18936,9 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                                 if (!taxRate && taxRate !== 0) return good;
                                 if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
-                                  console.log('equal');
                                   return good;
                                 } else {
                                   needRefresh = true;
-                                  console.log('not equal');
                                 }
                                 var quantity = format15(sourceQuantity, calculatingDigits);
@@ -18902,18 +18954,14 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                                   priceExcludeTax: priceExcludeTax
                                 });
                               } else {
-                                var _s$goodsListState$for;
                                 if (!sourceQuantity && sourceQuantity !== 0) return good;
                                 if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
                                 if (!taxRate && taxRate !== 0) return good;
                                 if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
-                                  console.log('equal');
                                   return good;
                                 } else {
                                   needRefresh = true;
-                                  console.log('not equal');
                                 }
                                 var _quantity5 = format15(sourceQuantity, calculatingDigits);
@@ -18928,7 +18976,6 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                                 var _taxAmount = evaluate("".concat(_lineAmountIncludeTax3, " - ").concat(_lineAmountExcludeTax3));
-                                console.log((_s$goodsListState$for = s.goodsListState.form) === null || _s$goodsListState$for === void 0 ? void 0 : _s$goodsListState$for.getFieldsValue(), 'goodsListState');
                                 return _objectSpread2(_objectSpread2({}, good), {}, {
                                   lineAmountExcludeTax: _lineAmountExcludeTax3,
                                   lineAmountIncludeTax: _lineAmountIncludeTax3,
@@ -18939,7 +18986,7 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                             });
                             if (needRefresh) {
-                              s.goodsListState.goodsList = newGoodList;
+                              s.goodsListState.goodsList = newGoodsList;
                             }
                           }
                         } catch (e) {
@@ -18948,23 +18995,23 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                       case 5:
                       case "end":
-                        return _context18.stop();
+                        return _context19.stop();
                     }
                   }
-                }, _callee18);
+                }, _callee19);
               }));
-              return function (_x36) {
-                return _ref19.apply(this, arguments);
+              return function (_x37) {
+                return _ref20.apply(this, arguments);
               };
             }());
-          case 7:
+          case 10:
           case "end":
-            return _context19.stop();
+            return _context20.stop();
         }
       }
-    }, _callee19);
+    }, _callee20);
   }));
   return function onChangeSwitchTax(_x34, _x35) {
@@ -23584,14 +23631,17 @@ var DrawerBody$3 = function DrawerBody(props) {
                   good.taxRate = values.taxRate;
                   good.taxFreeType = values.taxFreeType;
                   good.favouredPolicyMark = values.favouredPolicyMark;
-                  good.favouredPolicyName = values.favouredPolicyName;
-                  var taxRate = chain$1(bignumber(values.taxRate)).dotDivide(bignumber(100)).add(bignumber(1)).done(); // 是否含税
+                  good.favouredPolicyName = values.favouredPolicyName; // 无论是否含税，都保持价税合计不变
-                  var lineAmountExcludeTax = chain$1(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
-                  var priceExcludeTax = good.priceIncludeTax ? chain$1(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined;
-                  good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
-                  good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber(), s.calculatingDigits) : undefined) || undefined;
                   good.taxAmount = countTaxAmount(good.lineAmountIncludeTax || 0, s.goodsListState.deduction, values.taxRate);
+                  if (good.taxAmount || good.taxAmount === 0) {
+                    good.lineAmountExcludeTax = countAmountExcludeTax(good.lineAmountIncludeTax || 0, good.taxAmount);
+                  }
+                  if (good.lineAmountExcludeTax && good.quantity) {
+                    good.priceExcludeTax = countPrice(good.lineAmountExcludeTax, good.quantity, controller.state.calculatingDigits);
+                  }
                 });
                 s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
                 s.goodsListState.endowCode.endowcodeGoodIndex = [];

package/dist/index.js CHANGED Viewed

@@ -1099,6 +1099,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.deduction = 0;
   this.goodMax = void 0;
   this.isSwitchTax = void 0;
+  this.isRecalculateWhenSwitchTax = false;
   this.isAddDiscount = void 0;
   this.isAddRow = true;
   this.isRemRow = true;
@@ -9344,32 +9345,62 @@ var onChangeItemCode = /*#__PURE__*/function () {
 /** 修改了含税开关 重新计算 */
 var onChangeSwitchTax = /*#__PURE__*/function () {
-  var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(controller, isTaxIncluded) {
+  var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(controller, isTaxIncluded) {
     var calculatingDigits;
-    return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+    return _regeneratorRuntime().wrap(function _callee22$(_context22) {
       while (1) {
-        switch (_context21.prev = _context21.next) {
+        switch (_context22.prev = _context22.next) {
           case 0:
+            if (controller.state.goodsListState.isRecalculateWhenSwitchTax) {
+              _context22.next = 3;
+              break;
+            }
+            controller.pipeline( /*#__PURE__*/function () {
+              var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(s) {
+                return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+                  while (1) {
+                    switch (_context20.prev = _context20.next) {
+                      case 0:
+                        s.goodsListState = _objectSpread2(_objectSpread2({}, s.goodsListState), {}, {
+                          isTaxIncluded: isTaxIncluded
+                        });
+                      case 1:
+                      case "end":
+                        return _context20.stop();
+                    }
+                  }
+                }, _callee20);
+              }));
+              return function (_x40) {
+                return _ref21.apply(this, arguments);
+              };
+            }())();
+            return _context22.abrupt("return");
+          case 3:
             calculatingDigits = controller.state.calculatingDigits;
-            _context21.next = 3;
+            _context22.next = 6;
             return controller.saveEditGood();
-          case 3:
-            _context21.next = 5;
+          case 6:
+            _context22.next = 8;
             return controller.wait();
-          case 5:
-            _context21.next = 7;
+          case 8:
+            _context22.next = 10;
             return controller.run( /*#__PURE__*/function () {
-              var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(s) {
-                var _s$goodsListState, needRefresh, newGoodList;
+              var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(s) {
+                var _s$goodsListState, needRefresh, newGoodsList;
-                return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+                return _regeneratorRuntime().wrap(function _callee21$(_context21) {
                   while (1) {
-                    switch (_context20.prev = _context20.next) {
+                    switch (_context21.prev = _context21.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context20.next = 3;
+                          _context21.next = 3;
                           break;
                         }
@@ -9377,7 +9408,7 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                           content: '你正在编辑一个货物',
                           key: '你正在编辑一个货物'
                         });
-                        return _context20.abrupt("return");
+                        return _context21.abrupt("return");
                       case 3:
                         s.goodsListState.isTaxIncluded = isTaxIncluded;
@@ -9386,7 +9417,7 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                           needRefresh = false;
                           if (((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : _s$goodsListState.goodsList) && s.goodsListState.goodsList.length) {
-                            newGoodList = s.goodsListState.goodsList.map(function (good) {
+                            newGoodsList = s.goodsListState.goodsList.map(function (good) {
                               var sourceQuantity = good.quantity,
                                   sourcePriceExcludeTax = good.priceExcludeTax,
                                   sourcePriceIncludeTax = good.priceIncludeTax,
@@ -9400,11 +9431,9 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                                 if (!taxRate && taxRate !== 0) return good;
                                 if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && mathjs.equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
-                                  console.log('equal');
                                   return good;
                                 } else {
                                   needRefresh = true;
-                                  console.log('not equal');
                                 }
                                 var quantity = format15(sourceQuantity, calculatingDigits);
@@ -9420,18 +9449,14 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                                   priceExcludeTax: priceExcludeTax
                                 });
                               } else {
-                                var _s$goodsListState$for;
                                 if (!sourceQuantity && sourceQuantity !== 0) return good;
                                 if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
                                 if (!taxRate && taxRate !== 0) return good;
                                 if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && mathjs.equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
-                                  console.log('equal');
                                   return good;
                                 } else {
                                   needRefresh = true;
-                                  console.log('not equal');
                                 }
                                 var _quantity5 = format15(sourceQuantity, calculatingDigits);
@@ -9446,7 +9471,6 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                                 var _taxAmount = evaluate("".concat(_lineAmountIncludeTax3, " - ").concat(_lineAmountExcludeTax3));
-                                console.log((_s$goodsListState$for = s.goodsListState.form) === null || _s$goodsListState$for === void 0 ? void 0 : _s$goodsListState$for.getFieldsValue(), 'goodsListState');
                                 return _objectSpread2(_objectSpread2({}, good), {}, {
                                   lineAmountExcludeTax: _lineAmountExcludeTax3,
                                   lineAmountIncludeTax: _lineAmountIncludeTax3,
@@ -9457,7 +9481,7 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                             });
                             if (needRefresh) {
-                              s.goodsListState.goodsList = newGoodList;
+                              s.goodsListState.goodsList = newGoodsList;
                             }
                           }
                         } catch (e) {
@@ -9466,23 +9490,23 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                       case 5:
                       case "end":
-                        return _context20.stop();
+                        return _context21.stop();
                     }
                   }
-                }, _callee20);
+                }, _callee21);
               }));
-              return function (_x40) {
-                return _ref21.apply(this, arguments);
+              return function (_x41) {
+                return _ref22.apply(this, arguments);
               };
             }());
-          case 7:
+          case 10:
           case "end":
-            return _context21.stop();
+            return _context22.stop();
         }
       }
-    }, _callee21);
+    }, _callee22);
   }));
   return function onChangeSwitchTax(_x38, _x39) {
@@ -18836,32 +18860,62 @@ var onChangeItemName$1 = /*#__PURE__*/function () {
 /** 修改了含税开关 重新计算 */
 var onChangeSwitchTax$1 = /*#__PURE__*/function () {
-  var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(controller, isTaxIncluded) {
+  var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(controller, isTaxIncluded) {
     var calculatingDigits;
-    return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+    return _regeneratorRuntime().wrap(function _callee20$(_context20) {
       while (1) {
-        switch (_context19.prev = _context19.next) {
+        switch (_context20.prev = _context20.next) {
           case 0:
+            if (controller.state.goodsListState.isRecalculateWhenSwitchTax) {
+              _context20.next = 3;
+              break;
+            }
+            controller.pipeline( /*#__PURE__*/function () {
+              var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(s) {
+                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+                  while (1) {
+                    switch (_context18.prev = _context18.next) {
+                      case 0:
+                        s.goodsListState = _objectSpread2(_objectSpread2({}, s.goodsListState), {}, {
+                          isTaxIncluded: isTaxIncluded
+                        });
+                      case 1:
+                      case "end":
+                        return _context18.stop();
+                    }
+                  }
+                }, _callee18);
+              }));
+              return function (_x36) {
+                return _ref19.apply(this, arguments);
+              };
+            }())();
+            return _context20.abrupt("return");
+          case 3:
             calculatingDigits = controller.state.calculatingDigits;
-            _context19.next = 3;
+            _context20.next = 6;
             return controller.saveEditGood();
-          case 3:
-            _context19.next = 5;
+          case 6:
+            _context20.next = 8;
             return controller.wait();
-          case 5:
-            _context19.next = 7;
+          case 8:
+            _context20.next = 10;
             return controller.run( /*#__PURE__*/function () {
-              var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(s) {
-                var _s$goodsListState, needRefresh, newGoodList;
+              var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(s) {
+                var _s$goodsListState, needRefresh, newGoodsList;
-                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+                return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) {
-                    switch (_context18.prev = _context18.next) {
+                    switch (_context19.prev = _context19.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context18.next = 3;
+                          _context19.next = 3;
                           break;
                         }
@@ -18869,7 +18923,7 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                           content: '你正在编辑一个货物',
                           key: '你正在编辑一个货物'
                         });
-                        return _context18.abrupt("return");
+                        return _context19.abrupt("return");
                       case 3:
                         s.goodsListState.isTaxIncluded = isTaxIncluded;
@@ -18878,7 +18932,7 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                           needRefresh = false;
                           if (((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : _s$goodsListState.goodsList) && s.goodsListState.goodsList.length) {
-                            newGoodList = s.goodsListState.goodsList.map(function (good) {
+                            newGoodsList = s.goodsListState.goodsList.map(function (good) {
                               var sourceQuantity = good.quantity,
                                   sourcePriceExcludeTax = good.priceExcludeTax,
                                   sourcePriceIncludeTax = good.priceIncludeTax,
@@ -18892,11 +18946,9 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                                 if (!taxRate && taxRate !== 0) return good;
                                 if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && mathjs.equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
-                                  console.log('equal');
                                   return good;
                                 } else {
                                   needRefresh = true;
-                                  console.log('not equal');
                                 }
                                 var quantity = format15(sourceQuantity, calculatingDigits);
@@ -18912,18 +18964,14 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                                   priceExcludeTax: priceExcludeTax
                                 });
                               } else {
-                                var _s$goodsListState$for;
                                 if (!sourceQuantity && sourceQuantity !== 0) return good;
                                 if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
                                 if (!taxRate && taxRate !== 0) return good;
                                 if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && mathjs.equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
-                                  console.log('equal');
                                   return good;
                                 } else {
                                   needRefresh = true;
-                                  console.log('not equal');
                                 }
                                 var _quantity5 = format15(sourceQuantity, calculatingDigits);
@@ -18938,7 +18986,6 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                                 var _taxAmount = evaluate("".concat(_lineAmountIncludeTax3, " - ").concat(_lineAmountExcludeTax3));
-                                console.log((_s$goodsListState$for = s.goodsListState.form) === null || _s$goodsListState$for === void 0 ? void 0 : _s$goodsListState$for.getFieldsValue(), 'goodsListState');
                                 return _objectSpread2(_objectSpread2({}, good), {}, {
                                   lineAmountExcludeTax: _lineAmountExcludeTax3,
                                   lineAmountIncludeTax: _lineAmountIncludeTax3,
@@ -18949,7 +18996,7 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                             });
                             if (needRefresh) {
-                              s.goodsListState.goodsList = newGoodList;
+                              s.goodsListState.goodsList = newGoodsList;
                             }
                           }
                         } catch (e) {
@@ -18958,23 +19005,23 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
                       case 5:
                       case "end":
-                        return _context18.stop();
+                        return _context19.stop();
                     }
                   }
-                }, _callee18);
+                }, _callee19);
               }));
-              return function (_x36) {
-                return _ref19.apply(this, arguments);
+              return function (_x37) {
+                return _ref20.apply(this, arguments);
               };
             }());
-          case 7:
+          case 10:
           case "end":
-            return _context19.stop();
+            return _context20.stop();
         }
       }
-    }, _callee19);
+    }, _callee20);
   }));
   return function onChangeSwitchTax(_x34, _x35) {
@@ -23594,14 +23641,17 @@ var DrawerBody$3 = function DrawerBody(props) {
                   good.taxRate = values.taxRate;
                   good.taxFreeType = values.taxFreeType;
                   good.favouredPolicyMark = values.favouredPolicyMark;
-                  good.favouredPolicyName = values.favouredPolicyName;
-                  var taxRate = mathjs.chain(mathjs.bignumber(values.taxRate)).dotDivide(mathjs.bignumber(100)).add(mathjs.bignumber(1)).done(); // 是否含税
+                  good.favouredPolicyName = values.favouredPolicyName; // 无论是否含税，都保持价税合计不变
-                  var lineAmountExcludeTax = mathjs.chain(mathjs.bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
-                  var priceExcludeTax = good.priceIncludeTax ? mathjs.chain(mathjs.bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined;
-                  good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
-                  good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber(), s.calculatingDigits) : undefined) || undefined;
                   good.taxAmount = countTaxAmount(good.lineAmountIncludeTax || 0, s.goodsListState.deduction, values.taxRate);
+                  if (good.taxAmount || good.taxAmount === 0) {
+                    good.lineAmountExcludeTax = countAmountExcludeTax(good.lineAmountIncludeTax || 0, good.taxAmount);
+                  }
+                  if (good.lineAmountExcludeTax && good.quantity) {
+                    good.priceExcludeTax = countPrice(good.lineAmountExcludeTax, good.quantity, controller.state.calculatingDigits);
+                  }
                 });
                 s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
                 s.goodsListState.endowCode.endowcodeGoodIndex = [];

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.121-2",
+  "version": "3.2.122",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

package/src/Invoice/Invoice-digtal/_test/importGoods/index.tsx CHANGED Viewed

@@ -18,6 +18,8 @@ export default () => {
       // 设置数量金额计算小数位
       s.priceIntegerDigit = 14;
+      s.goodsListState.isRecalculateWhenSwitchTax = true;
     })
   }, [controller])

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.ts CHANGED Viewed

@@ -18,6 +18,9 @@ export default class GoodsListState {
   /** 是否可以切换(含税/不含税)状态 */
   isSwitchTax?: boolean;
+  /** 切换含税时是否重新计算 */
+  isRecalculateWhenSwitchTax = false;
   /** 是否能添加折扣行 */
   isAddDiscount?: boolean;
@@ -110,4 +113,5 @@ export default class GoodsListState {
   /** 商品拖拽数据 */
   drag = new Drag();
 }

package/src/Invoice/ui/default/EndowCodeDrawer/index.tsx CHANGED Viewed

@@ -6,7 +6,7 @@ import { Input, NumberPicker } from '@formily/antd-components';
 import { format15 } from '../GoodsList/hook/useColumns/autoFillFn';
 import { LineAttributeType } from '../../../InvoiceController';
 import IGood from '../../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
-import { countTaxAmount } from '../../../tools/calculate';
+import { countTaxAmount, countAmountExcludeTax, countPrice } from '../../../tools/calculate';
 import { bytesLnegth, cutStr } from '../../../tools/strringFn';
 import {
   SchemaForm,
@@ -428,16 +428,15 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
         good.favouredPolicyMark = values.favouredPolicyMark;
         good.favouredPolicyName = values.favouredPolicyName;
-        const taxRate = chain(bignumber(values.taxRate)).dotDivide(bignumber(100)).add(bignumber(1)).done();
-        // 是否含税
-        const lineAmountExcludeTax = chain(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
-        const priceExcludeTax = good.priceIncludeTax ? chain(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined
-        good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
-        good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber(), s.calculatingDigits) : undefined) || undefined;
+        // 无论是否含税，都保持价税合计不变
         good.taxAmount = countTaxAmount(good.lineAmountIncludeTax || 0, s.goodsListState.deduction, values.taxRate);
+        if (good.taxAmount || good.taxAmount === 0 ) {
+          good.lineAmountExcludeTax = countAmountExcludeTax(good.lineAmountIncludeTax || 0, good.taxAmount);
+        }
+        if (good.lineAmountExcludeTax && good.quantity) {
+          good.priceExcludeTax = countPrice(good.lineAmountExcludeTax, good.quantity, controller.state.calculatingDigits) as any;
+        }
       });
       s.goodsListState.goodsList = s.goodsListState.goodsList.slice();

package/src/Invoice/ui/default/GoodsList/hook/useColumns/autoFillFn/index.ts CHANGED Viewed

@@ -535,6 +535,10 @@ export const onChangeItemCode = async (controller: InvoiceController, form: Wrap
 /** 修改了含税开关 重新计算 */
 export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncluded: boolean) => {
+  if (!controller.state.goodsListState.isRecalculateWhenSwitchTax) {
+    controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded } })();
+    return
+  }
   const calculatingDigits = controller.state.calculatingDigits;
   await controller.saveEditGood();
@@ -556,7 +560,7 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
       let needRefresh = false;
       if (s.goodsListState?.goodsList && s.goodsListState.goodsList.length) {
-        const newGoodList = s.goodsListState.goodsList.map(good => {
+        const newGoodsList = s.goodsListState.goodsList.map(good => {
           const {
             quantity: sourceQuantity,
             priceExcludeTax: sourcePriceExcludeTax,
@@ -569,11 +573,9 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
             if (!sourcePriceIncludeTax && sourcePriceIncludeTax !== 0) return good;
             if (!taxRate && taxRate !== 0) return good;
             if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
-              console.log('equal')
               return good
             } else {
               needRefresh = true;
-              console.log('not equal')
             }
             const quantity: any = format15(sourceQuantity, calculatingDigits);
             const priceIncludeTax: any = format15(sourcePriceIncludeTax, calculatingDigits);
@@ -596,11 +598,9 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
             if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
             if (!taxRate && taxRate !== 0) return good;
             if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
-              console.log('equal')
               return good
             } else {
               needRefresh = true;
-              console.log('not equal')
             }
             const quantity: any = format15(sourceQuantity, calculatingDigits);
             const priceExcludeTax: any = format15(sourcePriceExcludeTax, calculatingDigits);
@@ -610,8 +610,6 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
             const priceIncludeTax: any = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), calculatingDigits);
             const taxAmount: any = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
-            console.log(s.goodsListState.form?.getFieldsValue(), 'goodsListState')
             return {
               ...good,
               lineAmountExcludeTax,
@@ -624,7 +622,7 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
         })
         if (needRefresh) {
-          s.goodsListState.goodsList = newGoodList;
+          s.goodsListState.goodsList = newGoodsList;
         }
       }
     } catch(e) {

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/autoFillFn/index.ts CHANGED Viewed

@@ -527,6 +527,10 @@ export const onChangeItemName = async (controller: InvoiceController, form: Wrap
 /** 修改了含税开关 重新计算 */
 export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncluded: boolean) => {
+  if (!controller.state.goodsListState.isRecalculateWhenSwitchTax) {
+    controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded } })();
+    return
+  }
   const calculatingDigits = controller.state.calculatingDigits;
   await controller.saveEditGood();
@@ -548,7 +552,7 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
       let needRefresh = false;
       if (s.goodsListState?.goodsList && s.goodsListState.goodsList.length) {
-        const newGoodList = s.goodsListState.goodsList.map(good => {
+        const newGoodsList = s.goodsListState.goodsList.map(good => {
           const {
             quantity: sourceQuantity,
             priceExcludeTax: sourcePriceExcludeTax,
@@ -561,11 +565,9 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
             if (!sourcePriceIncludeTax && sourcePriceIncludeTax !== 0) return good;
             if (!taxRate && taxRate !== 0) return good;
             if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
-              console.log('equal')
               return good
             } else {
               needRefresh = true;
-              console.log('not equal')
             }
             const quantity: any = format15(sourceQuantity, calculatingDigits);
             const priceIncludeTax: any = format15(sourcePriceIncludeTax, calculatingDigits);
@@ -588,11 +590,9 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
             if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
             if (!taxRate && taxRate !== 0) return good;
             if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
-              console.log('equal')
               return good
             } else {
               needRefresh = true;
-              console.log('not equal')
             }
             const quantity: any = format15(sourceQuantity, calculatingDigits);
             const priceExcludeTax: any = format15(sourcePriceExcludeTax, calculatingDigits);
@@ -602,8 +602,6 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
             const priceIncludeTax: any = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), calculatingDigits);
             const taxAmount: any = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
-            console.log(s.goodsListState.form?.getFieldsValue(), 'goodsListState')
             return {
               ...good,
               lineAmountExcludeTax,
@@ -616,11 +614,11 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
         })
         if (needRefresh) {
-          s.goodsListState.goodsList = newGoodList;
+          s.goodsListState.goodsList = newGoodsList;
         }
       }
     } catch(e) {
       console.error('切换税率重新计算出错', e, s.goodsListState)
     }
   })
-}
+}