kts-component-invoice-operate 1.2.20 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "1.2.20",
+  "version": "2.0.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -48,5 +48,8 @@
     "lint-staged": "^10.0.7",
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
+  },
+  "resolutions": {
+    "@types/react": "17.0.2"
   }
 }

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/{EndowCode.tsx → EndowCode/index.tsx}

@@ -1,6 +1,6 @@
-import GoodsListState from '../GoodsListState';
-import IGood from './IGood';
-import LineAttributeType from './LineAttributeType';
+import GoodsListState from '../../GoodsListState';
+import IGood from '../IGood';
+import LineAttributeType from '../LineAttributeType';
 
 export default class EndowCode {
 

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/{IGood.ts → IGood/index.ts}

@@ -1,4 +1,4 @@
-import LineAttributeType from './LineAttributeType';
+import LineAttributeType from '../LineAttributeType';
 
 export default interface IGood {
   /** 数据索引 */
@@ -10,14 +10,29 @@ export default interface IGood {
   /** 发票ID */
   id?: string;
 
-  /** 货物名称 */
+  /** 商品编码(我方) */
+  itemCode?: string;
+
+  /** 货物名称(我方) */
   itemName?: string;
 
-  /** 货物规格型号 */
+  /** 单位(我方) */
+  unit?: string;
+
+  /** 货物规格型号(我方) */
   itemModelName?: string;
 
-  /** 单位 */
-  unit?: string;
+  /** 商品编码(对方) */
+  itemCodeOther?: string;
+
+  /** 货物名称(对方) */
+  itemNameOther?: string;
+
+  /** 单位(对方) */
+  unitOther?: string;
+
+  /** 货物规格型号(对方) */
+  itemModelNameOther?: string;
 
   /** 数量 */
   quantity?: number;

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

@@ -0,0 +1,10 @@
+import IGood from "../IGood";
+
+export default class ProductComparison {
+
+    /** 执行商品对照 */
+    onComply?: (e: IGood[]) => Promise<IGood[]>
+
+    /** 更新对照表 */
+    onUpdateComparisonTable?: (e: IGood, values:any) => Promise<void>
+}

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

@@ -1,6 +1,7 @@
 import IGood from './IGood';
 import ImportGoods from './ImportGoods';
 import EndowCode from './EndowCode';
+import ProductComparison from './ProductComparison';
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import InvoiceController from '../..';
 
@@ -11,7 +12,7 @@ export default class GoodsListState {
 
   /** 产品最大数 */
   goodMax?: number;
-  
+
   /** 是否可以切换(含税/不含税)状态 */
   isSwitchTax?: boolean;
 
@@ -21,6 +22,9 @@ export default class GoodsListState {
   /** 是否含税 */
   isTaxIncluded = true;
 
+  /** 是否显示我方 */
+  isMyShow = false;
+
   /** 正在编辑的货物 */
   editGood?: IGood;
 
@@ -34,7 +38,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[] = [];
@@ -57,6 +61,12 @@ export default class GoodsListState {
   /** 导入商品的相关数据 */
   importGoods = new ImportGoods();
 
+  /** 商品对照 相关 */
+  productComparison = new ProductComparison();
+
   /** 是否显购买示导入抽屉 */
   isVisibleDrawer = false;
+
+  /** 正在 添加商品对照 的货物 */
+  addComparisonIndex?: number;
 }

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/_test/importGoods/index.tsx

@@ -1,8 +1,11 @@
-import { Button } from 'kts-components-antd-x3/lib/radio';
+
 import React from 'react';
-import { Invoice } from '../../../';
+import { Button } from 'kts-components-antd-x3/lib/radio';
+import { Invoice, IGood } from '../../../';
 import { IGetBuyerListOption } from '../../../Invoice/InvoiceController/InvoiceControllerState/BuyerState';
 
+const InvoiceController = Invoice.InvoiceController
+
 export default () => {
 
   // 初始化控制器
@@ -17,7 +20,7 @@ export default () => {
 };
 
 // 重写 购买方 的数据源，实现 ‘获取 购买方 列表’ 方法
-class MyInvoiceController extends Invoice.InvoiceController {
+class MyInvoiceController extends InvoiceController {
   constructor() {
     super();
 
@@ -31,6 +34,21 @@ class MyInvoiceController extends Invoice.InvoiceController {
       },
     ];
 
+    // 设置比对方法
+    this.state.goodsListState.productComparison = {
+      onComply: async (e: IGood[]) => {
+        return e.map(e => {
+          return {
+            ...e,
+            itemNameOther: e.itemName + '(他方)',
+            unitOther: e.unit + '(他方)',
+            itemModelNameOther: e.itemModelName + '(他方)',
+            itemCodeOther: e.itemCode + '(他方)',
+          }
+        })
+      }
+    }
+
     this.state.en = '08'
     this.state.invoiceType = '10'
   }

package/src/Invoice/index.tsx

@@ -9,6 +9,7 @@ import Buyer from './ui/Buyer';
 import ImportBuyerDrawer from './ui/ImportBuyerDrawer';
 import ImportGoodsDrawer from './ui/ImportGoodsDrawer';
 import EndowCodeDrawer from './ui/EndowCodeDrawer';
+import AddComparisonDrawer from './ui/AddComparisonDrawer';
 import idGenerator from './tools/idGenerator';
 
 /** 发票组件的上下文 */
@@ -39,7 +40,7 @@ export interface IInvoiceProps {
   footExpand?: React.ReactNode;
 }
 
-export default class extends React.PureComponent<IInvoiceProps> {
+export default class Invoice extends React.PureComponent<IInvoiceProps> {
   /** 控制器 */
   static readonly InvoiceController = InvoiceController;
 
@@ -100,6 +101,9 @@ const Main = (props: IInvoiceProps) => {
 
       {/* 给货品赋码的抽屉 */}
       <EndowCodeDrawer />
+
+      {/* 添加商品对照的抽屉 */}
+      <AddComparisonDrawer />
     </InvoiceContext.Provider>
   );
 };

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

@@ -0,0 +1,48 @@
+
+export interface ISN {
+
+    /** 简称 */
+    shorthand?: string;
+
+    /** 全称 */
+    full: string
+}
+
+/** 拆分全称加简称 */
+export const getSN = (value?: string): ISN | undefined => {
+    debugger;
+    if (!value) return undefined;
+    const arr = value.match(/\*[^*]+\*/);
+    if (arr && arr[0]) {
+        return { shorthand: arr[0].split('*')[1], full: value.replace(arr[0], '') };
+    } else {
+        return { shorthand: undefined, full: value };
+    }
+};
+
+/** 组合全称加简称 */
+export const getItemName = (value: ISN) => {
+    if (value.shorthand) {
+        return `*${value.shorthand}*${value.full}`;
+    } else {
+        return value.full;
+    }
+}
+
+/** 设置全称 */
+export const setFull = (name?:string, full?:string) => {
+    const sn = getSN(name);
+    if(!sn) return full;
+    sn.full = full || '';
+    return getItemName(sn);
+}
+
+/** 设置简称 */
+export const setShorthand = (name?:string, shorthand?:string) => {
+    if(!name) return undefined
+
+    const sn = getSN(name);
+    if(!sn) return undefined;
+    sn.shorthand = shorthand || '';
+    return getItemName(sn);
+}

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

@@ -0,0 +1,179 @@
+
+import { Row, Col, Input, Drawer, Form, Checkbox, Button } from "kts-components-antd-x3";
+import { FormComponentProps } from "kts-components-antd-x3/lib/form";
+import { decorator } from "grey-react-box";
+import { Invoice } from "../../../";
+import { getSN } from "../../tools/itemName";
+import React from "react";
+import { WrappedFormUtils } from "kts-components-antd-x3/lib/form/Form";
+
+const AddComparisonDrawer = decorator(
+    Form.create()
+)(
+    (props: FormComponentProps) => {
+
+        const { form } = props;
+
+        const { getFieldDecorator } = form;
+
+        /** 控制器 */
+        const controller = Invoice.useInvoiceController();
+
+        /** 正在 添加商品对照 的货物索引 */
+        const addComparisonIndex = controller.useMemo(s => s.goodsListState.addComparisonIndex, []);
+
+        /** 货物字典 */
+        const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
+
+        /** 正在 对照 的货物 */
+        const good = React.useMemo(() => addComparisonIndex ? goodsMap.get(addComparisonIndex) : undefined, [addComparisonIndex])
+
+        /** 关闭对照 */
+        const onClose = React.useCallback(controller.pipeline<any>(async s => {
+            s.goodsListState.addComparisonIndex = undefined
+        }), [controller])
+
+        /** 提交数据 */
+        const onSubmit = React.useCallback(() => {
+            controller.run(async s => {
+                if (!good) return
+
+                const { err, values } = await validateFields(form);
+                if (err) return;
+
+                const shorthand = s.goodsListState.isMyShow ? getSN(good.itemName)?.shorthand : getSN(good.itemNameOther)?.shorthand;
+                good.itemCode = values.itemCode;
+                good.itemCodeOther = values.itemCodeOther;
+                good.itemName = shorthand ? `*${shorthand}*${values.itemName}` : values.itemName;
+                good.itemNameOther = shorthand ? `*${shorthand}*${values.itemNameOther}` : values.itemNameOther;
+                good.itemModelName = values.itemModelName;
+                good.itemModelNameOther = values.itemModelNameOther;
+                good.unit = values.unit;
+                good.unitOther = values.unitOther;
+                s.goodsListState.addComparisonIndex = undefined;
+                s.goodsListState.goodsList = [...s.goodsListState.goodsList]
+
+                if (s.goodsListState?.productComparison?.onUpdateComparisonTable && values.isUpdate) {
+                    debugger
+                    await s.goodsListState.productComparison.onUpdateComparisonTable(good, values);
+                }
+            })
+        }, [form, good])
+
+        React.useEffect(() => {
+            form.resetFields();
+            if (good) {
+                form.setFieldsValue({
+                    ...good,
+                    itemName: getSN(good.itemName)?.full,
+                    itemNameOther: getSN(good.itemNameOther)?.full,
+                })
+            }
+        }, [good])
+
+        return (
+            <Drawer
+                width={500}
+                onClose={onClose}
+                placement="right"
+                title="添加商品对照"
+                visible={!!addComparisonIndex}
+                drawerStyle={{ display: 'flex', flexDirection: 'column' }}
+                bodyStyle={{ flex: 1, display: 'flex', flexDirection: 'column' }}
+            >
+                <Form layout="vertical" style={{ flex: 1 }} >
+                    <Row gutter={[8, 8]} >
+                        <Col span={12}>
+                            {getFieldDecorator('itemCode', {})(
+                                <Form.Item label="我方商品编码" >
+                                    <Input />
+                                </Form.Item>
+                            )}
+
+                        </Col>
+                        <Col span={12} >
+                            {getFieldDecorator('itemCodeOther', {})(
+                                <Form.Item label="对方商品编码" >
+                                    <Input />
+                                </Form.Item>
+                            )}
+                        </Col>
+                        <Col span={12} >
+                            {getFieldDecorator('itemName', {
+                                rules: [{ required: true, message: "请输入我方商品名称" }]
+                            })(
+                                <Form.Item label="我方商品名称" >
+                                    <Input />
+                                </Form.Item>
+                            )}
+
+                        </Col>
+                        <Col span={12} >
+                            {getFieldDecorator('itemNameOther', {
+                                rules: [{ required: true, message: "请输入对方商品名称" }]
+                            })(
+                                <Form.Item label="对方商品名称">
+                                    <Input />
+                                </Form.Item>
+                            )}
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item label="我方规格型号">
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            {getFieldDecorator('itemModelNameOther', {
+                                rules: [{ required: true, message: "请输入对方规格型号" }]
+                            })(
+                                <Form.Item label="对方规格型号">
+                                    <Input />
+                                </Form.Item>
+                            )}
+                        </Col>
+                        <Col span={12} >
+                            {getFieldDecorator('unit', {
+                                rules: [{ required: true, message: "请输入对方规格型号" }]
+                            })(
+                                <Form.Item label="我方计量单位"  >
+                                    <Input />
+                                </Form.Item>
+                            )}
+                        </Col>
+                        <Col span={12} >
+                            {getFieldDecorator('unitOther', {
+                                rules: [{ required: true, message: "请输入对方计量单位" }]
+                            })(
+                                <Form.Item label="对方计量单位"  >
+                                    <Input />
+                                </Form.Item>
+                            )}
+                        </Col>
+                        <Col span={24} >
+                            {getFieldDecorator('isUpdate', {
+                            })(
+                                <Form.Item >
+                                    <Checkbox>更新到商品对照表中</Checkbox>
+                                </Form.Item>
+                            )}
+                        </Col>
+                    </Row>
+                </Form>
+                <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 10 }} >
+                    <Button type="primary" onClick={onSubmit} >提交</Button>
+                    <Button onClick={onClose} >取消</Button>
+                </div>
+            </Drawer>
+        )
+    }
+)
+
+export default AddComparisonDrawer;
+
+function validateFields(form: WrappedFormUtils<any>) {
+    return new Promise<{ err: any, values: any }>(resolve => {
+        form.validateFields((err, values) => {
+            resolve({ err, values })
+        })
+    })
+}

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

@@ -8,6 +8,7 @@ import { LineAttributeType } from '../../InvoiceController';
 import IGood from '../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
 import { countTaxAmount } from '../../tools/calculate';
 import { bytesLnegth, cutStr } from '../../tools/strringFn';
+import { setShorthand } from '../../tools/itemName';
 import {
   SchemaForm,
   FormButtonGroup,
@@ -242,7 +243,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
         setList([])
       }
     }, [visible])
-    
+
     return (
       <>
         <InputAntd readOnly value={props.value} addonAfter={<Button size="small" type="link" onClick={() => { setVisible(true) }} >点击选择</Button>} />
@@ -289,9 +290,12 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       endowCodeGood.forEach(good => {
         if (!good) return;
 
+        good.itemName = setShorthand(good.itemName, values.shorthand);
+        good.itemNameOther = setShorthand(good.itemNameOther, values.shorthand);
+        
         // const name = getItemName(good.itemName, values.shorthand);
+        // good.itemName = getItemName(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
         
-        good.itemName = getItemName(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
         good.taxClassificationCode = values.taxClassificationCode;
         good.taxRate = values.taxRate;
         good.taxFreeType = values.taxFreeType;
@@ -301,19 +305,25 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
         const taxRate = chain(bignumber(values.taxRate)).dotDivide(bignumber(100)).add(bignumber(1)).done();
 
         // 是否含税
-        if (s.goodsListState.isTaxIncluded) {
-          const lineAmountExcludeTax = chain(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
-          const priceExcludeTax = good.priceIncludeTax ? chain(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined
+        const lineAmountExcludeTax = chain(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
+        const priceExcludeTax = good.priceIncludeTax ? chain(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined
 
-          good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
-          good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber()) : undefined) || undefined;
-        } else {
-          const lineAmountIncludeTax = chain(bignumber(good.lineAmountExcludeTax)).multiply(taxRate).done();
-          const priceIncludeTax = good.priceExcludeTax ? chain(bignumber(good.priceExcludeTax)).multiply(taxRate).done() : undefined
+        good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
+        good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber()) : undefined) || undefined;
 
-          good.lineAmountIncludeTax = lineAmountIncludeTax.toNumber().toFixed(2);
-          good.priceIncludeTax = (priceIncludeTax ? format15(priceIncludeTax.toNumber()) : undefined) || undefined;
-        }
+        // if (s.goodsListState.isTaxIncluded) {
+        //   const lineAmountExcludeTax = chain(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
+        //   const priceExcludeTax = good.priceIncludeTax ? chain(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined
+
+        //   good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
+        //   good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber()) : undefined) || undefined;
+        // } else {
+        //   const lineAmountIncludeTax = chain(bignumber(good.lineAmountExcludeTax)).multiply(taxRate).done();
+        //   const priceIncludeTax = good.priceExcludeTax ? chain(bignumber(good.priceExcludeTax)).multiply(taxRate).done() : undefined
+
+        //   good.lineAmountIncludeTax = lineAmountIncludeTax.toNumber().toFixed(2);
+        //   good.priceIncludeTax = (priceIncludeTax ? format15(priceIncludeTax.toNumber()) : undefined) || undefined;
+        // }
 
         good.taxAmount = countTaxAmount(good.lineAmountIncludeTax || 0, s.goodsListState.deduction, values.taxRate);
       });
@@ -456,18 +466,3 @@ const getShorthand = (value?: string) => {
     return undefined;
   }
 };
-
-/** 简称填入名称 */
-const getItemName = (value?: string, shorthand?: string) => {
-  if (!value) value = '';
-  if (!shorthand) {
-    return value.replace(/\*[^*]+\*/, ``);
-  }
-
-  const arr = value.match(/\*[^*]+\*/);
-  if (arr) {
-    return value.replace(/\*[^*]+\*/, `*${shorthand}*`);
-  } else {
-    return `*${shorthand}*${value}`;
-  }
-}

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

@@ -7,6 +7,7 @@
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import InvoiceController, { IGood, LineAttributeType } from '../../../../../InvoiceController';
 import evaluate from '../../../../../tools/evaluate';
+import { getSN, setShorthand } from '../../../../../tools/itemName';
 import { message } from 'kts-components-antd-x3'
 import { format2, format15, countTaxAmount, countAmountExcludeTax, countPrice } from '../../../../../tools/calculate';
 import moment from 'moment';
@@ -291,6 +292,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 +311,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;
-  // }
 }
 
 /** 含税 => 更新(不含税) */
@@ -464,3 +447,17 @@ export const endowCode = async (controller: InvoiceController, goods: IGood) =>
   })();
 }
 
+/** 修改了 货物名称 */
+export const onChangeItemName = async (controller: InvoiceController, form: WrappedFormUtils<any>, record: IGood) => {
+  controller.run(async s => {
+    const value = form.getFieldsValue().itemName;
+    const shorthand = getSN(value)?.shorthand ?? '';
+    if (s.goodsListState.isMyShow) {
+      await controller.setEditGood({ itemName: value });
+      record.itemNameOther && await controller.setEditGood({ itemNameOther: setShorthand(record.itemNameOther, shorthand) });
+    } else {
+      await controller.setEditGood({ itemNameOther: value });
+      record.itemName && await controller.setEditGood({ itemName: setShorthand(record.itemName, shorthand) });
+    }
+  })
+}