kts-component-invoice-operate 3.2.128 → 3.2.130-1

package/dist/Invoice/index.d.ts

@@ -2,6 +2,7 @@ import './index.less';
 import React from 'react';
 import InvoiceController from './InvoiceController';
 import * as calculator from './tools/calculate';
+import * as utils from './tools/utils';
 import GoodsList from './ui/default/GoodsList';
 import Seller from './ui/default/Seller';
 import Buyer from './ui/default/Buyer';
@@ -53,6 +54,8 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
     static idGenerator: () => string;
     /** 金额计算方法 */
     static calculator: typeof calculator;
+    /** 工具方法 */
+    static utils: typeof utils;
     /** 获取控制器钩子 */
     static useInvoiceController: () => InvoiceController;
     render(): JSX.Element;

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

@@ -0,0 +1 @@
+export * as Money from './money';

package/dist/Invoice/tools/utils/money/index.d.ts

@@ -0,0 +1,2 @@
+/** 数字转中文 */
+export declare const toStringChinese: (value: any) => any;

package/dist/index.esm.js

@@ -916,9 +916,12 @@ var ImportGoods = /*#__PURE__*/_createClass(function ImportGoods() {
     dataIndex: 'unit',
     key: 'unit'
   }, {
-    title: '税率（%）',
+    title: '税率',
     dataIndex: 'taxRate',
-    key: 'taxRate'
+    key: 'taxRate',
+    render: function render(text) {
+      return text || text === 0 ? "".concat(text, "%") : '';
+    }
   }, {
     title: '单价(含税)',
     dataIndex: 'priceIncludeTax',
@@ -9733,6 +9736,39 @@ function useToGenerateId(controller) {
   }, [goodsList]);
 }
 
+var Nzh = require("nzh");
+
+var nzhcn = new Nzh({
+  ch: '零壹贰叁肆伍陆柒捌玖',
+  ch_u: '个拾佰仟万亿',
+  ch_f: '负',
+  ch_d: '点',
+  m_t: '人民币',
+  m_z: '整',
+  m_u: '圆角分'
+});
+/** 数字转中文 */
+
+var toStringChinese = function toStringChinese(value) {
+  try {
+    return nzhcn.toMoney(value, {
+      outSymbol: false
+    });
+  } catch (e) {
+    return '';
+  }
+};
+
+var index = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  toStringChinese: toStringChinese
+});
+
+var utils = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  Money: index
+});
+
 var _defs, _path, _path2, _path3;
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -10092,7 +10128,7 @@ function TableVirtual (props) {
 var css_248z$3 = ".kts-invoice-operate-goods-list-statistics {\n  background: #fafafa;\n  overflow-y: scroll;\n}\n.kts-invoice-operate-goods-list-statistics .kts-invoice-operate-goods-list-statistics-row {\n  height: 30px;\n  line-height: 30px;\n  border-bottom: 1px solid #e8e8e8;\n  display: flex;\n}\n.kts-invoice-operate-goods-list-statistics .kts-invoice-operate-goods-list-statistics-row > div {\n  border-right: 1px solid #e8e8e8;\n}\n.kts-invoice-operate-goods-list-statistics .kts-invoice-operate-goods-list-statistics-row > div label {\n  padding: 0 10px;\n}\n";
 styleInject(css_248z$3);
 
-var nzhcn = require('nzh').cn;
+var nzhcn$1 = require('nzh').cn;
 
 var Statistics = (function () {
   var controller = Invoice.useInvoiceController();
@@ -10219,9 +10255,7 @@ var Statistics = (function () {
       flex: 5,
       border: 'none'
     }
-  }, /*#__PURE__*/React.createElement("label", null, "\u4EF7\u7A0E\u5408\u8BA1\uFF08\u5927\u5199\uFF09"), /*#__PURE__*/React.createElement("label", null, nzhcn.toMoney(lineAmountIncludeTax, {
-    outSymbol: false
-  }))), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("label", null, "\u4EF7\u7A0E\u5408\u8BA1\uFF08\u5927\u5199\uFF09"), /*#__PURE__*/React.createElement("label", null, toStringChinese(lineAmountIncludeTax))), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 5,
       border: 'none'
@@ -13726,7 +13760,7 @@ var useColumns = (function (form) {
     }, {
       title: /*#__PURE__*/React.createElement(TitleText, {
         required: true
-      }, "\u7A0E\u7387%"),
+      }, "\u7A0E\u7387"),
       dataIndex: 'taxRate',
       key: 'taxRate',
       align: 'right',
@@ -15572,52 +15606,68 @@ function useSalesGifts() {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            _context.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context.next = 4;
+            return controller.wait();
+
+          case 4:
+            if (!controller.state.goodsListState.editGood) {
+              _context.next = 6;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 6:
             _iterator = _createForOfIteratorHelper(giveaways);
-            _context.prev = 1;
+            _context.prev = 7;
 
             _iterator.s();
 
-          case 3:
+          case 9:
             if ((_step = _iterator.n()).done) {
-              _context.next = 10;
+              _context.next = 16;
               break;
             }
 
             g = _step.value;
             g.lineAttribute = LineAttributeType$1.正常;
-            _context.next = 8;
+            _context.next = 14;
             return controller.addGoodDiscountV2([{
               $index: g.$index,
               discolineAmountunt: g.lineAmountIncludeTax || 0
             }]);
 
-          case 8:
-            _context.next = 3;
+          case 14:
+            _context.next = 9;
             break;
 
-          case 10:
-            _context.next = 15;
+          case 16:
+            _context.next = 21;
             break;
 
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](1);
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](7);
 
             _iterator.e(_context.t0);
 
-          case 15:
-            _context.prev = 15;
+          case 21:
+            _context.prev = 21;
 
             _iterator.f();
 
-            return _context.finish(15);
+            return _context.finish(21);
 
-          case 18:
+          case 24:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 12, 15, 18]]);
+    }, _callee, null, [[7, 18, 21, 24]]);
   })), [controller, giveaways]);
   var onClickManual = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var _controller$state$goo, goodsMap, _selectedGoodIndex, _giveaways, _iterator2, _step2, g;
@@ -15627,70 +15677,86 @@ function useSalesGifts() {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
+            _context2.next = 3;
+            return controller.saveEditGood();
+
+          case 3:
+            _context2.next = 5;
+            return controller.wait();
+
+          case 5:
+            if (!controller.state.goodsListState.editGood) {
+              _context2.next = 7;
+              break;
+            }
+
+            return _context2.abrupt("return");
+
+          case 7:
             _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, _selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
             _giveaways = _selectedGoodIndex.map(function (e) {
               return goodsMap.get(e);
             }).filter(function (e) {
               return !!e;
             });
-            _context2.next = 5;
+            _context2.next = 11;
             return checkLineAttribute(_giveaways);
 
-          case 5:
+          case 11:
             _iterator2 = _createForOfIteratorHelper(_giveaways);
-            _context2.prev = 6;
+            _context2.prev = 12;
 
             _iterator2.s();
 
-          case 8:
+          case 14:
             if ((_step2 = _iterator2.n()).done) {
-              _context2.next = 14;
+              _context2.next = 20;
               break;
             }
 
             g = _step2.value;
-            _context2.next = 12;
+            _context2.next = 18;
             return controller.addGoodDiscountV2([{
               $index: g.$index,
               discolineAmountunt: g.lineAmountIncludeTax || 0
             }]);
 
-          case 12:
-            _context2.next = 8;
+          case 18:
+            _context2.next = 14;
             break;
 
-          case 14:
-            _context2.next = 19;
+          case 20:
+            _context2.next = 25;
             break;
 
-          case 16:
-            _context2.prev = 16;
-            _context2.t0 = _context2["catch"](6);
+          case 22:
+            _context2.prev = 22;
+            _context2.t0 = _context2["catch"](12);
 
             _iterator2.e(_context2.t0);
 
-          case 19:
-            _context2.prev = 19;
+          case 25:
+            _context2.prev = 25;
 
             _iterator2.f();
 
-            return _context2.finish(19);
+            return _context2.finish(25);
 
-          case 22:
+          case 28:
             controller.state.goodsListState.selectedGoodIndex = [];
-            _context2.next = 27;
+            _context2.next = 33;
             break;
 
-          case 25:
-            _context2.prev = 25;
+          case 31:
+            _context2.prev = 31;
             _context2.t1 = _context2["catch"](0);
 
-          case 27:
+          case 33:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[0, 25], [6, 16, 19, 22]]);
+    }, _callee2, null, [[0, 31], [12, 22, 25, 28]]);
   })), [controller]);
   var items = React.useMemo(function () {
     return [{
@@ -17505,8 +17571,6 @@ function SvgFork(props) {
 var css_248z$j = ".kts-invoice-operate-goods-list-statistics-digtal {\n  overflow-y: scroll;\n  /* 设置滚动条滑块颜色 */\n}\n.kts-invoice-operate-goods-list-statistics-digtal::-webkit-scrollbar-track {\n  background-color: #f1f1f1;\n}\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total-tax,\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total {\n  height: 42px;\n  display: flex;\n  align-items: center;\n}\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total-tax > div:first-child,\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total > div:first-child {\n  width: 225px;\n  color: #9F613E;\n  font-family: PingFang SC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total-tax {\n  border-top: 2px solid #9F613E;\n}\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total-tax > div:first-child {\n  border-right: 2px solid #9F613E;\n}\n";
 styleInject(css_248z$j);
 
-var nzhcn$1 = require('nzh').cn;
-
 var Statistics$1 = (function () {
   var controller = Invoice.useInvoiceController();
   /** 是否不含税） */
@@ -17617,9 +17681,7 @@ var Statistics$1 = (function () {
       fontWeight: 'bold',
       marginLeft: 4
     }
-  }, nzhcn$1.toMoney(lineAmountIncludeTax, {
-    outSymbol: false
-  }))), /*#__PURE__*/React.createElement("div", {
+  }, toStringChinese(lineAmountIncludeTax))), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1
     }
@@ -20576,7 +20638,7 @@ var useColumns$1 = (function (form) {
     }, {
       title: /*#__PURE__*/React.createElement(TitleText$1, {
         required: true
-      }, "\u7A0E\u7387%"),
+      }, "\u7A0E\u7387"),
       dataIndex: 'taxRate',
       key: 'taxRate',
       align: 'right',
@@ -24105,6 +24167,8 @@ var Invoice = /*#__PURE__*/function (_React$PureComponent) {
 
     /** 金额计算方法 */
 
+    /** 工具方法 */
+
     /** 获取控制器钩子 */
     function render() {
       if (this.props.invoiceType === 'digtal') {
@@ -24132,6 +24196,7 @@ Invoice.SignDigtal = SignDigtal;
 Invoice.GoodsListDigtal = GoodsList$1;
 Invoice.idGenerator = idGenerator;
 Invoice.calculator = calculator;
+Invoice.utils = utils;
 
 Invoice.useInvoiceController = function () {
   return React.useContext(InvoiceContext);

package/dist/index.js

@@ -926,9 +926,12 @@ var ImportGoods = /*#__PURE__*/_createClass(function ImportGoods() {
     dataIndex: 'unit',
     key: 'unit'
   }, {
-    title: '税率（%）',
+    title: '税率',
     dataIndex: 'taxRate',
-    key: 'taxRate'
+    key: 'taxRate',
+    render: function render(text) {
+      return text || text === 0 ? "".concat(text, "%") : '';
+    }
   }, {
     title: '单价(含税)',
     dataIndex: 'priceIncludeTax',
@@ -9743,6 +9746,39 @@ function useToGenerateId(controller) {
   }, [goodsList]);
 }
 
+var Nzh = require("nzh");
+
+var nzhcn = new Nzh({
+  ch: '零壹贰叁肆伍陆柒捌玖',
+  ch_u: '个拾佰仟万亿',
+  ch_f: '负',
+  ch_d: '点',
+  m_t: '人民币',
+  m_z: '整',
+  m_u: '圆角分'
+});
+/** 数字转中文 */
+
+var toStringChinese = function toStringChinese(value) {
+  try {
+    return nzhcn.toMoney(value, {
+      outSymbol: false
+    });
+  } catch (e) {
+    return '';
+  }
+};
+
+var index = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  toStringChinese: toStringChinese
+});
+
+var utils = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  Money: index
+});
+
 var _defs, _path, _path2, _path3;
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -10102,7 +10138,7 @@ function TableVirtual (props) {
 var css_248z$3 = ".kts-invoice-operate-goods-list-statistics {\n  background: #fafafa;\n  overflow-y: scroll;\n}\n.kts-invoice-operate-goods-list-statistics .kts-invoice-operate-goods-list-statistics-row {\n  height: 30px;\n  line-height: 30px;\n  border-bottom: 1px solid #e8e8e8;\n  display: flex;\n}\n.kts-invoice-operate-goods-list-statistics .kts-invoice-operate-goods-list-statistics-row > div {\n  border-right: 1px solid #e8e8e8;\n}\n.kts-invoice-operate-goods-list-statistics .kts-invoice-operate-goods-list-statistics-row > div label {\n  padding: 0 10px;\n}\n";
 styleInject(css_248z$3);
 
-var nzhcn = require('nzh').cn;
+var nzhcn$1 = require('nzh').cn;
 
 var Statistics = (function () {
   var controller = Invoice.useInvoiceController();
@@ -10229,9 +10265,7 @@ var Statistics = (function () {
       flex: 5,
       border: 'none'
     }
-  }, /*#__PURE__*/React__default['default'].createElement("label", null, "\u4EF7\u7A0E\u5408\u8BA1\uFF08\u5927\u5199\uFF09"), /*#__PURE__*/React__default['default'].createElement("label", null, nzhcn.toMoney(lineAmountIncludeTax, {
-    outSymbol: false
-  }))), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default['default'].createElement("label", null, "\u4EF7\u7A0E\u5408\u8BA1\uFF08\u5927\u5199\uFF09"), /*#__PURE__*/React__default['default'].createElement("label", null, toStringChinese(lineAmountIncludeTax))), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       flex: 5,
       border: 'none'
@@ -13736,7 +13770,7 @@ var useColumns = (function (form) {
     }, {
       title: /*#__PURE__*/React__default['default'].createElement(TitleText, {
         required: true
-      }, "\u7A0E\u7387%"),
+      }, "\u7A0E\u7387"),
       dataIndex: 'taxRate',
       key: 'taxRate',
       align: 'right',
@@ -15582,52 +15616,68 @@ function useSalesGifts() {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            _context.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context.next = 4;
+            return controller.wait();
+
+          case 4:
+            if (!controller.state.goodsListState.editGood) {
+              _context.next = 6;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 6:
             _iterator = _createForOfIteratorHelper(giveaways);
-            _context.prev = 1;
+            _context.prev = 7;
 
             _iterator.s();
 
-          case 3:
+          case 9:
             if ((_step = _iterator.n()).done) {
-              _context.next = 10;
+              _context.next = 16;
               break;
             }
 
             g = _step.value;
             g.lineAttribute = LineAttributeType$1.正常;
-            _context.next = 8;
+            _context.next = 14;
             return controller.addGoodDiscountV2([{
               $index: g.$index,
               discolineAmountunt: g.lineAmountIncludeTax || 0
             }]);
 
-          case 8:
-            _context.next = 3;
+          case 14:
+            _context.next = 9;
             break;
 
-          case 10:
-            _context.next = 15;
+          case 16:
+            _context.next = 21;
             break;
 
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](1);
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](7);
 
             _iterator.e(_context.t0);
 
-          case 15:
-            _context.prev = 15;
+          case 21:
+            _context.prev = 21;
 
             _iterator.f();
 
-            return _context.finish(15);
+            return _context.finish(21);
 
-          case 18:
+          case 24:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 12, 15, 18]]);
+    }, _callee, null, [[7, 18, 21, 24]]);
   })), [controller, giveaways]);
   var onClickManual = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var _controller$state$goo, goodsMap, _selectedGoodIndex, _giveaways, _iterator2, _step2, g;
@@ -15637,70 +15687,86 @@ function useSalesGifts() {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
+            _context2.next = 3;
+            return controller.saveEditGood();
+
+          case 3:
+            _context2.next = 5;
+            return controller.wait();
+
+          case 5:
+            if (!controller.state.goodsListState.editGood) {
+              _context2.next = 7;
+              break;
+            }
+
+            return _context2.abrupt("return");
+
+          case 7:
             _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, _selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
             _giveaways = _selectedGoodIndex.map(function (e) {
               return goodsMap.get(e);
             }).filter(function (e) {
               return !!e;
             });
-            _context2.next = 5;
+            _context2.next = 11;
             return checkLineAttribute(_giveaways);
 
-          case 5:
+          case 11:
             _iterator2 = _createForOfIteratorHelper(_giveaways);
-            _context2.prev = 6;
+            _context2.prev = 12;
 
             _iterator2.s();
 
-          case 8:
+          case 14:
             if ((_step2 = _iterator2.n()).done) {
-              _context2.next = 14;
+              _context2.next = 20;
               break;
             }
 
             g = _step2.value;
-            _context2.next = 12;
+            _context2.next = 18;
             return controller.addGoodDiscountV2([{
               $index: g.$index,
               discolineAmountunt: g.lineAmountIncludeTax || 0
             }]);
 
-          case 12:
-            _context2.next = 8;
+          case 18:
+            _context2.next = 14;
             break;
 
-          case 14:
-            _context2.next = 19;
+          case 20:
+            _context2.next = 25;
             break;
 
-          case 16:
-            _context2.prev = 16;
-            _context2.t0 = _context2["catch"](6);
+          case 22:
+            _context2.prev = 22;
+            _context2.t0 = _context2["catch"](12);
 
             _iterator2.e(_context2.t0);
 
-          case 19:
-            _context2.prev = 19;
+          case 25:
+            _context2.prev = 25;
 
             _iterator2.f();
 
-            return _context2.finish(19);
+            return _context2.finish(25);
 
-          case 22:
+          case 28:
             controller.state.goodsListState.selectedGoodIndex = [];
-            _context2.next = 27;
+            _context2.next = 33;
             break;
 
-          case 25:
-            _context2.prev = 25;
+          case 31:
+            _context2.prev = 31;
             _context2.t1 = _context2["catch"](0);
 
-          case 27:
+          case 33:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[0, 25], [6, 16, 19, 22]]);
+    }, _callee2, null, [[0, 31], [12, 22, 25, 28]]);
   })), [controller]);
   var items = React__default['default'].useMemo(function () {
     return [{
@@ -17515,8 +17581,6 @@ function SvgFork(props) {
 var css_248z$j = ".kts-invoice-operate-goods-list-statistics-digtal {\n  overflow-y: scroll;\n  /* 设置滚动条滑块颜色 */\n}\n.kts-invoice-operate-goods-list-statistics-digtal::-webkit-scrollbar-track {\n  background-color: #f1f1f1;\n}\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total-tax,\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total {\n  height: 42px;\n  display: flex;\n  align-items: center;\n}\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total-tax > div:first-child,\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total > div:first-child {\n  width: 225px;\n  color: #9F613E;\n  font-family: PingFang SC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total-tax {\n  border-top: 2px solid #9F613E;\n}\n.kts-invoice-operate-goods-list-statistics-digtal .statistics-digtal-total-tax > div:first-child {\n  border-right: 2px solid #9F613E;\n}\n";
 styleInject(css_248z$j);
 
-var nzhcn$1 = require('nzh').cn;
-
 var Statistics$1 = (function () {
   var controller = Invoice.useInvoiceController();
   /** 是否不含税） */
@@ -17627,9 +17691,7 @@ var Statistics$1 = (function () {
       fontWeight: 'bold',
       marginLeft: 4
     }
-  }, nzhcn$1.toMoney(lineAmountIncludeTax, {
-    outSymbol: false
-  }))), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, toStringChinese(lineAmountIncludeTax))), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       flex: 1
     }
@@ -20586,7 +20648,7 @@ var useColumns$1 = (function (form) {
     }, {
       title: /*#__PURE__*/React__default['default'].createElement(TitleText$1, {
         required: true
-      }, "\u7A0E\u7387%"),
+      }, "\u7A0E\u7387"),
       dataIndex: 'taxRate',
       key: 'taxRate',
       align: 'right',
@@ -24115,6 +24177,8 @@ var Invoice = /*#__PURE__*/function (_React$PureComponent) {
 
     /** 金额计算方法 */
 
+    /** 工具方法 */
+
     /** 获取控制器钩子 */
     function render() {
       if (this.props.invoiceType === 'digtal') {
@@ -24142,6 +24206,7 @@ Invoice.SignDigtal = SignDigtal;
 Invoice.GoodsListDigtal = GoodsList$1;
 Invoice.idGenerator = idGenerator;
 Invoice.calculator = calculator;
+Invoice.utils = utils;
 
 Invoice.useInvoiceController = function () {
   return React__default['default'].useContext(InvoiceContext);

package/package.json

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

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/ImportGoods/index.ts

@@ -37,9 +37,10 @@ export default class ImportGoods<ColumnType = any> {
       key: 'unit',
     },
     {
-      title: '税率（%）',
+      title: '税率',
       dataIndex: 'taxRate',
       key: 'taxRate',
+      render: text => text || text === 0 ? `${text}%` : ''
     },
     {
       title: '单价(含税)',

package/src/Invoice/index.tsx

@@ -5,6 +5,7 @@ import InvoiceController from './InvoiceController';
 import useToGenerateId from './tools/useToGenerateId';
 import idGenerator from './tools/idGenerator';
 import * as calculator from './tools/calculate';
+import * as utils from './tools/utils';
 
 import InvoiceHeader from './ui/default/InvoiceHeader';
 import GoodsList from './ui/default/GoodsList';
@@ -93,6 +94,9 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
   /** 金额计算方法 */
   static calculator = calculator;
 
+  /** 工具方法 */
+  static utils = utils;
+
   /** 获取控制器钩子 */
   static useInvoiceController = () => { return React.useContext(InvoiceContext) };
 

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

@@ -0,0 +1 @@
+export * as Money from './money';

package/src/Invoice/tools/utils/money/index.ts

@@ -0,0 +1,20 @@
+const Nzh = require("nzh");
+
+const nzhcn = new Nzh({
+    ch: '零壹贰叁肆伍陆柒捌玖'
+    ,ch_u: '个拾佰仟万亿'
+    ,ch_f: '负'
+    ,ch_d: '点'
+    ,m_t: '人民币'
+    ,m_z: '整'
+    ,m_u: '圆角分'
+})
+
+/** 数字转中文 */
+export const toStringChinese = (value: any) => {
+    try {
+        return nzhcn.toMoney(value, { outSymbol: false })
+    } catch(e) {
+        return ''
+    }
+};

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

@@ -475,7 +475,7 @@ export default (form: WrappedFormUtils) => {
         },
       },
       {
-        title: <TitleText required >税率%</TitleText>,
+        title: <TitleText required >税率</TitleText>,
         dataIndex: 'taxRate',
         key: 'taxRate',
         align: 'right',

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useSalesGifts/index.tsx

@@ -19,6 +19,9 @@ export default function useSalesGifts() {
     const giveaways = React.useMemo(() => goodsList.filter(e => e.lineAttribute === LineAttributeType.赠品行), [goodsList])
 
     const onClickAuto = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        if (controller.state.goodsListState.editGood) return;
         for (let g of giveaways) {
             g.lineAttribute = LineAttributeType.正常;
             await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
@@ -27,6 +30,9 @@ export default function useSalesGifts() {
 
     const onClickManual = React.useCallback(async () => {
         try {
+            await controller.saveEditGood();
+            await controller.wait();
+            if (controller.state.goodsListState.editGood) return;
             const { goodsMap, selectedGoodIndex } = controller.state.goodsListState;
             const giveaways = selectedGoodIndex.map(e => goodsMap.get(e) as IGood).filter(e => !!e);
 

package/src/Invoice/ui/default/GoodsList/ui/Statistics/index.tsx

@@ -3,6 +3,7 @@ import { } from 'kts-components-antd-x3';
 import { chain, bignumber } from 'mathjs';
 import { LineAttributeType } from '../../../../../../Invoice/InvoiceController';
 import Invoice from '../../../../..';
+import { Money } from '../../../../../tools/utils';
 import './index.less';
 
 const nzhcn = require('nzh').cn;
@@ -101,7 +102,7 @@ export default () => {
         <div style={{ flex: 5, border: 'none' }}>
           <label>价税合计（大写）</label>
           <label>
-            {nzhcn.toMoney(lineAmountIncludeTax, { outSymbol: false })}
+            {Money.toStringChinese(lineAmountIncludeTax)}
           </label>
         </div>
         <div style={{ flex: 5, border: 'none' }}>

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

@@ -445,7 +445,7 @@ export default (form: WrappedFormUtils) => {
         },
       },
       {
-        title: <TitleText required >税率%</TitleText>,
+        title: <TitleText required >税率</TitleText>,
         dataIndex: 'taxRate',
         key: 'taxRate',
         align: 'right',

package/src/Invoice/ui/digtal/GoodsList/ui/Statistics/index.tsx

@@ -4,10 +4,9 @@ import { } from 'kts-components-antd-x3';
 import { ReactComponent as ForkSvg } from './svg/fork.svg';
 import { chain, bignumber } from 'mathjs';
 import Invoice from '../../../../..';
+import { Money } from '../../../../../tools/utils';
 import './index.less';
 
-const nzhcn = require('nzh').cn;
-
 export default () => {
   const controller = Invoice.useInvoiceController();
 
@@ -88,7 +87,7 @@ export default () => {
         <div>价税合计（大写）</div>
         <div style={{ paddingLeft: 30 }} >
           <Icon style={{fontSize: 16}} component={ForkSvg} />
-          <span style={{ fontWeight: 'bold', marginLeft: 4 }} >{nzhcn.toMoney(lineAmountIncludeTax, { outSymbol: false })}</span>
+          <span style={{ fontWeight: 'bold', marginLeft: 4 }} >{Money.toStringChinese(lineAmountIncludeTax)}</span>
         </div>
         <div style={{ flex: 1 }} />
         <div style={{ width: 90, color: '#9F613E' }} >（小写）</div>