kts-component-invoice-operate 3.2.62 → 3.2.64

package/dist/index.esm.js

@@ -1542,6 +1542,7 @@ var addGoodDiscountV2 = /*#__PURE__*/(function () {
                   lineAttribute: LineAttributeType$1.折扣行,
                   taxRate: good.taxRate,
                   itemName: good.itemName,
+                  shorthand: good.shorthand,
                   taxAmount: -1 * taxAmount,
                   lineAmountExcludeTax: -1 * lineAmountExcludeTax,
                   lineAmountIncludeTax: -1 * e.discolineAmountunt,
@@ -14637,7 +14638,8 @@ function uaeSalesDiscount() {
     return s.goodsListState.isSalesDiscount;
   }, []);
   var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var selectedGood, concession, content, discountGood, totalDiscoline, discolinesSum, totalAmount, discolines, surplus, i;
+    var selectedGood, content, concession, _content, discountGood, totalDiscoline, discolinesSum, totalAmount, discolines, surplus, i;
+
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -14645,25 +14647,40 @@ function uaeSalesDiscount() {
             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
+            });
+            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 = 6;
+              _context3.next = 10;
               break;
             }
 
-            content = '未选择折让行';
+            _content = '未选择折让行';
             message.error({
-              content: content,
-              key: content
+              content: _content,
+              key: _content
             });
             return _context3.abrupt("return");
 
-          case 6:
+          case 10:
             /** 准备添加折扣的货物列表 */
             discountGood = selectedGood.filter(function (e) {
               return (e === null || e === void 0 ? void 0 : e.lineAttribute) !== LineAttributeType$1.折让行;
@@ -14700,30 +14717,30 @@ function uaeSalesDiscount() {
 
             i = 0;
 
-          case 13:
+          case 17:
             if (!(i < discolines.length)) {
-              _context3.next = 21;
+              _context3.next = 25;
               break;
             }
 
             if (!surplus.smaller(0.01).done()) {
-              _context3.next = 16;
+              _context3.next = 20;
               break;
             }
 
-            return _context3.abrupt("break", 21);
+            return _context3.abrupt("break", 25);
 
-          case 16:
+          case 20:
             discolines[i] = chain$1(bignumber(discolines[i])).add(bignumber(0.01)).done().toNumber();
             surplus = surplus.subtract(bignumber(0.01));
 
-          case 18:
+          case 22:
             i++;
-            _context3.next = 13;
+            _context3.next = 17;
             break;
 
-          case 21:
-            _context3.next = 23;
+          case 25:
+            _context3.next = 27;
             return controller.run( /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -14747,8 +14764,8 @@ function uaeSalesDiscount() {
               };
             }());
 
-          case 23:
-            _context3.next = 25;
+          case 27:
+            _context3.next = 29;
             return controller.run( /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -14770,8 +14787,8 @@ function uaeSalesDiscount() {
               };
             }());
 
-          case 25:
-            _context3.next = 27;
+          case 29:
+            _context3.next = 31;
             return controller.addGoodDiscountV2(discolines.map(function (e, i) {
               var _discountGood$i;
 
@@ -14781,7 +14798,7 @@ function uaeSalesDiscount() {
               };
             }));
 
-          case 27:
+          case 31:
           case "end":
             return _context3.stop();
         }

package/dist/index.js

@@ -1552,6 +1552,7 @@ var addGoodDiscountV2 = /*#__PURE__*/(function () {
                   lineAttribute: LineAttributeType$1.折扣行,
                   taxRate: good.taxRate,
                   itemName: good.itemName,
+                  shorthand: good.shorthand,
                   taxAmount: -1 * taxAmount,
                   lineAmountExcludeTax: -1 * lineAmountExcludeTax,
                   lineAmountIncludeTax: -1 * e.discolineAmountunt,
@@ -14647,7 +14648,8 @@ function uaeSalesDiscount() {
     return s.goodsListState.isSalesDiscount;
   }, []);
   var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var selectedGood, concession, content, discountGood, totalDiscoline, discolinesSum, totalAmount, discolines, surplus, i;
+    var selectedGood, content, concession, _content, discountGood, totalDiscoline, discolinesSum, totalAmount, discolines, surplus, i;
+
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -14655,25 +14657,40 @@ function uaeSalesDiscount() {
             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
+            });
+            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 = 6;
+              _context3.next = 10;
               break;
             }
 
-            content = '未选择折让行';
+            _content = '未选择折让行';
             ktsComponentsAntdX3.message.error({
-              content: content,
-              key: content
+              content: _content,
+              key: _content
             });
             return _context3.abrupt("return");
 
-          case 6:
+          case 10:
             /** 准备添加折扣的货物列表 */
             discountGood = selectedGood.filter(function (e) {
               return (e === null || e === void 0 ? void 0 : e.lineAttribute) !== LineAttributeType$1.折让行;
@@ -14710,30 +14727,30 @@ function uaeSalesDiscount() {
 
             i = 0;
 
-          case 13:
+          case 17:
             if (!(i < discolines.length)) {
-              _context3.next = 21;
+              _context3.next = 25;
               break;
             }
 
             if (!surplus.smaller(0.01).done()) {
-              _context3.next = 16;
+              _context3.next = 20;
               break;
             }
 
-            return _context3.abrupt("break", 21);
+            return _context3.abrupt("break", 25);
 
-          case 16:
+          case 20:
             discolines[i] = mathjs.chain(mathjs.bignumber(discolines[i])).add(mathjs.bignumber(0.01)).done().toNumber();
             surplus = surplus.subtract(mathjs.bignumber(0.01));
 
-          case 18:
+          case 22:
             i++;
-            _context3.next = 13;
+            _context3.next = 17;
             break;
 
-          case 21:
-            _context3.next = 23;
+          case 25:
+            _context3.next = 27;
             return controller.run( /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -14757,8 +14774,8 @@ function uaeSalesDiscount() {
               };
             }());
 
-          case 23:
-            _context3.next = 25;
+          case 27:
+            _context3.next = 29;
             return controller.run( /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -14780,8 +14797,8 @@ function uaeSalesDiscount() {
               };
             }());
 
-          case 25:
-            _context3.next = 27;
+          case 29:
+            _context3.next = 31;
             return controller.addGoodDiscountV2(discolines.map(function (e, i) {
               var _discountGood$i;
 
@@ -14791,7 +14808,7 @@ function uaeSalesDiscount() {
               };
             }));
 
-          case 27:
+          case 31:
           case "end":
             return _context3.stop();
         }

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.62",
+  "version": "3.2.64",
   "scripts": {
+    "dev": "dumi dev",
     "start": "dumi dev",
     "docs:build": "dumi build",
     "docs:deploy": "gh-pages -d docs-dist",

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

@@ -41,6 +41,7 @@ export default async (state: InvoiceControllerState, options?: IOptions[]) => {
                 lineAttribute: LineAttributeType.折扣行,
                 taxRate: good.taxRate,
                 itemName: good.itemName,
+                shorthand: good.shorthand,
 
                 taxAmount: -1 * taxAmount,
                 lineAmountExcludeTax: -1 * lineAmountExcludeTax,

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/uaeSalesDiscount/index.tsx

@@ -19,6 +19,12 @@ export default function uaeSalesDiscount() {
     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 concession = selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折让行)[0];
         if (!concession) {