kts-component-invoice-operate 3.2.36 → 3.2.37

package/dist/index.esm.js

@@ -1798,21 +1798,21 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 40;
+            _context.next = 41;
             break;
 
-          case 36:
-            _context.prev = 36;
+          case 37:
+            _context.prev = 37;
             _context.t0 = _context["catch"](5);
             debugger;
             showError(_context.t0);
 
-          case 40:
+          case 41:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 36]]);
+    }, _callee, null, [[5, 37]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -1985,7 +1985,9 @@ function _fillingInformationGood() {
             goods = goodsList[findMaxIndex(goodsList.map(function (e) {
               return e.lineAmountIncludeTax || 0;
             }))];
-            return _context7.abrupt("return", _objectSpread2({}, goods));
+            return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, goods), {}, {
+              lineAttribute: LineAttributeType$1.正常
+            }));
 
           case 3:
           case "end":

package/dist/index.js

@@ -1808,21 +1808,21 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 40;
+            _context.next = 41;
             break;
 
-          case 36:
-            _context.prev = 36;
+          case 37:
+            _context.prev = 37;
             _context.t0 = _context["catch"](5);
             debugger;
             showError(_context.t0);
 
-          case 40:
+          case 41:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 36]]);
+    }, _callee, null, [[5, 37]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -1995,7 +1995,9 @@ function _fillingInformationGood() {
             goods = goodsList[findMaxIndex(goodsList.map(function (e) {
               return e.lineAmountIncludeTax || 0;
             }))];
-            return _context7.abrupt("return", _objectSpread2({}, goods));
+            return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, goods), {}, {
+              lineAttribute: LineAttributeType$1.正常
+            }));
 
           case 3:
           case "end":

package/package.json

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

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

@@ -38,7 +38,7 @@ export default async function mergeDetails(state: InvoiceControllerState) {
         // 计算税额
         sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
 
-        const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
+        const p = state.goodsListState.goodsList.indexOf(goodsList[0]);9
         state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
         state.goodsListState.goodsList.splice(p, 0, sum);
         state.goodsListState.goodsMap = new Map();
@@ -95,7 +95,7 @@ async function fillingInformationGood(goodsList: IGood[], sum: IGood) {
 
     const goods = goodsList[findMaxIndex(goodsList.map(e => e.lineAmountIncludeTax || 0))]
 
-    return { ...goods };
+    return { ...goods, lineAttribute: LineAttributeType.正常 };
 }
 
 /** 存在税率不一样的明细，不能合并 */