kts-component-invoice-operate 3.2.43 → 3.2.45

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

@@ -17,7 +17,7 @@ export default class InvoiceController extends InvoiceControllerForm {
     /** 设置当前的编辑货物 */
     setEditGood: (option?: any) => Promise<any>;
     /** 保存正在编辑的货物 */
-    saveEditGood: (option?: undefined) => Promise<any>;
+    saveEditGood: (option?: any) => Promise<any>;
     /** 删除一个货物 */
     delGood: (option?: string | undefined) => Promise<any>;
     /** 添加一个货物 */

package/dist/index.esm.js

@@ -2,10 +2,10 @@ import 'kts-components-antd-x3/dist/kts-components-antd-x3.css';
 import React, { createElement, createContext, useContext, useEffect, forwardRef, Children, isValidElement } from 'react';
 import GreyReactBox, { decorator } from 'grey-react-box';
 import { chain as chain$1, bignumber, create, all } from 'mathjs';
-import { message, Form, Input, Icon as Icon$1, Tag as Tag$1, Select, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete as AutoComplete$2, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover, Table as Table$1, Tree, Modal as Modal$1, Row as Row$1, Col as Col$1 } from 'kts-components-antd-x3';
+import { message, Form, Input, Icon as Icon$1, Tag as Tag$1, Select, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete as AutoComplete$2, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover as Popover$1, Table as Table$1, Tree, Modal as Modal$1, Row as Row$1, Col as Col$1 } from 'kts-components-antd-x3';
 import { v4 } from 'uuid';
-import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Row, Col, Button as Button$1, Tooltip as Tooltip$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal } from 'kts-xui';
-import classnames from 'classnames';
+import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Popover, Row, Col, Button as Button$1, Tooltip as Tooltip$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal } from 'kts-xui';
+import classNames from 'classnames';
 import { Table } from 'kts-components-antd-x4-v4';
 import { render } from 'react-dom';
 import { Input as Input$2, NumberPicker } from '@formily/antd-components';
@@ -1786,7 +1786,12 @@ function _mergeDetails() {
           case 26:
             sum.priceIncludeTax = _context.sent;
             // 计算税额
-            sum.taxAmount = chain$1(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber();
+            sum.taxAmount = chain$1(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber(); // 校验数据 是否数量和金额是否同号
+
+            _context.next = 30;
+            return checkSameNumber(sum);
+
+          case 30:
             p = state.goodsListState.goodsList.indexOf(goodsList[0]);
             state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
               return state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0;
@@ -1800,20 +1805,20 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 40;
+            _context.next = 42;
             break;
 
-          case 37:
-            _context.prev = 37;
+          case 39:
+            _context.prev = 39;
             _context.t0 = _context["catch"](5);
             showError(_context.t0);
 
-          case 40:
+          case 42:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 37]]);
+    }, _callee, null, [[5, 39]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -2007,7 +2012,7 @@ function _fillingInformationGood() {
 function checkTaxTate(_x11) {
   return _checkTaxTate.apply(this, arguments);
 }
-/** 显示错误信息 */
+/** 校验数据 是否数量和金额是否同号 */
 
 
 function _checkTaxTate() {
@@ -2048,6 +2053,56 @@ function _checkTaxTate() {
   return _checkTaxTate.apply(this, arguments);
 }
 
+function checkSameNumber(_x12) {
+  return _checkSameNumber.apply(this, arguments);
+}
+/** 显示错误信息 */
+
+
+function _checkSameNumber() {
+  _checkSameNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(good) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) {
+        switch (_context9.prev = _context9.next) {
+          case 0:
+            if (good.quantity) {
+              _context9.next = 2;
+              break;
+            }
+
+            return _context9.abrupt("return");
+
+          case 2:
+            if (good.lineAmountExcludeTax) {
+              _context9.next = 5;
+              break;
+            }
+
+            message$1.error('金额不能为空');
+            throw new Error('金额不能为空');
+
+          case 5:
+            if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
+              _context9.next = 9;
+              break;
+            }
+
+            return _context9.abrupt("return");
+
+          case 9:
+            message$1.error('金额和数量需要同号');
+            throw new Error('金额和数量需要同号');
+
+          case 11:
+          case "end":
+            return _context9.stop();
+        }
+      }
+    }, _callee9);
+  }));
+  return _checkSameNumber.apply(this, arguments);
+}
+
 function showError(error) {
   console.log(error);
   message$1.error({
@@ -10133,7 +10188,7 @@ function TableRow(props) {
       bottom: 0
     }
   })) : React.createElement("tr", _objectSpread2(_objectSpread2({}, props), {}, {
-    className: classnames(props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container' : undefined)
+    className: classNames(props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container' : undefined)
   }));
 }
 
@@ -11840,8 +11895,8 @@ var Icon = /*#__PURE__*/forwardRef(function (props, ref) {
       _React$useContext$pre = _React$useContext.prefixCls,
       prefixCls = _React$useContext$pre === void 0 ? 'anticon' : _React$useContext$pre;
 
-  var classString = classnames(prefixCls, className);
-  var svgClassString = classnames(_defineProperty$1({}, "".concat(prefixCls, "-spin"), !!spin));
+  var classString = classNames(prefixCls, className);
+  var svgClassString = classNames(_defineProperty$1({}, "".concat(prefixCls, "-spin"), !!spin));
   var svgStyle = rotate ? {
     msTransform: "rotate(".concat(rotate, "deg)"),
     transform: "rotate(".concat(rotate, "deg)")
@@ -11925,6 +11980,12 @@ styleInject(css_248z$9);
 
 function Drag$1(props) {
   var record = props.record;
+
+  var _React$useState = React.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;
@@ -11933,7 +11994,7 @@ function Drag$1(props) {
     return !!editGood;
   }, [editGood]);
   var onMouseDown = React.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) {
@@ -12198,33 +12259,44 @@ function Drag$1(props) {
         };
       }());
     }
-  }, [controller, record]);
-  return React.createElement(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.createElement(Icon, {
-    component: SvgI001
-  }));
+  }, [controller, record, disabled]);
+  var renderButton = React.useMemo(function () {
+    return React.createElement(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.createElement(Icon, {
+      component: SvgI001
+    }));
+  }, [onMouseDown, controller]);
+
+  if (disabled) {
+    return React.createElement(Popover, {
+      content: '您还有未编辑完成的商品',
+      trigger: 'focus'
+    }, renderButton);
+  } else {
+    return renderButton;
+  }
 }
 
 function DragDiv(props) {
-  var _React$useState = React.useState(0),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      x = _React$useState2[0],
-      setX = _React$useState2[1];
-
-  var _React$useState3 = React.useState(-110),
+  var _React$useState3 = React.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.useState(-110),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      y = _React$useState6[0],
+      setY = _React$useState6[1];
 
   var div = React.useMemo(function () {
     return window.document.querySelector("[data-row-key=\"".concat(props.$index, "\"]"));
@@ -14727,7 +14799,7 @@ var Main = decorator(Form.create())(function (props) {
   }, React.createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, 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', {
+    className: classNames('kts-invoice-operate-goods-list-table', {
       'kts-invoice-operate-prefab': isprefab
     })
   }, React.createElement(TableVirtual, {
@@ -15076,7 +15148,7 @@ var BuyerNameInput = (function (props) {
     });
   }
 
-  return React.createElement(Popover, {
+  return React.createElement(Popover$1, {
     onVisibleChange: setVisible,
     overlayClassName: 'kts-invoice-operate-buyer-name-popover',
     placement: "bottomLeft",
@@ -15526,7 +15598,7 @@ function SvgPlus(props) {
   })))));
 }
 
-var css_248z$g = ".kts-invoice-operate-invoice-digtal-stakeholder {\n  display: flex;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-expand-button {\n  cursor: pointer;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div {\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:nth-child(even) {\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n  justify-content: end;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:nth-child(odd) {\n  flex: none;\n  text-align: center;\n  color: #9F613E;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  justify-items: center;\n  padding: 0 4px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:last-child {\n  border-right: none;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form {\n  padding: 20px 10px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item {\n  display: flex;\n  margin-bottom: 0;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label {\n  flex: none;\n  font-weight: 500;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label label {\n  color: #9F603D;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-control-wrapper {\n  flex: 1;\n}\n";
+var css_248z$g = ".kts-invoice-operate-invoice-digtal-stakeholder {\n  display: flex;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-expand-button {\n  cursor: pointer;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div {\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:nth-child(even) {\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n  justify-content: end;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:nth-child(odd) {\n  flex: none;\n  text-align: center;\n  color: #9F613E;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  justify-items: center;\n  padding: 0 4px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:last-child {\n  border-right: none;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form {\n  padding: 20px 10px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAntX-col {\n  margin-bottom: 15px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAntX-col:last-child {\n  margin-bottom: 0;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item {\n  display: flex;\n  margin-bottom: 0;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label {\n  flex: none;\n  font-weight: 500;\n  line-height: 29px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label label {\n  color: #9F603D;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-control {\n  line-height: 1.4;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-control-wrapper {\n  flex: 1;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder.readOnly .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label {\n  line-height: 1.4;\n}\n";
 styleInject(css_248z$g);
 
 var RULES = {
@@ -15640,7 +15712,9 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
   }, [rulesMap, isReadOnly, isReadOnly]);
   controller.useForm('stakeholder', form);
   return React.createElement("div", {
-    className: "kts-invoice-operate-invoice-digtal-stakeholder"
+    className: classNames("kts-invoice-operate-invoice-digtal-stakeholder", {
+      readOnly: readOnly
+    })
   }, React.createElement("div", null, '购买方信息'.split('').map(function (e) {
     return React.createElement("span", null, e);
   }), !readOnly && React.createElement(Icon, {
@@ -16706,7 +16780,7 @@ function TableRow$1(props) {
       bottom: 0
     }
   })) : React.createElement("tr", _objectSpread2(_objectSpread2({}, props), {}, {
-    className: classnames(props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container' : '')
+    className: classNames(props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container' : '')
   }));
 }
 
@@ -20958,7 +21032,7 @@ var Main$3 = decorator(Form.create())(function (props) {
       flex: 1
     }
   }), props.menuExpansion, reselectInvoiceType.button, emptyRefill.button), React.createElement("div", {
-    className: classnames('kts-invoice-operate-goods-list-table-digtal')
+    className: classNames('kts-invoice-operate-goods-list-table-digtal')
   }, React.createElement(TableVirtual$1, {
     size: "small",
     rowKey: "$index",

package/dist/index.js

@@ -9,7 +9,7 @@ var mathjs = require('mathjs');
 var ktsComponentsAntdX3 = require('kts-components-antd-x3');
 var uuid = require('uuid');
 var ktsXui = require('kts-xui');
-var classnames = require('classnames');
+var classNames = require('classnames');
 var ktsComponentsAntdX4V4 = require('kts-components-antd-x4-v4');
 var ReactDOM = require('react-dom');
 var antdComponents = require('@formily/antd-components');
@@ -19,7 +19,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var GreyReactBox__default = /*#__PURE__*/_interopDefaultLegacy(GreyReactBox);
-var classnames__default = /*#__PURE__*/_interopDefaultLegacy(classnames);
+var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -1796,7 +1796,12 @@ function _mergeDetails() {
           case 26:
             sum.priceIncludeTax = _context.sent;
             // 计算税额
-            sum.taxAmount = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).subtract(mathjs.bignumber(sum.lineAmountExcludeTax)).done().toNumber();
+            sum.taxAmount = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).subtract(mathjs.bignumber(sum.lineAmountExcludeTax)).done().toNumber(); // 校验数据 是否数量和金额是否同号
+
+            _context.next = 30;
+            return checkSameNumber(sum);
+
+          case 30:
             p = state.goodsListState.goodsList.indexOf(goodsList[0]);
             state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
               return state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0;
@@ -1810,20 +1815,20 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 40;
+            _context.next = 42;
             break;
 
-          case 37:
-            _context.prev = 37;
+          case 39:
+            _context.prev = 39;
             _context.t0 = _context["catch"](5);
             showError(_context.t0);
 
-          case 40:
+          case 42:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 37]]);
+    }, _callee, null, [[5, 39]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -2017,7 +2022,7 @@ function _fillingInformationGood() {
 function checkTaxTate(_x11) {
   return _checkTaxTate.apply(this, arguments);
 }
-/** 显示错误信息 */
+/** 校验数据 是否数量和金额是否同号 */
 
 
 function _checkTaxTate() {
@@ -2058,6 +2063,56 @@ function _checkTaxTate() {
   return _checkTaxTate.apply(this, arguments);
 }
 
+function checkSameNumber(_x12) {
+  return _checkSameNumber.apply(this, arguments);
+}
+/** 显示错误信息 */
+
+
+function _checkSameNumber() {
+  _checkSameNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(good) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) {
+        switch (_context9.prev = _context9.next) {
+          case 0:
+            if (good.quantity) {
+              _context9.next = 2;
+              break;
+            }
+
+            return _context9.abrupt("return");
+
+          case 2:
+            if (good.lineAmountExcludeTax) {
+              _context9.next = 5;
+              break;
+            }
+
+            ktsXui.message.error('金额不能为空');
+            throw new Error('金额不能为空');
+
+          case 5:
+            if (!(good.quantity >= 0 && good.lineAmountExcludeTax >= 0 || good.quantity < 0 && good.lineAmountExcludeTax < 0)) {
+              _context9.next = 9;
+              break;
+            }
+
+            return _context9.abrupt("return");
+
+          case 9:
+            ktsXui.message.error('金额和数量需要同号');
+            throw new Error('金额和数量需要同号');
+
+          case 11:
+          case "end":
+            return _context9.stop();
+        }
+      }
+    }, _callee9);
+  }));
+  return _checkSameNumber.apply(this, arguments);
+}
+
 function showError(error) {
   console.log(error);
   ktsXui.message.error({
@@ -10143,7 +10198,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' : undefined)
   }));
 }
 
@@ -11850,8 +11905,8 @@ var Icon = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _React$useContext$pre = _React$useContext.prefixCls,
       prefixCls = _React$useContext$pre === void 0 ? 'anticon' : _React$useContext$pre;
 
-  var classString = classnames__default['default'](prefixCls, className);
-  var svgClassString = classnames__default['default'](_defineProperty$1({}, "".concat(prefixCls, "-spin"), !!spin));
+  var classString = classNames__default['default'](prefixCls, className);
+  var svgClassString = classNames__default['default'](_defineProperty$1({}, "".concat(prefixCls, "-spin"), !!spin));
   var svgStyle = rotate ? {
     msTransform: "rotate(".concat(rotate, "deg)"),
     transform: "rotate(".concat(rotate, "deg)")
@@ -11935,6 +11990,12 @@ styleInject(css_248z$9);
 
 function Drag$1(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;
@@ -11943,7 +12004,7 @@ function Drag$1(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) {
@@ -12208,33 +12269,44 @@ function Drag$1(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
-  }));
+  }, [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
+    }));
+  }, [onMouseDown, controller]);
+
+  if (disabled) {
+    return React__default['default'].createElement(ktsXui.Popover, {
+      content: '您还有未编辑完成的商品',
+      trigger: 'focus'
+    }, renderButton);
+  } else {
+    return renderButton;
+  }
 }
 
 function DragDiv(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, "\"]"));
@@ -14737,7 +14809,7 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
   }, 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", {
     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', {
+    className: classNames__default['default']('kts-invoice-operate-goods-list-table', {
       'kts-invoice-operate-prefab': isprefab
     })
   }, React__default['default'].createElement(TableVirtual, {
@@ -15536,7 +15608,7 @@ function SvgPlus(props) {
   })))));
 }
 
-var css_248z$g = ".kts-invoice-operate-invoice-digtal-stakeholder {\n  display: flex;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-expand-button {\n  cursor: pointer;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div {\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:nth-child(even) {\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n  justify-content: end;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:nth-child(odd) {\n  flex: none;\n  text-align: center;\n  color: #9F613E;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  justify-items: center;\n  padding: 0 4px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:last-child {\n  border-right: none;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form {\n  padding: 20px 10px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item {\n  display: flex;\n  margin-bottom: 0;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label {\n  flex: none;\n  font-weight: 500;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label label {\n  color: #9F603D;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-control-wrapper {\n  flex: 1;\n}\n";
+var css_248z$g = ".kts-invoice-operate-invoice-digtal-stakeholder {\n  display: flex;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-expand-button {\n  cursor: pointer;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div {\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:nth-child(even) {\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n  justify-content: end;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:nth-child(odd) {\n  flex: none;\n  text-align: center;\n  color: #9F613E;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  justify-items: center;\n  padding: 0 4px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder > div:last-child {\n  border-right: none;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form {\n  padding: 20px 10px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAntX-col {\n  margin-bottom: 15px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAntX-col:last-child {\n  margin-bottom: 0;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item {\n  display: flex;\n  margin-bottom: 0;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label {\n  flex: none;\n  font-weight: 500;\n  line-height: 29px;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label label {\n  color: #9F603D;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-control {\n  line-height: 1.4;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-control-wrapper {\n  flex: 1;\n}\n.kts-invoice-operate-invoice-digtal-stakeholder.readOnly .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label {\n  line-height: 1.4;\n}\n";
 styleInject(css_248z$g);
 
 var RULES = {
@@ -15650,7 +15722,9 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
   }, [rulesMap, isReadOnly, isReadOnly]);
   controller.useForm('stakeholder', form);
   return React__default['default'].createElement("div", {
-    className: "kts-invoice-operate-invoice-digtal-stakeholder"
+    className: classNames__default['default']("kts-invoice-operate-invoice-digtal-stakeholder", {
+      readOnly: readOnly
+    })
   }, React__default['default'].createElement("div", null, '购买方信息'.split('').map(function (e) {
     return React__default['default'].createElement("span", null, e);
   }), !readOnly && React__default['default'].createElement(Icon, {
@@ -16716,7 +16790,7 @@ function TableRow$1(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' : '')
+    className: classNames__default['default'](props.className, discount, rowKey === container && current ? 'kts-invoice-operate-goods-list-itemName-drag-container' : '')
   }));
 }
 
@@ -20968,7 +21042,7 @@ var Main$3 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
       flex: 1
     }
   }), props.menuExpansion, reselectInvoiceType.button, emptyRefill.button), React__default['default'].createElement("div", {
-    className: classnames__default['default']('kts-invoice-operate-goods-list-table-digtal')
+    className: classNames__default['default']('kts-invoice-operate-goods-list-table-digtal')
   }, React__default['default'].createElement(TableVirtual$1, {
     size: "small",
     rowKey: "$index",

package/package.json

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

package/src/Invoice/Invoice-digtal/_test/readOnly/index.tsx

@@ -15,19 +15,19 @@ export default () => {
                 tag:'成品油',
             })
             await controller.formList.get('stakeholder')?.setFieldsValue({
-                buyerName: '购买方名称',
-                buyerTaxId: 'xxxxxxxxxx',
-                buyerAddress: '购买方地址',
-                buyerPhone: '15800000000',
-                buyerBank: '购买方开户银行',
-                buyerAccount: '银行账号',
+                buyerName: '国能供应链内蒙古有限公司',
+                buyerTaxId: '91150291552838725H',
+                buyerAddress: '内蒙古自治区包头稀士高新区总部经济园区9号楼204号',
+                buyerPhone: '0472-5368680',
+                buyerBank: '11050167360000000932中国银行股份有限公司包头开发区支行',
+                buyerAccount: '',
 
-                supplierName: '销售方名称',
-                supplierTaxId: 'xxxxxxxxxxxx',
-                sellerAddress: '购买方地址',
-                sellerPhone: '15800000000',
-                sellerBank: '购买方开户银行',
-                sellerAccount: '银行账号',
+                supplierName: '国星供应链管理(北京)有限公司上海分公司',
+                supplierTaxId: '91310230MA1JWA3QX1',
+                sellerAddress: '上海市宝山区南镇逸仙路华滋奔腾大厦A座1207室',
+                sellerPhone: '13511077832',
+                sellerBank: '广发银行股份有限公司上海大柏树支行',
+                sellerAccount: '9550880218186900195',
             })
             await controller.formList.get('sign')?.setFieldsValue({
                 remark: '备注',

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

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

package/src/Invoice/InvoiceController/index.ts

@@ -43,7 +43,7 @@ export default class InvoiceController extends InvoiceControllerForm {
   setEditGood = this.pipeline(setEditGood);
 
   /** 保存正在编辑的货物 */
-  saveEditGood = this.pipeline(saveEditGood);
+  saveEditGood = this.pipeline<any>(saveEditGood);
 
   /** 删除一个货物 */
   delGood = this.pipeline(delGood);

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

@@ -7,6 +7,7 @@ import { IGood, Invoice } from '../../../../../../../..';
 import mounting from "../../../../../../../tools/mounting";
 import { LineAttributeType } from "../../../../../../../InvoiceController";
 import './index.less';
+import { Popover } from "kts-xui";
 
 export interface IDragProps {
     record: IGood
@@ -16,6 +17,8 @@ export default function Drag(props: IDragProps) {
 
     const { record } = props;
 
+    const [open, setOpen] = React.useState(false)
+
     const controller = Invoice.useInvoiceController();
 
     const editGood = controller.useMemo(s => s.goodsListState.editGood, []);
@@ -23,7 +26,7 @@ export default function Drag(props: IDragProps) {
     const disabled = React.useMemo(() => !!editGood, [editGood]);
 
     const onMouseDown = React.useCallback(() => {
-        if (!controller || !record) return;
+        if (!controller || !record || disabled) return;
         controller.run(async s => s.goodsListState.drag.current = record.$index);
 
         const rowList = window.document.querySelectorAll<HTMLDivElement>('.kts-invoice-operate-goods-list');
@@ -136,20 +139,32 @@ export default function Drag(props: IDragProps) {
                 s.goodsListState.drag.current = undefined;
             })
         }
-    }, [controller, record])
-
-    return (
-        <Button
-            type='link'
-            style={{ padding: 0 }}
-            disabled={disabled}
-            onMouseDown={onMouseDown}
-            onClick={e => { e.stopPropagation() }}
-            className={"kts-invoice-operate-goods-list-itemName-drag"}
-        >
-            <Icon component={I001Svg} />
-        </Button>
-    )
+    }, [controller, record, disabled])
+
+    const renderButton = React.useMemo(() => {
+        return (
+            <Button
+                type='link'
+                style={{ padding: 0 }}
+                onMouseDown={onMouseDown}
+                onClick={e => { e.stopPropagation() }}
+                className={"kts-invoice-operate-goods-list-itemName-drag"}
+                onMouseOver={controller.saveEditGood}
+            >
+                <Icon component={I001Svg} />
+            </Button>
+        )
+    }, [onMouseDown, controller])
+
+    if (disabled) {
+        return (
+            <Popover content={'您还有未编辑完成的商品'} trigger='focus' >
+                {renderButton}
+            </Popover>
+        )
+    } else {
+        return renderButton;
+    }
 }
 
 function DragDiv(props: IGood) {

package/src/Invoice/ui/digtal/Stakeholder/index.less

@@ -2,7 +2,7 @@
 
     display: flex;
 
-    .digtal-stakeholder-expand-button{
+    .digtal-stakeholder-expand-button {
         cursor: pointer;
     }
 
@@ -36,6 +36,14 @@
 
         padding: 20px 10px;
 
+        .ktsAntX-col {
+            margin-bottom: 15px;
+
+            &:last-child {
+                margin-bottom: 0;
+            }
+        }
+
         .ktsAnt3x-row.ktsAnt3x-form-item {
             display      : flex;
             margin-bottom: 0;
@@ -43,15 +51,26 @@
             .ktsAnt3x-form-item-label {
                 flex       : none;
                 font-weight: 500;
+                line-height: 29px;
 
                 label {
                     color: #9F603D;
                 }
             }
 
+            .ktsAnt3x-form-item-control {
+                line-height: 1.4;
+            }
+
             .ktsAnt3x-form-item-control-wrapper {
                 flex: 1;
             }
         }
     }
+}
+
+.kts-invoice-operate-invoice-digtal-stakeholder.readOnly {
+    .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label {
+        line-height: 1.4;
+    }
 }

package/src/Invoice/ui/digtal/Stakeholder/index.tsx

@@ -13,6 +13,7 @@ import { ReactComponent as PlusSvg } from './svg/plus.svg'
 import InvoiceController from "../../../InvoiceController";
 import Invoice from "../../../../Invoice";
 import './index.less';
+import classNames from 'classnames';
 
 const RULES = {
     companyName: (label: string) => [
@@ -98,7 +99,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
     controller.useForm('stakeholder', form);
 
     return (
-        <div className="kts-invoice-operate-invoice-digtal-stakeholder" >
+        <div className={classNames("kts-invoice-operate-invoice-digtal-stakeholder", { readOnly: readOnly })} >
             <div>
                 {'购买方信息'.split('').map(e => <span>{e}</span>)}
                 {