kts-component-invoice-operate 1.2.22 → 2.0.0

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import 'kts-components-antd-x3/dist/kts-components-antd-x3.css';
 import React, { createElement } from 'react';
 import GreyReactBox, { decorator } from 'grey-react-box';
 import { chain as chain$1, bignumber, create, all } from 'mathjs';
-import { message, Form, Input, Icon, Tag, Select, Row, Col, Table, Button, Switch, Typography, Drawer, Menu, Dropdown, AutoComplete, Spin, Checkbox, Descriptions, Empty, Divider, Popover, Tree, Modal } from 'kts-components-antd-x3';
+import { message, Form, Input, Icon, Tag, Select, Row, Col, Table, Button, Switch, Tooltip, Typography, Drawer, Menu, Dropdown, AutoComplete, Spin, Checkbox, Descriptions, Empty, Divider, Popover, Tree, Modal } from 'kts-components-antd-x3';
 import { v4 } from 'uuid';
 import classnames from 'classnames';
 import { Input as Input$1, NumberPicker } from '@formily/antd-components';
@@ -972,6 +972,13 @@ function draft(value) {
   }
 }
 
+var ProductComparison = /*#__PURE__*/_createClass(function ProductComparison() {
+  _classCallCheck(this, ProductComparison);
+
+  this.onComply = void 0;
+  this.onUpdateComparisonTable = void 0;
+});
+
 var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   _classCallCheck(this, GoodsListState);
 
@@ -980,6 +987,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.isSwitchTax = void 0;
   this.isAddDiscount = void 0;
   this.isTaxIncluded = true;
+  this.isMyShow = false;
   this.editGood = void 0;
   this.form = void 0;
   this.unitList = [];
@@ -992,7 +1000,9 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.discountGoodIndex = [];
   this.endowCode = new EndowCode();
   this.importGoods = new ImportGoods();
+  this.productComparison = new ProductComparison();
   this.isVisibleDrawer = false;
+  this.addComparisonIndex = void 0;
 });
 
 var BuyerState = /*#__PURE__*/_createClass(function BuyerState() {
@@ -1579,7 +1589,7 @@ var InvoiceHeader = decorator(Form.create())(function (props) {
   /** 控制器 */
 
 
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []);
@@ -1893,7 +1903,7 @@ styleInject(css_248z$3);
 var nzhcn = require('nzh').cn;
 
 var Statistics = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 是否不含税） */
 
   var isTaxIncluded = controller.useMemo(function (s) {
@@ -2001,7 +2011,7 @@ var Statistics = (function () {
 });
 
 var AddRowButton = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []);
@@ -2090,7 +2100,7 @@ var AddRowButton = (function () {
 });
 
 var TaxIncludedSwitch = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 是否含税 */
 
   var isTaxIncluded = controller.useMemo(function (e) {
@@ -2125,7 +2135,11 @@ var TaxIncludedSwitch = (function () {
       };
     }())();
   }, []);
-  return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("label", null, "\u542B\u7A0E:"), /*#__PURE__*/React.createElement(Switch, {
+  return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("label", {
+    style: {
+      marginRight: 2
+    }
+  }, "\u542B\u7A0E:"), /*#__PURE__*/React.createElement(Switch, {
     disabled: isSwitchTax === false,
     checked: isTaxIncluded,
     checkedChildren: "\u5F00",
@@ -2135,8 +2149,59 @@ var TaxIncludedSwitch = (function () {
   }));
 });
 
+var DescribeSwitch = (function () {
+  var controller = Invoice.useInvoiceController();
+  var productComparison = controller.useMemo(function (s) {
+    return s.goodsListState.productComparison;
+  }, []);
+  var isMyShow = controller.useMemo(function (s) {
+    return s.goodsListState.isMyShow;
+  }, []);
+  var onChange = React.useCallback(function (e) {
+    controller.run( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", s.goodsListState.isMyShow = !s.goodsListState.isMyShow);
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+  }, []);
+  if (!productComparison.onComply) return /*#__PURE__*/React.createElement(React.Fragment, null);
+  return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("label", {
+    style: {
+      marginRight: 2
+    }
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u84DD\u8272\u4EE3\u8868\u6211\u65B9\u5546\u54C1\u63CF\u8FF0\uFF0C\u9ED1\u8272\u4EE3\u8868\u5BF9\u65B9\u7684\u5546\u54C1\u63CF\u8FF0\u3002"
+  }, /*#__PURE__*/React.createElement(Icon, {
+    style: {
+      marginRight: 3
+    },
+    type: "info-circle"
+  })), "\u4F7F\u7528\u54EA\u65B9\u5546\u54C1\u63CF\u8FF0:"), /*#__PURE__*/React.createElement(Switch, {
+    checked: isMyShow,
+    checkedChildren: "\u6211\u65B9",
+    unCheckedChildren: "\u5BF9\u65B9",
+    defaultChecked: true,
+    onChange: onChange
+  }));
+});
+
 function TableRow(props) {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var goodsMap = controller.useMemo(function (s) {
     return s.goodsListState.goodsMap;
   }, []);
@@ -2198,7 +2263,7 @@ var _create = create(all, {
 
 var AddDiscountRowButton = decorator(Form.create())(function (props) {
   /** 控制器 */
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []);
@@ -2360,7 +2425,7 @@ var AddDiscountRowButton = decorator(Form.create())(function (props) {
 var DrawerBody = decorator(Form.create())(function (props) {
   var form = props.form;
   var getFieldDecorator = form.getFieldDecorator;
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 选中的货物索引列表 */
 
   var discountGoodIndex = controller.useMemo(function (s) {
@@ -2580,7 +2645,7 @@ var coolingFn = (function () {
 });
 
 var EndowCodeButton = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 是否禁用 */
 
   var disabled = controller.useMemo(function (s) {
@@ -2665,7 +2730,7 @@ var EndowCodeButton = (function () {
 });
 
 var DelRowButton = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []);
@@ -2723,6 +2788,162 @@ var DelRowButton = (function () {
   }, "\u5220\u9664\u884C");
 });
 
+/** 拆分全称加简称 */
+var getSN = function getSN(value) {
+  debugger;
+  if (!value) return undefined;
+  var arr = value.match(/\*[^*]+\*/);
+
+  if (arr && arr[0]) {
+    return {
+      shorthand: arr[0].split('*')[1],
+      full: value.replace(arr[0], '')
+    };
+  } else {
+    return {
+      shorthand: undefined,
+      full: value
+    };
+  }
+};
+/** 组合全称加简称 */
+
+var getItemName = function getItemName(value) {
+  if (value.shorthand) {
+    return "*".concat(value.shorthand, "*").concat(value.full);
+  } else {
+    return value.full;
+  }
+};
+/** 设置简称 */
+
+var setShorthand = function setShorthand(name, shorthand) {
+  if (!name) return undefined;
+  var sn = getSN(name);
+  if (!sn) return undefined;
+  sn.shorthand = shorthand || '';
+  return getItemName(sn);
+};
+
+var CommodityComparisonButton = (function () {
+  var controller = Invoice.useInvoiceController();
+
+  var _controller$useMemo = controller.useMemo(function (s) {
+    return s.goodsListState.productComparison;
+  }, []),
+      onComply = _controller$useMemo.onComply;
+  /** 是否禁用 */
+
+
+  var disabled = controller.useMemo(function (s) {
+    if (s.goodsListState.selectedGoodIndex.length <= 0) return true;
+  }, []);
+  /** 点击了 */
+
+  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context2.next = 4;
+            return controller.wait();
+
+          case 4:
+            _context2.next = 6;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                var _s$goodsListState, _s$goodsListState$pro;
+
+                var goods, newGoods;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!(s.goodsListState.editGood && s.goodsListState.selectedGoodIndex.indexOf(s.goodsListState.editGood.$index) >= 0)) {
+                          _context.next = 3;
+                          break;
+                        }
+
+                        coolingFn('不能给正在编辑的货物执行商品对照', 3000, function () {
+                          message.error('不能给正在编辑的货物执行商品对照');
+                        });
+                        return _context.abrupt("return");
+
+                      case 3:
+                        if ((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : (_s$goodsListState$pro = _s$goodsListState.productComparison) === null || _s$goodsListState$pro === void 0 ? void 0 : _s$goodsListState$pro.onComply) {
+                          _context.next = 5;
+                          break;
+                        }
+
+                        return _context.abrupt("return");
+
+                      case 5:
+                        goods = s.goodsListState.selectedGoodIndex.map(function (e) {
+                          var _getSN, _getSN2;
+
+                          var t = s.goodsListState.goodsMap.get(e);
+                          if (!t) return undefined;
+                          return _objectSpread2(_objectSpread2({}, t), {}, {
+                            itemName: (_getSN = getSN(t.itemName)) === null || _getSN === void 0 ? void 0 : _getSN.full,
+                            itemNameOther: (_getSN2 = getSN(t.itemNameOther)) === null || _getSN2 === void 0 ? void 0 : _getSN2.full
+                          });
+                        }).filter(function (e) {
+                          return !!e;
+                        }); // 比对后的商品
+
+                        _context.next = 8;
+                        return s.goodsListState.productComparison.onComply(goods);
+
+                      case 8:
+                        newGoods = _context.sent;
+                        newGoods.filter(function (e) {
+                          var _getSN3, _getSN4;
+
+                          var vt = s.goodsListState.goodsMap.get(e.$index);
+                          if (!vt) return undefined;
+                          vt.itemName = e.itemName ? setShorthand(e.itemName, (_getSN3 = getSN(vt.itemName)) === null || _getSN3 === void 0 ? void 0 : _getSN3.shorthand) : vt.itemName;
+                          vt.itemNameOther = e.itemNameOther ? setShorthand(e.itemNameOther, (_getSN4 = getSN(vt.itemNameOther)) === null || _getSN4 === void 0 ? void 0 : _getSN4.shorthand) : vt.itemNameOther;
+                          vt.unit = e.unit ? e.unit : vt.unit;
+                          vt.unitOther = e.unitOther ? e.unitOther : vt.unitOther;
+                          vt.itemModelName = e.itemModelName ? e.itemModelName : vt.itemModelName;
+                          vt.itemModelNameOther = e.itemModelNameOther ? e.itemModelNameOther : vt.itemModelNameOther;
+                          vt.itemCode = e.itemCode ? e.itemCode : vt.itemCode;
+                          vt.itemCodeOther = e.itemCodeOther ? e.itemCodeOther : vt.itemCodeOther;
+                        });
+
+                      case 10:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
+
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })), []); // 没用 执行商品对照 的方法 不显示按钮
+
+  if (!onComply) return /*#__PURE__*/React.createElement(React.Fragment, null);
+  return /*#__PURE__*/React.createElement(Button, {
+    icon: 'swap',
+    disabled: disabled,
+    onClick: onClick
+  }, "\u6267\u884C\u5546\u54C1\u5BF9\u7167");
+});
+
 var _defs$1, _path$1;
 
 function _extends$1() { _extends$1 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$1.apply(this, arguments); }
@@ -2739,7 +2960,7 @@ function SvgSpot(props) {
 
 var Text$1 = Typography.Text;
 var useDelItem = (function (goods) {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var onClick = React.useCallback(function () {
     controller.delGood(goods.$index);
   }, [controller, goods.$index]);
@@ -2761,7 +2982,7 @@ var useDelItem = (function (goods) {
 
 var Text$2 = Typography.Text;
 var useAddDiscount = (function (goods) {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 点击了 添加折扣行 按钮 */
 
   var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -9359,44 +9580,6 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
     };
   }());
 };
-/** 保存到编辑货物 */
-
-var onSaveEditGood = lazyFn$1(function (controller, form, record, id) {
-  form.validateFields( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(err, values) {
-      var v;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) {
-          switch (_context9.prev = _context9.next) {
-            case 0:
-              err = err || {};
-
-              if (!err[id]) {
-                _context9.next = 3;
-                break;
-              }
-
-              return _context9.abrupt("return");
-
-            case 3:
-              v = {};
-              v[id] = values[id];
-              _context9.next = 7;
-              return controller.setEditGood(_objectSpread2({}, v));
-
-            case 7:
-            case "end":
-              return _context9.stop();
-          }
-        }
-      }, _callee9);
-    }));
-
-    return function (_x17, _x18) {
-      return _ref9.apply(this, arguments);
-    };
-  }());
-}, 1000);
 /** 单调赋码 */
 
 var endowCode = /*#__PURE__*/function () {
@@ -9492,10 +9675,101 @@ var endowCode = /*#__PURE__*/function () {
     return _ref10.apply(this, arguments);
   };
 }();
+/** 修改了 货物名称 */
+
+var onChangeItemName = /*#__PURE__*/function () {
+  var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(controller, form, record) {
+    return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+      while (1) {
+        switch (_context13.prev = _context13.next) {
+          case 0:
+            controller.run( /*#__PURE__*/function () {
+              var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(s) {
+                var _getSN$shorthand, _getSN;
+
+                var value, shorthand;
+                return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+                  while (1) {
+                    switch (_context12.prev = _context12.next) {
+                      case 0:
+                        value = form.getFieldsValue().itemName;
+                        shorthand = (_getSN$shorthand = (_getSN = getSN(value)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand) !== null && _getSN$shorthand !== void 0 ? _getSN$shorthand : '';
+
+                        if (!s.goodsListState.isMyShow) {
+                          _context12.next = 11;
+                          break;
+                        }
+
+                        _context12.next = 5;
+                        return controller.setEditGood({
+                          itemName: value
+                        });
+
+                      case 5:
+                        _context12.t0 = record.itemNameOther;
+
+                        if (!_context12.t0) {
+                          _context12.next = 9;
+                          break;
+                        }
+
+                        _context12.next = 9;
+                        return controller.setEditGood({
+                          itemNameOther: setShorthand(record.itemNameOther, shorthand)
+                        });
+
+                      case 9:
+                        _context12.next = 17;
+                        break;
+
+                      case 11:
+                        _context12.next = 13;
+                        return controller.setEditGood({
+                          itemNameOther: value
+                        });
+
+                      case 13:
+                        _context12.t1 = record.itemName;
+
+                        if (!_context12.t1) {
+                          _context12.next = 17;
+                          break;
+                        }
+
+                        _context12.next = 17;
+                        return controller.setEditGood({
+                          itemName: setShorthand(record.itemName, shorthand)
+                        });
+
+                      case 17:
+                      case "end":
+                        return _context12.stop();
+                    }
+                  }
+                }, _callee12);
+              }));
+
+              return function (_x25) {
+                return _ref13.apply(this, arguments);
+              };
+            }());
+
+          case 1:
+          case "end":
+            return _context13.stop();
+        }
+      }
+    }, _callee13);
+  }));
+
+  return function onChangeItemName(_x22, _x23, _x24) {
+    return _ref12.apply(this, arguments);
+  };
+}();
 
 var Text$3 = Typography.Text;
 var useEndowCode = (function (goods) {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -9520,45 +9794,139 @@ var useEndowCode = (function (goods) {
   }, [goods.lineAttribute, onClick]);
 });
 
-var css_248z$5 = ".ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:focus,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu {\n  font-size: 16px;\n  color: #000;\n  text-align: center;\n  padding: 0;\n}\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu.ktsAnt3x-dropdown-open {\n  background: #ebebeb;\n  border-radius: 9999px;\n}\n";
-styleInject(css_248z$5);
-
-var RowMenu = (function (props) {
-  var controller = default_1.useInvoiceController();
-  var model = controller.useMemo(function (s) {
-    return s.model;
-  }, []);
-  /** 是否能添加折扣行 */
-
-  var isAddDiscount = controller.useMemo(function (s) {
-    return s.goodsListState.isAddDiscount;
-  }, []);
-  var goodsMenuExpand = controller.useMemo(function (s) {
-    return s.goodsListState.goodsMenuExpand;
+var Text$4 = Typography.Text;
+var useAddComparison = (function (goods) {
+  var controller = Invoice.useInvoiceController();
+  var productComparison = controller.useMemo(function (s) {
+    return s.goodsListState.productComparison;
   }, []);
-  var delItem = useDelItem(props.goods);
-  var addDiscount = useAddDiscount(props.goods);
-  var endowCode = useEndowCode(props.goods);
-  var itemList = React.useMemo(function () {
-    var arr = [];
-    model !== 'prefab' && isAddDiscount !== false && addDiscount && arr.push(addDiscount); // 添加折扣行
+  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return controller.saveEditGood();
 
-    endowCode && arr.push(endowCode); // 赋码
+          case 2:
+            _context2.next = 4;
+            return controller.wait();
 
-    model !== 'prefab' && delItem && arr.push(delItem); // 删除
+          case 4:
+            _context2.next = 6;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                var err, key;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!s.goodsListState.form) {
+                          _context.next = 11;
+                          break;
+                        }
 
-    if (!goodsMenuExpand || goodsMenuExpand.length === 0) return arr;
-    arr.unshift( /*#__PURE__*/React.createElement(Menu.Divider, {
-      key: "divider-1"
-    }));
+                        err = s.goodsListState.form.getFieldsError();
+                        _context.t0 = _regeneratorRuntime().keys(err);
 
-    for (var i = goodsMenuExpand.length - 1; i >= 0; i--) {
-      var fn = goodsMenuExpand[i];
-      arr.unshift(fn(props.goods.$index, controller));
-    }
+                      case 3:
+                        if ((_context.t1 = _context.t0()).done) {
+                          _context.next = 11;
+                          break;
+                        }
 
-    return arr;
-  }, [controller, endowCode, addDiscount, delItem, goodsMenuExpand, props.goods, model, isAddDiscount]);
+                        key = _context.t1.value;
+
+                        if (err[key]) {
+                          _context.next = 7;
+                          break;
+                        }
+
+                        return _context.abrupt("continue", 3);
+
+                      case 7:
+                        message.error(err[key][0]);
+                        return _context.abrupt("return");
+
+                      case 11:
+                        s.goodsListState.addComparisonIndex = goods.$index;
+
+                      case 12:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              return function (_x) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
+
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })), [controller, goods.$index]);
+  return React.useMemo(function () {
+    if (productComparison.onComply) {
+      return /*#__PURE__*/React.createElement(Menu.Item, {
+        key: "delItem",
+        onClick: onClick
+      }, /*#__PURE__*/React.createElement(Text$4, {
+        strong: true
+      }, "\u6DFB\u52A0\u5546\u54C1\u5BF9\u7167"));
+    } else {
+      return /*#__PURE__*/React.createElement(React.Fragment, null);
+    }
+  }, [onClick, productComparison]);
+});
+
+var css_248z$5 = ".ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:focus,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu {\n  font-size: 16px;\n  color: #000;\n  text-align: center;\n  padding: 0;\n}\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu.ktsAnt3x-dropdown-open {\n  background: #ebebeb;\n  border-radius: 9999px;\n}\n";
+styleInject(css_248z$5);
+
+var RowMenu = (function (props) {
+  var controller = Invoice.useInvoiceController();
+  var model = controller.useMemo(function (s) {
+    return s.model;
+  }, []);
+  /** 是否能添加折扣行 */
+
+  var isAddDiscount = controller.useMemo(function (s) {
+    return s.goodsListState.isAddDiscount;
+  }, []);
+  var goodsMenuExpand = controller.useMemo(function (s) {
+    return s.goodsListState.goodsMenuExpand;
+  }, []);
+  var delItem = useDelItem(props.goods);
+  var addDiscount = useAddDiscount(props.goods);
+  var endowCode = useEndowCode(props.goods);
+  var addComparison = useAddComparison(props.goods);
+  var itemList = React.useMemo(function () {
+    var arr = [];
+    model !== 'prefab' && isAddDiscount !== false && addDiscount && arr.push(addDiscount); // 添加折扣行
+
+    arr.push(addComparison); // 添加商品对照
+
+    endowCode && arr.push(endowCode); // 赋码
+
+    model !== 'prefab' && delItem && arr.push(delItem); // 删除
+
+    if (!goodsMenuExpand || goodsMenuExpand.length === 0) return arr;
+    arr.unshift( /*#__PURE__*/React.createElement(Menu.Divider, {
+      key: "divider-1"
+    }));
+
+    for (var i = goodsMenuExpand.length - 1; i >= 0; i--) {
+      var fn = goodsMenuExpand[i];
+      arr.unshift(fn(props.goods.$index, controller));
+    }
+
+    return arr;
+  }, [controller, endowCode, addDiscount, delItem, goodsMenuExpand, props.goods, model, isAddDiscount]);
 
   if (itemList.length === 0) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -9575,16 +9943,21 @@ var RowMenu = (function (props) {
   })));
 });
 
-var Text$4 = Typography.Text;
+var Text$5 = Typography.Text;
 var useColumns = (function (form) {
   var getFieldDecorator = form.getFieldDecorator,
       getFieldValue = form.getFieldValue;
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 是否含税 */
 
   var isTaxIncluded = controller.useMemo(function (e) {
     return e.goodsListState.isTaxIncluded;
   }, []);
+  /** 是否显示我方 */
+
+  var isMyShow = controller.useMemo(function (e) {
+    return e.goodsListState.isMyShow;
+  }, []);
   /** 正在编辑的货物 */
 
   var editGood = controller.useMemo(function (e) {
@@ -9616,12 +9989,11 @@ var useColumns = (function (form) {
 
   var columns = React.useMemo(function () {
     return [{
-      title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$4, {
+      title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$5, {
         type: "danger"
       }, "*"), "\u8D27\u7269\u540D\u79F0"),
-      dataIndex: 'itemName',
       key: 'itemName',
-      render: function render(value, record) {
+      render: function render(_, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           var _editGood$itemName;
 
@@ -9630,17 +10002,54 @@ var useColumns = (function (form) {
               display: 'flex'
             }
           }, getFieldDecorator('itemName', {
-            initialValue: editGood.itemName,
+            initialValue: isMyShow ? record.itemName : record.itemNameOther,
             rules: [{
-              required: true,
-              message: '货物名称不能为空'
+              validator: function () {
+                var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, __, callback) {
+                  var value;
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) {
+                      switch (_context.prev = _context.next) {
+                        case 0:
+                          _context.next = 2;
+                          return controller.wait();
+
+                        case 2:
+                          value = controller.state.goodsListState.editGood;
+
+                          if (!(!(value === null || value === void 0 ? void 0 : value.itemName) && !(value === null || value === void 0 ? void 0 : value.itemNameOther))) {
+                            _context.next = 7;
+                            break;
+                          }
+
+                          callback('货物名称不能为空');
+                          _context.next = 8;
+                          break;
+
+                        case 7:
+                          return _context.abrupt("return");
+
+                        case 8:
+                        case "end":
+                          return _context.stop();
+                      }
+                    }
+                  }, _callee);
+                }));
+
+                function validator(_x, _x2, _x3) {
+                  return _validator.apply(this, arguments);
+                }
+
+                return validator;
+              }()
             }]
           })( /*#__PURE__*/React.createElement(MyInput, {
             style: {
               flex: 1
             },
             onChange: function onChange() {
-              onSaveEditGood(controller, form, record, 'itemName');
+              onChangeItemName(controller, form, record);
             }
           })), /*#__PURE__*/React.createElement("div", {
             className: "kts-invoice-operate-goods-list-able-list-itemName-import"
@@ -9651,67 +10060,90 @@ var useColumns = (function (form) {
             type: "link",
             icon: "file-add"
           }), controller.getGoodsList && /*#__PURE__*/React.createElement(Button, {
-            onClick: function onClick() {
-              controller.pipeline( /*#__PURE__*/function () {
-                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
-                  return _regeneratorRuntime().wrap(function _callee$(_context) {
-                    while (1) {
-                      switch (_context.prev = _context.next) {
-                        case 0:
-                          s.goodsListState.importGoods.isVisibleDrawer = true;
+            onClick: controller.pipeline( /*#__PURE__*/function () {
+              var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
+                      case 0:
+                        s.goodsListState.importGoods.isVisibleDrawer = true;
 
-                        case 1:
-                        case "end":
-                          return _context.stop();
-                      }
+                      case 1:
+                      case "end":
+                        return _context2.stop();
                     }
-                  }, _callee);
-                }));
+                  }
+                }, _callee2);
+              }));
 
-                return function (_x) {
-                  return _ref.apply(this, arguments);
-                };
-              }())();
-            },
+              return function (_x4) {
+                return _ref.apply(this, arguments);
+              };
+            }()),
             type: "link",
             icon: "plus-circle"
           }))));
         } else {
-          return /*#__PURE__*/React.createElement("span", {
-            style: {
-              padding: '0 10px'
-            }
-          }, value);
+          return /*#__PURE__*/React.createElement(MyItemNameDiv, {
+            valueT: record.itemName,
+            valueF: record.itemNameOther,
+            isMyShow: isMyShow
+          });
         }
       }
     }, {
       title: '货物规格型号',
-      dataIndex: 'itemModelName',
       key: 'itemModelName',
       width: 119,
-      render: function render(value, record) {
+      render: function render(_, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('itemModelName', {
-            initialValue: editGood.itemModelName
+            initialValue: isMyShow ? editGood.itemModelName : editGood.itemModelNameOther
           })( /*#__PURE__*/React.createElement(MyInput, {
-            onChange: function onChange() {
-              onSaveEditGood(controller, form, record, 'itemModelName');
-            }
+            onChange: function () {
+              var _onChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                var key, value;
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                  while (1) {
+                    switch (_context3.prev = _context3.next) {
+                      case 0:
+                        _context3.next = 2;
+                        return controller.wait();
+
+                      case 2:
+                        key = isMyShow ? 'itemModelName' : 'itemModelNameOther';
+                        value = {};
+                        value[key] = form.getFieldsValue().itemModelName;
+                        controller.setEditGood(value);
+
+                      case 6:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }
+                }, _callee3);
+              }));
+
+              function onChange() {
+                return _onChange.apply(this, arguments);
+              }
+
+              return onChange;
+            }()
           })));
         } else {
-          return /*#__PURE__*/React.createElement("span", {
-            style: {
-              padding: '0 10px'
-            }
-          }, value);
+          return /*#__PURE__*/React.createElement(MyItemNameDiv, {
+            valueT: record.itemModelName,
+            valueF: record.itemModelNameOther,
+            isMyShow: isMyShow
+          });
         }
       }
     }, {
       title: '单位',
-      dataIndex: 'unit',
       key: 'unit',
       width: 70,
-      render: function render(value, record) {
+      render: function render(_, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('unit', {
             initialValue: editGood.unit
@@ -9720,16 +10152,43 @@ var useColumns = (function (form) {
               width: '100%'
             },
             dataSource: unitList,
-            onChange: function onChange() {
-              onSaveEditGood(controller, form, record, 'unit');
-            }
+            onChange: function () {
+              var _onChange2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+                var key, value;
+                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                  while (1) {
+                    switch (_context4.prev = _context4.next) {
+                      case 0:
+                        _context4.next = 2;
+                        return controller.wait();
+
+                      case 2:
+                        key = isMyShow ? 'unit' : 'unitOther';
+                        value = {};
+                        value[key] = form.getFieldsValue().unit;
+                        controller.setEditGood(value);
+
+                      case 6:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }
+                }, _callee4);
+              }));
+
+              function onChange() {
+                return _onChange2.apply(this, arguments);
+              }
+
+              return onChange;
+            }()
           })));
         } else {
-          return /*#__PURE__*/React.createElement("span", {
-            style: {
-              padding: '0 10px'
-            }
-          }, value);
+          return /*#__PURE__*/React.createElement(MyItemNameDiv, {
+            valueT: record.unit,
+            valueF: record.unitOther,
+            isMyShow: isMyShow
+          });
         }
       }
     }, {
@@ -9747,13 +10206,13 @@ var useColumns = (function (form) {
               message: '数量必须为数字'
             }, {
               validator: function () {
-                var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_, value, callback) {
+                var _validator2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_, value, callback) {
                   var isvalue, isPrice;
-                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                     while (1) {
-                      switch (_context2.prev = _context2.next) {
+                      switch (_context5.prev = _context5.next) {
                         case 0:
-                          _context2.next = 2;
+                          _context5.next = 2;
                           return controller.wait();
 
                         case 2:
@@ -9761,25 +10220,25 @@ var useColumns = (function (form) {
                           isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
 
                           if (!(isvalue || isPrice === isvalue)) {
-                            _context2.next = 6;
+                            _context5.next = 6;
                             break;
                           }
 
-                          return _context2.abrupt("return");
+                          return _context5.abrupt("return");
 
                         case 6:
                           callback('请输入数量');
 
                         case 7:
                         case "end":
-                          return _context2.stop();
+                          return _context5.stop();
                       }
                     }
-                  }, _callee2);
+                  }, _callee5);
                 }));
 
-                function validator(_x2, _x3, _x4) {
-                  return _validator.apply(this, arguments);
+                function validator(_x5, _x6, _x7) {
+                  return _validator2.apply(this, arguments);
                 }
 
                 return validator;
@@ -9819,13 +10278,13 @@ var useColumns = (function (form) {
               message: '单价必须为数字'
             }, {
               validator: function () {
-                var _validator2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_, value, callback) {
+                var _validator3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_, value, callback) {
                   var isQuantity, isvalue;
-                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
                     while (1) {
-                      switch (_context3.prev = _context3.next) {
+                      switch (_context6.prev = _context6.next) {
                         case 0:
-                          _context3.next = 2;
+                          _context6.next = 2;
                           return controller.wait();
 
                         case 2:
@@ -9833,25 +10292,25 @@ var useColumns = (function (form) {
                           isvalue = !!value || value === 0;
 
                           if (!(isvalue || isQuantity === isvalue)) {
-                            _context3.next = 6;
+                            _context6.next = 6;
                             break;
                           }
 
-                          return _context3.abrupt("return");
+                          return _context6.abrupt("return");
 
                         case 6:
                           callback('请输入单价');
 
                         case 7:
                         case "end":
-                          return _context3.stop();
+                          return _context6.stop();
                       }
                     }
-                  }, _callee3);
+                  }, _callee6);
                 }));
 
-                function validator(_x5, _x6, _x7) {
-                  return _validator2.apply(this, arguments);
+                function validator(_x8, _x9, _x10) {
+                  return _validator3.apply(this, arguments);
                 }
 
                 return validator;
@@ -9891,13 +10350,13 @@ var useColumns = (function (form) {
               message: '单价必须为数字'
             }, {
               validator: function () {
-                var _validator3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_, value, callback) {
+                var _validator4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_, value, callback) {
                   var isQuantity, isvalue;
-                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
                     while (1) {
-                      switch (_context4.prev = _context4.next) {
+                      switch (_context7.prev = _context7.next) {
                         case 0:
-                          _context4.next = 2;
+                          _context7.next = 2;
                           return controller.wait();
 
                         case 2:
@@ -9905,25 +10364,25 @@ var useColumns = (function (form) {
                           isvalue = !!value || value === 0;
 
                           if (!(isvalue || isQuantity === isvalue)) {
-                            _context4.next = 6;
+                            _context7.next = 6;
                             break;
                           }
 
-                          return _context4.abrupt("return");
+                          return _context7.abrupt("return");
 
                         case 6:
                           callback('请输入单价');
 
                         case 7:
                         case "end":
-                          return _context4.stop();
+                          return _context7.stop();
                       }
                     }
-                  }, _callee4);
+                  }, _callee7);
                 }));
 
-                function validator(_x8, _x9, _x10) {
-                  return _validator3.apply(this, arguments);
+                function validator(_x11, _x12, _x13) {
+                  return _validator4.apply(this, arguments);
                 }
 
                 return validator;
@@ -9949,7 +10408,7 @@ var useColumns = (function (form) {
         }
       }
     }, {
-      title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$4, {
+      title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$5, {
         type: "danger"
       }, "*"), "\u91D1\u989D(\u542B\u7A0E)"),
       dataIndex: 'lineAmountIncludeTax',
@@ -9968,10 +10427,10 @@ var useColumns = (function (form) {
               message: '金额必须为数字'
             }, {
               validator: function () {
-                var _validator4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_, value, callback) {
-                  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                var _validator5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_, value, callback) {
+                  return _regeneratorRuntime().wrap(function _callee8$(_context8) {
                     while (1) {
-                      switch (_context5.prev = _context5.next) {
+                      switch (_context8.prev = _context8.next) {
                         case 0:
                           if ("".concat(value).split('.')[0].length > 9) {
                             callback('金额整数部分不能大于9位，小数点后最多2位');
@@ -9979,24 +10438,24 @@ var useColumns = (function (form) {
 
                         case 1:
                         case "end":
-                          return _context5.stop();
+                          return _context8.stop();
                       }
                     }
-                  }, _callee5);
+                  }, _callee8);
                 }));
 
-                function validator(_x11, _x12, _x13) {
-                  return _validator4.apply(this, arguments);
+                function validator(_x14, _x15, _x16) {
+                  return _validator5.apply(this, arguments);
                 }
 
                 return validator;
               }()
             }, {
               validator: function () {
-                var _validator5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_, value, callback) {
-                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                var _validator6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_, value, callback) {
+                  return _regeneratorRuntime().wrap(function _callee9$(_context9) {
                     while (1) {
-                      switch (_context6.prev = _context6.next) {
+                      switch (_context9.prev = _context9.next) {
                         case 0:
                           if (deduction && parseFloat(value) <= deduction) {
                             callback('扣除额不能大于等于价税合计');
@@ -10004,14 +10463,14 @@ var useColumns = (function (form) {
 
                         case 1:
                         case "end":
-                          return _context6.stop();
+                          return _context9.stop();
                       }
                     }
-                  }, _callee6);
+                  }, _callee9);
                 }));
 
-                function validator(_x14, _x15, _x16) {
-                  return _validator5.apply(this, arguments);
+                function validator(_x17, _x18, _x19) {
+                  return _validator6.apply(this, arguments);
                 }
 
                 return validator;
@@ -10036,7 +10495,7 @@ var useColumns = (function (form) {
         }
       }
     }, {
-      title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$4, {
+      title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$5, {
         type: "danger"
       }, "*"), "\u91D1\u989D(\u4E0D\u542B\u7A0E)"),
       dataIndex: 'lineAmountExcludeTax',
@@ -10055,10 +10514,10 @@ var useColumns = (function (form) {
               message: '金额必须为数字'
             }, {
               validator: function () {
-                var _validator6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_, value, callback) {
-                  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                var _validator7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_, value, callback) {
+                  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
                     while (1) {
-                      switch (_context7.prev = _context7.next) {
+                      switch (_context10.prev = _context10.next) {
                         case 0:
                           if ("".concat(value).split('.')[0].length > 9) {
                             callback('金额整数部分不能大于9位，小数点后最多2位');
@@ -10066,14 +10525,14 @@ var useColumns = (function (form) {
 
                         case 1:
                         case "end":
-                          return _context7.stop();
+                          return _context10.stop();
                       }
                     }
-                  }, _callee7);
+                  }, _callee10);
                 }));
 
-                function validator(_x17, _x18, _x19) {
-                  return _validator6.apply(this, arguments);
+                function validator(_x20, _x21, _x22) {
+                  return _validator7.apply(this, arguments);
                 }
 
                 return validator;
@@ -10098,7 +10557,7 @@ var useColumns = (function (form) {
         }
       }
     }, {
-      title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$4, {
+      title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$5, {
         type: "danger"
       }, "*"), "\u7A0E\u7387"),
       dataIndex: 'taxRate',
@@ -10184,7 +10643,7 @@ var useColumns = (function (form) {
         ellipsis: true
       });
     });
-  }, [isTaxIncluded, editGood, controller, changeField, deduction]);
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow]);
   React.useEffect(function () {
     if (!changeField) return;
     var t = setTimeout(function () {
@@ -10259,9 +10718,65 @@ var MyDiv = /*#__PURE__*/function (_React$Component2) {
   return MyDiv;
 }(React.Component);
 
+var MyItemNameDiv = /*#__PURE__*/function (_React$Component3) {
+  _inherits(MyItemNameDiv, _React$Component3);
+
+  var _super3 = _createSuper(MyItemNameDiv);
+
+  function MyItemNameDiv() {
+    _classCallCheck(this, MyItemNameDiv);
+
+    return _super3.apply(this, arguments);
+  }
+
+  _createClass(MyItemNameDiv, [{
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+          isMyShow = _this$props.isMyShow,
+          valueT = _this$props.valueT,
+          valueF = _this$props.valueF;
+
+      if (isMyShow) {
+        if (valueT) {
+          return /*#__PURE__*/React.createElement("span", {
+            style: {
+              padding: '0 10px',
+              color: '#0074ff'
+            }
+          }, valueT);
+        } else {
+          return /*#__PURE__*/React.createElement("span", {
+            style: {
+              padding: '0 10px'
+            }
+          }, valueF);
+        }
+      } else {
+        if (valueF) {
+          return /*#__PURE__*/React.createElement("span", {
+            style: {
+              padding: '0 10px'
+            }
+          }, valueF);
+        } else {
+          return /*#__PURE__*/React.createElement("span", {
+            style: {
+              padding: '0 10px',
+              color: '#0074ff'
+            }
+          }, valueT);
+        }
+      }
+    }
+  }]);
+
+  return MyItemNameDiv;
+}(React.Component);
+
 var useOnRow = (function () {
   /** 控制器 */
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []);
@@ -10444,7 +10959,7 @@ function useWindowClick(controller) {
 
 var useRowSelection = (function () {
   /** 控制器 */
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 列表选中的货物索引列表 */
 
   var selectedRowKeys = controller.useMemo(function (s) {
@@ -10668,7 +11183,7 @@ var useRowSelection = (function () {
   };
 });
 
-var css_248z$6 = ".kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-table-tax-rate .ktsAnt3x-select-selection-selected-value {\n  float: right;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able {\n  display: flex;\n  padding: 10px;\n  border-bottom: 1px solid #dcdcdc;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list {\n  flex: 1;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button {\n  padding-left: 10px;\n  padding-right: 10px;\n  border-radius: 12px;\n  color: #0074ff;\n  border: 1px solid #0074ff;\n  margin: 0 10px;\n  height: 24px;\n  line-height: 22px;\n  cursor: pointer;\n  font-size: 12px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button[disabled] {\n  color: rgba(0, 0, 0, 0.25);\n  border: 1px solid;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-extend {\n  flex: none;\n  display: flex;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-extend label {\n  margin-right: 5px;\n}\n.kts-invoice-operate-goods-list-table.kts-invoice-operate-prefab .ktsAnt3x-table-row {\n  color: rgba(0, 0, 0, 0.25);\n  background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table {\n  border-bottom: 1px solid #dcdcdc;\n}\n.kts-invoice-operate-goods-list-table .kts-invoice-operate-goods-discount {\n  color: rgba(0, 0, 0, 0.25);\n  background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table .kts-invoice-operate-goods-list-able-list-itemName-import {\n  display: flex;\n}\n.kts-invoice-operate-goods-list-table .kts-invoice-operate-goods-list-able-list-itemName-import .ktsAnt3x-btn {\n  display: block;\n  line-height: 0;\n  width: auto;\n  padding-right: 5px;\n}\n.kts-invoice-operate-goods-list-table .ktsAnt3x-form-item-children {\n  height: 30px;\n  display: block;\n}\n.kts-invoice-operate-goods-list-table .ktsAnt3x-table-body {\n  height: 263px;\n}\n.kts-invoice-operate-goods-list-table .ktsAnt3x-form-explain {\n  position: absolute;\n  right: 6px;\n  top: 6px;\n}\n.kts-invoice-operate-goods-list-table table {\n  border-bottom: 1px solid #d9d9d9 !important;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td {\n  padding: 0 !important;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-form-explain {\n  display: none;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-form-item {\n  padding: 0;\n  margin: 0;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-form-item .ktsAnt3x-form-item-control {\n  line-height: inherit;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .has-error .ktsAnt3x-select-selection,\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .has-error .ktsAnt3x-input,\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .has-error .ktsAnt3x-input:hover {\n  border-right-width: 1px !important;\n  border-top-width: 1px;\n  border-left-width: 1px;\n  border-bottom-width: 1px;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-select-selection--single,\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-select-auto-complete.ktsAnt3x-select .ktsAnt3x-input:hover,\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-input {\n  height: 30px;\n  border-radius: 0;\n  border-right-width: 0 !important;\n  border-top-width: 0;\n  border-left-width: 0;\n  border-bottom-width: 0;\n  box-shadow: none;\n}\n";
+var css_248z$6 = ".kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-table-tax-rate .ktsAnt3x-select-selection-selected-value {\n  float: right;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able {\n  display: flex;\n  padding: 10px;\n  border-bottom: 1px solid #dcdcdc;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list {\n  flex: 1;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button {\n  padding-left: 10px;\n  padding-right: 10px;\n  border-radius: 12px;\n  color: #0074ff;\n  border: 1px solid #0074ff;\n  margin: 0 10px;\n  height: 24px;\n  line-height: 22px;\n  cursor: pointer;\n  font-size: 12px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button[disabled] {\n  color: rgba(0, 0, 0, 0.25);\n  border: 1px solid;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-extend {\n  flex: none;\n  display: flex;\n  gap: 5px;\n}\n.kts-invoice-operate-goods-list-table.kts-invoice-operate-prefab .ktsAnt3x-table-row {\n  color: rgba(0, 0, 0, 0.25);\n  background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table {\n  border-bottom: 1px solid #dcdcdc;\n}\n.kts-invoice-operate-goods-list-table .kts-invoice-operate-goods-discount {\n  color: rgba(0, 0, 0, 0.25);\n  background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table .kts-invoice-operate-goods-list-able-list-itemName-import {\n  display: flex;\n}\n.kts-invoice-operate-goods-list-table .kts-invoice-operate-goods-list-able-list-itemName-import .ktsAnt3x-btn {\n  display: block;\n  line-height: 0;\n  width: auto;\n  padding-right: 5px;\n}\n.kts-invoice-operate-goods-list-table .ktsAnt3x-form-item-children {\n  height: 30px;\n  display: block;\n}\n.kts-invoice-operate-goods-list-table .ktsAnt3x-table-body {\n  height: 263px;\n}\n.kts-invoice-operate-goods-list-table .ktsAnt3x-form-explain {\n  position: absolute;\n  right: 6px;\n  top: 6px;\n}\n.kts-invoice-operate-goods-list-table table {\n  border-bottom: 1px solid #d9d9d9 !important;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td {\n  padding: 0 !important;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-form-explain {\n  display: none;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-form-item {\n  padding: 0;\n  margin: 0;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-form-item .ktsAnt3x-form-item-control {\n  line-height: inherit;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .has-error .ktsAnt3x-select-selection,\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .has-error .ktsAnt3x-input,\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .has-error .ktsAnt3x-input:hover {\n  border-right-width: 1px !important;\n  border-top-width: 1px;\n  border-left-width: 1px;\n  border-bottom-width: 1px;\n}\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-select-selection--single,\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-select-auto-complete.ktsAnt3x-select .ktsAnt3x-input:hover,\n.kts-invoice-operate-goods-list-table table > .ktsAnt3x-table-tbody > tr > td .ktsAnt3x-input {\n  height: 30px;\n  border-radius: 0;\n  border-right-width: 0 !important;\n  border-top-width: 0;\n  border-left-width: 0;\n  border-bottom-width: 0;\n  box-shadow: none;\n}\n";
 styleInject(css_248z$6);
 
 var GoodsList = /*#__PURE__*/function (_React$Component) {
@@ -10693,7 +11208,7 @@ var GoodsList = /*#__PURE__*/function (_React$Component) {
 }(React.Component);
 var Main = decorator(Form.create())(function (props) {
   /** 控制器 */
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var goodsList = controller.useMemo(function (s) {
     return s.goodsListState.goodsList;
   }, []);
@@ -10863,9 +11378,9 @@ var Main = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-goods-list-able"
   }, /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, /*#__PURE__*/React.createElement(AddRowButton, null), /*#__PURE__*/React.createElement(DelRowButton, null), /*#__PURE__*/React.createElement(AddDiscountRowButton, null), /*#__PURE__*/React.createElement(EndowCodeButton, null)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(AddRowButton, null), /*#__PURE__*/React.createElement(DelRowButton, null), /*#__PURE__*/React.createElement(AddDiscountRowButton, null), /*#__PURE__*/React.createElement(EndowCodeButton, null), /*#__PURE__*/React.createElement(CommodityComparisonButton, null)), /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
-  }, props.menuExpansion, /*#__PURE__*/React.createElement(TaxIncludedSwitch, null))), /*#__PURE__*/React.createElement("div", {
+  }, props.menuExpansion, /*#__PURE__*/React.createElement(DescribeSwitch, null), /*#__PURE__*/React.createElement(TaxIncludedSwitch, null))), /*#__PURE__*/React.createElement("div", {
     className: classnames('kts-invoice-operate-goods-list-table', {
       'kts-invoice-operate-prefab': isprefab
     })
@@ -10932,7 +11447,7 @@ var Main$1 = decorator(Form.create())(function (props) {
   var getFieldDecorator = form.getFieldDecorator;
   /** 控制器 */
 
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 控制器 */
 
   var model = controller.useMemo(function (s) {
@@ -11050,7 +11565,7 @@ var Sign = decorator(Form.create())(function (props) {
   var getFieldDecorator = form.getFieldDecorator;
   /** 控制器 */
 
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []); // 注册 form
@@ -11092,7 +11607,7 @@ var formItemLayout = {
 };
 
 var ImportBuyerButton = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var onClick = React.useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
@@ -11124,7 +11639,7 @@ var ImportBuyerButton = (function () {
 
 var BuyerNameInput = (function (props) {
   /** 控制器 */
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 组件模式 */
 
   var model = controller.useMemo(function (s) {
@@ -11284,7 +11799,7 @@ var BuyerNameInput = (function (props) {
 
 function useDataSource() {
   /** 控制器 */
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
 
   var _React$useState3 = React.useState(false),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
@@ -11368,7 +11883,7 @@ function interval(i, t) {
 var css_248z$9 = ".kts-invoice-operate-buyer {\n  display: flex;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message {\n  flex: 1;\n  display: flex;\n  position: relative;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .ktsAnt3x-descriptions-item-label {\n  width: 179px;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list {\n  width: 100%;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-descriptions-view {\n  border: none;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-descriptions-item-label {\n  padding: 0 10px;\n  font-size: 12px;\n  background-color: #fff;\n  line-height: 30px;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-descriptions-item-content {\n  padding: 0;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-descriptions-item-content .ktsAnt3x-input {\n  box-shadow: none;\n  border-color: #fff;\n  border-radius: 0;\n  padding: 0 10px;\n  font-size: 12px;\n  line-height: 30px;\n  width: 100%;\n  height: 100%;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-descriptions-item-content .ktsAnt3x-input:hover {\n  border: 1 solid;\n  border-color: #40a9ff;\n  border-right-width: 1px !important;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-descriptions-item-content .has-error .ktsAnt3x-input,\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-descriptions-item-content .has-error .ktsAnt3x-input:hover {\n  background-color: #fff;\n  border: 1 solid;\n  border-color: #f5222d;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-form-item {\n  margin: 0;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-form-item-control {\n  line-height: 0;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-form-item-children {\n  height: 30px;\n  display: block;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-form-item-children .ktsAnt3x-btn {\n  line-height: 0;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-list .ktsAnt3x-form-explain {\n  position: absolute;\n  left: 5px;\n  top: 6px;\n  z-index: 10;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-message .kts-invoice-operate-buyer-message-Import {\n  position: absolute;\n  right: 0px;\n  top: 0px;\n  z-index: 10;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-password {\n  border-left: 1px solid #dcdcdc;\n  display: flex;\n  flex: none;\n  width: 458px;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-title {\n  flex: none;\n  width: 30px;\n  height: 100%;\n  text-align: center;\n  border-right: 1px solid #dcdcdc;\n  display: table;\n  padding: 0 5px;\n}\n.kts-invoice-operate-buyer .kts-invoice-operate-buyer-title label {\n  display: table-cell;\n  vertical-align: middle;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover {\n  padding-top: 0;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .ktsAnt3x-popover-inner-content {\n  padding: 6px 0;\n  display: flex;\n  flex-direction: column;\n  overflow-y: auto;\n  overflow-x: hidden;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .ktsAnt3x-popover-arrow {\n  display: none;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content {\n  width: 567px;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-block {\n  padding: 14px 0;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-block label {\n  display: block;\n  font-size: 12px;\n  color: #666666;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-recently-issued {\n  padding: 0;\n  margin: 0;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-recently-issued li {\n  list-style: none;\n  width: 50%;\n  float: left;\n  margin-bottom: 20px;\n  padding: 0 10px;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-recently-issued::after {\n  content: \".\";\n  display: block;\n  height: 0;\n  clear: left;\n  visibility: hidden;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-select-company {\n  padding: 0;\n  margin: 0;\n  font-size: 12px;\n  padding: 10px;\n  font-weight: bold;\n  color: #000000;\n  cursor: pointer;\n  transition: background 0.4s;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-select-company:hover {\n  background: #e6e6e6e6;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-select-company:last-child {\n  margin-bottom: 0;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-select-company li {\n  list-style: none;\n  width: 50%;\n  float: left;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n  padding-right: 10px;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content .kts-invoice-operate-buyer-name-content-select-company::after {\n  content: \".\";\n  display: block;\n  height: 0;\n  clear: left;\n  visibility: hidden;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content-tag {\n  line-height: 1;\n  padding: 4px 12px;\n  background: #F3F3F3;\n  border-radius: 9999px;\n  font-size: 12px;\n  font-weight: bold;\n  color: #000;\n  cursor: pointer;\n  transition: background 0.4s;\n  display: inline-block;\n  max-width: 100%;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n}\n.ktsAnt3x-popover.kts-invoice-operate-buyer-name-popover .kts-invoice-operate-buyer-name-content-tag:hover {\n  background: #e6e6e6e6;\n}\n";
 styleInject(css_248z$9);
 
-var Text$5 = Typography.Text;
+var Text$6 = Typography.Text;
 
 var Buyer$1 = /*#__PURE__*/function (_React$Component) {
   _inherits(Buyer, _React$Component);
@@ -11400,7 +11915,7 @@ var Main$2 = decorator(Form.create())(function (props) {
   var getFieldDecorator = form.getFieldDecorator;
   /** 控制器 */
 
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 组件模式 */
 
   var model = controller.useMemo(function (s) {
@@ -11482,7 +11997,7 @@ var Main$2 = decorator(Form.create())(function (props) {
       if (e.options.rules.some(function (e) {
         return e.required;
       })) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$5, {
+        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text$6, {
           type: "danger"
         }, "*"), e.label);
       } else {
@@ -11518,7 +12033,7 @@ var Main$2 = decorator(Form.create())(function (props) {
 });
 
 var ImportBuyerDrawer = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var visible = controller.useMemo(function (s) {
     return s.buyerState.isVisibleDrawer;
   }, []);
@@ -11560,7 +12075,7 @@ var ImportBuyerDrawer = (function () {
 });
 
 var DrawerBody$1 = function DrawerBody() {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var columns = controller.useMemo(function (e) {
     return e.buyerState.columns;
   }, []);
@@ -11648,7 +12163,7 @@ var DrawerBody$1 = function DrawerBody() {
 };
 
 var ImportGoodsDrawer = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var visible = controller.useMemo(function (s) {
     return s.goodsListState.importGoods.isVisibleDrawer;
   }, []);
@@ -11694,7 +12209,7 @@ var ImportGoodsDrawer = (function () {
 });
 
 var DrawerBody$2 = function DrawerBody() {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var columns = controller.useMemo(function (s) {
     return s.goodsListState.importGoods.columns;
   }, []);
@@ -11728,6 +12243,7 @@ var DrawerBody$2 = function DrawerBody() {
         onClick: function onClick() {
           controller.run( /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+              var between, editGood;
               return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
@@ -11736,7 +12252,8 @@ var DrawerBody$2 = function DrawerBody() {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
-                      });
+                      }); // 导入时校验函数
+
                       _context2.next = 3;
                       return s.goodsListState.importGoods.verifyFn(record);
 
@@ -11764,30 +12281,41 @@ var DrawerBody$2 = function DrawerBody() {
                         record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
                         record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
                         record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
-                      }
+                      } // 中间数据
 
-                      s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
-                      if (s.goodsListState.editGood) {
-                        _context2.next = 12;
-                        break;
+                      between = _objectSpread2({}, record);
+                      between.itemName = getItemName$1(record, s.goodsListState.editGood);
+                      between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood); // 设置编辑货物
+
+                      editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
+
+                      if (editGood.taxRate) {
+                        editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood);
                       }
 
-                      return _context2.abrupt("return");
+                      if ("".concat(editGood.priceIncludeTax) === '0') {
+                        editGood.priceIncludeTax = undefined;
+                        editGood.priceExcludeTax = undefined;
+                      } else {
+                        editGood.priceExcludeTax = getPriceExcludeTax(editGood, record);
+                      }
+
+                      if (editGood.quantity && editGood.priceIncludeTax) {
+                        editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax);
+                      } // 导入FORM里
 
-                    case 12:
-                      if (s.goodsListState.editGood.taxRate) s.goodsListState.editGood.taxRate = dutyFree(controller, s.goodsListState.editGood.taxRate, s.goodsListState.form, s.goodsListState.editGood);
 
-                      if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
-                        s.goodsListState.editGood.priceIncludeTax = undefined;
-                        s.goodsListState.editGood.priceExcludeTax = undefined;
+                      if (s.goodsListState.isMyShow) {
+                        s.goodsListState.form.setFieldsValue(editGood);
                       } else {
-                        s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record);
+                        s.goodsListState.form.setFieldsValue(_objectSpread2(_objectSpread2({}, editGood), {}, {
+                          itemName: editGood.itemNameOther,
+                          unit: editGood.unitOther,
+                          itemModelName: editGood.itemModelNameOther
+                        }));
                       }
 
-                      if (s.goodsListState.editGood.quantity && s.goodsListState.editGood.priceIncludeTax) s.goodsListState.editGood.lineAmountIncludeTax = countAmountIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
-                      s.goodsListState.editGood.itemName = getItemName(record);
-                      s.goodsListState.form.setFieldsValue(s.goodsListState.editGood);
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
@@ -11809,11 +12337,12 @@ var DrawerBody$2 = function DrawerBody() {
   });
 };
 /** 货物名称 */
+// const getItemName = (record: any) => {
+//   return record.shorthand
+//     ? `*${record.shorthand}*${record.itemName}`
+//     : record.itemName;
+// };
 
-
-var getItemName = function getItemName(record) {
-  return record.shorthand ? "*".concat(record.shorthand, "*").concat(record.itemName) : record.itemName;
-};
 /** 货物单价，不含税 */
 
 
@@ -11821,6 +12350,39 @@ var getPriceExcludeTax = function getPriceExcludeTax(s, record) {
   if (!s.taxRate && s.taxRate !== 0 || !record.priceIncludeTax && record.priceIncludeTax !== 0) return; // 单价(含税)/(1+税率) = 单价(不含税)
 
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")));
+}; // 获取我方名称
+
+
+var getItemName$1 = function getItemName(record, editGood) {
+  var _getSN;
+
+  var shorthand;
+  shorthand = record.shorthand;
+
+  if (shorthand) {
+    return "*".concat(shorthand, "*").concat(record.itemName);
+  }
+
+  shorthand = (_getSN = getSN(editGood.itemNameOther)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand;
+
+  if (shorthand) {
+    return "*".concat(shorthand, "*").concat(record.itemName);
+  }
+
+  return record.itemName;
+}; // 获取他方名称
+
+
+var getItemNameOther = function getItemNameOther(record, editGood) {
+  if (!editGood.itemNameOther) return editGood.itemNameOther;
+  var shorthand;
+  shorthand = record.shorthand;
+
+  if (shorthand) {
+    return "*".concat(shorthand, "*").concat(record.itemName);
+  }
+
+  return record.itemNameOther;
 };
 
 /**
@@ -11880,7 +12442,7 @@ styleInject(css_248z$a);
 var TreeNode = Tree.TreeNode;
 var confirm = Modal.confirm;
 var EndowCodeDrawer = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var visible = controller.useMemo(function (s) {
     return s.goodsListState.endowCode.endowcodeGoodIndex.length > 0;
   }, []);
@@ -11995,7 +12557,7 @@ var EndowCodeDrawer = (function () {
 var DrawerBody$3 = function DrawerBody(props) {
   var _defaultValue$taxRate, _defaultValue$favoure;
 
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var defaultValue = props.defaultValue;
   var actions = React.useMemo(function () {
     return createAsyncFormActions();
@@ -12380,9 +12942,10 @@ var DrawerBody$3 = function DrawerBody(props) {
                 }); // 赋码
 
                 endowCodeGood.forEach(function (good) {
-                  if (!good) return; // const name = getItemName(good.itemName, values.shorthand);
-
-                  good.itemName = getItemName$1(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
+                  if (!good) return;
+                  good.itemName = setShorthand(good.itemName, values.shorthand);
+                  good.itemNameOther = setShorthand(good.itemNameOther, values.shorthand); // const name = getItemName(good.itemName, values.shorthand);
+                  // good.itemName = getItemName(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
 
                   good.taxClassificationCode = values.taxClassificationCode;
                   good.taxRate = values.taxRate;
@@ -12630,41 +13193,255 @@ var getShorthand = function getShorthand(value) {
     return undefined;
   }
 };
-/** 简称填入名称 */
 
+var AddComparisonDrawer = decorator(Form.create())(function (props) {
+  var form = props.form;
+  var getFieldDecorator = form.getFieldDecorator;
+  /** 控制器 */
 
-var getItemName$1 = function getItemName(value, shorthand) {
-  if (!value) value = '';
+  var controller = Invoice.useInvoiceController();
+  /** 正在 添加商品对照 的货物索引 */
 
-  if (!shorthand) {
-    return value.replace(/\*[^*]+\*/, "");
-  }
+  var addComparisonIndex = controller.useMemo(function (s) {
+    return s.goodsListState.addComparisonIndex;
+  }, []);
+  /** 货物字典 */
 
-  var arr = value.match(/\*[^*]+\*/);
+  var goodsMap = controller.useMemo(function (s) {
+    return s.goodsListState.goodsMap;
+  }, []);
+  /** 正在 对照 的货物 */
 
-  if (arr) {
-    return value.replace(/\*[^*]+\*/, "*".concat(shorthand, "*"));
-  } else {
-    return "*".concat(shorthand, "*").concat(value);
-  }
-};
+  var good = React.useMemo(function () {
+    return addComparisonIndex ? goodsMap.get(addComparisonIndex) : undefined;
+  }, [addComparisonIndex]);
+  /** 关闭对照 */
+
+  var onClose = React.useCallback(controller.pipeline( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              s.goodsListState.addComparisonIndex = undefined;
+
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }()), [controller]);
+  /** 提交数据 */
+
+  var onSubmit = React.useCallback(function () {
+    controller.run( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+        var _getSN, _getSN2, _s$goodsListState, _s$goodsListState$pro;
+
+        var _yield$validateFields, err, values, shorthand;
+
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                if (good) {
+                  _context2.next = 2;
+                  break;
+                }
+
+                return _context2.abrupt("return");
+
+              case 2:
+                _context2.next = 4;
+                return validateFields$1(form);
+
+              case 4:
+                _yield$validateFields = _context2.sent;
+                err = _yield$validateFields.err;
+                values = _yield$validateFields.values;
+
+                if (!err) {
+                  _context2.next = 9;
+                  break;
+                }
+
+                return _context2.abrupt("return");
+
+              case 9:
+                shorthand = s.goodsListState.isMyShow ? (_getSN = getSN(good.itemName)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand : (_getSN2 = getSN(good.itemNameOther)) === null || _getSN2 === void 0 ? void 0 : _getSN2.shorthand;
+                good.itemCode = values.itemCode;
+                good.itemCodeOther = values.itemCodeOther;
+                good.itemName = shorthand ? "*".concat(shorthand, "*").concat(values.itemName) : values.itemName;
+                good.itemNameOther = shorthand ? "*".concat(shorthand, "*").concat(values.itemNameOther) : values.itemNameOther;
+                good.itemModelName = values.itemModelName;
+                good.itemModelNameOther = values.itemModelNameOther;
+                good.unit = values.unit;
+                good.unitOther = values.unitOther;
+                s.goodsListState.addComparisonIndex = undefined;
+                s.goodsListState.goodsList = _toConsumableArray(s.goodsListState.goodsList);
+
+                if (!(((_s$goodsListState = s.goodsListState) === null || _s$goodsListState === void 0 ? void 0 : (_s$goodsListState$pro = _s$goodsListState.productComparison) === null || _s$goodsListState$pro === void 0 ? void 0 : _s$goodsListState$pro.onUpdateComparisonTable) && values.isUpdate)) {
+                  _context2.next = 24;
+                  break;
+                }
+
+                debugger;
+                _context2.next = 24;
+                return s.goodsListState.productComparison.onUpdateComparisonTable(good, values);
+
+              case 24:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }));
+
+      return function (_x2) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
+  }, [form, good]);
+  React.useEffect(function () {
+    form.resetFields();
+
+    if (good) {
+      var _getSN3, _getSN4;
+
+      form.setFieldsValue(_objectSpread2(_objectSpread2({}, good), {}, {
+        itemName: (_getSN3 = getSN(good.itemName)) === null || _getSN3 === void 0 ? void 0 : _getSN3.full,
+        itemNameOther: (_getSN4 = getSN(good.itemNameOther)) === null || _getSN4 === void 0 ? void 0 : _getSN4.full
+      }));
+    }
+  }, [good]);
+  return /*#__PURE__*/React.createElement(Drawer, {
+    width: 500,
+    onClose: onClose,
+    placement: "right",
+    title: "\u6DFB\u52A0\u5546\u54C1\u5BF9\u7167",
+    visible: !!addComparisonIndex,
+    drawerStyle: {
+      display: 'flex',
+      flexDirection: 'column'
+    },
+    bodyStyle: {
+      flex: 1,
+      display: 'flex',
+      flexDirection: 'column'
+    }
+  }, /*#__PURE__*/React.createElement(Form, {
+    layout: "vertical",
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(Row, {
+    gutter: [8, 8]
+  }, /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, getFieldDecorator('itemCode', {})( /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u6211\u65B9\u5546\u54C1\u7F16\u7801"
+  }, /*#__PURE__*/React.createElement(Input, null)))), /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, getFieldDecorator('itemCodeOther', {})( /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u5BF9\u65B9\u5546\u54C1\u7F16\u7801"
+  }, /*#__PURE__*/React.createElement(Input, null)))), /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, getFieldDecorator('itemName', {
+    rules: [{
+      required: true,
+      message: "请输入我方商品名称"
+    }]
+  })( /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u6211\u65B9\u5546\u54C1\u540D\u79F0"
+  }, /*#__PURE__*/React.createElement(Input, null)))), /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, getFieldDecorator('itemNameOther', {
+    rules: [{
+      required: true,
+      message: "请输入对方商品名称"
+    }]
+  })( /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u5BF9\u65B9\u5546\u54C1\u540D\u79F0"
+  }, /*#__PURE__*/React.createElement(Input, null)))), /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u6211\u65B9\u89C4\u683C\u578B\u53F7"
+  }, /*#__PURE__*/React.createElement(Input, null))), /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, getFieldDecorator('itemModelNameOther', {
+    rules: [{
+      required: true,
+      message: "请输入对方规格型号"
+    }]
+  })( /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u5BF9\u65B9\u89C4\u683C\u578B\u53F7"
+  }, /*#__PURE__*/React.createElement(Input, null)))), /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, getFieldDecorator('unit', {
+    rules: [{
+      required: true,
+      message: "请输入对方规格型号"
+    }]
+  })( /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u6211\u65B9\u8BA1\u91CF\u5355\u4F4D"
+  }, /*#__PURE__*/React.createElement(Input, null)))), /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, getFieldDecorator('unitOther', {
+    rules: [{
+      required: true,
+      message: "请输入对方计量单位"
+    }]
+  })( /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u5BF9\u65B9\u8BA1\u91CF\u5355\u4F4D"
+  }, /*#__PURE__*/React.createElement(Input, null)))), /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, getFieldDecorator('isUpdate', {})( /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Checkbox, null, "\u66F4\u65B0\u5230\u5546\u54C1\u5BF9\u7167\u8868\u4E2D")))))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      justifyContent: 'flex-end',
+      gap: 10
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    onClick: onSubmit
+  }, "\u63D0\u4EA4"), /*#__PURE__*/React.createElement(Button, {
+    onClick: onClose
+  }, "\u53D6\u6D88")));
+});
+
+function validateFields$1(form) {
+  return new Promise(function (resolve) {
+    form.validateFields(function (err, values) {
+      resolve({
+        err: err,
+        values: values
+      });
+    });
+  });
+}
 
 /** 发票组件的上下文 */
 
 var InvoiceContext = /*#__PURE__*/React.createContext(undefined);
 
-var default_1 = /*#__PURE__*/function (_React$PureComponent) {
-  _inherits(default_1, _React$PureComponent);
+var Invoice = /*#__PURE__*/function (_React$PureComponent) {
+  _inherits(Invoice, _React$PureComponent);
 
-  var _super = _createSuper(default_1);
+  var _super = _createSuper(Invoice);
 
-  function default_1() {
-    _classCallCheck(this, default_1);
+  function Invoice() {
+    _classCallCheck(this, Invoice);
 
     return _super.apply(this, arguments);
   }
 
-  _createClass(default_1, [{
+  _createClass(Invoice, [{
     key: "render",
     value:
     /** 控制器 */
@@ -12687,18 +13464,18 @@ var default_1 = /*#__PURE__*/function (_React$PureComponent) {
     }
   }]);
 
-  return default_1;
+  return Invoice;
 }(React.PureComponent);
 
-default_1.InvoiceController = InvoiceController;
-default_1.InvoiceHeader = InvoiceHeader;
-default_1.GoodsList = GoodsList;
-default_1.Seller = Buyer;
-default_1.Sign = Sign;
-default_1.Buyer = Buyer$1;
-default_1.idGenerator = idGenerator;
+Invoice.InvoiceController = InvoiceController;
+Invoice.InvoiceHeader = InvoiceHeader;
+Invoice.GoodsList = GoodsList;
+Invoice.Seller = Buyer;
+Invoice.Sign = Sign;
+Invoice.Buyer = Buyer$1;
+Invoice.idGenerator = idGenerator;
 
-default_1.useInvoiceController = function () {
+Invoice.useInvoiceController = function () {
   return React.useContext(InvoiceContext);
 };
 
@@ -12730,7 +13507,7 @@ var Main$3 = function Main(props) {
   /**                  销售方 */
   , props.sign || /*#__PURE__*/React.createElement(Sign, null)
   /**                      落款 */
-  , props.footExpand), /*#__PURE__*/React.createElement(ImportBuyerDrawer, null), /*#__PURE__*/React.createElement(ImportGoodsDrawer, null), /*#__PURE__*/React.createElement(EndowCodeDrawer, null));
+  , props.footExpand), /*#__PURE__*/React.createElement(ImportBuyerDrawer, null), /*#__PURE__*/React.createElement(ImportGoodsDrawer, null), /*#__PURE__*/React.createElement(EndowCodeDrawer, null), /*#__PURE__*/React.createElement(AddComparisonDrawer, null));
 };
 
-export { default_1 as Invoice, InvoiceController };
+export { Invoice, InvoiceController };