kts-component-invoice-operate 3.2.60 → 3.2.62

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;
@@ -1003,6 +1004,7 @@ var Drag = /*#__PURE__*/_createClass(function Drag() {
   this.isStart = false;
   this.current = void 0;
   this.container = void 0;
+  this.site = void 0;
 });
 
 var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
@@ -1038,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();
 });
@@ -10173,7 +10176,7 @@ function Search() {
   });
 }
 
-var css_248z$5 = ".kts-invoice-operate-goods-list-itemName-drag-container {\n  position: relative;\n}\n.kts-invoice-operate-goods-list-itemName-drag-container::after {\n  content: \" \";\n  width: 100%;\n  height: 2px;\n  background: #0074ff;\n  position: absolute;\n  left: 0;\n  top: 0;\n  z-index: 9999;\n}\n";
+var css_248z$5 = ".kts-invoice-operate-goods-list-itemName-drag-container-u {\n  position: relative;\n}\n.kts-invoice-operate-goods-list-itemName-drag-container-u::after {\n  content: \" \";\n  width: 100%;\n  height: 2px;\n  background: #0074ff;\n  position: absolute;\n  left: 0;\n  top: 0;\n  z-index: 9999;\n}\n.kts-invoice-operate-goods-list-itemName-drag-container-d {\n  position: relative;\n}\n.kts-invoice-operate-goods-list-itemName-drag-container-d::after {\n  content: \" \";\n  width: 100%;\n  height: 2px;\n  background: #0074ff;\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  z-index: 9999;\n}\n";
 styleInject(css_248z$5);
 
 function TableRow(props) {
@@ -10182,9 +10185,18 @@ function TableRow(props) {
   var goodsMap = controller.useMemo(function (s) {
     return s.goodsListState.goodsMap;
   }, []);
+  /** 当前拖动中的货品索引 */
+
   var current = controller.useMemo(function (s) {
     return s.goodsListState.drag.current;
   }, []);
+  /** 当前拖动中的货品索引 */
+
+  var site = controller.useMemo(function (s) {
+    return s.goodsListState.drag.site;
+  }, []);
+  /** 准备插入的货物索引 */
+
   var container = controller.useMemo(function (s) {
     return s.goodsListState.drag.container;
   }, []);
@@ -10218,7 +10230,7 @@ function TableRow(props) {
       bottom: 0
     }
   })) : React__default['default'].createElement("tr", _objectSpread2(_objectSpread2({}, props), {}, {
-    className: classNames__default['default'](props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container' : undefined)
+    className: classNames__default['default'](props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container-' + site : undefined)
   }));
 }
 
@@ -10248,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;
   }
@@ -10435,6 +10451,11 @@ var useEndowCode = (function (goods) {
       }
     }, _callee);
   })), [controller, goods]);
+
+  if (goods.lineAttribute === LineAttributeType$1.折让行) {
+    return undefined;
+  }
+
   return {
     key: 'endowCode',
     title: '赋码',
@@ -12040,64 +12061,57 @@ function Drag$1(props) {
     var currentGood = controller.state.goodsListState.goodsList.filter(function (e) {
       return e.$index === record.$index;
     })[0];
-    mounting(React__default['default'].createElement(DragDiv, _objectSpread2({}, currentGood))); // 监听移动
-
+    mounting(React__default['default'].createElement(DragDiv, _objectSpread2({}, currentGood)));
     rowList.forEach(function (e) {
-      e.addEventListener('mouseover', onMouseover);
+      e.addEventListener('mousemove', onMousemove);
     });
 
-    function onMouseover(e) {
+    function onMousemove(e) {
       controller.run( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
-          var _getRow, _getRow$dataset;
+          var _rowDom$dataset;
 
-          var container, currentGood, row, currentIndex, containerIndex, _currentIndex, _containerIndex, t;
+          var rowDom, container, row, currentGood, currentIndex, containerIndex, _currentIndex, _containerIndex, t, rect, mouseY;
 
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
-                  container = s.goodsListState.drag.container = (_getRow = getRow(e.target)) === null || _getRow === void 0 ? void 0 : (_getRow$dataset = _getRow.dataset) === null || _getRow$dataset === void 0 ? void 0 : _getRow$dataset.rowKey;
+                  rowDom = getRow(e.target);
+                  container = s.goodsListState.drag.container = rowDom === null || rowDom === void 0 ? void 0 : (_rowDom$dataset = rowDom.dataset) === null || _rowDom$dataset === void 0 ? void 0 : _rowDom$dataset.rowKey;
+                  /** 准备插入的货物 */
 
-                  if (container) {
-                    _context2.next = 3;
+                  row = s.goodsListState.goodsMap.get(container);
+
+                  if (row) {
+                    _context2.next = 5;
                     break;
                   }
 
                   return _context2.abrupt("return");
 
-                case 3:
+                case 5:
                   if (!(container === s.goodsListState.drag.current)) {
-                    _context2.next = 6;
+                    _context2.next = 7;
                     break;
                   }
 
-                  s.goodsListState.drag.container = undefined;
-                  return _context2.abrupt("return");
+                  return _context2.abrupt("return", s.goodsListState.drag.container = undefined);
 
-                case 6:
+                case 7:
+                  /** 当前拖动中的货品 */
                   currentGood = s.goodsListState.drag.current && s.goodsListState.goodsMap.get(s.goodsListState.drag.current);
 
                   if (currentGood) {
-                    _context2.next = 9;
+                    _context2.next = 10;
                     break;
                   }
 
                   return _context2.abrupt("return");
 
-                case 9:
-                  row = s.goodsListState.goodsMap.get(container);
-
-                  if (row) {
-                    _context2.next = 12;
-                    break;
-                  }
-
-                  return _context2.abrupt("return");
-
-                case 12:
+                case 10:
                   if (!(currentGood.lineAttribute === LineAttributeType$1.折扣行)) {
-                    _context2.next = 18;
+                    _context2.next = 15;
                     break;
                   }
 
@@ -12109,16 +12123,15 @@ function Drag$1(props) {
                   }).indexOf(row.$index);
 
                   if (!(currentIndex - 1 === containerIndex)) {
-                    _context2.next = 18;
+                    _context2.next = 15;
                     break;
                   }
 
-                  s.goodsListState.drag.container = undefined;
-                  return _context2.abrupt("return");
+                  return _context2.abrupt("return", s.goodsListState.drag.container = undefined);
 
-                case 18:
+                case 15:
                   if (!(currentGood.lineAttribute === LineAttributeType$1.被折扣行)) {
-                    _context2.next = 24;
+                    _context2.next = 20;
                     break;
                   }
 
@@ -12130,23 +12143,29 @@ function Drag$1(props) {
                   }).indexOf(row.$index);
 
                   if (!(_currentIndex + 1 === _containerIndex)) {
-                    _context2.next = 24;
+                    _context2.next = 20;
                     break;
                   }
 
-                  s.goodsListState.drag.container = undefined;
-                  return _context2.abrupt("return");
+                  return _context2.abrupt("return", s.goodsListState.drag.container = undefined);
 
-                case 24:
+                case 20:
                   // 折扣行 拖动的 相当于 自己的 被折扣行
                   if (row.lineAttribute === LineAttributeType$1.折扣行) {
                     t = s.goodsListState.goodsList.map(function (e) {
                       return e.$index;
                     }).indexOf(container) - 1;
                     s.goodsListState.drag.container = s.goodsListState.goodsList[t].$index;
+                    s.goodsListState.drag.site = 'u';
+                  } else if (row.lineAttribute === LineAttributeType$1.被折扣行) {
+                    s.goodsListState.drag.site = 'd';
+                  } else {
+                    rect = rowDom.getBoundingClientRect();
+                    mouseY = e.clientY - rect.top;
+                    s.goodsListState.drag.site = mouseY > 15 ? 'd' : 'u';
                   }
 
-                case 25:
+                case 21:
                 case "end":
                   return _context2.stop();
               }
@@ -12199,7 +12218,7 @@ function Drag$1(props) {
       }());
       window.removeEventListener('mouseup', onMouseup);
       rowList.forEach(function (e) {
-        e.removeEventListener('mouseover', onMouseover);
+        e.removeEventListener('mousemove', onMousemove);
       }); // window.document.body.removeChild(rowDiv);
     } // 开始插入
 
@@ -12208,13 +12227,13 @@ function Drag$1(props) {
       mounting(React__default['default'].createElement(React__default['default'].Fragment, null));
       controller.run( /*#__PURE__*/function () {
         var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
-          var _s$goodsListState$dra, container, current, goodsList, goodsMap, _currentGood, currentIndex, moveGoods;
+          var _s$goodsListState$dra, container, current, site, goodsList, goodsMap, _currentGood, currentIndex, moveGoods;
 
           return _regeneratorRuntime().wrap(function _callee4$(_context4) {
             while (1) {
               switch (_context4.prev = _context4.next) {
                 case 0:
-                  _s$goodsListState$dra = s.goodsListState.drag, container = _s$goodsListState$dra.container, current = _s$goodsListState$dra.current;
+                  _s$goodsListState$dra = s.goodsListState.drag, container = _s$goodsListState$dra.container, current = _s$goodsListState$dra.current, site = _s$goodsListState$dra.site;
 
                   if (!(!container || !current)) {
                     _context4.next = 3;
@@ -12247,9 +12266,11 @@ function Drag$1(props) {
                       var g = s.goodsListState.goodsList.filter(function (e) {
                         return moveGoods.indexOf(e.$index) < 0;
                       });
-                      var t = g.map(function (e) {
+                      var t = site === 'u' ? g.map(function (e) {
+                        return e.$index;
+                      }).indexOf(container) : g.map(function (e) {
                         return e.$index;
-                      }).indexOf(container);
+                      }).indexOf(container) + 1;
                       var m = moveGoods.map(function (e) {
                         return goodsMap.get(e);
                       }).filter(function (e) {
@@ -13843,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++;
@@ -13900,9 +13921,9 @@ styleInject(css_248z$a);
 var keys$1 = {};
 /**
  * 有冷却时间的函数
- * @param fn 方法
  * @param key 方法key
  * @param delayed 冷却时间
+ * @param fn 方法
  */
 
 var coolingFn = (function () {
@@ -13978,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();
                     }
@@ -14597,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);
 
@@ -14659,6 +14873,9 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
   /** 全单合并折扣 */
 
   var mergeDiscount = useMergeDiscount();
+  /** 销售折让 */
+
+  var salesDiscount = uaeSalesDiscount();
   /** 清空自动赋码缓存 */
 
   React__default['default'].useEffect(function () {
@@ -14816,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', {
@@ -16759,7 +16976,7 @@ function Search$1() {
   });
 }
 
-var css_248z$l = ".kts-invoice-operate-goods-list-itemName-drag-container {\n  position: relative;\n}\n.kts-invoice-operate-goods-list-itemName-drag-container::after {\n  content: \" \";\n  width: 100%;\n  height: 2px;\n  background: #0074ff;\n  position: absolute;\n  left: 0;\n  top: 0;\n  z-index: 9999;\n}\n";
+var css_248z$l = ".kts-invoice-operate-goods-list-itemName-drag-container-u {\n  position: relative;\n}\n.kts-invoice-operate-goods-list-itemName-drag-container-u::after {\n  content: \" \";\n  width: 100%;\n  height: 2px;\n  background: #0074ff;\n  position: absolute;\n  left: 0;\n  top: 0;\n  z-index: 9999;\n}\n.kts-invoice-operate-goods-list-itemName-drag-container-d {\n  position: relative;\n}\n.kts-invoice-operate-goods-list-itemName-drag-container-d::after {\n  content: \" \";\n  width: 100%;\n  height: 2px;\n  background: #0074ff;\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  z-index: 9999;\n}\n";
 styleInject(css_248z$l);
 
 function TableRow$1(props) {
@@ -16768,6 +16985,11 @@ function TableRow$1(props) {
   var goodsMap = controller.useMemo(function (s) {
     return s.goodsListState.goodsMap;
   }, []);
+  /** 当前拖动中的货品索引 */
+
+  var site = controller.useMemo(function (s) {
+    return s.goodsListState.drag.site;
+  }, []);
   var current = controller.useMemo(function (s) {
     return s.goodsListState.drag.current;
   }, []);
@@ -16799,8 +17021,9 @@ function TableRow$1(props) {
       position: 'absolute',
       bottom: 0
     }
-  })) : React__default['default'].createElement("tr", _objectSpread2(_objectSpread2({}, props), {}, {
-    className: classNames__default['default'](props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container' : '')
+  })) : // <tr {...props} className={classnames(props.className, discount, (rowKey === container && current) ? 'kts-invoice-operate-goods-list-itemName-drag-container' : '')} />
+  React__default['default'].createElement("tr", _objectSpread2(_objectSpread2({}, props), {}, {
+    className: classNames__default['default'](props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container-' + site : undefined)
   }));
 }
 
@@ -17995,6 +18218,12 @@ styleInject(css_248z$n);
 
 function Drag$2(props) {
   var record = props.record;
+
+  var _React$useState = React__default['default'].useState(false),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      open = _React$useState2[0],
+      setOpen = _React$useState2[1];
+
   var controller = Invoice.useInvoiceController();
   var editGood = controller.useMemo(function (s) {
     return s.goodsListState.editGood;
@@ -18003,7 +18232,7 @@ function Drag$2(props) {
     return !!editGood;
   }, [editGood]);
   var onMouseDown = React__default['default'].useCallback(function () {
-    if (!controller || !record) return;
+    if (!controller || !record || disabled) return;
     controller.run( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -18028,64 +18257,57 @@ function Drag$2(props) {
     var currentGood = controller.state.goodsListState.goodsList.filter(function (e) {
       return e.$index === record.$index;
     })[0];
-    mounting(React__default['default'].createElement(DragDiv$1, _objectSpread2({}, currentGood))); // 监听移动
-
+    mounting(React__default['default'].createElement(DragDiv$1, _objectSpread2({}, currentGood)));
     rowList.forEach(function (e) {
-      e.addEventListener('mouseover', onMouseover);
+      e.addEventListener('mousemove', onMousemove);
     });
 
-    function onMouseover(e) {
+    function onMousemove(e) {
       controller.run( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
-          var _getRow, _getRow$dataset;
+          var _rowDom$dataset;
 
-          var container, currentGood, row, currentIndex, containerIndex, _currentIndex, _containerIndex, t;
+          var rowDom, container, row, currentGood, currentIndex, containerIndex, _currentIndex, _containerIndex, t, rect, mouseY;
 
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
-                  container = s.goodsListState.drag.container = (_getRow = getRow(e.target)) === null || _getRow === void 0 ? void 0 : (_getRow$dataset = _getRow.dataset) === null || _getRow$dataset === void 0 ? void 0 : _getRow$dataset.rowKey;
+                  rowDom = getRow(e.target);
+                  container = s.goodsListState.drag.container = rowDom === null || rowDom === void 0 ? void 0 : (_rowDom$dataset = rowDom.dataset) === null || _rowDom$dataset === void 0 ? void 0 : _rowDom$dataset.rowKey;
+                  /** 准备插入的货物 */
+
+                  row = s.goodsListState.goodsMap.get(container);
 
-                  if (container) {
-                    _context2.next = 3;
+                  if (row) {
+                    _context2.next = 5;
                     break;
                   }
 
                   return _context2.abrupt("return");
 
-                case 3:
+                case 5:
                   if (!(container === s.goodsListState.drag.current)) {
-                    _context2.next = 6;
+                    _context2.next = 7;
                     break;
                   }
 
-                  s.goodsListState.drag.container = undefined;
-                  return _context2.abrupt("return");
+                  return _context2.abrupt("return", s.goodsListState.drag.container = undefined);
 
-                case 6:
+                case 7:
+                  /** 当前拖动中的货品 */
                   currentGood = s.goodsListState.drag.current && s.goodsListState.goodsMap.get(s.goodsListState.drag.current);
 
                   if (currentGood) {
-                    _context2.next = 9;
+                    _context2.next = 10;
                     break;
                   }
 
                   return _context2.abrupt("return");
 
-                case 9:
-                  row = s.goodsListState.goodsMap.get(container);
-
-                  if (row) {
-                    _context2.next = 12;
-                    break;
-                  }
-
-                  return _context2.abrupt("return");
-
-                case 12:
+                case 10:
                   if (!(currentGood.lineAttribute === LineAttributeType$1.折扣行)) {
-                    _context2.next = 18;
+                    _context2.next = 15;
                     break;
                   }
 
@@ -18097,16 +18319,15 @@ function Drag$2(props) {
                   }).indexOf(row.$index);
 
                   if (!(currentIndex - 1 === containerIndex)) {
-                    _context2.next = 18;
+                    _context2.next = 15;
                     break;
                   }
 
-                  s.goodsListState.drag.container = undefined;
-                  return _context2.abrupt("return");
+                  return _context2.abrupt("return", s.goodsListState.drag.container = undefined);
 
-                case 18:
+                case 15:
                   if (!(currentGood.lineAttribute === LineAttributeType$1.被折扣行)) {
-                    _context2.next = 24;
+                    _context2.next = 20;
                     break;
                   }
 
@@ -18118,23 +18339,29 @@ function Drag$2(props) {
                   }).indexOf(row.$index);
 
                   if (!(_currentIndex + 1 === _containerIndex)) {
-                    _context2.next = 24;
+                    _context2.next = 20;
                     break;
                   }
 
-                  s.goodsListState.drag.container = undefined;
-                  return _context2.abrupt("return");
+                  return _context2.abrupt("return", s.goodsListState.drag.container = undefined);
 
-                case 24:
+                case 20:
                   // 折扣行 拖动的 相当于 自己的 被折扣行
                   if (row.lineAttribute === LineAttributeType$1.折扣行) {
                     t = s.goodsListState.goodsList.map(function (e) {
                       return e.$index;
                     }).indexOf(container) - 1;
                     s.goodsListState.drag.container = s.goodsListState.goodsList[t].$index;
+                    s.goodsListState.drag.site = 'u';
+                  } else if (row.lineAttribute === LineAttributeType$1.被折扣行) {
+                    s.goodsListState.drag.site = 'd';
+                  } else {
+                    rect = rowDom.getBoundingClientRect();
+                    mouseY = e.clientY - rect.top;
+                    s.goodsListState.drag.site = mouseY > 25 ? 'd' : 'u';
                   }
 
-                case 25:
+                case 21:
                 case "end":
                   return _context2.stop();
               }
@@ -18187,7 +18414,7 @@ function Drag$2(props) {
       }());
       window.removeEventListener('mouseup', onMouseup);
       rowList.forEach(function (e) {
-        e.removeEventListener('mouseover', onMouseover);
+        e.removeEventListener('mousemove', onMousemove);
       }); // window.document.body.removeChild(rowDiv);
     } // 开始插入
 
@@ -18196,13 +18423,13 @@ function Drag$2(props) {
       mounting(React__default['default'].createElement(React__default['default'].Fragment, null));
       controller.run( /*#__PURE__*/function () {
         var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
-          var _s$goodsListState$dra, container, current, goodsList, goodsMap, _currentGood, currentIndex, moveGoods;
+          var _s$goodsListState$dra, container, current, site, goodsList, goodsMap, _currentGood, currentIndex, moveGoods;
 
           return _regeneratorRuntime().wrap(function _callee4$(_context4) {
             while (1) {
               switch (_context4.prev = _context4.next) {
                 case 0:
-                  _s$goodsListState$dra = s.goodsListState.drag, container = _s$goodsListState$dra.container, current = _s$goodsListState$dra.current;
+                  _s$goodsListState$dra = s.goodsListState.drag, container = _s$goodsListState$dra.container, current = _s$goodsListState$dra.current, site = _s$goodsListState$dra.site;
 
                   if (!(!container || !current)) {
                     _context4.next = 3;
@@ -18235,9 +18462,11 @@ function Drag$2(props) {
                       var g = s.goodsListState.goodsList.filter(function (e) {
                         return moveGoods.indexOf(e.$index) < 0;
                       });
-                      var t = g.map(function (e) {
+                      var t = site === 'u' ? g.map(function (e) {
+                        return e.$index;
+                      }).indexOf(container) : g.map(function (e) {
                         return e.$index;
-                      }).indexOf(container);
+                      }).indexOf(container) + 1;
                       var m = moveGoods.map(function (e) {
                         return goodsMap.get(e);
                       }).filter(function (e) {
@@ -18268,33 +18497,44 @@ function Drag$2(props) {
         };
       }());
     }
-  }, [controller, record]);
-  return React__default['default'].createElement(ktsComponentsAntdX3.Button, {
-    type: 'link',
-    style: {
-      padding: 0
-    },
-    disabled: disabled,
-    onMouseDown: onMouseDown,
-    onClick: function onClick(e) {
-      e.stopPropagation();
-    },
-    className: "kts-invoice-operate-goods-list-itemName-drag"
-  }, React__default['default'].createElement(Icon, {
-    component: SvgI001$1
-  }));
+  }, [controller, record, disabled]);
+  var renderButton = React__default['default'].useMemo(function () {
+    return React__default['default'].createElement(ktsComponentsAntdX3.Button, {
+      type: 'link',
+      style: {
+        padding: 0
+      },
+      onMouseDown: onMouseDown,
+      onClick: function onClick(e) {
+        e.stopPropagation();
+      },
+      className: "kts-invoice-operate-goods-list-itemName-drag",
+      onMouseOver: controller.saveEditGood
+    }, React__default['default'].createElement(Icon, {
+      component: SvgI001$1
+    }));
+  }, [onMouseDown, controller]);
+
+  if (disabled) {
+    return React__default['default'].createElement(ktsXui.Popover, {
+      content: '您还有未编辑完成的商品',
+      trigger: 'focus'
+    }, renderButton);
+  } else {
+    return renderButton;
+  }
 }
 
 function DragDiv$1(props) {
-  var _React$useState = React__default['default'].useState(0),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      x = _React$useState2[0],
-      setX = _React$useState2[1];
-
-  var _React$useState3 = React__default['default'].useState(-110),
+  var _React$useState3 = React__default['default'].useState(0),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
-      y = _React$useState4[0],
-      setY = _React$useState4[1];
+      x = _React$useState4[0],
+      setX = _React$useState4[1];
+
+  var _React$useState5 = React__default['default'].useState(-110),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      y = _React$useState6[0],
+      setY = _React$useState6[1];
 
   var div = React__default['default'].useMemo(function () {
     return window.document.querySelector("[data-row-key=\"".concat(props.$index, "\"]"));
@@ -18309,7 +18549,7 @@ function DragDiv$1(props) {
 
   React__default['default'].useEffect(function () {
     function onMousemove(e) {
-      setY(e.clientY - 25);
+      setY(e.clientY - 15);
     }
     window.addEventListener('mousemove', onMousemove);
     return function () {