kts-component-invoice-operate 3.0.16 → 3.0.18

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

@@ -41,6 +41,10 @@ export default class GoodsListState {
     goodsMap: Map<string, IGood>;
     /** 货物菜单扩展 */
     goodsMenuExpand: ((index: string, controller: InvoiceController) => React.ReactNode)[];
+    /** 金额含税(受控，输入后不再自动计算) */
+    amountIncludeTax?: number;
+    /** 金额不含税(受控，输入后不再自动计算) */
+    amountExcludeTax?: number;
     /** 列表选中的货物索引列表 */
     selectedGoodIndex: string[];
     /** 准备添加折扣的货物索引列表 */

package/dist/Invoice/ui/GoodsList/hook/useColumns/autoFillFn/index.d.ts

@@ -18,7 +18,7 @@ export declare const onChangeLineAmountIncludeTax: (...par: any[]) => void;
 /** 金额(不含税) */
 export declare const onChangeLineAmountExcludeTax: (...par: any[]) => void;
 /** 税率 */
-export declare const onChangeTaxRate: (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => void;
+export declare const onChangeTaxRate: (...par: any[]) => void;
 /** 小规模纳税人 1% 和 3% 自动赋码免税 */
 export declare function dutyFree(controller: InvoiceController, taxRate: number, form: WrappedFormUtils<any>, record: IGood): number | undefined;
 /** 含税 => 更新(不含税) */

package/dist/index.esm.js

@@ -1001,6 +1001,8 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.goodsList = [];
   this.goodsMap = new Map();
   this.goodsMenuExpand = [];
+  this.amountIncludeTax = void 0;
+  this.amountExcludeTax = void 0;
   this.selectedGoodIndex = [];
   this.discountGoodIndex = [];
   this.endowCode = new EndowCode();
@@ -1948,6 +1950,10 @@ var Statistics = (function () {
   var lineAmountIncludeTax = controller.useMemo(function (s) {
     var _s$goodsListState$for, _s$goodsListState$for2;
 
+    if (typeof s.goodsListState.amountIncludeTax === 'number') {
+      return s.goodsListState.amountIncludeTax;
+    }
+
     var sum = chain$1(bignumber(0));
     var editGood = s.goodsListState.editGood; // 正在编辑的货物
 
@@ -1968,6 +1974,10 @@ var Statistics = (function () {
   var lineAmountExcludeTax = controller.useMemo(function (s) {
     var _s$goodsListState$for3, _s$goodsListState$for4;
 
+    if (typeof s.goodsListState.amountExcludeTax === 'number') {
+      return s.goodsListState.amountExcludeTax;
+    }
+
     var sum = chain$1(bignumber(0));
     var editGood = s.goodsListState.editGood; // 正在编辑的货物
 
@@ -8957,26 +8967,26 @@ var onChangeLineAmountExcludeTax = lazyFn(function (controller, form, record) {
 }, 1000);
 /** 税率 */
 
-var onChangeTaxRate = function onChangeTaxRate(controller, form, record) {
+var onChangeTaxRate = lazyFn(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(err, values) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(err, values) {
       var taxRate;
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
         while (1) {
-          switch (_context11.prev = _context11.next) {
+          switch (_context12.prev = _context12.next) {
             case 0:
               err = err || {};
 
               if (!(promptErr(err.taxRate) || !values.taxRate && values.taxRate !== 0)) {
-                _context11.next = 3;
+                _context12.next = 3;
                 break;
               }
 
-              return _context11.abrupt("return");
+              return _context12.abrupt("return");
 
             case 3:
               taxRate = parseFloat(values.taxRate);
-              _context11.next = 6;
+              _context12.next = 6;
               return controller.setEditGood({
                 taxRate: taxRate
               });
@@ -9000,21 +9010,43 @@ var onChangeTaxRate = function onChangeTaxRate(controller, form, record) {
                 updateUnitPriceExcludingTax(controller, form);
               } else {
                 updateUnitPriceTax(controller, form);
-              }
+              } // 清楚 计算中启动字段
+
+
+              controller.run( /*#__PURE__*/function () {
+                var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(s) {
+                  return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                    while (1) {
+                      switch (_context11.prev = _context11.next) {
+                        case 0:
+                          return _context11.abrupt("return", s.calculating = '');
+
+                        case 1:
+                        case "end":
+                          return _context11.stop();
+                      }
+                    }
+                  }, _callee11);
+                }));
+
+                return function (_x18) {
+                  return _ref12.apply(this, arguments);
+                };
+              }());
 
-            case 8:
+            case 9:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
         }
-      }, _callee11);
+      }, _callee12);
     }));
 
     return function (_x16, _x17) {
       return _ref11.apply(this, arguments);
     };
   }());
-};
+}, 1000);
 /** 小规模纳税人 1% 和 3% 自动赋码免税 */
 
 function dutyFree(controller, taxRate, form, record) {
@@ -9050,11 +9082,11 @@ function dutyFree(controller, taxRate, form, record) {
 
 var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(err, values) {
+    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(err, values) {
       var taxAmount, lineAmountExcludeTax, priceExcludeTax, deduction;
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
               err = err || {};
               /** 税额 */
@@ -9066,7 +9098,7 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
                 taxAmount = countTaxAmount(values.lineAmountIncludeTax, deduction, values.taxRate);
               }
 
-              _context12.next = 5;
+              _context13.next = 5;
               return controller.setEditGood({
                 taxAmount: taxAmount
               });
@@ -9080,7 +9112,7 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
               form.setFieldsValue({
                 lineAmountExcludeTax: lineAmountExcludeTax
               });
-              _context12.next = 9;
+              _context13.next = 9;
               return controller.setEditGood({
                 lineAmountExcludeTax: lineAmountExcludeTax
               });
@@ -9094,21 +9126,21 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
               form.setFieldsValue({
                 priceExcludeTax: priceExcludeTax
               });
-              _context12.next = 13;
+              _context13.next = 13;
               return controller.setEditGood({
                 priceExcludeTax: priceExcludeTax
               });
 
             case 13:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
         }
-      }, _callee12);
+      }, _callee13);
     }));
 
-    return function (_x18, _x19) {
-      return _ref12.apply(this, arguments);
+    return function (_x19, _x20) {
+      return _ref13.apply(this, arguments);
     };
   }());
 };
@@ -9116,35 +9148,35 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
 
 var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(err, values) {
+    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(err, values) {
       var lineAmountExcludeTax, lineAmountIncludeTax, priceIncludeTax, taxAmount;
-      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
         while (1) {
-          switch (_context13.prev = _context13.next) {
+          switch (_context14.prev = _context14.next) {
             case 0:
               err = err || {};
 
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !promptErr(err.lineAmountExcludeTax) && (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0))) {
-                _context13.next = 16;
+                _context14.next = 16;
                 break;
               }
 
               // 金额（含税）= 金额（不含税）* (1+ 税率)
               lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
               lineAmountIncludeTax = format2(evaluate("".concat(lineAmountExcludeTax, " * (1+(").concat(values.taxRate, "/100))")));
-              _context13.next = 6;
+              _context14.next = 6;
               return controller.setEditGood({
                 lineAmountIncludeTax: lineAmountIncludeTax
               });
 
             case 6:
               if (!(!err.quantity && values.quantity)) {
-                _context13.next = 10;
+                _context14.next = 10;
                 break;
               }
 
               priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(values.quantity)));
-              _context13.next = 10;
+              _context14.next = 10;
               return controller.setEditGood({
                 priceIncludeTax: priceIncludeTax
               });
@@ -9155,221 +9187,221 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               form.setFieldsValue({
                 taxAmount: taxAmount
               });
-              _context13.next = 14;
+              _context14.next = 14;
               return controller.setEditGood({
                 taxAmount: taxAmount
               });
 
             case 14:
-              _context13.next = 19;
+              _context14.next = 19;
               break;
 
             case 16:
               form.setFieldsValue({
                 taxAmount: undefined
               });
-              _context13.next = 19;
+              _context14.next = 19;
               return controller.setEditGood({
                 taxAmount: undefined
               });
 
             case 19:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
         }
-      }, _callee13);
+      }, _callee14);
     }));
 
-    return function (_x20, _x21) {
-      return _ref13.apply(this, arguments);
+    return function (_x21, _x22) {
+      return _ref14.apply(this, arguments);
     };
   }());
 };
 /** 单调赋码 */
 
 var endowCode = /*#__PURE__*/function () {
-  var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(controller, goods) {
-    return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(controller, goods) {
+    return _regeneratorRuntime().wrap(function _callee17$(_context17) {
       while (1) {
-        switch (_context16.prev = _context16.next) {
+        switch (_context17.prev = _context17.next) {
           case 0:
-            _context16.next = 2;
+            _context17.next = 2;
             return controller.wait();
 
           case 2:
-            _context16.next = 4;
+            _context17.next = 4;
             return controller.saveEditGood();
 
           case 4:
-            _context16.next = 6;
+            _context17.next = 6;
             return controller.pipeline( /*#__PURE__*/function () {
-              var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(s) {
+              var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(s) {
                 var err, key, g, i;
-                return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+                return _regeneratorRuntime().wrap(function _callee16$(_context16) {
                   while (1) {
-                    switch (_context15.prev = _context15.next) {
+                    switch (_context16.prev = _context16.next) {
                       case 0:
                         if (!s.goodsListState.form) {
-                          _context15.next = 11;
+                          _context16.next = 11;
                           break;
                         }
 
                         err = s.goodsListState.form.getFieldsError();
-                        _context15.t0 = _regeneratorRuntime().keys(err);
+                        _context16.t0 = _regeneratorRuntime().keys(err);
 
                       case 3:
-                        if ((_context15.t1 = _context15.t0()).done) {
-                          _context15.next = 11;
+                        if ((_context16.t1 = _context16.t0()).done) {
+                          _context16.next = 11;
                           break;
                         }
 
-                        key = _context15.t1.value;
+                        key = _context16.t1.value;
 
                         if (err[key]) {
-                          _context15.next = 7;
+                          _context16.next = 7;
                           break;
                         }
 
-                        return _context15.abrupt("continue", 3);
+                        return _context16.abrupt("continue", 3);
 
                       case 7:
                         message.error(err[key][0]);
-                        return _context15.abrupt("return");
+                        return _context16.abrupt("return");
 
                       case 11:
                         g = s.goodsListState.goodsMap.get(goods.$index);
                         i = s.goodsListState.goodsList.indexOf(g);
-                        _context15.t2 = goods.lineAttribute;
-                        _context15.next = _context15.t2 === LineAttributeType$1.正常 ? 16 : _context15.t2 === LineAttributeType$1.折扣行 ? 18 : _context15.t2 === LineAttributeType$1.被折扣行 ? 20 : 22;
+                        _context16.t2 = goods.lineAttribute;
+                        _context16.next = _context16.t2 === LineAttributeType$1.正常 ? 16 : _context16.t2 === LineAttributeType$1.折扣行 ? 18 : _context16.t2 === LineAttributeType$1.被折扣行 ? 20 : 22;
                         break;
 
                       case 16:
                         s.goodsListState.endowCode.endowcodeGoodIndex = [goods.$index];
-                        return _context15.abrupt("break", 22);
+                        return _context16.abrupt("break", 22);
 
                       case 18:
                         s.goodsListState.endowCode.endowcodeGoodIndex = [goods.$index, s.goodsListState.goodsList[i - 1].$index];
-                        return _context15.abrupt("break", 22);
+                        return _context16.abrupt("break", 22);
 
                       case 20:
                         s.goodsListState.endowCode.endowcodeGoodIndex = [goods.$index, s.goodsListState.goodsList[i + 1].$index];
-                        return _context15.abrupt("break", 22);
+                        return _context16.abrupt("break", 22);
 
                       case 22:
                       case "end":
-                        return _context15.stop();
+                        return _context16.stop();
                     }
                   }
-                }, _callee15);
+                }, _callee16);
               }));
 
-              return function (_x26) {
-                return _ref16.apply(this, arguments);
+              return function (_x27) {
+                return _ref17.apply(this, arguments);
               };
             }())();
 
           case 6:
           case "end":
-            return _context16.stop();
+            return _context17.stop();
         }
       }
-    }, _callee16);
+    }, _callee17);
   }));
 
-  return function endowCode(_x24, _x25) {
-    return _ref15.apply(this, arguments);
+  return function endowCode(_x25, _x26) {
+    return _ref16.apply(this, arguments);
   };
 }();
 /** 修改了 货物名称 */
 
 var onChangeItemName = /*#__PURE__*/function () {
-  var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(controller, form, record) {
-    return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+  var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(controller, form, record) {
+    return _regeneratorRuntime().wrap(function _callee19$(_context19) {
       while (1) {
-        switch (_context18.prev = _context18.next) {
+        switch (_context19.prev = _context19.next) {
           case 0:
             controller.run( /*#__PURE__*/function () {
-              var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(s) {
+              var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(s) {
                 var _getSN$shorthand, _getSN;
 
                 var value, shorthand;
-                return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
                   while (1) {
-                    switch (_context17.prev = _context17.next) {
+                    switch (_context18.prev = _context18.next) {
                       case 0:
                         value = form.getFieldsValue().itemName;
                         shorthand = (_getSN$shorthand = (_getSN = getSN(value)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand) !== null && _getSN$shorthand !== void 0 ? _getSN$shorthand : '';
 
                         if (!s.goodsListState.isMyShow) {
-                          _context17.next = 11;
+                          _context18.next = 11;
                           break;
                         }
 
-                        _context17.next = 5;
+                        _context18.next = 5;
                         return controller.setEditGood({
                           itemNameSelf: value
                         });
 
                       case 5:
-                        _context17.t0 = record.itemName;
+                        _context18.t0 = record.itemName;
 
-                        if (!_context17.t0) {
-                          _context17.next = 9;
+                        if (!_context18.t0) {
+                          _context18.next = 9;
                           break;
                         }
 
-                        _context17.next = 9;
+                        _context18.next = 9;
                         return controller.setEditGood({
                           itemName: setShorthand(record.itemName, shorthand)
                         });
 
                       case 9:
-                        _context17.next = 17;
+                        _context18.next = 17;
                         break;
 
                       case 11:
-                        _context17.next = 13;
+                        _context18.next = 13;
                         return controller.setEditGood({
                           itemName: value
                         });
 
                       case 13:
-                        _context17.t1 = record.itemNameSelf;
+                        _context18.t1 = record.itemNameSelf;
 
-                        if (!_context17.t1) {
-                          _context17.next = 17;
+                        if (!_context18.t1) {
+                          _context18.next = 17;
                           break;
                         }
 
-                        _context17.next = 17;
+                        _context18.next = 17;
                         return controller.setEditGood({
                           itemNameSelf: setShorthand(record.itemNameSelf, shorthand)
                         });
 
                       case 17:
                       case "end":
-                        return _context17.stop();
+                        return _context18.stop();
                     }
                   }
-                }, _callee17);
+                }, _callee18);
               }));
 
-              return function (_x30) {
-                return _ref18.apply(this, arguments);
+              return function (_x31) {
+                return _ref19.apply(this, arguments);
               };
             }());
 
           case 1:
           case "end":
-            return _context18.stop();
+            return _context19.stop();
         }
       }
-    }, _callee18);
+    }, _callee19);
   }));
 
-  return function onChangeItemName(_x27, _x28, _x29) {
-    return _ref17.apply(this, arguments);
+  return function onChangeItemName(_x28, _x29, _x30) {
+    return _ref18.apply(this, arguments);
   };
 }();
 
@@ -10279,7 +10311,8 @@ var useColumns = (function (form) {
               width: '100%'
             },
             onChange: function onChange() {
-              onChangeTaxRate(controller, form);
+              setChangeField('taxRate');
+              onChangeTaxRate(controller, form, record);
             }
           }, taxRateList.map(function (e, i) {
             return React.createElement(Select.Option, {
@@ -13351,9 +13384,7 @@ var DrawerBody$3 = function DrawerBody(props) {
                 endowCodeGood.forEach(function (good) {
                   if (!good) return;
                   good.itemName = setShorthand(good.itemName, values.shorthand);
-                  good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand); // const name = getItemName(good.itemName, values.shorthand);
-                  // good.itemName = getItemName(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
-
+                  good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand);
                   good.taxClassificationCode = values.taxClassificationCode;
                   good.taxRate = values.taxRate;
                   good.taxFreeType = values.taxFreeType;
@@ -13364,41 +13395,9 @@ var DrawerBody$3 = function DrawerBody(props) {
                   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()) : undefined) || undefined; // if (s.goodsListState.isTaxIncluded) {
-                  //   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()) : undefined) || undefined;
-                  // } else {
-                  //   const lineAmountIncludeTax = chain(bignumber(good.lineAmountExcludeTax)).multiply(taxRate).done();
-                  //   const priceIncludeTax = good.priceExcludeTax ? chain(bignumber(good.priceExcludeTax)).multiply(taxRate).done() : undefined
-                  //   good.lineAmountIncludeTax = lineAmountIncludeTax.toNumber().toFixed(2);
-                  //   good.priceIncludeTax = (priceIncludeTax ? format15(priceIncludeTax.toNumber()) : undefined) || undefined;
-                  // }
-
+                  good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber()) : undefined) || undefined;
                   good.taxAmount = countTaxAmount(good.lineAmountIncludeTax || 0, s.goodsListState.deduction, values.taxRate);
-                }); //截取名称
-                // if (endowCodeGood.some(e => bytesLnegth(e?.itemName || '') > 92)) {
-                //   await (() => new Promise<void>(resolve => {
-                //     confirm({
-                //       title: '温馨提示',
-                //       content: '商品名称长度过长,是否截取名称',
-                //       okText: '确定',
-                //       cancelText: '取消',
-                //       onOk() {
-                //         endowCodeGood.forEach(e => {
-                //           if (e && e.itemName) { e.itemName = cutStr(e.itemName, 91) }
-                //         })
-                //         message.success('商品名称截取成功！')
-                //         resolve()
-                //       },
-                //       onCancel() {
-                //         resolve()
-                //       },
-                //     });
-                //   }))()
-                // }
-
+                });
                 s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
                 s.goodsListState.endowCode.endowcodeGoodIndex = [];