kts-component-invoice-operate 3.2.181-2 → 3.2.181-21

package/dist/index.js

@@ -1131,6 +1131,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.isAddDiscount = void 0;
   this.isAddRow = true;
   this.isRemRow = true;
+  this.isBatchRemRow = true;
   this.isTaxIncluded = true;
   this.calculateType = '3';
   this.isMyShow = false;
@@ -1190,6 +1191,10 @@ var BuyerState = /*#__PURE__*/_createClass(function BuyerState() {
     title: '公司名称',
     dataIndex: 'buyerName',
     key: 'buyerName'
+  }, {
+    title: '客户代码',
+    dataIndex: 'customerCode',
+    key: 'customerCode'
   }, {
     title: '纳税人识别号',
     dataIndex: 'buyerNo',
@@ -8497,12 +8502,70 @@ var clearCalculatingField = /*#__PURE__*/function () {
   };
 }();
 /** 数量改变了 */
+// export const onChangeQuantity = lazyFn(
+//   (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
+//     form.validateFields(async (err, values) => {
+//       err = err || {};
+//       if (!values.quantity && values.quantity !== 0) {
+//         await controller.setEditGood({ quantity: undefined });
+//         await clearCalculatingField(controller);
+//         return;
+//       }
+//       if (err.quantity) {
+//         await clearCalculatingField(controller);
+//         return
+//       };
+//       const calculatingDigits = controller.state.calculatingDigits;
+//       const quantity = format15(values.quantity, calculatingDigits);
+//       await controller.setEditGood({ quantity });
+//       form.setFieldsValue({ quantity });
+//       // 是否含税
+//       if (controller.state.goodsListState.isTaxIncluded) {
+//         // 含税
+//         if (!err.priceIncludeTax && values.priceIncludeTax) {
+//           // 可以找到 单价(含税)
+//           const priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
+//           const lineAmountIncludeTax = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
+//           form.setFieldsValue({ lineAmountIncludeTax });
+//           await controller.setEditGood({ lineAmountIncludeTax });
+//         } else if (!err.lineAmountIncludeTax && values.lineAmountIncludeTax) {
+//           // 可以找到 金额(含税)
+//           const lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
+//           const priceIncludeTax = format15(
+//             evaluate(`${lineAmountIncludeTax} / ${quantity}`),
+//             calculatingDigits);
+//           form.setFieldsValue({ priceIncludeTax });
+//           await controller.setEditGood({ priceIncludeTax });
+//         }
+//         // 更新不含税
+//         await updateUnitPriceExcludingTax(controller, form, record);
+//       } else {
+//         // 不含税
+//         if (!err.priceExcludeTax && values.priceExcludeTax) {
+//           const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
+//           const lineAmountExcludeTax = format2(evaluate(`${quantity} * ${priceExcludeTax}`));
+//           form.setFieldsValue({ lineAmountExcludeTax });
+//           await controller.setEditGood({ lineAmountExcludeTax, quantity });
+//         } else if (!err.lineAmountExcludeTax && values.lineAmountExcludeTax) {
+//           const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
+//           const priceExcludeTax = format15(evaluate(`${lineAmountExcludeTax} / ${quantity}`), calculatingDigits);
+//           form.setFieldsValue({ priceExcludeTax });
+//           await controller.setEditGood({ priceExcludeTax, quantity });
+//         }
+//         // 更新含税
+//         await updateUnitPriceTax(controller, form, record);
+//       }
+//       // 清楚 计算中启动字段
+//       await clearCalculatingField(controller);
+//     });
+//   },
+//   1000,
+// );
 
 var onChangeQuantity = lazyFn(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(err, values) {
-      var calculatingDigits, quantity, priceIncludeTax, lineAmountIncludeTax, _lineAmountIncludeTax, _priceIncludeTax, priceExcludeTax, lineAmountExcludeTax, _lineAmountExcludeTax, _priceExcludeTax;
-
+      var calculatingDigits, quantity, lineAmountIncludeTax, priceIncludeTax, lineAmountExcludeTax, priceExcludeTax;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
@@ -8541,113 +8604,69 @@ var onChangeQuantity = lazyFn(function (controller, form, record) {
             case 11:
               calculatingDigits = controller.state.calculatingDigits;
               quantity = format15(values.quantity, calculatingDigits);
-              _context3.next = 16;
+              _context3.next = 15;
               return controller.setEditGood({
                 quantity: quantity
               });
 
-            case 16:
+            case 15:
               form.setFieldsValue({
                 quantity: quantity
               }); // 是否含税
 
               if (!controller.state.goodsListState.isTaxIncluded) {
-                _context3.next = 36;
-                break;
-              }
-
-              if (!(!err.priceIncludeTax && values.priceIncludeTax)) {
-                _context3.next = 26;
+                _context3.next = 27;
                 break;
               }
 
-              // 可以找到 单价(含税)
-              priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
-              lineAmountIncludeTax = format2(evaluate("".concat(priceIncludeTax, " * ").concat(quantity)));
-              form.setFieldsValue({
-                lineAmountIncludeTax: lineAmountIncludeTax
-              });
-              _context3.next = 24;
-              return controller.setEditGood({
-                lineAmountIncludeTax: lineAmountIncludeTax
-              });
-
-            case 24:
-              _context3.next = 32;
-              break;
-
-            case 26:
               if (!(!err.lineAmountIncludeTax && values.lineAmountIncludeTax)) {
-                _context3.next = 32;
+                _context3.next = 23;
                 break;
               }
 
-              // 可以找到 金额(含税)
-              _lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
-              _priceIncludeTax = format15(evaluate("".concat(_lineAmountIncludeTax, " / ").concat(quantity)), calculatingDigits);
+              lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
+              priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(quantity)), 8);
               form.setFieldsValue({
-                priceIncludeTax: _priceIncludeTax
+                priceIncludeTax: priceIncludeTax
               });
-              _context3.next = 32;
+              _context3.next = 23;
               return controller.setEditGood({
-                priceIncludeTax: _priceIncludeTax
+                priceIncludeTax: priceIncludeTax
               });
 
-            case 32:
-              _context3.next = 34;
+            case 23:
+              _context3.next = 25;
               return updateUnitPriceExcludingTax(controller, form, record);
 
-            case 34:
-              _context3.next = 52;
-              break;
-
-            case 36:
-              if (!(!err.priceExcludeTax && values.priceExcludeTax)) {
-                _context3.next = 44;
-                break;
-              }
-
-              priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
-              lineAmountExcludeTax = format2(evaluate("".concat(quantity, " * ").concat(priceExcludeTax)));
-              form.setFieldsValue({
-                lineAmountExcludeTax: lineAmountExcludeTax
-              });
-              _context3.next = 42;
-              return controller.setEditGood({
-                lineAmountExcludeTax: lineAmountExcludeTax,
-                quantity: quantity
-              });
-
-            case 42:
-              _context3.next = 50;
+            case 25:
+              _context3.next = 35;
               break;
 
-            case 44:
+            case 27:
               if (!(!err.lineAmountExcludeTax && values.lineAmountExcludeTax)) {
-                _context3.next = 50;
+                _context3.next = 33;
                 break;
               }
 
-              _lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
-              _priceExcludeTax = format15(evaluate("".concat(_lineAmountExcludeTax, " / ").concat(quantity)), calculatingDigits);
+              lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
+              priceExcludeTax = format15(evaluate("".concat(lineAmountExcludeTax, " / ").concat(quantity)), 8);
               form.setFieldsValue({
-                priceExcludeTax: _priceExcludeTax
+                priceExcludeTax: priceExcludeTax
               });
-              _context3.next = 50;
+              _context3.next = 33;
               return controller.setEditGood({
-                priceExcludeTax: _priceExcludeTax,
-                quantity: quantity
+                priceExcludeTax: priceExcludeTax
               });
 
-            case 50:
-              _context3.next = 52;
+            case 33:
+              _context3.next = 35;
               return updateUnitPriceTax(controller, form, record);
 
-            case 52:
-              _context3.next = 54;
+            case 35:
+              _context3.next = 37;
               return clearCalculatingField(controller);
 
-            case 54:
+            case 37:
             case "end":
               return _context3.stop();
           }
@@ -8665,7 +8684,7 @@ var onChangeQuantity = lazyFn(function (controller, form, record) {
 var onChangePriceIncludeTax = lazyFn(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(err, values) {
-      var calculatingDigits, priceIncludeTax, quantity, lineAmountIncludeTax, _lineAmountIncludeTax2, _quantity;
+      var calculatingDigits, priceIncludeTax, quantity, lineAmountIncludeTax, _lineAmountIncludeTax, _quantity;
 
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) {
@@ -8705,7 +8724,7 @@ var onChangePriceIncludeTax = lazyFn(function (controller, form, record) {
 
             case 11:
               calculatingDigits = controller.state.calculatingDigits;
-              priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
+              priceIncludeTax = format15(values.priceIncludeTax, 8);
               _context4.next = 15;
               return controller.setEditGood({
                 priceIncludeTax: priceIncludeTax
@@ -8741,8 +8760,8 @@ var onChangePriceIncludeTax = lazyFn(function (controller, form, record) {
                 break;
               }
 
-              _lineAmountIncludeTax2 = format2(values.lineAmountIncludeTax);
-              _quantity = format15(evaluate("".concat(_lineAmountIncludeTax2, " / ").concat(priceIncludeTax)), calculatingDigits);
+              _lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
+              _quantity = format15(evaluate("".concat(_lineAmountIncludeTax, " / ").concat(priceIncludeTax)), calculatingDigits);
               form.setFieldsValue({
                 quantity: _quantity
               });
@@ -8777,7 +8796,7 @@ var onChangePriceIncludeTax = lazyFn(function (controller, form, record) {
 var onChangePriceExcludeTax = lazyFn(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(err, values) {
-      var calculatingDigits, priceExcludeTax, quantity, lineAmountExcludeTax, _lineAmountExcludeTax2, _quantity2;
+      var calculatingDigits, priceExcludeTax, quantity, lineAmountExcludeTax, _lineAmountExcludeTax, _quantity2;
 
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) {
@@ -8817,7 +8836,7 @@ var onChangePriceExcludeTax = lazyFn(function (controller, form, record) {
 
             case 11:
               calculatingDigits = controller.state.calculatingDigits;
-              priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
+              priceExcludeTax = format15(values.priceExcludeTax, 8);
               _context5.next = 15;
               return controller.setEditGood({
                 priceExcludeTax: priceExcludeTax
@@ -8853,8 +8872,8 @@ var onChangePriceExcludeTax = lazyFn(function (controller, form, record) {
                 break;
               }
 
-              _lineAmountExcludeTax2 = format2(values.lineAmountExcludeTax);
-              _quantity2 = format15(evaluate("".concat(_lineAmountExcludeTax2, " / ").concat(priceExcludeTax)), calculatingDigits);
+              _lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
+              _quantity2 = format15(evaluate("".concat(_lineAmountExcludeTax, " / ").concat(priceExcludeTax)), calculatingDigits);
               form.setFieldsValue({
                 quantity: _quantity2
               });
@@ -8889,7 +8908,7 @@ var onChangePriceExcludeTax = lazyFn(function (controller, form, record) {
 var onChangeLineAmountIncludeTax = lazyFn(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(err, values) {
-      var calculatingDigits, lineAmountIncludeTax, quantity, priceIncludeTax, _priceIncludeTax2, _quantity3;
+      var calculatingDigits, lineAmountIncludeTax, quantity, priceIncludeTax, _priceIncludeTax, _quantity3;
 
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) {
@@ -8938,7 +8957,7 @@ var onChangeLineAmountIncludeTax = lazyFn(function (controller, form, record) {
               }
 
               quantity = format15(values.quantity, calculatingDigits);
-              priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(quantity)), calculatingDigits);
+              priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(quantity)), 8);
               form.setFieldsValue({
                 priceIncludeTax: priceIncludeTax
               });
@@ -8957,8 +8976,8 @@ var onChangeLineAmountIncludeTax = lazyFn(function (controller, form, record) {
                 break;
               }
 
-              _priceIncludeTax2 = format15(values.priceIncludeTax, calculatingDigits);
-              _quantity3 = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(_priceIncludeTax2)), calculatingDigits);
+              _priceIncludeTax = format15(values.priceIncludeTax, 8);
+              _quantity3 = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(_priceIncludeTax)), calculatingDigits);
               form.setFieldsValue({
                 quantity: _quantity3
               });
@@ -8993,7 +9012,7 @@ var onChangeLineAmountIncludeTax = lazyFn(function (controller, form, record) {
 var onChangeLineAmountExcludeTax = lazyFn(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(err, values) {
-      var calculatingDigits, lineAmountExcludeTax, quantity, priceExcludeTax, _priceExcludeTax2, _quantity4;
+      var calculatingDigits, lineAmountExcludeTax, quantity, priceExcludeTax, _priceExcludeTax, _quantity4;
 
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) {
@@ -9042,7 +9061,7 @@ var onChangeLineAmountExcludeTax = lazyFn(function (controller, form, record) {
               }
 
               quantity = format15(values.quantity, calculatingDigits);
-              priceExcludeTax = format15(evaluate("".concat(lineAmountExcludeTax, " / ").concat(quantity)), calculatingDigits);
+              priceExcludeTax = format15(evaluate("".concat(lineAmountExcludeTax, " / ").concat(quantity)), 8);
               form.setFieldsValue({
                 priceExcludeTax: priceExcludeTax
               });
@@ -9061,8 +9080,8 @@ var onChangeLineAmountExcludeTax = lazyFn(function (controller, form, record) {
                 break;
               }
 
-              _priceExcludeTax2 = format15(values.priceExcludeTax, calculatingDigits);
-              _quantity4 = format15(evaluate("".concat(lineAmountExcludeTax, " / ").concat(_priceExcludeTax2)), calculatingDigits);
+              _priceExcludeTax = format15(values.priceExcludeTax, 8);
+              _quantity4 = format15(evaluate("".concat(lineAmountExcludeTax, " / ").concat(_priceExcludeTax)), calculatingDigits);
               form.setFieldsValue({
                 quantity: _quantity4
               });
@@ -9346,7 +9365,7 @@ var updateUnitPriceTax = /*#__PURE__*/function () {
                             break;
                           }
 
-                          priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(values.quantity)), calculatingDigits);
+                          priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(values.quantity)), 8);
                           _context11.next = 11;
                           return controller.setEditGood({
                             priceIncludeTax: priceIncludeTax
@@ -9784,11 +9803,11 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
                                 }
 
                                 var quantity = format15(sourceQuantity, calculatingDigits);
-                                var priceIncludeTax = format15(sourcePriceIncludeTax, calculatingDigits);
+                                var priceIncludeTax = format15(sourcePriceIncludeTax, 8);
                                 var lineAmountIncludeTax = format2(evaluate("".concat(priceIncludeTax, " * ").concat(quantity)));
                                 var taxAmount = countTaxAmount(lineAmountIncludeTax, controller.state.goodsListState.deduction, taxRate);
                                 var lineAmountExcludeTax = countAmountExcludeTax(lineAmountIncludeTax, taxAmount);
-                                var priceExcludeTax = countPrice(lineAmountExcludeTax, quantity, controller.state.calculatingDigits);
+                                var priceExcludeTax = countPrice(lineAmountExcludeTax, quantity, 8);
                                 return _objectSpread2(_objectSpread2({}, good), {}, {
                                   lineAmountExcludeTax: lineAmountExcludeTax,
                                   lineAmountIncludeTax: lineAmountIncludeTax,
@@ -9808,21 +9827,21 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
 
                                 var _quantity5 = format15(sourceQuantity, calculatingDigits);
 
-                                var _priceExcludeTax3 = format15(sourcePriceExcludeTax, calculatingDigits);
+                                var _priceExcludeTax2 = format15(sourcePriceExcludeTax, 8);
 
-                                var _lineAmountExcludeTax3 = format2(evaluate("".concat(_priceExcludeTax3, " * ").concat(_quantity5)));
+                                var _lineAmountExcludeTax2 = format2(evaluate("".concat(_priceExcludeTax2, " * ").concat(_quantity5)));
 
-                                var _lineAmountIncludeTax3 = format2(evaluate("".concat(_lineAmountExcludeTax3, " * (1+(").concat(taxRate, "/100))")));
+                                var _lineAmountIncludeTax2 = format2(evaluate("".concat(_lineAmountExcludeTax2, " * (1+(").concat(taxRate, "/100))")));
 
-                                var _priceIncludeTax3 = format15(evaluate("".concat(_lineAmountIncludeTax3, " / ").concat(_quantity5)), calculatingDigits);
+                                var _priceIncludeTax2 = format15(evaluate("".concat(_lineAmountIncludeTax2, " / ").concat(_quantity5)), 8);
 
-                                var _taxAmount = evaluate("".concat(_lineAmountIncludeTax3, " - ").concat(_lineAmountExcludeTax3));
+                                var _taxAmount = evaluate("".concat(_lineAmountIncludeTax2, " - ").concat(_lineAmountExcludeTax2));
 
                                 return _objectSpread2(_objectSpread2({}, good), {}, {
-                                  lineAmountExcludeTax: _lineAmountExcludeTax3,
-                                  lineAmountIncludeTax: _lineAmountIncludeTax3,
+                                  lineAmountExcludeTax: _lineAmountExcludeTax2,
+                                  lineAmountIncludeTax: _lineAmountIncludeTax2,
                                   taxAmount: _taxAmount,
-                                  priceIncludeTax: _priceIncludeTax3
+                                  priceIncludeTax: _priceIncludeTax2
                                 });
                               }
                             });
@@ -11110,6 +11129,8 @@ function SvgSpot(props) {
 }
 
 var useDelItem = (function (goods) {
+  var _goods$referenceLines;
+
   var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
@@ -11121,6 +11142,10 @@ var useDelItem = (function (goods) {
     controller.delGood(goods.$index);
   }, [controller, goods.$index]);
 
+  if (goods.lineAttribute === LineAttributeType$1.正常 && (goods === null || goods === void 0 ? void 0 : goods.referenceLines) && (goods === null || goods === void 0 ? void 0 : (_goods$referenceLines = goods.referenceLines) === null || _goods$referenceLines === void 0 ? void 0 : _goods$referenceLines.length) > 0) {
+    return undefined;
+  }
+
   if (goods.lineAttribute === LineAttributeType$1.被折扣行) {
     return undefined;
   }
@@ -14005,15 +14030,17 @@ var useColumns = (function (form) {
       render: function render(value, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && model !== 'prefab') {
           return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, null, getFieldDecorator('priceIncludeTax', {
-            initialValue: nonScientificNotation(editGood.priceIncludeTax),
+            initialValue: nonScientificNotation(editGood.priceIncludeTax, 8),
             getValueFromEvent: onNumberValueChange,
-            rules: [].concat(_toConsumableArray(getReplenishRules('priceIncludeTax')), [{
-              pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-              message: '单价必须为数字'
+            rules: [].concat(_toConsumableArray(getReplenishRules('priceIncludeTax')), [// { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
+            // { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额必须为数字' },
+            {
+              pattern: /^[+-]?(0|([1-9]\d*))(\.\d{1,8})?$/,
+              message: '单价必须为数字且最多保留8位小数'
             }, {
               validator: function () {
                 var _validator3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_, value, callback) {
-                  var isQuantity, isvalue;
+                  var quantity, isQuantityValid, isValueValid;
                   return _regeneratorRuntime().wrap(function _callee9$(_context9) {
                     while (1) {
                       switch (_context9.prev = _context9.next) {
@@ -14022,20 +14049,39 @@ var useColumns = (function (form) {
                           return controller.wait();
 
                         case 2:
-                          isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
-                          isvalue = !!value || value === 0;
-
-                          if (!(isvalue || isQuantity === isvalue)) {
-                            _context9.next = 6;
+                          // const isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
+                          // const isvalue = !!value || value === 0;
+                          // if (isvalue || isQuantity === isvalue) return;
+                          // callback('请输入单价');
+                          quantity = getFieldValue('quantity');
+                          isQuantityValid = quantity !== undefined && quantity !== null && quantity !== '';
+                          isValueValid = value !== undefined && value !== null && value !== ''; // if (isValueValid && isQuantityValid) return;
+                          // 允许两者都为空
+
+                          if (!(!isValueValid && !isQuantityValid)) {
+                            _context9.next = 7;
                             break;
                           }
 
                           return _context9.abrupt("return");
 
-                        case 6:
-                          callback('请输入单价');
-
                         case 7:
+                          if (isValueValid) {
+                            _context9.next = 9;
+                            break;
+                          }
+
+                          return _context9.abrupt("return", callback('金额不能为空'));
+
+                        case 9:
+                          if (isQuantityValid) {
+                            _context9.next = 11;
+                            break;
+                          }
+
+                          return _context9.abrupt("return", callback('数量不能为空'));
+
+                        case 11:
                         case "end":
                           return _context9.stop();
                       }
@@ -14066,7 +14112,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, nonScientificNotation(value));
+          }, nonScientificNotation(value, 8));
         }
       }
     }, {
@@ -14080,15 +14126,16 @@ var useColumns = (function (form) {
       render: function render(value, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && model !== 'prefab') {
           return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, null, getFieldDecorator('priceExcludeTax', {
-            initialValue: nonScientificNotation(editGood.priceExcludeTax),
+            initialValue: nonScientificNotation(editGood.priceExcludeTax, 8),
             getValueFromEvent: onNumberValueChange,
-            rules: [].concat(_toConsumableArray(getReplenishRules('priceExcludeTax')), [{
-              pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-              message: '单价必须为数字'
+            rules: [].concat(_toConsumableArray(getReplenishRules('priceExcludeTax')), [// { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
+            {
+              pattern: /^[+-]?(0|([1-9]\d*))(\.\d{1,8})?$/,
+              message: '单价必须为数字且最多保留8位小数'
             }, {
               validator: function () {
                 var _validator4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_, value, callback) {
-                  var isQuantity, isvalue;
+                  var quantity, isQuantityValid, isValueValid;
                   return _regeneratorRuntime().wrap(function _callee10$(_context10) {
                     while (1) {
                       switch (_context10.prev = _context10.next) {
@@ -14097,20 +14144,39 @@ var useColumns = (function (form) {
                           return controller.wait();
 
                         case 2:
-                          isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
-                          isvalue = !!value || value === 0;
-
-                          if (!(isvalue || isQuantity === isvalue)) {
-                            _context10.next = 6;
+                          // const isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
+                          // const isvalue = !!value || value === 0;
+                          // if (isvalue || isQuantity === isvalue) return;
+                          // callback('请输入单价');
+                          quantity = getFieldValue('quantity');
+                          isQuantityValid = quantity !== undefined && quantity !== null && quantity !== '';
+                          isValueValid = value !== undefined && value !== null && value !== ''; // if (isValueValid && isQuantityValid) return;
+                          // 允许两者都为空
+
+                          if (!(!isValueValid && !isQuantityValid)) {
+                            _context10.next = 7;
                             break;
                           }
 
                           return _context10.abrupt("return");
 
-                        case 6:
-                          callback('请输入单价');
-
                         case 7:
+                          if (isValueValid) {
+                            _context10.next = 9;
+                            break;
+                          }
+
+                          return _context10.abrupt("return", callback('金额不能为空'));
+
+                        case 9:
+                          if (isQuantityValid) {
+                            _context10.next = 11;
+                            break;
+                          }
+
+                          return _context10.abrupt("return", callback('数量不能为空'));
+
+                        case 11:
                         case "end":
                           return _context10.stop();
                       }
@@ -14141,7 +14207,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, nonScientificNotation(value));
+          }, nonScientificNotation(value, 8));
         }
       }
     }, {
@@ -15318,6 +15384,9 @@ var useDelRowButton = (function () {
   var isRemRow = controller.useMemo(function (s) {
     return s.goodsListState.isRemRow;
   }, []);
+  var isBatchRemRow = controller.useMemo(function (s) {
+    return s.goodsListState.isBatchRemRow;
+  }, []);
   /** 是否禁用 */
 
   var disabled = controller.useMemo(function (s) {
@@ -15374,6 +15443,7 @@ var useDelRowButton = (function () {
     }, " \u5220\u9664\u884C ");
   }, [model, onClick, disabled]);
   var button = React__default['default'].useMemo(function () {
+    if (isBatchRemRow === false) return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
     if (isRemRow === false) return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
     if (model === 'prefab') return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
     if (model === 'readOnly') return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
@@ -15381,39 +15451,13 @@ var useDelRowButton = (function () {
       onClick: onClick,
       disabled: disabled
     }, "\u6279\u91CF\u5220\u9664");
-  }, [model, onClick, disabled, isRemRow]);
+  }, [model, onClick, disabled, isRemRow, isBatchRemRow]);
   return {
     button: button,
     menuItem: menuItem
   };
 });
 
-/** 延迟函数 */
-var lazyFn$1 = (function (fn) {
-  var delayed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
-  // let timer: any = 0;
-  // return (...par: any[]) => {
-  //     if (timer === 0) {
-  //         timer = setTimeout(() => {
-  //             fn.apply(null, par);
-  //             timer = 0;
-  //         }, delayed);
-  //     }
-  // }
-  var timer;
-  return function () {
-    for (var _len = arguments.length, par = new Array(_len), _key = 0; _key < _len; _key++) {
-      par[_key] = arguments[_key];
-    }
-
-    if (timer) return;
-    timer = setTimeout(function () {
-      timer = undefined;
-      fn.apply(null, par);
-    }, delayed);
-  };
-});
-
 var css_248z$b = ".kts-invoice-operate-goods-list-add-discount-row .ktsAnt3x-drawer-wrapper-body {\n  display: flex;\n  flex-direction: column;\n}\n.kts-invoice-operate-goods-list-add-discount-row .ktsAnt3x-drawer-wrapper-body .ktsAnt3x-drawer-body {\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n}\n.kts-invoice-operate-goods-list-add-discount-row .ktsAnt3x-drawer-wrapper-body .ktsAnt3x-drawer-body .add-discount-row-body {\n  flex: 1;\n  overflow: auto;\n}\n.kts-invoice-operate-goods-list-add-discount-row .ktsAnt3x-drawer-wrapper-body .ktsAnt3x-drawer-body .add-discount-row-footer {\n  flex: none;\n}\n";
 styleInject(css_248z$b);
 
@@ -15437,10 +15481,8 @@ var useAddDiscountRowButton = (function () {
     return s.goodsListState.isAddDiscount;
   }, []);
   /** 是否开启抽屉 */
+  // const visible = controller.useMemo(s => s.goodsListState.discountGoodIndex.length > 0, []);
 
-  var visible = controller.useMemo(function (s) {
-    return s.goodsListState.discountGoodIndex.length > 0;
-  }, []);
   /** 是否禁用 按钮 */
 
   var disabled = controller.useMemo(function (s) {
@@ -15577,221 +15619,692 @@ var useAddDiscountRowButton = (function () {
       onClick: onClick,
       disabled: disabled
     }, "\u6DFB\u52A0\u6298\u6263\u884C") : undefined;
-  }, [isAddDiscount, disabled, onClick]);
-  var drawer = React__default['default'].useMemo(function () {
-    return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Drawer, {
-      className: "kts-invoice-operate-goods-list-add-discount-row",
-      width: 540,
-      title: "\u6DFB\u52A0\u6298\u6263\u884C",
-      placement: "right",
-      destroyOnClose: true,
-      onClose: onClose,
-      visible: visible
-    }, /*#__PURE__*/React__default['default'].createElement(DrawerBody, null));
-  }, [visible, onClose]);
-  return {
-    menuItem: menuItem,
-    drawer: drawer
-  };
-});
-var DrawerBody = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (props) {
-  var form = props.form;
-  var getFieldDecorator = form.getFieldDecorator;
-  var controller = Invoice.useInvoiceController();
-  /** 选中的货物索引列表 */
+  }, [isAddDiscount, disabled, onClick]); // const drawer = React.useMemo(() => {
+  //   return (
+  //     <Drawer
+  //       className="kts-invoice-operate-goods-list-add-discount-row"
+  //       width={540}
+  //       title="添加折扣行"
+  //       placement="right"
+  //       destroyOnClose={true}
+  //       onClose={onClose}
+  //       visible={visible}
+  //     >
+  //       <DrawerBody />
+  //     </Drawer>
+  //   )
+  // }, [visible, onClose])
+  // 添加折扣(批量)
 
-  var discountGoodIndex = controller.useMemo(function (s) {
-    return s.goodsListState.discountGoodIndex;
-  }, []);
-  /** 金额合计 */
+  /** 是否启用 */
 
-  var lineAmountSum = controller.useMemo(function (s) {
-    var sum = chain(0);
+  var isEnable = React__default['default'].useMemo(function () {
+    if (model === 'readOnly') return false;
+    if (model === 'prefab') return false;
+    return !(isAddDiscount === false);
+  }, [isAddDiscount, model]);
+  /** 准备添加折扣的货物索引列表 */
 
-    if (s.goodsListState.isTaxIncluded) {
-      s.goodsListState.discountGoodIndex.forEach(function (e) {
-        var goods = s.goodsListState.goodsMap.get(e);
-        sum = sum.add((goods === null || goods === void 0 ? void 0 : goods.lineAmountIncludeTax) || 0);
-      });
-    } else {
-      s.goodsListState.discountGoodIndex.forEach(function (e) {
-        var goods = s.goodsListState.goodsMap.get(e);
-        sum = sum.add((goods === null || goods === void 0 ? void 0 : goods.lineAmountExcludeTax) || 0);
-      });
-    }
+  var discountGoodIndex = controller.useMemo(function (s) {
+    return s.goodsListState.discountGoodIndex || [];
+  }, []); // 抽屉开启状态
 
-    return sum.done();
-  }, []);
-  /** 关闭抽屉 */
+  var open = React__default['default'].useMemo(function () {
+    return discountGoodIndex.length > 0;
+  }, [discountGoodIndex]);
+  /** 打开抽屉 */
 
-  var onClose = React__default['default'].useCallback(function () {
-    controller.pipeline( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                s.goodsListState.discountGoodIndex = [];
+  var onOpen = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
+            return controller.saveEditGood();
 
-              case 1:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4);
-      }));
+          case 2:
+            _context5.next = 4;
+            return controller.wait();
 
-      return function (_x3) {
-        return _ref4.apply(this, arguments);
-      };
-    }())();
-  }, []);
-  /** 点击了保存 */
-
-  var onClickSave = React__default['default'].useCallback(function () {
-    form.validateFields(function (err, values) {
-      if (err) return;
-      var discolineAmountunt = parseFloat(parseFloat(values.discolineAmountunt).toFixed(2));
-      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) {
-            while (1) {
-              switch (_context5.prev = _context5.next) {
-                case 0:
-                  s.goodsListState.discountGoodIndex = [];
+          case 4:
+            _context5.next = 6;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
+                var isOk;
+                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                  while (1) {
+                    switch (_context4.prev = _context4.next) {
+                      case 0:
+                        // 不能给编辑状态的行增加折扣!
+                        isOk = s.goodsListState.editGood && s.goodsListState.selectedGoodIndex.indexOf(s.goodsListState.editGood.$index) >= 0;
 
-                case 1:
-                case "end":
-                  return _context5.stop();
-              }
-            }
-          }, _callee5);
-        }));
+                        if (!isOk) {
+                          _context4.next = 4;
+                          break;
+                        }
 
-        return function (_x4) {
-          return _ref5.apply(this, arguments);
-        };
-      }())();
-      controller.addGoodDiscount({
-        indexList: indexList,
-        discount: discount,
-        discolineAmountunt: discolineAmountunt
-      });
+                        ktsComponentsAntdX3.message.error({
+                          content: '不能给编辑状态的行增加折扣!',
+                          key: '不能给编辑状态的行增加折扣!'
+                        });
+                        return _context4.abrupt("return");
+
+                      case 4:
+                        if (isContinuityNum(s.goodsListState.selectedGoodIndex.map(function (e) {
+                          var _s$goodsListState$goo;
+
+                          return ((_s$goodsListState$goo = s.goodsListState.goodsMap.get(e)) === null || _s$goodsListState$goo === void 0 ? void 0 : _s$goodsListState$goo.serialNo) || -2;
+                        }).sort(function (a, b) {
+                          return a - b;
+                        }))) {
+                          _context4.next = 7;
+                          break;
+                        }
+
+                        ktsComponentsAntdX3.message.error({
+                          content: '项目不连续，不允许添加折扣',
+                          key: '项目不连续，不允许添加折扣'
+                        });
+                        return _context4.abrupt("return");
+
+                      case 7:
+                        // 不允许重复添加折扣
+                        isOk = s.goodsListState.selectedGoodIndex.some(function ($index) {
+                          var _s$goodsListState$goo2;
+
+                          return ((_s$goodsListState$goo2 = s.goodsListState.goodsMap.get($index)) === null || _s$goodsListState$goo2 === void 0 ? void 0 : _s$goodsListState$goo2.lineAttribute) !== LineAttributeType$1.正常;
+                        });
+
+                        if (!isOk) {
+                          _context4.next = 11;
+                          break;
+                        }
+
+                        ktsComponentsAntdX3.message.error({
+                          content: '不允许重复添加折扣',
+                          key: '不允许重复添加折扣'
+                        });
+                        return _context4.abrupt("return");
+
+                      case 11:
+                        if (!(areAllValuesEqual(s.goodsListState.selectedGoodIndex.map(function (e) {
+                          var _s$goodsListState$goo3;
+
+                          return (_s$goodsListState$goo3 = s.goodsListState.goodsMap.get(e)) === null || _s$goodsListState$goo3 === void 0 ? void 0 : _s$goodsListState$goo3.taxRate;
+                        })) === false)) {
+                          _context4.next = 14;
+                          break;
+                        }
+
+                        ktsComponentsAntdX3.message.error({
+                          content: '存在不同税率，不允许同时添加折扣',
+                          key: '存在不同税率，不允许同时添加折扣'
+                        });
+                        return _context4.abrupt("return");
+
+                      case 14:
+                        // 添加折扣时项目金额不能为空或零
+                        isOk = s.goodsListState.selectedGoodIndex.some(function ($index) {
+                          var good = s.goodsListState.goodsMap.get($index);
+                          return "".concat(good === null || good === void 0 ? void 0 : good.lineAmountIncludeTax) === '0';
+                        });
+
+                        if (!isOk) {
+                          _context4.next = 18;
+                          break;
+                        }
+
+                        ktsComponentsAntdX3.message.error({
+                          content: '添加折扣时项目金额不能为空或零',
+                          key: '添加折扣时项目金额不能为空或零'
+                        });
+                        return _context4.abrupt("return");
+
+                      case 18:
+                        // 零税率需要设置免税类型，请在赋码中设置！
+                        isOk = s.goodsListState.selectedGoodIndex.some(function ($index) {
+                          var good = s.goodsListState.goodsMap.get($index);
+                          return !good || good.taxRate === 0 && s.goodsListState.endowCode.isTaxFreeTypeNeeded && !good.taxFreeType;
+                        });
+
+                        if (!isOk) {
+                          _context4.next = 22;
+                          break;
+                        }
+
+                        ktsComponentsAntdX3.message.error({
+                          content: '零税率需要设置免税类型，请在赋码中设置！',
+                          key: '零税率需要设置免税类型，请在赋码中设置！'
+                        });
+                        return _context4.abrupt("return");
+
+                      case 22:
+                        s.goodsListState.discountGoodIndex = s.goodsListState.selectedGoodIndex.slice();
+
+                      case 23:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }
+                }, _callee4);
+              }));
+
+              return function (_x3) {
+                return _ref5.apply(this, arguments);
+              };
+            }());
+
+          case 6:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  })), [controller]);
+  var button = React__default['default'].useMemo(function () {
+    if (isEnable) {
+      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Button, {
+        size: 'small',
+        onClick: onOpen,
+        disabled: disabled
+      }, "\u6DFB\u52A0\u6298\u6263"), /*#__PURE__*/React__default['default'].createElement(AddDiscountRowDrawer, {
+        open: open,
+        onClose: onClose
+      }));
+    } else {
+      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+    }
+  }, [open, onOpen, onClose, isEnable, disabled]);
+  return {
+    menuItem: menuItem,
+    button: button
+  };
+}); // 批量折扣弹窗
+
+/** 添加折扣行的抽屉 */
+
+function AddDiscountRowDrawer(props) {
+  var open = props.open,
+      onClose = props.onClose;
+
+  var _Form1$useForm = ktsXui.Form.useForm(),
+      _Form1$useForm2 = _slicedToArray(_Form1$useForm, 1),
+      form = _Form1$useForm2[0];
+
+  var _React$useState = React__default['default'].useState(),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      formValues = _React$useState2[0],
+      setFormValues = _React$useState2[1];
+  /** 控制器 */
+
+
+  var controller = Invoice.useInvoiceController();
+  /** 货物字典 */
+
+  var goodsMap = controller.useMemo(function (s) {
+    return s.goodsListState.goodsMap;
+  }, []);
+  /** 准备添加折扣的货物索引列表 */
+
+  var discountGoodIndex = controller.useMemo(function (s) {
+    return s.goodsListState.discountGoodIndex || [];
+  }, []);
+  /** 准备添加折扣的货物列表 */
+
+  var discountGood = React__default['default'].useMemo(function () {
+    return discountGoodIndex.map(function (e) {
+      return goodsMap.get(e);
     });
-  }, [controller, form, discountGoodIndex]);
-  /** 折扣率变化 */
+  }, [discountGoodIndex, goodsMap]);
+  /** 总金额 */
 
-  var onChangeDiscount = React__default['default'].useCallback(lazyFn$1(function (e) {
-    form.validateFields(function (err, values) {
-      if (err && err.discount) return;
-      var discolineAmountunt = evaluate("".concat(lineAmountSum, " * (").concat(values.discount, "/100)")).toFixed(2);
-      form.setFieldsValue({
-        discolineAmountunt: discolineAmountunt
-      });
+  var totalAmount = React__default['default'].useMemo(function () {
+    var sum = 0;
+    discountGood.forEach(function (e) {
+      var _e$lineAmountIncludeT;
+
+      sum += (_e$lineAmountIncludeT = e === null || e === void 0 ? void 0 : e.lineAmountIncludeTax) !== null && _e$lineAmountIncludeT !== void 0 ? _e$lineAmountIncludeT : 0;
     });
-  }, 300), [form, lineAmountSum]);
-  /** 折扣变化 */
-
-  var onChangeDiscolineAmountunt = React__default['default'].useCallback(lazyFn$1(function (e) {
-    form.validateFields(function (err, values) {
-      if (err && err.discolineAmountunt) return;
-      var discolineAmountunt = parseFloat(values.discolineAmountunt).toFixed(2);
-      var discount = evaluate("(".concat(discolineAmountunt, " / ").concat(lineAmountSum, ") * 100")).toFixed(4);
+    return sum;
+  }, [discountGood]);
+  /** 表单变化 */
+
+  var onChangeForm = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var values;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 2;
+            return form.getFieldsValue();
+
+          case 2:
+            values = _context6.sent;
+            setFormValues(values);
+
+          case 4:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  })), [form]);
+  /** 点击了确认 */
+
+  var onDefine = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+    var values, totalDiscoline, discolinesSum, discolines, surplus, i;
+    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+      while (1) {
+        switch (_context8.prev = _context8.next) {
+          case 0:
+            _context8.next = 2;
+            return form.validateFields();
+
+          case 2:
+            values = _context8.sent;
+            // 折扣总金额
+            totalDiscoline = values.discolineType === '1' ? chain(mathjs.bignumber(values.discolineValue)) : chain(mathjs.bignumber(totalAmount)).multiply(mathjs.bignumber(values.discolineValue)).multiply(mathjs.bignumber(0.01));
+            discolinesSum = chain(mathjs.bignumber(0)); // 每行的折扣金额
+
+            discolines = discountGood.map(function (e, i) {
+              var _e$lineAmountIncludeT2;
+
+              // 折扣金额占比
+              var share = chain(mathjs.bignumber((_e$lineAmountIncludeT2 = e === null || e === void 0 ? void 0 : e.lineAmountIncludeTax) !== null && _e$lineAmountIncludeT2 !== void 0 ? _e$lineAmountIncludeT2 : 0)).divide(mathjs.bignumber(totalAmount)); // 折扣金额
+
+              var value = totalDiscoline.multiply(share.done()).multiply(mathjs.bignumber(100)).round().divide(mathjs.bignumber(100)).done();
+              discolinesSum = discolinesSum.add(value);
+              return value.toNumber();
+            }); // 剩余折扣金额
+
+            surplus = totalDiscoline.subtract(discolinesSum.done()); // 补充剩余折扣金
+
+            i = 0;
+
+          case 8:
+            if (!(i < discolines.length)) {
+              _context8.next = 16;
+              break;
+            }
+
+            if (!surplus.smaller(0.01).done()) {
+              _context8.next = 11;
+              break;
+            }
+
+            return _context8.abrupt("break", 16);
+
+          case 11:
+            discolines[i] = chain(mathjs.bignumber(discolines[i])).add(mathjs.bignumber(0.01)).done().toNumber();
+            surplus = surplus.subtract(mathjs.bignumber(0.01));
+
+          case 13:
+            i++;
+            _context8.next = 8;
+            break;
+
+          case 16:
+            _context8.next = 18;
+            return controller.addGoodDiscountV2(discolines.map(function (e, i) {
+              var _discountGood$i;
+
+              return {
+                $index: (_discountGood$i = discountGood[i]) === null || _discountGood$i === void 0 ? void 0 : _discountGood$i.$index,
+                discolineAmountunt: e
+              };
+            }));
+
+          case 18:
+            _context8.next = 20;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(s) {
+                return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                  while (1) {
+                    switch (_context7.prev = _context7.next) {
+                      case 0:
+                        s.goodsListState.selectedGoodIndex = [];
+
+                      case 1:
+                      case "end":
+                        return _context7.stop();
+                    }
+                  }
+                }, _callee7);
+              }));
+
+              return function (_x4) {
+                return _ref8.apply(this, arguments);
+              };
+            }());
+
+          case 20:
+            // 关闭抽屉
+            onClose();
+
+          case 21:
+          case "end":
+            return _context8.stop();
+        }
+      }
+    }, _callee8);
+  })), [discountGood, form, totalAmount, onClose, controller]); // 打开抽屉时 重置form
+
+  React__default['default'].useEffect(function () {
+    if (open) {
+      form.resetFields();
       form.setFieldsValue({
-        discount: discount
+        discolineType: '1',
+        discolineValue: undefined
+      }); // 强制设置初始值
+
+      setFormValues({
+        discolineType: '1'
       });
-    });
-  }, 300), [form, lineAmountSum]);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "add-discount-row-body"
-  }, /*#__PURE__*/React__default['default'].createElement("p", null, "\u5F53\u524D\u9009\u62E9", /*#__PURE__*/React__default['default'].createElement(Text$3, {
-    type: "danger"
-  }, discountGoodIndex.length), "\u884C\u88AB\u6298\u6263\u5546\u54C1\u884C\uFF0C\u91D1\u989D\u5408\u8BA1\xA5", /*#__PURE__*/React__default['default'].createElement(Text$3, {
-    type: "danger"
-  }, lineAmountSum.toFixed(2))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u6298\u6263\u7387\uFF1A"
-  }, getFieldDecorator('discount', {
+    }
+  }, [open]); // 切换 折扣方式 清空折扣值
+
+  React__default['default'].useEffect(function () {
+    form.setFieldsValue(_objectSpread2(_objectSpread2({}, formValues), {}, {
+      discolineValue: undefined
+    }));
+  }, [formValues === null || formValues === void 0 ? void 0 : formValues.discolineType]);
+  return /*#__PURE__*/React__default['default'].createElement(ktsXui.Drawer, {
+    title: "\u6DFB\u52A0\u6298\u6263",
+    placement: "right",
+    width: 350,
+    onClose: onClose,
+    open: open,
+    footer: /*#__PURE__*/React__default['default'].createElement(ktsXui.Space, {
+      size: "middle",
+      style: {
+        display: 'flex',
+        justifyContent: 'end'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Button, {
+      onClick: onDefine,
+      type: 'primary'
+    }, "\u786E\u5B9A"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Button, {
+      onClick: onClose
+    }, "\u53D6\u6D88"))
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Form, {
+    form: form,
+    layout: 'vertical',
+    onChange: onChangeForm
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
+    label: "\u5546\u54C1\u91D1\u989D\uFF08\u542B\u7A0E\uFF09"
+  }, totalAmount.toFixed(2), "\uFF08\u5171 ", discountGood.length, " \u884C\uFF09"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
+    label: "\u6298\u6263\u65B9\u5F0F",
+    name: 'discolineType',
+    initialValue: '1'
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Radio.Group, {
+    options: [{
+      label: '按金额折扣',
+      value: '1'
+    }, {
+      label: '按比例折扣',
+      value: '2'
+    }]
+  })), (formValues === null || formValues === void 0 ? void 0 : formValues.discolineType) === '2' ? /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
+    label: "\u6298\u6263\u6BD4\u4F8B\uFF08%\uFF09\uFF08\u542B\u7A0E\uFF09",
+    name: 'discolineValue',
     rules: [{
       required: true,
-      message: '请输入折扣金额'
-    }, {
-      pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-      message: '请输入数字'
+      message: '必填'
     }, {
-      validator: function validator(_, value, callback) {
-        var _value$match;
+      validator: function () {
+        var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_, value) {
+          return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+            while (1) {
+              switch (_context9.prev = _context9.next) {
+                case 0:
+                  if (!isNaN(parseFloat(value))) {
+                    _context9.next = 2;
+                    break;
+                  }
 
-        if (!value) {
-          callback();
-          return;
-        }
+                  return _context9.abrupt("return");
 
-        if (!((_value$match = value.match(/^[+-]?(0|([1-9]\d*))(\.\d+)?$/)) === null || _value$match === void 0 ? void 0 : _value$match.length)) {
-          callback();
-          return;
-        }
+                case 2:
+                  if (!(value <= 0)) {
+                    _context9.next = 4;
+                    break;
+                  }
+
+                  throw new Error('需大于0');
+
+                case 4:
+                  if (!(value > 100)) {
+                    _context9.next = 6;
+                    break;
+                  }
+
+                  throw new Error('不可以大于100');
 
-        if (parseFloat(value) > 100 || parseFloat(value) < 0) {
-          callback('请输入大于0小于100的数字');
+                case 6:
+                case "end":
+                  return _context9.stop();
+              }
+            }
+          }, _callee9);
+        }));
+
+        function validator(_x5, _x6) {
+          return _validator.apply(this, arguments);
         }
 
-        callback();
-      }
+        return validator;
+      }()
     }]
-  })( /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Input, {
-    placeholder: "\u8BF7\u8F93\u5165\u5927\u4E8E0\u5C0F\u4E8E100\u7684\u6570\u5B57",
-    suffix: "%",
-    onChange: onChangeDiscount
-  }))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u6298\u6263\u91D1\u989D\uFF1A"
-  }, getFieldDecorator('discolineAmountunt', {
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.InputNumber, {
+    style: {
+      width: '100%'
+    }
+  })) : /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
+    label: "\u6298\u6263\u91D1\u989D\uFF08\u5143\uFF09\uFF08\u542B\u7A0E\uFF09",
+    name: 'discolineValue',
     rules: [{
       required: true,
-      message: '请输入折扣金额'
-    }, {
-      pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-      message: '请输入数字'
+      message: '必填'
     }, {
-      validator: function validator(_, value, callback) {
-        var _value$match2;
+      validator: function () {
+        var _validator2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_, value) {
+          return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+            while (1) {
+              switch (_context10.prev = _context10.next) {
+                case 0:
+                  if (!isNaN(parseFloat(value))) {
+                    _context10.next = 2;
+                    break;
+                  }
 
-        if (!value) {
-          callback();
-          return;
-        }
+                  return _context10.abrupt("return");
 
-        if (!((_value$match2 = value.match(/^[+-]?(0|([1-9]\d*))(\.\d+)?$/)) === null || _value$match2 === void 0 ? void 0 : _value$match2.length)) {
-          callback();
-          return;
-        }
+                case 2:
+                  if (!(value <= 0)) {
+                    _context10.next = 4;
+                    break;
+                  }
+
+                  throw new Error('需大于0');
+
+                case 4:
+                  if (!(value > totalAmount)) {
+                    _context10.next = 6;
+                    break;
+                  }
+
+                  throw new Error('不可以大于商品金额');
+
+                case 6:
+                case "end":
+                  return _context10.stop();
+              }
+            }
+          }, _callee10);
+        }));
 
-        if (parseFloat(value) > lineAmountSum || parseFloat(value) <= 0) {
-          callback('请输入大于0小于金额合计的数字');
+        function validator(_x7, _x8) {
+          return _validator2.apply(this, arguments);
         }
 
-        callback();
-      }
+        return validator;
+      }()
     }]
-  })( /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Input, {
-    placeholder: "\u8BF7\u8F93\u5165\u5927\u4E8E0\u5C0F\u4E8E\u91D1\u989D\u5408\u8BA1\u7684\u6570\u5B57",
-    suffix: "\xA5",
-    onChange: onChangeDiscolineAmountunt
-  })))), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "add-discount-row-footer"
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Button, {
-    block: true,
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.InputNumber, {
     style: {
-      marginBottom: 12
-    },
-    onClick: onClose
-  }, "\u53D6\u6D88"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Button, {
-    type: "primary",
-    block: true,
-    onClick: onClickSave
-  }, "\u4FDD\u5B58")));
-});
+      width: '100%'
+    }
+  }))));
+}
+/** 判断数组是否连续 */
+
+
+function isContinuityNum(array) {
+  var i = array[0];
+  var isContinuation = true;
+
+  for (var e in array) {
+    if (array[e] != i) {
+      isContinuation = false;
+      break;
+    }
+
+    i++;
+  }
+
+  return isContinuation;
+}
+/** 数组的值是否相等 */
+
+
+function areAllValuesEqual(arr) {
+  for (var i = 1; i < arr.length; i++) {
+    if (arr[i] !== arr[0]) {
+      return false;
+    }
+  }
+
+  return true;
+} // const DrawerBody = decorator<{}, FormComponentProps>(Form.create())((props) => {
+//   const { form } = props;
+//   const { getFieldDecorator } = form;
+//   const controller = Invoice.useInvoiceController();
+//   /** 选中的货物索引列表 */
+//   const discountGoodIndex = controller.useMemo(s => s.goodsListState.discountGoodIndex, []);
+//   /** 金额合计 */
+//   const lineAmountSum = controller.useMemo((s) => {
+//     let sum = chain(0);
+//     if (s.goodsListState.isTaxIncluded) {
+//       s.goodsListState.discountGoodIndex.forEach((e) => {
+//         const goods = s.goodsListState.goodsMap.get(e);
+//         sum = sum.add(goods?.lineAmountIncludeTax || 0);
+//       });
+//     } else {
+//       s.goodsListState.discountGoodIndex.forEach((e) => {
+//         const goods = s.goodsListState.goodsMap.get(e);
+//         sum = sum.add(goods?.lineAmountExcludeTax || 0);
+//       });
+//     }
+//     return sum.done();
+//   }, []);
+//   /** 关闭抽屉 */
+//   const onClose = React.useCallback(() => {
+//     controller.pipeline(async (s) => { s.goodsListState.discountGoodIndex = [] })();
+//   }, []);
+//   /** 点击了保存 */
+//   const onClickSave = React.useCallback(() => {
+//     form.validateFields((err, values) => {
+//       if (err) return;
+//       const discolineAmountunt = parseFloat(parseFloat(values.discolineAmountunt).toFixed(2));
+//       const discount = parseFloat(parseFloat(values.discount).toFixed(4));
+//       const indexList = discountGoodIndex;
+//       controller.pipeline(async s => { s.goodsListState.discountGoodIndex = []; })();
+//       controller.addGoodDiscount({ indexList, discount, discolineAmountunt });
+//     });
+//   }, [controller, form, discountGoodIndex]);
+//   /** 折扣率变化 */
+//   const onChangeDiscount = React.useCallback(
+//     lazyFn((e: React.ChangeEvent<HTMLInputElement>) => {
+//       form.validateFields((err, values) => {
+//         if (err && err.discount) return;
+//         const discolineAmountunt = evaluate(`${lineAmountSum} * (${values.discount}/100)`).toFixed(2);
+//         form.setFieldsValue({ discolineAmountunt });
+//       });
+//     }, 300),
+//     [form, lineAmountSum],
+//   );
+//   /** 折扣变化 */
+//   const onChangeDiscolineAmountunt = React.useCallback(
+//     lazyFn((e: React.ChangeEvent<HTMLInputElement>) => {
+//       form.validateFields((err, values) => {
+//         if (err && err.discolineAmountunt) return;
+//         const discolineAmountunt = parseFloat(values.discolineAmountunt).toFixed(2);
+//         const discount = evaluate(`(${discolineAmountunt} / ${lineAmountSum}) * 100`).toFixed(4);
+//         form.setFieldsValue({ discount });
+//       });
+//     }, 300),
+//     [form, lineAmountSum],
+//   );
+//   return (
+//     <>
+//       <div className="add-discount-row-body">
+//         <p>
+//           当前选择<Text type="danger">{discountGoodIndex.length}</Text>
+//           行被折扣商品行，金额合计¥
+//           <Text type="danger">{lineAmountSum.toFixed(2)}</Text>
+//         </p>
+//         <Form.Item label="折扣率：">
+//           {getFieldDecorator('discount', {
+//             rules: [
+//               { required: true, message: '请输入折扣金额' },
+//               { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '请输入数字' },
+//               {
+//                 validator: (_, value: string, callback) => {
+//                   if (!value) { callback(); return; }
+//                   if (!value.match(/^[+-]?(0|([1-9]\d*))(\.\d+)?$/)?.length) { callback(); return; }
+//                   if (parseFloat(value) > 100 || parseFloat(value) < 0) { callback('请输入大于0小于100的数字'); }
+//                   callback();
+//                 },
+//               },
+//             ],
+//           })(
+//             <Input
+//               placeholder="请输入大于0小于100的数字"
+//               suffix="%"
+//               onChange={onChangeDiscount}
+//             />,
+//           )}
+//         </Form.Item>
+//         <Form.Item label="折扣金额：">
+//           {getFieldDecorator('discolineAmountunt', {
+//             rules: [
+//               { required: true, message: '请输入折扣金额' },
+//               { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '请输入数字' },
+//               {
+//                 validator: (_, value: string, callback) => {
+//                   if (!value) { callback(); return; }
+//                   if (!value.match(/^[+-]?(0|([1-9]\d*))(\.\d+)?$/)?.length) { callback(); return; }
+//                   if (parseFloat(value) > lineAmountSum || parseFloat(value) <= 0) { callback('请输入大于0小于金额合计的数字'); }
+//                   callback();
+//                 },
+//               },
+//             ],
+//           })(
+//             <Input
+//               placeholder="请输入大于0小于金额合计的数字"
+//               suffix="¥"
+//               onChange={onChangeDiscolineAmountunt}
+//             />,
+//           )}
+//         </Form.Item>
+//       </div>
+//       <div className="add-discount-row-footer">
+//         <Button block style={{ marginBottom: 12 }} onClick={onClose}>取消</Button>
+//         <Button type="primary" block onClick={onClickSave}>保存</Button>
+//       </div>
+//     </>
+//   );
+// });
 
 /** 全单合并明细 */
 
@@ -16612,7 +17125,7 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
     className: "kts-invoice-operate-goods-list-able"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, /*#__PURE__*/React__default['default'].createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React__default['default'].createElement(Search, null)), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default['default'].createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, addDiscountRowButton.button, mergeDetails.button, mergeDiscount.button, salesDiscount.button, salesGifts.button, /*#__PURE__*/React__default['default'].createElement(Search, null)), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, /*#__PURE__*/React__default['default'].createElement(DescribeSwitch, null), /*#__PURE__*/React__default['default'].createElement(TaxIncludedSwitch, null))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: classnames__default['default']('kts-invoice-operate-goods-list-table', {
@@ -17559,18 +18072,41 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     className: "digtal-stakeholder-expand-button",
     component: isExpand ? SvgArrowUp : SvgArrowDown,
     onClick: onExpand
-  })), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
+  })), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form, {
+    className: "digtal-stakeholder-form"
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Row, {
+    gutter: [16, 0],
+    className: 'natural-person-flag',
     style: {
-      marginTop: 20
-    },
-    className: 'natural-person-flag'
+      paddingRight: 0
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+    span: 24,
+    style: {
+      display: 'flex',
+      marginBottom: '15px'
+    }
   }, props.isNaturalPerson === true && /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
     colon: false
   }, getFieldDecorator('naturalPersonFlag', {})( /*#__PURE__*/React__default['default'].createElement(NaturalPersonFlag, {
     readOnly: isReadOnly('naturalPersonFlag')
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form, {
-    className: "digtal-stakeholder-form"
-  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Row, {
+  }))), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u5BA2\u6237\u4EE3\u7801",
+    colon: false
+  }, getFieldDecorator('buyerCode', {
+    rules: [{
+      required: true,
+      message: '客户代码必填'
+    }]
+  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Input, {
+    style: {
+      width: '100%'
+    }
+  })))))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Row, {
     gutter: [16, 0]
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 24
@@ -19285,7 +19821,7 @@ function _rollBottom$1() {
 
 /** 延迟函数 */
 
-var lazyFn$2 = function lazyFn(fn) {
+var lazyFn$1 = function lazyFn(fn) {
   var delayed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
   var timer;
   return function () {
@@ -19366,7 +19902,7 @@ var clearCalculatingField$1 = /*#__PURE__*/function () {
 }();
 /** 数量改变了 */
 
-var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
+var onChangeQuantity$1 = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(err, values) {
       var calculatingDigits, quantity, priceIncludeTax, lineAmountIncludeTax, _lineAmountIncludeTax, _priceIncludeTax, priceExcludeTax, lineAmountExcludeTax, _lineAmountExcludeTax, _priceExcludeTax;
@@ -19532,7 +20068,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
 }, 1000);
 /** 单价(含税) */
 
-var onChangePriceIncludeTax$1 = lazyFn$2(function (controller, form, record) {
+var onChangePriceIncludeTax$1 = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(err, values) {
       var calculatingDigits, priceIncludeTax, quantity, lineAmountIncludeTax, _lineAmountIncludeTax2, _quantity;
@@ -19644,7 +20180,7 @@ var onChangePriceIncludeTax$1 = lazyFn$2(function (controller, form, record) {
 }, 1000);
 /** 单价(不含税) */
 
-var onChangePriceExcludeTax$1 = lazyFn$2(function (controller, form, record) {
+var onChangePriceExcludeTax$1 = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(err, values) {
       var calculatingDigits, priceExcludeTax, quantity, lineAmountExcludeTax, _lineAmountExcludeTax2, _quantity2;
@@ -19756,7 +20292,7 @@ var onChangePriceExcludeTax$1 = lazyFn$2(function (controller, form, record) {
 }, 1000);
 /** 金额(含税) */
 
-var onChangeLineAmountIncludeTax$1 = lazyFn$2(function (controller, form, record) {
+var onChangeLineAmountIncludeTax$1 = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(err, values) {
       var calculatingDigits, lineAmountIncludeTax, quantity, priceIncludeTax, _priceIncludeTax2, _quantity3;
@@ -19860,7 +20396,7 @@ var onChangeLineAmountIncludeTax$1 = lazyFn$2(function (controller, form, record
 }, 1000);
 /** 金额(不含税) */
 
-var onChangeLineAmountExcludeTax$1 = lazyFn$2(function (controller, form, record) {
+var onChangeLineAmountExcludeTax$1 = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(err, values) {
       var calculatingDigits, lineAmountExcludeTax, quantity, priceExcludeTax, _priceExcludeTax2, _quantity4;
@@ -19964,7 +20500,7 @@ var onChangeLineAmountExcludeTax$1 = lazyFn$2(function (controller, form, record
 }, 1000);
 /** 税率 */
 
-var onChangeTaxRate$1 = lazyFn$2(function (controller, form, record) {
+var onChangeTaxRate$1 = lazyFn$1(function (controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(err, values) {
       var taxRate;
@@ -20059,7 +20595,7 @@ var onChangeTaxRate$1 = lazyFn$2(function (controller, form, record) {
 }, 1000);
 /** 税额 */
 
-var onChangeTaxAmount = lazyFn$2(function (controller, form, record) {
+var onChangeTaxAmount = lazyFn$1(function (controller, form, record) {
   /** 金额（不含税） */
   var lineAmountExcludeTax;
   form.validateFields( /*#__PURE__*/function () {
@@ -23147,7 +23683,7 @@ var useAddDiscountRowButton$1 = (function () {
                         return _context.abrupt("return");
 
                       case 4:
-                        if (isContinuityNum(s.goodsListState.selectedGoodIndex.map(function (e) {
+                        if (isContinuityNum$1(s.goodsListState.selectedGoodIndex.map(function (e) {
                           var _s$goodsListState$goo;
 
                           return ((_s$goodsListState$goo = s.goodsListState.goodsMap.get(e)) === null || _s$goodsListState$goo === void 0 ? void 0 : _s$goodsListState$goo.serialNo) || -2;
@@ -23184,7 +23720,7 @@ var useAddDiscountRowButton$1 = (function () {
                         return _context.abrupt("return");
 
                       case 11:
-                        if (!(areAllValuesEqual(s.goodsListState.selectedGoodIndex.map(function (e) {
+                        if (!(areAllValuesEqual$1(s.goodsListState.selectedGoodIndex.map(function (e) {
                           var _s$goodsListState$goo3;
 
                           return (_s$goodsListState$goo3 = s.goodsListState.goodsMap.get(e)) === null || _s$goodsListState$goo3 === void 0 ? void 0 : _s$goodsListState$goo3.taxRate;
@@ -23300,7 +23836,7 @@ var useAddDiscountRowButton$1 = (function () {
         size: 'small',
         onClick: onOpen,
         disabled: disabled
-      }, "\u6DFB\u52A0\u6298\u6263"), /*#__PURE__*/React__default['default'].createElement(AddDiscountRowDrawer, {
+      }, "\u6DFB\u52A0\u6298\u6263"), /*#__PURE__*/React__default['default'].createElement(AddDiscountRowDrawer$1, {
         open: open,
         onClose: onClose
       }));
@@ -23314,7 +23850,7 @@ var useAddDiscountRowButton$1 = (function () {
 });
 /** 添加折扣行的抽屉 */
 
-function AddDiscountRowDrawer(props) {
+function AddDiscountRowDrawer$1(props) {
   var open = props.open,
       onClose = props.onClose;
 
@@ -23361,13 +23897,19 @@ function AddDiscountRowDrawer(props) {
   /** 表单变化 */
 
   var onChangeForm = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var values;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            setFormValues(form.getFieldsValue());
+            _context4.next = 2;
+            return form.getFieldsValue();
 
-          case 1:
+          case 2:
+            values = _context4.sent;
+            setFormValues(values);
+
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -23477,7 +24019,14 @@ function AddDiscountRowDrawer(props) {
   React__default['default'].useEffect(function () {
     if (open) {
       form.resetFields();
-      setFormValues(form.getFieldsValue());
+      form.setFieldsValue({
+        discolineType: '1',
+        discolineValue: undefined
+      }); // 强制设置初始值
+
+      setFormValues({
+        discolineType: '1'
+      }); // 强制设置formValues的初始状态
     }
   }, [open]); // 切换 折扣方式 清空折扣值
 
@@ -23507,7 +24056,10 @@ function AddDiscountRowDrawer(props) {
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Form, {
     form: form,
     layout: 'vertical',
-    onChange: onChangeForm
+    onChange: onChangeForm,
+    initialValues: {
+      discolineType: '1'
+    }
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
     label: "\u5546\u54C1\u91D1\u989D\uFF08\u542B\u7A0E\uFF09"
   }, totalAmount.toFixed(2), "\uFF08\u5171 ", discountGood.length, " \u884C\uFF09"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
@@ -23637,7 +24189,7 @@ function AddDiscountRowDrawer(props) {
 /** 判断数组是否连续 */
 
 
-function isContinuityNum(array) {
+function isContinuityNum$1(array) {
   var i = array[0];
   var isContinuation = true;
 
@@ -23655,7 +24207,7 @@ function isContinuityNum(array) {
 /** 数组的值是否相等 */
 
 
-function areAllValuesEqual(arr) {
+function areAllValuesEqual$1(arr) {
   for (var i = 1; i < arr.length; i++) {
     if (arr[i] !== arr[0]) {
       return false;
@@ -26242,10 +26794,10 @@ var ImportBuyerDrawer = (function () {
     width: 983,
     onClose: onClose,
     visible: visible
-  }, topExpand, /*#__PURE__*/React__default['default'].createElement(DrawerBody$1, null));
+  }, topExpand, /*#__PURE__*/React__default['default'].createElement(DrawerBody, null));
 });
 
-var DrawerBody$1 = function DrawerBody() {
+var DrawerBody = function DrawerBody() {
   var controller = Invoice.useInvoiceController();
   var columns = controller.useMemo(function (e) {
     return e.buyerState.columns;
@@ -26375,10 +26927,10 @@ var ImportGoodsDrawer = (function () {
     style: {
       marginBottom: 10
     }
-  }, topExpand), /*#__PURE__*/React__default['default'].createElement(DrawerBody$2, null));
+  }, topExpand), /*#__PURE__*/React__default['default'].createElement(DrawerBody$1, null));
 });
 
-var DrawerBody$2 = function DrawerBody() {
+var DrawerBody$1 = function DrawerBody() {
   var controller = Invoice.useInvoiceController();
   var columns = controller.useMemo(function (s) {
     return s.goodsListState.importGoods.columns;
@@ -26397,6 +26949,11 @@ var DrawerBody$2 = function DrawerBody() {
       }
     });
   }, [controller]);
+
+  var roundTo8Decimals = function roundTo8Decimals(num) {
+    return Math.round(num * 1e8) / 1e8;
+  };
+
   return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Table, {
     bordered: true,
     size: "small",
@@ -26413,6 +26970,8 @@ var DrawerBody$2 = function DrawerBody() {
         onClick: function onClick() {
           controller.run( /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+              var _s$goodsListState$edi, _s$goodsListState$edi2, _s$goodsListState$edi3, _s$goodsListState$edi4, _s$goodsListState$edi5, _s$goodsListState$edi6, _s$goodsListState$edi7, _s$goodsListState$edi8, _s$goodsListState$edi9, _s$goodsListState$edi10, _s$goodsListState$edi11, _s$goodsListState$edi12, _s$goodsListState$edi13, _s$goodsListState$edi14, _s$goodsListState$edi15, _s$goodsListState$edi16;
+
               var between, editGood;
               return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                 while (1) {
@@ -26449,17 +27008,32 @@ var DrawerBody$2 = function DrawerBody() {
                       // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
                       record.quantity = undefined;
                       record.lineAmountExcludeTax = undefined;
-                      record.lineAmountIncludeTax = undefined; // 中间数据
+                      record.lineAmountIncludeTax = undefined; // console.log('s.goodsListState.editGood1:', s.goodsListState.editGood);
+                      //  光电定制化功能：无论是否有值都替换 itemCode, itemName, shorthand, taxCategoryCode, taxClassificationCode； 
+                      // 如果其他输入框有值就不替换，没值就替换：itemModelName, lineAmountExcludeTax, lineAmountIncludeTax,lineAttribute,priceExcludeTax, 
+                      // priceIncludeTax,quantity, serialNo, taxAmount, taxRate, unit 
+                      // 中间数据
+
+                      between = _objectSpread2({}, record); // console.log(':between:', between);
 
-                      between = _objectSpread2({}, record);
                       between.itemName = getItemName(record, s.goodsListState.editGood);
                       between.itemCode = getItemCode(record, s.goodsListState.editGood);
                       between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood); // 设置编辑货物
 
-                      editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), {}, {
-                        itemModelName: undefined,
-                        itemModelNameSelf: undefined
-                      }, between);
+                      editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between), {}, {
+                        itemModelName: (_s$goodsListState$edi = (_s$goodsListState$edi2 = s.goodsListState.editGood) === null || _s$goodsListState$edi2 === void 0 ? void 0 : _s$goodsListState$edi2.itemModelName) !== null && _s$goodsListState$edi !== void 0 ? _s$goodsListState$edi : between.itemModelName,
+                        itemModelNameSelf: (_s$goodsListState$edi3 = (_s$goodsListState$edi4 = s.goodsListState.editGood) === null || _s$goodsListState$edi4 === void 0 ? void 0 : _s$goodsListState$edi4.itemModelNameSelf) !== null && _s$goodsListState$edi3 !== void 0 ? _s$goodsListState$edi3 : between.itemModelNameSelf,
+                        lineAmountExcludeTax: (_s$goodsListState$edi5 = (_s$goodsListState$edi6 = s.goodsListState.editGood) === null || _s$goodsListState$edi6 === void 0 ? void 0 : _s$goodsListState$edi6.lineAmountExcludeTax) !== null && _s$goodsListState$edi5 !== void 0 ? _s$goodsListState$edi5 : between.lineAmountExcludeTax,
+                        lineAmountIncludeTax: (_s$goodsListState$edi7 = (_s$goodsListState$edi8 = s.goodsListState.editGood) === null || _s$goodsListState$edi8 === void 0 ? void 0 : _s$goodsListState$edi8.lineAmountIncludeTax) !== null && _s$goodsListState$edi7 !== void 0 ? _s$goodsListState$edi7 : between.lineAmountIncludeTax,
+                        priceExcludeTax: roundTo8Decimals((_s$goodsListState$edi9 = (_s$goodsListState$edi10 = s.goodsListState.editGood) === null || _s$goodsListState$edi10 === void 0 ? void 0 : _s$goodsListState$edi10.priceExcludeTax) !== null && _s$goodsListState$edi9 !== void 0 ? _s$goodsListState$edi9 : between.priceExcludeTax),
+                        priceIncludeTax: roundTo8Decimals((_s$goodsListState$edi11 = (_s$goodsListState$edi12 = s.goodsListState.editGood) === null || _s$goodsListState$edi12 === void 0 ? void 0 : _s$goodsListState$edi12.priceIncludeTax) !== null && _s$goodsListState$edi11 !== void 0 ? _s$goodsListState$edi11 : between.priceIncludeTax),
+                        quantity: (_s$goodsListState$edi13 = (_s$goodsListState$edi14 = s.goodsListState.editGood) === null || _s$goodsListState$edi14 === void 0 ? void 0 : _s$goodsListState$edi14.quantity) !== null && _s$goodsListState$edi13 !== void 0 ? _s$goodsListState$edi13 : between.quantity,
+                        unit: (_s$goodsListState$edi15 = (_s$goodsListState$edi16 = s.goodsListState.editGood) === null || _s$goodsListState$edi16 === void 0 ? void 0 : _s$goodsListState$edi16.unit) !== null && _s$goodsListState$edi15 !== void 0 ? _s$goodsListState$edi15 : between.unit // serialNo:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                        // taxAmount:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                        // taxRate:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                        // lineAttribute:s.goodsListState.editGood?.lineAttribute, 
+
+                      });
 
                       if (editGood.taxRate) {
                         editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood);
@@ -26469,7 +27043,7 @@ var DrawerBody$2 = function DrawerBody() {
                         editGood.priceIncludeTax = undefined;
                         editGood.priceExcludeTax = undefined;
                       } else {
-                        editGood.priceExcludeTax = getPriceExcludeTax$1(editGood, record, s.calculatingDigits);
+                        editGood.priceExcludeTax = editGood.priceExcludeTax || getPriceExcludeTax$1(editGood, record, 8);
                       }
 
                       if (editGood.quantity && editGood.priceIncludeTax) {
@@ -26487,7 +27061,7 @@ var DrawerBody$2 = function DrawerBody() {
                       //   s.goodsListState.form.setFieldsValue({
                       //     ...editGood,
                       //   });
-                      // }
+                      // } 
 
                       s.goodsListState.importGoods.isVisibleDrawer = false;
 
@@ -26719,12 +27293,12 @@ var EndowCodeDrawer = (function () {
     width: 383,
     onClose: onClose,
     visible: visible
-  }, defaultValue && /*#__PURE__*/React__default['default'].createElement(DrawerBody$3, {
+  }, defaultValue && /*#__PURE__*/React__default['default'].createElement(DrawerBody$2, {
     defaultValue: defaultValue
   }));
 });
 
-var DrawerBody$3 = function DrawerBody(props) {
+var DrawerBody$2 = function DrawerBody(props) {
   var _defaultValue$taxRate, _defaultValue$favoure;
 
   var controller = Invoice.useInvoiceController();