kts-component-invoice-operate 3.1.13 → 3.1.15

package/dist/index.js

@@ -945,7 +945,7 @@ var InvoiceControllerState = /*#__PURE__*/_createClass(function InvoiceControlle
   this.invoiceType = '08';
   this.buyerState = new BuyerState();
   this.goodsListState = new GoodsListState();
-  this.calculating = void 0;
+  this.calculatingField = void 0;
   this.calculatingDigits = void 0;
   this.priceIntegerDigit = void 0;
   this.rootElement = null;
@@ -1297,7 +1297,7 @@ var saveEditGood = /*#__PURE__*/(function () {
         case 0:
           editGood = state.goodsListState.editGood;
           form = state.goodsListState.form;
-          if (!(!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculating)) {
+          if (!(!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField)) {
             _context.next = 4;
             break;
           }
@@ -2337,39 +2337,6 @@ var evaluate = (function (expr) {
   return parseFloat(math.evaluate(expr).toFixed(fractionDigits));
 });
 
-/** 拆分全称加简称 */
-var getSN = function getSN(value) {
-  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);
-};
-
 //! moment.js
 //! version : 2.29.4
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -8090,7 +8057,7 @@ var clearCalculatingField = /*#__PURE__*/function () {
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
-                    return _context.abrupt("return", s.calculating = '');
+                    return _context.abrupt("return", s.calculatingField = '');
                   case 1:
                   case "end":
                     return _context.stop();
@@ -8155,7 +8122,7 @@ var onChangeQuantity = lazyFn(function (controller, form, record) {
             });
             // 是否含税
             if (!controller.state.goodsListState.isTaxIncluded) {
-              _context3.next = 35;
+              _context3.next = 36;
               break;
             }
             if (!(!err.priceIncludeTax && values.priceIncludeTax)) {
@@ -8191,13 +8158,14 @@ var onChangeQuantity = lazyFn(function (controller, form, record) {
               priceIncludeTax: _priceIncludeTax
             });
           case 32:
-            // 更新不含税
-            updateUnitPriceExcludingTax(controller, form);
-            _context3.next = 50;
+            _context3.next = 34;
+            return updateUnitPriceExcludingTax(controller, form, record);
+          case 34:
+            _context3.next = 52;
             break;
-          case 35:
+          case 36:
             if (!(!err.priceExcludeTax && values.priceExcludeTax)) {
-              _context3.next = 43;
+              _context3.next = 44;
               break;
             }
             priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
@@ -8205,17 +8173,17 @@ var onChangeQuantity = lazyFn(function (controller, form, record) {
             form.setFieldsValue({
               lineAmountExcludeTax: lineAmountExcludeTax
             });
-            _context3.next = 41;
+            _context3.next = 42;
             return controller.setEditGood({
               lineAmountExcludeTax: lineAmountExcludeTax,
               quantity: quantity
             });
-          case 41:
-            _context3.next = 49;
+          case 42:
+            _context3.next = 50;
             break;
-          case 43:
+          case 44:
             if (!(!err.lineAmountExcludeTax && values.lineAmountExcludeTax)) {
-              _context3.next = 49;
+              _context3.next = 50;
               break;
             }
             _lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
@@ -8223,18 +8191,18 @@ var onChangeQuantity = lazyFn(function (controller, form, record) {
             form.setFieldsValue({
               priceExcludeTax: _priceExcludeTax
             });
-            _context3.next = 49;
+            _context3.next = 50;
             return controller.setEditGood({
               priceExcludeTax: _priceExcludeTax,
               quantity: quantity
             });
-          case 49:
-            // 更新含税
-            updateUnitPriceTax(controller, form);
           case 50:
             _context3.next = 52;
-            return clearCalculatingField(controller);
+            return updateUnitPriceTax(controller, form, record);
           case 52:
+            _context3.next = 54;
+            return clearCalculatingField(controller);
+          case 54:
           case "end":
             return _context3.stop();
         }
@@ -8320,12 +8288,12 @@ var onChangePriceIncludeTax = lazyFn(function (controller, form, record) {
               quantity: _quantity
             });
           case 30:
-            // 更新不含税
-            updateUnitPriceExcludingTax(controller, form);
-            // 清楚 计算中启动字段
-            _context4.next = 33;
+            _context4.next = 32;
+            return updateUnitPriceExcludingTax(controller, form, record);
+          case 32:
+            _context4.next = 34;
             return clearCalculatingField(controller);
-          case 33:
+          case 34:
           case "end":
             return _context4.stop();
         }
@@ -8411,12 +8379,12 @@ var onChangePriceExcludeTax = lazyFn(function (controller, form, record) {
               quantity: _quantity2
             });
           case 30:
-            // 更新含税
-            updateUnitPriceTax(controller, form);
-            // 清楚 计算中启动字段
-            _context5.next = 33;
+            _context5.next = 32;
+            return updateUnitPriceTax(controller, form, record);
+          case 32:
+            _context5.next = 34;
             return clearCalculatingField(controller);
-          case 33:
+          case 34:
           case "end":
             return _context5.stop();
         }
@@ -8437,7 +8405,7 @@ var onChangeLineAmountIncludeTax = lazyFn(function (controller, form, record) {
           case 0:
             err = err || {};
             if (!(promptErr(err.lineAmountIncludeTax) || !values.lineAmountIncludeTax)) {
-              _context6.next = 8;
+              _context6.next = 9;
               break;
             }
             _context6.next = 4;
@@ -8446,25 +8414,27 @@ var onChangeLineAmountIncludeTax = lazyFn(function (controller, form, record) {
               lineAmountExcludeTax: undefined
             });
           case 4:
-            updateUnitPriceExcludingTax(controller, form);
-            _context6.next = 7;
+            _context6.next = 6;
+            return updateUnitPriceExcludingTax(controller, form, record);
+          case 6:
+            _context6.next = 8;
             return clearCalculatingField(controller);
-          case 7:
-            return _context6.abrupt("return");
           case 8:
+            return _context6.abrupt("return");
+          case 9:
             calculatingDigits = controller.state.calculatingDigits;
             lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
-            _context6.next = 12;
+            _context6.next = 13;
             return controller.setEditGood({
               lineAmountIncludeTax: lineAmountIncludeTax
             });
-          case 12:
+          case 13:
             form.setFieldsValue({
               lineAmountIncludeTax: lineAmountIncludeTax
             });
             // 是否有数量
             if (!(!err.quantity && values.quantity)) {
-              _context6.next = 21;
+              _context6.next = 22;
               break;
             }
             quantity = format15(values.quantity, calculatingDigits);
@@ -8472,16 +8442,16 @@ var onChangeLineAmountIncludeTax = lazyFn(function (controller, form, record) {
             form.setFieldsValue({
               priceIncludeTax: priceIncludeTax
             });
-            _context6.next = 19;
+            _context6.next = 20;
             return controller.setEditGood({
               priceIncludeTax: priceIncludeTax
             });
-          case 19:
-            _context6.next = 27;
+          case 20:
+            _context6.next = 28;
             break;
-          case 21:
+          case 22:
             if (!(!err.priceIncludeTax && (values.priceIncludeTax || values.priceIncludeTax === 0))) {
-              _context6.next = 27;
+              _context6.next = 28;
               break;
             }
             _priceIncludeTax2 = format15(values.priceIncludeTax, calculatingDigits);
@@ -8489,17 +8459,17 @@ var onChangeLineAmountIncludeTax = lazyFn(function (controller, form, record) {
             form.setFieldsValue({
               quantity: _quantity3
             });
-            _context6.next = 27;
+            _context6.next = 28;
             return controller.setEditGood({
               quantity: _quantity3
             });
-          case 27:
-            // 更新不含税
-            updateUnitPriceExcludingTax(controller, form);
-            // 清楚 计算中启动字段
+          case 28:
             _context6.next = 30;
-            return clearCalculatingField(controller);
+            return updateUnitPriceExcludingTax(controller, form, record);
           case 30:
+            _context6.next = 32;
+            return clearCalculatingField(controller);
+          case 32:
           case "end":
             return _context6.stop();
         }
@@ -8520,7 +8490,7 @@ var onChangeLineAmountExcludeTax = lazyFn(function (controller, form, record) {
           case 0:
             err = err || {};
             if (!(promptErr(err.lineAmountExcludeTax) || !values.lineAmountExcludeTax)) {
-              _context7.next = 8;
+              _context7.next = 9;
               break;
             }
             _context7.next = 4;
@@ -8529,25 +8499,27 @@ var onChangeLineAmountExcludeTax = lazyFn(function (controller, form, record) {
               lineAmountExcludeTax: undefined
             });
           case 4:
-            updateUnitPriceTax(controller, form);
-            _context7.next = 7;
+            _context7.next = 6;
+            return updateUnitPriceTax(controller, form, record);
+          case 6:
+            _context7.next = 8;
             return clearCalculatingField(controller);
-          case 7:
-            return _context7.abrupt("return");
           case 8:
+            return _context7.abrupt("return");
+          case 9:
             calculatingDigits = controller.state.calculatingDigits;
             lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
-            _context7.next = 12;
+            _context7.next = 13;
             return controller.setEditGood({
               lineAmountExcludeTax: lineAmountExcludeTax
             });
-          case 12:
+          case 13:
             form.setFieldsValue({
               lineAmountExcludeTax: lineAmountExcludeTax
             });
             // 是否有数量
             if (!(!err.quantity && values.quantity)) {
-              _context7.next = 21;
+              _context7.next = 22;
               break;
             }
             quantity = format15(values.quantity, calculatingDigits);
@@ -8555,16 +8527,16 @@ var onChangeLineAmountExcludeTax = lazyFn(function (controller, form, record) {
             form.setFieldsValue({
               priceExcludeTax: priceExcludeTax
             });
-            _context7.next = 19;
+            _context7.next = 20;
             return controller.setEditGood({
               priceExcludeTax: priceExcludeTax
             });
-          case 19:
-            _context7.next = 27;
+          case 20:
+            _context7.next = 28;
             break;
-          case 21:
+          case 22:
             if (!(!err.priceExcludeTax && values.priceExcludeTax)) {
-              _context7.next = 27;
+              _context7.next = 28;
               break;
             }
             _priceExcludeTax2 = format15(values.priceExcludeTax, calculatingDigits);
@@ -8572,17 +8544,17 @@ var onChangeLineAmountExcludeTax = lazyFn(function (controller, form, record) {
             form.setFieldsValue({
               quantity: _quantity4
             });
-            _context7.next = 27;
+            _context7.next = 28;
             return controller.setEditGood({
               quantity: _quantity4
             });
-          case 27:
-            // 更新含税
-            updateUnitPriceTax(controller, form);
-            // 清楚 计算中启动字段
+          case 28:
             _context7.next = 30;
-            return clearCalculatingField(controller);
+            return updateUnitPriceTax(controller, form, record);
           case 30:
+            _context7.next = 32;
+            return clearCalculatingField(controller);
+          case 32:
           case "end":
             return _context7.stop();
         }
@@ -8626,15 +8598,22 @@ var onChangeTaxRate = lazyFn(function (controller, form, record) {
               }
             })();
             // 是否含税
-            if (controller.state.goodsListState.isTaxIncluded) {
-              updateUnitPriceExcludingTax(controller, form);
-            } else {
-              updateUnitPriceTax(controller, form);
+            if (!controller.state.goodsListState.isTaxIncluded) {
+              _context8.next = 12;
+              break;
             }
-            // 清楚 计算中启动字段
             _context8.next = 10;
-            return clearCalculatingField(controller);
+            return updateUnitPriceExcludingTax(controller, form, record);
           case 10:
+            _context8.next = 14;
+            break;
+          case 12:
+            _context8.next = 14;
+            return updateUnitPriceTax(controller, form, record);
+          case 14:
+            _context8.next = 16;
+            return clearCalculatingField(controller);
+          case 16:
           case "end":
             return _context8.stop();
         }
@@ -8675,265 +8654,307 @@ function dutyFree(controller, taxRate, form, record) {
   }
 }
 /** 含税 => 更新(不含税) */
-var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controller, form, record) {
-  form.validateFields( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(err, values) {
-      var taxAmount, lineAmountExcludeTax, priceExcludeTax, deduction;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            err = err || {};
-            /** 税额 */
-            /** 扣除额 */
-            deduction = controller.state.goodsListState.deduction; // 计算税额
-            if (!promptErr(err.lineAmountIncludeTax) && !promptErr(err.taxRate)) {
-              taxAmount = countTaxAmount(values.lineAmountIncludeTax, deduction, values.taxRate);
-            }
-            _context9.next = 5;
-            return controller.setEditGood({
-              taxAmount: taxAmount
-            });
-          case 5:
-            // 计算 金额(不含税)
-            if ((taxAmount || taxAmount === 0) && !promptErr(err.lineAmountIncludeTax)) {
-              lineAmountExcludeTax = countAmountExcludeTax(values.lineAmountIncludeTax, taxAmount);
-            }
-            form.setFieldsValue({
-              lineAmountExcludeTax: lineAmountExcludeTax
-            });
-            _context9.next = 9;
-            return controller.setEditGood({
-              lineAmountExcludeTax: lineAmountExcludeTax
-            });
-          case 9:
-            // 单价(不含税)
-            if (lineAmountExcludeTax && !promptErr(err.quantity)) {
-              priceExcludeTax = countPrice(lineAmountExcludeTax, values.quantity, controller.state.calculatingDigits);
-            }
-            form.setFieldsValue({
-              priceExcludeTax: priceExcludeTax
-            });
-            _context9.next = 13;
-            return controller.setEditGood({
-              priceExcludeTax: priceExcludeTax
-            });
-          case 13:
-          case "end":
-            return _context9.stop();
-        }
-      }, _callee9);
-    }));
-    return function (_x15, _x16) {
-      return _ref9.apply(this, arguments);
-    };
-  }());
-};
+var updateUnitPriceExcludingTax = /*#__PURE__*/function () {
+  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(controller, form, record) {
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
+        case 0:
+          return _context10.abrupt("return", new Promise(function (resolve) {
+            form.validateFields( /*#__PURE__*/function () {
+              var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(err, values) {
+                var taxAmount, lineAmountExcludeTax, priceExcludeTax, deduction;
+                return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+                  while (1) switch (_context9.prev = _context9.next) {
+                    case 0:
+                      err = err || {};
+                      /** 税额 */
+                      /** 扣除额 */
+                      deduction = controller.state.goodsListState.deduction; // 计算税额
+                      if (!promptErr(err.lineAmountIncludeTax) && !promptErr(err.taxRate)) {
+                        taxAmount = countTaxAmount(values.lineAmountIncludeTax, deduction, values.taxRate);
+                      }
+                      _context9.next = 5;
+                      return controller.setEditGood({
+                        taxAmount: taxAmount
+                      });
+                    case 5:
+                      // 计算 金额(不含税)
+                      if ((taxAmount || taxAmount === 0) && !promptErr(err.lineAmountIncludeTax)) {
+                        lineAmountExcludeTax = countAmountExcludeTax(values.lineAmountIncludeTax, taxAmount);
+                      }
+                      form.setFieldsValue({
+                        lineAmountExcludeTax: lineAmountExcludeTax
+                      });
+                      _context9.next = 9;
+                      return controller.setEditGood({
+                        lineAmountExcludeTax: lineAmountExcludeTax
+                      });
+                    case 9:
+                      // 单价(不含税)
+                      if (lineAmountExcludeTax && !promptErr(err.quantity)) {
+                        priceExcludeTax = countPrice(lineAmountExcludeTax, values.quantity, controller.state.calculatingDigits);
+                      }
+                      form.setFieldsValue({
+                        priceExcludeTax: priceExcludeTax
+                      });
+                      _context9.next = 13;
+                      return controller.setEditGood({
+                        priceExcludeTax: priceExcludeTax
+                      });
+                    case 13:
+                    case "end":
+                      return _context9.stop();
+                  }
+                }, _callee9);
+              }));
+              return function (_x18, _x19) {
+                return _ref10.apply(this, arguments);
+              };
+            }());
+            resolve(undefined);
+          }));
+        case 1:
+        case "end":
+          return _context10.stop();
+      }
+    }, _callee10);
+  }));
+  return function updateUnitPriceExcludingTax(_x15, _x16, _x17) {
+    return _ref9.apply(this, arguments);
+  };
+}();
 /** 不含税 => 更新(含税) */
-var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
-  form.validateFields( /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(err, values) {
-      var calculatingDigits, lineAmountExcludeTax, lineAmountIncludeTax, priceIncludeTax, taxAmount;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
-          case 0:
-            err = err || {};
-            if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !promptErr(err.lineAmountExcludeTax) && (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0))) {
-              _context10.next = 17;
-              break;
-            }
-            calculatingDigits = controller.state.calculatingDigits; // 金额（含税）= 金额（不含税）* (1+ 税率)
-            lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
-            lineAmountIncludeTax = format2(evaluate("".concat(lineAmountExcludeTax, " * (1+(").concat(values.taxRate, "/100))")));
-            _context10.next = 7;
-            return controller.setEditGood({
-              lineAmountIncludeTax: lineAmountIncludeTax
-            });
-          case 7:
-            if (!(!err.quantity && values.quantity)) {
-              _context10.next = 11;
-              break;
-            }
-            priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(values.quantity)), calculatingDigits);
-            _context10.next = 11;
-            return controller.setEditGood({
-              priceIncludeTax: priceIncludeTax
-            });
-          case 11:
-            // 税额 = 金额(含税)-金额(不含税)
-            taxAmount = evaluate("".concat(lineAmountIncludeTax, " - ").concat(lineAmountExcludeTax));
-            form.setFieldsValue({
-              taxAmount: taxAmount
-            });
-            _context10.next = 15;
-            return controller.setEditGood({
-              taxAmount: taxAmount
-            });
-          case 15:
-            _context10.next = 20;
-            break;
-          case 17:
-            form.setFieldsValue({
-              taxAmount: undefined
-            });
-            _context10.next = 20;
-            return controller.setEditGood({
-              taxAmount: undefined
-            });
-          case 20:
-          case "end":
-            return _context10.stop();
-        }
-      }, _callee10);
-    }));
-    return function (_x17, _x18) {
-      return _ref10.apply(this, arguments);
-    };
-  }());
-};
+var updateUnitPriceTax = /*#__PURE__*/function () {
+  var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(controller, form, record) {
+    return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+      while (1) switch (_context12.prev = _context12.next) {
+        case 0:
+          return _context12.abrupt("return", new Promise(function (resolve) {
+            form.validateFields( /*#__PURE__*/function () {
+              var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(err, values) {
+                var calculatingDigits, lineAmountExcludeTax, lineAmountIncludeTax, priceIncludeTax, taxAmount;
+                return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                  while (1) switch (_context11.prev = _context11.next) {
+                    case 0:
+                      err = err || {};
+                      if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !promptErr(err.lineAmountExcludeTax) && (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0))) {
+                        _context11.next = 17;
+                        break;
+                      }
+                      calculatingDigits = controller.state.calculatingDigits; // 金额（含税）= 金额（不含税）* (1+ 税率)
+                      lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
+                      lineAmountIncludeTax = format2(evaluate("".concat(lineAmountExcludeTax, " * (1+(").concat(values.taxRate, "/100))")));
+                      _context11.next = 7;
+                      return controller.setEditGood({
+                        lineAmountIncludeTax: lineAmountIncludeTax
+                      });
+                    case 7:
+                      if (!(!err.quantity && values.quantity)) {
+                        _context11.next = 11;
+                        break;
+                      }
+                      priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(values.quantity)), calculatingDigits);
+                      _context11.next = 11;
+                      return controller.setEditGood({
+                        priceIncludeTax: priceIncludeTax
+                      });
+                    case 11:
+                      // 税额 = 金额(含税)-金额(不含税)
+                      taxAmount = evaluate("".concat(lineAmountIncludeTax, " - ").concat(lineAmountExcludeTax));
+                      form.setFieldsValue({
+                        taxAmount: taxAmount
+                      });
+                      _context11.next = 15;
+                      return controller.setEditGood({
+                        taxAmount: taxAmount
+                      });
+                    case 15:
+                      _context11.next = 20;
+                      break;
+                    case 17:
+                      form.setFieldsValue({
+                        taxAmount: undefined
+                      });
+                      _context11.next = 20;
+                      return controller.setEditGood({
+                        taxAmount: undefined
+                      });
+                    case 20:
+                      // 单价(含税) = 单价(不含税) * (1+税率)
+                      // if (
+                      //   !err.taxRat &&
+                      //   (values.taxRate || values.taxRate === 0) &&
+                      //   !promptErr(err.priceExcludeTax) &&
+                      //   (values.priceExcludeTax || values.priceExcludeTax === 0)
+                      // ) {
+                      //   const priceExcludeTax = format15(values.priceExcludeTax);
+                      //   const priceIncludeTax = format15(evaluate(`${priceExcludeTax} * (1+(${values.taxRate}/100))`));
+                      //   await controller.setEditGood({ priceIncludeTax });
+                      // }
+                      resolve(undefined);
+                    case 21:
+                    case "end":
+                      return _context11.stop();
+                  }
+                }, _callee11);
+              }));
+              return function (_x23, _x24) {
+                return _ref12.apply(this, arguments);
+              };
+            }());
+          }));
+        case 1:
+        case "end":
+          return _context12.stop();
+      }
+    }, _callee12);
+  }));
+  return function updateUnitPriceTax(_x20, _x21, _x22) {
+    return _ref11.apply(this, arguments);
+  };
+}();
 /** 单调赋码 */
 var endowCode = /*#__PURE__*/function () {
-  var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(controller, goods) {
-    return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-      while (1) switch (_context13.prev = _context13.next) {
+  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(controller, goods) {
+    return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+      while (1) switch (_context15.prev = _context15.next) {
         case 0:
-          _context13.next = 2;
+          _context15.next = 2;
           return controller.wait();
         case 2:
-          _context13.next = 4;
+          _context15.next = 4;
           return controller.saveEditGood();
         case 4:
-          _context13.next = 6;
+          _context15.next = 6;
           return controller.pipeline( /*#__PURE__*/function () {
-            var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(s) {
+            var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
               var _s$goodsListState$edi;
               var err, key, g, i;
-              return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-                while (1) switch (_context12.prev = _context12.next) {
+              return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+                while (1) switch (_context14.prev = _context14.next) {
                   case 0:
                     if (!(s.goodsListState.form && ((_s$goodsListState$edi = s.goodsListState.editGood) === null || _s$goodsListState$edi === void 0 ? void 0 : _s$goodsListState$edi.$index) === (goods === null || goods === void 0 ? void 0 : goods.$index))) {
-                      _context12.next = 11;
+                      _context14.next = 11;
                       break;
                     }
                     err = s.goodsListState.form.getFieldsError();
-                    _context12.t0 = _regeneratorRuntime().keys(err);
+                    _context14.t0 = _regeneratorRuntime().keys(err);
                   case 3:
-                    if ((_context12.t1 = _context12.t0()).done) {
-                      _context12.next = 11;
+                    if ((_context14.t1 = _context14.t0()).done) {
+                      _context14.next = 11;
                       break;
                     }
-                    key = _context12.t1.value;
+                    key = _context14.t1.value;
                     if (err[key]) {
-                      _context12.next = 7;
+                      _context14.next = 7;
                       break;
                     }
-                    return _context12.abrupt("continue", 3);
+                    return _context14.abrupt("continue", 3);
                   case 7:
                     ktsComponentsAntdX3.message.error(err[key][0]);
-                    return _context12.abrupt("return");
+                    return _context14.abrupt("return");
                   case 11:
                     g = s.goodsListState.goodsMap.get(goods.$index);
                     i = s.goodsListState.goodsList.indexOf(g);
-                    _context12.t2 = goods.lineAttribute;
-                    _context12.next = _context12.t2 === LineAttributeType$1.正常 ? 16 : _context12.t2 === LineAttributeType$1.折扣行 ? 18 : _context12.t2 === LineAttributeType$1.被折扣行 ? 20 : 22;
+                    _context14.t2 = goods.lineAttribute;
+                    _context14.next = _context14.t2 === LineAttributeType$1.正常 ? 16 : _context14.t2 === LineAttributeType$1.折扣行 ? 18 : _context14.t2 === LineAttributeType$1.被折扣行 ? 20 : 22;
                     break;
                   case 16:
                     s.goodsListState.endowCode.endowcodeGoodIndex = [goods.$index];
-                    return _context12.abrupt("break", 22);
+                    return _context14.abrupt("break", 22);
                   case 18:
                     s.goodsListState.endowCode.endowcodeGoodIndex = [goods.$index, s.goodsListState.goodsList[i - 1].$index];
-                    return _context12.abrupt("break", 22);
+                    return _context14.abrupt("break", 22);
                   case 20:
                     s.goodsListState.endowCode.endowcodeGoodIndex = [goods.$index, s.goodsListState.goodsList[i + 1].$index];
-                    return _context12.abrupt("break", 22);
+                    return _context14.abrupt("break", 22);
                   case 22:
                   case "end":
-                    return _context12.stop();
+                    return _context14.stop();
                 }
-              }, _callee12);
+              }, _callee14);
             }));
-            return function (_x23) {
-              return _ref13.apply(this, arguments);
+            return function (_x29) {
+              return _ref15.apply(this, arguments);
             };
           }())();
         case 6:
         case "end":
-          return _context13.stop();
+          return _context15.stop();
       }
-    }, _callee13);
+    }, _callee15);
   }));
-  return function endowCode(_x21, _x22) {
-    return _ref12.apply(this, arguments);
+  return function endowCode(_x27, _x28) {
+    return _ref14.apply(this, arguments);
   };
 }();
 /** 修改了 项目名称 */
 var onChangeItemName = /*#__PURE__*/function () {
-  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(controller, form, record) {
-    return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-      while (1) switch (_context15.prev = _context15.next) {
+  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(controller, form, record) {
+    return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+      while (1) switch (_context17.prev = _context17.next) {
         case 0:
           controller.run( /*#__PURE__*/function () {
-            var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
-              var _getSN$shorthand, _getSN;
-              var value, shorthand;
-              return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-                while (1) switch (_context14.prev = _context14.next) {
+            var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(s) {
+              var value;
+              return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+                while (1) switch (_context16.prev = _context16.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) {
-                      _context14.next = 11;
+                      _context16.next = 10;
                       break;
                     }
-                    _context14.next = 5;
+                    _context16.next = 4;
                     return controller.setEditGood({
                       itemNameSelf: value
                     });
-                  case 5:
-                    _context14.t0 = record.itemName;
-                    if (!_context14.t0) {
-                      _context14.next = 9;
+                  case 4:
+                    _context16.t0 = record.itemName;
+                    if (!_context16.t0) {
+                      _context16.next = 8;
                       break;
                     }
-                    _context14.next = 9;
+                    _context16.next = 8;
                     return controller.setEditGood({
-                      itemName: setShorthand(record.itemName, shorthand)
+                      itemName: record.itemName
                     });
-                  case 9:
-                    _context14.next = 17;
+                  case 8:
+                    _context16.next = 16;
                     break;
-                  case 11:
-                    _context14.next = 13;
+                  case 10:
+                    _context16.next = 12;
                     return controller.setEditGood({
                       itemName: value
                     });
-                  case 13:
-                    _context14.t1 = record.itemNameSelf;
-                    if (!_context14.t1) {
-                      _context14.next = 17;
+                  case 12:
+                    _context16.t1 = record.itemNameSelf;
+                    if (!_context16.t1) {
+                      _context16.next = 16;
                       break;
                     }
-                    _context14.next = 17;
+                    _context16.next = 16;
                     return controller.setEditGood({
-                      itemNameSelf: setShorthand(record.itemNameSelf, shorthand)
+                      itemNameSelf: record.itemNameSelf
                     });
-                  case 17:
+                  case 16:
                   case "end":
-                    return _context14.stop();
+                    return _context16.stop();
                 }
-              }, _callee14);
+              }, _callee16);
             }));
-            return function (_x27) {
-              return _ref15.apply(this, arguments);
+            return function (_x33) {
+              return _ref17.apply(this, arguments);
             };
           }());
         case 1:
         case "end":
-          return _context15.stop();
+          return _context17.stop();
       }
-    }, _callee15);
+    }, _callee17);
   }));
-  return function onChangeItemName(_x24, _x25, _x26) {
-    return _ref14.apply(this, arguments);
+  return function onChangeItemName(_x30, _x31, _x32) {
+    return _ref16.apply(this, arguments);
   };
 }();
 
@@ -9073,40 +9094,50 @@ var css_248z$6 = ".kts-invoice-operate-goods-list-itemName-input {\n  display: f
 styleInject(css_248z$6);
 
 function ItemNameInput(props) {
-  var _getShorthand = getShorthand(props.value),
-    shorthand = _getShorthand.shorthand,
-    fullName = _getShorthand.fullName;
   var onChange = React__default['default'].useCallback(function (e) {
     var event = _objectSpread2({}, e);
-    event.target.value = shorthand ? "*".concat(shorthand, "*").concat(e.target.value) : e.target.value;
     props.onChange && props.onChange(event);
   }, []);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'kts-invoice-operate-goods-list-itemName-input'
-  }, shorthand && /*#__PURE__*/React__default['default'].createElement("span", {
+  }, props.shorthand && /*#__PURE__*/React__default['default'].createElement("span", {
     style: {
       alignSelf: 'center',
       fontSize: 12
     }
-  }, "*", shorthand, "*"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Input, {
+  }, "*", props.shorthand, "*"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Input, {
     style: {
       height: '100%',
       border: 'none'
     },
-    value: fullName,
+    value: props.value,
     onChange: onChange
   }));
 }
-/** 提取简称 */
-var getShorthand = function getShorthand(value) {
-  if (!value) return {};
+
+/** 拆分全称加简称 */
+var getSN = function getSN(value) {
+  if (!value) return undefined;
   var arr = value.match(/\*[^*]+\*/);
-  var shorthand = arr ? arr[0].split('*')[1] : '';
-  var fullName = shorthand ? value.replace("*".concat(shorthand, "*"), '') : value;
-  return {
-    shorthand: shorthand,
-    fullName: fullName
-  };
+  if (arr && arr[0]) {
+    return {
+      shorthand: arr[0].split('*')[1],
+      full: value.replace(arr[0], '')
+    };
+  } else {
+    return {
+      shorthand: undefined,
+      full: value
+    };
+  }
+};
+/** 组合全称加简称 */
+var getItemNameWithShorthand = function getItemNameWithShorthand(value) {
+  if (value.shorthand) {
+    return "*".concat(value.shorthand, "*").concat(value.full);
+  } else {
+    return value.full;
+  }
 };
 
 var useColumns = (function (form) {
@@ -9151,7 +9182,7 @@ var useColumns = (function (form) {
   }, []);
   /** 计算中启动字段 */
   var changeField = controller.useMemo(function (e) {
-    return e.calculating;
+    return e.calculatingField;
   }, []);
   /** 计算中启动字段 */
   var setChangeField = React__default['default'].useCallback(function (value) {
@@ -9160,7 +9191,7 @@ var useColumns = (function (form) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              s.calculating = value;
+              s.calculatingField = value;
             case 1:
             case "end":
               return _context.stop();
@@ -9248,6 +9279,7 @@ var useColumns = (function (form) {
               }()
             }])
           })( /*#__PURE__*/React__default['default'].createElement(ItemNameInput, {
+            shorthand: editGood.shorthand,
             onChange: function onChange() {
               onChangeItemName(controller, form, record);
             }
@@ -9277,8 +9309,14 @@ var useColumns = (function (form) {
           })))));
         } else {
           return /*#__PURE__*/React__default['default'].createElement(MyItemNameDiv, {
-            valueT: formatSearch(record.itemNameSelf, searchValue),
-            valueF: formatSearch(record.itemName, searchValue),
+            valueT: formatSearch(getItemNameWithShorthand({
+              shorthand: record.shorthand,
+              full: record.itemNameSelf || ''
+            }), searchValue),
+            valueF: formatSearch(getItemNameWithShorthand({
+              shorthand: record.shorthand,
+              full: record.itemName || ''
+            }), searchValue),
             isMyShow: isMyShow
           });
         }
@@ -11899,7 +11937,7 @@ var DrawerBody$2 = function DrawerBody() {
                     }
                     // 中间数据
                     between = _objectSpread2({}, record);
-                    between.itemName = getItemName$1(record, s.goodsListState.editGood);
+                    between.itemName = getItemName(record, s.goodsListState.editGood);
                     between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
                     // 设置编辑货物
                     editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
@@ -11925,8 +11963,19 @@ var DrawerBody$2 = function DrawerBody() {
                       s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood));
                     }
                     s.goodsListState.importGoods.isVisibleDrawer = false;
-                    s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
-                  case 19:
+                    if (!s.goodsListState.isTaxIncluded) {
+                      _context2.next = 23;
+                      break;
+                    }
+                    _context2.next = 21;
+                    return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
+                  case 21:
+                    _context2.next = 25;
+                    break;
+                  case 23:
+                    _context2.next = 25;
+                    return updateUnitPriceTax(controller, s.goodsListState.form, record);
+                  case 25:
                   case "end":
                     return _context2.stop();
                 }
@@ -11954,27 +12003,26 @@ var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigit
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);
 };
 // 获取我方名称
-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.itemName)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand;
-  if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemNameSelf);
-  }
+var getItemName = function getItemName(record, editGood) {
+  // let shorthand;
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemName}`;
+  // }
+  // shorthand = getSN(editGood.itemName)?.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
   return record.itemName;
 };
 // 获取他方名称
 var getItemNameOther = function getItemNameOther(record, editGood) {
-  if (!editGood.itemName) return editGood.itemName;
-  var shorthand;
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemNameSelf);
-  }
+  // if (!editGood.itemName) return editGood.itemName;
+  // let shorthand;
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
   return record.itemName;
 };
 
@@ -12424,8 +12472,7 @@ var DrawerBody$3 = function DrawerBody(props) {
               }); // 赋码
               endowCodeGood.forEach(function (good) {
                 if (!good) return;
-                good.itemName = setShorthand(good.itemName, values.shorthand);
-                good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand);
+                good.shorthand = values.shorthand;
                 good.taxClassificationCode = values.taxClassificationCode;
                 good.taxRate = values.taxRate;
                 good.taxFreeType = values.taxFreeType;
@@ -12500,6 +12547,7 @@ var DrawerBody$3 = function DrawerBody(props) {
   }, [controller]);
   return /*#__PURE__*/React__default['default'].createElement(antd.SchemaForm, {
     actions: actions,
+    previewPlaceholder: " ",
     components: _objectSpread2(_objectSpread2({}, components), {}, {
       showSearch: !!controller.state.goodsListState.endowCode.getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch
     }),
@@ -12518,7 +12566,7 @@ var DrawerBody$3 = function DrawerBody(props) {
     name: "shorthand",
     type: "string",
     readOnly: true,
-    default: getShorthand$1(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.itemName),
+    default: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.shorthand,
     title: "\u5546\u54C1\u548C\u670D\u52A1\u5206\u7C7B\u7B80\u79F0"
   }), /*#__PURE__*/React__default['default'].createElement(antd.SchemaMarkupField, {
     name: "taxRate",
@@ -12610,16 +12658,6 @@ var components = {
   string: antdComponents.Input,
   number: antdComponents.NumberPicker
 };
-/** 提取简称 */
-var getShorthand$1 = function getShorthand(value) {
-  if (!value) return ' ';
-  var arr = value.match(/\*[^*]+\*/);
-  if (arr) {
-    return arr[0].split('*')[1];
-  } else {
-    return ' ';
-  }
-};
 
 function AddComparisonDrawer() {
   var _Form$useForm = ktsXui.Form.useForm(),