kts-component-invoice-operate 3.2.88 → 3.2.90

package/README.md

@@ -6,4 +6,4 @@
 南湖：https://lanhuapp.com/web/#/item/project/detailDetach?pid=7daf94b0-9aa7-4372-89a7-226f389b021d&project_id=7daf94b0-9aa7-4372-89a7-226f389b021d&image_id=3bc42812-5718-4aa5-b088-5bc7e0c9a62f&fromEditor=true
 
 
-node 16.20.2
+node 16.20.2

package/dist/index.esm.js

@@ -2274,8 +2274,8 @@ function _mergeDiscount() {
                 sum.quantity = good.quantity;
 
                 if (sum.quantity) {
-                  sum.priceExcludeTax = chain$1(bignumber(good.lineAmountExcludeTax)).divide(bignumber(good.quantity)).done().toNumber();
-                  sum.priceIncludeTax = chain$1(bignumber(good.lineAmountIncludeTax)).divide(bignumber(good.quantity)).done().toNumber();
+                  sum.priceExcludeTax = chain$1(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+                  sum.priceIncludeTax = chain$1(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
                 }
 
                 goodsList.splice(i, 2, sum);
@@ -15210,34 +15210,24 @@ function useSalesGifts() {
     }, _callee, null, [[1, 12, 15, 18]]);
   })), [controller, giveaways]);
   var onClickManual = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var _controller$state$goo, goodsMap, selectedGoodIndex, giveaways, content, _iterator2, _step2, g;
+    var _controller$state$goo, goodsMap, _selectedGoodIndex, _giveaways, _iterator2, _step2, g;
 
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
-            giveaways = selectedGoodIndex.map(function (e) {
+            _context2.prev = 0;
+            _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, _selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
+            _giveaways = _selectedGoodIndex.map(function (e) {
               return goodsMap.get(e);
             }).filter(function (e) {
               return !!e;
             });
-
-            if (!(giveaways.some(function (e) {
-              return e.lineAttribute === LineAttributeType$1.正常 || e.lineAttribute === LineAttributeType$1.赠品行;
-            }) === false)) {
-              _context2.next = 5;
-              break;
-            }
-
-            content = '只能选择‘赠品行’和‘正常行’';
-            return _context2.abrupt("return", message.error({
-              content: content,
-              key: content
-            }));
+            _context2.next = 5;
+            return checkLineAttribute(_giveaways);
 
           case 5:
-            _iterator2 = _createForOfIteratorHelper(giveaways);
+            _iterator2 = _createForOfIteratorHelper(_giveaways);
             _context2.prev = 6;
 
             _iterator2.s();
@@ -15278,13 +15268,19 @@ function useSalesGifts() {
 
           case 22:
             controller.state.goodsListState.selectedGoodIndex = [];
+            _context2.next = 27;
+            break;
 
-          case 23:
+          case 25:
+            _context2.prev = 25;
+            _context2.t1 = _context2["catch"](0);
+
+          case 27:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[6, 16, 19, 22]]);
+    }, _callee2, null, [[0, 25], [6, 16, 19, 22]]);
   })), [controller]);
   var items = React.useMemo(function () {
     return [{
@@ -15313,6 +15309,22 @@ function useSalesGifts() {
     button: button
   };
 }
+/** 只能选择‘赠品行’和‘正常行’ */
+
+function checkLineAttribute(giveaways) {
+  giveaways.forEach(function (e) {
+    if (e.lineAttribute === LineAttributeType$1.正常 || e.lineAttribute === LineAttributeType$1.赠品行) {
+      return;
+    } else {
+      var content = '只能选择‘赠品行’和‘正常行’';
+      message.error({
+        content: content,
+        key: content
+      });
+      throw new Error(content);
+    }
+  });
+}
 
 var GoodsList = /*#__PURE__*/function (_React$Component) {
   _inherits(GoodsList, _React$Component);

package/dist/index.js

@@ -2284,8 +2284,8 @@ function _mergeDiscount() {
                 sum.quantity = good.quantity;
 
                 if (sum.quantity) {
-                  sum.priceExcludeTax = mathjs.chain(mathjs.bignumber(good.lineAmountExcludeTax)).divide(mathjs.bignumber(good.quantity)).done().toNumber();
-                  sum.priceIncludeTax = mathjs.chain(mathjs.bignumber(good.lineAmountIncludeTax)).divide(mathjs.bignumber(good.quantity)).done().toNumber();
+                  sum.priceExcludeTax = mathjs.chain(mathjs.bignumber(sum.lineAmountExcludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber();
+                  sum.priceIncludeTax = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber();
                 }
 
                 goodsList.splice(i, 2, sum);
@@ -15220,34 +15220,24 @@ function useSalesGifts() {
     }, _callee, null, [[1, 12, 15, 18]]);
   })), [controller, giveaways]);
   var onClickManual = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var _controller$state$goo, goodsMap, selectedGoodIndex, giveaways, content, _iterator2, _step2, g;
+    var _controller$state$goo, goodsMap, _selectedGoodIndex, _giveaways, _iterator2, _step2, g;
 
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
-            giveaways = selectedGoodIndex.map(function (e) {
+            _context2.prev = 0;
+            _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, _selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
+            _giveaways = _selectedGoodIndex.map(function (e) {
               return goodsMap.get(e);
             }).filter(function (e) {
               return !!e;
             });
-
-            if (!(giveaways.some(function (e) {
-              return e.lineAttribute === LineAttributeType$1.正常 || e.lineAttribute === LineAttributeType$1.赠品行;
-            }) === false)) {
-              _context2.next = 5;
-              break;
-            }
-
-            content = '只能选择‘赠品行’和‘正常行’';
-            return _context2.abrupt("return", ktsComponentsAntdX3.message.error({
-              content: content,
-              key: content
-            }));
+            _context2.next = 5;
+            return checkLineAttribute(_giveaways);
 
           case 5:
-            _iterator2 = _createForOfIteratorHelper(giveaways);
+            _iterator2 = _createForOfIteratorHelper(_giveaways);
             _context2.prev = 6;
 
             _iterator2.s();
@@ -15288,13 +15278,19 @@ function useSalesGifts() {
 
           case 22:
             controller.state.goodsListState.selectedGoodIndex = [];
+            _context2.next = 27;
+            break;
 
-          case 23:
+          case 25:
+            _context2.prev = 25;
+            _context2.t1 = _context2["catch"](0);
+
+          case 27:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[6, 16, 19, 22]]);
+    }, _callee2, null, [[0, 25], [6, 16, 19, 22]]);
   })), [controller]);
   var items = React__default['default'].useMemo(function () {
     return [{
@@ -15323,6 +15319,22 @@ function useSalesGifts() {
     button: button
   };
 }
+/** 只能选择‘赠品行’和‘正常行’ */
+
+function checkLineAttribute(giveaways) {
+  giveaways.forEach(function (e) {
+    if (e.lineAttribute === LineAttributeType$1.正常 || e.lineAttribute === LineAttributeType$1.赠品行) {
+      return;
+    } else {
+      var content = '只能选择‘赠品行’和‘正常行’';
+      ktsComponentsAntdX3.message.error({
+        content: content,
+        key: content
+      });
+      throw new Error(content);
+    }
+  });
+}
 
 var GoodsList = /*#__PURE__*/function (_React$Component) {
   _inherits(GoodsList, _React$Component);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.88",
+  "version": "3.2.90",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

package/src/Invoice/InvoiceController/fns/mergeDiscount.ts

@@ -13,13 +13,13 @@ export default async function mergeDiscount(state: InvoiceControllerState) {
         if (good.lineAttribute * 1 === LineAttributeType.被折扣行) {
             const sum: IGood = { ...good, $index: idGenerator(), lineAttribute: LineAttributeType.正常, discountGroup: undefined };
             const zk = goodsList[i + 1];
-
+            
             sum.lineAmountExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).subtract(bignumber(Math.abs(zk.lineAmountExcludeTax || 0))).done().toNumber();
             sum.lineAmountIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).subtract(bignumber(Math.abs(zk.lineAmountIncludeTax || 0))).done().toNumber();
             sum.quantity = good.quantity;
             if (sum.quantity) {
-                sum.priceExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).divide(bignumber(good.quantity)).done().toNumber();
-                sum.priceIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).divide(bignumber(good.quantity)).done().toNumber();
+                sum.priceExcludeTax = chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+                sum.priceIncludeTax = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
             }
 
             goodsList.splice(i, 2, sum);

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

@@ -66,6 +66,8 @@ class MyController1 extends Invoice.InvoiceController {
     this.state.model = 'default'
     this.state.goodsListState.isMergeDetails = true;
     this.state.goodsListState.isSalesDiscount = true;
+    this.state.goodsListState.isMergeDiscount = true;
+    this.state.goodsListState.isSalesGifts = true;
     this.state.goodsListState.drag.isStart = true;
     this.state.goodsListState.columnshide = [];
   }
@@ -94,6 +96,8 @@ class MyController2 extends Invoice.InvoiceController {
     this.state.model = 'prefab'
     this.state.goodsListState.isMergeDetails = true;
     this.state.goodsListState.isSalesDiscount = true;
+    this.state.goodsListState.isMergeDiscount = true;
+    this.state.goodsListState.isSalesGifts = true;
     this.state.goodsListState.drag.isStart = true;
     this.state.goodsListState.columnshide = [];
   }

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

@@ -1,7 +1,6 @@
 
 import React from "react"
 import { Button, message } from "kts-components-antd-x3"
-import { chain, bignumber } from 'mathjs';
 import Invoice from '../../../../../../..'
 import { IGood, LineAttributeType } from "../../../../../../../InvoiceController";
 import { Dropdown, MenuProps } from "kts-xui";
@@ -27,19 +26,20 @@ export default function useSalesGifts() {
     }, [controller, giveaways])
 
     const onClickManual = React.useCallback(async () => {
-        const { goodsMap, selectedGoodIndex } = controller.state.goodsListState;
-        const giveaways = selectedGoodIndex.map(e => goodsMap.get(e) as IGood).filter(e => !!e);
+        try {
+            const { goodsMap, selectedGoodIndex } = controller.state.goodsListState;
+            const giveaways = selectedGoodIndex.map(e => goodsMap.get(e) as IGood).filter(e => !!e);
 
-        if (giveaways.some(e => e.lineAttribute === LineAttributeType.正常 || e.lineAttribute === LineAttributeType.赠品行) === false) {
-            const content = '只能选择‘赠品行’和‘正常行’';
-            return message.error({ content, key: content });
-        }
+            await checkLineAttribute(giveaways);
 
-        for (let g of giveaways) {
-            await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
-        }
+            for (let g of giveaways) {
+                await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
+            }
 
-        controller.state.goodsListState.selectedGoodIndex = [];
+            controller.state.goodsListState.selectedGoodIndex = [];
+        } catch (error) {
+
+        }
     }, [controller])
 
     const items: MenuProps['items'] = React.useMemo(() => {
@@ -73,4 +73,17 @@ export default function useSalesGifts() {
         /** 按钮 */
         button,
     }
+}
+
+/** 只能选择‘赠品行’和‘正常行’ */
+function checkLineAttribute(giveaways: IGood[]) {
+    giveaways.forEach(e => {
+        if (e.lineAttribute === LineAttributeType.正常 || e.lineAttribute === LineAttributeType.赠品行) {
+            return;
+        } else {
+            const content = '只能选择‘赠品行’和‘正常行’';
+            message.error({ content, key: content });
+            throw new Error(content);
+        }
+    })
 }