npm - kts-component-invoice-operate - Versions diffs - 3.2.83 → 3.2.84 - Mend

kts-component-invoice-operate 3.2.83 → 3.2.84

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/index.esm.js +42 -57
package/dist/index.js +42 -57
package/package.json +1 -1
package/src/Invoice/_test/endowCode/index.tsx +58 -3
package/src/Invoice/ui/default/GoodsList/hook/useRowSelection/index.tsx +4 -1
package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useSalesDiscount/index.tsx +18 -19

package/dist/index.esm.js CHANGED Viewed

@@ -14825,63 +14825,41 @@ function useSalesDiscount() {
   var selectedGoodIndex = controller.useMemo(function (s) {
     return s.goodsListState.selectedGoodIndex;
   }, []);
-  var goodsMap = controller.useMemo(function (s) {
-    return s.goodsListState.goodsMap;
+  var goodsList = controller.useMemo(function (s) {
+    return s.goodsListState.goodsList;
   }, []);
   var isSalesDiscount = controller.useMemo(function (s) {
     return s.goodsListState.isSalesDiscount;
   }, []);
   var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var selectedGood, content, concession, _content, discountGood, totalDiscoline, discolinesSum, totalAmount, discolines, surplus, i;
+    var selectedGood, concessions, discountGood, totalDiscoline, discolinesSum, totalAmount, discolines, surplus, i;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            selectedGood = selectedGoodIndex.map(function (e) {
-              return goodsMap.get(e);
-            });
-            if (!(selectedGood.filter(function (e) {
-              return (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.折扣行 || (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.被折扣行;
-            }).length > 0)) {
-              _context3.next = 5;
-              break;
-            }
-            content = '不能选择折扣行和被折扣行';
-            message.error({
-              content: content,
-              key: content
+            selectedGood = goodsList.filter(function (e) {
+              return e.lineAttribute === LineAttributeType$1.折让行 || e.lineAttribute === LineAttributeType$1.正常;
             });
-            return _context3.abrupt("return");
-          case 5:
             /** 折让行 */
-            concession = selectedGood.filter(function (e) {
-              return (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.折让行;
-            })[0];
-            if (concession) {
-              _context3.next = 10;
-              break;
-            }
-            _content = '未选择折让行';
-            message.error({
-              content: _content,
-              key: _content
+            concessions = selectedGood.filter(function (e) {
+              return (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.折让行;
             });
-            return _context3.abrupt("return");
-          case 10:
             /** 准备添加折扣的货物列表 */
             discountGood = selectedGood.filter(function (e) {
               return (e === null || e === void 0 ? void 0 : e.lineAttribute) !== LineAttributeType$1.折让行;
             });
             /** 折扣总金额 */
-            totalDiscoline = chain$1(bignumber(-1 * (concession.lineAmountIncludeTax || 0)));
+            totalDiscoline = function () {
+              var sum = chain$1(bignumber(0));
+              concessions.forEach(function (e) {
+                sum = sum.add(bignumber(-1 * (e.lineAmountIncludeTax || 0)));
+              });
+              return sum;
+            }();
             discolinesSum = chain$1(bignumber(0));
             /** 总金额 */
@@ -14911,38 +14889,40 @@ function useSalesDiscount() {
             i = 0;
-          case 17:
+          case 9:
             if (!(i < discolines.length)) {
-              _context3.next = 25;
+              _context3.next = 17;
               break;
             }
             if (!surplus.smaller(0.01).done()) {
-              _context3.next = 20;
+              _context3.next = 12;
               break;
             }
-            return _context3.abrupt("break", 25);
+            return _context3.abrupt("break", 17);
-          case 20:
+          case 12:
             discolines[i] = chain$1(bignumber(discolines[i])).add(bignumber(0.01)).done().toNumber();
             surplus = surplus.subtract(bignumber(0.01));
-          case 22:
+          case 14:
             i++;
-            _context3.next = 17;
+            _context3.next = 9;
             break;
-          case 25:
-            _context3.next = 27;
+          case 17:
+            _context3.next = 19;
             return controller.run( /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        s.goodsListState.goodsList = s.goodsListState.goodsList.filter(function (e) {
-                          return e.$index !== concession.$index;
+                        concessions.forEach(function (concession) {
+                          s.goodsListState.goodsList = s.goodsListState.goodsList.filter(function (e) {
+                            return e.$index !== concession.$index;
+                          });
                         });
                       case 1:
@@ -14958,8 +14938,8 @@ function useSalesDiscount() {
               };
             }());
-          case 27:
-            _context3.next = 29;
+          case 19:
+            _context3.next = 21;
             return controller.run( /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -14981,8 +14961,8 @@ function useSalesDiscount() {
               };
             }());
-          case 29:
-            _context3.next = 31;
+          case 21:
+            _context3.next = 23;
             return controller.addGoodDiscountV2(discolines.map(function (e, i) {
               var _discountGood$i;
@@ -14992,20 +14972,25 @@ function useSalesDiscount() {
               };
             }));
-          case 31:
+          case 23:
           case "end":
             return _context3.stop();
         }
       }
     }, _callee3);
-  })), [controller, selectedGoodIndex, goodsMap]);
+  })), [controller, selectedGoodIndex, goodsList]);
+  var disabled = React.useMemo(function () {
+    return goodsList.filter(function (e) {
+      return e.lineAttribute === LineAttributeType$1.折让行;
+    }).length <= 0;
+  }, [goodsList]);
   var button = React.useMemo(function () {
     if (!isSalesDiscount) return React.createElement(React.Fragment, null);
     return React.createElement(Button, {
       onClick: onClick,
-      disabled: selectedGoodIndex.length <= 1
+      disabled: disabled
     }, "\u9500\u552E\u6298\u8BA9");
-  }, [selectedGoodIndex.length, isSalesDiscount]);
+  }, [selectedGoodIndex.length, isSalesDiscount, disabled]);
   return {
     /** 按钮 */
     button: button

package/dist/index.js CHANGED Viewed

@@ -14835,63 +14835,41 @@ function useSalesDiscount() {
   var selectedGoodIndex = controller.useMemo(function (s) {
     return s.goodsListState.selectedGoodIndex;
   }, []);
-  var goodsMap = controller.useMemo(function (s) {
-    return s.goodsListState.goodsMap;
+  var goodsList = controller.useMemo(function (s) {
+    return s.goodsListState.goodsList;
   }, []);
   var isSalesDiscount = controller.useMemo(function (s) {
     return s.goodsListState.isSalesDiscount;
   }, []);
   var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var selectedGood, content, concession, _content, discountGood, totalDiscoline, discolinesSum, totalAmount, discolines, surplus, i;
+    var selectedGood, concessions, discountGood, totalDiscoline, discolinesSum, totalAmount, discolines, surplus, i;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            selectedGood = selectedGoodIndex.map(function (e) {
-              return goodsMap.get(e);
-            });
-            if (!(selectedGood.filter(function (e) {
-              return (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.折扣行 || (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.被折扣行;
-            }).length > 0)) {
-              _context3.next = 5;
-              break;
-            }
-            content = '不能选择折扣行和被折扣行';
-            ktsComponentsAntdX3.message.error({
-              content: content,
-              key: content
+            selectedGood = goodsList.filter(function (e) {
+              return e.lineAttribute === LineAttributeType$1.折让行 || e.lineAttribute === LineAttributeType$1.正常;
             });
-            return _context3.abrupt("return");
-          case 5:
             /** 折让行 */
-            concession = selectedGood.filter(function (e) {
-              return (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.折让行;
-            })[0];
-            if (concession) {
-              _context3.next = 10;
-              break;
-            }
-            _content = '未选择折让行';
-            ktsComponentsAntdX3.message.error({
-              content: _content,
-              key: _content
+            concessions = selectedGood.filter(function (e) {
+              return (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.折让行;
             });
-            return _context3.abrupt("return");
-          case 10:
             /** 准备添加折扣的货物列表 */
             discountGood = selectedGood.filter(function (e) {
               return (e === null || e === void 0 ? void 0 : e.lineAttribute) !== LineAttributeType$1.折让行;
             });
             /** 折扣总金额 */
-            totalDiscoline = mathjs.chain(mathjs.bignumber(-1 * (concession.lineAmountIncludeTax || 0)));
+            totalDiscoline = function () {
+              var sum = mathjs.chain(mathjs.bignumber(0));
+              concessions.forEach(function (e) {
+                sum = sum.add(mathjs.bignumber(-1 * (e.lineAmountIncludeTax || 0)));
+              });
+              return sum;
+            }();
             discolinesSum = mathjs.chain(mathjs.bignumber(0));
             /** 总金额 */
@@ -14921,38 +14899,40 @@ function useSalesDiscount() {
             i = 0;
-          case 17:
+          case 9:
             if (!(i < discolines.length)) {
-              _context3.next = 25;
+              _context3.next = 17;
               break;
             }
             if (!surplus.smaller(0.01).done()) {
-              _context3.next = 20;
+              _context3.next = 12;
               break;
             }
-            return _context3.abrupt("break", 25);
+            return _context3.abrupt("break", 17);
-          case 20:
+          case 12:
             discolines[i] = mathjs.chain(mathjs.bignumber(discolines[i])).add(mathjs.bignumber(0.01)).done().toNumber();
             surplus = surplus.subtract(mathjs.bignumber(0.01));
-          case 22:
+          case 14:
             i++;
-            _context3.next = 17;
+            _context3.next = 9;
             break;
-          case 25:
-            _context3.next = 27;
+          case 17:
+            _context3.next = 19;
             return controller.run( /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        s.goodsListState.goodsList = s.goodsListState.goodsList.filter(function (e) {
-                          return e.$index !== concession.$index;
+                        concessions.forEach(function (concession) {
+                          s.goodsListState.goodsList = s.goodsListState.goodsList.filter(function (e) {
+                            return e.$index !== concession.$index;
+                          });
                         });
                       case 1:
@@ -14968,8 +14948,8 @@ function useSalesDiscount() {
               };
             }());
-          case 27:
-            _context3.next = 29;
+          case 19:
+            _context3.next = 21;
             return controller.run( /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -14991,8 +14971,8 @@ function useSalesDiscount() {
               };
             }());
-          case 29:
-            _context3.next = 31;
+          case 21:
+            _context3.next = 23;
             return controller.addGoodDiscountV2(discolines.map(function (e, i) {
               var _discountGood$i;
@@ -15002,20 +14982,25 @@ function useSalesDiscount() {
               };
             }));
-          case 31:
+          case 23:
           case "end":
             return _context3.stop();
         }
       }
     }, _callee3);
-  })), [controller, selectedGoodIndex, goodsMap]);
+  })), [controller, selectedGoodIndex, goodsList]);
+  var disabled = React__default['default'].useMemo(function () {
+    return goodsList.filter(function (e) {
+      return e.lineAttribute === LineAttributeType$1.折让行;
+    }).length <= 0;
+  }, [goodsList]);
   var button = React__default['default'].useMemo(function () {
     if (!isSalesDiscount) return React__default['default'].createElement(React__default['default'].Fragment, null);
     return React__default['default'].createElement(ktsComponentsAntdX3.Button, {
       onClick: onClick,
-      disabled: selectedGoodIndex.length <= 1
+      disabled: disabled
     }, "\u9500\u552E\u6298\u8BA9");
-  }, [selectedGoodIndex.length, isSalesDiscount]);
+  }, [selectedGoodIndex.length, isSalesDiscount, disabled]);
   return {
     /** 按钮 */
     button: button

package/package.json CHANGED Viewed

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

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

@@ -65,6 +65,7 @@ class MyController1 extends Invoice.InvoiceController {
     super()
     this.state.model = 'default'
     this.state.goodsListState.isMergeDetails = true;
+    this.state.goodsListState.isSalesDiscount = true;
     this.state.goodsListState.drag.isStart = true;
     this.state.goodsListState.columnshide = [];
   }
@@ -92,6 +93,7 @@ class MyController2 extends Invoice.InvoiceController {
     super()
     this.state.model = 'prefab'
     this.state.goodsListState.isMergeDetails = true;
+    this.state.goodsListState.isSalesDiscount = true;
     this.state.goodsListState.drag.isStart = true;
     this.state.goodsListState.columnshide = [];
   }
@@ -155,7 +157,8 @@ const lines: any[] = [
       "favouredPolicyName": null,
       "zeroTaxRateFlag": null,
       "referenceLines": null,
-      "version": 0
+      "version": 0,
+      taxAmount:1
   },
   {
       "serialNumber": "1714491422279110656",
@@ -179,7 +182,8 @@ const lines: any[] = [
       "favouredPolicyName": null,
       "zeroTaxRateFlag": null,
       "referenceLines": null,
-      "version": 0
+      "version": 0,
+      taxAmount:1
   },
   {
       "serialNumber": "1714491422279110656",
@@ -203,7 +207,58 @@ const lines: any[] = [
       "favouredPolicyName": null,
       "zeroTaxRateFlag": null,
       "referenceLines": null,
-      "version": 0
+      "version": 0,
+      taxAmount:1
+  },
+  {
+      "serialNumber": "1714491422279110656",
+      "lineNumber": 3,
+      "taxCode": "3070401000000000000",
+      "taxName": "信息技术服务",
+      "specification": null,
+      "itemName": "技术服务费",
+      "itemCode": null,
+      "unit": "套",
+      "quantity": 1,
+      "taxRate": 0.06,
+      "priceExcludeTax": 2,
+      "priceIncludeTax": 2.12,
+      "amountTax": 0.12,
+      "lineAmountExcludeTax": 5,
+      "lineAmountIncludeTax": 5.3,
+      "lineAttribute": LineAttributeType.折让行,
+      "discountGroup": null,
+      "favouredPolicyMark": false,
+      "favouredPolicyName": null,
+      "zeroTaxRateFlag": null,
+      "referenceLines": null,
+      "version": 0,
+      taxAmount:1
+  },
+  {
+      "serialNumber": "1714491422279110656",
+      "lineNumber": 3,
+      "taxCode": "3070401000000000000",
+      "taxName": "信息技术服务",
+      "specification": null,
+      "itemName": "技术服务费",
+      "itemCode": null,
+      "unit": "套",
+      "quantity": 1,
+      "taxRate": 0.06,
+      "priceExcludeTax": 2,
+      "priceIncludeTax": 2.12,
+      "amountTax": 0.12,
+      "lineAmountExcludeTax": 5,
+      "lineAmountIncludeTax": 5.3,
+      "lineAttribute": LineAttributeType.折让行,
+      "discountGroup": null,
+      "favouredPolicyMark": false,
+      "favouredPolicyName": null,
+      "zeroTaxRateFlag": null,
+      "referenceLines": null,
+      "version": 0,
+      taxAmount:1
   }
 ]

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

@@ -40,7 +40,7 @@ export default () => {
             await controller.pipeline(async s => {
                 const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index)
-                s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e=>!seeGoodsIndex.some(t => e === t));
+                s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => !seeGoodsIndex.some(t => e === t));
             })()
         } else {
             await controller.pipeline(async s => {
@@ -84,12 +84,15 @@ export default () => {
         await controller.pipeline(async s => {
             s.goodsListState.selectedGoodIndex.forEach($index => {
                 const goods = s.goodsListState.goodsMap.get($index);
                 if (!goods || (goods.lineAttribute !== LineAttributeType.折扣行 && goods.lineAttribute !== LineAttributeType.被折扣行)) return;
                 // 数组位置
                 let t = s.goodsListState.goodsList.indexOf(goods);
                 goods.lineAttribute === LineAttributeType.折扣行 ? t-- : t++;
                 const i = s.goodsListState.goodsList[t].$index;
                 if (selected) {
                     if (s.goodsListState.selectedGoodIndex.indexOf(i) < 0) s.goodsListState.selectedGoodIndex = [...s.goodsListState.selectedGoodIndex, i];
                 } else {

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useSalesDiscount/index.tsx CHANGED Viewed

@@ -12,32 +12,25 @@ export default function useSalesDiscount() {
     const selectedGoodIndex = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
-    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
+    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
     const isSalesDiscount = controller.useMemo(s => s.goodsListState.isSalesDiscount, []);
     const onClick = React.useCallback(async () => {
-        const selectedGood = selectedGoodIndex.map(e => goodsMap.get(e));
-        if (selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折扣行 || e?.lineAttribute === LineAttributeType.被折扣行).length > 0) {
-            const content = '不能选择折扣行和被折扣行';
-            message.error({ content, key: content });
-            return;
-        }
+        const selectedGood = goodsList.filter(e => e.lineAttribute === LineAttributeType.折让行 || e.lineAttribute === LineAttributeType.正常);
         /** 折让行 */
-        const concession = selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折让行)[0];
-        if (!concession) {
-            const content = '未选择折让行';
-            message.error({ content, key: content })
-            return;
-        }
+        const concessions = selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折让行);
         /** 准备添加折扣的货物列表 */
         const discountGood = selectedGood.filter(e => e?.lineAttribute !== LineAttributeType.折让行);
         /** 折扣总金额 */
-        const totalDiscoline = chain(bignumber(-1 * (concession.lineAmountIncludeTax || 0)));
+        const totalDiscoline = (() => {
+            let sum = chain(bignumber(0));
+            concessions.forEach(e => { sum = sum.add(bignumber(-1 * (e.lineAmountIncludeTax || 0))) })
+            return sum;
+        })()
         let discolinesSum = chain(bignumber(0));
@@ -79,7 +72,11 @@ export default function useSalesDiscount() {
         }
         // 清楚折让行
-        await controller.run(async s => { s.goodsListState.goodsList = s.goodsListState.goodsList.filter(e => e.$index !== concession.$index) })
+        await controller.run(async s => {
+            concessions.forEach(concession => {
+                s.goodsListState.goodsList = s.goodsListState.goodsList.filter(e => e.$index !== concession.$index)
+            })
+        })
         await controller.run(async s => { s.goodsListState.selectedGoodIndex = [] });
         // 给一组货物添加折扣行
@@ -89,19 +86,21 @@ export default function useSalesDiscount() {
                 discolineAmountunt: e as number,
             }
         }))
-    }, [controller, selectedGoodIndex, goodsMap])
+    }, [controller, selectedGoodIndex, goodsList])
+    const disabled = React.useMemo(() => goodsList.filter(e => e.lineAttribute === LineAttributeType.折让行).length <= 0, [goodsList])
     const button = React.useMemo(() => {
         if (!isSalesDiscount) return <></>;
         return (
             <Button
                 onClick={onClick}
-                disabled={selectedGoodIndex.length <= 1}
+                disabled={disabled}
             >
                 销售折让
             </Button>
         )
-    }, [selectedGoodIndex.length, isSalesDiscount])
+    }, [selectedGoodIndex.length, isSalesDiscount, disabled])
     return {
         /** 按钮 */