kts-component-invoice-operate 1.0.64 → 1.0.68

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

@@ -0,0 +1,5 @@
+/** 格式化 保留2位小数 */
+export declare const format2: (value: number | string) => number | "";
+/** 格式化 保留15位数字 */
+export declare const format15: (value: number | string) => number | "";
+export declare function quantityPriceIncludeTax(quantity?: number | string, priceIncludeTax?: number | string): number | undefined;

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

@@ -6,10 +6,7 @@
  */
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import InvoiceController, { IGood } from '../../../../../InvoiceController';
-/** 格式化 保留2位小数 */
-export declare const format2: (value: number | string) => number | "";
-/** 格式化 保留15位数字 */
-export declare const format15: (value: number | string) => number | "";
+export { format2, format15 } from '../../../../../tools/calculate';
 /** 数量改变了 */
 export declare const onChangeQuantity: (...par: any[]) => void;
 /** 单价(含税) */

package/dist/index.esm.js

@@ -1486,41 +1486,25 @@ var Statistics = (function () {
     className: "kts-invoice-operate-goods-list-statistics-row"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      width: 60
-    }
-  }), /*#__PURE__*/React.createElement("div", {
-    style: {
-      flex: 2
-    }
-  }, /*#__PURE__*/React.createElement("label", null, "\u5408\u8BA1")), /*#__PURE__*/React.createElement("div", {
-    style: {
-      width: 80
-    }
-  }), /*#__PURE__*/React.createElement("div", {
-    style: {
-      flex: 2
+      width: 45
     }
   }), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1
     }
-  }, /*#__PURE__*/React.createElement("label", null, isTaxIncluded ? lineAmountIncludeTax : lineAmountExcludeTax)), /*#__PURE__*/React.createElement("div", {
-    style: {
-      width: 80
-    }
-  }), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("label", null, "\u5408\u8BA1")), /*#__PURE__*/React.createElement("div", {
     style: {
-      flex: 1
+      width: 119 + 70
     }
-  }, /*#__PURE__*/React.createElement("label", null, taxAmount)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("label", null, parseFloat(isTaxIncluded ? lineAmountIncludeTax : lineAmountExcludeTax).toFixed(2))), /*#__PURE__*/React.createElement("div", {
     style: {
-      width: 80
+      width: 119 + 50 + 1
     }
-  })), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("label", null, parseFloat(taxAmount).toFixed(2)))), /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-statistics-row"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      width: 60
+      width: 45
     }
   }), /*#__PURE__*/React.createElement("div", {
     style: {
@@ -1539,7 +1523,7 @@ var Statistics = (function () {
       flex: 3,
       border: 'none'
     }
-  }, /*#__PURE__*/React.createElement("label", null, lineAmountIncludeTax))));
+  }, /*#__PURE__*/React.createElement("label", null, parseFloat(lineAmountIncludeTax).toFixed()))));
 });
 
 var AddRowButton = (function () {
@@ -2374,26 +2358,8 @@ var useAddDiscount = (function (goods) {
   }, [onClick, goods.lineAttribute]);
 });
 
-/** 延迟函数 */
-
-var lazyFn$1 = function lazyFn(fn) {
-  var delayed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
-  var timer;
-  return function () {
-    for (var _len = arguments.length, par = new Array(_len), _key = 0; _key < _len; _key++) {
-      par[_key] = arguments[_key];
-    }
-
-    if (timer) return;
-    timer = setTimeout(function () {
-      timer = undefined;
-      fn.apply(null, par);
-    }, delayed);
-  };
-};
 /** 格式化 保留2位小数 */
 
-
 var format2 = function format2(value) {
   if (value === Infinity) return '';
   if ("".concat(value) === 'NaN') return '';
@@ -2408,9 +2374,36 @@ var format15 = function format15(value) {
   if (typeof value === 'string') value = parseFloat(value);
   var fractionDigits = 15 - value.toString().indexOf('.');
   return parseFloat(value.toFixed(fractionDigits > 8 ? 8 : fractionDigits));
+}; // 数量 + 单价(含税) => 金额(含税)
+
+function quantityPriceIncludeTax(quantity, priceIncludeTax) {
+  if (!quantity && quantity !== 0) return undefined;
+  if (!priceIncludeTax && priceIncludeTax !== 0) return undefined;
+  quantity = format15(quantity);
+  priceIncludeTax = format15(priceIncludeTax);
+  return evaluate("".concat(priceIncludeTax, " * ").concat(quantity));
+}
+
+/** 延迟函数 */
+
+var lazyFn$1 = function lazyFn(fn) {
+  var delayed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
+  var timer;
+  return function () {
+    for (var _len = arguments.length, par = new Array(_len), _key = 0; _key < _len; _key++) {
+      par[_key] = arguments[_key];
+    }
+
+    if (timer) return;
+    timer = setTimeout(function () {
+      timer = undefined;
+      fn.apply(null, par);
+    }, delayed);
+  };
 };
 /** 数量改变了 */
 
+
 var onChangeQuantity = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(err, values) {
@@ -3706,7 +3699,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value);
+          }, parseFloat(value).toFixed(2));
         }
       }
     }, {
@@ -3743,7 +3736,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value);
+          }, parseFloat(value).toFixed(2));
         }
       }
     }, {
@@ -3807,7 +3800,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value);
+          }, parseFloat(value).toFixed(2));
         }
       }
     }, {
@@ -4331,7 +4324,9 @@ var Main = decorator(Form.create())(function (props) {
 
   React.useEffect(function () {
     var click = function click() {
-      controller.saveEditGood();
+      setTimeout(function () {
+        controller.saveEditGood();
+      });
     };
 
     window.addEventListener('click', click);
@@ -4966,43 +4961,44 @@ var DrawerBody$2 = function DrawerBody() {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
                     case 0:
+                      debugger;
                       Object.keys(record).filter(function (e) {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
                       });
-                      _context2.next = 3;
+                      _context2.next = 4;
                       return s.goodsListState.importGoods.verifyFn(record);
 
-                    case 3:
+                    case 4:
                       _context2.t0 = _context2.sent;
 
                       if (!(_context2.t0 === false)) {
-                        _context2.next = 6;
+                        _context2.next = 7;
                         break;
                       }
 
                       return _context2.abrupt("return");
 
-                    case 6:
+                    case 7:
                       if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
-                        _context2.next = 8;
+                        _context2.next = 9;
                         break;
                       }
 
                       return _context2.abrupt("return");
 
-                    case 8:
+                    case 9:
                       s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
                       if (s.goodsListState.editGood) {
-                        _context2.next = 11;
+                        _context2.next = 12;
                         break;
                       }
 
                       return _context2.abrupt("return");
 
-                    case 11:
+                    case 12:
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -5010,12 +5006,13 @@ var DrawerBody$2 = function DrawerBody() {
                         s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record);
                       }
 
+                      s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
                       s.goodsListState.editGood.itemName = getItemName(record);
                       s.goodsListState.form.setFieldsValue(s.goodsListState.editGood);
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
-                    case 16:
+                    case 18:
                     case "end":
                       return _context2.stop();
                   }

package/dist/index.js

@@ -1495,41 +1495,25 @@ var Statistics = (function () {
     className: "kts-invoice-operate-goods-list-statistics-row"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
-      width: 60
-    }
-  }), /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      flex: 2
-    }
-  }, /*#__PURE__*/React__default['default'].createElement("label", null, "\u5408\u8BA1")), /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      width: 80
-    }
-  }), /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      flex: 2
+      width: 45
     }
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       flex: 1
     }
-  }, /*#__PURE__*/React__default['default'].createElement("label", null, isTaxIncluded ? lineAmountIncludeTax : lineAmountExcludeTax)), /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      width: 80
-    }
-  }), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default['default'].createElement("label", null, "\u5408\u8BA1")), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
-      flex: 1
+      width: 119 + 70
     }
-  }, /*#__PURE__*/React__default['default'].createElement("label", null, taxAmount)), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default['default'].createElement("label", null, parseFloat(isTaxIncluded ? lineAmountIncludeTax : lineAmountExcludeTax).toFixed(2))), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
-      width: 80
+      width: 119 + 50 + 1
     }
-  })), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default['default'].createElement("label", null, parseFloat(taxAmount).toFixed(2)))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-statistics-row"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
-      width: 60
+      width: 45
     }
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
@@ -1548,7 +1532,7 @@ var Statistics = (function () {
       flex: 3,
       border: 'none'
     }
-  }, /*#__PURE__*/React__default['default'].createElement("label", null, lineAmountIncludeTax))));
+  }, /*#__PURE__*/React__default['default'].createElement("label", null, parseFloat(lineAmountIncludeTax).toFixed()))));
 });
 
 var AddRowButton = (function () {
@@ -2383,26 +2367,8 @@ var useAddDiscount = (function (goods) {
   }, [onClick, goods.lineAttribute]);
 });
 
-/** 延迟函数 */
-
-var lazyFn$1 = function lazyFn(fn) {
-  var delayed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
-  var timer;
-  return function () {
-    for (var _len = arguments.length, par = new Array(_len), _key = 0; _key < _len; _key++) {
-      par[_key] = arguments[_key];
-    }
-
-    if (timer) return;
-    timer = setTimeout(function () {
-      timer = undefined;
-      fn.apply(null, par);
-    }, delayed);
-  };
-};
 /** 格式化 保留2位小数 */
 
-
 var format2 = function format2(value) {
   if (value === Infinity) return '';
   if ("".concat(value) === 'NaN') return '';
@@ -2417,9 +2383,36 @@ var format15 = function format15(value) {
   if (typeof value === 'string') value = parseFloat(value);
   var fractionDigits = 15 - value.toString().indexOf('.');
   return parseFloat(value.toFixed(fractionDigits > 8 ? 8 : fractionDigits));
+}; // 数量 + 单价(含税) => 金额(含税)
+
+function quantityPriceIncludeTax(quantity, priceIncludeTax) {
+  if (!quantity && quantity !== 0) return undefined;
+  if (!priceIncludeTax && priceIncludeTax !== 0) return undefined;
+  quantity = format15(quantity);
+  priceIncludeTax = format15(priceIncludeTax);
+  return evaluate("".concat(priceIncludeTax, " * ").concat(quantity));
+}
+
+/** 延迟函数 */
+
+var lazyFn$1 = function lazyFn(fn) {
+  var delayed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
+  var timer;
+  return function () {
+    for (var _len = arguments.length, par = new Array(_len), _key = 0; _key < _len; _key++) {
+      par[_key] = arguments[_key];
+    }
+
+    if (timer) return;
+    timer = setTimeout(function () {
+      timer = undefined;
+      fn.apply(null, par);
+    }, delayed);
+  };
 };
 /** 数量改变了 */
 
+
 var onChangeQuantity = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(err, values) {
@@ -3715,7 +3708,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value);
+          }, parseFloat(value).toFixed(2));
         }
       }
     }, {
@@ -3752,7 +3745,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value);
+          }, parseFloat(value).toFixed(2));
         }
       }
     }, {
@@ -3816,7 +3809,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value);
+          }, parseFloat(value).toFixed(2));
         }
       }
     }, {
@@ -4340,7 +4333,9 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
 
   React__default['default'].useEffect(function () {
     var click = function click() {
-      controller.saveEditGood();
+      setTimeout(function () {
+        controller.saveEditGood();
+      });
     };
 
     window.addEventListener('click', click);
@@ -4975,43 +4970,44 @@ var DrawerBody$2 = function DrawerBody() {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
                     case 0:
+                      debugger;
                       Object.keys(record).filter(function (e) {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
                       });
-                      _context2.next = 3;
+                      _context2.next = 4;
                       return s.goodsListState.importGoods.verifyFn(record);
 
-                    case 3:
+                    case 4:
                       _context2.t0 = _context2.sent;
 
                       if (!(_context2.t0 === false)) {
-                        _context2.next = 6;
+                        _context2.next = 7;
                         break;
                       }
 
                       return _context2.abrupt("return");
 
-                    case 6:
+                    case 7:
                       if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
-                        _context2.next = 8;
+                        _context2.next = 9;
                         break;
                       }
 
                       return _context2.abrupt("return");
 
-                    case 8:
+                    case 9:
                       s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
                       if (s.goodsListState.editGood) {
-                        _context2.next = 11;
+                        _context2.next = 12;
                         break;
                       }
 
                       return _context2.abrupt("return");
 
-                    case 11:
+                    case 12:
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -5019,12 +5015,13 @@ var DrawerBody$2 = function DrawerBody() {
                         s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record);
                       }
 
+                      s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
                       s.goodsListState.editGood.itemName = getItemName(record);
                       s.goodsListState.form.setFieldsValue(s.goodsListState.editGood);
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
-                    case 16:
+                    case 18:
                     case "end":
                       return _context2.stop();
                   }