kts-component-invoice-operate 3.2.98 → 3.2.99

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

@@ -1,99 +1,91 @@
-
-import { Input } from 'kts-components-antd-x3';
-import React, { ChangeEvent } from 'react';
-import { AutoComplete } from 'kts-xui';
-// import { countAmountIncludeTax } from '../../../../../../../tools/calculate'
-import { IGood, Invoice } from '../../../../../../../..';
-import './index.less';
-// import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../autoFillFn';
-// import evaluate from '../../../../../../../tools/evaluate';
-
-export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string, editGood?: any, shorthand?: string }) {
-
-    const controller = Invoice.useInvoiceController();
-
-    const autoComplete = controller.useMemo(s => s.autoComplete, [])
-
-    const [options, setOptions] = React.useState<IGood[]>([]);
-
-    const [selectLine, setSelectLine] = React.useState<any>(null);
-
-    const onChange = React.useCallback((e: ChangeEvent<HTMLInputElement>) => {
-        const event = { ...e };
-        props.onChange && props.onChange(event);
-    }, [])
-
-    const onBlur = React.useCallback(async (searchText: any) => {
-      try {
-        if (autoComplete.onItemNameBlur) {
-          if(!selectLine?.shorthand) {
-            const taxCategoryData: any = await autoComplete.onItemNameBlur(searchText);
-            if(taxCategoryData && taxCategoryData[0]) {
-              const params = {
-                ...props.editGood,
-                taxClassificationCode: taxCategoryData[0].taxCategoryCode,
-                shorthand: taxCategoryData[0].shorthand
-              }
-              controller.importGoodsDrawer(params);
-            }
-          }
-          setSelectLine(null);
-        }
-      } catch (error) {
-        throw error;
-      }
-    }, [autoComplete.onItemNameBlur, selectLine, props.editGood])
-
-    const onSearch = React.useCallback(async (searchText: string) => {
-        try {
-            if (autoComplete.onItemNameSearch) {
-                setOptions(await autoComplete.onItemNameSearch(searchText));
-            }
-        } catch (error) {
-            setOptions([])
-            throw error;
-        }
-    }, [autoComplete.onItemNameSearch])
-
-    const onChangeAutoComplete = React.useCallback(async itemName => {
-        const record = options.filter(e => e.itemName === itemName)[0] as any;
-        if (!record) return;
-
-        await controller.setEditGood({ itemName: record.itemName });
-
-        setSelectLine(record[0]);
-        controller.importGoodsDrawer(record);
-
-        setOptions([]);
-    }, [options, controller])
-
-    return (
-        <div className='kts-invoice-operate-goods-list-itemName-input'>
-            {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
-            <AutoComplete onSearch={onSearch} value={props.value} options={options.map(e => ({ value: e.itemName }))} onSelect={onChangeAutoComplete} >
-                <Input style={{ height: '100%', border: 'none' }} onChange={onChange} onBlur={onBlur} />
-            </AutoComplete>
-        </div>
-    )
-}
-
-
-// function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
-//     const filteredObj: Record<string, any> = {};
-
-//     for (const key in obj) {
-//         if (obj[key] !== null && obj[key] !== undefined) {
-//             filteredObj[key] = obj[key];
-//         }
-//     }
-
-//     return filteredObj;
-// }
-
-/** 货物单价，不含税 */
-// 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);
-// };
+
+import { Input } from 'kts-components-antd-x3';
+import { v4 as uuid } from 'uuid';
+import React, { ChangeEvent } from 'react';
+import { AutoComplete } from 'kts-xui';
+import { IGood, Invoice } from '../../../../../../../..';
+import './index.less';
+
+export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string, editGood?: any, shorthand?: string }) {
+
+    const controller = Invoice.useInvoiceController();
+
+    const autoComplete = controller.useMemo(s => s.autoComplete, [])
+
+    const [options, setOptions] = React.useState<IGood[]>([]);
+
+    const [selectLine, setSelectLine] = React.useState<any>(null);
+
+    const [value, setValue] = React.useState(props.value);
+
+    const onChange = React.useCallback((e: ChangeEvent<HTMLInputElement>) => {
+        const event = { ...e };
+        props.onChange && props.onChange(event);
+    }, [])
+
+    const onBlur = React.useCallback(async (searchText: any) => {
+      try {
+        if (autoComplete.onItemNameBlur) {
+          if(!selectLine?.shorthand) {
+            const taxCategoryData: any = await autoComplete.onItemNameBlur(searchText);
+            if(taxCategoryData && taxCategoryData[0]) {
+              const params = {
+                ...props.editGood,
+                taxClassificationCode: taxCategoryData[0].taxCategoryCode,
+                shorthand: taxCategoryData[0].shorthand
+              }
+              controller.importGoodsDrawer(params);
+            }
+          }
+          setSelectLine(null);
+        }
+      } catch (error) {
+        throw error;
+      }
+    }, [autoComplete.onItemNameBlur, selectLine, props.editGood])
+
+    const onSearch = React.useCallback(async (searchText: string) => {
+        try {
+            if (autoComplete.onItemNameSearch && searchText) {
+                const list = [...await autoComplete.onItemNameSearch(searchText)].map(e => ({ ...e, $index: uuid() }));
+                setOptions(list);
+            } else {
+                setOptions([]);
+            }
+        } catch (error) {
+            setOptions([])
+            throw error;
+        }
+    }, [autoComplete.onItemNameSearch])
+
+    const onChangeAutoComplete = React.useCallback(async (_, i) => {
+        const record = options.filter(e => e.$index === i.value)[0] as any;
+        if (!record) return;
+
+        await controller.setEditGood({ itemName: record.itemName });
+
+        await controller.importGoodsDrawer(record);
+
+        setValue(record.itemName);
+        setSelectLine(record[0]);
+        controller.importGoodsDrawer(record);
+
+        setOptions([]);
+    }, [options, controller])
+
+    React.useEffect(() => { setValue(props.value) }, [props.value])
+
+    return (
+        <div className='kts-invoice-operate-goods-list-itemName-input'>
+            {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
+            <AutoComplete
+                onSearch={onSearch}
+                value={value}
+                options={options.map(e => ({ value: e.$index, label: e.itemName }))}
+                onSelect={onChangeAutoComplete}
+            >
+                <Input style={{ height: '100%', border: 'none' }} onChange={onChange} onBlur={onBlur} />
+            </AutoComplete>
+        </div>
+    )
+}

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

@@ -1,30 +1,30 @@
-import React from 'react';
-import { Button, message } from 'kts-components-antd-x3';
-import Invoice from '../../../../../../';
-import { IGood } from '../../../../../../InvoiceController';
-import LineAttributeType from '../../../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
-
-export default (props: { goods: IGood }) => {
-  const { goods } = props;
-
-  const controller = Invoice.useInvoiceController();
-
-  const editGood = controller.useMemo((s) => s.goodsListState.editGood, []);
-
-  const onClick = React.useCallback(() => {
-    if (editGood) {
-      message.error({
-        content: '你正在编辑一个货物',
-        key: '你正在编辑一个货物',
-      });
-      return;
-    }
-    controller.setEditGood(goods);
-  }, [controller, goods, editGood]);
-
-  if (goods.lineAttribute !== LineAttributeType.正常) {
-    return <></>;
-  } else {
-    return <Button type="link" icon="edit" onClick={onClick} />;
-  }
-};
+import React from 'react';
+import { Button, message } from 'kts-components-antd-x3';
+import Invoice from '../../../../../../';
+import { IGood } from '../../../../../../InvoiceController';
+import LineAttributeType from '../../../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
+
+export default (props: { goods: IGood }) => {
+  const { goods } = props;
+
+  const controller = Invoice.useInvoiceController();
+
+  const editGood = controller.useMemo((s) => s.goodsListState.editGood, []);
+
+  const onClick = React.useCallback(() => {
+    if (editGood) {
+      message.error({
+        content: '你正在编辑一个货物',
+        key: '你正在编辑一个货物',
+      });
+      return;
+    }
+    controller.setEditGood(goods);
+  }, [controller, goods, editGood]);
+
+  if (goods.lineAttribute !== LineAttributeType.正常) {
+    return <></>;
+  } else {
+    return <Button type="link" icon="edit" onClick={onClick} />;
+  }
+};

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

@@ -1,43 +1,43 @@
-/** 添加商品对照 */
-
-import React from 'react';
-import { Menu, message, Typography } from 'kts-components-antd-x3';
-import { IGood, LineAttributeType } from '../../../../../../../../InvoiceController';
-import Invoice from '../../../../../../../../';
-
-const { Text } = Typography;
-
-export default (goods: IGood) => {
-
-    const controller = Invoice.useInvoiceController();
-
-    const productComparison = controller.useMemo(s => s.goodsListState.productComparison, []);
-
-    const onClick = React.useCallback(async () => {
-        await controller.saveEditGood();
-        await controller.wait();
-        await controller.run(async s => {
-            if (s.goodsListState.form) {
-                const err: any = s.goodsListState.form.getFieldsError();
-                for (let key in err) {
-                    if (!err[key]) continue;
-                    message.error(err[key][0]);
-                    return;
-                }
-            }
-            s.goodsListState.addComparisonIndex = goods.$index;
-        })
-    }, [controller, goods.$index]);
-
-    if (!(goods.lineAttribute !== LineAttributeType.折扣行)) {
-        return undefined;
-    }
-
-    return React.useMemo(() => {
-        if (productComparison.onComply) {
-            return <Menu.Item key="delItem" onClick={onClick}><Text strong>添加商品对照</Text></Menu.Item>
-        } else {
-            return <></>
-        }
-    }, [onClick, productComparison])
-};
+/** 添加商品对照 */
+
+import React from 'react';
+import { Menu, message, Typography } from 'kts-components-antd-x3';
+import { IGood, LineAttributeType } from '../../../../../../../../InvoiceController';
+import Invoice from '../../../../../../../../';
+
+const { Text } = Typography;
+
+export default (goods: IGood) => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const productComparison = controller.useMemo(s => s.goodsListState.productComparison, []);
+
+    const onClick = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        await controller.run(async s => {
+            if (s.goodsListState.form) {
+                const err: any = s.goodsListState.form.getFieldsError();
+                for (let key in err) {
+                    if (!err[key]) continue;
+                    message.error(err[key][0]);
+                    return;
+                }
+            }
+            s.goodsListState.addComparisonIndex = goods.$index;
+        })
+    }, [controller, goods.$index]);
+
+    if (!(goods.lineAttribute !== LineAttributeType.折扣行)) {
+        return undefined;
+    }
+
+    return React.useMemo(() => {
+        if (productComparison.onComply) {
+            return <Menu.Item key="delItem" onClick={onClick}><Text strong>添加商品对照</Text></Menu.Item>
+        } else {
+            return <></>
+        }
+    }, [onClick, productComparison])
+};

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

@@ -1,119 +1,119 @@
-
-import React from 'react';
-import { Typography } from 'kts-components-antd-x3';
-import { message } from 'kts-xui';
-import InvoiceController, { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
-import Invoice from '../../../../../../../../..';
-
-const { Text } = Typography;
-
-export default (goods: IGood) => {
-
-    const controller = Invoice.useInvoiceController();
-
-    const model = controller.useMemo(s => s.model, [])
-
-    /** 是否能添加折扣行 */
-    const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
-
-    /** 点击了 添加折扣行 按钮 */
-    const onClick = React.useCallback(async e => {
-        try {
-            e.stopPropagation()
-            await controller.wait();
-            await controller.saveEditGood();
-            await checkDiscount(controller);
-            await checkFieldsError(controller, goods);
-            await checkDutyFree(controller, goods);
-            await checkZeroAmount(controller, goods);
-            await controller.run(async s => {
-                s.goodsListState.discountGoodIndex = [goods.$index];
-            })
-        } catch (error: any) {
-            console.error(error);
-        }
-    }, [controller, goods.$index]);
-
-    if (goods.lineAttribute !== LineAttributeType.正常) {
-        return undefined
-    }
-
-    if (!(model !== 'prefab')) {
-        return undefined;
-    }
-
-    if (!(isAddDiscount !== false)) {
-        return undefined
-    }
-
-    if (goods.lineAttribute !== LineAttributeType.正常) {
-        return undefined
-    }
-
-    return {
-        key: 'addDiscount',
-        title: '折扣',
-        onClick,
-    }
-};
-
-/**
- * 有折让行，不可以添加折扣
- * @param controller 组件控制器
- */
-async function checkDiscount(controller: InvoiceController) {
-    const { goodsList } = controller.state.goodsListState;
-    goodsList.forEach(e => {
-        if (e.lineAttribute === LineAttributeType.折让行) {
-            const content = '有折让行，不可以添加折扣';
-            message.error({ content, key: content });
-            throw new Error(content)
-        }
-    })
-}
-
-/**
- * 零税率需要设置免税类型，请在赋码中设置！
- * @param controller 组件控制器
- * @param goods 当前行数据
- */
-async function checkDutyFree(controller: InvoiceController, goods: IGood) {
-    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
-    if (goods.taxRate === 0 && controller.state.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType) {
-        const content = '零税率需要设置免税类型，请在赋码中设置！'
-        message.error({ content, key: content });
-        throw new Error(content)
-    }
-}
-
-/** 
- * 金额为0不能添加折扣行 
- * @param controller 组件控制器
- * @param goods 当前行数据
- **/
-async function checkZeroAmount(controller: InvoiceController, goods: IGood) {
-    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
-    if (`${goods.lineAmountIncludeTax}` === '0') {
-        const content = '金额为0不能添加折扣行'
-        message.error({ content, key: content });
-        throw new Error(content)
-    }
-}
-
-/** 
- * 校验当前的表单 
- * @param controller 组件控制器
- * @param goods 当前行数据
- * */
-async function checkFieldsError(controller: InvoiceController, goods: IGood) {
-    const s = controller.state;
-    if (s.goodsListState.form && s.goodsListState.editGood?.$index === goods?.$index) {
-        const err: any = s.goodsListState.form.getFieldsError();
-        for (let key in err) {
-            if (!err[key]) continue;
-            const content = err[key][0];
-            message.error({ content, key: content });
-            throw new Error(content)
-        }
-    }
+
+import React from 'react';
+import { Typography } from 'kts-components-antd-x3';
+import { message } from 'kts-xui';
+import InvoiceController, { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
+import Invoice from '../../../../../../../../..';
+
+const { Text } = Typography;
+
+export default (goods: IGood) => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const model = controller.useMemo(s => s.model, [])
+
+    /** 是否能添加折扣行 */
+    const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
+
+    /** 点击了 添加折扣行 按钮 */
+    const onClick = React.useCallback(async e => {
+        try {
+            e.stopPropagation()
+            await controller.wait();
+            await controller.saveEditGood();
+            await checkDiscount(controller);
+            await checkFieldsError(controller, goods);
+            await checkDutyFree(controller, goods);
+            await checkZeroAmount(controller, goods);
+            await controller.run(async s => {
+                s.goodsListState.discountGoodIndex = [goods.$index];
+            })
+        } catch (error: any) {
+            console.error(error);
+        }
+    }, [controller, goods.$index]);
+
+    if (goods.lineAttribute !== LineAttributeType.正常) {
+        return undefined
+    }
+
+    if (!(model !== 'prefab')) {
+        return undefined;
+    }
+
+    if (!(isAddDiscount !== false)) {
+        return undefined
+    }
+
+    if (goods.lineAttribute !== LineAttributeType.正常) {
+        return undefined
+    }
+
+    return {
+        key: 'addDiscount',
+        title: '折扣',
+        onClick,
+    }
+};
+
+/**
+ * 有折让行，不可以添加折扣
+ * @param controller 组件控制器
+ */
+async function checkDiscount(controller: InvoiceController) {
+    const { goodsList } = controller.state.goodsListState;
+    goodsList.forEach(e => {
+        if (e.lineAttribute === LineAttributeType.折让行) {
+            const content = '有折让行，不可以添加折扣';
+            message.error({ content, key: content });
+            throw new Error(content)
+        }
+    })
+}
+
+/**
+ * 零税率需要设置免税类型，请在赋码中设置！
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ */
+async function checkDutyFree(controller: InvoiceController, goods: IGood) {
+    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
+    if (goods.taxRate === 0 && controller.state.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType) {
+        const content = '零税率需要设置免税类型，请在赋码中设置！'
+        message.error({ content, key: content });
+        throw new Error(content)
+    }
+}
+
+/** 
+ * 金额为0不能添加折扣行 
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ **/
+async function checkZeroAmount(controller: InvoiceController, goods: IGood) {
+    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
+    if (`${goods.lineAmountIncludeTax}` === '0') {
+        const content = '金额为0不能添加折扣行'
+        message.error({ content, key: content });
+        throw new Error(content)
+    }
+}
+
+/** 
+ * 校验当前的表单 
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ * */
+async function checkFieldsError(controller: InvoiceController, goods: IGood) {
+    const s = controller.state;
+    if (s.goodsListState.form && s.goodsListState.editGood?.$index === goods?.$index) {
+        const err: any = s.goodsListState.form.getFieldsError();
+        for (let key in err) {
+            if (!err[key]) continue;
+            const content = err[key][0];
+            message.error({ content, key: content });
+            throw new Error(content)
+        }
+    }
 }

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

@@ -1,41 +1,41 @@
-import React from 'react';
-// import { Menu, Typography } from 'kts-components-antd-x3';
-import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
-import Invoice from '../../../../../../../../..';
-
-// const { Text } = Typography;
-
-export default (goods: IGood) => {
-
-    const controller = Invoice.useInvoiceController();
-
-    const model = controller.useMemo(s => s.model, [])
-
-    const isRemRow = controller.useMemo(s => s.goodsListState.isRemRow, [])
-
-    const onClick = React.useCallback(() => {
-        controller.delGood(goods.$index);
-    }, [controller, goods.$index]);
-
-    if (goods.lineAttribute === LineAttributeType.被折扣行) {
-        return undefined;
-    }
-
-    if(isRemRow === false) {
-        return undefined;
-    }
-
-    if (!(model !== 'prefab')) {
-        return undefined;
-    }
-
-    return {
-        key:'delItem',
-        title:'删除',
-        onClick,
-    }
-
-    // return React.useMemo(() => {
-    //     return <Menu.Item key="delItem" onClick={onClick}><Text strong type="danger">删除</Text></Menu.Item>
-    // }, [onClick])
-};
+import React from 'react';
+// import { Menu, Typography } from 'kts-components-antd-x3';
+import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
+import Invoice from '../../../../../../../../..';
+
+// const { Text } = Typography;
+
+export default (goods: IGood) => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const model = controller.useMemo(s => s.model, [])
+
+    const isRemRow = controller.useMemo(s => s.goodsListState.isRemRow, [])
+
+    const onClick = React.useCallback(() => {
+        controller.delGood(goods.$index);
+    }, [controller, goods.$index]);
+
+    if (goods.lineAttribute === LineAttributeType.被折扣行) {
+        return undefined;
+    }
+
+    if(isRemRow === false) {
+        return undefined;
+    }
+
+    if (!(model !== 'prefab')) {
+        return undefined;
+    }
+
+    return {
+        key:'delItem',
+        title:'删除',
+        onClick,
+    }
+
+    // return React.useMemo(() => {
+    //     return <Menu.Item key="delItem" onClick={onClick}><Text strong type="danger">删除</Text></Menu.Item>
+    // }, [onClick])
+};