kts-component-invoice-operate 3.2.21 → 3.2.24

package/package.json

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

package/src/Invoice/Invoice-digtal/_test/header/index.tsx

@@ -1,10 +1,15 @@
 import React from 'react';
 import Invoice from '../../..';
 import 'antd/dist/antd.css';
+import InvoiceController from '../../../InvoiceController';
 
 export default () => {
+
+    const invoiceController = React.useMemo(() => new MyInvoiceController(), []);
+
     return (
         <Invoice
+            controller={invoiceController}
             invoiceType='digtal'
             invoiceHeader={
                 <Invoice.InvoiceHeaderDigtal
@@ -15,3 +20,66 @@ export default () => {
         />
     )
 };
+
+class MyInvoiceController extends InvoiceController {
+
+    constructor() {
+        super();
+        this.state.autoComplete.onItemNameSearch = async text => {
+            return [
+                {
+                    "itemName": "呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵呵",
+                    "taxClassificationCode": "1010112070000000000",
+                    "itemModelName": null,
+                    "shorthand": "蔬菜",
+                    "taxRate": undefined
+                },
+                {
+                    "itemName": "稻谷",
+                    "taxClassificationCode": "1010101040000000000",
+                    "itemModelName": null,
+                    "shorthand": "谷物",
+                    "taxRate": 3
+                },
+                {
+                    "itemName": "苹果",
+                    "taxClassificationCode": "1090111090000000000",
+                    "itemModelName": null,
+                    "shorthand": "小型起重设备",
+                    "taxRate": null
+                },
+                {
+                    "itemName": "银丝",
+                    "taxClassificationCode": "1080411120000000000",
+                    "itemModelName": null,
+                    "shorthand": "金属制品",
+                    "taxRate": 3
+                },
+                {
+                    "itemName": "布料",
+                    "taxClassificationCode": "1100101011100000000",
+                    "itemModelName": null,
+                    "shorthand": "发电",
+                    "taxRate": 2
+                },
+                {
+                    "itemName": "苹果",
+                    "taxClassificationCode": "1010115010100000000",
+                    "itemModelName": null,
+                    "shorthand": "水果",
+                    "taxRate": 3
+                }
+            ] as any
+        }
+
+        this.state.autoComplete.onBuyerTaxIdSearch = this.state.autoComplete.onBuyerNameSearch = async test => {
+            return [
+                { buyerName: '测试1', buyerTaxId: 'xxxxx1', buyerPhone:'xxxx1' },
+                { buyerName: '测试2', buyerTaxId: 'xxxxx2', buyerPhone:'xxxx2' },
+                { buyerName: '测试4', buyerTaxId: 'xxxxx4', buyerPhone:'xxxx4' },
+                { buyerName: '测试5', buyerTaxId: 'xxxxx5', buyerPhone:'xxxx5' },
+                { buyerName: '测试6', buyerTaxId: 'xxxxx6', buyerPhone:'xxxx6' },
+            ]
+        }
+    }
+}

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

@@ -4,5 +4,11 @@ import IGood from "../GoodsListState/IGood";
 export default class AutoComplete {
 
     /** 商品名称自动补全 */
-    onItemNameSearch?: (searchText: string) => Promise<IGood[]>
+    onItemNameSearch?: (searchText: string) => Promise<IGood[]>;
+
+    /** 购方名称自动补全 */
+    onBuyerNameSearch?: (searchText: string) => Promise<any[]>;
+
+    /** 统一社会信用代码/纳税人识别号 */
+    onBuyerTaxIdSearch?: (searchText: string) => Promise<any[]>;
 }

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

@@ -92,6 +92,9 @@ export default class GoodsListState {
   /** 是否可以合并明细 */
   isMergeDetails = false;
 
+  /** 是否可以合并折扣 */
+  isMergeDiscount = false;
+
   /** 正在 添加商品对照 的货物 */
   addComparisonIndex?: string;
 }

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

@@ -0,0 +1,68 @@
+import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../ui/default/GoodsList/hook/useColumns/autoFillFn';
+import { InvoiceControllerState, IGood } from '../';
+import evaluate from '../../tools/evaluate';
+import { countAmountIncludeTax } from '../../tools/calculate';
+
+/**
+ * 删除一个货物
+ */
+export default async (s: InvoiceControllerState, record: any, controller:any) => {
+    Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
+
+    // 没用 被编辑的货物 和 form 就退出
+    if (!s.goodsListState.editGood || !s.goodsListState.form) return;
+
+    // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+    record.quantity = undefined;
+    record.lineAmountExcludeTax = undefined;
+    record.lineAmountIncludeTax = undefined;
+
+    // 中间数据
+    const between = { ...record };
+    between.itemName = record.itemName;
+    between.itemNameOther = record.itemName;
+
+    // 设置编辑货物
+    const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
+
+    if (editGood.taxRate) {
+        editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
+    }
+
+    if (`${editGood.priceIncludeTax}` === '0') {
+        editGood.priceIncludeTax = undefined;
+        editGood.priceExcludeTax = undefined;
+    } else {
+        editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits) as number;
+    }
+
+    if (editGood.quantity && editGood.priceIncludeTax) {
+        editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
+    }
+
+    // 导入FORM里
+    if (s.goodsListState.isMyShow) {
+        s.goodsListState.form.setFieldsValue({
+            ...editGood,
+            itemName: editGood.itemNameSelf,
+            itemModelName: editGood.itemModelNameSelf,
+        });
+    } else {
+        s.goodsListState.form.setFieldsValue({
+            ...editGood,
+        });
+    }
+
+    s.goodsListState.importGoods.isVisibleDrawer = false;
+    s.goodsListState.isTaxIncluded
+        ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
+        : await updateUnitPriceTax(controller, s.goodsListState.form, record)
+}
+
+/** 货物单价，不含税 */
+const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) => {
+    if ((!s.taxRate && s.taxRate !== 0) || (!record.priceIncludeTax && record.priceIncludeTax !== 0)) return;
+
+    // 单价(含税)/(1+税率) = 单价(不含税)
+    return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`), calculatingDigits);
+};

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

@@ -0,0 +1,29 @@
+
+
+import { IGood, InvoiceControllerState, LineAttributeType } from '..';
+import { chain, bignumber } from 'mathjs';
+import idGenerator from '../../tools/idGenerator';
+
+export default async function mergeDiscount(state: InvoiceControllerState) {
+    if (state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood) return;
+
+    const goodsList = state.goodsListState.goodsList.slice();
+    for (let i = 0; i < goodsList.length; i++) {
+        const good = goodsList[i];
+        if (good.lineAttribute * 1 === LineAttributeType.被折扣行) {
+            const sum: IGood = { ...good, $index: idGenerator(), lineAttribute: LineAttributeType.正常, discountGroup: undefined };
+            const zk = goodsList[i + 1];
+
+            sum.lineAmountExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).subtract(bignumber(Math.abs(zk.lineAmountExcludeTax || 0))).done().toNumber();
+            sum.lineAmountIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).subtract(bignumber(Math.abs(zk.lineAmountIncludeTax || 0))).done().toNumber();
+            sum.quantity = good.quantity;
+            if (sum.quantity) {
+                sum.priceExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).divide(bignumber(good.quantity)).done().toNumber();
+                sum.priceIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).divide(bignumber(good.quantity)).done().toNumber();
+            }
+
+            goodsList.splice(i, 2, sum);
+        }
+    }
+    state.goodsListState.goodsList = goodsList;
+}

package/src/Invoice/InvoiceController/index.ts

@@ -12,7 +12,9 @@ import addGood from './fns/addGood';
 import saveEditGood from './fns/saveEditGood';
 import getGoodsSearch from './fns/getGoodsSearch';
 import mergeDetails from './fns/mergeDetails';
-
+import mergeDiscount from './fns/mergeDiscount';
+import importGoodsDrawer from './fns/importGoodsDrawer';
+0
 export { default as InvoiceControllerState } from './InvoiceControllerState';
 export { default as IGood } from './InvoiceControllerState/GoodsListState/IGood';
 export { default as LineAttributeType } from './InvoiceControllerState/GoodsListState/LineAttributeType';
@@ -52,12 +54,18 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 全单合并明细 */
   mergeDetails = this.pipeline<any>(mergeDetails);
 
+  /** 全单合并折扣 */
+  mergeDiscount = this.pipeline<any>(mergeDiscount);
+
   /** 给一组货物添加折扣行 */
   addGoodDiscount = this.pipeline(addGoodDiscount);
 
   /** 给一组货物添加折扣行 */
   addGoodDiscountV2 = this.pipeline(addGoodDiscountV2);
 
+  /** 导入商品 */
+  importGoodsDrawer = this.pipeline(importGoodsDrawer);
+
   /** 获取 商品 列表 */
   getGoodsList?: (option?: IGetGoodsListOption | undefined) => Promise<any>;
 

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/ItemNameInput/index.tsx

@@ -2,11 +2,11 @@
 import { Input } from 'kts-components-antd-x3';
 import React, { ChangeEvent } from 'react';
 import { AutoComplete } from 'kts-xui';
-import { countAmountIncludeTax } from '../../../../../../../tools/calculate'
+// import { countAmountIncludeTax } from '../../../../../../../tools/calculate'
 import { IGood, Invoice } from '../../../../../../../..';
 import './index.less';
-import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../autoFillFn';
-import evaluate from '../../../../../../../tools/evaluate';
+// import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../autoFillFn';
+// import evaluate from '../../../../../../../tools/evaluate';
 
 export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string, shorthand?: string }) {
 
@@ -37,60 +37,60 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
         // good && controller.state.goodsListState.form?.setFieldsValue(removeNullUndefined(good));
 
         const record = options.filter(e => e.itemName === itemName)[0] as any;
-        debugger;
         if (!record) return;
-        controller.run(async s => {
-            Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
-
-            // 没用 被编辑的货物 和 form 就退出
-            if (!s.goodsListState.editGood || !s.goodsListState.form) return;
-
-            // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
-            record.quantity = undefined;
-            record.lineAmountExcludeTax = undefined;
-            record.lineAmountIncludeTax = undefined;
-
-            // 中间数据
-            const between = { ...record };
-            between.itemName = record.itemName;
-            between.itemNameOther = record.itemName;
-
-            // 设置编辑货物
-            const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
-
-            if (editGood.taxRate) {
-                editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
-            }
-
-            if (`${editGood.priceIncludeTax}` === '0') {
-                editGood.priceIncludeTax = undefined;
-                editGood.priceExcludeTax = undefined;
-            } else {
-                editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits) as number;
-            }
-
-            if (editGood.quantity && editGood.priceIncludeTax) {
-                editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
-            }
-
-            // 导入FORM里
-            if (s.goodsListState.isMyShow) {
-                s.goodsListState.form.setFieldsValue({
-                    ...editGood,
-                    itemName: editGood.itemNameSelf,
-                    itemModelName: editGood.itemModelNameSelf,
-                });
-            } else {
-                s.goodsListState.form.setFieldsValue({
-                    ...editGood,
-                });
-            }
-
-            s.goodsListState.importGoods.isVisibleDrawer = false;
-            s.goodsListState.isTaxIncluded
-                ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
-                : await updateUnitPriceTax(controller, s.goodsListState.form, record)
-        })
+        controller.importGoodsDrawer(record);
+        // controller.run(async s => {
+        //     Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
+
+        //     // 没用 被编辑的货物 和 form 就退出
+        //     if (!s.goodsListState.editGood || !s.goodsListState.form) return;
+
+        //     // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+        //     record.quantity = undefined;
+        //     record.lineAmountExcludeTax = undefined;
+        //     record.lineAmountIncludeTax = undefined;
+
+        //     // 中间数据
+        //     const between = { ...record };
+        //     between.itemName = record.itemName;
+        //     between.itemNameOther = record.itemName;
+
+        //     // 设置编辑货物
+        //     const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
+
+        //     if (editGood.taxRate) {
+        //         editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
+        //     }
+
+        //     if (`${editGood.priceIncludeTax}` === '0') {
+        //         editGood.priceIncludeTax = undefined;
+        //         editGood.priceExcludeTax = undefined;
+        //     } else {
+        //         editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits) as number;
+        //     }
+
+        //     if (editGood.quantity && editGood.priceIncludeTax) {
+        //         editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
+        //     }
+
+        //     // 导入FORM里
+        //     if (s.goodsListState.isMyShow) {
+        //         s.goodsListState.form.setFieldsValue({
+        //             ...editGood,
+        //             itemName: editGood.itemNameSelf,
+        //             itemModelName: editGood.itemModelNameSelf,
+        //         });
+        //     } else {
+        //         s.goodsListState.form.setFieldsValue({
+        //             ...editGood,
+        //         });
+        //     }
+
+        //     s.goodsListState.importGoods.isVisibleDrawer = false;
+        //     s.goodsListState.isTaxIncluded
+        //         ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
+        //         : await updateUnitPriceTax(controller, s.goodsListState.form, record)
+        // })
     }, [options, controller])
 
     return (
@@ -117,9 +117,9 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
 // }
 
 /** 货物单价，不含税 */
-const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) => {
-    if ((!s.taxRate && s.taxRate !== 0) || (!record.priceIncludeTax && record.priceIncludeTax !== 0)) return;
+// const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) => {
+//     if ((!s.taxRate && s.taxRate !== 0) || (!record.priceIncludeTax && record.priceIncludeTax !== 0)) return;
 
-    // 单价(含税)/(1+税率) = 单价(不含税)
-    return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`), calculatingDigits);
-};
+//     // 单价(含税)/(1+税率) = 单价(不含税)
+//     return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`), calculatingDigits);
+// };

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

@@ -28,6 +28,7 @@ import useEndowCodeButton from './ui/BulkMenu/hooks/useEndowCodeButton';
 import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
 import useAddDiscountRowButton from './ui/BulkMenu/hooks/useAddDiscountRowButton';
 import useMergeDetails from './ui/BulkMenu/hooks/useMergeDetails';
+import useMergeDiscount from './ui/BulkMenu/hooks/useMergeDiscount';
 
 export interface IGoodsListProps {
   /** 扩展部分 */
@@ -87,6 +88,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   /** 全单合并明细 */
   const mergeDetails = useMergeDetails()
 
+  /** 全单合并折扣 */
+  const mergeDiscount = useMergeDiscount()
+
   /** 清空自动赋码缓存 */
   React.useEffect(() => {
     controller.run(async s => { s.goodsListState.endowCode.cache = {} });
@@ -139,6 +143,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
           {/* 全单合并明细 */}
           {mergeDetails.button}
 
+          {/* 全单合并折扣 */}
+          {mergeDiscount.button}
+
           {/* 添加折扣行 */}
           {addDiscountRowButton.drawer}
 

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useMergeDetails/index.tsx

@@ -16,7 +16,7 @@ export default function useMergeDetails() {
         await controller.saveEditGood();
         await controller.wait();
         await controller.mergeDetails();
-    }, [])
+    }, [controller])
 
     const button = React.useMemo(() => {
         if (!isMergeDetails) return <></>;

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useMergeDiscount/index.tsx

@@ -0,0 +1,37 @@
+
+import React from "react"
+import { Button } from "kts-components-antd-x3"
+import Invoice from '../../../../../../..'
+
+/** 全单合并折扣 */
+export default function useMergeDiscount() {
+
+    const controller = Invoice.useInvoiceController();
+
+    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
+
+    const isMergeDiscount = controller.useMemo(s => s.goodsListState.isMergeDiscount, []);
+
+    const onClick = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        await controller.mergeDiscount();
+    }, [controller])
+
+    const button = React.useMemo(() => {
+        if (!isMergeDiscount) return <></>;
+        return (
+            <Button
+                onClick={onClick}
+                disabled={goodsList.length <= 1}
+            >
+                合并折扣
+            </Button>
+        )
+    }, [goodsList.length])
+
+    return {
+        /** 按钮 */
+        button,
+    }
+}

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/ItemNameInput/index.tsx

@@ -1,24 +1,50 @@
 
-import { Input } from 'kts-xui';
+import { AutoComplete, Input } from 'kts-xui';
 import React, { ChangeEvent } from 'react';
+import { IGood, Invoice } from '../../../../../../../..';
 import './index.less';
 
-export default function ItemNameInput(props: { 
-    onChange?: (e: ChangeEvent<HTMLInputElement>) => void, 
-    suffix?: React.ReactNode, 
-    value?: string, 
-    shorthand?: string 
+export default function ItemNameInput(props: {
+    onChange?: (e: ChangeEvent<HTMLInputElement>) => void,
+    suffix?: React.ReactNode,
+    value?: string,
+    shorthand?: string
 }) {
 
+    const controller = Invoice.useInvoiceController();
+
+    const autoComplete = controller.useMemo(s => s.autoComplete, [])
+
+    const [options, setOptions] = React.useState<IGood[]>([])
+
     const onChange = React.useCallback((e: ChangeEvent<HTMLInputElement>) => {
         const event = { ...e };
         props.onChange && props.onChange(event);
     }, [])
 
+    const onChangeAutoComplete = React.useCallback(itemName => {
+        const record = options.filter(e => e.itemName === itemName)[0] as any;
+        if (!record) return;
+        controller.importGoodsDrawer(record);
+    }, [options, controller])
+
+    const onSearch = React.useCallback(async (searchText: string) => {
+        try {
+            if (autoComplete.onItemNameSearch) {
+                setOptions(await autoComplete.onItemNameSearch(searchText));
+            }
+        } catch (error) {
+            setOptions([]);
+            throw error;
+        }
+    }, [autoComplete.onItemNameSearch])
+
     return (
         <div className='kts-invoice-operate-goods-list-itemName-input'>
             {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
-            <Input style={{ height: '100%' }} value={props.value} onChange={onChange} suffix={props.suffix} />
+            <AutoComplete onSearch={onSearch} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
+                <Input style={{ height: '100%' }} value={props.value} onChange={onChange} suffix={props.suffix} />
+            </AutoComplete>
         </div>
     )
 }