kts-component-invoice-operate 3.2.61 → 3.2.62

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType/index.d.ts

@@ -1,6 +1,7 @@
 declare enum LineAttributeType {
     正常 = 0,
     折扣行 = 1,
-    被折扣行 = 2
+    被折扣行 = 2,
+    折让行 = 3
 }
 export default LineAttributeType;

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.d.ts

@@ -70,6 +70,8 @@ export default class GoodsListState {
     isMergeDetails: boolean;
     /** 是否可以合并折扣 */
     isMergeDiscount: boolean;
+    /** 是否可以销售折让 */
+    isSalesDiscount: boolean;
     /** 正在 添加商品对照 的货物 */
     addComparisonIndex?: string;
     /** 商品拖拽数据 */

package/dist/Invoice/tools/coolingFn/index.d.ts

@@ -1,8 +1,8 @@
 /**
  * 有冷却时间的函数
- * @param fn 方法
  * @param key 方法key
  * @param delayed 冷却时间
+ * @param fn 方法
  */
 declare const _default: (key: string | undefined, delayed: number | undefined, fn: Function) => void;
 export default _default;

package/dist/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useEndowCode/index.d.ts

@@ -3,5 +3,5 @@ declare const _default: (goods: IGood) => {
     key: string;
     title: string;
     onClick: () => Promise<void>;
-};
+} | undefined;
 export default _default;

package/dist/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/uaeSalesDiscount/index.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+/** 销售折让 */
+export default function uaeSalesDiscount(): {
+    /** 按钮 */
+    button: JSX.Element;
+};

package/dist/index.esm.js

@@ -916,6 +916,7 @@ var LineAttributeType;
   LineAttributeType[LineAttributeType["\u6B63\u5E38"] = 0] = "\u6B63\u5E38";
   LineAttributeType[LineAttributeType["\u6298\u6263\u884C"] = 1] = "\u6298\u6263\u884C";
   LineAttributeType[LineAttributeType["\u88AB\u6298\u6263\u884C"] = 2] = "\u88AB\u6298\u6263\u884C";
+  LineAttributeType[LineAttributeType["\u6298\u8BA9\u884C"] = 3] = "\u6298\u8BA9\u884C";
 })(LineAttributeType || (LineAttributeType = {}));
 
 var LineAttributeType$1 = LineAttributeType;
@@ -1029,6 +1030,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.isVisibleDrawer = false;
   this.isMergeDetails = false;
   this.isMergeDiscount = false;
+  this.isSalesDiscount = false;
   this.addComparisonIndex = void 0;
   this.drag = new Drag();
 });
@@ -10248,6 +10250,10 @@ var useDelItem = (function (goods) {
     controller.delGood(goods.$index);
   }, [controller, goods.$index]);
 
+  if (goods.lineAttribute === LineAttributeType$1.折让行) {
+    return undefined;
+  }
+
   if (goods.lineAttribute === LineAttributeType$1.被折扣行) {
     return undefined;
   }
@@ -10435,6 +10441,11 @@ var useEndowCode = (function (goods) {
       }
     }, _callee);
   })), [controller, goods]);
+
+  if (goods.lineAttribute === LineAttributeType$1.折让行) {
+    return undefined;
+  }
+
   return {
     key: 'endowCode',
     title: '赋码',
@@ -13843,7 +13854,7 @@ var useRowSelection = (function () {
                         case 0:
                           s.goodsListState.selectedGoodIndex.forEach(function ($index) {
                             var goods = s.goodsListState.goodsMap.get($index);
-                            if (!goods || goods.lineAttribute === LineAttributeType$1.正常) return; // 数组位置
+                            if (!goods || goods.lineAttribute !== LineAttributeType$1.折扣行 && goods.lineAttribute !== LineAttributeType$1.被折扣行) return; // 数组位置
 
                             var t = s.goodsListState.goodsList.indexOf(goods);
                             goods.lineAttribute === LineAttributeType$1.折扣行 ? t-- : t++;
@@ -13900,9 +13911,9 @@ styleInject(css_248z$a);
 var keys$1 = {};
 /**
  * 有冷却时间的函数
- * @param fn 方法
  * @param key 方法key
  * @param delayed 冷却时间
+ * @param fn 方法
  */
 
 var coolingFn = (function () {
@@ -13978,10 +13989,25 @@ var useEndowCodeButton = (function () {
                         return _context.abrupt("return");
 
                       case 6:
+                        if (!(s.goodsListState.selectedGoodIndex.map(function (e) {
+                          return s.goodsListState.goodsMap.get(e);
+                        }).every(function (e) {
+                          return (e === null || e === void 0 ? void 0 : e.lineAttribute) !== LineAttributeType$1.折让行;
+                        }) === false)) {
+                          _context.next = 9;
+                          break;
+                        }
+
+                        coolingFn('折让行不能赋码', 3000, function () {
+                          message.error('折让行不能赋码');
+                        });
+                        return _context.abrupt("return");
+
+                      case 9:
                         // 设置赋码
                         s.goodsListState.endowCode.endowcodeGoodIndex = s.goodsListState.selectedGoodIndex;
 
-                      case 7:
+                      case 10:
                       case "end":
                         return _context.stop();
                     }
@@ -14597,6 +14623,184 @@ function useMergeDiscount() {
   };
 }
 
+/** 销售折让 */
+
+function uaeSalesDiscount() {
+  var controller = Invoice.useInvoiceController();
+  var selectedGoodIndex = controller.useMemo(function (s) {
+    return s.goodsListState.selectedGoodIndex;
+  }, []);
+  var goodsMap = controller.useMemo(function (s) {
+    return s.goodsListState.goodsMap;
+  }, []);
+  var isSalesDiscount = controller.useMemo(function (s) {
+    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;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            selectedGood = selectedGoodIndex.map(function (e) {
+              return goodsMap.get(e);
+            });
+            /** 折让行 */
+
+            concession = selectedGood.filter(function (e) {
+              return (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.折让行;
+            })[0];
+
+            if (concession) {
+              _context3.next = 6;
+              break;
+            }
+
+            content = '未选择折让行';
+            message.error({
+              content: content,
+              key: content
+            });
+            return _context3.abrupt("return");
+
+          case 6:
+            /** 准备添加折扣的货物列表 */
+            discountGood = selectedGood.filter(function (e) {
+              return (e === null || e === void 0 ? void 0 : e.lineAttribute) !== LineAttributeType$1.折让行;
+            });
+            /** 折扣总金额 */
+
+            totalDiscoline = chain$1(bignumber(-1 * (concession.lineAmountIncludeTax || 0)));
+            discolinesSum = chain$1(bignumber(0));
+            /** 总金额 */
+
+            totalAmount = function () {
+              var sum = 0;
+              discountGood.forEach(function (e) {
+                var _e$lineAmountIncludeT;
+
+                sum += (_e$lineAmountIncludeT = e === null || e === void 0 ? void 0 : e.lineAmountIncludeTax) !== null && _e$lineAmountIncludeT !== void 0 ? _e$lineAmountIncludeT : 0;
+              });
+              return sum;
+            }(); // 每行的折扣金额
+
+
+            discolines = discountGood.map(function (e, i) {
+              var _e$lineAmountIncludeT2;
+
+              // 折扣金额占比
+              var share = chain$1(bignumber((_e$lineAmountIncludeT2 = e === null || e === void 0 ? void 0 : e.lineAmountIncludeTax) !== null && _e$lineAmountIncludeT2 !== void 0 ? _e$lineAmountIncludeT2 : 0)).divide(bignumber(totalAmount)); // 折扣金额
+
+              var value = totalDiscoline.multiply(share.done()).multiply(bignumber(100)).round().divide(bignumber(100)).done();
+              discolinesSum = discolinesSum.add(value);
+              return value.toNumber();
+            }); // 剩余折扣金额
+
+            surplus = totalDiscoline.subtract(discolinesSum.done()); // 补充剩余折扣金
+
+            i = 0;
+
+          case 13:
+            if (!(i < discolines.length)) {
+              _context3.next = 21;
+              break;
+            }
+
+            if (!surplus.smaller(0.01).done()) {
+              _context3.next = 16;
+              break;
+            }
+
+            return _context3.abrupt("break", 21);
+
+          case 16:
+            discolines[i] = chain$1(bignumber(discolines[i])).add(bignumber(0.01)).done().toNumber();
+            surplus = surplus.subtract(bignumber(0.01));
+
+          case 18:
+            i++;
+            _context3.next = 13;
+            break;
+
+          case 21:
+            _context3.next = 23;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        s.goodsListState.goodsList = s.goodsListState.goodsList.filter(function (e) {
+                          return e.$index !== concession.$index;
+                        });
+
+                      case 1:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
+
+          case 23:
+            _context3.next = 25;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
+                      case 0:
+                        s.goodsListState.selectedGoodIndex = [];
+
+                      case 1:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }
+                }, _callee2);
+              }));
+
+              return function (_x2) {
+                return _ref3.apply(this, arguments);
+              };
+            }());
+
+          case 25:
+            _context3.next = 27;
+            return controller.addGoodDiscountV2(discolines.map(function (e, i) {
+              var _discountGood$i;
+
+              return {
+                $index: (_discountGood$i = discountGood[i]) === null || _discountGood$i === void 0 ? void 0 : _discountGood$i.$index,
+                discolineAmountunt: e
+              };
+            }));
+
+          case 27:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  })), [controller, selectedGoodIndex, goodsMap]);
+  var button = React.useMemo(function () {
+    if (!isSalesDiscount) return React.createElement(React.Fragment, null);
+    return React.createElement(Button, {
+      onClick: onClick,
+      disabled: selectedGoodIndex.length <= 1
+    }, "\u9500\u552E\u6298\u8BA9");
+  }, [selectedGoodIndex.length, isSalesDiscount]);
+  return {
+    /** 按钮 */
+    button: button
+  };
+}
+
 var GoodsList = /*#__PURE__*/function (_React$Component) {
   _inherits(GoodsList, _React$Component);
 
@@ -14659,6 +14863,9 @@ var Main = decorator(Form.create())(function (props) {
   /** 全单合并折扣 */
 
   var mergeDiscount = useMergeDiscount();
+  /** 销售折让 */
+
+  var salesDiscount = uaeSalesDiscount();
   /** 清空自动赋码缓存 */
 
   React.useEffect(function () {
@@ -14816,7 +15023,7 @@ var Main = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-goods-list-able"
   }, React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, React.createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, React.createElement(Search, null)), React.createElement("div", {
+  }, React.createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, React.createElement(Search, null)), React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, React.createElement(DescribeSwitch, null), React.createElement(TaxIncludedSwitch, null))), React.createElement("div", {
     className: classNames('kts-invoice-operate-goods-list-table', {

package/dist/index.js

@@ -926,6 +926,7 @@ var LineAttributeType;
   LineAttributeType[LineAttributeType["\u6B63\u5E38"] = 0] = "\u6B63\u5E38";
   LineAttributeType[LineAttributeType["\u6298\u6263\u884C"] = 1] = "\u6298\u6263\u884C";
   LineAttributeType[LineAttributeType["\u88AB\u6298\u6263\u884C"] = 2] = "\u88AB\u6298\u6263\u884C";
+  LineAttributeType[LineAttributeType["\u6298\u8BA9\u884C"] = 3] = "\u6298\u8BA9\u884C";
 })(LineAttributeType || (LineAttributeType = {}));
 
 var LineAttributeType$1 = LineAttributeType;
@@ -1039,6 +1040,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.isVisibleDrawer = false;
   this.isMergeDetails = false;
   this.isMergeDiscount = false;
+  this.isSalesDiscount = false;
   this.addComparisonIndex = void 0;
   this.drag = new Drag();
 });
@@ -10258,6 +10260,10 @@ var useDelItem = (function (goods) {
     controller.delGood(goods.$index);
   }, [controller, goods.$index]);
 
+  if (goods.lineAttribute === LineAttributeType$1.折让行) {
+    return undefined;
+  }
+
   if (goods.lineAttribute === LineAttributeType$1.被折扣行) {
     return undefined;
   }
@@ -10445,6 +10451,11 @@ var useEndowCode = (function (goods) {
       }
     }, _callee);
   })), [controller, goods]);
+
+  if (goods.lineAttribute === LineAttributeType$1.折让行) {
+    return undefined;
+  }
+
   return {
     key: 'endowCode',
     title: '赋码',
@@ -13853,7 +13864,7 @@ var useRowSelection = (function () {
                         case 0:
                           s.goodsListState.selectedGoodIndex.forEach(function ($index) {
                             var goods = s.goodsListState.goodsMap.get($index);
-                            if (!goods || goods.lineAttribute === LineAttributeType$1.正常) return; // 数组位置
+                            if (!goods || goods.lineAttribute !== LineAttributeType$1.折扣行 && goods.lineAttribute !== LineAttributeType$1.被折扣行) return; // 数组位置
 
                             var t = s.goodsListState.goodsList.indexOf(goods);
                             goods.lineAttribute === LineAttributeType$1.折扣行 ? t-- : t++;
@@ -13910,9 +13921,9 @@ styleInject(css_248z$a);
 var keys$1 = {};
 /**
  * 有冷却时间的函数
- * @param fn 方法
  * @param key 方法key
  * @param delayed 冷却时间
+ * @param fn 方法
  */
 
 var coolingFn = (function () {
@@ -13988,10 +13999,25 @@ var useEndowCodeButton = (function () {
                         return _context.abrupt("return");
 
                       case 6:
+                        if (!(s.goodsListState.selectedGoodIndex.map(function (e) {
+                          return s.goodsListState.goodsMap.get(e);
+                        }).every(function (e) {
+                          return (e === null || e === void 0 ? void 0 : e.lineAttribute) !== LineAttributeType$1.折让行;
+                        }) === false)) {
+                          _context.next = 9;
+                          break;
+                        }
+
+                        coolingFn('折让行不能赋码', 3000, function () {
+                          ktsComponentsAntdX3.message.error('折让行不能赋码');
+                        });
+                        return _context.abrupt("return");
+
+                      case 9:
                         // 设置赋码
                         s.goodsListState.endowCode.endowcodeGoodIndex = s.goodsListState.selectedGoodIndex;
 
-                      case 7:
+                      case 10:
                       case "end":
                         return _context.stop();
                     }
@@ -14607,6 +14633,184 @@ function useMergeDiscount() {
   };
 }
 
+/** 销售折让 */
+
+function uaeSalesDiscount() {
+  var controller = Invoice.useInvoiceController();
+  var selectedGoodIndex = controller.useMemo(function (s) {
+    return s.goodsListState.selectedGoodIndex;
+  }, []);
+  var goodsMap = controller.useMemo(function (s) {
+    return s.goodsListState.goodsMap;
+  }, []);
+  var isSalesDiscount = controller.useMemo(function (s) {
+    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;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            selectedGood = selectedGoodIndex.map(function (e) {
+              return goodsMap.get(e);
+            });
+            /** 折让行 */
+
+            concession = selectedGood.filter(function (e) {
+              return (e === null || e === void 0 ? void 0 : e.lineAttribute) === LineAttributeType$1.折让行;
+            })[0];
+
+            if (concession) {
+              _context3.next = 6;
+              break;
+            }
+
+            content = '未选择折让行';
+            ktsComponentsAntdX3.message.error({
+              content: content,
+              key: content
+            });
+            return _context3.abrupt("return");
+
+          case 6:
+            /** 准备添加折扣的货物列表 */
+            discountGood = selectedGood.filter(function (e) {
+              return (e === null || e === void 0 ? void 0 : e.lineAttribute) !== LineAttributeType$1.折让行;
+            });
+            /** 折扣总金额 */
+
+            totalDiscoline = mathjs.chain(mathjs.bignumber(-1 * (concession.lineAmountIncludeTax || 0)));
+            discolinesSum = mathjs.chain(mathjs.bignumber(0));
+            /** 总金额 */
+
+            totalAmount = function () {
+              var sum = 0;
+              discountGood.forEach(function (e) {
+                var _e$lineAmountIncludeT;
+
+                sum += (_e$lineAmountIncludeT = e === null || e === void 0 ? void 0 : e.lineAmountIncludeTax) !== null && _e$lineAmountIncludeT !== void 0 ? _e$lineAmountIncludeT : 0;
+              });
+              return sum;
+            }(); // 每行的折扣金额
+
+
+            discolines = discountGood.map(function (e, i) {
+              var _e$lineAmountIncludeT2;
+
+              // 折扣金额占比
+              var share = mathjs.chain(mathjs.bignumber((_e$lineAmountIncludeT2 = e === null || e === void 0 ? void 0 : e.lineAmountIncludeTax) !== null && _e$lineAmountIncludeT2 !== void 0 ? _e$lineAmountIncludeT2 : 0)).divide(mathjs.bignumber(totalAmount)); // 折扣金额
+
+              var value = totalDiscoline.multiply(share.done()).multiply(mathjs.bignumber(100)).round().divide(mathjs.bignumber(100)).done();
+              discolinesSum = discolinesSum.add(value);
+              return value.toNumber();
+            }); // 剩余折扣金额
+
+            surplus = totalDiscoline.subtract(discolinesSum.done()); // 补充剩余折扣金
+
+            i = 0;
+
+          case 13:
+            if (!(i < discolines.length)) {
+              _context3.next = 21;
+              break;
+            }
+
+            if (!surplus.smaller(0.01).done()) {
+              _context3.next = 16;
+              break;
+            }
+
+            return _context3.abrupt("break", 21);
+
+          case 16:
+            discolines[i] = mathjs.chain(mathjs.bignumber(discolines[i])).add(mathjs.bignumber(0.01)).done().toNumber();
+            surplus = surplus.subtract(mathjs.bignumber(0.01));
+
+          case 18:
+            i++;
+            _context3.next = 13;
+            break;
+
+          case 21:
+            _context3.next = 23;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        s.goodsListState.goodsList = s.goodsListState.goodsList.filter(function (e) {
+                          return e.$index !== concession.$index;
+                        });
+
+                      case 1:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
+
+          case 23:
+            _context3.next = 25;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
+                      case 0:
+                        s.goodsListState.selectedGoodIndex = [];
+
+                      case 1:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }
+                }, _callee2);
+              }));
+
+              return function (_x2) {
+                return _ref3.apply(this, arguments);
+              };
+            }());
+
+          case 25:
+            _context3.next = 27;
+            return controller.addGoodDiscountV2(discolines.map(function (e, i) {
+              var _discountGood$i;
+
+              return {
+                $index: (_discountGood$i = discountGood[i]) === null || _discountGood$i === void 0 ? void 0 : _discountGood$i.$index,
+                discolineAmountunt: e
+              };
+            }));
+
+          case 27:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  })), [controller, selectedGoodIndex, goodsMap]);
+  var button = React__default['default'].useMemo(function () {
+    if (!isSalesDiscount) return React__default['default'].createElement(React__default['default'].Fragment, null);
+    return React__default['default'].createElement(ktsComponentsAntdX3.Button, {
+      onClick: onClick,
+      disabled: selectedGoodIndex.length <= 1
+    }, "\u9500\u552E\u6298\u8BA9");
+  }, [selectedGoodIndex.length, isSalesDiscount]);
+  return {
+    /** 按钮 */
+    button: button
+  };
+}
+
 var GoodsList = /*#__PURE__*/function (_React$Component) {
   _inherits(GoodsList, _React$Component);
 
@@ -14669,6 +14873,9 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
   /** 全单合并折扣 */
 
   var mergeDiscount = useMergeDiscount();
+  /** 销售折让 */
+
+  var salesDiscount = uaeSalesDiscount();
   /** 清空自动赋码缓存 */
 
   React__default['default'].useEffect(function () {
@@ -14826,7 +15033,7 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
     className: "kts-invoice-operate-goods-list-able"
   }, React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, React__default['default'].createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, React__default['default'].createElement(Search, null)), React__default['default'].createElement("div", {
+  }, React__default['default'].createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, React__default['default'].createElement(Search, null)), React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, React__default['default'].createElement(DescribeSwitch, null), React__default['default'].createElement(TaxIncludedSwitch, null))), React__default['default'].createElement("div", {
     className: classNames__default['default']('kts-invoice-operate-goods-list-table', {

package/package.json

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

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType/index.ts

@@ -1,6 +1,7 @@
 enum LineAttributeType {
     正常 = 0,
     折扣行 = 1,
-    被折扣行 = 2
+    被折扣行 = 2,
+    折让行 = 3,
 }
 export default LineAttributeType;

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.ts

@@ -43,7 +43,7 @@ export default class GoodsListState {
   columnsReplenish: { [key: string]: IColumnsReplenish } = {};
 
   /** 商品表格隐藏列 */
-  columnshide:string[] = ['itemCode'];
+  columnshide: string[] = ['itemCode'];
 
   /** 单位列表 */
   unitList: string[] = [];
@@ -99,6 +99,9 @@ export default class GoodsListState {
   /** 是否可以合并折扣 */
   isMergeDiscount = false;
 
+  /** 是否可以销售折让 */
+  isSalesDiscount = false;
+
   /** 正在 添加商品对照 的货物 */
   addComparisonIndex?: string;
 

package/src/Invoice/_test/endowCode/index.tsx

@@ -53,7 +53,7 @@ export default () => {
       <Switch checkedChildren="预制" unCheckedChildren="默认" onChange={e => { e ? setController(controller2) : setController(controller1) }} ></Switch>
       <Button onClick={controller.pipeline(async s => { s.goodsListState.endowCode.getReadOnlyTaxRate = s.goodsListState.endowCode.readOnlyTaxRateMap.DRAFT })} >税率（草稿）</Button>
       <Button onClick={controller.pipeline(async s => { s.goodsListState.endowCode.getReadOnlyTaxRate = () => true })} >税率（预制）</Button>
-      <Invoice controller={controller} invoiceType='digtal' />
+      <Invoice controller={controller} />
     </div>
   );
 };
@@ -149,7 +149,7 @@ const lines: any[] = [
     "itemName": "*配电控制设备*公牛(BULL)",
     "lineAmountExcludeTax": 443365.88,
     "lineAmountIncludeTax": 501003.53,
-    "lineAttribute": "2",
+    "lineAttribute": 0,
     "lineDiscountExcludeTax": 4433.66,
     "lineDiscountRate": null,
     "lineId": "1740823580142206976",
@@ -200,7 +200,7 @@ const lines: any[] = [
     "itemName": "*配电控制设备*公牛(BULL)",
     "lineAmountExcludeTax": -4433.66,
     "lineAmountIncludeTax": -5010.04,
-    "lineAttribute": "1",
+    "lineAttribute": 0,
     "lineDiscountExcludeTax": null,
     "lineDiscountRate": null,
     "lineId": "1740823580142206976",
@@ -234,6 +234,57 @@ const lines: any[] = [
     "taxRate": 13,
     "unit": "",
     "zeroTaxRateFlag": null
+  },
+  {
+    "buyersItemCode": null,
+    "buyersItemModelName": "GN-G32Z104",
+    "buyersItemName": "打折",
+    "buyersItemUnit": null,
+    "discount": null,
+    "discountGroup": "31b6d887-4877-4926-abe8-ab49ef6902da",
+    "dispatchDocumentReference": null,
+    "dispatchLineReference": null,
+    "favouredPolicyMark": "0",
+    "favouredPolicyName": null,
+    "id": "40823568750477313",
+    "itemModelName": "",
+    "itemName": "打折",
+    "lineAmountExcludeTax": -100,
+    "lineAmountIncludeTax": -100,
+    "lineAttribute": 3,
+    "lineDiscountExcludeTax": null,
+    "lineDiscountRate": null,
+    "lineId": "1740823580142206976",
+    "lineOrder": 2,
+    "materialCode": null,
+    "noticeCodeNo": null,
+    "noticeLineId": null,
+    "orderLineId": null,
+    "orderLineReference": null,
+    "orderNo": null,
+    "orderReference": null,
+    "priceExcludeTax": null,
+    "priceIncludeTax": null,
+    "quantity": null,
+    "receiptDocumentReference": null,
+    "receiptLineReference": null,
+    "reconciliationDocumentReference": null,
+    "reconciliationSheetLineReference": null,
+    "relationReferences": null,
+    "requisitionLineNo": null,
+    "sellersItemCode": null,
+    "sellersItemModelName": null,
+    "sellersItemName": "*配电控制设备*1",
+    "sellersItemUnit": null,
+    "specialManagement": null,
+    "statementCode": null,
+    "statementLineId": null,
+    "taxAmount": -576.38,
+    "taxClassificationCode": "1090407030000000000",
+    "taxDiscount": null,
+    "taxRate": 0,
+    "unit": "",
+    "zeroTaxRateFlag": null
   }
 ]
 

package/src/Invoice/tools/coolingFn/index.ts

@@ -4,9 +4,9 @@ const keys: { [key: string]: any } = {}
 
 /**
  * 有冷却时间的函数
- * @param fn 方法
  * @param key 方法key
  * @param delayed 冷却时间
+ * @param fn 方法
  */
 export default (key: string = 'default', delayed: number = 200, fn: Function) => {
     if (keys[key]) {

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

@@ -17,6 +17,10 @@ export default (goods: IGood) => {
         controller.delGood(goods.$index);
     }, [controller, goods.$index]);
 
+    if (goods.lineAttribute === LineAttributeType.折让行) {
+        return undefined;
+    }
+
     if (goods.lineAttribute === LineAttributeType.被折扣行) {
         return undefined;
     }

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

@@ -1,7 +1,7 @@
 import React from 'react';
 // import { Button } from 'kts-components-antd-x3';
 import Invoice from '../../../../../../../../..';
-import { IGood } from '../../../../../../../../../InvoiceController';
+import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
 import { endowCode } from '../../../../autoFillFn';
 
 // const { Text } = Typography;
@@ -14,6 +14,10 @@ export default (goods: IGood) => {
         endowCode(controller, goods);
     }, [controller, goods]);
 
+    if (goods.lineAttribute === LineAttributeType.折让行) {
+        return undefined;
+    }
+
     return {
         key: 'endowCode',
         title: '赋码',

package/src/Invoice/ui/default/GoodsList/hook/useRowSelection/index.tsx

@@ -84,7 +84,7 @@ export default () => {
         await controller.pipeline(async s => {
             s.goodsListState.selectedGoodIndex.forEach($index => {
                 const goods = s.goodsListState.goodsMap.get($index);
-                if (!goods || goods.lineAttribute === LineAttributeType.正常) return;
+                if (!goods || (goods.lineAttribute !== LineAttributeType.折扣行 && goods.lineAttribute !== LineAttributeType.被折扣行)) return;
 
                 // 数组位置
                 let t = s.goodsListState.goodsList.indexOf(goods);

package/src/Invoice/ui/default/GoodsList/index.tsx

@@ -29,6 +29,7 @@ import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
 import useAddDiscountRowButton from './ui/BulkMenu/hooks/useAddDiscountRowButton';
 import useMergeDetails from './ui/BulkMenu/hooks/useMergeDetails';
 import useMergeDiscount from './ui/BulkMenu/hooks/useMergeDiscount';
+import uaeSalesDiscount from './ui/BulkMenu/hooks/uaeSalesDiscount';
 
 export interface IGoodsListProps {
   /** 扩展部分 */
@@ -91,6 +92,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   /** 全单合并折扣 */
   const mergeDiscount = useMergeDiscount()
 
+  /** 销售折让 */
+  const salesDiscount = uaeSalesDiscount()
+
   /** 清空自动赋码缓存 */
   React.useEffect(() => {
     controller.run(async s => { s.goodsListState.endowCode.cache = {} });
@@ -149,6 +153,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
           {/* 添加折扣行 */}
           {addDiscountRowButton.drawer}
 
+          {/* 销售折让 */}
+          {salesDiscount.button}
+
           {/* 搜索 */}
           <Search />
         </div>

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

@@ -0,0 +1,104 @@
+
+import React from "react"
+import { Button, message } from "kts-components-antd-x3"
+import { chain, bignumber } from 'mathjs';
+import Invoice from '../../../../../../..'
+import { LineAttributeType } from "../../../../../../../InvoiceController";
+
+/** 销售折让 */
+export default function uaeSalesDiscount() {
+
+    const controller = Invoice.useInvoiceController();
+
+    const selectedGoodIndex = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
+
+    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
+
+    const isSalesDiscount = controller.useMemo(s => s.goodsListState.isSalesDiscount, []);
+
+    const onClick = React.useCallback(async () => {
+        const selectedGood = selectedGoodIndex.map(e => goodsMap.get(e));
+
+        /** 折让行 */
+        const concession = selectedGood.filter(e => e?.lineAttribute === LineAttributeType.折让行)[0];
+        if (!concession) {
+            const content = '未选择折让行';
+            message.error({ content, key: content })
+            return;
+        }
+
+        /** 准备添加折扣的货物列表 */
+        const discountGood = selectedGood.filter(e => e?.lineAttribute !== LineAttributeType.折让行);
+
+        /** 折扣总金额 */
+        const totalDiscoline = chain(bignumber(-1 * (concession.lineAmountIncludeTax || 0)));
+
+        let discolinesSum = chain(bignumber(0));
+
+        /** 总金额 */
+        const totalAmount = (() => {
+            let sum = 0;
+            discountGood.forEach(e => { sum += e?.lineAmountIncludeTax ?? 0 });
+            return sum;
+        })()
+
+        // 每行的折扣金额
+        const discolines: number[] = discountGood.map((e, i) => {
+            // 折扣金额占比
+            const share = chain(bignumber(e?.lineAmountIncludeTax ?? 0))
+                .divide(bignumber(totalAmount));
+
+            // 折扣金额
+            const value = totalDiscoline
+                .multiply(share.done())
+
+                .multiply(bignumber(100))
+                .round()
+                .divide(bignumber(100))
+
+                .done();
+
+            discolinesSum = discolinesSum.add(value);
+            return value.toNumber();
+        });
+
+        // 剩余折扣金额
+        let surplus = totalDiscoline.subtract(discolinesSum.done());
+
+        // 补充剩余折扣金
+        for (let i = 0; i < discolines.length; i++) {
+            if (surplus.smaller(0.01).done()) break;
+            discolines[i] = chain(bignumber(discolines[i])).add(bignumber(0.01)).done().toNumber();
+            surplus = surplus.subtract(bignumber(0.01));
+        }
+
+        // 清楚折让行
+        await controller.run(async s => { s.goodsListState.goodsList = s.goodsListState.goodsList.filter(e => e.$index !== concession.$index) })
+        await controller.run(async s => { s.goodsListState.selectedGoodIndex = [] });
+
+        // 给一组货物添加折扣行
+        await controller.addGoodDiscountV2(discolines.map((e, i) => {
+            return {
+                $index: discountGood[i]?.$index as string,
+                discolineAmountunt: e as number,
+            }
+        }))
+    }, [controller, selectedGoodIndex, goodsMap])
+
+    const button = React.useMemo(() => {
+        if (!isSalesDiscount) return <></>;
+        return (
+            <Button
+                onClick={onClick}
+                disabled={selectedGoodIndex.length <= 1}
+            >
+                销售折让
+            </Button>
+        )
+    }, [selectedGoodIndex.length, isSalesDiscount])
+
+    return {
+        /** 按钮 */
+        button,
+    }
+}

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

@@ -2,9 +2,10 @@ import React from 'react';
 import Invoice from '../../../../../../..';
 import { message, Menu, Button } from 'kts-components-antd-x3';
 import coolingFn from '../../../../../../../tools/coolingFn';
+import { LineAttributeType } from '../../../../../../../InvoiceController';
 
 export default () => {
-  
+
   const controller = Invoice.useInvoiceController();
 
   const model = controller.useMemo(s => s.model, []);
@@ -31,6 +32,12 @@ export default () => {
         return;
       }
 
+      // 折让行 不能赋码
+      if (s.goodsListState.selectedGoodIndex.map(e => s.goodsListState.goodsMap.get(e)).every(e => e?.lineAttribute !== LineAttributeType.折让行) === false) {
+        coolingFn('折让行不能赋码', 3000, () => { message.error('折让行不能赋码') });
+        return;
+      }
+
       // 设置赋码
       s.goodsListState.endowCode.endowcodeGoodIndex = s.goodsListState.selectedGoodIndex;
     })();

package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx

@@ -1,9 +1,7 @@
 
 import React from "react";
 import { chain, bignumber } from 'mathjs';
-import Icon from '@ant-design/icons';
 import { Button, Drawer, Form, InputNumber, Radio, message, Space } from "kts-xui";
-import { ReactComponent as AddSvg } from './svg/add.svg';
 import Invoice from "../../../../../../..";
 import { LineAttributeType } from "../../../../../../../InvoiceController";