kts-component-invoice-operate 1.2.25 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "1.2.25",
+  "version": "2.0.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -30,10 +30,13 @@
     "classnames": "^2.3.1",
     "grey-react-box": "^0.2.20",
     "kts-components-antd-x3": "^3.26.20-5",
+    "kts-components-antd-x4": "^4.0.3",
+    "kts-xui": "^1.0.30",
     "mathjs": "^9.4.2",
     "next": "^11.0.1",
     "nzh": "^1.0.4",
     "react": "^16.12.0",
+    "react-dom": "^16.12.0",
     "styled-components": "^5.3.0",
     "uuid": "^8.3.2"
   },
@@ -44,9 +47,13 @@
     "dumi": "^1.0.14",
     "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",
+    "invariant": "^2.2.4",
     "kts-components": "^1.2.18",
     "lint-staged": "^10.0.7",
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
+  },
+  "resolutions": {
+    "@types/react": "17.0.2"
   }
 }

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/{EndowCode.tsx → EndowCode/index.tsx}

@@ -1,6 +1,6 @@
-import GoodsListState from '../GoodsListState';
-import IGood from './IGood';
-import LineAttributeType from './LineAttributeType';
+import GoodsListState from '../../GoodsListState';
+import IGood from '../IGood';
+import LineAttributeType from '../LineAttributeType';
 
 export default class EndowCode {
 

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/{IGood.ts → IGood/index.ts}

@@ -1,4 +1,4 @@
-import LineAttributeType from './LineAttributeType';
+import LineAttributeType from '../LineAttributeType';
 
 export default interface IGood {
   /** 数据索引 */
@@ -10,14 +10,26 @@ export default interface IGood {
   /** 发票ID */
   id?: string;
 
-  /** 货物名称 */
+  /** 商品编码(对方-销售) */
+  itemCode?: string;
+
+  /** 货物名称(对方-销售) */
   itemName?: string;
 
-  /** 货物规格型号 */
+  /** 单位(对方-销售) */
+  unit?: string;
+
+  /** 货物规格型号(对方-销售) */
   itemModelName?: string;
 
-  /** 单位 */
-  unit?: string;
+  /** 商品编码(我方-购买) */
+  itemCodeSelf?: string;
+
+  /** 货物名称(我方-购买) */
+  itemNameSelf?: string;
+
+  /** 货物规格型号(我方-购买) */
+  itemModelNameSelf?: string;
 
   /** 数量 */
   quantity?: number;

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/ProductComparison/index.ts

@@ -0,0 +1,10 @@
+import IGood from "../IGood";
+
+export default class ProductComparison {
+
+    /** 执行商品对照 */
+    onComply?: (e: IGood[]) => Promise<IGood[]>
+
+    /** 更新对照表 */
+    // onUpdateComparisonTable?: (e: IGood, values:any) => Promise<void>
+}

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.ts

@@ -1,6 +1,7 @@
 import IGood from './IGood';
 import ImportGoods from './ImportGoods';
 import EndowCode from './EndowCode';
+import ProductComparison from './ProductComparison';
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import InvoiceController from '../..';
 
@@ -21,6 +22,9 @@ export default class GoodsListState {
   /** 是否含税 */
   isTaxIncluded = true;
 
+  /** 是否显示我方 */
+  isMyShow = false;
+
   /** 正在编辑的货物 */
   editGood?: IGood;
 
@@ -60,6 +64,12 @@ export default class GoodsListState {
   /** 导入商品的相关数据 */
   importGoods = new ImportGoods();
 
+  /** 商品对照 相关 */
+  productComparison = new ProductComparison();
+
   /** 是否显购买示导入抽屉 */
   isVisibleDrawer = false;
+
+  /** 正在 添加商品对照 的货物 */
+  addComparisonIndex?: number;
 }

package/src/Invoice/_test/importGoods/index.tsx

@@ -1,8 +1,11 @@
-import { Button } from 'kts-components-antd-x3/lib/radio';
+
 import React from 'react';
-import { Invoice } from '../../../';
+import { Button } from 'kts-components-antd-x3/lib/radio';
+import { Invoice, IGood } from '../../../';
 import { IGetBuyerListOption } from '../../../Invoice/InvoiceController/InvoiceControllerState/BuyerState';
 
+const InvoiceController = Invoice.InvoiceController
+
 export default () => {
 
   // 初始化控制器
@@ -17,7 +20,7 @@ export default () => {
 };
 
 // 重写 购买方 的数据源，实现 ‘获取 购买方 列表’ 方法
-class MyInvoiceController extends Invoice.InvoiceController {
+class MyInvoiceController extends InvoiceController {
   constructor() {
     super();
 
@@ -31,6 +34,21 @@ class MyInvoiceController extends Invoice.InvoiceController {
       },
     ];
 
+    // 设置比对方法
+    this.state.goodsListState.productComparison = {
+      onComply: async (e: IGood[]) => {
+        return e.map(e => {
+          return {
+            ...e,
+            itemNameOther: e.itemName + '(他方)',
+            unitOther: e.unit + '(他方)',
+            itemModelNameOther: e.itemModelName + '(他方)',
+            itemCodeOther: e.itemCode + '(他方)',
+          }
+        })
+      }
+    }
+
     this.state.en = '08'
     this.state.invoiceType = '10'
   }

package/src/Invoice/index.tsx

@@ -9,6 +9,7 @@ import Buyer from './ui/Buyer';
 import ImportBuyerDrawer from './ui/ImportBuyerDrawer';
 import ImportGoodsDrawer from './ui/ImportGoodsDrawer';
 import EndowCodeDrawer from './ui/EndowCodeDrawer';
+import AddComparisonDrawer from './ui/AddComparisonDrawer';
 import idGenerator from './tools/idGenerator';
 
 /** 发票组件的上下文 */
@@ -39,7 +40,7 @@ export interface IInvoiceProps {
   footExpand?: React.ReactNode;
 }
 
-export default class extends React.PureComponent<IInvoiceProps> {
+export default class Invoice extends React.PureComponent<IInvoiceProps> {
   /** 控制器 */
   static readonly InvoiceController = InvoiceController;
 
@@ -100,6 +101,9 @@ const Main = (props: IInvoiceProps) => {
 
       {/* 给货品赋码的抽屉 */}
       <EndowCodeDrawer />
+
+      {/* 添加商品对照的抽屉 */}
+      <AddComparisonDrawer />
     </InvoiceContext.Provider>
   );
 };

package/src/Invoice/tools/itemName/index.ts

@@ -0,0 +1,48 @@
+
+export interface ISN {
+
+    /** 简称 */
+    shorthand?: string;
+
+    /** 全称 */
+    full: string
+}
+
+/** 拆分全称加简称 */
+export const getSN = (value?: string): ISN | undefined => {
+    debugger;
+    if (!value) return undefined;
+    const arr = value.match(/\*[^*]+\*/);
+    if (arr && arr[0]) {
+        return { shorthand: arr[0].split('*')[1], full: value.replace(arr[0], '') };
+    } else {
+        return { shorthand: undefined, full: value };
+    }
+};
+
+/** 组合全称加简称 */
+export const getItemName = (value: ISN) => {
+    if (value.shorthand) {
+        return `*${value.shorthand}*${value.full}`;
+    } else {
+        return value.full;
+    }
+}
+
+/** 设置全称 */
+export const setFull = (name?:string, full?:string) => {
+    const sn = getSN(name);
+    if(!sn) return full;
+    sn.full = full || '';
+    return getItemName(sn);
+}
+
+/** 设置简称 */
+export const setShorthand = (name?:string, shorthand?:string) => {
+    if(!name) return undefined
+
+    const sn = getSN(name);
+    if(!sn) return undefined;
+    sn.shorthand = shorthand || '';
+    return getItemName(sn);
+}

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

@@ -0,0 +1,135 @@
+
+import React from "react";
+import { Row, Col, Input, Button } from "kts-components-antd-x3";
+import { Form, Drawer } from "kts-xui";
+import { Invoice } from "../../../";
+import { getSN } from "../../tools/itemName";
+
+export default function AddComparisonDrawer() {
+
+    const [form] = Form.useForm();
+
+    /** 控制器 */
+    const controller = Invoice.useInvoiceController();
+
+    /** 正在 添加商品对照 的货物索引 */
+    const addComparisonIndex = controller.useMemo(s => s.goodsListState.addComparisonIndex, []);
+
+    /** 货物字典 */
+    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
+
+    /** 正在 对照 的货物 */
+    const good = React.useMemo(() => addComparisonIndex ? goodsMap.get(addComparisonIndex) : undefined, [addComparisonIndex]);
+
+    /** 关闭对照 */
+    const onClose = React.useCallback(controller.pipeline<any>(async s => { s.goodsListState.addComparisonIndex = undefined }), [controller]);
+
+    /** 提交数据 */
+    const onSubmit = React.useCallback(() => {
+        controller.run(async s => {
+            if (!good) return
+
+            try {
+                const values = await form.validateFields()
+                const shorthand = s.goodsListState.isMyShow ? getSN(good.itemNameSelf)?.shorthand : getSN(good.itemName)?.shorthand;
+
+                good.itemCode = values.itemCode;
+                good.itemCodeSelf = values.itemCodeSelf;
+                good.itemName = shorthand ? `*${shorthand}*${values.itemName}` : values.itemName;
+                good.itemNameSelf = shorthand ? `*${shorthand}*${values.itemNameSelf}` : values.itemNameSelf;
+                good.itemModelName = values.itemModelName;
+                good.itemModelNameSelf = values.itemModelNameSelf;
+
+                s.goodsListState.addComparisonIndex = undefined;
+                s.goodsListState.goodsList = [...s.goodsListState.goodsList];
+            } catch (error) {
+
+            }
+        })
+    }, [form, good])
+
+    React.useEffect(() => {
+        form.resetFields();
+        if (good) {
+            form.setFieldsValue({
+                ...good,
+                itemName: getSN(good.itemName)?.full,
+                itemNameSelf: getSN(good.itemNameSelf)?.full,
+            })
+        }
+    }, [good])
+
+    return (
+        <Drawer
+            width={500}
+            onClose={onClose}
+            placement="right"
+            title="添加商品对照"
+            visible={!!good}
+            footer={
+                <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 10 }} >
+                    <Button type="primary" onClick={onSubmit} >提交</Button>
+                    <Button onClick={onClose} >取消</Button>
+                </div>
+            }
+        >
+            {
+                !!good &&
+                <Form layout="vertical" style={{ flex: 1 }} form={form} >
+                    <Row gutter={[8, 8]} >
+                        <Col span={12}>
+                            <Form.Item
+                                name="itemCodeSelf"
+                                label="我方商品编码"
+                            >
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item
+                                name="itemCode"
+                                label="对方商品编码"
+                            >
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item
+                                name="itemNameSelf"
+                                label="我方商品名称"
+                            >
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item
+                                name="itemName"
+                                label="对方商品名称"
+                            >
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item name='itemModelNameSelf' label="我方规格型号">
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item name="itemModelName" label="对方规格型号">
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                    </Row>
+                </Form>
+            }
+        </Drawer>
+    )
+}
+
+// function validateFields(form: WrappedFormUtils<any>) {
+//     return new Promise<{ err: any, values: any }>(resolve => {
+//         form.validateFields((err, values) => {
+//             resolve({ err, values })
+//         })
+//     })
+// }

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

@@ -8,6 +8,7 @@ import { LineAttributeType } from '../../InvoiceController';
 import IGood from '../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
 import { countTaxAmount } from '../../tools/calculate';
 import { bytesLnegth, cutStr } from '../../tools/strringFn';
+import { setShorthand } from '../../tools/itemName';
 import {
   SchemaForm,
   FormButtonGroup,
@@ -289,9 +290,12 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       endowCodeGood.forEach(good => {
         if (!good) return;
 
+        good.itemName = setShorthand(good.itemName, values.shorthand);
+        good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand);
+        
         // const name = getItemName(good.itemName, values.shorthand);
-
-        good.itemName = getItemName(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
+        // good.itemName = getItemName(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
+        
         good.taxClassificationCode = values.taxClassificationCode;
         good.taxRate = values.taxRate;
         good.taxFreeType = values.taxFreeType;
@@ -462,18 +466,3 @@ const getShorthand = (value?: string) => {
     return undefined;
   }
 };
-
-/** 简称填入名称 */
-const getItemName = (value?: string, shorthand?: string) => {
-  if (!value) value = '';
-  if (!shorthand) {
-    return value.replace(/\*[^*]+\*/, ``);
-  }
-
-  const arr = value.match(/\*[^*]+\*/);
-  if (arr) {
-    return value.replace(/\*[^*]+\*/, `*${shorthand}*`);
-  } else {
-    return `*${shorthand}*${value}`;
-  }
-}

package/src/Invoice/ui/GoodsList/hook/useColumns/autoFillFn/index.ts

@@ -7,6 +7,7 @@
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import InvoiceController, { IGood, LineAttributeType } from '../../../../../InvoiceController';
 import evaluate from '../../../../../tools/evaluate';
+import { getSN, setShorthand } from '../../../../../tools/itemName';
 import { message } from 'kts-components-antd-x3'
 import { format2, format15, countTaxAmount, countAmountExcludeTax, countPrice } from '../../../../../tools/calculate';
 import moment from 'moment';
@@ -446,3 +447,18 @@ export const endowCode = async (controller: InvoiceController, goods: IGood) =>
   })();
 }
 
+/** 修改了 货物名称 */
+export const onChangeItemName = async (controller: InvoiceController, form: WrappedFormUtils<any>, record: IGood) => {
+  controller.run(async s => {
+    const value = form.getFieldsValue().itemName;
+    const shorthand = getSN(value)?.shorthand ?? '';
+
+    if (s.goodsListState.isMyShow) {
+      await controller.setEditGood({ itemNameSelf: value });
+      record.itemName && await controller.setEditGood({ itemName: setShorthand(record.itemName, shorthand) });
+    } else {
+      await controller.setEditGood({ itemName: value });
+      record.itemNameSelf && await controller.setEditGood({ itemNameSelf: setShorthand(record.itemNameSelf, shorthand) });
+    }
+  })
+}