kts-component-invoice-operate 3.2.181-5 → 3.2.181-7

package/dist/index.esm.js

@@ -8491,12 +8491,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) {
@@ -8535,113 +8593,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)), calculatingDigits);
               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)), calculatingDigits);
               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();
           }
@@ -8659,7 +8673,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) {
@@ -8735,8 +8749,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
               });
@@ -8771,7 +8785,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) {
@@ -8847,8 +8861,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
               });
@@ -8883,7 +8897,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) {
@@ -8951,8 +8965,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, calculatingDigits);
+              _quantity3 = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(_priceIncludeTax)), calculatingDigits);
               form.setFieldsValue({
                 quantity: _quantity3
               });
@@ -8987,7 +9001,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) {
@@ -9055,8 +9069,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, calculatingDigits);
+              _quantity4 = format15(evaluate("".concat(lineAmountExcludeTax, " / ").concat(_priceExcludeTax)), calculatingDigits);
               form.setFieldsValue({
                 quantity: _quantity4
               });
@@ -9802,21 +9816,21 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
 
                                 var _quantity5 = format15(sourceQuantity, calculatingDigits);
 
-                                var _priceExcludeTax3 = format15(sourcePriceExcludeTax, calculatingDigits);
+                                var _priceExcludeTax2 = format15(sourcePriceExcludeTax, calculatingDigits);
 
-                                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)), calculatingDigits);
 
-                                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
                                 });
                               }
                             });
@@ -14001,13 +14015,14 @@ var useColumns = (function (form) {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('priceIncludeTax', {
             initialValue: nonScientificNotation(editGood.priceIncludeTax),
             getValueFromEvent: onNumberValueChange,
-            rules: [].concat(_toConsumableArray(getReplenishRules('priceIncludeTax')), [{
+            rules: [].concat(_toConsumableArray(getReplenishRules('priceIncludeTax')), [// { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
+            {
               pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-              message: '单价必须为数字'
+              message: '金额必须为数字'
             }, {
               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) {
@@ -14016,20 +14031,38 @@ 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)) {
+                            _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();
                       }
@@ -14082,29 +14115,44 @@ var useColumns = (function (form) {
             }, {
               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) {
                         case 0:
-                          _context10.next = 2;
-                          return controller.wait();
-
-                        case 2:
-                          isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
-                          isvalue = !!value || value === 0;
-
-                          if (!(isvalue || isQuantity === isvalue)) {
-                            _context10.next = 6;
+                          // await controller.wait();
+                          // 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)) {
+                            _context10.next = 5;
                             break;
                           }
 
                           return _context10.abrupt("return");
 
-                        case 6:
-                          callback('请输入单价');
+                        case 5:
+                          if (isValueValid) {
+                            _context10.next = 7;
+                            break;
+                          }
+
+                          return _context10.abrupt("return", callback('金额不能为空'));
 
                         case 7:
+                          if (isQuantityValid) {
+                            _context10.next = 9;
+                            break;
+                          }
+
+                          return _context10.abrupt("return", callback('数量不能为空'));
+
+                        case 9:
                         case "end":
                           return _context10.stop();
                       }
@@ -15794,13 +15842,19 @@ function AddDiscountRowDrawer(props) {
   /** 表单变化 */
 
   var onChangeForm = React.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:
-            setFormValues(form.getFieldsValue());
+            _context6.next = 2;
+            return form.getFieldsValue();
 
-          case 1:
+          case 2:
+            values = _context6.sent;
+            setFormValues(values);
+
+          case 4:
           case "end":
             return _context6.stop();
         }
@@ -15908,18 +15962,18 @@ function AddDiscountRowDrawer(props) {
   })), [discountGood, form, totalAmount, onClose, controller]); // 打开抽屉时 重置form
 
   React.useEffect(function () {
-    // if (open) {
-    // form.resetFields();
-    // setFormValues(form.getFieldsValue())
-    // } 
     if (open) {
       form.resetFields();
       form.setFieldsValue({
+        discolineType: '1',
+        discolineValue: undefined
+      }); // 强制设置初始值
+
+      setFormValues({
         discolineType: '1'
       });
-      setFormValues(form.getFieldsValue());
     }
-  }, [open, form]); // 切换 折扣方式 清空折扣值
+  }, [open]); // 切换 折扣方式 清空折扣值
 
   React.useEffect(function () {
     form.setFieldsValue(_objectSpread2(_objectSpread2({}, formValues), {}, {
@@ -23816,13 +23870,19 @@ function AddDiscountRowDrawer$1(props) {
   /** 表单变化 */
 
   var onChangeForm = React.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();
         }
@@ -23932,7 +23992,14 @@ function AddDiscountRowDrawer$1(props) {
   React.useEffect(function () {
     if (open) {
       form.resetFields();
-      setFormValues(form.getFieldsValue());
+      form.setFieldsValue({
+        discolineType: '1',
+        discolineValue: undefined
+      }); // 强制设置初始值
+
+      setFormValues({
+        discolineType: '1'
+      }); // 强制设置formValues的初始状态
     }
   }, [open]); // 切换 折扣方式 清空折扣值
 
@@ -23962,7 +24029,10 @@ function AddDiscountRowDrawer$1(props) {
   }, /*#__PURE__*/React.createElement(Form$1, {
     form: form,
     layout: 'vertical',
-    onChange: onChangeForm
+    onChange: onChangeForm,
+    initialValues: {
+      discolineType: '1'
+    }
   }, /*#__PURE__*/React.createElement(Form$1.Item, {
     label: "\u5546\u54C1\u91D1\u989D\uFF08\u542B\u7A0E\uFF09"
   }, totalAmount.toFixed(2), "\uFF08\u5171 ", discountGood.length, " \u884C\uFF09"), /*#__PURE__*/React.createElement(Form$1.Item, {
@@ -26868,6 +26938,8 @@ var DrawerBody$1 = 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;
+
               var between, editGood;
               return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                 while (1) {
@@ -26904,17 +26976,31 @@ var DrawerBody$1 = function DrawerBody() {
                       // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
                       record.quantity = undefined;
                       record.lineAmountExcludeTax = undefined;
-                      record.lineAmountIncludeTax = undefined; // 中间数据
+                      record.lineAmountIncludeTax = undefined;
+                      console.log('s.goodsListState.editGood:', 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.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,
+                        lineAmountExcludeTax: (_s$goodsListState$edi3 = (_s$goodsListState$edi4 = s.goodsListState.editGood) === null || _s$goodsListState$edi4 === void 0 ? void 0 : _s$goodsListState$edi4.lineAmountExcludeTax) !== null && _s$goodsListState$edi3 !== void 0 ? _s$goodsListState$edi3 : between.lineAmountExcludeTax,
+                        lineAmountIncludeTax: (_s$goodsListState$edi5 = (_s$goodsListState$edi6 = s.goodsListState.editGood) === null || _s$goodsListState$edi6 === void 0 ? void 0 : _s$goodsListState$edi6.lineAmountIncludeTax) !== null && _s$goodsListState$edi5 !== void 0 ? _s$goodsListState$edi5 : between.lineAmountIncludeTax,
+                        // lineAttribute:s.goodsListState.editGood?.lineAttribute, 
+                        priceExcludeTax: (_s$goodsListState$edi7 = (_s$goodsListState$edi8 = s.goodsListState.editGood) === null || _s$goodsListState$edi8 === void 0 ? void 0 : _s$goodsListState$edi8.priceExcludeTax) !== null && _s$goodsListState$edi7 !== void 0 ? _s$goodsListState$edi7 : between.priceExcludeTax,
+                        priceIncludeTax: (_s$goodsListState$edi9 = (_s$goodsListState$edi10 = s.goodsListState.editGood) === null || _s$goodsListState$edi10 === void 0 ? void 0 : _s$goodsListState$edi10.priceIncludeTax) !== null && _s$goodsListState$edi9 !== void 0 ? _s$goodsListState$edi9 : between.priceIncludeTax,
+                        quantity: (_s$goodsListState$edi11 = (_s$goodsListState$edi12 = s.goodsListState.editGood) === null || _s$goodsListState$edi12 === void 0 ? void 0 : _s$goodsListState$edi12.quantity) !== null && _s$goodsListState$edi11 !== void 0 ? _s$goodsListState$edi11 : between.quantity,
+                        // serialNo:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                        // taxAmount:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                        // taxRate:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                        unit: (_s$goodsListState$edi13 = (_s$goodsListState$edi14 = s.goodsListState.editGood) === null || _s$goodsListState$edi14 === void 0 ? void 0 : _s$goodsListState$edi14.unit) !== null && _s$goodsListState$edi13 !== void 0 ? _s$goodsListState$edi13 : between.unit
+                      });
 
                       if (editGood.taxRate) {
                         editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood);
@@ -26942,27 +27028,27 @@ var DrawerBody$1 = function DrawerBody() {
                       //   s.goodsListState.form.setFieldsValue({
                       //     ...editGood,
                       //   });
-                      // }
+                      // } 
 
                       s.goodsListState.importGoods.isVisibleDrawer = false;
 
                       if (!s.goodsListState.isTaxIncluded) {
-                        _context2.next = 26;
+                        _context2.next = 28;
                         break;
                       }
 
-                      _context2.next = 24;
+                      _context2.next = 26;
                       return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
 
-                    case 24:
-                      _context2.next = 28;
+                    case 26:
+                      _context2.next = 30;
                       break;
 
-                    case 26:
-                      _context2.next = 28;
+                    case 28:
+                      _context2.next = 30;
                       return updateUnitPriceTax(controller, s.goodsListState.form, record);
 
-                    case 28:
+                    case 30:
                     case "end":
                       return _context2.stop();
                   }