kts-component-invoice-operate 3.2.215 → 3.2.216-fix

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, isRemRow])
-
-  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, isRemRow])
+
+  return { button, menuItem };
+};

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

@@ -1,65 +1,65 @@
-import React from 'react';
-import Invoice from '../../../../../../..';
-import { message, Menu, Button } from 'kts-components-antd-x3';
-import coolingFn from '../../../../../../../tools/coolingFn';
-import { LineAttributeType } from '../../../../../../../InvoiceController';
-
-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;
-      }
-
-      // 折让行 不能赋码
-      if (s.goodsListState.selectedGoodIndex.map(e => s.goodsListState.goodsMap.get(e)).every(e => e?.lineAttribute !== LineAttributeType.折让行) === false) {
-        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';
+import { LineAttributeType } from '../../../../../../../InvoiceController';
+
+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;
+      }
+
+      // 折让行 不能赋码
+      if (s.goodsListState.selectedGoodIndex.map(e => s.goodsListState.goodsMap.get(e)).every(e => e?.lineAttribute !== LineAttributeType.折让行) === false) {
+        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

@@ -1,92 +1,92 @@
-
-import React from "react"
-import { Button } from "kts-components-antd-x3"
-import Invoice from '../../../../../../..'
-import { Dropdown, MenuProps } from "kts-xui";
-import { IGood, LineAttributeType } from "../../../../../../../InvoiceController";
-
-/** 全单合并明细 */
-export default function useMergeDetails() {
-
-    const controller = Invoice.useInvoiceController();
-
-    const selectedGoodIndex = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
-
-    const isMergeDetails = controller.useMemo(s => s.goodsListState.isMergeDetails, []);
-
-    const onClickManual = React.useCallback(async () => {
-        await controller.saveEditGood();
-        await controller.wait();
-        await controller.mergeDetails(controller.state.goodsListState.selectedGoodIndex);
-    }, [controller])
-
-    const onClickAuto = React.useCallback(async () => {
-        await controller.saveEditGood();
-        await controller.wait();
-        const goodsList = controller.state.goodsListState.goodsList;
-        const isTaxIncluded = controller.state.goodsListState.isTaxIncluded;
-        const group = groupBy(goodsList, isTaxIncluded);
-        for (let i = 0; i < group.length; i++) {
-            const selectedGoodIndex = group[i].map(e => e.$index);
-            await controller.mergeDetails(selectedGoodIndex);
-        }
-    }, [])
-
-    const items: MenuProps['items'] = React.useMemo(() => {
-        return [
-            {
-                key: '0',
-                label: '处理全部行',
-                onClick: onClickAuto,
-            }, {
-                key: '1',
-                label: '处理选中行',
-                disabled: selectedGoodIndex.length <= 1,
-                onClick: onClickManual,
-            },
-        ];
-    }, [selectedGoodIndex, onClickManual, onClickAuto])
-
-    const button = React.useMemo(() => {
-        if (!isMergeDetails) return <></>;
-        return (
-            <Dropdown menu={{ items }} trigger={['click']} >
-                <Button>
-                    合并明细
-                </Button>
-            </Dropdown>
-        )
-    }, [selectedGoodIndex.length, isMergeDetails])
-
-    return {
-        /** 按钮 */
-        button,
-    }
-}
-
-// 根据"商品编码"" 和 "单价" 分组
-function groupBy(arr: IGood[], isTaxIncluded: boolean): IGood[][] {
-    const grouped: any = {};
-    for (let i = 0; i < arr.length; i++) {
-        const item = arr[i];
-        if (!item.itemCode) continue;
-        
-        const key = (() => {
-            if (isTaxIncluded) {
-                return `${item.itemCode}${Math.floor((item.priceIncludeTax || 0) * 100) / 100}`;
-            } else {
-                return `${item.itemCode}${Math.floor((item.priceExcludeTax || 0) * 100) / 100}`;
-            }
-        })()
-
-        if (!grouped[key]) {
-            grouped[key] = [];
-        }
-
-        grouped[key].push(item);
-        if (item.lineAttribute === LineAttributeType.被折扣行) {
-            grouped[key].push(arr[i + 1]); i++;
-        }
-    }
-    return Object.values(grouped);
+
+import React from "react"
+import { Button } from "kts-components-antd-x3"
+import Invoice from '../../../../../../..'
+import { Dropdown, MenuProps } from "kts-xui";
+import { IGood, LineAttributeType } from "../../../../../../../InvoiceController";
+
+/** 全单合并明细 */
+export default function useMergeDetails() {
+
+    const controller = Invoice.useInvoiceController();
+
+    const selectedGoodIndex = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
+
+    const isMergeDetails = controller.useMemo(s => s.goodsListState.isMergeDetails, []);
+
+    const onClickManual = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        await controller.mergeDetails(controller.state.goodsListState.selectedGoodIndex);
+    }, [controller])
+
+    const onClickAuto = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        const goodsList = controller.state.goodsListState.goodsList;
+        const isTaxIncluded = controller.state.goodsListState.isTaxIncluded;
+        const group = groupBy(goodsList, isTaxIncluded);
+        for (let i = 0; i < group.length; i++) {
+            const selectedGoodIndex = group[i].map(e => e.$index);
+            await controller.mergeDetails(selectedGoodIndex);
+        }
+    }, [])
+
+    const items: MenuProps['items'] = React.useMemo(() => {
+        return [
+            {
+                key: '0',
+                label: '处理全部行',
+                onClick: onClickAuto,
+            }, {
+                key: '1',
+                label: '处理选中行',
+                disabled: selectedGoodIndex.length <= 1,
+                onClick: onClickManual,
+            },
+        ];
+    }, [selectedGoodIndex, onClickManual, onClickAuto])
+
+    const button = React.useMemo(() => {
+        if (!isMergeDetails) return <></>;
+        return (
+            <Dropdown menu={{ items }} trigger={['click']} >
+                <Button>
+                    合并明细
+                </Button>
+            </Dropdown>
+        )
+    }, [selectedGoodIndex.length, isMergeDetails])
+
+    return {
+        /** 按钮 */
+        button,
+    }
+}
+
+// 根据"商品编码"" 和 "单价" 分组
+function groupBy(arr: IGood[], isTaxIncluded: boolean): IGood[][] {
+    const grouped: any = {};
+    for (let i = 0; i < arr.length; i++) {
+        const item = arr[i];
+        if (!item.itemCode) continue;
+        
+        const key = (() => {
+            if (isTaxIncluded) {
+                return `${item.itemCode}${Math.floor((item.priceIncludeTax || 0) * 100) / 100}`;
+            } else {
+                return `${item.itemCode}${Math.floor((item.priceExcludeTax || 0) * 100) / 100}`;
+            }
+        })()
+
+        if (!grouped[key]) {
+            grouped[key] = [];
+        }
+
+        grouped[key].push(item);
+        if (item.lineAttribute === LineAttributeType.被折扣行) {
+            grouped[key].push(arr[i + 1]); i++;
+        }
+    }
+    return Object.values(grouped);
 }

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

@@ -1,37 +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,
-    }
+
+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,
+    }
 }