kts-component-invoice-operate 3.2.104 → 3.2.106

package/dist/index.js

@@ -1823,111 +1823,170 @@ function mergeDetails(_x, _x2) {
 /** 计算单价(含税) */
 
 function _mergeDetails() {
-  _mergeDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state, selectedGoodIndex) {
-    var goodsList, sum, p;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
+  _mergeDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, selectedGoodIndex) {
+    var goodsList, grouping, merge, _merge;
+
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
-        switch (_context.prev = _context.next) {
+        switch (_context2.prev = _context2.next) {
           case 0:
-            debugger;
+            _merge = function _merge3() {
+              _merge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(goodsList) {
+                var selectedGoodIndex, sum, p;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!(goodsList.length < 2)) {
+                          _context.next = 2;
+                          break;
+                        }
 
-            if (!(state.goodsListState.editGood || !selectedGoodIndex || selectedGoodIndex.length < 2)) {
-              _context.next = 3;
-              break;
-            }
+                        return _context.abrupt("return");
 
-            return _context.abrupt("return");
+                      case 2:
+                        selectedGoodIndex = goodsList.map(function (e) {
+                          return e.$index;
+                        });
+                        _context.prev = 3;
+                        // 创建合并后的商品对象
+                        sum = {
+                          $index: idGenerator(),
+                          lineAttribute: goodsList[0].lineAttribute
+                        }; // 存在税率不一样的明细，不能合并
 
-          case 3:
-            // const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
-            // const goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0)
-            goodsList = state.goodsListState.goodsList.filter(function (e) {
-              return selectedGoodIndex.indexOf(e.$index) >= 0;
-            });
+                        _context.next = 7;
+                        return checkTaxTate(goodsList);
 
-            if (!(goodsList.length < 2)) {
-              _context.next = 6;
-              break;
-            }
+                      case 7:
+                        _context.next = 9;
+                        return fillingInformationGood(goodsList, sum);
 
-            return _context.abrupt("return");
+                      case 9:
+                        sum = _context.sent;
+                        _context.next = 12;
+                        return mergeQuantity(goodsList);
 
-          case 6:
-            _context.prev = 6;
-            // 创建合并后的商品对象
-            sum = {
-              $index: idGenerator(),
-              lineAttribute: LineAttributeType$1.正常
-            }; // 存在税率不一样的明细，不能合并
+                      case 12:
+                        sum.quantity = _context.sent;
+                        _context.next = 15;
+                        return mergeLineAmountExcludeTax(goodsList);
 
-            _context.next = 10;
-            return checkTaxTate(goodsList);
+                      case 15:
+                        sum.lineAmountExcludeTax = _context.sent;
+                        _context.next = 18;
+                        return mergeLineAmountIncludeTax(goodsList);
 
-          case 10:
-            _context.next = 12;
-            return fillingInformationGood(goodsList, sum);
+                      case 18:
+                        sum.lineAmountIncludeTax = _context.sent;
+                        _context.next = 21;
+                        return calculatePriceExcludeTax(sum, state.calculatingDigits);
+
+                      case 21:
+                        sum.priceExcludeTax = _context.sent;
+                        _context.next = 24;
+                        return calculatePriceIncludeTax(sum, state.calculatingDigits);
+
+                      case 24:
+                        sum.priceIncludeTax = _context.sent;
+                        // 计算税额
+                        sum.taxAmount = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).subtract(mathjs.bignumber(sum.lineAmountExcludeTax)).done().toNumber(); // 校验数据 是否数量和金额是否同号
+
+                        _context.next = 28;
+                        return checkSameNumber(sum);
+
+                      case 28:
+                        p = state.goodsListState.goodsList.indexOf(goodsList[0]);
+                        state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
+                          return selectedGoodIndex.indexOf(e.$index) < 0;
+                        });
+                        state.goodsListState.goodsList.splice(p, 0, sum);
+                        state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
+                          return e.lineAmountExcludeTax !== 0;
+                        });
+                        state.goodsListState.goodsMap = new Map();
+                        state.goodsListState.goodsList.forEach(function (e) {
+                          state.goodsListState.goodsMap.set(e.$index, e);
+                        });
+                        state.goodsListState.selectedGoodIndex = [];
+                        _context.next = 40;
+                        break;
 
-          case 12:
-            sum = _context.sent;
-            _context.next = 15;
-            return mergeQuantity(goodsList);
+                      case 37:
+                        _context.prev = 37;
+                        _context.t0 = _context["catch"](3);
+                        showError(_context.t0);
 
-          case 15:
-            sum.quantity = _context.sent;
-            _context.next = 18;
-            return mergeLineAmountExcludeTax(goodsList);
+                      case 40:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee, null, [[3, 37]]);
+              }));
+              return _merge.apply(this, arguments);
+            };
 
-          case 18:
-            sum.lineAmountExcludeTax = _context.sent;
-            _context.next = 21;
-            return mergeLineAmountIncludeTax(goodsList);
+            merge = function _merge2(_x14) {
+              return _merge.apply(this, arguments);
+            };
 
-          case 21:
-            sum.lineAmountIncludeTax = _context.sent;
-            _context.next = 24;
-            return calculatePriceExcludeTax(sum, state.calculatingDigits);
+            grouping = function _grouping(goodsList) {
+              var grouped = {};
+              goodsList.forEach(function (good) {
+                var key = function () {
+                  switch (good.lineAttribute) {
+                    case LineAttributeType$1.折让行:
+                      return LineAttributeType$1.折让行;
 
-          case 24:
-            sum.priceExcludeTax = _context.sent;
-            _context.next = 27;
-            return calculatePriceIncludeTax(sum, state.calculatingDigits);
+                    case LineAttributeType$1.赠品行:
+                      return LineAttributeType$1.赠品行;
 
-          case 27:
-            sum.priceIncludeTax = _context.sent;
-            // 计算税额
-            sum.taxAmount = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).subtract(mathjs.bignumber(sum.lineAmountExcludeTax)).done().toNumber(); // 校验数据 是否数量和金额是否同号
+                    default:
+                      return LineAttributeType$1.正常;
+                  }
+                }();
 
-            _context.next = 31;
-            return checkSameNumber(sum);
+                if (!grouped[key]) {
+                  grouped[key] = [];
+                }
 
-          case 31:
-            p = state.goodsListState.goodsList.indexOf(goodsList[0]);
-            state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
-              return selectedGoodIndex.indexOf(e.$index) < 0;
-            });
-            state.goodsListState.goodsList.splice(p, 0, sum);
-            state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
-              return e.lineAmountExcludeTax !== 0;
-            });
-            state.goodsListState.goodsMap = new Map();
-            state.goodsListState.goodsList.forEach(function (e) {
-              state.goodsListState.goodsMap.set(e.$index, e);
+                grouped[key].push(_objectSpread2(_objectSpread2({}, good), {}, {
+                  lineAttribute: key
+                }));
+              });
+              return Object.values(grouped);
+            };
+
+            if (!(state.goodsListState.editGood || !selectedGoodIndex || selectedGoodIndex.length < 2)) {
+              _context2.next = 5;
+              break;
+            }
+
+            return _context2.abrupt("return");
+
+          case 5:
+            goodsList = state.goodsListState.goodsList.filter(function (e) {
+              return selectedGoodIndex.indexOf(e.$index) >= 0;
             });
-            state.goodsListState.selectedGoodIndex = [];
-            _context.next = 43;
-            break;
 
-          case 40:
-            _context.prev = 40;
-            _context.t0 = _context["catch"](6);
-            showError(_context.t0);
+            if (!(goodsList.length < 2)) {
+              _context2.next = 8;
+              break;
+            }
+
+            return _context2.abrupt("return");
 
-          case 43:
+          case 8:
+            grouping(goodsList).forEach(merge);
+            /** 分组 */
+
+          case 9:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
       }
-    }, _callee, null, [[6, 40]]);
+    }, _callee2);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -1939,29 +1998,29 @@ function calculatePriceIncludeTax(_x3, _x4) {
 
 
 function _calculatePriceIncludeTax() {
-  _calculatePriceIncludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(sum, calculatingDigits) {
+  _calculatePriceIncludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sum, calculatingDigits) {
     var value;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context3.prev = _context3.next) {
           case 0:
             if (sum.quantity) {
-              _context2.next = 2;
+              _context3.next = 2;
               break;
             }
 
-            return _context2.abrupt("return", undefined);
+            return _context3.abrupt("return", undefined);
 
           case 2:
             value = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber();
-            return _context2.abrupt("return", format15(value, calculatingDigits) || undefined);
+            return _context3.abrupt("return", format15(value, calculatingDigits) || undefined);
 
           case 4:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _calculatePriceIncludeTax.apply(this, arguments);
 }
@@ -1973,29 +2032,29 @@ function calculatePriceExcludeTax(_x5, _x6) {
 
 
 function _calculatePriceExcludeTax() {
-  _calculatePriceExcludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sum, calculatingDigits) {
+  _calculatePriceExcludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(sum, calculatingDigits) {
     var value;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
             if (sum.quantity) {
-              _context3.next = 2;
+              _context4.next = 2;
               break;
             }
 
-            return _context3.abrupt("return", undefined);
+            return _context4.abrupt("return", undefined);
 
           case 2:
             value = format15(mathjs.chain(mathjs.bignumber(sum.lineAmountExcludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber());
-            return _context3.abrupt("return", format15(value, calculatingDigits) || undefined);
+            return _context4.abrupt("return", format15(value, calculatingDigits) || undefined);
 
           case 5:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return _calculatePriceExcludeTax.apply(this, arguments);
 }
@@ -2007,24 +2066,24 @@ function mergeLineAmountIncludeTax(_x7) {
 
 
 function _mergeLineAmountIncludeTax() {
-  _mergeLineAmountIncludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(goodsList) {
+  _mergeLineAmountIncludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(goodsList) {
     var sum;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
             sum = mathjs.chain(mathjs.bignumber(0));
             goodsList.forEach(function (e) {
               sum = sum.add(mathjs.bignumber(e.lineAmountIncludeTax || 0));
             });
-            return _context4.abrupt("return", sum.done().toNumber());
+            return _context5.abrupt("return", sum.done().toNumber());
 
           case 3:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
   return _mergeLineAmountIncludeTax.apply(this, arguments);
 }
@@ -2036,24 +2095,24 @@ function mergeLineAmountExcludeTax(_x8) {
 
 
 function _mergeLineAmountExcludeTax() {
-  _mergeLineAmountExcludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(goodsList) {
+  _mergeLineAmountExcludeTax = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(goodsList) {
     var sum;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
             sum = mathjs.chain(mathjs.bignumber(0));
             goodsList.forEach(function (e) {
               sum = sum.add(mathjs.bignumber(e.lineAmountExcludeTax || 0));
             });
-            return _context5.abrupt("return", sum.done().toNumber());
+            return _context6.abrupt("return", sum.done().toNumber());
 
           case 3:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
       }
-    }, _callee5);
+    }, _callee6);
   }));
   return _mergeLineAmountExcludeTax.apply(this, arguments);
 }
@@ -2065,24 +2124,24 @@ function mergeQuantity(_x9) {
 
 
 function _mergeQuantity() {
-  _mergeQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(goodsList) {
+  _mergeQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(goodsList) {
     var sum;
-    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) {
-        switch (_context6.prev = _context6.next) {
+        switch (_context7.prev = _context7.next) {
           case 0:
             sum = mathjs.chain(mathjs.bignumber(0));
             goodsList.forEach(function (e) {
               sum = sum.add(mathjs.bignumber(e.quantity || 0));
             });
-            return _context6.abrupt("return", sum.done().toNumber() || undefined);
+            return _context7.abrupt("return", sum.done().toNumber() || undefined);
 
           case 3:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
       }
-    }, _callee6);
+    }, _callee7);
   }));
   return _mergeQuantity.apply(this, arguments);
 }
@@ -2094,26 +2153,26 @@ function fillingInformationGood(_x10, _x11) {
 
 
 function _fillingInformationGood() {
-  _fillingInformationGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(goodsList, sum) {
+  _fillingInformationGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(goodsList, sum) {
     var goods;
-    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context8.prev = _context8.next) {
           case 0:
             sum = _objectSpread2({}, sum);
             goods = goodsList[findMaxIndex(goodsList.map(function (e) {
               return e.lineAmountIncludeTax || 0;
             }))];
-            return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, goods), {}, {
-              lineAttribute: LineAttributeType$1.正常
+            return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, goods), {}, {
+              lineAttribute: sum.lineAttribute
             }));
 
           case 3:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
       }
-    }, _callee7);
+    }, _callee8);
   }));
   return _fillingInformationGood.apply(this, arguments);
 }
@@ -2125,23 +2184,23 @@ function checkTaxTate(_x12) {
 
 
 function _checkTaxTate() {
-  _checkTaxTate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(goodsList) {
+  _checkTaxTate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(goodsList) {
     var tax, i;
-    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
       while (1) {
-        switch (_context8.prev = _context8.next) {
+        switch (_context9.prev = _context9.next) {
           case 0:
             tax = goodsList[0].taxRate;
             i = 1;
 
           case 2:
             if (!(i < goodsList.length)) {
-              _context8.next = 8;
+              _context9.next = 8;
               break;
             }
 
             if (!(tax !== goodsList[i].taxRate)) {
-              _context8.next = 5;
+              _context9.next = 5;
               break;
             }
 
@@ -2149,15 +2208,15 @@ function _checkTaxTate() {
 
           case 5:
             i++;
-            _context8.next = 2;
+            _context9.next = 2;
             break;
 
           case 8:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
       }
-    }, _callee8);
+    }, _callee9);
   }));
   return _checkTaxTate.apply(this, arguments);
 }
@@ -2169,23 +2228,23 @@ function checkSameNumber(_x13) {
 
 
 function _checkSameNumber() {
-  _checkSameNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(good) {
+  _checkSameNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(good) {
     var content, _content;
 
-    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
       while (1) {
-        switch (_context9.prev = _context9.next) {
+        switch (_context10.prev = _context10.next) {
           case 0:
             if (good.quantity) {
-              _context9.next = 2;
+              _context10.next = 2;
               break;
             }
 
-            return _context9.abrupt("return");
+            return _context10.abrupt("return");
 
           case 2:
             if (!(!good.lineAmountExcludeTax && good.lineAmountExcludeTax !== 0)) {
-              _context9.next = 6;
+              _context10.next = 6;
               break;
             }
 
@@ -2198,11 +2257,11 @@ function _checkSameNumber() {
 
           case 6:
             if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.lineAmountExcludeTax === 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
-              _context9.next = 10;
+              _context10.next = 10;
               break;
             }
 
-            return _context9.abrupt("return");
+            return _context10.abrupt("return");
 
           case 10:
             _content = '合并失败，合并后“数量”和“金额”必须同时为正数或同时为负数。';
@@ -2214,10 +2273,10 @@ function _checkSameNumber() {
 
           case 13:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
       }
-    }, _callee9);
+    }, _callee10);
   }));
   return _checkSameNumber.apply(this, arguments);
 }
@@ -9315,27 +9374,26 @@ var importGoodsDrawer = /*#__PURE__*/(function () {
               }));
             } else {
               s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood));
-            }
+            } // s.goodsListState.importGoods.isVisibleDrawer = false;
 
-            s.goodsListState.importGoods.isVisibleDrawer = false;
 
             if (!s.goodsListState.isTaxIncluded) {
-              _context.next = 30;
+              _context.next = 29;
               break;
             }
 
-            _context.next = 28;
+            _context.next = 27;
             return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
 
-          case 28:
-            _context.next = 32;
+          case 27:
+            _context.next = 31;
             break;
 
-          case 30:
-            _context.next = 32;
+          case 29:
+            _context.next = 31;
             return updateUnitPriceTax(controller, s.goodsListState.form, record);
 
-          case 32:
+          case 31:
           case "end":
             return _context.stop();
         }

package/package.json

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

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

@@ -32,7 +32,7 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
     between.lineAmountExcludeTax = record.lineAmountExcludeTax;
     between.taxRate = record.taxRate;
     between.taxAmount = record.taxAmount;
-    
+
     // 设置编辑货物
     const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
 
@@ -64,7 +64,7 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
         });
     }
 
-    s.goodsListState.importGoods.isVisibleDrawer = false;
+    // s.goodsListState.importGoods.isVisibleDrawer = false;
     s.goodsListState.isTaxIncluded
         ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
         : await updateUnitPriceTax(controller, s.goodsListState.form, record)