kts-component-invoice-operate 3.1.17 → 3.1.19

package/dist/Invoice/index.d.ts

@@ -4,6 +4,7 @@ import InvoiceController from './InvoiceController';
 import GoodsList from './ui/GoodsList';
 import Seller from './ui/Seller';
 import Buyer from './ui/Buyer';
+import * as calculator from './tools/calculate';
 /** 发票组件的上下文 */
 export declare const InvoiceContext: React.Context<InvoiceController>;
 export interface IInvoiceProps {
@@ -37,6 +38,8 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
     static readonly Buyer: typeof Buyer;
     /** 货物索引生成器 */
     static idGenerator: () => string;
+    /** 金额计算方法 */
+    static calculator: typeof calculator;
     /** 获取控制器钩子 */
     static useInvoiceController: () => InvoiceController;
     render(): JSX.Element;

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

@@ -31,3 +31,10 @@ export declare function countTaxAmount(amountIncludeTax: string | number, deduct
  * @returns 单价
  */
 export declare function countPrice(amount: string | number, quantity: string | number, calculatingDigits?: number): number | undefined | '';
+/**
+ * 数量 = 金额/单价
+ * @param amount 金额
+ * @param price 单价
+ * @returns 数量
+ */
+export declare function countQuantity(amount: string | number, price: string | number, calculatingDigits?: number): number | undefined | '';

package/dist/index.esm.js

@@ -1135,6 +1135,28 @@ function countPrice(amount, quantity, calculatingDigits) {
   if (!quantity && quantity !== 0) return undefined;
   return format15(chain$1(bignumber(amount)).divide(bignumber(quantity)).done().toNumber(), calculatingDigits);
 }
+/**
+ * 数量 = 金额/单价
+ * @param amount 金额
+ * @param price 单价
+ * @returns 数量
+ */
+function countQuantity(amount, price, calculatingDigits) {
+  if (!amount && amount !== 0) return undefined;
+  if (!price && price !== 0) return undefined;
+  return format15(chain$1(bignumber(amount)).divide(bignumber(price)).done().toNumber(), calculatingDigits);
+}
+
+var calculator = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  format2: format2,
+  format15: format15,
+  countAmountIncludeTax: countAmountIncludeTax,
+  countAmountExcludeTax: countAmountExcludeTax,
+  countTaxAmount: countTaxAmount,
+  countPrice: countPrice,
+  countQuantity: countQuantity
+});
 
 /**
  * 设置当前的编辑货物
@@ -8665,11 +8687,14 @@ var updateUnitPriceExcludingTax = /*#__PURE__*/function () {
                       if (!promptErr(err.lineAmountIncludeTax) && !promptErr(err.taxRate)) {
                         taxAmount = countTaxAmount(values.lineAmountIncludeTax, deduction, values.taxRate);
                       }
-                      _context9.next = 5;
+                      form.setFieldsValue({
+                        taxAmount: taxAmount
+                      });
+                      _context9.next = 6;
                       return controller.setEditGood({
                         taxAmount: taxAmount
                       });
-                    case 5:
+                    case 6:
                       // 计算 金额(不含税)
                       if ((taxAmount || taxAmount === 0) && !promptErr(err.lineAmountIncludeTax)) {
                         lineAmountExcludeTax = countAmountExcludeTax(values.lineAmountIncludeTax, taxAmount);
@@ -8677,11 +8702,11 @@ var updateUnitPriceExcludingTax = /*#__PURE__*/function () {
                       form.setFieldsValue({
                         lineAmountExcludeTax: lineAmountExcludeTax
                       });
-                      _context9.next = 9;
+                      _context9.next = 10;
                       return controller.setEditGood({
                         lineAmountExcludeTax: lineAmountExcludeTax
                       });
-                    case 9:
+                    case 10:
                       // 单价(不含税)
                       if (lineAmountExcludeTax && !promptErr(err.quantity)) {
                         priceExcludeTax = countPrice(lineAmountExcludeTax, values.quantity, controller.state.calculatingDigits);
@@ -8689,11 +8714,11 @@ var updateUnitPriceExcludingTax = /*#__PURE__*/function () {
                       form.setFieldsValue({
                         priceExcludeTax: priceExcludeTax
                       });
-                      _context9.next = 13;
+                      _context9.next = 14;
                       return controller.setEditGood({
                         priceExcludeTax: priceExcludeTax
                       });
-                    case 13:
+                    case 14:
                     case "end":
                       return _context9.stop();
                   }
@@ -11921,12 +11946,10 @@ var DrawerBody$2 = function DrawerBody() {
                     }
                     return _context2.abrupt("return");
                   case 8:
-                    if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
-                      record.priceExcludeTax = s.goodsListState.editGood.priceExcludeTax;
-                      record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
-                      record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
-                      record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
-                    }
+                    // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+                    record.quantity = undefined;
+                    record.lineAmountExcludeTax = undefined;
+                    record.lineAmountIncludeTax = undefined;
                     // 中间数据
                     between = _objectSpread2({}, record);
                     between.itemName = getItemName(record, s.goodsListState.editGood);
@@ -11956,18 +11979,18 @@ var DrawerBody$2 = function DrawerBody() {
                     }
                     s.goodsListState.importGoods.isVisibleDrawer = false;
                     if (!s.goodsListState.isTaxIncluded) {
-                      _context2.next = 23;
+                      _context2.next = 25;
                       break;
                     }
-                    _context2.next = 21;
+                    _context2.next = 23;
                     return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
-                  case 21:
-                    _context2.next = 25;
-                    break;
                   case 23:
-                    _context2.next = 25;
-                    return updateUnitPriceTax(controller, s.goodsListState.form, record);
+                    _context2.next = 27;
+                    break;
                   case 25:
+                    _context2.next = 27;
+                    return updateUnitPriceTax(controller, s.goodsListState.form, record);
+                  case 27:
                   case "end":
                     return _context2.stop();
                 }
@@ -12832,6 +12855,8 @@ var Invoice = /*#__PURE__*/function (_React$PureComponent) {
 
     /** 货物索引生成器 */
 
+    /** 金额计算方法 */
+
     /** 获取控制器钩子 */
 
     function render() {
@@ -12847,6 +12872,7 @@ Invoice.Seller = Buyer;
 Invoice.Sign = Sign;
 Invoice.Buyer = Buyer$1;
 Invoice.idGenerator = idGenerator;
+Invoice.calculator = calculator;
 Invoice.useInvoiceController = function () {
   return React.useContext(InvoiceContext);
 };

package/dist/index.js

@@ -1145,6 +1145,28 @@ function countPrice(amount, quantity, calculatingDigits) {
   if (!quantity && quantity !== 0) return undefined;
   return format15(mathjs.chain(mathjs.bignumber(amount)).divide(mathjs.bignumber(quantity)).done().toNumber(), calculatingDigits);
 }
+/**
+ * 数量 = 金额/单价
+ * @param amount 金额
+ * @param price 单价
+ * @returns 数量
+ */
+function countQuantity(amount, price, calculatingDigits) {
+  if (!amount && amount !== 0) return undefined;
+  if (!price && price !== 0) return undefined;
+  return format15(mathjs.chain(mathjs.bignumber(amount)).divide(mathjs.bignumber(price)).done().toNumber(), calculatingDigits);
+}
+
+var calculator = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  format2: format2,
+  format15: format15,
+  countAmountIncludeTax: countAmountIncludeTax,
+  countAmountExcludeTax: countAmountExcludeTax,
+  countTaxAmount: countTaxAmount,
+  countPrice: countPrice,
+  countQuantity: countQuantity
+});
 
 /**
  * 设置当前的编辑货物
@@ -8675,11 +8697,14 @@ var updateUnitPriceExcludingTax = /*#__PURE__*/function () {
                       if (!promptErr(err.lineAmountIncludeTax) && !promptErr(err.taxRate)) {
                         taxAmount = countTaxAmount(values.lineAmountIncludeTax, deduction, values.taxRate);
                       }
-                      _context9.next = 5;
+                      form.setFieldsValue({
+                        taxAmount: taxAmount
+                      });
+                      _context9.next = 6;
                       return controller.setEditGood({
                         taxAmount: taxAmount
                       });
-                    case 5:
+                    case 6:
                       // 计算 金额(不含税)
                       if ((taxAmount || taxAmount === 0) && !promptErr(err.lineAmountIncludeTax)) {
                         lineAmountExcludeTax = countAmountExcludeTax(values.lineAmountIncludeTax, taxAmount);
@@ -8687,11 +8712,11 @@ var updateUnitPriceExcludingTax = /*#__PURE__*/function () {
                       form.setFieldsValue({
                         lineAmountExcludeTax: lineAmountExcludeTax
                       });
-                      _context9.next = 9;
+                      _context9.next = 10;
                       return controller.setEditGood({
                         lineAmountExcludeTax: lineAmountExcludeTax
                       });
-                    case 9:
+                    case 10:
                       // 单价(不含税)
                       if (lineAmountExcludeTax && !promptErr(err.quantity)) {
                         priceExcludeTax = countPrice(lineAmountExcludeTax, values.quantity, controller.state.calculatingDigits);
@@ -8699,11 +8724,11 @@ var updateUnitPriceExcludingTax = /*#__PURE__*/function () {
                       form.setFieldsValue({
                         priceExcludeTax: priceExcludeTax
                       });
-                      _context9.next = 13;
+                      _context9.next = 14;
                       return controller.setEditGood({
                         priceExcludeTax: priceExcludeTax
                       });
-                    case 13:
+                    case 14:
                     case "end":
                       return _context9.stop();
                   }
@@ -11931,12 +11956,10 @@ var DrawerBody$2 = function DrawerBody() {
                     }
                     return _context2.abrupt("return");
                   case 8:
-                    if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
-                      record.priceExcludeTax = s.goodsListState.editGood.priceExcludeTax;
-                      record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
-                      record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
-                      record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
-                    }
+                    // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+                    record.quantity = undefined;
+                    record.lineAmountExcludeTax = undefined;
+                    record.lineAmountIncludeTax = undefined;
                     // 中间数据
                     between = _objectSpread2({}, record);
                     between.itemName = getItemName(record, s.goodsListState.editGood);
@@ -11966,18 +11989,18 @@ var DrawerBody$2 = function DrawerBody() {
                     }
                     s.goodsListState.importGoods.isVisibleDrawer = false;
                     if (!s.goodsListState.isTaxIncluded) {
-                      _context2.next = 23;
+                      _context2.next = 25;
                       break;
                     }
-                    _context2.next = 21;
+                    _context2.next = 23;
                     return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
-                  case 21:
-                    _context2.next = 25;
-                    break;
                   case 23:
-                    _context2.next = 25;
-                    return updateUnitPriceTax(controller, s.goodsListState.form, record);
+                    _context2.next = 27;
+                    break;
                   case 25:
+                    _context2.next = 27;
+                    return updateUnitPriceTax(controller, s.goodsListState.form, record);
+                  case 27:
                   case "end":
                     return _context2.stop();
                 }
@@ -12842,6 +12865,8 @@ var Invoice = /*#__PURE__*/function (_React$PureComponent) {
 
     /** 货物索引生成器 */
 
+    /** 金额计算方法 */
+
     /** 获取控制器钩子 */
 
     function render() {
@@ -12857,6 +12882,7 @@ Invoice.Seller = Buyer;
 Invoice.Sign = Sign;
 Invoice.Buyer = Buyer$1;
 Invoice.idGenerator = idGenerator;
+Invoice.calculator = calculator;
 Invoice.useInvoiceController = function () {
   return React__default['default'].useContext(InvoiceContext);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.1.17",
+  "version": "3.1.19",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/Invoice/index.tsx

@@ -12,6 +12,8 @@ import ImportGoodsDrawer from './ui/ImportGoodsDrawer';
 import EndowCodeDrawer from './ui/EndowCodeDrawer';
 import AddComparisonDrawer from './ui/AddComparisonDrawer';
 import idGenerator from './tools/idGenerator';
+import * as calculator from './tools/calculate';
+
 
 /** 发票组件的上下文 */
 export const InvoiceContext = React.createContext<InvoiceController>(
@@ -63,6 +65,9 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
   /** 货物索引生成器 */
   static idGenerator = idGenerator;
 
+  /** 金额计算方法 */
+  static calculator = calculator;
+
   /** 获取控制器钩子 */
   static useInvoiceController = () => { return React.useContext(InvoiceContext) };
 

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

@@ -92,6 +92,21 @@ export function countPrice(amount: string | number, quantity: string | number, c
 }
 
 
+/**
+ * 数量 = 金额/单价
+ * @param amount 金额
+ * @param price 单价
+ * @returns 数量
+ */
+export function countQuantity(amount: string | number, price: string | number, calculatingDigits?: number): number | undefined | '' {
+    if (!amount && amount !== 0) return undefined;
+    if (!price && price !== 0) return undefined;
+
+    return format15(chain(bignumber(amount)).divide(bignumber(price))
+        .done()
+        .toNumber(), calculatingDigits)
+}
+
 
 
 

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

@@ -377,6 +377,7 @@ export const updateUnitPriceExcludingTax = async (controller: InvoiceController,
       if (!promptErr(err.lineAmountIncludeTax) && !promptErr(err.taxRate)) {
         taxAmount = countTaxAmount(values.lineAmountIncludeTax, deduction, values.taxRate);
       }
+      form.setFieldsValue({ taxAmount });
       await controller.setEditGood({ taxAmount });
 
       // 计算 金额(不含税)

package/src/Invoice/ui/ImportGoodsDrawer/index.tsx

@@ -70,12 +70,10 @@ const DrawerBody = () => {
               // 没用 被编辑的货物 和 form 就退出
               if (!s.goodsListState.editGood || !s.goodsListState.form) return;
 
-              if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
-                record.priceExcludeTax = s.goodsListState.editGood.priceExcludeTax;
-                record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
-                record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
-                record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
-              }
+              // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+              record.quantity = undefined;
+              record.lineAmountExcludeTax = undefined;
+              record.lineAmountIncludeTax = undefined;
 
               // 中间数据
               const between = { ...record };