kts-component-invoice-operate 3.2.53 → 3.2.55

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

@@ -1,130 +1,130 @@
-
-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, shorthand?: string }) {
-
-    const controller = Invoice.useInvoiceController();
-
-    const autoComplete = controller.useMemo(s => s.autoComplete, [])
-
-    const editGood = controller.useMemo((e) => e.goodsListState.editGood, []);
-
-    const [options, setOptions] = React.useState<IGood[]>([])
-
-    const onChange = React.useCallback((e: ChangeEvent<HTMLInputElement>) => {
-        const event = { ...e };
-        props.onChange && props.onChange(event);
-    }, [])
-
-    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 good = options.filter(e=>e.itemName === itemName)[0];
-        // good && controller.state.goodsListState.form?.setFieldsValue(removeNullUndefined(good));
-
-        const record = options.filter(e => e.itemName === itemName)[0] as any;
-        if (!record) return;
-
-        await controller.setEditGood({ itemName: record.itemName });
-
-        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 (
-        <div className='kts-invoice-operate-goods-list-itemName-input'>
-            {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
-            <AutoComplete onSearch={onSearch} defaultValue={props.value} value={editGood?.itemName} options={options.map(e => ({ value: e.itemName }))} onSelect={onChangeAutoComplete} >
-                <Input style={{ height: '100%', border: 'none' }} value={props.value} onChange={onChange} />
-            </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 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, shorthand?: string }) {
+
+    const controller = Invoice.useInvoiceController();
+
+    const autoComplete = controller.useMemo(s => s.autoComplete, [])
+
+    const editGood = controller.useMemo((e) => e.goodsListState.editGood, []);
+
+    const [options, setOptions] = React.useState<IGood[]>([])
+
+    const onChange = React.useCallback((e: ChangeEvent<HTMLInputElement>) => {
+        const event = { ...e };
+        props.onChange && props.onChange(event);
+    }, [])
+
+    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 good = options.filter(e=>e.itemName === itemName)[0];
+        // good && controller.state.goodsListState.form?.setFieldsValue(removeNullUndefined(good));
+
+        const record = options.filter(e => e.itemName === itemName)[0] as any;
+        if (!record) return;
+
+        await controller.setEditGood({ itemName: record.itemName });
+
+        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 (
+        <div className='kts-invoice-operate-goods-list-itemName-input'>
+            {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
+            <AutoComplete onSearch={onSearch} defaultValue={props.value} value={editGood?.itemName} options={options.map(e => ({ value: e.itemName }))} onSelect={onChangeAutoComplete} >
+                <Input style={{ height: '100%', border: 'none' }} value={props.value} onChange={onChange} />
+            </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);
+// };

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,76 +1,76 @@
-
-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 model = controller.useMemo(s => s.model, [])
-
-    /** 是否能添加折扣行 */
-    const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
-
-    /** 点击了 添加折扣行 按钮 */
-    const onClick = React.useCallback(async e => {
-        e.stopPropagation()
-        await controller.wait();
-        await controller.saveEditGood();
-        await controller.run(async s => {
-            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;
-                    message.error(err[key][0]);
-                    return;
-                }
-            }
-            goods = s.goodsListState.goodsMap.get(goods.$index) as any;
-            if (goods.taxRate === 0 && s.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType) {
-                message.error({ content: '零税率需要设置免税类型，请在赋码中设置！', key: '零税率需要设置免税类型，请在赋码中设置！' });
-                return;
-            }
-            if (`${goods.lineAmountIncludeTax}` === '0') {
-                message.error({ content: '金额为0不能添加折扣行', key: '金额为0不能添加折扣行' });
-                return;
-            }
-            s.goodsListState.discountGoodIndex = [goods.$index];
-        })
-    }, [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,
-    }
-
-    // return React.useMemo(() => {
-    //     if (goods.lineAttribute !== LineAttributeType.正常) {
-    //         return undefined
-    //     }
-
-    //     return (
-    //         <Menu.Item key="addDiscount" onClick={onClick}><Text strong>折扣</Text></Menu.Item>
-    //     );
-    // }, [onClick, goods.lineAttribute]);
-};
+
+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 model = controller.useMemo(s => s.model, [])
+
+    /** 是否能添加折扣行 */
+    const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
+
+    /** 点击了 添加折扣行 按钮 */
+    const onClick = React.useCallback(async e => {
+        e.stopPropagation()
+        await controller.wait();
+        await controller.saveEditGood();
+        await controller.run(async s => {
+            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;
+                    message.error(err[key][0]);
+                    return;
+                }
+            }
+            goods = s.goodsListState.goodsMap.get(goods.$index) as any;
+            if (goods.taxRate === 0 && s.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType) {
+                message.error({ content: '零税率需要设置免税类型，请在赋码中设置！', key: '零税率需要设置免税类型，请在赋码中设置！' });
+                return;
+            }
+            if (`${goods.lineAmountIncludeTax}` === '0') {
+                message.error({ content: '金额为0不能添加折扣行', key: '金额为0不能添加折扣行' });
+                return;
+            }
+            s.goodsListState.discountGoodIndex = [goods.$index];
+        })
+    }, [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,
+    }
+
+    // return React.useMemo(() => {
+    //     if (goods.lineAttribute !== LineAttributeType.正常) {
+    //         return undefined
+    //     }
+
+    //     return (
+    //         <Menu.Item key="addDiscount" onClick={onClick}><Text strong>折扣</Text></Menu.Item>
+    //     );
+    // }, [onClick, goods.lineAttribute]);
+};

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])
+};