kts-component-invoice-operate 1.2.20 → 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';
@@ -13,14 +13,9 @@ function ownKeys(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -28,22 +23,360 @@ function ownKeys(object, enumerableOnly) {
 
 function _objectSpread2(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
 
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+  return target;
+}
+
+function _regeneratorRuntime() {
+  /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+  _regeneratorRuntime = function () {
+    return exports;
+  };
+
+  var exports = {},
+      Op = Object.prototype,
+      hasOwn = Op.hasOwnProperty,
+      $Symbol = "function" == typeof Symbol ? Symbol : {},
+      iteratorSymbol = $Symbol.iterator || "@@iterator",
+      asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator",
+      toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
+
+  function define(obj, key, value) {
+    return Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: !0,
+      configurable: !0,
+      writable: !0
+    }), obj[key];
+  }
+
+  try {
+    define({}, "");
+  } catch (err) {
+    define = function (obj, key, value) {
+      return obj[key] = value;
+    };
+  }
+
+  function wrap(innerFn, outerFn, self, tryLocsList) {
+    var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator,
+        generator = Object.create(protoGenerator.prototype),
+        context = new Context(tryLocsList || []);
+    return generator._invoke = function (innerFn, self, context) {
+      var state = "suspendedStart";
+      return function (method, arg) {
+        if ("executing" === state) throw new Error("Generator is already running");
+
+        if ("completed" === state) {
+          if ("throw" === method) throw arg;
+          return doneResult();
+        }
+
+        for (context.method = method, context.arg = arg;;) {
+          var delegate = context.delegate;
+
+          if (delegate) {
+            var delegateResult = maybeInvokeDelegate(delegate, context);
+
+            if (delegateResult) {
+              if (delegateResult === ContinueSentinel) continue;
+              return delegateResult;
+            }
+          }
+
+          if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) {
+            if ("suspendedStart" === state) throw state = "completed", context.arg;
+            context.dispatchException(context.arg);
+          } else "return" === context.method && context.abrupt("return", context.arg);
+          state = "executing";
+          var record = tryCatch(innerFn, self, context);
+
+          if ("normal" === record.type) {
+            if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue;
+            return {
+              value: record.arg,
+              done: context.done
+            };
+          }
+
+          "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg);
+        }
+      };
+    }(innerFn, self, context), generator;
+  }
+
+  function tryCatch(fn, obj, arg) {
+    try {
+      return {
+        type: "normal",
+        arg: fn.call(obj, arg)
+      };
+    } catch (err) {
+      return {
+        type: "throw",
+        arg: err
+      };
+    }
+  }
+
+  exports.wrap = wrap;
+  var ContinueSentinel = {};
+
+  function Generator() {}
+
+  function GeneratorFunction() {}
+
+  function GeneratorFunctionPrototype() {}
+
+  var IteratorPrototype = {};
+  define(IteratorPrototype, iteratorSymbol, function () {
+    return this;
+  });
+  var getProto = Object.getPrototypeOf,
+      NativeIteratorPrototype = getProto && getProto(getProto(values([])));
+  NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype);
+  var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
+
+  function defineIteratorMethods(prototype) {
+    ["next", "throw", "return"].forEach(function (method) {
+      define(prototype, method, function (arg) {
+        return this._invoke(method, arg);
       });
+    });
+  }
+
+  function AsyncIterator(generator, PromiseImpl) {
+    function invoke(method, arg, resolve, reject) {
+      var record = tryCatch(generator[method], generator, arg);
+
+      if ("throw" !== record.type) {
+        var result = record.arg,
+            value = result.value;
+        return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) {
+          invoke("next", value, resolve, reject);
+        }, function (err) {
+          invoke("throw", err, resolve, reject);
+        }) : PromiseImpl.resolve(value).then(function (unwrapped) {
+          result.value = unwrapped, resolve(result);
+        }, function (error) {
+          return invoke("throw", error, resolve, reject);
+        });
+      }
+
+      reject(record.arg);
     }
+
+    var previousPromise;
+
+    this._invoke = function (method, arg) {
+      function callInvokeWithMethodAndArg() {
+        return new PromiseImpl(function (resolve, reject) {
+          invoke(method, arg, resolve, reject);
+        });
+      }
+
+      return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+    };
   }
 
-  return target;
+  function maybeInvokeDelegate(delegate, context) {
+    var method = delegate.iterator[context.method];
+
+    if (undefined === method) {
+      if (context.delegate = null, "throw" === context.method) {
+        if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel;
+        context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method");
+      }
+
+      return ContinueSentinel;
+    }
+
+    var record = tryCatch(method, delegate.iterator, context.arg);
+    if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel;
+    var info = record.arg;
+    return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel);
+  }
+
+  function pushTryEntry(locs) {
+    var entry = {
+      tryLoc: locs[0]
+    };
+    1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry);
+  }
+
+  function resetTryEntry(entry) {
+    var record = entry.completion || {};
+    record.type = "normal", delete record.arg, entry.completion = record;
+  }
+
+  function Context(tryLocsList) {
+    this.tryEntries = [{
+      tryLoc: "root"
+    }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0);
+  }
+
+  function values(iterable) {
+    if (iterable) {
+      var iteratorMethod = iterable[iteratorSymbol];
+      if (iteratorMethod) return iteratorMethod.call(iterable);
+      if ("function" == typeof iterable.next) return iterable;
+
+      if (!isNaN(iterable.length)) {
+        var i = -1,
+            next = function next() {
+          for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next;
+
+          return next.value = undefined, next.done = !0, next;
+        };
+
+        return next.next = next;
+      }
+    }
+
+    return {
+      next: doneResult
+    };
+  }
+
+  function doneResult() {
+    return {
+      value: undefined,
+      done: !0
+    };
+  }
+
+  return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) {
+    var ctor = "function" == typeof genFun && genFun.constructor;
+    return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name));
+  }, exports.mark = function (genFun) {
+    return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun;
+  }, exports.awrap = function (arg) {
+    return {
+      __await: arg
+    };
+  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
+    return this;
+  }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) {
+    void 0 === PromiseImpl && (PromiseImpl = Promise);
+    var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl);
+    return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
+      return result.done ? result.value : iter.next();
+    });
+  }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () {
+    return this;
+  }), define(Gp, "toString", function () {
+    return "[object Generator]";
+  }), exports.keys = function (object) {
+    var keys = [];
+
+    for (var key in object) keys.push(key);
+
+    return keys.reverse(), function next() {
+      for (; keys.length;) {
+        var key = keys.pop();
+        if (key in object) return next.value = key, next.done = !1, next;
+      }
+
+      return next.done = !0, next;
+    };
+  }, exports.values = values, Context.prototype = {
+    constructor: Context,
+    reset: function (skipTempReset) {
+      if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined);
+    },
+    stop: function () {
+      this.done = !0;
+      var rootRecord = this.tryEntries[0].completion;
+      if ("throw" === rootRecord.type) throw rootRecord.arg;
+      return this.rval;
+    },
+    dispatchException: function (exception) {
+      if (this.done) throw exception;
+      var context = this;
+
+      function handle(loc, caught) {
+        return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught;
+      }
+
+      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+        var entry = this.tryEntries[i],
+            record = entry.completion;
+        if ("root" === entry.tryLoc) return handle("end");
+
+        if (entry.tryLoc <= this.prev) {
+          var hasCatch = hasOwn.call(entry, "catchLoc"),
+              hasFinally = hasOwn.call(entry, "finallyLoc");
+
+          if (hasCatch && hasFinally) {
+            if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
+            if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
+          } else if (hasCatch) {
+            if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
+          } else {
+            if (!hasFinally) throw new Error("try statement without catch or finally");
+            if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
+          }
+        }
+      }
+    },
+    abrupt: function (type, arg) {
+      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+        var entry = this.tryEntries[i];
+
+        if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
+          var finallyEntry = entry;
+          break;
+        }
+      }
+
+      finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null);
+      var record = finallyEntry ? finallyEntry.completion : {};
+      return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record);
+    },
+    complete: function (record, afterLoc) {
+      if ("throw" === record.type) throw record.arg;
+      return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel;
+    },
+    finish: function (finallyLoc) {
+      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+        var entry = this.tryEntries[i];
+        if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel;
+      }
+    },
+    catch: function (tryLoc) {
+      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+        var entry = this.tryEntries[i];
+
+        if (entry.tryLoc === tryLoc) {
+          var record = entry.completion;
+
+          if ("throw" === record.type) {
+            var thrown = record.arg;
+            resetTryEntry(entry);
+          }
+
+          return thrown;
+        }
+      }
+
+      throw new Error("illegal catch attempt");
+    },
+    delegateYield: function (iterable, resultName, nextLoc) {
+      return this.delegate = {
+        iterator: values(iterable),
+        resultName: resultName,
+        nextLoc: nextLoc
+      }, "next" === this.method && (this.arg = undefined), ContinueSentinel;
+    }
+  }, exports;
 }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -101,6 +434,9 @@ function _defineProperties(target, props) {
 function _createClass(Constructor, protoProps, staticProps) {
   if (protoProps) _defineProperties(Constructor.prototype, protoProps);
   if (staticProps) _defineProperties(Constructor, staticProps);
+  Object.defineProperty(Constructor, "prototype", {
+    writable: false
+  });
   return Constructor;
 }
 
@@ -131,22 +467,24 @@ function _inherits(subClass, superClass) {
       configurable: true
     }
   });
+  Object.defineProperty(subClass, "prototype", {
+    writable: false
+  });
   if (superClass) _setPrototypeOf(subClass, superClass);
 }
 
 function _getPrototypeOf(o) {
-  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
     return o.__proto__ || Object.getPrototypeOf(o);
   };
   return _getPrototypeOf(o);
 }
 
 function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
     o.__proto__ = p;
     return o;
   };
-
   return _setPrototypeOf(o, p);
 }
 
@@ -345,12 +683,12 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
   }, {
     key: "validateFields",
     value: function () {
-      var _validateFields2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var _validateFields2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var _this3 = this;
 
         var _errors, _values, arr, i, key, _yield$_validateField, errors, values, _this$state$goodsList;
 
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -479,7 +817,7 @@ var _validateFields = function _validateFields(form) {
   });
 };
 
-var ImportGoods = function ImportGoods() {
+var ImportGoods = /*#__PURE__*/_createClass(function ImportGoods() {
   _classCallCheck(this, ImportGoods);
 
   this.columns = [{
@@ -521,8 +859,8 @@ var ImportGoods = function ImportGoods() {
   this.topExpand = void 0;
 
   this.verifyFn = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(record) {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -564,7 +902,7 @@ var ImportGoods = function ImportGoods() {
       return _ref.apply(this, arguments);
     };
   }();
-};
+});
 
 var LineAttributeType;
 
@@ -576,12 +914,12 @@ var LineAttributeType;
 
 var LineAttributeType$1 = LineAttributeType;
 
-var EndowCode = function EndowCode() {
+var EndowCode = /*#__PURE__*/_createClass(function EndowCode() {
   _classCallCheck(this, EndowCode);
 
   this.endowcodeGoodIndex = [];
-  this.getTaxCategoryCodeList = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+  this.getTaxCategoryCodeList = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -613,7 +951,7 @@ var EndowCode = function EndowCode() {
     value: 3
   }];
   this.cache = {};
-};
+});
 
 function draft(value) {
   if (!value) return true; // isDiscount 
@@ -634,7 +972,14 @@ function draft(value) {
   }
 }
 
-var GoodsListState = function GoodsListState() {
+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);
 
   this.deduction = 0;
@@ -642,11 +987,12 @@ var GoodsListState = 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 = [];
   this.defaultRate = 3;
-  this.taxRateList = [0, 3, 5, 6, 9, 12];
+  this.taxRateList = [0, 3, 5, 6, 9, 13];
   this.goodsList = [];
   this.goodsMap = new Map();
   this.goodsMenuExpand = [];
@@ -654,10 +1000,12 @@ var GoodsListState = 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 = function BuyerState() {
+var BuyerState = /*#__PURE__*/_createClass(function BuyerState() {
   _classCallCheck(this, BuyerState);
 
   this.columns = [{
@@ -683,8 +1031,8 @@ var BuyerState = function BuyerState() {
   }];
 
   this.onRowClick = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(record) {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -708,9 +1056,9 @@ var BuyerState = function BuyerState() {
   this.isVisibleDrawer = false;
   this.topExpand = void 0;
   this.autoContainer = void 0;
-};
+});
 
-var InvoiceControllerState = function InvoiceControllerState() {
+var InvoiceControllerState = /*#__PURE__*/_createClass(function InvoiceControllerState() {
   _classCallCheck(this, InvoiceControllerState);
 
   this.model = 'default';
@@ -718,15 +1066,15 @@ var InvoiceControllerState = function InvoiceControllerState() {
   this.invoiceType = '08';
   this.buyerState = new BuyerState();
   this.goodsListState = new GoodsListState();
-};
+});
 
 /**
  * 设置当前的编辑货物
  */
 var setEditGood = /*#__PURE__*/(function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(state, newEditGood) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state, newEditGood) {
     var editGood;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -758,9 +1106,9 @@ var setEditGood = /*#__PURE__*/(function () {
  * 设置单个货物属性
  */
 var setGoods = /*#__PURE__*/(function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(state, options) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state, options) {
     var goodsList;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -797,9 +1145,9 @@ var setGoods = /*#__PURE__*/(function () {
  */
 
 var delGood = /*#__PURE__*/(function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(state, $index) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state, $index) {
     var goods;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -872,15 +1220,86 @@ var idGenerator = (function () {
   return ++id;
 });
 
+/** 格式化 保留2位小数 */
+
+var format2 = function format2(value) {
+  if (value === Infinity) return '';
+  if ("".concat(value) === 'NaN') return '';
+  if (typeof value === 'string') value = parseFloat(value);
+  return parseFloat(value.toFixed(2));
+};
+/** 格式化 保留15位数字 */
+
+var format15 = function format15(value) {
+  if (value === Infinity) return '';
+  if ("".concat(value) === 'NaN') return '';
+  if (typeof value === 'string') value = parseFloat(value);
+  var fractionDigits = 15 - "".concat(value || 0).indexOf('.');
+  return parseFloat(value.toFixed(fractionDigits > 8 ? 8 : fractionDigits));
+};
+/**
+ * 金额(含税) = 数量 * 单价(含税)
+ * @param quantity 数量
+ * @param priceIncludeTax 单价(含税)
+ * @returns 金额(含税)
+ */
+
+function countAmountIncludeTax(quantity, priceIncludeTax) {
+  if (!quantity && quantity !== 0) return undefined;
+  if (!priceIncludeTax && priceIncludeTax !== 0) return undefined;
+  quantity = format15(quantity);
+  priceIncludeTax = format15(priceIncludeTax);
+  return parseFloat(chain$1(bignumber(priceIncludeTax)).multiply(bignumber(quantity)).done().toNumber().toFixed(2)); // return parseFloat(evaluate(`${priceIncludeTax} * ${quantity}`).toFixed(2));
+}
+/**
+ * 不含税金额 = 含税金额-税额
+ * @param amountIncludeTax 含税金额
+ * @param taxAmount 税额
+ * @returns 不含税金额
+ */
+
+function countAmountExcludeTax(amountIncludeTax, taxAmount) {
+  if (!amountIncludeTax && amountIncludeTax !== 0) return undefined;
+  if (!taxAmount && taxAmount !== 0) return undefined;
+  return chain$1(bignumber(amountIncludeTax)).subtract(bignumber(taxAmount)).done().toNumber();
+}
+/**
+ * 税额 = (含税金额-扣除额)/(1+税率)*税率
+ * @param amountIncludeTax 含税金额
+ * @param deduction 扣除额
+ * @param taxRate 税率
+ * @returns 税额
+ */
+
+function countTaxAmount(amountIncludeTax, deduction, taxRate) {
+  if (!amountIncludeTax && amountIncludeTax !== 0) return undefined;
+  if (!deduction && deduction !== 0) return undefined;
+  if (!taxRate && taxRate !== 0) return undefined;
+  var taxRateBu = chain$1(bignumber(taxRate)).divide(bignumber(100)).done();
+  return parseFloat(chain$1(bignumber(amountIncludeTax)).subtract(bignumber(deduction)).divide(chain$1(bignumber(1)).add(taxRateBu).done()).multiply(taxRateBu).done().toNumber().toFixed(2));
+}
+/**
+ * 单价 = 金额/数量
+ * @param amount 金额
+ * @param quantity 数量
+ * @returns 单价
+ */
+
+function countPrice(amount, quantity) {
+  if (!amount && amount !== 0) return undefined;
+  if (!quantity && quantity !== 0) return undefined;
+  return format15(chain$1(bignumber(amount)).divide(bignumber(quantity)).done().toNumber());
+}
+
 /**
  * 设置当前的编辑货物
  */
 
 var addGoodDiscount = /*#__PURE__*/(function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(state, options) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state, options) {
     var _options$indexList, indexList, discount, goodsMap, goodsList, discountGroup, amountSum, _loop, t, _ret;
 
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -935,7 +1354,7 @@ var addGoodDiscount = /*#__PURE__*/(function () {
                 amountSum = amountSum.add(bignumber(lineAmountExcludeTax));
                 /** 金额(含税)  lineAmountExcludeTax * (1+${good.taxRate}/100)*/
 
-                lineAmountIncludeTax = chain$1(bignumber(lineAmountExcludeTax)).multiply(chain$1(bignumber(1)).add(taxRate).done()).done().toNumber();
+                lineAmountIncludeTax = format2(chain$1(bignumber(lineAmountExcludeTax)).multiply(chain$1(bignumber(1)).add(taxRate).done()).done().toNumber());
               }
               /** 税额 */
 
@@ -999,8 +1418,8 @@ var addGoodDiscount = /*#__PURE__*/(function () {
  */
 
 var addGood = /*#__PURE__*/(function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(state, options) {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state, options) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -1025,9 +1444,9 @@ var addGood = /*#__PURE__*/(function () {
  * 保存正在编辑的货物
  */
 var saveEditGood = /*#__PURE__*/(function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(state) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
     var editGood, form;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -1075,8 +1494,8 @@ var saveEditGood = /*#__PURE__*/(function () {
 var validateFields = function validateFields(form) {
   return new Promise(function (resolve) {
     form.validateFields( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(err, values) {
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -1129,12 +1548,12 @@ var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
   /** 更新发票单据编号 */
 
 
-  return InvoiceController;
+  return _createClass(InvoiceController);
 }(InvoiceControllerForm);
 
 var _defs, _path, _path2, _path3;
 
-function _extends() { _extends = Object.assign || 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.apply(this, arguments); }
+function _extends() { _extends = 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.apply(this, arguments); }
 
 function SvgAuto(props) {
   return /*#__PURE__*/createElement("svg", _extends({
@@ -1170,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;
   }, []);
@@ -1278,8 +1697,8 @@ var InvoiceHeader = decorator(Form.create())(function (props) {
       },
       component: SvgAuto,
       onClick: function () {
-        var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-          return regeneratorRuntime.wrap(function _callee$(_context) {
+        var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
@@ -1484,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) {
@@ -1592,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;
   }, []);
@@ -1611,8 +2030,8 @@ var AddRowButton = (function () {
   var disabled = React.useMemo(function () {
     return typeof goodMax === 'number' ? goodsNum >= goodMax : false;
   }, [goodMax, goodsNum]);
-  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+  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:
@@ -1626,8 +2045,8 @@ var AddRowButton = (function () {
           case 4:
             _context2.next = 6;
             return controller.pipeline( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-                return regeneratorRuntime.wrap(function _callee$(_context) {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
@@ -1681,7 +2100,7 @@ var AddRowButton = (function () {
 });
 
 var TaxIncludedSwitch = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 是否含税 */
 
   var isTaxIncluded = controller.useMemo(function (e) {
@@ -1694,8 +2113,8 @@ var TaxIncludedSwitch = (function () {
   }, []);
   var onChange = React.useCallback(function (e) {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -1716,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",
@@ -1726,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;
   }, []);
@@ -1789,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;
   }, []);
@@ -1820,8 +2294,8 @@ var AddDiscountRowButton = decorator(Form.create())(function (props) {
 
   var onClose = React.useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -1842,8 +2316,8 @@ var AddDiscountRowButton = decorator(Form.create())(function (props) {
   }, []);
   /** 点击了 添加折扣行 按钮 */
 
-  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-    return regeneratorRuntime.wrap(function _callee3$(_context3) {
+  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
@@ -1857,9 +2331,9 @@ var AddDiscountRowButton = decorator(Form.create())(function (props) {
           case 4:
             _context3.next = 6;
             return controller.pipeline( /*#__PURE__*/function () {
-              var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
                 var isOk;
-                return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
@@ -1951,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) {
@@ -1980,8 +2454,8 @@ var DrawerBody = decorator(Form.create())(function (props) {
 
   var onClose = React.useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(s) {
-        return regeneratorRuntime.wrap(function _callee4$(_context4) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -2009,8 +2483,8 @@ var DrawerBody = decorator(Form.create())(function (props) {
       var discount = parseFloat(parseFloat(values.discount).toFixed(4));
       var indexList = discountGoodIndex;
       controller.pipeline( /*#__PURE__*/function () {
-        var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(s) {
-          return regeneratorRuntime.wrap(function _callee5$(_context5) {
+        var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(s) {
+          return _regeneratorRuntime().wrap(function _callee5$(_context5) {
             while (1) {
               switch (_context5.prev = _context5.next) {
                 case 0:
@@ -2046,7 +2520,7 @@ var DrawerBody = decorator(Form.create())(function (props) {
       });
     });
   }, 300), [form, lineAmountSum]);
-  /** 折扣率变化 */
+  /** 折扣变化 */
 
   var onChangeDiscolineAmountunt = React.useCallback(lazyFn(function (e) {
     form.validateFields(function (err, values) {
@@ -2171,14 +2645,14 @@ var coolingFn = (function () {
 });
 
 var EndowCodeButton = (function () {
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 是否禁用 */
 
   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) {
+  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:
@@ -2192,8 +2666,8 @@ var EndowCodeButton = (function () {
           case 4:
             _context2.next = 6;
             return controller.pipeline( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-                return regeneratorRuntime.wrap(function _callee$(_context) {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
@@ -2256,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;
   }, []);
@@ -2272,9 +2746,9 @@ var DelRowButton = (function () {
   }, []);
   var onClick = React.useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
         var goodsList;
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -2314,9 +2788,165 @@ 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 || 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); }
+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); }
 
 function SvgSpot(props) {
   return /*#__PURE__*/createElement("svg", _extends$1({
@@ -2330,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]);
@@ -2352,11 +2982,11 @@ 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() {
-    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+  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:
@@ -2370,9 +3000,9 @@ var useAddDiscount = (function (goods) {
           case 4:
             _context2.next = 6;
             return controller.pipeline( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
                 var err, key;
-                return regeneratorRuntime.wrap(function _callee$(_context) {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
@@ -2382,7 +3012,7 @@ var useAddDiscount = (function (goods) {
                         }
 
                         err = s.goodsListState.form.getFieldsError();
-                        _context.t0 = regeneratorRuntime.keys(err);
+                        _context.t0 = _regeneratorRuntime().keys(err);
 
                       case 3:
                         if ((_context.t1 = _context.t0()).done) {
@@ -2457,93 +3087,22 @@ var useAddDiscount = (function (goods) {
     return undefined;
   }
 
-  return React.useMemo(function () {
-    if (goods.lineAttribute !== LineAttributeType$1.正常) {
-      return undefined;
-    }
-
-    return /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "addDiscount",
-      onClick: onClick
-    }, /*#__PURE__*/React.createElement(Text$2, {
-      strong: true
-    }, "\u6DFB\u52A0\u6298\u6263\u884C"));
-  }, [onClick, goods.lineAttribute]);
-});
-
-/** 格式化 保留2位小数 */
-
-var format2 = function format2(value) {
-  if (value === Infinity) return '';
-  if ("".concat(value) === 'NaN') return '';
-  if (typeof value === 'string') value = parseFloat(value);
-  return parseFloat(value.toFixed(2));
-};
-/** 格式化 保留15位数字 */
-
-var format15 = function format15(value) {
-  if (value === Infinity) return '';
-  if ("".concat(value) === 'NaN') return '';
-  if (typeof value === 'string') value = parseFloat(value);
-  var fractionDigits = 15 - "".concat(value || 0).indexOf('.');
-  return parseFloat(value.toFixed(fractionDigits > 8 ? 8 : fractionDigits));
-};
-/**
- * 金额(含税) = 数量 * 单价(含税)
- * @param quantity 数量
- * @param priceIncludeTax 单价(含税)
- * @returns 金额(含税)
- */
-
-function countAmountIncludeTax(quantity, priceIncludeTax) {
-  if (!quantity && quantity !== 0) return undefined;
-  if (!priceIncludeTax && priceIncludeTax !== 0) return undefined;
-  quantity = format15(quantity);
-  priceIncludeTax = format15(priceIncludeTax);
-  return parseFloat(chain$1(bignumber(priceIncludeTax)).multiply(bignumber(quantity)).done().toNumber().toFixed(2)); // return parseFloat(evaluate(`${priceIncludeTax} * ${quantity}`).toFixed(2));
-}
-/**
- * 不含税金额 = 含税金额-税额
- * @param amountIncludeTax 含税金额
- * @param taxAmount 税额
- * @returns 不含税金额
- */
-
-function countAmountExcludeTax(amountIncludeTax, taxAmount) {
-  if (!amountIncludeTax && amountIncludeTax !== 0) return undefined;
-  if (!taxAmount && taxAmount !== 0) return undefined;
-  return chain$1(bignumber(amountIncludeTax)).subtract(bignumber(taxAmount)).done().toNumber();
-}
-/**
- * 税额 = (含税金额-扣除额)/(1+税率)*税率
- * @param amountIncludeTax 含税金额
- * @param deduction 扣除额
- * @param taxRate 税率
- * @returns 税额
- */
-
-function countTaxAmount(amountIncludeTax, deduction, taxRate) {
-  if (!amountIncludeTax && amountIncludeTax !== 0) return undefined;
-  if (!deduction && deduction !== 0) return undefined;
-  if (!taxRate && taxRate !== 0) return undefined;
-  var taxRateBu = chain$1(bignumber(taxRate)).divide(bignumber(100)).done();
-  return parseFloat(chain$1(bignumber(amountIncludeTax)).subtract(bignumber(deduction)).divide(chain$1(bignumber(1)).add(taxRateBu).done()).multiply(taxRateBu).done().toNumber().toFixed(2));
-}
-/**
- * 单价 = 金额/数量
- * @param amount 金额
- * @param quantity 数量
- * @returns 单价
- */
+  return React.useMemo(function () {
+    if (goods.lineAttribute !== LineAttributeType$1.正常) {
+      return undefined;
+    }
 
-function countPrice(amount, quantity) {
-  if (!amount && amount !== 0) return undefined;
-  if (!quantity && quantity !== 0) return undefined;
-  return format15(chain$1(bignumber(amount)).divide(bignumber(quantity)).done().toNumber());
-}
+    return /*#__PURE__*/React.createElement(Menu.Item, {
+      key: "addDiscount",
+      onClick: onClick
+    }, /*#__PURE__*/React.createElement(Text$2, {
+      strong: true
+    }, "\u6DFB\u52A0\u6298\u6263\u884C"));
+  }, [onClick, goods.lineAttribute]);
+});
 
 //! moment.js
-//! version : 2.29.1
+//! version : 2.29.3
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
@@ -2614,8 +3173,9 @@ function isDate(input) {
 
 function map(arr, fn) {
     var res = [],
-        i;
-    for (i = 0; i < arr.length; ++i) {
+        i,
+        arrLen = arr.length;
+    for (i = 0; i < arrLen; ++i) {
         res.push(fn(arr[i], i));
     }
     return res;
@@ -2744,7 +3304,10 @@ var momentProperties = (hooks.momentProperties = []),
     updateInProgress = false;
 
 function copyConfig(to, from) {
-    var i, prop, val;
+    var i,
+        prop,
+        val,
+        momentPropertiesLen = momentProperties.length;
 
     if (!isUndefined(from._isAMomentObject)) {
         to._isAMomentObject = from._isAMomentObject;
@@ -2777,8 +3340,8 @@ function copyConfig(to, from) {
         to._locale = from._locale;
     }
 
-    if (momentProperties.length > 0) {
-        for (i = 0; i < momentProperties.length; i++) {
+    if (momentPropertiesLen > 0) {
+        for (i = 0; i < momentPropertiesLen; i++) {
             prop = momentProperties[i];
             val = from[prop];
             if (!isUndefined(val)) {
@@ -2833,8 +3396,9 @@ function deprecate(msg, fn) {
             var args = [],
                 arg,
                 i,
-                key;
-            for (i = 0; i < arguments.length; i++) {
+                key,
+                argLen = arguments.length;
+            for (i = 0; i < argLen; i++) {
                 arg = '';
                 if (typeof arguments[i] === 'object') {
                     arg += '\n[' + i + '] ';
@@ -2984,7 +3548,8 @@ function zeroFill(number, targetLength, forceSign) {
     );
 }
 
-var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|N{1,5}|YYYYYY|YYYYY|YYYY|YY|y{2,4}|yo?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,
+var formattingTokens =
+        /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|N{1,5}|YYYYYY|YYYYY|YYYY|YY|y{2,4}|yo?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,
     localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,
     formatFunctions = {},
     formatTokenFunctions = {};
@@ -3288,8 +3853,9 @@ function stringSet(units, value) {
     if (typeof units === 'object') {
         units = normalizeObjectUnits(units);
         var prioritized = getPrioritizedUnits(units),
-            i;
-        for (i = 0; i < prioritized.length; i++) {
+            i,
+            prioritizedLen = prioritized.length;
+        for (i = 0; i < prioritizedLen; i++) {
             this[prioritized[i].unit](units[prioritized[i].unit]);
         }
     } else {
@@ -3319,7 +3885,8 @@ var match1 = /\d/, //       0 - 9
     matchTimestamp = /[+-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123
     // any word (or two) characters or numbers including two/three word month in arabic.
     // includes scottish gaelic two word and hyphenated months
-    matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,
+    matchWord =
+        /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,
     regexes;
 
 regexes = {};
@@ -3345,15 +3912,12 @@ function unescapeFormat(s) {
     return regexEscape(
         s
             .replace('\\', '')
-            .replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (
-                matched,
-                p1,
-                p2,
-                p3,
-                p4
-            ) {
-                return p1 || p2 || p3 || p4;
-            })
+            .replace(
+                /\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,
+                function (matched, p1, p2, p3, p4) {
+                    return p1 || p2 || p3 || p4;
+                }
+            )
     );
 }
 
@@ -3365,7 +3929,8 @@ var tokens = {};
 
 function addParseToken(token, callback) {
     var i,
-        func = callback;
+        func = callback,
+        tokenLen;
     if (typeof token === 'string') {
         token = [token];
     }
@@ -3374,7 +3939,8 @@ function addParseToken(token, callback) {
             array[callback] = toInt(input);
         };
     }
-    for (i = 0; i < token.length; i++) {
+    tokenLen = token.length;
+    for (i = 0; i < tokenLen; i++) {
         tokens[token[i]] = func;
     }
 }
@@ -3485,12 +4051,12 @@ addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
 
 // LOCALES
 
-var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split(
-        '_'
-    ),
-    defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split(
-        '_'
-    ),
+var defaultLocaleMonths =
+        'January_February_March_April_May_June_July_August_September_October_November_December'.split(
+            '_'
+        ),
+    defaultLocaleMonthsShort =
+        'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
     MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,
     defaultMonthsShortRegex = matchWord,
     defaultMonthsRegex = matchWord;
@@ -3932,14 +4498,12 @@ addRegexToken('ww', match1to2, match2);
 addRegexToken('W', match1to2);
 addRegexToken('WW', match1to2, match2);
 
-addWeekParseToken(['w', 'ww', 'W', 'WW'], function (
-    input,
-    week,
-    config,
-    token
-) {
-    week[token.substr(0, 1)] = toInt(input);
-});
+addWeekParseToken(
+    ['w', 'ww', 'W', 'WW'],
+    function (input, week, config, token) {
+        week[token.substr(0, 1)] = toInt(input);
+    }
+);
 
 // HELPERS
 
@@ -4064,9 +4628,8 @@ function shiftWeekdays(ws, n) {
     return ws.slice(n, 7).concat(ws.slice(0, n));
 }
 
-var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split(
-        '_'
-    ),
+var defaultLocaleWeekdays =
+        'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
     defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
     defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
     defaultWeekdaysRegex = matchWord,
@@ -4614,6 +5177,11 @@ function chooseLocale(names) {
     return globalLocale;
 }
 
+function isLocaleNameSane(name) {
+    // Prevent names that look like filesystem paths, i.e contain '/' or '\'
+    return name.match('^[^/\\\\]*$') != null;
+}
+
 function loadLocale(name) {
     var oldLocale = null,
         aliasedRequire;
@@ -4622,7 +5190,8 @@ function loadLocale(name) {
         locales[name] === undefined &&
         typeof module !== 'undefined' &&
         module &&
-        module.exports
+        module.exports &&
+        isLocaleNameSane(name)
     ) {
         try {
             oldLocale = globalLocale._abbr;
@@ -4839,8 +5408,10 @@ function checkOverflow(m) {
 
 // iso 8601 regex
 // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
-var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
-    basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
+var extendedIsoRegex =
+        /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
+    basicIsoRegex =
+        /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
     tzRegex = /Z|[+-]\d\d(?::?\d\d)?/,
     isoDates = [
         ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
@@ -4871,7 +5442,8 @@ var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\
     ],
     aspNetJsonRegex = /^\/?Date\((-?\d+)/i,
     // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
-    rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/,
+    rfc2822 =
+        /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/,
     obsOffsets = {
         UT: 0,
         GMT: 0,
@@ -4894,12 +5466,13 @@ function configFromISO(config) {
         allowTime,
         dateFormat,
         timeFormat,
-        tzFormat;
+        tzFormat,
+        isoDatesLen = isoDates.length,
+        isoTimesLen = isoTimes.length;
 
     if (match) {
         getParsingFlags(config).iso = true;
-
-        for (i = 0, l = isoDates.length; i < l; i++) {
+        for (i = 0, l = isoDatesLen; i < l; i++) {
             if (isoDates[i][1].exec(match[1])) {
                 dateFormat = isoDates[i][0];
                 allowTime = isoDates[i][2] !== false;
@@ -4911,7 +5484,7 @@ function configFromISO(config) {
             return;
         }
         if (match[3]) {
-            for (i = 0, l = isoTimes.length; i < l; i++) {
+            for (i = 0, l = isoTimesLen; i < l; i++) {
                 if (isoTimes[i][1].exec(match[3])) {
                     // match[2] should be 'T' or space
                     timeFormat = (match[2] || ' ') + isoTimes[i][0];
@@ -5291,12 +5864,13 @@ function configFromStringAndFormat(config) {
         skipped,
         stringLength = string.length,
         totalParsedInputLength = 0,
-        era;
+        era,
+        tokenLen;
 
     tokens =
         expandFormat(config._f, config._locale).match(formattingTokens) || [];
-
-    for (i = 0; i < tokens.length; i++) {
+    tokenLen = tokens.length;
+    for (i = 0; i < tokenLen; i++) {
         token = tokens[i];
         parsedInput = (string.match(getParseRegexForToken(token, config)) ||
             [])[0];
@@ -5391,15 +5965,16 @@ function configFromStringAndArray(config) {
         i,
         currentScore,
         validFormatFound,
-        bestFormatIsValid = false;
+        bestFormatIsValid = false,
+        configfLen = config._f.length;
 
-    if (config._f.length === 0) {
+    if (configfLen === 0) {
         getParsingFlags(config).invalidFormat = true;
         config._d = new Date(NaN);
         return;
     }
 
-    for (i = 0; i < config._f.length; i++) {
+    for (i = 0; i < configfLen; i++) {
         currentScore = 0;
         validFormatFound = false;
         tempConfig = copyConfig({}, config);
@@ -5640,7 +6215,8 @@ var ordering = [
 function isDurationValid(m) {
     var key,
         unitHasDecimal = false,
-        i;
+        i,
+        orderLen = ordering.length;
     for (key in m) {
         if (
             hasOwnProp(m, key) &&
@@ -5653,7 +6229,7 @@ function isDurationValid(m) {
         }
     }
 
-    for (i = 0; i < ordering.length; ++i) {
+    for (i = 0; i < orderLen; ++i) {
         if (m[ordering[i]]) {
             if (unitHasDecimal) {
                 return false; // only allow non-integers for smallest unit
@@ -5978,7 +6554,8 @@ var aspNetRegex = /^(-|\+)?(?:(\d*)[. ])?(\d+):(\d+)(?::(\d+)(\.\d*)?)?$/,
     // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
     // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
     // and further modified to allow for strings containing both week and day
-    isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
+    isoRegex =
+        /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
 
 function createDuration(input, key) {
     var duration = input,
@@ -6199,9 +6776,10 @@ function isMomentInputObject(input) {
             'ms',
         ],
         i,
-        property;
+        property,
+        propertyLen = properties.length;
 
-    for (i = 0; i < properties.length; i += 1) {
+    for (i = 0; i < propertyLen; i += 1) {
         property = properties[i];
         propertyTest = propertyTest || hasOwnProp(input, property);
     }
@@ -6824,19 +7402,17 @@ addRegexToken('NNN', matchEraAbbr);
 addRegexToken('NNNN', matchEraName);
 addRegexToken('NNNNN', matchEraNarrow);
 
-addParseToken(['N', 'NN', 'NNN', 'NNNN', 'NNNNN'], function (
-    input,
-    array,
-    config,
-    token
-) {
-    var era = config._locale.erasParse(input, token, config._strict);
-    if (era) {
-        getParsingFlags(config).era = era;
-    } else {
-        getParsingFlags(config).invalidEra = input;
+addParseToken(
+    ['N', 'NN', 'NNN', 'NNNN', 'NNNNN'],
+    function (input, array, config, token) {
+        var era = config._locale.erasParse(input, token, config._strict);
+        if (era) {
+            getParsingFlags(config).era = era;
+        } else {
+            getParsingFlags(config).invalidEra = input;
+        }
     }
-});
+);
 
 addRegexToken('y', matchUnsigned);
 addRegexToken('yy', matchUnsigned);
@@ -7128,14 +7704,12 @@ addRegexToken('gggg', match1to4, match4);
 addRegexToken('GGGGG', match1to6, match6);
 addRegexToken('ggggg', match1to6, match6);
 
-addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (
-    input,
-    week,
-    config,
-    token
-) {
-    week[token.substr(0, 2)] = toInt(input);
-});
+addWeekParseToken(
+    ['gggg', 'ggggg', 'GGGG', 'GGGGG'],
+    function (input, week, config, token) {
+        week[token.substr(0, 2)] = toInt(input);
+    }
+);
 
 addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
     week[token] = hooks.parseTwoDigitYear(input);
@@ -8158,7 +8732,7 @@ addParseToken('x', function (input, array, config) {
 
 //! moment.js
 
-hooks.version = '2.29.1';
+hooks.version = '2.29.3';
 
 setHookCallback(createLocal);
 
@@ -8247,10 +8821,10 @@ var promptErr = function promptErr(err) {
 
 var onChangeQuantity = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(err, values) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err, values) {
       var quantity, priceIncludeTax, lineAmountIncludeTax, _lineAmountIncludeTax, _priceIncludeTax, priceExcludeTax, lineAmountExcludeTax, _lineAmountExcludeTax, _priceExcludeTax;
 
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -8396,10 +8970,10 @@ var onChangeQuantity = lazyFn$1(function (controller, form, record) {
 
 var onChangePriceIncludeTax = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(err, values) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
       var priceIncludeTax, quantity, lineAmountIncludeTax, _lineAmountIncludeTax2, _quantity;
 
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
@@ -8495,10 +9069,10 @@ var onChangePriceIncludeTax = lazyFn$1(function (controller, form, record) {
 
 var onChangePriceExcludeTax = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(err, values) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(err, values) {
       var priceExcludeTax, quantity, lineAmountExcludeTax, _lineAmountExcludeTax2, _quantity2;
 
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
@@ -8594,10 +9168,10 @@ var onChangePriceExcludeTax = lazyFn$1(function (controller, form, record) {
 
 var onChangeLineAmountIncludeTax = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(err, values) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(err, values) {
       var lineAmountIncludeTax, quantity, priceIncludeTax, _priceIncludeTax2, _quantity3;
 
-      return regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
@@ -8686,10 +9260,10 @@ var onChangeLineAmountIncludeTax = lazyFn$1(function (controller, form, record)
 
 var onChangeLineAmountExcludeTax = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(err, values) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(err, values) {
       var lineAmountExcludeTax, quantity, priceExcludeTax, _priceExcludeTax2, _quantity4;
 
-      return regeneratorRuntime.wrap(function _callee5$(_context5) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
@@ -8778,9 +9352,9 @@ var onChangeLineAmountExcludeTax = lazyFn$1(function (controller, form, record)
 
 var onChangeTaxRate = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(err, values) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(err, values) {
       var taxRate;
-      return regeneratorRuntime.wrap(function _callee6$(_context6) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
@@ -8840,6 +9414,11 @@ function dutyFree(controller, taxRate, form, record) {
   var cache = controller.state.goodsListState.endowCode.cache;
   var invoiceType = controller.state.invoiceType; // 4月1日至12月31日
 
+  console.log('===> 小规模纳税人免税逻辑');
+  console.log('===> invoiceType', invoiceType);
+  console.log('===> en', controller.state.en);
+  console.log('===> taxRate', taxRate);
+  console.log('===> state', controller.state);
   if (hooks().valueOf() > hooks('2022-12-31 23:59').valueOf()) return taxRate;
   if (controller.state.en !== '08') return taxRate;
   if (invoiceType !== '10' && invoiceType !== '04') return taxRate;
@@ -8858,38 +9437,15 @@ function dutyFree(controller, taxRate, form, record) {
       taxRate: 0
     });
     return 0;
-  } // 选择的 1或者3
-  // if (taxRate === 1 || taxRate === 3) {
-  // 是否处理过
-  // if (cache[record.$index]) {
-  //   return taxRate;
-  // } else {
-  // cache[record.$index] = { favouredPolicyName: record.favouredPolicyName, favouredPolicyMark: record.favouredPolicyMark,taxFreeType:record.taxFreeType }
-  //   record.favouredPolicyName = '免税';
-  //   record.taxRate = 0;
-  //   record.favouredPolicyMark = 1;
-  //   record.taxFreeType = 1 as any;
-  //   form.setFieldsValue({ taxRate: 0 });
-  //   return 0;
-  // }
-  // } else {
-  //   if (cache[record.$index] && cache[record.$index] !== true) {
-  //     record.favouredPolicyName = cache[record.$index].favouredPolicyName;
-  //     record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
-  //     record.taxFreeType = cache[record.$index].taxFreeType;
-  //     cache[record.$index] = true;
-  //   }
-  //   return taxRate;
-  // }
-
+  }
 }
 /** 含税 => 更新(不含税) */
 
 var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(err, values) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(err, values) {
       var taxAmount, lineAmountExcludeTax, priceExcludeTax, deduction;
-      return regeneratorRuntime.wrap(function _callee7$(_context7) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
@@ -8953,9 +9509,9 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
 
 var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8(err, values) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(err, values) {
       var lineAmountExcludeTax, lineAmountIncludeTax, taxAmount, priceExcludeTax, priceIncludeTax;
-      return regeneratorRuntime.wrap(function _callee8$(_context8) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) {
           switch (_context8.prev = _context8.next) {
             case 0:
@@ -9024,49 +9580,11 @@ 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 () {
-  var _ref10 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(controller, goods) {
-    return regeneratorRuntime.wrap(function _callee11$(_context11) {
+  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(controller, goods) {
+    return _regeneratorRuntime().wrap(function _callee11$(_context11) {
       while (1) {
         switch (_context11.prev = _context11.next) {
           case 0:
@@ -9080,9 +9598,9 @@ var endowCode = /*#__PURE__*/function () {
           case 4:
             _context11.next = 6;
             return controller.pipeline( /*#__PURE__*/function () {
-              var _ref11 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10(s) {
+              var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(s) {
                 var err, key, g, i;
-                return regeneratorRuntime.wrap(function _callee10$(_context10) {
+                return _regeneratorRuntime().wrap(function _callee10$(_context10) {
                   while (1) {
                     switch (_context10.prev = _context10.next) {
                       case 0:
@@ -9092,7 +9610,7 @@ var endowCode = /*#__PURE__*/function () {
                         }
 
                         err = s.goodsListState.form.getFieldsError();
-                        _context10.t0 = regeneratorRuntime.keys(err);
+                        _context10.t0 = _regeneratorRuntime().keys(err);
 
                       case 3:
                         if ((_context10.t1 = _context10.t0()).done) {
@@ -9157,12 +9675,103 @@ 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 onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+  var controller = Invoice.useInvoiceController();
+  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -9185,11 +9794,102 @@ var useEndowCode = (function (goods) {
   }, [goods.lineAttribute, onClick]);
 });
 
+var Text$4 = Typography.Text;
+var useAddComparison = (function (goods) {
+  var controller = Invoice.useInvoiceController();
+  var productComparison = controller.useMemo(function (s) {
+    return s.goodsListState.productComparison;
+  }, []);
+  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 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;
+                        }
+
+                        err = s.goodsListState.form.getFieldsError();
+                        _context.t0 = _regeneratorRuntime().keys(err);
+
+                      case 3:
+                        if ((_context.t1 = _context.t0()).done) {
+                          _context.next = 11;
+                          break;
+                        }
+
+                        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 = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []);
@@ -9204,10 +9904,13 @@ var RowMenu = (function (props) {
   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); // 删除
@@ -9240,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) {
@@ -9281,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;
 
@@ -9295,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"
@@ -9316,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
@@ -9385,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
+          });
         }
       }
     }, {
@@ -9412,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:
@@ -9426,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;
@@ -9484,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:
@@ -9498,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;
@@ -9556,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:
@@ -9570,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;
@@ -9614,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',
@@ -9633,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位');
@@ -9644,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('扣除额不能大于等于价税合计');
@@ -9669,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;
@@ -9701,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',
@@ -9720,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位');
@@ -9731,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;
@@ -9763,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',
@@ -9849,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 () {
@@ -9924,16 +10718,72 @@ 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;
   }, []);
   var onClick = React.useCallback( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(record) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record) {
       var editGood;
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
@@ -9978,8 +10828,8 @@ var useOnRow = (function () {
             case 12:
               _context2.next = 14;
               return controller.pipeline( /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-                  return regeneratorRuntime.wrap(function _callee$(_context) {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
                         case 0:
@@ -10040,8 +10890,8 @@ function useDeduction(controller) {
   // 更新 扣除额
   React.useEffect(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -10063,8 +10913,8 @@ function useDeduction(controller) {
 
   React.useEffect(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -10109,7 +10959,7 @@ function useWindowClick(controller) {
 
 var useRowSelection = (function () {
   /** 控制器 */
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 列表选中的货物索引列表 */
 
   var selectedRowKeys = controller.useMemo(function (s) {
@@ -10130,8 +10980,8 @@ var useRowSelection = (function () {
   var onClickSelectAll = React.useCallback(function () {
     if (isAll) {
       controller.pipeline( /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-          return regeneratorRuntime.wrap(function _callee$(_context) {
+        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
@@ -10151,8 +11001,8 @@ var useRowSelection = (function () {
       }())();
     } else {
       controller.pipeline( /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
-          return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
@@ -10175,8 +11025,8 @@ var useRowSelection = (function () {
     }
   }, [controller, isAll]);
   var onSelect = React.useCallback( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(record, selected) {
-      return regeneratorRuntime.wrap(function _callee5$(_context5) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(record, selected) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
@@ -10187,8 +11037,8 @@ var useRowSelection = (function () {
 
               _context5.next = 3;
               return controller.pipeline( /*#__PURE__*/function () {
-                var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
-                  return regeneratorRuntime.wrap(function _callee3$(_context3) {
+                var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) {
                       switch (_context3.prev = _context3.next) {
                         case 0:
@@ -10215,8 +11065,8 @@ var useRowSelection = (function () {
             case 5:
               _context5.next = 7;
               return controller.pipeline( /*#__PURE__*/function () {
-                var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(s) {
-                  return regeneratorRuntime.wrap(function _callee4$(_context4) {
+                var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                     while (1) {
                       switch (_context4.prev = _context4.next) {
                         case 0:
@@ -10264,8 +11114,8 @@ var useRowSelection = (function () {
   /** 选择了商品后 调整 折扣行 和 被折扣行 */
 
   var sortOut = React.useCallback( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(selected) {
-      return regeneratorRuntime.wrap(function _callee7$(_context7) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(selected) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
@@ -10275,8 +11125,8 @@ var useRowSelection = (function () {
             case 2:
               _context7.next = 4;
               return controller.pipeline( /*#__PURE__*/function () {
-                var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(s) {
-                  return regeneratorRuntime.wrap(function _callee6$(_context6) {
+                var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(s) {
+                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
                     while (1) {
                       switch (_context6.prev = _context6.next) {
                         case 0:
@@ -10284,7 +11134,6 @@ var useRowSelection = (function () {
                             var goods = s.goodsListState.goodsMap.get($index);
                             if (!goods || goods.lineAttribute === LineAttributeType$1.正常) return; // 数组位置
 
-                            // 数组位置
                             var t = s.goodsListState.goodsList.indexOf(goods);
                             goods.lineAttribute === LineAttributeType$1.折扣行 ? t-- : t++;
                             var i = s.goodsListState.goodsList[t].$index;
@@ -10334,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) {
@@ -10359,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;
   }, []);
@@ -10376,8 +11225,8 @@ var Main = decorator(Form.create())(function (props) {
 
   React.useEffect(function () {
     controller.run( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -10400,8 +11249,8 @@ var Main = decorator(Form.create())(function (props) {
 
   React.useEffect(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s, form) {
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s, form) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -10425,8 +11274,8 @@ var Main = decorator(Form.create())(function (props) {
 
   React.useEffect(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
-        return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -10452,8 +11301,8 @@ var Main = decorator(Form.create())(function (props) {
 
   React.useEffect(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(s) {
-        return regeneratorRuntime.wrap(function _callee4$(_context4) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -10476,8 +11325,8 @@ var Main = decorator(Form.create())(function (props) {
 
   React.useEffect(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(s) {
-        return regeneratorRuntime.wrap(function _callee5$(_context5) {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(s) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
@@ -10500,8 +11349,8 @@ var Main = decorator(Form.create())(function (props) {
 
   React.useEffect(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(s) {
-        return regeneratorRuntime.wrap(function _callee6$(_context6) {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(s) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
@@ -10529,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
     })
@@ -10591,14 +11440,14 @@ var Buyer = /*#__PURE__*/function (_React$Component) {
     return _this;
   }
 
-  return Buyer;
+  return _createClass(Buyer);
 }(React.Component);
 var Main$1 = decorator(Form.create())(function (props) {
   var form = props.form;
   var getFieldDecorator = form.getFieldDecorator;
   /** 控制器 */
 
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 控制器 */
 
   var model = controller.useMemo(function (s) {
@@ -10716,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
@@ -10758,11 +11607,11 @@ 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) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -10790,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) {
@@ -10888,10 +11737,10 @@ var BuyerNameInput = (function (props) {
   /** 点击了选择项 */
 
   var onClickItem = React.useCallback( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(e) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
       var _controller$formList$;
 
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -10950,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),
@@ -10969,8 +11818,8 @@ function useDataSource() {
     return s.buyerState.autoContainer;
   }, []);
   var onBuyNameChange = React.useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(e) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
@@ -11034,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);
@@ -11059,14 +11908,14 @@ var Buyer$1 = /*#__PURE__*/function (_React$Component) {
     return _this;
   }
 
-  return Buyer;
+  return _createClass(Buyer);
 }(React.Component);
 var Main$2 = decorator(Form.create())(function (props) {
   var form = props.form;
   var getFieldDecorator = form.getFieldDecorator;
   /** 控制器 */
 
-  var controller = default_1.useInvoiceController();
+  var controller = Invoice.useInvoiceController();
   /** 组件模式 */
 
   var model = controller.useMemo(function (s) {
@@ -11148,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 {
@@ -11184,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;
   }, []);
@@ -11194,8 +12043,8 @@ var ImportBuyerDrawer = (function () {
 
   var onClose = React.useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -11226,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;
   }, []);
@@ -11257,10 +12106,10 @@ var DrawerBody$1 = function DrawerBody() {
     onRow: function onRow(record) {
       return {
         onClick: function () {
-          var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+          var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
             var re, _controller$formList$;
 
-            return regeneratorRuntime.wrap(function _callee3$(_context3) {
+            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
               while (1) {
                 switch (_context3.prev = _context3.next) {
                   case 0:
@@ -11273,8 +12122,8 @@ var DrawerBody$1 = function DrawerBody() {
                     if (re) {
                       (_controller$formList$ = controller.formList.get('buyer')) === null || _controller$formList$ === void 0 ? void 0 : _controller$formList$.setFieldsValue(re);
                       controller.pipeline( /*#__PURE__*/function () {
-                        var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
-                          return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+                          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                             while (1) {
                               switch (_context2.prev = _context2.next) {
                                 case 0:
@@ -11314,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;
   }, []);
@@ -11324,8 +12173,8 @@ var ImportGoodsDrawer = (function () {
   var onClose = React.useCallback(function () {
     console.log('===> 关闭抽屉');
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -11360,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;
   }, []);
@@ -11393,8 +12242,9 @@ var DrawerBody$2 = function DrawerBody() {
       return {
         onClick: function onClick() {
           controller.run( /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
-              return regeneratorRuntime.wrap(function _callee2$(_context2) {
+            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) {
                     case 0:
@@ -11402,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);
 
@@ -11430,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);
+                      }
 
-                    case 12:
-                      if (s.goodsListState.editGood.taxRate) s.goodsListState.editGood.taxRate = dutyFree(controller, s.goodsListState.editGood.taxRate, s.goodsListState.form, s.goodsListState.editGood);
+                      if (editGood.quantity && editGood.priceIncludeTax) {
+                        editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax);
+                      } // 导入FORM里
 
-                      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);
 
@@ -11475,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;
-};
 /** 货物单价，不含税 */
 
 
@@ -11487,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;
 };
 
 /**
@@ -11546,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;
   }, []);
@@ -11558,8 +12454,8 @@ var EndowCodeDrawer = (function () {
 
   var onClose = React.useCallback(function () {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -11582,9 +12478,9 @@ var EndowCodeDrawer = (function () {
   React.useEffect(function () {
     if (visible) {
       controller.pipeline( /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
           var endowcodeGoodIndex, good, getDefaultValue;
-          return regeneratorRuntime.wrap(function _callee2$(_context2) {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
@@ -11661,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();
@@ -11714,9 +12610,9 @@ var DrawerBody$3 = function DrawerBody(props) {
         setDataSource = _React$useState6[1];
 
     var onSearch = React.useCallback( /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(e) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e) {
         var arr;
-        return regeneratorRuntime.wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -11749,8 +12645,8 @@ var DrawerBody$3 = function DrawerBody(props) {
       })[0];
       if (!info) return;
       !readOnlyTaxRate && actions.setFieldState('taxRate', /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(s) {
-          return regeneratorRuntime.wrap(function _callee4$(_context4) {
+        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
             while (1) {
               switch (_context4.prev = _context4.next) {
                 case 0:
@@ -11771,8 +12667,8 @@ var DrawerBody$3 = function DrawerBody(props) {
         };
       }());
       actions.setFieldState('shorthand', /*#__PURE__*/function () {
-        var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(s) {
-          return regeneratorRuntime.wrap(function _callee5$(_context5) {
+        var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(s) {
+          return _regeneratorRuntime().wrap(function _callee5$(_context5) {
             while (1) {
               switch (_context5.prev = _context5.next) {
                 case 0:
@@ -11873,8 +12769,8 @@ var DrawerBody$3 = function DrawerBody(props) {
         return e.id === id;
       })[0];
       !readOnlyTaxRate && actions.setFieldState('taxRate', /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(s) {
-          return regeneratorRuntime.wrap(function _callee6$(_context6) {
+        var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(s) {
+          return _regeneratorRuntime().wrap(function _callee6$(_context6) {
             while (1) {
               switch (_context6.prev = _context6.next) {
                 case 0:
@@ -11895,8 +12791,8 @@ var DrawerBody$3 = function DrawerBody(props) {
         };
       }());
       actions.setFieldState('taxClassificationCode', /*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(s) {
-          return regeneratorRuntime.wrap(function _callee7$(_context7) {
+        var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(s) {
+          return _regeneratorRuntime().wrap(function _callee7$(_context7) {
             while (1) {
               switch (_context7.prev = _context7.next) {
                 case 0:
@@ -11917,8 +12813,8 @@ var DrawerBody$3 = function DrawerBody(props) {
         };
       }());
       actions.setFieldState('shorthand', /*#__PURE__*/function () {
-        var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8(s) {
-          return regeneratorRuntime.wrap(function _callee8$(_context8) {
+        var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(s) {
+          return _regeneratorRuntime().wrap(function _callee8$(_context8) {
             while (1) {
               switch (_context8.prev = _context8.next) {
                 case 0:
@@ -11941,14 +12837,14 @@ var DrawerBody$3 = function DrawerBody(props) {
       setVisible(false);
     }, [list, actions, readOnlyTaxRate]);
     React.useEffect(function () {
-      _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+      _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var fn, list;
-        return regeneratorRuntime.wrap(function _callee10$(_context10) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) {
             switch (_context10.prev = _context10.next) {
               case 0:
-                fn = controller.state.goodsListState.endowCode.getTaxCategoryCodeTree || /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
-                  return regeneratorRuntime.wrap(function _callee9$(_context9) {
+                fn = controller.state.goodsListState.endowCode.getTaxCategoryCodeTree || /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+                  return _regeneratorRuntime().wrap(function _callee9$(_context9) {
                     while (1) {
                       switch (_context9.prev = _context9.next) {
                         case 0:
@@ -12035,9 +12931,9 @@ var DrawerBody$3 = function DrawerBody(props) {
 
   var onSubmit = React.useCallback(function (values) {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref11 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(s) {
+      var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(s) {
         var endowCodeGood;
-        return regeneratorRuntime.wrap(function _callee11$(_context11) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) {
             switch (_context11.prev = _context11.next) {
               case 0:
@@ -12046,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;
@@ -12057,17 +12954,20 @@ var DrawerBody$3 = function DrawerBody(props) {
                   good.favouredPolicyName = values.favouredPolicyName;
                   var taxRate = chain$1(bignumber(values.taxRate)).dotDivide(bignumber(100)).add(bignumber(1)).done(); // 是否含税
 
-                  if (s.goodsListState.isTaxIncluded) {
-                    var lineAmountExcludeTax = chain$1(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
-                    var priceExcludeTax = good.priceIncludeTax ? chain$1(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined;
-                    good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
-                    good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber()) : undefined) || undefined;
-                  } else {
-                    var lineAmountIncludeTax = chain$1(bignumber(good.lineAmountExcludeTax)).multiply(taxRate).done();
-                    var priceIncludeTax = good.priceExcludeTax ? chain$1(bignumber(good.priceExcludeTax)).multiply(taxRate).done() : undefined;
-                    good.lineAmountIncludeTax = lineAmountIncludeTax.toNumber().toFixed(2);
-                    good.priceIncludeTax = (priceIncludeTax ? format15(priceIncludeTax.toNumber()) : undefined) || undefined;
-                  }
+                  var lineAmountExcludeTax = chain$1(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
+                  var priceExcludeTax = good.priceIncludeTax ? chain$1(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined;
+                  good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
+                  good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber()) : undefined) || undefined; // if (s.goodsListState.isTaxIncluded) {
+                  //   const lineAmountExcludeTax = chain(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
+                  //   const priceExcludeTax = good.priceIncludeTax ? chain(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined
+                  //   good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
+                  //   good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber()) : undefined) || undefined;
+                  // } else {
+                  //   const lineAmountIncludeTax = chain(bignumber(good.lineAmountExcludeTax)).multiply(taxRate).done();
+                  //   const priceIncludeTax = good.priceExcludeTax ? chain(bignumber(good.priceExcludeTax)).multiply(taxRate).done() : undefined
+                  //   good.lineAmountIncludeTax = lineAmountIncludeTax.toNumber().toFixed(2);
+                  //   good.priceIncludeTax = (priceIncludeTax ? format15(priceIncludeTax.toNumber()) : undefined) || undefined;
+                  // }
 
                   good.taxAmount = countTaxAmount(good.lineAmountIncludeTax || 0, s.goodsListState.deduction, values.taxRate);
                 }); //截取名称
@@ -12125,8 +13025,8 @@ var DrawerBody$3 = function DrawerBody(props) {
     FormEffectHooks.onFieldValueChange$('taxRate').subscribe(function (e) {
       setTaxRate(e.value);
       actions.setFieldState('taxFreeType', /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12(s) {
-          return regeneratorRuntime.wrap(function _callee12$(_context12) {
+        var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(s) {
+          return _regeneratorRuntime().wrap(function _callee12$(_context12) {
             while (1) {
               switch (_context12.prev = _context12.next) {
                 case 0:
@@ -12149,8 +13049,8 @@ var DrawerBody$3 = function DrawerBody(props) {
     FormEffectHooks.onFieldValueChange$('favouredPolicyMark').subscribe(function (e) {
       setFavouredPolicyMark(e.value);
       actions.setFieldState('favouredPolicyName', /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13(s) {
-          return regeneratorRuntime.wrap(function _callee13$(_context13) {
+        var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(s) {
+          return _regeneratorRuntime().wrap(function _callee13$(_context13) {
             while (1) {
               switch (_context13.prev = _context13.next) {
                 case 0:
@@ -12254,8 +13154,8 @@ var DrawerBody$3 = function DrawerBody(props) {
   }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       controller.pipeline( /*#__PURE__*/function () {
-        var _ref14 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14(s) {
-          return regeneratorRuntime.wrap(function _callee14$(_context14) {
+        var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
+          return _regeneratorRuntime().wrap(function _callee14$(_context14) {
             while (1) {
               switch (_context14.prev = _context14.next) {
                 case 0:
@@ -12293,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:
     /** 控制器 */
@@ -12350,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);
 };
 
@@ -12393,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 };