kts-component-invoice-operate 3.2.70 → 3.2.71-2

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

@@ -1,110 +1,110 @@
-
-import React from "react"
-import { Button, message } from "kts-components-antd-x3"
-import { chain, bignumber } from 'mathjs';
-import Invoice from '../../../../../../..'
-import { LineAttributeType } from "../../../../../../../InvoiceController";
-
-/** 销售折让 */
-export default function useSalesDiscount() {
-
-    const controller = Invoice.useInvoiceController();
-
-    const selectedGoodIndex = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
-
-    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
-
-    const isSalesDiscount = controller.useMemo(s => s.goodsListState.isSalesDiscount, []);
-
-    const onClick = React.useCallback(async () => {
-        const selectedGood = selectedGoodIndex.map(e => goodsMap.get(e));
-
-        if (selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折扣行 || e?.lineAttribute === LineAttributeType.被折扣行).length > 0) {
-            const content = '不能选择折扣行和被折扣行';
-            message.error({ content, key: content });
-            return;
-        }
-
-        /** 折让行 */
-        const concession = selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折让行)[0];
-        if (!concession) {
-            const content = '未选择折让行';
-            message.error({ content, key: content })
-            return;
-        }
-
-        /** 准备添加折扣的货物列表 */
-        const discountGood = selectedGood.filter(e => e?.lineAttribute !== LineAttributeType.折让行);
-
-        /** 折扣总金额 */
-        const totalDiscoline = chain(bignumber(-1 * (concession.lineAmountIncludeTax || 0)));
-
-        let discolinesSum = chain(bignumber(0));
-
-        /** 总金额 */
-        const totalAmount = (() => {
-            let sum = 0;
-            discountGood.forEach(e => { sum += e?.lineAmountIncludeTax ?? 0 });
-            return sum;
-        })()
-
-        // 每行的折扣金额
-        const discolines: number[] = discountGood.map((e, i) => {
-            // 折扣金额占比
-            const share = chain(bignumber(e?.lineAmountIncludeTax ?? 0))
-                .divide(bignumber(totalAmount));
-
-            // 折扣金额
-            const value = totalDiscoline
-                .multiply(share.done())
-
-                .multiply(bignumber(100))
-                .round()
-                .divide(bignumber(100))
-
-                .done();
-
-            discolinesSum = discolinesSum.add(value);
-            return value.toNumber();
-        });
-
-        // 剩余折扣金额
-        let surplus = totalDiscoline.subtract(discolinesSum.done());
-
-        // 补充剩余折扣金
-        for (let i = 0; i < discolines.length; i++) {
-            if (surplus.smaller(0.01).done()) break;
-            discolines[i] = chain(bignumber(discolines[i])).add(bignumber(0.01)).done().toNumber();
-            surplus = surplus.subtract(bignumber(0.01));
-        }
-
-        // 清楚折让行
-        await controller.run(async s => { s.goodsListState.goodsList = s.goodsListState.goodsList.filter(e => e.$index !== concession.$index) })
-        await controller.run(async s => { s.goodsListState.selectedGoodIndex = [] });
-
-        // 给一组货物添加折扣行
-        await controller.addGoodDiscountV2(discolines.map((e, i) => {
-            return {
-                $index: discountGood[i]?.$index as string,
-                discolineAmountunt: e as number,
-            }
-        }))
-    }, [controller, selectedGoodIndex, goodsMap])
-
-    const button = React.useMemo(() => {
-        if (!isSalesDiscount) return <></>;
-        return (
-            <Button
-                onClick={onClick}
-                disabled={selectedGoodIndex.length <= 1}
-            >
-                销售折让
-            </Button>
-        )
-    }, [selectedGoodIndex.length, isSalesDiscount])
-
-    return {
-        /** 按钮 */
-        button,
-    }
-}
+
+import React from "react"
+import { Button, message } from "kts-components-antd-x3"
+import { chain, bignumber } from 'mathjs';
+import Invoice from '../../../../../../..'
+import { LineAttributeType } from "../../../../../../../InvoiceController";
+
+/** 销售折让 */
+export default function useSalesDiscount() {
+
+    const controller = Invoice.useInvoiceController();
+
+    const selectedGoodIndex = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
+
+    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
+
+    const isSalesDiscount = controller.useMemo(s => s.goodsListState.isSalesDiscount, []);
+
+    const onClick = React.useCallback(async () => {
+        const selectedGood = selectedGoodIndex.map(e => goodsMap.get(e));
+
+        if (selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折扣行 || e?.lineAttribute === LineAttributeType.被折扣行).length > 0) {
+            const content = '不能选择折扣行和被折扣行';
+            message.error({ content, key: content });
+            return;
+        }
+
+        /** 折让行 */
+        const concession = selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折让行)[0];
+        if (!concession) {
+            const content = '未选择折让行';
+            message.error({ content, key: content })
+            return;
+        }
+
+        /** 准备添加折扣的货物列表 */
+        const discountGood = selectedGood.filter(e => e?.lineAttribute !== LineAttributeType.折让行);
+
+        /** 折扣总金额 */
+        const totalDiscoline = chain(bignumber(-1 * (concession.lineAmountIncludeTax || 0)));
+
+        let discolinesSum = chain(bignumber(0));
+
+        /** 总金额 */
+        const totalAmount = (() => {
+            let sum = 0;
+            discountGood.forEach(e => { sum += e?.lineAmountIncludeTax ?? 0 });
+            return sum;
+        })()
+
+        // 每行的折扣金额
+        const discolines: number[] = discountGood.map((e, i) => {
+            // 折扣金额占比
+            const share = chain(bignumber(e?.lineAmountIncludeTax ?? 0))
+                .divide(bignumber(totalAmount));
+
+            // 折扣金额
+            const value = totalDiscoline
+                .multiply(share.done())
+
+                .multiply(bignumber(100))
+                .round()
+                .divide(bignumber(100))
+
+                .done();
+
+            discolinesSum = discolinesSum.add(value);
+            return value.toNumber();
+        });
+
+        // 剩余折扣金额
+        let surplus = totalDiscoline.subtract(discolinesSum.done());
+
+        // 补充剩余折扣金
+        for (let i = 0; i < discolines.length; i++) {
+            if (surplus.smaller(0.01).done()) break;
+            discolines[i] = chain(bignumber(discolines[i])).add(bignumber(0.01)).done().toNumber();
+            surplus = surplus.subtract(bignumber(0.01));
+        }
+
+        // 清楚折让行
+        await controller.run(async s => { s.goodsListState.goodsList = s.goodsListState.goodsList.filter(e => e.$index !== concession.$index) })
+        await controller.run(async s => { s.goodsListState.selectedGoodIndex = [] });
+
+        // 给一组货物添加折扣行
+        await controller.addGoodDiscountV2(discolines.map((e, i) => {
+            return {
+                $index: discountGood[i]?.$index as string,
+                discolineAmountunt: e as number,
+            }
+        }))
+    }, [controller, selectedGoodIndex, goodsMap])
+
+    const button = React.useMemo(() => {
+        if (!isSalesDiscount) return <></>;
+        return (
+            <Button
+                onClick={onClick}
+                disabled={selectedGoodIndex.length <= 1}
+            >
+                销售折让
+            </Button>
+        )
+    }, [selectedGoodIndex.length, isSalesDiscount])
+
+    return {
+        /** 按钮 */
+        button,
+    }
+}

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

@@ -1,37 +1,76 @@
-
-import React from "react"
-import { Button, message } from "kts-components-antd-x3"
-import { chain, bignumber } from 'mathjs';
-import Invoice from '../../../../../../..'
-import { LineAttributeType } from "../../../../../../../InvoiceController";
-
-/** 销售赠品 */
-export default function useSalesGifts() {
-
-    const controller = Invoice.useInvoiceController();
-
-    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, [])
-
-    const giveaways = React.useMemo(() => goodsList.filter(e => e.lineAttribute === LineAttributeType.赠品行), [goodsList])
-
-    const onClick = React.useCallback(async () => {
-        for (let g of giveaways) {
-            g.lineAttribute = LineAttributeType.正常;
-            await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
-        }
-    }, [controller, giveaways])
-
-    const button = React.useMemo(() => {
-        if (giveaways.length <= 0) return <></>;
-        return (
-            <Button onClick={onClick} >
-                销售赠品
-            </Button>
-        )
-    }, [giveaways, onClick])
-
-    return {
-        /** 按钮 */
-        button,
-    }
+
+import React from "react"
+import { Button, message } from "kts-components-antd-x3"
+import { chain, bignumber } from 'mathjs';
+import Invoice from '../../../../../../..'
+import { IGood, LineAttributeType } from "../../../../../../../InvoiceController";
+import { Dropdown, MenuProps } from "kts-xui";
+
+/** 销售赠品 */
+export default function useSalesGifts() {
+
+    const controller = Invoice.useInvoiceController();
+
+    const isSalesGifts = controller.useMemo(s => s.goodsListState.isSalesGifts, []);
+
+    const selectedGoodIndex = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
+
+    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, [])
+
+    const giveaways = React.useMemo(() => goodsList.filter(e => e.lineAttribute === LineAttributeType.赠品行), [goodsList])
+
+    const onClickAuto = React.useCallback(async () => {
+        for (let g of giveaways) {
+            g.lineAttribute = LineAttributeType.正常;
+            await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
+        }
+    }, [controller, giveaways])
+
+    const onClickManual = React.useCallback(async () => {
+        const { goodsMap, selectedGoodIndex } = controller.state.goodsListState;
+        const giveaways = selectedGoodIndex.map(e => goodsMap.get(e) as IGood).filter(e => !!e);
+
+        if (giveaways.some(e => e.lineAttribute === LineAttributeType.正常 || e.lineAttribute === LineAttributeType.赠品行) === false) {
+            const content = '只能选择‘赠品行’和‘正常行’';
+            return message.error({ content, key: content });
+        }
+
+        for (let g of giveaways) {
+            await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
+        }
+
+        controller.state.goodsListState.selectedGoodIndex = [];
+    }, [controller])
+
+    const items: MenuProps['items'] = React.useMemo(() => {
+        return [
+            {
+                key: '0',
+                label: '自动转换',
+                disabled: giveaways.length <= 0,
+                onClick: onClickAuto,
+            }, {
+                key: '1',
+                label: '手动转换',
+                disabled: selectedGoodIndex.length <= 0,
+                onClick: onClickManual,
+            },
+        ];
+    }, [selectedGoodIndex, onClickManual, onClickAuto])
+
+    const button = React.useMemo(() => {
+        if (!isSalesGifts) return;
+        return (
+            <Dropdown menu={{ items }} trigger={['click']} >
+                <Button>
+                    销售赠品
+                </Button>
+            </Dropdown>
+        )
+    }, [items, isSalesGifts])
+
+    return {
+        /** 按钮 */
+        button,
+    }
 }

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

@@ -1,38 +1,38 @@
-
-import React from "react";
-import { Button, Dropdown, Menu } from "kts-components-antd-x3";
-
-import useDelRowButton from "./hooks/useDelRowButton";
-import useAddDiscountRowButton from "./hooks/useAddDiscountRowButton";
-import useCommodityComparisonButton from "./hooks/useCommodityComparisonButton";
-
-export default function BulkMenu() {
-
-    /** 删除行 */
-    const delRowButton = useDelRowButton();
-
-    /** 添加折扣行 */
-    const addDiscountRowButton = useAddDiscountRowButton();
-
-    /** 执行商品对照 */
-    const commodityComparisonButton = useCommodityComparisonButton();
-
-    const menu = (
-        <Menu>
-            {delRowButton.menuItem}
-            {addDiscountRowButton.menuItem}
-            {commodityComparisonButton.menuItem}
-        </Menu>
-    );
-
-    return (
-        <>
-            <Dropdown overlay={menu}>
-                <Button>
-                    批量操作行
-                </Button>
-            </Dropdown>
-            {addDiscountRowButton.drawer}
-        </>
-    )
+
+import React from "react";
+import { Button, Dropdown, Menu } from "kts-components-antd-x3";
+
+import useDelRowButton from "./hooks/useDelRowButton";
+import useAddDiscountRowButton from "./hooks/useAddDiscountRowButton";
+import useCommodityComparisonButton from "./hooks/useCommodityComparisonButton";
+
+export default function BulkMenu() {
+
+    /** 删除行 */
+    const delRowButton = useDelRowButton();
+
+    /** 添加折扣行 */
+    const addDiscountRowButton = useAddDiscountRowButton();
+
+    /** 执行商品对照 */
+    const commodityComparisonButton = useCommodityComparisonButton();
+
+    const menu = (
+        <Menu>
+            {delRowButton.menuItem}
+            {addDiscountRowButton.menuItem}
+            {commodityComparisonButton.menuItem}
+        </Menu>
+    );
+
+    return (
+        <>
+            <Dropdown overlay={menu}>
+                <Button>
+                    批量操作行
+                </Button>
+            </Dropdown>
+            {addDiscountRowButton.drawer}
+        </>
+    )
 }

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

@@ -1,37 +1,37 @@
-
-import React from 'react';
-import { Switch, Icon, Tooltip } from 'kts-components-antd-x3';
-import Invoice from '../../../../..';
-
-export default () => {
-
-    const controller = Invoice.useInvoiceController();
-
-    const productComparison = controller.useMemo(s => s.goodsListState.productComparison, [])
-
-    const isMyShow = controller.useMemo(s => s.goodsListState.isMyShow, []);
-
-    const onChange = React.useCallback(e => {
-        controller.run(async s => s.goodsListState.isMyShow = !s.goodsListState.isMyShow)
-    }, [])
-
-    if (!productComparison.onComply) return <></>;
-
-    return (
-        <span>
-            <label style={{ marginRight: 2 }} >
-                <Tooltip title="蓝色代表我方商品描述，黑色代表对方的商品描述。">
-                    <Icon style={{ marginRight: 3 }} type="info-circle" />
-                </Tooltip>
-                使用哪方商品描述:
-            </label>
-            <Switch
-                checked={isMyShow}
-                checkedChildren="我方"
-                unCheckedChildren="对方"
-                defaultChecked
-                onChange={onChange}
-            />
-        </span>
-    )
+
+import React from 'react';
+import { Switch, Icon, Tooltip } from 'kts-components-antd-x3';
+import Invoice from '../../../../..';
+
+export default () => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const productComparison = controller.useMemo(s => s.goodsListState.productComparison, [])
+
+    const isMyShow = controller.useMemo(s => s.goodsListState.isMyShow, []);
+
+    const onChange = React.useCallback(e => {
+        controller.run(async s => s.goodsListState.isMyShow = !s.goodsListState.isMyShow)
+    }, [])
+
+    if (!productComparison.onComply) return <></>;
+
+    return (
+        <span>
+            <label style={{ marginRight: 2 }} >
+                <Tooltip title="蓝色代表我方商品描述，黑色代表对方的商品描述。">
+                    <Icon style={{ marginRight: 3 }} type="info-circle" />
+                </Tooltip>
+                使用哪方商品描述:
+            </label>
+            <Switch
+                checked={isMyShow}
+                checkedChildren="我方"
+                unCheckedChildren="对方"
+                defaultChecked
+                onChange={onChange}
+            />
+        </span>
+    )
 }

package/src/Invoice/ui/default/GoodsList/ui/Search/index.less

@@ -1,11 +1,11 @@
-.kts-invoice-operate-goods-list-able-list {
-  .kts-invoice-operate-goods-list-search {
-    width: 350px;
-
-    input {
-      border-radius: 999px;
-      border-color : #b8b8b8;
-      font-size    : 12px;
-    }
-  }
+.kts-invoice-operate-goods-list-able-list {
+  .kts-invoice-operate-goods-list-search {
+    width: 350px;
+
+    input {
+      border-radius: 999px;
+      border-color : #b8b8b8;
+      font-size    : 12px;
+    }
+  }
 }

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

@@ -1,52 +1,52 @@
-
-import React from "react";
-import { Icon, Input, message } from "kts-components-antd-x3";
-import { ReactComponent as MagnifierSvg } from './icon/magnifier.svg';
-import Invoice from '../../../../..';
-import './index.less';
-
-export default function Search() {
-
-    const controller = Invoice.useInvoiceController();
-
-    const [value, setValue] = React.useState('');
-
-    const readOnly = controller.useMemo(s => !!s.goodsListState.editGood, [])
-
-    const columnshide = controller.useMemo(s => s.goodsListState.columnshide, [])
-
-    /** 是否含税 */
-    const isTaxIncluded = controller.useMemo(s => s.goodsListState.isTaxIncluded, [])
-
-    const onClick = React.useCallback(async () => {
-        await controller.saveEditGood();
-        await controller.wait();
-        if (controller.state.goodsListState.editGood) {
-            message.error({
-                content: '你正在编辑一个货物',
-                key: '你正在编辑一个货物',
-            });
-            return;
-        }
-    }, [])
-
-    React.useEffect(() => {
-        controller.run(async s => {
-            s.goodsListState.searchValue = value.trim();
-        })
-    }, [value, controller])
-
-    return (
-        <Input
-            size="small"
-            readOnly={readOnly}
-            value={value}
-            className="kts-invoice-operate-goods-list-search"
-            placeholder={`请您输入${columnshide.includes('itemCode') ? '' : '商品编码、'}项目名称、规格型号、金额(${isTaxIncluded ? '含税' : '不含税'})搜索`}
-            prefix={<Icon component={MagnifierSvg} style={{ color: "#b8b8b8" }} />}
-            onChange={e => { setValue(e.target.value); }}
-            onClick={onClick}
-        />
-    )
-}
-
+
+import React from "react";
+import { Icon, Input, message } from "kts-components-antd-x3";
+import { ReactComponent as MagnifierSvg } from './icon/magnifier.svg';
+import Invoice from '../../../../..';
+import './index.less';
+
+export default function Search() {
+
+    const controller = Invoice.useInvoiceController();
+
+    const [value, setValue] = React.useState('');
+
+    const readOnly = controller.useMemo(s => !!s.goodsListState.editGood, [])
+
+    const columnshide = controller.useMemo(s => s.goodsListState.columnshide, [])
+
+    /** 是否含税 */
+    const isTaxIncluded = controller.useMemo(s => s.goodsListState.isTaxIncluded, [])
+
+    const onClick = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        if (controller.state.goodsListState.editGood) {
+            message.error({
+                content: '你正在编辑一个货物',
+                key: '你正在编辑一个货物',
+            });
+            return;
+        }
+    }, [])
+
+    React.useEffect(() => {
+        controller.run(async s => {
+            s.goodsListState.searchValue = value.trim();
+        })
+    }, [value, controller])
+
+    return (
+        <Input
+            size="small"
+            readOnly={readOnly}
+            value={value}
+            className="kts-invoice-operate-goods-list-search"
+            placeholder={`请您输入${columnshide.includes('itemCode') ? '' : '商品编码、'}项目名称、规格型号、金额(${isTaxIncluded ? '含税' : '不含税'})搜索`}
+            prefix={<Icon component={MagnifierSvg} style={{ color: "#b8b8b8" }} />}
+            onChange={e => { setValue(e.target.value); }}
+            onClick={onClick}
+        />
+    )
+}
+

package/src/Invoice/ui/default/GoodsList/ui/Statistics/index.less

@@ -1,19 +1,19 @@
-.kts-invoice-operate-goods-list-statistics {
-  background: #fafafa;
-  overflow-y: scroll;
-
-  .kts-invoice-operate-goods-list-statistics-row {
-    height       : 30px;
-    line-height  : 30px;
-    border-bottom: 1px solid #e8e8e8;
-    display      : flex;
-
-    &>div {
-      border-right: 1px solid #e8e8e8;
-
-      label {
-        padding: 0 10px;
-      }
-    }
-  }
+.kts-invoice-operate-goods-list-statistics {
+  background: #fafafa;
+  overflow-y: scroll;
+
+  .kts-invoice-operate-goods-list-statistics-row {
+    height       : 30px;
+    line-height  : 30px;
+    border-bottom: 1px solid #e8e8e8;
+    display      : flex;
+
+    &>div {
+      border-right: 1px solid #e8e8e8;
+
+      label {
+        padding: 0 10px;
+      }
+    }
+  }
 }