kts-component-invoice-operate 3.1.19 → 3.2.0

package/src/Invoice/InvoiceController/fns/addGoodDiscount.ts

@@ -1,125 +1,125 @@
-/**
- *
- * 折扣率  含税金额  不含税金额
- *
- * 含税折扣额 = -1 * (含税金额   * 折扣率)
- * 不含税扣额 = 含税折扣额 / (1+税率)
- * 折扣税额   = 含税折扣额 - 不含税扣额
- */
-
-import { v4 as uuidv4 } from 'uuid';
-import { chain, bignumber } from 'mathjs';
-import { InvoiceControllerState } from '../';
-import LineAttributeType from '../InvoiceControllerState/GoodsListState/LineAttributeType';
-import idGenerator from '../../tools/idGenerator';
-import { format2 } from '../../../Invoice/tools/calculate';
-
-export interface IOptions {
-  /** 需要添加的 索引列表 */
-  indexList: string[];
-
-  /** 折扣 */
-  discount: number;
-
-  /** 折扣 金额 */
-  discolineAmountunt: number;
-}
-
-/**
- * 设置当前的编辑货物
- */
-export default async (state: InvoiceControllerState, options?: IOptions) => {
-  if (!options) return;
-
-  const { indexList = [] } = options;
-  const discount = chain(bignumber(options.discount || 0)).dotDivide(bignumber(100)).done();
-  const goodsMap = state.goodsListState.goodsMap;
-  const goodsList = state.goodsListState.goodsList;
-  const discountGroup = uuidv4();
-  let amountSum = bignumber(0);
-
-  for (let t = 0; t < indexList.length; t++) {
-    const $index = indexList[t];
-    const good = goodsMap.get($index);
-
-    if (!good || good.lineAttribute !== LineAttributeType.正常) continue;
-
-    const i = goodsList.indexOf(good);
-
-    let lineAmountIncludeTax = 0;
-    let lineAmountExcludeTax = 0;
-
-    const taxRate = chain(bignumber(good.taxRate)).dotDivide(bignumber(100)).done();
-    if (state.goodsListState.isTaxIncluded) {
-      /** 金额(含税)  -1 * ${good.lineAmountIncludeTax} * ${discount}*/
-      lineAmountIncludeTax = (() => {
-        if (t === indexList.length - 1) {
-          return chain(bignumber(options.discolineAmountunt)).add(amountSum).multiply(-1).done().toNumber();
-        } else {
-          return chain(bignumber(-1))
-            .multiply(bignumber(good.lineAmountIncludeTax))
-            .multiply(discount)
-            .done()
-            .toNumber()
-            .toFixed(2);
-        }
-      })()
-      amountSum = amountSum.add(bignumber(lineAmountIncludeTax));
-
-      /** 金额(不含税) ${lineAmountIncludeTax} / (1+${good.taxRate}/100)*/
-      lineAmountExcludeTax = 1 * chain(bignumber(lineAmountIncludeTax))
-        .dotDivide(chain(bignumber(1)).add(taxRate).done())
-        .done()
-        .toNumber()
-        .toFixed(2)
-    } else {
-
-      /** 金额(不含税)  -1 * ${good.lineAmountIncludeTax} * ${discount}*/
-      lineAmountExcludeTax = (() => {
-        if (t === indexList.length - 1) {
-          return chain(bignumber(options.discolineAmountunt)).add(amountSum).multiply(-1).done().toNumber();
-        } else {
-          return chain(bignumber(-1))
-            .multiply(bignumber(good.lineAmountExcludeTax))
-            .multiply(discount)
-            .done()
-            .toNumber()
-            .toFixed(2);
-        }
-      })()
-      amountSum = amountSum.add(bignumber(lineAmountExcludeTax));
-
-      /** 金额(含税)  lineAmountExcludeTax * (1+${good.taxRate}/100)*/
-      lineAmountIncludeTax = format2(chain(bignumber(lineAmountExcludeTax))
-        .multiply(chain(bignumber(1)).add(taxRate).done())
-        .done().toNumber()) as number
-    }
-
-    /** 税额 */
-    const taxAmount = chain(bignumber(lineAmountIncludeTax))
-      .subtract(bignumber(lineAmountExcludeTax))
-      .done()
-      .toNumber();
-
-      
-    good.discountGroup = discountGroup;
-    good.lineAttribute = LineAttributeType.被折扣行;
-    goodsList.splice(i + 1, 0, {
-      $index: idGenerator(),
-      lineAttribute: LineAttributeType.折扣行,
-      taxClassificationCode: good.taxClassificationCode,
-      taxRate: good.taxRate,
-      itemName: good.itemName,
-      itemNameSelf: good.itemNameSelf,
-      favouredPolicyMark: good.favouredPolicyMark,
-      favouredPolicyName: good.favouredPolicyName,
-      taxFreeType: good.taxFreeType,
-      discountGroup,
-      lineAmountIncludeTax,
-      lineAmountExcludeTax,
-      taxAmount,
-    });
-  }
-
-  state.goodsListState.goodsList = goodsList.slice();
-};
+/**
+ *
+ * 折扣率  含税金额  不含税金额
+ *
+ * 含税折扣额 = -1 * (含税金额   * 折扣率)
+ * 不含税扣额 = 含税折扣额 / (1+税率)
+ * 折扣税额   = 含税折扣额 - 不含税扣额
+ */
+
+import { v4 as uuidv4 } from 'uuid';
+import { chain, bignumber } from 'mathjs';
+import { InvoiceControllerState } from '../';
+import LineAttributeType from '../InvoiceControllerState/GoodsListState/LineAttributeType';
+import idGenerator from '../../tools/idGenerator';
+import { format2 } from '../../../Invoice/tools/calculate';
+
+export interface IOptions {
+  /** 需要添加的 索引列表 */
+  indexList: string[];
+
+  /** 折扣 */
+  discount: number;
+
+  /** 折扣 金额 */
+  discolineAmountunt: number;
+}
+
+/**
+ * 给一组货物添加折扣行
+ */
+export default async (state: InvoiceControllerState, options?: IOptions) => {
+  if (!options) return;
+
+  const { indexList = [] } = options;
+  const discount = chain(bignumber(options.discount || 0)).dotDivide(bignumber(100)).done();
+  const goodsMap = state.goodsListState.goodsMap;
+  const goodsList = state.goodsListState.goodsList;
+  const discountGroup = uuidv4();
+  let amountSum = bignumber(0);
+
+  for (let t = 0; t < indexList.length; t++) {
+    const $index = indexList[t];
+    const good = goodsMap.get($index);
+
+    if (!good || good.lineAttribute !== LineAttributeType.正常) continue;
+
+    const i = goodsList.indexOf(good);
+
+    let lineAmountIncludeTax = 0;
+    let lineAmountExcludeTax = 0;
+
+    const taxRate = chain(bignumber(good.taxRate)).dotDivide(bignumber(100)).done();
+    if (state.goodsListState.isTaxIncluded) {
+      /** 金额(含税)  -1 * ${good.lineAmountIncludeTax} * ${discount}*/
+      lineAmountIncludeTax = (() => {
+        if (t === indexList.length - 1) {
+          return chain(bignumber(options.discolineAmountunt)).add(amountSum).multiply(-1).done().toNumber();
+        } else {
+          return chain(bignumber(-1))
+            .multiply(bignumber(good.lineAmountIncludeTax))
+            .multiply(discount)
+            .done()
+            .toNumber()
+            .toFixed(2);
+        }
+      })()
+      amountSum = amountSum.add(bignumber(lineAmountIncludeTax));
+
+      /** 金额(不含税) ${lineAmountIncludeTax} / (1+${good.taxRate}/100)*/
+      lineAmountExcludeTax = 1 * chain(bignumber(lineAmountIncludeTax))
+        .dotDivide(chain(bignumber(1)).add(taxRate).done())
+        .done()
+        .toNumber()
+        .toFixed(2)
+    } else {
+
+      /** 金额(不含税)  -1 * ${good.lineAmountIncludeTax} * ${discount}*/
+      lineAmountExcludeTax = (() => {
+        if (t === indexList.length - 1) {
+          return chain(bignumber(options.discolineAmountunt)).add(amountSum).multiply(-1).done().toNumber();
+        } else {
+          return chain(bignumber(-1))
+            .multiply(bignumber(good.lineAmountExcludeTax))
+            .multiply(discount)
+            .done()
+            .toNumber()
+            .toFixed(2);
+        }
+      })()
+      amountSum = amountSum.add(bignumber(lineAmountExcludeTax));
+
+      /** 金额(含税)  lineAmountExcludeTax * (1+${good.taxRate}/100)*/
+      lineAmountIncludeTax = format2(chain(bignumber(lineAmountExcludeTax))
+        .multiply(chain(bignumber(1)).add(taxRate).done())
+        .done().toNumber()) as number
+    }
+
+    /** 税额 */
+    const taxAmount = chain(bignumber(lineAmountIncludeTax))
+      .subtract(bignumber(lineAmountExcludeTax))
+      .done()
+      .toNumber();
+
+      
+    good.discountGroup = discountGroup;
+    good.lineAttribute = LineAttributeType.被折扣行;
+    goodsList.splice(i + 1, 0, {
+      $index: idGenerator(),
+      lineAttribute: LineAttributeType.折扣行,
+      taxClassificationCode: good.taxClassificationCode,
+      taxRate: good.taxRate,
+      itemName: good.itemName,
+      itemNameSelf: good.itemNameSelf,
+      favouredPolicyMark: good.favouredPolicyMark,
+      favouredPolicyName: good.favouredPolicyName,
+      taxFreeType: good.taxFreeType,
+      discountGroup,
+      lineAmountIncludeTax,
+      lineAmountExcludeTax,
+      taxAmount,
+    });
+  }
+
+  state.goodsListState.goodsList = goodsList.slice();
+};

package/src/Invoice/InvoiceController/fns/addGoodDiscountV2.ts

@@ -0,0 +1,84 @@
+
+import { v4 as uuidv4 } from 'uuid';
+import { bignumber, chain } from 'mathjs';
+import { InvoiceControllerState, LineAttributeType } from '../';
+import idGenerator from '../../tools/idGenerator';
+
+export interface IOptions {
+    /** 需要添加的索引 */
+    $index: string;
+
+    /** 折扣 金额 */
+    discolineAmountunt: number;
+}
+
+/**
+ * 给一组货物添加折扣行
+ */
+export default async (state: InvoiceControllerState, options?: IOptions[]) => {
+
+    if (!options || options.length <= 0) return;
+
+    const discountGroup = uuidv4();
+
+    options.forEach(e => {
+        const goodsList = state.goodsListState.goodsList;
+        const goodsMap = state.goodsListState.goodsMap;
+        for (let i = 0; i < goodsList.length; i++) {
+            const good = goodsList[i];
+            if (good.$index !== e.$index) continue;
+
+            // 折扣行 税额
+            const lineAmountExcludeTax = getLineAmountExcludeTax(e.discolineAmountunt, good.taxRate);
+            const taxAmount = getTaxAmount(e.discolineAmountunt, lineAmountExcludeTax);
+
+            good.lineAttribute = LineAttributeType.被折扣行;
+            good.discountGroup = discountGroup;
+
+            const newGood = {
+                discountGroup,
+                $index: idGenerator(),
+                lineAttribute: LineAttributeType.折扣行,
+                taxRate: good.taxRate,
+                itemName: good.itemName,
+
+                taxAmount: -1 * taxAmount,
+                lineAmountExcludeTax: -1 * lineAmountExcludeTax,
+                lineAmountIncludeTax: -1 * e.discolineAmountunt,
+
+                taxFreeType: good.taxFreeType,
+                favouredPolicyMark: good.favouredPolicyMark,
+                favouredPolicyName: good.favouredPolicyName,
+            }
+
+            goodsList.splice(i + 1, 0, newGood);
+            goodsMap.set(newGood.$index, newGood);
+        }
+    })
+
+    state.goodsListState.goodsList = [...state.goodsListState.goodsList];
+    state.goodsListState.goodsMap = new Map(state.goodsListState.goodsMap);
+}
+
+/** 金额（不含税） = 含税金额 / (1 + 税率) */
+function getLineAmountExcludeTax(lineAmountIncludeTax: number, taxRate: number = 0) {
+    const biTaxRate = chain(bignumber(taxRate)).divide(bignumber(100)).done();
+    return chain(bignumber(lineAmountIncludeTax))
+        .divide(chain(bignumber(1)).add(biTaxRate).done())
+
+        .multiply(bignumber(100))
+        .floor()
+        .divide(bignumber(100))
+
+        .done()
+        .toNumber()
+}
+
+/** 税额 = 含税金额 - 金额（不含税） */
+function getTaxAmount(lineAmountIncludeTax: number, lineAmountExcludeTax: number) {
+    return chain(bignumber(lineAmountIncludeTax))
+        .subtract(bignumber(lineAmountExcludeTax))
+
+        .done()
+        .toNumber()
+}

package/src/Invoice/InvoiceController/fns/delGood.ts

@@ -1,43 +1,41 @@
-import { InvoiceControllerState, IGood } from '../';
-import LineAttributeType from '../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
-
-/**
- * 设置当前的编辑货物
- */
-export default async (state: InvoiceControllerState, $index?: string) => {
-  if (!$index) return;
-
-  const goods = state.goodsListState.goodsList.filter( (e) => e.$index === $index)[0];
-  if (!goods) return;
-  if (
-    state.goodsListState.editGood &&
-    state.goodsListState.editGood.$index === $index
-  ) {
-    state.goodsListState.editGood = undefined;
-  }
-
-  if (goods.lineAttribute === LineAttributeType.正常) {
-    state.goodsListState.selectedGoodIndex =
-      state.goodsListState.selectedGoodIndex.filter((e) => e !== $index);
-    state.goodsListState.goodsList = state.goodsListState.goodsList.filter(
-      (e) => e.$index !== $index,
-    );
-  }
-
-  if (goods.lineAttribute === LineAttributeType.折扣行) {
-    state.goodsListState.goodsList = state.goodsListState.goodsList.filter(
-      (e) => {
-        if (e.discountGroup !== goods.discountGroup) return true;
-        if (e.lineAttribute === LineAttributeType.折扣行) {
-          state.goodsListState.selectedGoodIndex =
-            state.goodsListState.selectedGoodIndex.filter((e) => e !== $index);
-          return false;
-        }
-        if (e.lineAttribute === LineAttributeType.被折扣行) {
-          e.lineAttribute = LineAttributeType.正常;
-          return true;
-        }
-      },
-    );
-  }
-};
+import { InvoiceControllerState, IGood } from '../';
+import LineAttributeType from '../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
+
+/**
+ * 删除一个货物
+ */
+export default async (state: InvoiceControllerState, $index?: string) => {
+  if (!$index) return;
+
+  // 查下要删除的货物
+  const goods = state.goodsListState.goodsList.filter((e) => e.$index === $index)[0];
+  if (!goods) return;
+
+  // 如果正在编辑 就取消编辑
+  if (state.goodsListState.editGood && state.goodsListState.editGood.$index === $index) {
+    state.goodsListState.editGood = undefined;
+  }
+
+  const goodsList = state.goodsListState.goodsList;
+  const goodsMap = state.goodsListState.goodsMap;
+
+  goodsMap.delete($index);
+
+  for (let i = 0; i < goodsList.length; i++) {
+
+    if (goodsList[i].$index === $index) {
+      const good = goodsList[i];
+
+      if (good.lineAttribute === LineAttributeType.折扣行 && goodsList[i - 1] && goodsList[i - 1].lineAttribute === LineAttributeType.被折扣行) {
+        goodsList[i - 1].lineAttribute = LineAttributeType.正常;
+      }
+
+      goodsList.splice(i, 1);
+
+      break;
+    }
+  }
+
+  state.goodsListState.goodsList = [...goodsList];
+  state.goodsListState.goodsMap = new Map(goodsMap);
+};

package/src/Invoice/InvoiceController/fns/getGoodsSearch.ts

@@ -1,24 +1,24 @@
-
-import IGood from "../InvoiceControllerState/GoodsListState/IGood";
-
-/**
- * 计算搜索商品
- * @param goodsList 被搜索列表
- * @param search 搜索条件
- * @param isTaxIncluded 是否含税
- * @returns 
- */
-export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean) {
-    if (!search) return goodsList;
-    return goodsList.filter(e => {
-        if ((e.itemName?.indexOf(search) ?? -1) >= 0) {
-            return true;
-        } else if ((e.itemModelName?.indexOf(search) ?? -1) >= 0) {
-            return true
-        } else if (`${isTaxIncluded ? e.lineAmountIncludeTax?.toFixed(2) : e.lineAmountExcludeTax?.toFixed(2)}`.indexOf(search) >= 0) {
-            return true
-        } else {
-            return false;
-        }
-    })
+
+import IGood from "../InvoiceControllerState/GoodsListState/IGood";
+
+/**
+ * 计算搜索商品
+ * @param goodsList 被搜索列表
+ * @param search 搜索条件
+ * @param isTaxIncluded 是否含税
+ * @returns 
+ */
+export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean) {
+    if (!search) return goodsList;
+    return goodsList.filter(e => {
+        if ((e.itemName?.indexOf(search) ?? -1) >= 0) {
+            return true;
+        } else if ((e.itemModelName?.indexOf(search) ?? -1) >= 0) {
+            return true
+        } else if (`${isTaxIncluded ? e.lineAmountIncludeTax?.toFixed(2) : e.lineAmountExcludeTax?.toFixed(2)}`.indexOf(search) >= 0) {
+            return true
+        } else {
+            return false;
+        }
+    })
 }

package/src/Invoice/InvoiceController/fns/saveEditGood.ts

@@ -1,23 +1,24 @@
-import { InvoiceControllerState } from '../';
-
-/**
- * 保存正在编辑的货物
- */
-export default async (state: InvoiceControllerState) => {
-  const editGood = state.goodsListState.editGood;
-  const form = state.goodsListState.form;
-  
-  if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
-  if ((await validateFields(form)).err) return;
-
-  state.goodsListState.goodsList = state.goodsListState.goodsList.map((e) =>
-    e.$index === editGood.$index ? { ...e, ...editGood } : e,
-  );
-  state.goodsListState.editGood = undefined;
-};
-
-const validateFields = (form: any) => new Promise((resolve: (v: { err: any; values: any }) => void) => {
-  form.validateFields(async (err: any, values: any) => {
-    resolve({ err, values });
-  });
-});
+import { InvoiceControllerState } from '../';
+
+/**
+ * 保存正在编辑的货物
+ */
+export default async (state: InvoiceControllerState) => {
+
+  const editGood = state.goodsListState.editGood;
+  const form = state.goodsListState.form;
+  
+  if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
+  if ((await validateFields(form)).err) return;
+
+  state.goodsListState.goodsList = state.goodsListState.goodsList.map((e) =>
+    e.$index === editGood.$index ? { ...e, ...editGood } : e,
+  );
+  state.goodsListState.editGood = undefined;
+};
+
+const validateFields = (form: any) => new Promise((resolve: (v: { err: any; values: any }) => void) => {
+  form.validateFields(async (err: any, values: any) => {
+    resolve({ err, values });
+  });
+});

package/src/Invoice/InvoiceController/fns/setEditGood.ts

@@ -1,16 +1,16 @@
-import { InvoiceControllerState, IGood } from '../';
-
-/**
- * 设置当前的编辑货物
- */
-export default async (state: InvoiceControllerState, newEditGood?: any) => {
-  if (newEditGood) {
-    const editGood = state.goodsListState.editGood as IGood;
-    state.goodsListState = {
-      ...state.goodsListState,
-      editGood: { ...editGood, ...newEditGood },
-    };
-  } else {
-    state.goodsListState = { ...state.goodsListState, editGood: undefined };
-  }
-};
+import { InvoiceControllerState, IGood } from '../';
+
+/**
+ * 设置当前的编辑货物
+ */
+export default async (state: InvoiceControllerState, newEditGood?: any) => {
+  if (newEditGood) {
+    const editGood = state.goodsListState.editGood as IGood;
+    state.goodsListState = {
+      ...state.goodsListState,
+      editGood: { ...editGood, ...newEditGood },
+    };
+  } else {
+    state.goodsListState = { ...state.goodsListState, editGood: undefined };
+  }
+};

package/src/Invoice/InvoiceController/fns/setGoods.ts

@@ -1,11 +1,11 @@
-
-import { InvoiceControllerState, IGood } from '../';
-
-/**
- * 设置单个货物属性
- */
-export default async (state: InvoiceControllerState, options?: IGood) => {
-    if (!options || !options.$index) return;
-    const goodsList = state.goodsListState.goodsList.map(e => e.$index === options.$index ? { ...e, ...options } : e);
-    state.goodsListState = { ...state.goodsListState, goodsList };
+
+import { InvoiceControllerState, IGood } from '../';
+
+/**
+ * 设置单个货物属性
+ */
+export default async (state: InvoiceControllerState, options?: IGood) => {
+    if (!options || !options.$index) return;
+    const goodsList = state.goodsListState.goodsList.map(e => e.$index === options.$index ? { ...e, ...options } : e);
+    state.goodsListState = { ...state.goodsListState, goodsList };
 };

package/src/Invoice/InvoiceController/fns/updateInvoiceNo.ts

@@ -1,9 +1,9 @@
-
-import InvoiceControllerState from '../InvoiceControllerState';
-
-/**
- * 更新 发票单据编号
- */
-export default async (state: InvoiceControllerState) => {
-    return `INV${(Math.random() * 10000000000000).toFixed(0)}`;
+
+import InvoiceControllerState from '../InvoiceControllerState';
+
+/**
+ * 更新 发票单据编号
+ */
+export default async (state: InvoiceControllerState) => {
+    return `INV${(Math.random() * 10000000000000).toFixed(0)}`;
 };