kts-component-invoice-operate 3.2.42 → 3.2.44

package/dist/index.esm.js

@@ -1786,31 +1786,39 @@ function _mergeDetails() {
           case 26:
             sum.priceIncludeTax = _context.sent;
             // 计算税额
-            sum.taxAmount = chain$1(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber();
+            sum.taxAmount = chain$1(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber(); // 校验数据 是否数量和金额是否同号
+
+            _context.next = 30;
+            return checkSameNumber(sum);
+
+          case 30:
             p = state.goodsListState.goodsList.indexOf(goodsList[0]);
             state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
               return state.goodsListState.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 = 39;
+            _context.next = 42;
             break;
 
-          case 36:
-            _context.prev = 36;
+          case 39:
+            _context.prev = 39;
             _context.t0 = _context["catch"](5);
             showError(_context.t0);
 
-          case 39:
+          case 42:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 36]]);
+    }, _callee, null, [[5, 39]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -2004,7 +2012,7 @@ function _fillingInformationGood() {
 function checkTaxTate(_x11) {
   return _checkTaxTate.apply(this, arguments);
 }
-/** 显示错误信息 */
+/** 校验数据 是否数量和金额是否同号 */
 
 
 function _checkTaxTate() {
@@ -2045,6 +2053,56 @@ function _checkTaxTate() {
   return _checkTaxTate.apply(this, arguments);
 }
 
+function checkSameNumber(_x12) {
+  return _checkSameNumber.apply(this, arguments);
+}
+/** 显示错误信息 */
+
+
+function _checkSameNumber() {
+  _checkSameNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(good) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) {
+        switch (_context9.prev = _context9.next) {
+          case 0:
+            if (good.quantity) {
+              _context9.next = 2;
+              break;
+            }
+
+            return _context9.abrupt("return");
+
+          case 2:
+            if (good.lineAmountExcludeTax) {
+              _context9.next = 5;
+              break;
+            }
+
+            message$1.error('金额不能为空');
+            throw new Error('金额不能为空');
+
+          case 5:
+            if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
+              _context9.next = 9;
+              break;
+            }
+
+            return _context9.abrupt("return");
+
+          case 9:
+            message$1.error('金额和数量需要同号');
+            throw new Error('金额和数量需要同号');
+
+          case 11:
+          case "end":
+            return _context9.stop();
+        }
+      }
+    }, _callee9);
+  }));
+  return _checkSameNumber.apply(this, arguments);
+}
+
 function showError(error) {
   console.log(error);
   message$1.error({

package/dist/index.js

@@ -1796,31 +1796,39 @@ function _mergeDetails() {
           case 26:
             sum.priceIncludeTax = _context.sent;
             // 计算税额
-            sum.taxAmount = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).subtract(mathjs.bignumber(sum.lineAmountExcludeTax)).done().toNumber();
+            sum.taxAmount = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).subtract(mathjs.bignumber(sum.lineAmountExcludeTax)).done().toNumber(); // 校验数据 是否数量和金额是否同号
+
+            _context.next = 30;
+            return checkSameNumber(sum);
+
+          case 30:
             p = state.goodsListState.goodsList.indexOf(goodsList[0]);
             state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
               return state.goodsListState.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 = 39;
+            _context.next = 42;
             break;
 
-          case 36:
-            _context.prev = 36;
+          case 39:
+            _context.prev = 39;
             _context.t0 = _context["catch"](5);
             showError(_context.t0);
 
-          case 39:
+          case 42:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 36]]);
+    }, _callee, null, [[5, 39]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -2014,7 +2022,7 @@ function _fillingInformationGood() {
 function checkTaxTate(_x11) {
   return _checkTaxTate.apply(this, arguments);
 }
-/** 显示错误信息 */
+/** 校验数据 是否数量和金额是否同号 */
 
 
 function _checkTaxTate() {
@@ -2055,6 +2063,56 @@ function _checkTaxTate() {
   return _checkTaxTate.apply(this, arguments);
 }
 
+function checkSameNumber(_x12) {
+  return _checkSameNumber.apply(this, arguments);
+}
+/** 显示错误信息 */
+
+
+function _checkSameNumber() {
+  _checkSameNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(good) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) {
+        switch (_context9.prev = _context9.next) {
+          case 0:
+            if (good.quantity) {
+              _context9.next = 2;
+              break;
+            }
+
+            return _context9.abrupt("return");
+
+          case 2:
+            if (good.lineAmountExcludeTax) {
+              _context9.next = 5;
+              break;
+            }
+
+            ktsXui.message.error('金额不能为空');
+            throw new Error('金额不能为空');
+
+          case 5:
+            if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
+              _context9.next = 9;
+              break;
+            }
+
+            return _context9.abrupt("return");
+
+          case 9:
+            ktsXui.message.error('金额和数量需要同号');
+            throw new Error('金额和数量需要同号');
+
+          case 11:
+          case "end":
+            return _context9.stop();
+        }
+      }
+    }, _callee9);
+  }));
+  return _checkSameNumber.apply(this, arguments);
+}
+
 function showError(error) {
   console.log(error);
   ktsXui.message.error({

package/package.json

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

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

@@ -40,9 +40,13 @@ export default async function mergeDetails(state: InvoiceControllerState) {
         // 计算税额
         sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
 
+        // 校验数据 是否数量和金额是否同号
+        await checkSameNumber(sum);
+
         const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
         state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
         state.goodsListState.goodsList.splice(p, 0, sum);
+        state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => e.lineAmountExcludeTax !== 0);
         state.goodsListState.goodsMap = new Map();
         state.goodsListState.goodsList.forEach(e => { state.goodsListState.goodsMap.set(e.$index, e) });
         state.goodsListState.selectedGoodIndex = [];
@@ -111,6 +115,23 @@ async function checkTaxTate(goodsList: IGood[]) {
     }
 }
 
+/** 校验数据 是否数量和金额是否同号 */
+async function checkSameNumber(good: IGood) {
+    if (!good.quantity) return;
+
+    if (!good.lineAmountExcludeTax) {
+        message.error('金额不能为空');
+        throw new Error('金额不能为空');
+    }
+
+    if (good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0) {
+        return;
+    }else{
+        message.error('金额和数量需要同号');
+        throw new Error('金额和数量需要同号');
+    }
+}
+
 /** 显示错误信息 */
 function showError(error: Error) {
     console.log(error);