kts-component-invoice-operate 1.2.22 → 2.0.1

package/src/Invoice/ui/GoodsList/ui/{AddDiscountRowButton → BulkMenu/hooks/useAddDiscountRowButton}/index.tsx

@@ -7,20 +7,20 @@
  */
 
 import React from 'react';
-import { Button, Drawer, Form, message, Input, Typography } from 'kts-components-antd-x3';
+import { Button, Drawer, Form, message, Input, Typography, Menu } from 'kts-components-antd-x3';
 import { FormComponentProps } from 'kts-components-antd-x3/lib/form';
 import { all, create } from 'mathjs';
 import { decorator } from 'grey-react-box';
-import Invoice from '../../../../';
-import lazyFn from '../../../../tools/lazyFn';
-import LineAttributeType from '../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
-import evaluate from '../../../../../Invoice/tools/evaluate';
+import Invoice from '../../../../../../';
+import lazyFn from '../../../../../../tools/lazyFn';
+import LineAttributeType from '../../../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
+import evaluate from '../../../../../../../Invoice/tools/evaluate';
 import './index.less';
 
 const { Text } = Typography;
 const { chain } = create(all, { number: 'BigNumber', precision: 20 }) as any;
 
-export default decorator<{}, FormComponentProps>(Form.create())((props) => {
+export default () => {
   /** 控制器 */
   const controller = Invoice.useInvoiceController();
 
@@ -86,15 +86,16 @@ export default decorator<{}, FormComponentProps>(Form.create())((props) => {
     })();
   }, [controller]);
 
-  if (model === 'prefab') return <></>;
+  const menuItem = React.useMemo(() => {
+    return model === 'prefab' ? <></> : isAddDiscount !== false ? (
+      <Menu.Item key="0" onClick={onClick} disabled={disabled}>
+        添加折扣行
+      </Menu.Item>
+    ) : undefined
+  }, [isAddDiscount, disabled, onClick])
 
-  return (
-    <>
-      {
-        isAddDiscount !== false &&
-        <Button icon="plus-circle" disabled={disabled} onClick={onClick}>
-          添加折扣行
-        </Button>}
+  const drawer = React.useMemo(() => {
+    return (
       <Drawer
         className="kts-invoice-operate-goods-list-add-discount-row"
         width={540}
@@ -106,9 +107,11 @@ export default decorator<{}, FormComponentProps>(Form.create())((props) => {
       >
         <DrawerBody />
       </Drawer>
-    </>
-  );
-});
+    )
+  }, [visible, onClose])
+
+  return { menuItem, drawer }
+};
 
 const DrawerBody = decorator<{}, FormComponentProps>(Form.create())((props) => {
   const { form } = props;

package/src/Invoice/ui/GoodsList/ui/BulkMenu/hooks/useCommodityComparisonButton/index.tsx

@@ -0,0 +1,80 @@
+import React from 'react';
+import { Menu, message } from 'kts-components-antd-x3';
+import coolingFn from '../../../../../../tools/coolingFn'
+import { getSN, setShorthand } from '../../../../../../tools/itemName'
+import { Invoice, IGood } from '../../../../../../../';
+
+export default () => {
+
+  const controller = Invoice.useInvoiceController();
+
+  const { onComply } = controller.useMemo(s => s.goodsListState.productComparison, [])
+
+  /** 是否禁用 */
+  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.run(async s => {
+
+      // 不能给正在编辑的货物对照
+      if (s.goodsListState.editGood && s.goodsListState.selectedGoodIndex.indexOf(s.goodsListState.editGood.$index) >= 0) {
+        coolingFn('不能给正在编辑的货物执行商品对照', 3000, () => { message.error('不能给正在编辑的货物执行商品对照') });
+        return;
+      }
+
+      if (!s.goodsListState?.productComparison?.onComply) return;
+
+      const goods = s.goodsListState.selectedGoodIndex.map(e => {
+        const t = s.goodsListState.goodsMap.get(e);
+        if (!t) return undefined;
+
+        return {
+          ...t,
+          itemName: getSN(t.itemName)?.full,
+          itemNameOther: getSN(t.itemNameOther)?.full,
+        } as IGood
+      }).filter(e => !!e) as IGood[]
+
+
+      // 比对后的商品
+      const newGoods = await s.goodsListState.productComparison.onComply(goods);
+
+      newGoods.filter(e => {
+        const vt = s.goodsListState.goodsMap.get(e.$index);
+        if (!vt) return undefined;
+
+        vt.itemName = e.itemName ? setShorthand(e.itemName, getSN(vt.itemName)?.shorthand) : vt.itemName;
+        vt.itemNameOther = e.itemNameOther ? setShorthand(e.itemNameOther, getSN(vt.itemNameOther)?.shorthand) : vt.itemNameOther;
+
+        vt.unit = e.unit ? e.unit : vt.unit;
+        vt.unitOther = e.unitOther ? e.unitOther : vt.unitOther;
+
+        vt.itemModelName = e.itemModelName ? e.itemModelName : vt.itemModelName;
+        vt.itemModelNameOther = e.itemModelNameOther ? e.itemModelNameOther : vt.itemModelNameOther;
+
+        vt.itemCode = e.itemCode ? e.itemCode : vt.itemCode;
+        vt.itemCodeOther = e.itemCodeOther ? e.itemCodeOther : vt.itemCodeOther;
+      })
+    })
+  }, [])
+
+
+  const menuItem = React.useMemo(() => {
+
+    // 没用 执行商品对照 的方法 不显示按钮
+    if (!onComply) return <></>;
+
+    return (
+      <Menu.Item key="3" disabled={disabled} onClick={onClick} >
+        执行商品对照
+      </Menu.Item>
+    );
+  }, [])
+
+  return { menuItem }
+};

package/src/Invoice/ui/GoodsList/ui/{DelRowButton → BulkMenu/hooks/useDelRowButton}/index.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
-import Invoice from '../../../../';
-import LineAttributeType from '../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
-import { Button } from 'kts-components-antd-x3';
+import Invoice from '../../../../../../';
+import LineAttributeType from '../../../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
+import { Menu } from 'kts-components-antd-x3';
 
 export default () => {
+
   const controller = Invoice.useInvoiceController();
 
   const model = controller.useMemo(s => s.model, []);
@@ -41,9 +42,16 @@ export default () => {
     })();
   }, [controller]);
 
-  if (model === 'prefab') return <></>;
+  const menuItem = React.useMemo(() => {
+
+    if (model === 'prefab') return <></>;
+
+    return (
+      <Menu.Item key="1" onClick={onClick} disabled={disabled}>
+        删除行
+      </Menu.Item>
+    )
+  }, [model, onClick, disabled])
 
-  return (
-    <Button icon="delete" onClick={onClick} disabled={disabled}>删除行</Button>
-  );
+  return { menuItem };
 };

package/src/Invoice/ui/GoodsList/ui/{EndowCodeButton → BulkMenu/hooks/useEndowCodeButton}/index.tsx

@@ -1,8 +1,7 @@
 import React from 'react';
-import Invoice from '../../../../';
-import { Button, message } from 'kts-components-antd-x3';
-import coolingFn from '../../../../tools/coolingFn'
-// import { LineAttributeType } from '../../../../InvoiceController';
+import Invoice from '../../../../../../';
+import { message ,Menu} from 'kts-components-antd-x3';
+import coolingFn from '../../../../../../tools/coolingFn';
 
 export default () => {
   const controller = Invoice.useInvoiceController();
@@ -34,9 +33,14 @@ export default () => {
     })();
   }, [controller]);
 
-  return (
-    <Button icon="file-add" disabled={disabled} onClick={onClick}>
-      批量赋码
-    </Button>
-  );
+  const menuItem = React.useMemo(() => {
+
+    return (
+      <Menu.Item key="2" onClick={onClick} disabled={disabled}>
+        批量赋码
+      </Menu.Item>
+    )
+  }, [onClick, disabled])
+
+  return { menuItem };
 };

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

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

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

@@ -0,0 +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>
+    )
+}

package/src/Invoice/ui/GoodsList/ui/Search/icon/magnifier.svg

@@ -0,0 +1 @@
+<svg t="1656901778998" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9253" width="200" height="200"><path d="M985.781333 918.594133 820.773333 765.5264c27.3728-32.973867 49.6544-69.5776 66.436267-109.258667 22.933333-54.218667 34.561067-111.7952 34.561067-171.1296 0-59.333333-11.627733-116.910933-34.561067-171.1296-22.142933-52.354133-53.837867-99.365333-94.200533-139.729067S705.633067 102.222933 653.28 80.08c-54.218667-22.933333-111.7952-34.561067-171.1296-34.561067S365.240533 57.147733 311.021867 80.08c-52.354133 22.142933-99.365333 53.8368-139.729067 94.200533s-72.0576 87.374933-94.200533 139.729067c-22.932267 54.218667-34.56 111.7952-34.56 171.1296 0 59.3344 11.627733 116.910933 34.56 171.1296 22.144 52.354133 53.837867 99.365333 94.200533 139.729067s87.374933 72.0576 139.729067 94.200533c54.218667 22.932267 111.7952 34.56 171.1296 34.56s116.910933-11.627733 171.1296-34.56c45.352533-19.181867 86.686933-45.543467 123.172267-78.487467L942.256 965.514667c6.16 5.714133 13.966933 8.539733 21.755733 8.539733 8.593067 0 17.163733-3.441067 23.467733-10.237867C999.4976 950.8608 998.738133 930.612267 985.781333 918.594133zM482.151467 860.7584c-207.117867 0-375.620267-168.5024-375.620267-375.620267 0-207.1168 168.5024-375.6192 375.620267-375.6192S857.770667 278.021333 857.770667 485.138133C857.770667 692.256 689.268267 860.7584 482.151467 860.7584z" p-id="9254"></path></svg>

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

@@ -0,0 +1,10 @@
+.kts-invoice-operate-goods-list-able-list {
+  .kts-invoice-operate-goods-list-search {
+    width: 330px;
+
+    input {
+      border-radius: 999px;
+      border-color : #b8b8b8;
+    }
+  }
+}

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

@@ -0,0 +1,47 @@
+
+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 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;
+        })
+    }, [value, controller])
+
+    return (
+        <Input
+            size="small"
+            readOnly={readOnly}
+            value={value}
+            className="kts-invoice-operate-goods-list-search"
+            placeholder="请您输入货物名称、规格型号、金额(含税)搜索"
+            prefix={<Icon component={MagnifierSvg} style={{ color: "#b8b8b8" }} />}
+            onChange={e => { setValue(e.target.value); }}
+            onClick={onClick}
+        />
+    )
+}
+

package/src/Invoice/ui/GoodsList/ui/TaxIncludedSwitch/index.tsx

@@ -14,12 +14,12 @@ export default () => {
     const isSwitchTax = controller.useMemo(e => e.goodsListState.isSwitchTax, []);
 
     const onChange = React.useCallback(e => {
-        controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded: e } })()
+        controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded: e } })();
     }, [])
 
     return (
         <span>
-            <label>含税:</label>
+            <label style={{ marginRight: 2 }}>含税:</label>
             <Switch
                 disabled={isSwitchTax === false}
                 checked={isTaxIncluded}

package/src/Invoice/ui/ImportGoodsDrawer/index.tsx

@@ -1,8 +1,9 @@
 import React from 'react';
-import { Drawer, message, Table } from 'kts-components-antd-x3';
+import { Drawer, Table } from 'kts-components-antd-x3';
 import Invoice from '../../';
 import { updateUnitPriceExcludingTax, updateUnitPriceTax, dutyFree, format15 } from '../GoodsList/hook/useColumns/autoFillFn';
 import { countAmountIncludeTax } from '../../tools/calculate'
+import { getSN } from '../../tools/itemName'
 import { IGood } from '../../InvoiceController';
 import evaluate from '../../tools/evaluate';
 
@@ -68,8 +69,10 @@ const DrawerBody = () => {
               async s => {
                 Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
 
+                // 导入时校验函数
                 if (await s.goodsListState.importGoods.verifyFn(record) === false) return;
 
+                // 没用 被编辑的货物 和 form 就退出
                 if (!s.goodsListState.editGood || !s.goodsListState.form) return;
 
                 if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
@@ -79,25 +82,42 @@ const DrawerBody = () => {
                   record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
                 }
 
-                s.goodsListState.editGood = { ...s.goodsListState.editGood, ...record };
-                if (!s.goodsListState.editGood) return;
+                // 中间数据
+                const between = { ...record };
+                between.itemName = getItemName(record, s.goodsListState.editGood);
+                between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
 
-                if(s.goodsListState.editGood.taxRate)
-                  s.goodsListState.editGood.taxRate = dutyFree(controller, s.goodsListState.editGood.taxRate, s.goodsListState.form, s.goodsListState.editGood)
+                // 设置编辑货物
+                const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
 
-                if (`${s.goodsListState.editGood.priceIncludeTax}` === '0') {
-                  s.goodsListState.editGood.priceIncludeTax = undefined;
-                  s.goodsListState.editGood.priceExcludeTax = undefined;
+                if (editGood.taxRate) {
+                  editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
+                }
+
+                if (`${editGood.priceIncludeTax}` === '0') {
+                  editGood.priceIncludeTax = undefined;
+                  editGood.priceExcludeTax = undefined;
                 } else {
-                  s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record) as number;
+                  editGood.priceExcludeTax = getPriceExcludeTax(editGood, record) as number;
+                }
+
+                if (editGood.quantity && editGood.priceIncludeTax) {
+                  editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax);
                 }
 
-                if (s.goodsListState.editGood.quantity && s.goodsListState.editGood.priceIncludeTax)
-                  s.goodsListState.editGood.lineAmountIncludeTax = countAmountIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
+                // 导入FORM里
+                if (s.goodsListState.isMyShow) {
+                  s.goodsListState.form.setFieldsValue(editGood);
+                } else {
+                  s.goodsListState.form.setFieldsValue({
+                    ...editGood,
+                    itemName: editGood.itemNameOther,
+                    unit: editGood.unitOther,
+                    itemModelName: editGood.itemModelNameOther,
+                  });
+                }
 
-                s.goodsListState.editGood.itemName = getItemName(record);
 
-                s.goodsListState.form.setFieldsValue(s.goodsListState.editGood as any);
                 s.goodsListState.importGoods.isVisibleDrawer = false;
 
                 s.goodsListState.isTaxIncluded
@@ -113,11 +133,11 @@ const DrawerBody = () => {
 };
 
 /** 货物名称 */
-const getItemName = (record: any) => {
-  return record.shorthand
-    ? `*${record.shorthand}*${record.itemName}`
-    : record.itemName;
-};
+// const getItemName = (record: any) => {
+//   return record.shorthand
+//     ? `*${record.shorthand}*${record.itemName}`
+//     : record.itemName;
+// };
 
 /** 货物单价，不含税 */
 const getPriceExcludeTax = (s: IGood, record: any) => {
@@ -126,3 +146,35 @@ const getPriceExcludeTax = (s: IGood, record: any) => {
   // 单价(含税)/(1+税率) = 单价(不含税)
   return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`));
 };
+
+// 获取我方名称
+const getItemName = (record: any, editGood: IGood) => {
+
+  let shorthand;
+
+  shorthand = record.shorthand;
+  if (shorthand) {
+    return `*${shorthand}*${record.itemName}`;
+  }
+
+  shorthand = getSN(editGood.itemNameOther)?.shorthand;
+  if (shorthand) {
+    return `*${shorthand}*${record.itemName}`;
+  }
+
+  return record.itemName;
+}
+
+// 获取他方名称
+const getItemNameOther = (record: any, editGood: IGood) => {
+  if (!editGood.itemNameOther) return editGood.itemNameOther;
+
+  let shorthand;
+
+  shorthand = record.shorthand;
+  if (shorthand) {
+    return `*${shorthand}*${record.itemName}`;
+  }
+
+  return record.itemNameOther;
+}

package/src/index.ts

@@ -3,3 +3,4 @@ import 'kts-components-antd-x3/dist/kts-components-antd-x3.css';
 
 export { default as Invoice } from './Invoice';
 export { default as InvoiceController } from './Invoice/InvoiceController';
+export type { default as IGood } from './Invoice/InvoiceController/InvoiceControllerState/GoodsListState/IGood';