kts-component-invoice-operate 3.2.87 → 3.2.89

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);
@@ -10390,82 +10390,42 @@ var useAddDiscount = (function (goods) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              _context2.prev = 0;
               e.stopPropagation();
-              _context2.next = 3;
+              _context2.next = 4;
               return controller.wait();
 
-            case 3:
-              _context2.next = 5;
+            case 4:
+              _context2.next = 6;
               return controller.saveEditGood();
 
-            case 5:
-              _context2.next = 7;
+            case 6:
+              _context2.next = 8;
+              return checkDiscount(controller);
+
+            case 8:
+              _context2.next = 10;
+              return checkFieldsError(controller, goods);
+
+            case 10:
+              _context2.next = 12;
+              return checkDutyFree(controller, goods);
+
+            case 12:
+              _context2.next = 14;
+              return checkZeroAmount(controller, goods);
+
+            case 14:
+              _context2.next = 16;
               return controller.run( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
-                  var _s$goodsListState$edi, _goods;
-
-                  var err, key;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
                         case 0:
-                          if (!(s.goodsListState.form && ((_s$goodsListState$edi = s.goodsListState.editGood) === null || _s$goodsListState$edi === void 0 ? void 0 : _s$goodsListState$edi.$index) === ((_goods = goods) === null || _goods === void 0 ? void 0 : _goods.$index))) {
-                            _context.next = 11;
-                            break;
-                          }
-
-                          err = s.goodsListState.form.getFieldsError();
-                          _context.t0 = _regeneratorRuntime().keys(err);
-
-                        case 3:
-                          if ((_context.t1 = _context.t0()).done) {
-                            _context.next = 11;
-                            break;
-                          }
-
-                          key = _context.t1.value;
-
-                          if (err[key]) {
-                            _context.next = 7;
-                            break;
-                          }
-
-                          return _context.abrupt("continue", 3);
-
-                        case 7:
-                          message.error(err[key][0]);
-                          return _context.abrupt("return");
-
-                        case 11:
-                          goods = s.goodsListState.goodsMap.get(goods.$index);
-
-                          if (!(goods.taxRate === 0 && s.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType)) {
-                            _context.next = 15;
-                            break;
-                          }
-
-                          message.error({
-                            content: '零税率需要设置免税类型，请在赋码中设置！',
-                            key: '零税率需要设置免税类型，请在赋码中设置！'
-                          });
-                          return _context.abrupt("return");
-
-                        case 15:
-                          if (!("".concat(goods.lineAmountIncludeTax) === '0')) {
-                            _context.next = 18;
-                            break;
-                          }
-
-                          message.error({
-                            content: '金额为0不能添加折扣行',
-                            key: '金额为0不能添加折扣行'
-                          });
-                          return _context.abrupt("return");
-
-                        case 18:
                           s.goodsListState.discountGoodIndex = [goods.$index];
 
-                        case 19:
+                        case 1:
                         case "end":
                           return _context.stop();
                       }
@@ -10478,12 +10438,21 @@ var useAddDiscount = (function (goods) {
                 };
               }());
 
-            case 7:
+            case 16:
+              _context2.next = 21;
+              break;
+
+            case 18:
+              _context2.prev = 18;
+              _context2.t0 = _context2["catch"](0);
+              console.error(_context2.t0);
+
+            case 21:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2);
+      }, _callee2, null, [[0, 18]]);
     }));
 
     return function (_x) {
@@ -10511,15 +10480,193 @@ var useAddDiscount = (function (goods) {
     key: 'addDiscount',
     title: '折扣',
     onClick: onClick
-  }; // return React.useMemo(() => {
-  //     if (goods.lineAttribute !== LineAttributeType.正常) {
-  //         return undefined
-  //     }
-  //     return (
-  //         <Menu.Item key="addDiscount" onClick={onClick}><Text strong>折扣</Text></Menu.Item>
-  //     );
-  // }, [onClick, goods.lineAttribute]);
+  };
 });
+/**
+ * 有折让行，不可以添加折扣
+ * @param controller 组件控制器
+ */
+
+function checkDiscount(_x3) {
+  return _checkDiscount.apply(this, arguments);
+}
+/**
+ * 零税率需要设置免税类型，请在赋码中设置！
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ */
+
+
+function _checkDiscount() {
+  _checkDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(controller) {
+    var goodsList;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            goodsList = controller.state.goodsListState.goodsList;
+            goodsList.forEach(function (e) {
+              if (e.lineAttribute === LineAttributeType$1.折让行) {
+                var content = '有折让行，不可以添加折扣';
+                message$1.error({
+                  content: content,
+                  key: content
+                });
+                throw new Error(content);
+              }
+            });
+
+          case 2:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _checkDiscount.apply(this, arguments);
+}
+
+function checkDutyFree(_x4, _x5) {
+  return _checkDutyFree.apply(this, arguments);
+}
+/**
+ * 金额为0不能添加折扣行
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ **/
+
+
+function _checkDutyFree() {
+  _checkDutyFree = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller, goods) {
+    var content;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            goods = controller.state.goodsListState.goodsList.filter(function (e) {
+              return e.$index === goods.$index;
+            })[0];
+
+            if (!(goods.taxRate === 0 && controller.state.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType)) {
+              _context4.next = 5;
+              break;
+            }
+
+            content = '零税率需要设置免税类型，请在赋码中设置！';
+            message$1.error({
+              content: content,
+              key: content
+            });
+            throw new Error(content);
+
+          case 5:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+  return _checkDutyFree.apply(this, arguments);
+}
+
+function checkZeroAmount(_x6, _x7) {
+  return _checkZeroAmount.apply(this, arguments);
+}
+/**
+ * 校验当前的表单
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ * */
+
+
+function _checkZeroAmount() {
+  _checkZeroAmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, goods) {
+    var content;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            goods = controller.state.goodsListState.goodsList.filter(function (e) {
+              return e.$index === goods.$index;
+            })[0];
+
+            if (!("".concat(goods.lineAmountIncludeTax) === '0')) {
+              _context5.next = 5;
+              break;
+            }
+
+            content = '金额为0不能添加折扣行';
+            message$1.error({
+              content: content,
+              key: content
+            });
+            throw new Error(content);
+
+          case 5:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+  return _checkZeroAmount.apply(this, arguments);
+}
+
+function checkFieldsError(_x8, _x9) {
+  return _checkFieldsError.apply(this, arguments);
+}
+
+function _checkFieldsError() {
+  _checkFieldsError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(controller, goods) {
+    var _s$goodsListState$edi;
+
+    var s, err, key, content;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            s = controller.state;
+
+            if (!(s.goodsListState.form && ((_s$goodsListState$edi = s.goodsListState.editGood) === null || _s$goodsListState$edi === void 0 ? void 0 : _s$goodsListState$edi.$index) === (goods === null || goods === void 0 ? void 0 : goods.$index))) {
+              _context6.next = 13;
+              break;
+            }
+
+            err = s.goodsListState.form.getFieldsError();
+            _context6.t0 = _regeneratorRuntime().keys(err);
+
+          case 4:
+            if ((_context6.t1 = _context6.t0()).done) {
+              _context6.next = 13;
+              break;
+            }
+
+            key = _context6.t1.value;
+
+            if (err[key]) {
+              _context6.next = 8;
+              break;
+            }
+
+            return _context6.abrupt("continue", 4);
+
+          case 8:
+            content = err[key][0];
+            message$1.error({
+              content: content,
+              key: content
+            });
+            throw new Error(content);
+
+          case 13:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  }));
+  return _checkFieldsError.apply(this, arguments);
+}
 
 var useEndowCode = (function (goods) {
   var controller = Invoice.useInvoiceController();

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);
@@ -10400,82 +10400,42 @@ var useAddDiscount = (function (goods) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              _context2.prev = 0;
               e.stopPropagation();
-              _context2.next = 3;
+              _context2.next = 4;
               return controller.wait();
 
-            case 3:
-              _context2.next = 5;
+            case 4:
+              _context2.next = 6;
               return controller.saveEditGood();
 
-            case 5:
-              _context2.next = 7;
+            case 6:
+              _context2.next = 8;
+              return checkDiscount(controller);
+
+            case 8:
+              _context2.next = 10;
+              return checkFieldsError(controller, goods);
+
+            case 10:
+              _context2.next = 12;
+              return checkDutyFree(controller, goods);
+
+            case 12:
+              _context2.next = 14;
+              return checkZeroAmount(controller, goods);
+
+            case 14:
+              _context2.next = 16;
               return controller.run( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
-                  var _s$goodsListState$edi, _goods;
-
-                  var err, key;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
                         case 0:
-                          if (!(s.goodsListState.form && ((_s$goodsListState$edi = s.goodsListState.editGood) === null || _s$goodsListState$edi === void 0 ? void 0 : _s$goodsListState$edi.$index) === ((_goods = goods) === null || _goods === void 0 ? void 0 : _goods.$index))) {
-                            _context.next = 11;
-                            break;
-                          }
-
-                          err = s.goodsListState.form.getFieldsError();
-                          _context.t0 = _regeneratorRuntime().keys(err);
-
-                        case 3:
-                          if ((_context.t1 = _context.t0()).done) {
-                            _context.next = 11;
-                            break;
-                          }
-
-                          key = _context.t1.value;
-
-                          if (err[key]) {
-                            _context.next = 7;
-                            break;
-                          }
-
-                          return _context.abrupt("continue", 3);
-
-                        case 7:
-                          ktsComponentsAntdX3.message.error(err[key][0]);
-                          return _context.abrupt("return");
-
-                        case 11:
-                          goods = s.goodsListState.goodsMap.get(goods.$index);
-
-                          if (!(goods.taxRate === 0 && s.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType)) {
-                            _context.next = 15;
-                            break;
-                          }
-
-                          ktsComponentsAntdX3.message.error({
-                            content: '零税率需要设置免税类型，请在赋码中设置！',
-                            key: '零税率需要设置免税类型，请在赋码中设置！'
-                          });
-                          return _context.abrupt("return");
-
-                        case 15:
-                          if (!("".concat(goods.lineAmountIncludeTax) === '0')) {
-                            _context.next = 18;
-                            break;
-                          }
-
-                          ktsComponentsAntdX3.message.error({
-                            content: '金额为0不能添加折扣行',
-                            key: '金额为0不能添加折扣行'
-                          });
-                          return _context.abrupt("return");
-
-                        case 18:
                           s.goodsListState.discountGoodIndex = [goods.$index];
 
-                        case 19:
+                        case 1:
                         case "end":
                           return _context.stop();
                       }
@@ -10488,12 +10448,21 @@ var useAddDiscount = (function (goods) {
                 };
               }());
 
-            case 7:
+            case 16:
+              _context2.next = 21;
+              break;
+
+            case 18:
+              _context2.prev = 18;
+              _context2.t0 = _context2["catch"](0);
+              console.error(_context2.t0);
+
+            case 21:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2);
+      }, _callee2, null, [[0, 18]]);
     }));
 
     return function (_x) {
@@ -10521,15 +10490,193 @@ var useAddDiscount = (function (goods) {
     key: 'addDiscount',
     title: '折扣',
     onClick: onClick
-  }; // return React.useMemo(() => {
-  //     if (goods.lineAttribute !== LineAttributeType.正常) {
-  //         return undefined
-  //     }
-  //     return (
-  //         <Menu.Item key="addDiscount" onClick={onClick}><Text strong>折扣</Text></Menu.Item>
-  //     );
-  // }, [onClick, goods.lineAttribute]);
+  };
 });
+/**
+ * 有折让行，不可以添加折扣
+ * @param controller 组件控制器
+ */
+
+function checkDiscount(_x3) {
+  return _checkDiscount.apply(this, arguments);
+}
+/**
+ * 零税率需要设置免税类型，请在赋码中设置！
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ */
+
+
+function _checkDiscount() {
+  _checkDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(controller) {
+    var goodsList;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            goodsList = controller.state.goodsListState.goodsList;
+            goodsList.forEach(function (e) {
+              if (e.lineAttribute === LineAttributeType$1.折让行) {
+                var content = '有折让行，不可以添加折扣';
+                ktsXui.message.error({
+                  content: content,
+                  key: content
+                });
+                throw new Error(content);
+              }
+            });
+
+          case 2:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _checkDiscount.apply(this, arguments);
+}
+
+function checkDutyFree(_x4, _x5) {
+  return _checkDutyFree.apply(this, arguments);
+}
+/**
+ * 金额为0不能添加折扣行
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ **/
+
+
+function _checkDutyFree() {
+  _checkDutyFree = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller, goods) {
+    var content;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            goods = controller.state.goodsListState.goodsList.filter(function (e) {
+              return e.$index === goods.$index;
+            })[0];
+
+            if (!(goods.taxRate === 0 && controller.state.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType)) {
+              _context4.next = 5;
+              break;
+            }
+
+            content = '零税率需要设置免税类型，请在赋码中设置！';
+            ktsXui.message.error({
+              content: content,
+              key: content
+            });
+            throw new Error(content);
+
+          case 5:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+  return _checkDutyFree.apply(this, arguments);
+}
+
+function checkZeroAmount(_x6, _x7) {
+  return _checkZeroAmount.apply(this, arguments);
+}
+/**
+ * 校验当前的表单
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ * */
+
+
+function _checkZeroAmount() {
+  _checkZeroAmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, goods) {
+    var content;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            goods = controller.state.goodsListState.goodsList.filter(function (e) {
+              return e.$index === goods.$index;
+            })[0];
+
+            if (!("".concat(goods.lineAmountIncludeTax) === '0')) {
+              _context5.next = 5;
+              break;
+            }
+
+            content = '金额为0不能添加折扣行';
+            ktsXui.message.error({
+              content: content,
+              key: content
+            });
+            throw new Error(content);
+
+          case 5:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+  return _checkZeroAmount.apply(this, arguments);
+}
+
+function checkFieldsError(_x8, _x9) {
+  return _checkFieldsError.apply(this, arguments);
+}
+
+function _checkFieldsError() {
+  _checkFieldsError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(controller, goods) {
+    var _s$goodsListState$edi;
+
+    var s, err, key, content;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            s = controller.state;
+
+            if (!(s.goodsListState.form && ((_s$goodsListState$edi = s.goodsListState.editGood) === null || _s$goodsListState$edi === void 0 ? void 0 : _s$goodsListState$edi.$index) === (goods === null || goods === void 0 ? void 0 : goods.$index))) {
+              _context6.next = 13;
+              break;
+            }
+
+            err = s.goodsListState.form.getFieldsError();
+            _context6.t0 = _regeneratorRuntime().keys(err);
+
+          case 4:
+            if ((_context6.t1 = _context6.t0()).done) {
+              _context6.next = 13;
+              break;
+            }
+
+            key = _context6.t1.value;
+
+            if (err[key]) {
+              _context6.next = 8;
+              break;
+            }
+
+            return _context6.abrupt("continue", 4);
+
+          case 8:
+            content = err[key][0];
+            ktsXui.message.error({
+              content: content,
+              key: content
+            });
+            throw new Error(content);
+
+          case 13:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  }));
+  return _checkFieldsError.apply(this, arguments);
+}
 
 var useEndowCode = (function (goods) {
   var controller = Invoice.useInvoiceController();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.87",
+  "version": "3.2.89",
   "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,7 @@ 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.drag.isStart = true;
     this.state.goodsListState.columnshide = [];
   }
@@ -94,6 +95,7 @@ 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.drag.isStart = true;
     this.state.goodsListState.columnshide = [];
   }

package/src/Invoice/index.tsx

@@ -22,7 +22,6 @@ import ImportGoodsDrawer from './ui/default/ImportGoodsDrawer';
 import EndowCodeDrawer from './ui/default/EndowCodeDrawer';
 import AddComparisonDrawer from './ui/default/AddComparisonDrawer';
 
-
 /** 发票组件的上下文 */
 export const InvoiceContext = React.createContext<InvoiceController>(
   undefined as any,
@@ -163,4 +162,6 @@ const Digtal = (props: IInvoiceProps) => {
       <EndowCodeDrawer />{/*                                      给货品赋码的抽屉   */}
     </InvoiceContext.Provider>
   )
-}
+}
+
+

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useAddDiscount/index.tsx

@@ -1,7 +1,8 @@
 
 import React from 'react';
-import { Menu, message, Typography } from 'kts-components-antd-x3';
-import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
+import { Typography } from 'kts-components-antd-x3';
+import { message } from 'kts-xui';
+import InvoiceController, { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
 import Invoice from '../../../../../../../../..';
 
 const { Text } = Typography;
@@ -17,29 +18,20 @@ export default (goods: IGood) => {
 
     /** 点击了 添加折扣行 按钮 */
     const onClick = React.useCallback(async e => {
-        e.stopPropagation()
-        await controller.wait();
-        await controller.saveEditGood();
-        await controller.run(async s => {
-            if (s.goodsListState.form && s.goodsListState.editGood?.$index === goods?.$index) {
-                const err: any = s.goodsListState.form.getFieldsError();
-                for (let key in err) {
-                    if (!err[key]) continue;
-                    message.error(err[key][0]);
-                    return;
-                }
-            }
-            goods = s.goodsListState.goodsMap.get(goods.$index) as any;
-            if (goods.taxRate === 0 && s.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType) {
-                message.error({ content: '零税率需要设置免税类型，请在赋码中设置！', key: '零税率需要设置免税类型，请在赋码中设置！' });
-                return;
-            }
-            if (`${goods.lineAmountIncludeTax}` === '0') {
-                message.error({ content: '金额为0不能添加折扣行', key: '金额为0不能添加折扣行' });
-                return;
-            }
-            s.goodsListState.discountGoodIndex = [goods.$index];
-        })
+        try {
+            e.stopPropagation()
+            await controller.wait();
+            await controller.saveEditGood();
+            await checkDiscount(controller);
+            await checkFieldsError(controller, goods);
+            await checkDutyFree(controller, goods);
+            await checkZeroAmount(controller, goods);
+            await controller.run(async s => {
+                s.goodsListState.discountGoodIndex = [goods.$index];
+            })
+        } catch (error: any) {
+            console.error(error);
+        }
     }, [controller, goods.$index]);
 
     if (goods.lineAttribute !== LineAttributeType.正常) {
@@ -59,18 +51,69 @@ export default (goods: IGood) => {
     }
 
     return {
-        key:'addDiscount',
-        title:'折扣',
+        key: 'addDiscount',
+        title: '折扣',
         onClick,
     }
+};
 
-    // return React.useMemo(() => {
-    //     if (goods.lineAttribute !== LineAttributeType.正常) {
-    //         return undefined
-    //     }
+/**
+ * 有折让行，不可以添加折扣
+ * @param controller 组件控制器
+ */
+async function checkDiscount(controller: InvoiceController) {
+    const { goodsList } = controller.state.goodsListState;
+    goodsList.forEach(e => {
+        if (e.lineAttribute === LineAttributeType.折让行) {
+            const content = '有折让行，不可以添加折扣';
+            message.error({ content, key: content });
+            throw new Error(content)
+        }
+    })
+}
 
-    //     return (
-    //         <Menu.Item key="addDiscount" onClick={onClick}><Text strong>折扣</Text></Menu.Item>
-    //     );
-    // }, [onClick, goods.lineAttribute]);
-};
+/**
+ * 零税率需要设置免税类型，请在赋码中设置！
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ */
+async function checkDutyFree(controller: InvoiceController, goods: IGood) {
+    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
+    if (goods.taxRate === 0 && controller.state.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType) {
+        const content = '零税率需要设置免税类型，请在赋码中设置！'
+        message.error({ content, key: content });
+        throw new Error(content)
+    }
+}
+
+/** 
+ * 金额为0不能添加折扣行 
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ **/
+async function checkZeroAmount(controller: InvoiceController, goods: IGood) {
+    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
+    if (`${goods.lineAmountIncludeTax}` === '0') {
+        const content = '金额为0不能添加折扣行'
+        message.error({ content, key: content });
+        throw new Error(content)
+    }
+}
+
+/** 
+ * 校验当前的表单 
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ * */
+async function checkFieldsError(controller: InvoiceController, goods: IGood) {
+    const s = controller.state;
+    if (s.goodsListState.form && s.goodsListState.editGood?.$index === goods?.$index) {
+        const err: any = s.goodsListState.form.getFieldsError();
+        for (let key in err) {
+            if (!err[key]) continue;
+            const content = err[key][0];
+            message.error({ content, key: content });
+            throw new Error(content)
+        }
+    }
+}