kts-component-invoice-operate 3.2.60 → 3.2.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.60",
+  "version": "3.2.62",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -10,4 +10,7 @@ export default class Drag {
 
     /** 准备插入的货物索引 */
     container?: string;
+
+    /** 插入位置 */
+    site?: 'u' | 'd'
 }

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

@@ -1,6 +1,7 @@
 enum LineAttributeType {
     正常 = 0,
     折扣行 = 1,
-    被折扣行 = 2
+    被折扣行 = 2,
+    折让行 = 3,
 }
 export default LineAttributeType;

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

@@ -43,7 +43,7 @@ export default class GoodsListState {
   columnsReplenish: { [key: string]: IColumnsReplenish } = {};
 
   /** 商品表格隐藏列 */
-  columnshide:string[] = ['itemCode'];
+  columnshide: string[] = ['itemCode'];
 
   /** 单位列表 */
   unitList: string[] = [];
@@ -99,6 +99,9 @@ export default class GoodsListState {
   /** 是否可以合并折扣 */
   isMergeDiscount = false;
 
+  /** 是否可以销售折让 */
+  isSalesDiscount = false;
+
   /** 正在 添加商品对照 的货物 */
   addComparisonIndex?: string;
 

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

@@ -149,7 +149,7 @@ const lines: any[] = [
     "itemName": "*配电控制设备*公牛(BULL)",
     "lineAmountExcludeTax": 443365.88,
     "lineAmountIncludeTax": 501003.53,
-    "lineAttribute": "2",
+    "lineAttribute": 0,
     "lineDiscountExcludeTax": 4433.66,
     "lineDiscountRate": null,
     "lineId": "1740823580142206976",
@@ -200,7 +200,7 @@ const lines: any[] = [
     "itemName": "*配电控制设备*公牛(BULL)",
     "lineAmountExcludeTax": -4433.66,
     "lineAmountIncludeTax": -5010.04,
-    "lineAttribute": "1",
+    "lineAttribute": 0,
     "lineDiscountExcludeTax": null,
     "lineDiscountRate": null,
     "lineId": "1740823580142206976",
@@ -234,6 +234,57 @@ const lines: any[] = [
     "taxRate": 13,
     "unit": "",
     "zeroTaxRateFlag": null
+  },
+  {
+    "buyersItemCode": null,
+    "buyersItemModelName": "GN-G32Z104",
+    "buyersItemName": "打折",
+    "buyersItemUnit": null,
+    "discount": null,
+    "discountGroup": "31b6d887-4877-4926-abe8-ab49ef6902da",
+    "dispatchDocumentReference": null,
+    "dispatchLineReference": null,
+    "favouredPolicyMark": "0",
+    "favouredPolicyName": null,
+    "id": "40823568750477313",
+    "itemModelName": "",
+    "itemName": "打折",
+    "lineAmountExcludeTax": -100,
+    "lineAmountIncludeTax": -100,
+    "lineAttribute": 3,
+    "lineDiscountExcludeTax": null,
+    "lineDiscountRate": null,
+    "lineId": "1740823580142206976",
+    "lineOrder": 2,
+    "materialCode": null,
+    "noticeCodeNo": null,
+    "noticeLineId": null,
+    "orderLineId": null,
+    "orderLineReference": null,
+    "orderNo": null,
+    "orderReference": null,
+    "priceExcludeTax": null,
+    "priceIncludeTax": null,
+    "quantity": null,
+    "receiptDocumentReference": null,
+    "receiptLineReference": null,
+    "reconciliationDocumentReference": null,
+    "reconciliationSheetLineReference": null,
+    "relationReferences": null,
+    "requisitionLineNo": null,
+    "sellersItemCode": null,
+    "sellersItemModelName": null,
+    "sellersItemName": "*配电控制设备*1",
+    "sellersItemUnit": null,
+    "specialManagement": null,
+    "statementCode": null,
+    "statementLineId": null,
+    "taxAmount": -576.38,
+    "taxClassificationCode": "1090407030000000000",
+    "taxDiscount": null,
+    "taxRate": 0,
+    "unit": "",
+    "zeroTaxRateFlag": null
   }
 ]
 

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

@@ -4,9 +4,9 @@ const keys: { [key: string]: any } = {}
 
 /**
  * 有冷却时间的函数
- * @param fn 方法
  * @param key 方法key
  * @param delayed 冷却时间
+ * @param fn 方法
  */
 export default (key: string = 'default', delayed: number = 200, fn: Function) => {
     if (keys[key]) {

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/Drag/index.tsx

@@ -34,32 +34,30 @@ export default function Drag(props: IDragProps) {
         const currentGood = controller.state.goodsListState.goodsList.filter(e => e.$index === record.$index)[0];
         mounting(<DragDiv {...currentGood} />)
 
-        // 监听移动
-        rowList.forEach(e => { e.addEventListener('mouseover', onMouseover) });
-        function onMouseover(e: MouseEvent) {
+        rowList.forEach(e => { e.addEventListener('mousemove', onMousemove) });
+        function onMousemove(e: MouseEvent) {
             controller.run(async s => {
-                const container = s.goodsListState.drag.container = getRow(e.target)?.dataset?.rowKey;
-                if (!container) return;
+                const rowDom = getRow(e.target);
+                const container = s.goodsListState.drag.container = rowDom?.dataset?.rowKey;
+
+                /** 准备插入的货物 */
+                const row = s.goodsListState.goodsMap.get(container); if (!row) return;
 
                 // 不可以插入自己
                 if (container === s.goodsListState.drag.current) {
-                    s.goodsListState.drag.container = undefined;
-                    return;
+                    return s.goodsListState.drag.container = undefined;
                 }
 
-                const currentGood = s.goodsListState.drag.current && s.goodsListState.goodsMap.get(s.goodsListState.drag.current);
-                if (!currentGood) return;
-
-                const row = s.goodsListState.goodsMap.get(container);
-                if (!row) return;
+                /** 当前拖动中的货品 */
+                const currentGood = s.goodsListState.drag.current && s.goodsListState.goodsMap.get(s.goodsListState.drag.current); if (!currentGood) return;
 
                 // 折扣行 不可以插入 自己的被折扣行
                 if (currentGood.lineAttribute === LineAttributeType.折扣行) {
                     const currentIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(currentGood.$index)
                     const containerIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(row.$index)
                     if (currentIndex - 1 === containerIndex) {
-                        s.goodsListState.drag.container = undefined;
-                        return;
+                        return s.goodsListState.drag.container = undefined;
+
                     }
                 }
 
@@ -68,8 +66,7 @@ export default function Drag(props: IDragProps) {
                     const currentIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(currentGood.$index)
                     const containerIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(row.$index)
                     if (currentIndex + 1 === containerIndex) {
-                        s.goodsListState.drag.container = undefined;
-                        return;
+                        return s.goodsListState.drag.container = undefined;
                     }
                 }
 
@@ -77,9 +74,15 @@ export default function Drag(props: IDragProps) {
                 if (row.lineAttribute === LineAttributeType.折扣行) {
                     const t = s.goodsListState.goodsList.map(e => e.$index).indexOf(container) - 1;
                     s.goodsListState.drag.container = s.goodsListState.goodsList[t].$index;
+                    s.goodsListState.drag.site = 'u'
+                } else if (row.lineAttribute === LineAttributeType.被折扣行) {
+                    s.goodsListState.drag.site = 'd'
+                } else {
+                    const rect = rowDom.getBoundingClientRect();
+                    const mouseY = e.clientY - rect.top;
+                    s.goodsListState.drag.site = mouseY > 15 ? 'd' : 'u';
                 }
-            });
-
+            })
 
             const getRow = (t: any): any => {
                 try {
@@ -100,7 +103,7 @@ export default function Drag(props: IDragProps) {
             insert();
             controller.run(async s => s.goodsListState.drag.current = undefined);
             window.removeEventListener('mouseup', onMouseup);
-            rowList.forEach(e => { e.removeEventListener('mouseover', onMouseover) });
+            rowList.forEach(e => { e.removeEventListener('mousemove', onMousemove) });
             // window.document.body.removeChild(rowDiv);
         }
 
@@ -108,7 +111,7 @@ export default function Drag(props: IDragProps) {
         function insert() {
             mounting(<></>);
             controller.run(async s => {
-                const { container, current } = s.goodsListState.drag;
+                const { container, current, site } = s.goodsListState.drag;
                 if (!container || !current) return;
                 if (container !== current) {
                     const goodsList = s.goodsListState.goodsList;
@@ -126,7 +129,7 @@ export default function Drag(props: IDragProps) {
 
                     (() => {
                         const g = s.goodsListState.goodsList.filter(e => moveGoods.indexOf(e.$index) < 0);
-                        const t = g.map(e => e.$index).indexOf(container);
+                        const t = site === 'u' ? g.map(e => e.$index).indexOf(container) : g.map(e => e.$index).indexOf(container) + 1;
                         const m = moveGoods.map(e => goodsMap.get(e)).filter(e => !!e) as IGood[];
                         s.goodsListState.goodsList = (g.splice.apply(g, [t, 0, ...m]), g);
                     })()

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useDelItem/index.tsx

@@ -17,6 +17,10 @@ export default (goods: IGood) => {
         controller.delGood(goods.$index);
     }, [controller, goods.$index]);
 
+    if (goods.lineAttribute === LineAttributeType.折让行) {
+        return undefined;
+    }
+
     if (goods.lineAttribute === LineAttributeType.被折扣行) {
         return undefined;
     }

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useEndowCode/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 // import { Button } from 'kts-components-antd-x3';
 import Invoice from '../../../../../../../../..';
-import { IGood } from '../../../../../../../../../InvoiceController';
+import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
 import { endowCode } from '../../../../autoFillFn';
 
 // const { Text } = Typography;
@@ -14,6 +14,10 @@ export default (goods: IGood) => {
         endowCode(controller, goods);
     }, [controller, goods]);
 
+    if (goods.lineAttribute === LineAttributeType.折让行) {
+        return undefined;
+    }
+
     return {
         key: 'endowCode',
         title: '赋码',

package/src/Invoice/ui/default/GoodsList/hook/useRowSelection/index.tsx

@@ -84,7 +84,7 @@ export default () => {
         await controller.pipeline(async s => {
             s.goodsListState.selectedGoodIndex.forEach($index => {
                 const goods = s.goodsListState.goodsMap.get($index);
-                if (!goods || goods.lineAttribute === LineAttributeType.正常) return;
+                if (!goods || (goods.lineAttribute !== LineAttributeType.折扣行 && goods.lineAttribute !== LineAttributeType.被折扣行)) return;
 
                 // 数组位置
                 let t = s.goodsListState.goodsList.indexOf(goods);

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

@@ -29,6 +29,7 @@ import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
 import useAddDiscountRowButton from './ui/BulkMenu/hooks/useAddDiscountRowButton';
 import useMergeDetails from './ui/BulkMenu/hooks/useMergeDetails';
 import useMergeDiscount from './ui/BulkMenu/hooks/useMergeDiscount';
+import uaeSalesDiscount from './ui/BulkMenu/hooks/uaeSalesDiscount';
 
 export interface IGoodsListProps {
   /** 扩展部分 */
@@ -91,6 +92,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   /** 全单合并折扣 */
   const mergeDiscount = useMergeDiscount()
 
+  /** 销售折让 */
+  const salesDiscount = uaeSalesDiscount()
+
   /** 清空自动赋码缓存 */
   React.useEffect(() => {
     controller.run(async s => { s.goodsListState.endowCode.cache = {} });
@@ -149,6 +153,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
           {/* 添加折扣行 */}
           {addDiscountRowButton.drawer}
 
+          {/* 销售折让 */}
+          {salesDiscount.button}
+
           {/* 搜索 */}
           <Search />
         </div>

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

@@ -0,0 +1,104 @@
+
+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 uaeSalesDiscount() {
+
+    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));
+
+        /** 折让行 */
+        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/useEndowCodeButton/index.tsx

@@ -2,9 +2,10 @@ 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, []);
@@ -31,6 +32,12 @@ export default () => {
         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;
     })();

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

@@ -1,4 +1,4 @@
-.kts-invoice-operate-goods-list-itemName-drag-container {
+.kts-invoice-operate-goods-list-itemName-drag-container-u {
   position: relative;
 
   &::after {
@@ -11,4 +11,19 @@
     top       : 0;
     z-index   : 9999;
   }
+}
+
+.kts-invoice-operate-goods-list-itemName-drag-container-d {
+  position: relative;
+
+  &::after {
+    content   : " ";
+    width     : 100%;
+    height    : 2px;
+    background: #0074ff;
+    position  : absolute;
+    left      : 0;
+    bottom    : 0;
+    z-index   : 9999;
+  }
 }

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

@@ -12,8 +12,13 @@ export default function TableRow(props: any) {
 
     const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, [])
 
+    /** 当前拖动中的货品索引 */
     const current = controller.useMemo(s => s.goodsListState.drag.current, [])
 
+    /** 当前拖动中的货品索引 */
+    const site = controller.useMemo(s => s.goodsListState.drag.site, [])
+
+    /** 准备插入的货物索引 */
     const container = controller.useMemo(s => s.goodsListState.drag.container, [])
 
     const good = React.useMemo(() => goodsMap?.get(rowKey), [rowKey, goodsMap])
@@ -40,7 +45,13 @@ export default function TableRow(props: any) {
             ) : (
                 <tr
                     {...props}
-                    className={classnames(props.className, discount, (rowKey === container && current) ? 'kts-invoice-operate-goods-list-itemName-drag-container' : undefined)}
+                    className={classnames(
+                        props.className,
+                        discount,
+                        (rowKey === container && current)
+                            ? 'kts-invoice-operate-goods-list-itemName-drag-container-' + site
+                            : undefined
+                    )}
                 />
             )
     )