kts-component-invoice-operate 3.2.16 → 3.2.17

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

@@ -1,69 +1,69 @@
-import React from 'react';
-import Invoice from '../../../../../../..';
-import LineAttributeType from '../../../../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
-import { Button, Menu } from 'kts-components-antd-x3';
-
-export default () => {
-
-  const controller = Invoice.useInvoiceController();
-
-  const model = controller.useMemo(s => s.model, []);
-
-  const isRemRow = controller.useMemo(s => s.goodsListState.isRemRow, []);
-
-  /** 是否禁用 */
-  const disabled = controller.useMemo((s) => {
-    if (s.goodsListState.selectedGoodIndex.length <= 0) return true;
-
-    return s.goodsListState.selectedGoodIndex.some((e) => {
-      const good = s.goodsListState.goodsMap.get(e);
-      if (!good) return true;
-      return good.lineAttribute !== LineAttributeType.正常;
-    });
-  }, []);
-
-  const onClick = React.useCallback(() => {
-    controller.pipeline(async (s) => {
-      const goodsList = s.goodsListState.goodsList.filter(
-        (e) => s.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0,
-      );
-      if (s.goodsListState.editGood) {
-        if (
-          s.goodsListState.selectedGoodIndex.indexOf(
-            s.goodsListState.editGood.$index,
-          ) >= 0
-        ) {
-          controller.setEditGood();
-        }
-      }
-      s.goodsListState = {
-        ...s.goodsListState,
-        goodsList,
-        selectedGoodIndex: [],
-      };
-    })();
-  }, [controller]);
-
-  const menuItem = React.useMemo(() => {
-
-    if (model === 'prefab') return <></>;
-    if (model === 'readOnly') return <></>;
-
-    return (
-      <Menu.Item key="1" onClick={onClick} disabled={disabled}> 删除行 </Menu.Item>
-    )
-  }, [model, onClick, disabled])
-
-  const button = React.useMemo(() => {
-
-    if (isRemRow === false) return <></>;
-    if (model === 'prefab') return <></>;
-    if (model === 'readOnly') return <></>;
-
-    return (
-      <Button onClick={onClick} disabled={disabled} >批量删除</Button>
-    )
-  }, [model, onClick, disabled])
-
-  return { button, menuItem };
-};
+import React from 'react';
+import Invoice from '../../../../../../..';
+import LineAttributeType from '../../../../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
+import { Button, Menu } from 'kts-components-antd-x3';
+
+export default () => {
+
+  const controller = Invoice.useInvoiceController();
+
+  const model = controller.useMemo(s => s.model, []);
+
+  const isRemRow = controller.useMemo(s => s.goodsListState.isRemRow, []);
+
+  /** 是否禁用 */
+  const disabled = controller.useMemo((s) => {
+    if (s.goodsListState.selectedGoodIndex.length <= 0) return true;
+
+    return s.goodsListState.selectedGoodIndex.some((e) => {
+      const good = s.goodsListState.goodsMap.get(e);
+      if (!good) return true;
+      return good.lineAttribute !== LineAttributeType.正常;
+    });
+  }, []);
+
+  const onClick = React.useCallback(() => {
+    controller.pipeline(async (s) => {
+      const goodsList = s.goodsListState.goodsList.filter(
+        (e) => s.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0,
+      );
+      if (s.goodsListState.editGood) {
+        if (
+          s.goodsListState.selectedGoodIndex.indexOf(
+            s.goodsListState.editGood.$index,
+          ) >= 0
+        ) {
+          controller.setEditGood();
+        }
+      }
+      s.goodsListState = {
+        ...s.goodsListState,
+        goodsList,
+        selectedGoodIndex: [],
+      };
+    })();
+  }, [controller]);
+
+  const menuItem = React.useMemo(() => {
+
+    if (model === 'prefab') return <></>;
+    if (model === 'readOnly') return <></>;
+
+    return (
+      <Menu.Item key="1" onClick={onClick} disabled={disabled}> 删除行 </Menu.Item>
+    )
+  }, [model, onClick, disabled])
+
+  const button = React.useMemo(() => {
+
+    if (isRemRow === false) return <></>;
+    if (model === 'prefab') return <></>;
+    if (model === 'readOnly') return <></>;
+
+    return (
+      <Button onClick={onClick} disabled={disabled} >批量删除</Button>
+    )
+  }, [model, onClick, disabled])
+
+  return { button, menuItem };
+};

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

@@ -1,58 +1,58 @@
-import React from 'react';
-import Invoice from '../../../../../../..';
-import { message, Menu, Button } from 'kts-components-antd-x3';
-import coolingFn from '../../../../../../../tools/coolingFn';
-
-export default () => {
-  
-  const controller = Invoice.useInvoiceController();
-
-  const model = controller.useMemo(s => s.model, []);
-
-  /** 是否禁用 */
-  const disabled = controller.useMemo((s) => {
-    if (s.goodsListState.selectedGoodIndex.length <= 0) return true;
-  }, []);
-
-  const onClick = React.useCallback(async () => {
-    await controller.saveEditGood();
-    await controller.wait();
-    await controller.pipeline(async (s) => {
-
-      // 不能给正在编辑的货物赋码
-      if (s.goodsListState.editGood && s.goodsListState.selectedGoodIndex.indexOf(s.goodsListState.editGood.$index) >= 0) {
-        coolingFn('不能给正在编辑的货物赋码', 3000, () => { message.error('不能给正在编辑的货物赋码') });
-        return;
-      }
-
-      // 税率不一样不能批量赋码
-      if (s.goodsListState.selectedGoodIndex.map(e => s.goodsListState.goodsMap.get(e)).some((e, _, arr) => e?.taxRate !== arr[0]?.taxRate)) {
-        coolingFn('商品税率不一致不能操作批量赋码', 3000, () => { message.error('商品税率不一致不能操作批量赋码') });
-        return;
-      }
-
-      // 设置赋码
-      s.goodsListState.endowCode.endowcodeGoodIndex = s.goodsListState.selectedGoodIndex;
-    })();
-  }, [controller]);
-
-  const menuItem = React.useMemo(() => {
-    if (model === 'readOnly') return <></>;
-    return (
-      <Menu.Item key="2" onClick={onClick} disabled={disabled}>
-        批量赋码
-      </Menu.Item>
-    )
-  }, [onClick, disabled, model])
-
-  const button = React.useMemo(() => {
-    if (model === 'readOnly') return <></>;
-    return (
-      <Button onClick={onClick} disabled={disabled}>
-        批量赋码
-      </Button>
-    )
-  }, [onClick, disabled, model])
-
-  return { menuItem, button };
-};
+import React from 'react';
+import Invoice from '../../../../../../..';
+import { message, Menu, Button } from 'kts-components-antd-x3';
+import coolingFn from '../../../../../../../tools/coolingFn';
+
+export default () => {
+  
+  const controller = Invoice.useInvoiceController();
+
+  const model = controller.useMemo(s => s.model, []);
+
+  /** 是否禁用 */
+  const disabled = controller.useMemo((s) => {
+    if (s.goodsListState.selectedGoodIndex.length <= 0) return true;
+  }, []);
+
+  const onClick = React.useCallback(async () => {
+    await controller.saveEditGood();
+    await controller.wait();
+    await controller.pipeline(async (s) => {
+
+      // 不能给正在编辑的货物赋码
+      if (s.goodsListState.editGood && s.goodsListState.selectedGoodIndex.indexOf(s.goodsListState.editGood.$index) >= 0) {
+        coolingFn('不能给正在编辑的货物赋码', 3000, () => { message.error('不能给正在编辑的货物赋码') });
+        return;
+      }
+
+      // 税率不一样不能批量赋码
+      if (s.goodsListState.selectedGoodIndex.map(e => s.goodsListState.goodsMap.get(e)).some((e, _, arr) => e?.taxRate !== arr[0]?.taxRate)) {
+        coolingFn('商品税率不一致不能操作批量赋码', 3000, () => { message.error('商品税率不一致不能操作批量赋码') });
+        return;
+      }
+
+      // 设置赋码
+      s.goodsListState.endowCode.endowcodeGoodIndex = s.goodsListState.selectedGoodIndex;
+    })();
+  }, [controller]);
+
+  const menuItem = React.useMemo(() => {
+    if (model === 'readOnly') return <></>;
+    return (
+      <Menu.Item key="2" onClick={onClick} disabled={disabled}>
+        批量赋码
+      </Menu.Item>
+    )
+  }, [onClick, disabled, model])
+
+  const button = React.useMemo(() => {
+    if (model === 'readOnly') return <></>;
+    return (
+      <Button onClick={onClick} disabled={disabled}>
+        批量赋码
+      </Button>
+    )
+  }, [onClick, disabled, model])
+
+  return { menuItem, button };
+};

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

@@ -0,0 +1,34 @@
+
+import React from "react"
+import { Button } from "kts-components-antd-x3"
+import Invoice from '../../../../../../..'
+
+/** 全单合并明细 */
+export default function useMergeDetails() {
+
+    const controller = Invoice.useInvoiceController();
+
+    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
+
+    const onClick = React.useCallback(async ()=>{
+        await controller.saveEditGood();
+        await controller.wait();
+        await controller.mergeDetails();
+    }, [])
+
+    const button = React.useMemo(() => {
+        return (
+            <Button
+                onClick={onClick}
+                disabled={goodsList.length <= 1}
+            >
+                合并明细
+            </Button>
+        )
+    }, [goodsList.length])
+
+    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,50 +1,50 @@
-
-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 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={`请您输入项目名称、规格型号、金额(${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 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={`请您输入项目名称、规格型号、金额(${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;
+      }
+    }
+  }
 }