kts-component-invoice-operate 1.2.20 → 1.2.21

package/package.json

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

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

@@ -34,7 +34,7 @@ export default class GoodsListState {
   defaultRate = 3;
 
   /** 税率列表 */
-  taxRateList: number[] = [0, 3, 5, 6, 9, 12];
+  taxRateList: number[] = [0, 3, 5, 6, 9, 13];
 
   /** 货物列表 */
   goodsList: IGood[] = [];

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

@@ -12,6 +12,7 @@ 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 {
   /** 需要添加的 索引列表 */
@@ -29,7 +30,7 @@ export interface IOptions {
  */
 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;
@@ -89,9 +90,9 @@ export default async (state: InvoiceControllerState, options?: IOptions) => {
       amountSum = amountSum.add(bignumber(lineAmountExcludeTax));
 
       /** 金额(含税)  lineAmountExcludeTax * (1+${good.taxRate}/100)*/
-      lineAmountIncludeTax = chain(bignumber(lineAmountExcludeTax))
+      lineAmountIncludeTax = format2(chain(bignumber(lineAmountExcludeTax))
         .multiply(chain(bignumber(1)).add(taxRate).done())
-        .done().toNumber();
+        .done().toNumber()) as number
     }
     
     /** 税额 */

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

@@ -291,6 +291,12 @@ export function dutyFree(controller: InvoiceController, taxRate: number, form: W
   const invoiceType = controller.state.invoiceType;
 
   // 4月1日至12月31日
+  console.log('===> 小规模纳税人免税逻辑');
+  console.log('===> invoiceType', invoiceType);
+  console.log('===> en', controller.state.en);
+  console.log('===> taxRate', taxRate);
+  console.log('===> state', controller.state);
+
   if (moment().valueOf() > moment('2022-12-31 23:59').valueOf()) return taxRate;
   if (controller.state.en !== '08') return taxRate;
   if (invoiceType !== '10' && invoiceType !== '04') return taxRate;
@@ -304,30 +310,6 @@ export function dutyFree(controller: InvoiceController, taxRate: number, form: W
     form.setFieldsValue({ taxRate: 0 });
     return 0;
   }
-
-  // 选择的 1或者3
-  // if (taxRate === 1 || taxRate === 3) {
-  // 是否处理过
-  // if (cache[record.$index]) {
-  //   return taxRate;
-  // } else {
-  // cache[record.$index] = { favouredPolicyName: record.favouredPolicyName, favouredPolicyMark: record.favouredPolicyMark,taxFreeType:record.taxFreeType }
-  //   record.favouredPolicyName = '免税';
-  //   record.taxRate = 0;
-  //   record.favouredPolicyMark = 1;
-  //   record.taxFreeType = 1 as any;
-  //   form.setFieldsValue({ taxRate: 0 });
-  //   return 0;
-  // }
-  // } else {
-  //   if (cache[record.$index] && cache[record.$index] !== true) {
-  //     record.favouredPolicyName = cache[record.$index].favouredPolicyName;
-  //     record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
-  //     record.taxFreeType = cache[record.$index].taxFreeType;
-  //     cache[record.$index] = true;
-  //   }
-  //   return taxRate;
-  // }
 }
 
 /** 含税 => 更新(不含税) */

package/src/Invoice/ui/GoodsList/ui/AddDiscountRowButton/index.tsx

@@ -139,9 +139,7 @@ const DrawerBody = decorator<{}, FormComponentProps>(Form.create())((props) => {
 
   /** 关闭抽屉 */
   const onClose = React.useCallback(() => {
-    controller.pipeline(async (s) => {
-      s.goodsListState.discountGoodIndex = [];
-    })();
+    controller.pipeline(async (s) => { s.goodsListState.discountGoodIndex = [] })();
   }, []);
 
   /** 点击了保存 */
@@ -151,9 +149,7 @@ const DrawerBody = decorator<{}, FormComponentProps>(Form.create())((props) => {
       const discolineAmountunt = parseFloat(parseFloat(values.discolineAmountunt).toFixed(2));
       const discount = parseFloat(parseFloat(values.discount).toFixed(4));
       const indexList = discountGoodIndex;
-      controller.pipeline(async s => {
-        s.goodsListState.discountGoodIndex = [];
-      })();
+      controller.pipeline(async s => { s.goodsListState.discountGoodIndex = []; })();
       controller.addGoodDiscount({ indexList, discount, discolineAmountunt });
     });
   }, [controller, form, discountGoodIndex]);
@@ -163,26 +159,20 @@ const DrawerBody = decorator<{}, FormComponentProps>(Form.create())((props) => {
     lazyFn((e: React.ChangeEvent<HTMLInputElement>) => {
       form.validateFields((err, values) => {
         if (err && err.discount) return;
-        const discolineAmountunt = evaluate(
-          `${lineAmountSum} * (${values.discount}/100)`,
-        ).toFixed(2);
+        const discolineAmountunt = evaluate(`${lineAmountSum} * (${values.discount}/100)`).toFixed(2);
         form.setFieldsValue({ discolineAmountunt });
       });
     }, 300),
     [form, lineAmountSum],
   );
 
-  /** 折扣率变化 */
+  /** 折扣变化 */
   const onChangeDiscolineAmountunt = React.useCallback(
     lazyFn((e: React.ChangeEvent<HTMLInputElement>) => {
       form.validateFields((err, values) => {
         if (err && err.discolineAmountunt) return;
-        const discolineAmountunt = parseFloat(
-          values.discolineAmountunt,
-        ).toFixed(2);
-        const discount = evaluate(
-          `(${discolineAmountunt} / ${lineAmountSum}) * 100`,
-        ).toFixed(4);
+        const discolineAmountunt = parseFloat(values.discolineAmountunt).toFixed(2);
+        const discount = evaluate(`(${discolineAmountunt} / ${lineAmountSum}) * 100`).toFixed(4);
         form.setFieldsValue({ discount });
       });
     }, 300),