kts-component-invoice-operate 1.0.68 → 1.0.73

package/dist/index.esm.js

@@ -2763,26 +2763,34 @@ var onChangeLineAmountIncludeTax = lazyFn$1(function (controller, form, record)
               err = err || {};
 
               if (!(err.lineAmountIncludeTax || !values.lineAmountIncludeTax)) {
-                _context4.next = 3;
+                _context4.next = 6;
                 break;
               }
 
+              _context4.next = 4;
+              return controller.setEditGood({
+                lineAmountIncludeTax: undefined,
+                lineAmountExcludeTax: undefined
+              });
+
+            case 4:
+              updateUnitPriceExcludingTax(controller, form);
               return _context4.abrupt("return");
 
-            case 3:
+            case 6:
               lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
-              _context4.next = 6;
+              _context4.next = 9;
               return controller.setEditGood({
                 lineAmountIncludeTax: lineAmountIncludeTax
               });
 
-            case 6:
+            case 9:
               form.setFieldsValue({
                 lineAmountIncludeTax: lineAmountIncludeTax
               }); // 是否有数量
 
               if (!(!err.quantity && values.quantity)) {
-                _context4.next = 15;
+                _context4.next = 18;
                 break;
               }
 
@@ -2791,18 +2799,18 @@ var onChangeLineAmountIncludeTax = lazyFn$1(function (controller, form, record)
               form.setFieldsValue({
                 priceIncludeTax: priceIncludeTax
               });
-              _context4.next = 13;
+              _context4.next = 16;
               return controller.setEditGood({
                 priceIncludeTax: priceIncludeTax
               });
 
-            case 13:
-              _context4.next = 21;
+            case 16:
+              _context4.next = 24;
               break;
 
-            case 15:
+            case 18:
               if (!(!err.priceIncludeTax && (values.priceIncludeTax || values.priceIncludeTax === 0))) {
-                _context4.next = 21;
+                _context4.next = 24;
                 break;
               }
 
@@ -2811,16 +2819,16 @@ var onChangeLineAmountIncludeTax = lazyFn$1(function (controller, form, record)
               form.setFieldsValue({
                 quantity: _quantity3
               });
-              _context4.next = 21;
+              _context4.next = 24;
               return controller.setEditGood({
                 quantity: _quantity3
               });
 
-            case 21:
+            case 24:
               // 更新不含税
               updateUnitPriceExcludingTax(controller, form);
 
-            case 22:
+            case 25:
             case "end":
               return _context4.stop();
           }
@@ -2847,26 +2855,32 @@ var onChangeLineAmountExcludeTax = lazyFn$1(function (controller, form, record)
               err = err || {};
 
               if (!(err.lineAmountExcludeTax || !values.lineAmountExcludeTax)) {
-                _context5.next = 3;
+                _context5.next = 5;
                 break;
               }
 
-              return _context5.abrupt("return");
+              // 更新含税
+              updateUnitPriceTax(controller, form);
+              _context5.next = 5;
+              return controller.setEditGood({
+                lineAmountIncludeTax: undefined,
+                lineAmountExcludeTax: undefined
+              });
 
-            case 3:
+            case 5:
               lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
-              _context5.next = 6;
+              _context5.next = 8;
               return controller.setEditGood({
                 lineAmountExcludeTax: lineAmountExcludeTax
               });
 
-            case 6:
+            case 8:
               form.setFieldsValue({
                 lineAmountExcludeTax: lineAmountExcludeTax
               }); // 是否有数量
 
               if (!(!err.quantity && values.quantity)) {
-                _context5.next = 15;
+                _context5.next = 17;
                 break;
               }
 
@@ -2875,18 +2889,18 @@ var onChangeLineAmountExcludeTax = lazyFn$1(function (controller, form, record)
               form.setFieldsValue({
                 priceExcludeTax: priceExcludeTax
               });
-              _context5.next = 13;
+              _context5.next = 15;
               return controller.setEditGood({
                 priceExcludeTax: priceExcludeTax
               });
 
-            case 13:
-              _context5.next = 21;
+            case 15:
+              _context5.next = 23;
               break;
 
-            case 15:
+            case 17:
               if (!(!err.priceExcludeTax && values.priceExcludeTax)) {
-                _context5.next = 21;
+                _context5.next = 23;
                 break;
               }
 
@@ -2895,16 +2909,16 @@ var onChangeLineAmountExcludeTax = lazyFn$1(function (controller, form, record)
               form.setFieldsValue({
                 quantity: _quantity4
               });
-              _context5.next = 21;
+              _context5.next = 23;
               return controller.setEditGood({
                 quantity: _quantity4
               });
 
-            case 21:
+            case 23:
               // 更新含税
               updateUnitPriceTax(controller, form);
 
-            case 22:
+            case 24:
             case "end":
               return _context5.stop();
           }
@@ -2977,7 +2991,7 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
               err = err || {};
 
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !err.lineAmountIncludeTax && (values.lineAmountIncludeTax || values.lineAmountIncludeTax === 0))) {
-                _context7.next = 10;
+                _context7.next = 12;
                 break;
               }
 
@@ -3001,19 +3015,32 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
               });
 
             case 10:
+              _context7.next = 15;
+              break;
+
+            case 12:
+              form.setFieldsValue({
+                taxAmount: null
+              });
+              _context7.next = 15;
+              return controller.setEditGood({
+                taxAmount: null
+              });
+
+            case 15:
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !err.priceIncludeTax && (values.priceIncludeTax || values.priceIncludeTax === 0))) {
-                _context7.next = 15;
+                _context7.next = 20;
                 break;
               }
 
               priceIncludeTax = format15(values.priceIncludeTax);
               priceExcludeTax = format15(evaluate("".concat(priceIncludeTax, " / (1+(").concat(values.taxRate, "/100))")));
-              _context7.next = 15;
+              _context7.next = 20;
               return controller.setEditGood({
                 priceExcludeTax: priceExcludeTax
               });
 
-            case 15:
+            case 20:
             case "end":
               return _context7.stop();
           }
@@ -3039,7 +3066,7 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               err = err || {};
 
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !err.lineAmountExcludeTax && (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0))) {
-                _context8.next = 10;
+                _context8.next = 12;
                 break;
               }
 
@@ -3063,19 +3090,32 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               });
 
             case 10:
+              _context8.next = 15;
+              break;
+
+            case 12:
+              form.setFieldsValue({
+                taxAmount: undefined
+              });
+              _context8.next = 15;
+              return controller.setEditGood({
+                taxAmount: undefined
+              });
+
+            case 15:
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !err.priceExcludeTax && (values.priceExcludeTax || values.priceExcludeTax === 0))) {
-                _context8.next = 15;
+                _context8.next = 20;
                 break;
               }
 
               priceExcludeTax = format15(values.priceExcludeTax);
               priceIncludeTax = format15(evaluate("".concat(priceExcludeTax, " * (1+(").concat(values.taxRate, "/100))")));
-              _context8.next = 15;
+              _context8.next = 20;
               return controller.setEditGood({
                 priceIncludeTax: priceIncludeTax
               });
 
-            case 15:
+            case 20:
             case "end":
               return _context8.stop();
           }
@@ -4908,6 +4948,19 @@ var ImportGoodsDrawer = (function () {
       };
     }())();
   }, [controller]);
+  React.useEffect(function () {
+    setTimeout(function () {
+      console.log(window.document.querySelector('.ktsAnt3x-drawer'));
+
+      if (visible) {
+        var _window$document$quer;
+
+        (_window$document$quer = window.document.querySelector('.ktsAnt3x-drawer')) === null || _window$document$quer === void 0 ? void 0 : _window$document$quer.addEventListener('click', function (e) {// debugger
+          // e.stopPropagation();
+        }, true);
+      }
+    });
+  }, [visible]);
   return /*#__PURE__*/React.createElement(Drawer, {
     title: "\u5546\u54C1\u5217\u8868",
     placement: "right",
@@ -4915,7 +4968,10 @@ var ImportGoodsDrawer = (function () {
     destroyOnClose: true,
     width: 983,
     onClose: onClose,
-    visible: visible
+    visible: visible,
+    getContainer: function getContainer() {
+      return window.document.querySelector('.kts-invoice-operate-goods-list-able');
+    }
   }, topExpand && /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: 10
@@ -4934,6 +4990,11 @@ var DrawerBody$2 = function DrawerBody() {
   var pagination = controller.useMemo(function (s) {
     return s.goodsListState.importGoods.pagination;
   }, []);
+
+  var _React$useState = React.useState(controller.state.goodsListState.editGood),
+      _React$useState2 = _slicedToArray(_React$useState, 1),
+      editGood = _React$useState2[0];
+
   React.useEffect(function () {
     controller.getGoodsList && controller.getGoodsList({
       pagination: {
@@ -4961,44 +5022,70 @@ var DrawerBody$2 = function DrawerBody() {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
                     case 0:
-                      debugger;
+                      if (!s.goodsListState.editGood) {
+                        _context2.next = 2;
+                        break;
+                      }
+
+                      return _context2.abrupt("return");
+
+                    case 2:
+                      s.goodsListState.editGood = editGood;
+
+                    case 3:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }
+              }, _callee2);
+            }));
+
+            return function (_x2) {
+              return _ref2.apply(this, arguments);
+            };
+          }(), /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
+              return regeneratorRuntime.wrap(function _callee3$(_context3) {
+                while (1) {
+                  switch (_context3.prev = _context3.next) {
+                    case 0:
                       Object.keys(record).filter(function (e) {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
                       });
-                      _context2.next = 4;
+                      _context3.next = 3;
                       return s.goodsListState.importGoods.verifyFn(record);
 
-                    case 4:
-                      _context2.t0 = _context2.sent;
+                    case 3:
+                      _context3.t0 = _context3.sent;
 
-                      if (!(_context2.t0 === false)) {
-                        _context2.next = 7;
+                      if (!(_context3.t0 === false)) {
+                        _context3.next = 6;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
-                    case 7:
+                    case 6:
                       if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
-                        _context2.next = 9;
+                        _context3.next = 8;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
-                    case 9:
+                    case 8:
                       s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
                       if (s.goodsListState.editGood) {
-                        _context2.next = 12;
+                        _context3.next = 11;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
-                    case 12:
+                    case 11:
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -5012,16 +5099,16 @@ var DrawerBody$2 = function DrawerBody() {
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
-                    case 18:
+                    case 17:
                     case "end":
-                      return _context2.stop();
+                      return _context3.stop();
                   }
                 }
-              }, _callee2);
+              }, _callee3);
             }));
 
-            return function (_x2) {
-              return _ref2.apply(this, arguments);
+            return function (_x3) {
+              return _ref3.apply(this, arguments);
             };
           }())();
         }

package/dist/index.js

@@ -2772,26 +2772,34 @@ var onChangeLineAmountIncludeTax = lazyFn$1(function (controller, form, record)
               err = err || {};
 
               if (!(err.lineAmountIncludeTax || !values.lineAmountIncludeTax)) {
-                _context4.next = 3;
+                _context4.next = 6;
                 break;
               }
 
+              _context4.next = 4;
+              return controller.setEditGood({
+                lineAmountIncludeTax: undefined,
+                lineAmountExcludeTax: undefined
+              });
+
+            case 4:
+              updateUnitPriceExcludingTax(controller, form);
               return _context4.abrupt("return");
 
-            case 3:
+            case 6:
               lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
-              _context4.next = 6;
+              _context4.next = 9;
               return controller.setEditGood({
                 lineAmountIncludeTax: lineAmountIncludeTax
               });
 
-            case 6:
+            case 9:
               form.setFieldsValue({
                 lineAmountIncludeTax: lineAmountIncludeTax
               }); // 是否有数量
 
               if (!(!err.quantity && values.quantity)) {
-                _context4.next = 15;
+                _context4.next = 18;
                 break;
               }
 
@@ -2800,18 +2808,18 @@ var onChangeLineAmountIncludeTax = lazyFn$1(function (controller, form, record)
               form.setFieldsValue({
                 priceIncludeTax: priceIncludeTax
               });
-              _context4.next = 13;
+              _context4.next = 16;
               return controller.setEditGood({
                 priceIncludeTax: priceIncludeTax
               });
 
-            case 13:
-              _context4.next = 21;
+            case 16:
+              _context4.next = 24;
               break;
 
-            case 15:
+            case 18:
               if (!(!err.priceIncludeTax && (values.priceIncludeTax || values.priceIncludeTax === 0))) {
-                _context4.next = 21;
+                _context4.next = 24;
                 break;
               }
 
@@ -2820,16 +2828,16 @@ var onChangeLineAmountIncludeTax = lazyFn$1(function (controller, form, record)
               form.setFieldsValue({
                 quantity: _quantity3
               });
-              _context4.next = 21;
+              _context4.next = 24;
               return controller.setEditGood({
                 quantity: _quantity3
               });
 
-            case 21:
+            case 24:
               // 更新不含税
               updateUnitPriceExcludingTax(controller, form);
 
-            case 22:
+            case 25:
             case "end":
               return _context4.stop();
           }
@@ -2856,26 +2864,32 @@ var onChangeLineAmountExcludeTax = lazyFn$1(function (controller, form, record)
               err = err || {};
 
               if (!(err.lineAmountExcludeTax || !values.lineAmountExcludeTax)) {
-                _context5.next = 3;
+                _context5.next = 5;
                 break;
               }
 
-              return _context5.abrupt("return");
+              // 更新含税
+              updateUnitPriceTax(controller, form);
+              _context5.next = 5;
+              return controller.setEditGood({
+                lineAmountIncludeTax: undefined,
+                lineAmountExcludeTax: undefined
+              });
 
-            case 3:
+            case 5:
               lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
-              _context5.next = 6;
+              _context5.next = 8;
               return controller.setEditGood({
                 lineAmountExcludeTax: lineAmountExcludeTax
               });
 
-            case 6:
+            case 8:
               form.setFieldsValue({
                 lineAmountExcludeTax: lineAmountExcludeTax
               }); // 是否有数量
 
               if (!(!err.quantity && values.quantity)) {
-                _context5.next = 15;
+                _context5.next = 17;
                 break;
               }
 
@@ -2884,18 +2898,18 @@ var onChangeLineAmountExcludeTax = lazyFn$1(function (controller, form, record)
               form.setFieldsValue({
                 priceExcludeTax: priceExcludeTax
               });
-              _context5.next = 13;
+              _context5.next = 15;
               return controller.setEditGood({
                 priceExcludeTax: priceExcludeTax
               });
 
-            case 13:
-              _context5.next = 21;
+            case 15:
+              _context5.next = 23;
               break;
 
-            case 15:
+            case 17:
               if (!(!err.priceExcludeTax && values.priceExcludeTax)) {
-                _context5.next = 21;
+                _context5.next = 23;
                 break;
               }
 
@@ -2904,16 +2918,16 @@ var onChangeLineAmountExcludeTax = lazyFn$1(function (controller, form, record)
               form.setFieldsValue({
                 quantity: _quantity4
               });
-              _context5.next = 21;
+              _context5.next = 23;
               return controller.setEditGood({
                 quantity: _quantity4
               });
 
-            case 21:
+            case 23:
               // 更新含税
               updateUnitPriceTax(controller, form);
 
-            case 22:
+            case 24:
             case "end":
               return _context5.stop();
           }
@@ -2986,7 +3000,7 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
               err = err || {};
 
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !err.lineAmountIncludeTax && (values.lineAmountIncludeTax || values.lineAmountIncludeTax === 0))) {
-                _context7.next = 10;
+                _context7.next = 12;
                 break;
               }
 
@@ -3010,19 +3024,32 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
               });
 
             case 10:
+              _context7.next = 15;
+              break;
+
+            case 12:
+              form.setFieldsValue({
+                taxAmount: null
+              });
+              _context7.next = 15;
+              return controller.setEditGood({
+                taxAmount: null
+              });
+
+            case 15:
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !err.priceIncludeTax && (values.priceIncludeTax || values.priceIncludeTax === 0))) {
-                _context7.next = 15;
+                _context7.next = 20;
                 break;
               }
 
               priceIncludeTax = format15(values.priceIncludeTax);
               priceExcludeTax = format15(evaluate("".concat(priceIncludeTax, " / (1+(").concat(values.taxRate, "/100))")));
-              _context7.next = 15;
+              _context7.next = 20;
               return controller.setEditGood({
                 priceExcludeTax: priceExcludeTax
               });
 
-            case 15:
+            case 20:
             case "end":
               return _context7.stop();
           }
@@ -3048,7 +3075,7 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               err = err || {};
 
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !err.lineAmountExcludeTax && (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0))) {
-                _context8.next = 10;
+                _context8.next = 12;
                 break;
               }
 
@@ -3072,19 +3099,32 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               });
 
             case 10:
+              _context8.next = 15;
+              break;
+
+            case 12:
+              form.setFieldsValue({
+                taxAmount: undefined
+              });
+              _context8.next = 15;
+              return controller.setEditGood({
+                taxAmount: undefined
+              });
+
+            case 15:
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !err.priceExcludeTax && (values.priceExcludeTax || values.priceExcludeTax === 0))) {
-                _context8.next = 15;
+                _context8.next = 20;
                 break;
               }
 
               priceExcludeTax = format15(values.priceExcludeTax);
               priceIncludeTax = format15(evaluate("".concat(priceExcludeTax, " * (1+(").concat(values.taxRate, "/100))")));
-              _context8.next = 15;
+              _context8.next = 20;
               return controller.setEditGood({
                 priceIncludeTax: priceIncludeTax
               });
 
-            case 15:
+            case 20:
             case "end":
               return _context8.stop();
           }
@@ -4917,6 +4957,19 @@ var ImportGoodsDrawer = (function () {
       };
     }())();
   }, [controller]);
+  React__default['default'].useEffect(function () {
+    setTimeout(function () {
+      console.log(window.document.querySelector('.ktsAnt3x-drawer'));
+
+      if (visible) {
+        var _window$document$quer;
+
+        (_window$document$quer = window.document.querySelector('.ktsAnt3x-drawer')) === null || _window$document$quer === void 0 ? void 0 : _window$document$quer.addEventListener('click', function (e) {// debugger
+          // e.stopPropagation();
+        }, true);
+      }
+    });
+  }, [visible]);
   return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Drawer, {
     title: "\u5546\u54C1\u5217\u8868",
     placement: "right",
@@ -4924,7 +4977,10 @@ var ImportGoodsDrawer = (function () {
     destroyOnClose: true,
     width: 983,
     onClose: onClose,
-    visible: visible
+    visible: visible,
+    getContainer: function getContainer() {
+      return window.document.querySelector('.kts-invoice-operate-goods-list-able');
+    }
   }, topExpand && /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       marginBottom: 10
@@ -4943,6 +4999,11 @@ var DrawerBody$2 = function DrawerBody() {
   var pagination = controller.useMemo(function (s) {
     return s.goodsListState.importGoods.pagination;
   }, []);
+
+  var _React$useState = React__default['default'].useState(controller.state.goodsListState.editGood),
+      _React$useState2 = _slicedToArray(_React$useState, 1),
+      editGood = _React$useState2[0];
+
   React__default['default'].useEffect(function () {
     controller.getGoodsList && controller.getGoodsList({
       pagination: {
@@ -4970,44 +5031,70 @@ var DrawerBody$2 = function DrawerBody() {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
                     case 0:
-                      debugger;
+                      if (!s.goodsListState.editGood) {
+                        _context2.next = 2;
+                        break;
+                      }
+
+                      return _context2.abrupt("return");
+
+                    case 2:
+                      s.goodsListState.editGood = editGood;
+
+                    case 3:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }
+              }, _callee2);
+            }));
+
+            return function (_x2) {
+              return _ref2.apply(this, arguments);
+            };
+          }(), /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
+              return regeneratorRuntime.wrap(function _callee3$(_context3) {
+                while (1) {
+                  switch (_context3.prev = _context3.next) {
+                    case 0:
                       Object.keys(record).filter(function (e) {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
                       });
-                      _context2.next = 4;
+                      _context3.next = 3;
                       return s.goodsListState.importGoods.verifyFn(record);
 
-                    case 4:
-                      _context2.t0 = _context2.sent;
+                    case 3:
+                      _context3.t0 = _context3.sent;
 
-                      if (!(_context2.t0 === false)) {
-                        _context2.next = 7;
+                      if (!(_context3.t0 === false)) {
+                        _context3.next = 6;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
-                    case 7:
+                    case 6:
                       if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
-                        _context2.next = 9;
+                        _context3.next = 8;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
-                    case 9:
+                    case 8:
                       s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
                       if (s.goodsListState.editGood) {
-                        _context2.next = 12;
+                        _context3.next = 11;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
-                    case 12:
+                    case 11:
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -5021,16 +5108,16 @@ var DrawerBody$2 = function DrawerBody() {
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
-                    case 18:
+                    case 17:
                     case "end":
-                      return _context2.stop();
+                      return _context3.stop();
                   }
                 }
-              }, _callee2);
+              }, _callee3);
             }));
 
-            return function (_x2) {
-              return _ref2.apply(this, arguments);
+            return function (_x3) {
+              return _ref3.apply(this, arguments);
             };
           }())();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "1.0.68",
+  "version": "1.0.73",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/Invoice/_test/importGoods/index.tsx

@@ -139,7 +139,7 @@ const getMok = async (current: number = 1) => {
       "specification": "苹果一号",
       "spuCode": "6000000040810519",
       "status": 1,
-      "taxCategoryCode": "1100101020200000000",
+      // "taxCategoryCode": "1100101020200000000",
       "taxExemptionType": "",
       "taxId": 5,
       "taxRate": 3,

package/src/Invoice/ui/GoodsList/hook/useColumns/autoFillFn/index.ts

@@ -173,7 +173,12 @@ export const onChangeLineAmountIncludeTax = lazyFn(
     form.validateFields(async (err, values) => {
 
       err = err || {};
-      if (err.lineAmountIncludeTax || !values.lineAmountIncludeTax) return;
+      if (err.lineAmountIncludeTax || !values.lineAmountIncludeTax) {
+        // 更新不含税
+        await controller.setEditGood({ lineAmountIncludeTax: undefined, lineAmountExcludeTax: undefined });
+        updateUnitPriceExcludingTax(controller, form, record);
+        return;
+      }
 
       const lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
       await controller.setEditGood({ lineAmountIncludeTax });
@@ -191,6 +196,7 @@ export const onChangeLineAmountIncludeTax = lazyFn(
         form.setFieldsValue({ quantity });
         await controller.setEditGood({ quantity });
       }
+
       // 更新不含税
       updateUnitPriceExcludingTax(controller, form, record);
     });
@@ -203,7 +209,11 @@ export const onChangeLineAmountExcludeTax = lazyFn(
   (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
     form.validateFields(async (err, values) => {
       err = err || {};
-      if (err.lineAmountExcludeTax || !values.lineAmountExcludeTax) return;
+      if (err.lineAmountExcludeTax || !values.lineAmountExcludeTax) {
+        // 更新含税
+        updateUnitPriceTax(controller, form, record);
+        await controller.setEditGood({ lineAmountIncludeTax: undefined, lineAmountExcludeTax: undefined });
+      }
 
       const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
       await controller.setEditGood({ lineAmountExcludeTax });
@@ -273,9 +283,11 @@ export const updateUnitPriceExcludingTax = (controller: InvoiceController, form:
 
       // 税额 = 金额(含税)-金额(不含税)
       const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
-
       form.setFieldsValue({ taxAmount });
       await controller.setEditGood({ taxAmount });
+    } else {
+      form.setFieldsValue({ taxAmount: null });
+      await controller.setEditGood({ taxAmount: null });
     }
 
     // 单价(不含税) = 单价(含税) / (1+税率)
@@ -316,11 +328,12 @@ export const updateUnitPriceTax = (
       await controller.setEditGood({ lineAmountIncludeTax });
 
       // 税额 = 金额(含税)-金额(不含税)
-      const taxAmount = evaluate(
-        `${lineAmountIncludeTax} - ${lineAmountExcludeTax}`,
-      );
+      const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
       form.setFieldsValue({ taxAmount });
       await controller.setEditGood({ taxAmount });
+    } else {
+      form.setFieldsValue({ taxAmount: undefined });
+      await controller.setEditGood({ taxAmount: undefined });
     }
 
     // 单价(含税) = 单价(不含税) * (1+税率)

package/src/Invoice/ui/GoodsList/index.tsx

@@ -48,9 +48,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   React.useEffect(() => {
     controller.pipeline(async (s) => {
       s.goodsListState.goodsMap = new Map();
-      goodsList.forEach((e) => {
-        s.goodsListState.goodsMap.set(e.$index, e);
-      });
+      goodsList.forEach((e) => { s.goodsListState.goodsMap.set(e.$index, e); });
     })();
   }, [goodsList, controller]);
 

package/src/Invoice/ui/ImportGoodsDrawer/index.tsx

@@ -23,6 +23,19 @@ export default () => {
     controller.pipeline(async s => { s.goodsListState.importGoods.isVisibleDrawer = false })();
   }, [controller]);
 
+  React.useEffect(() => {
+    setTimeout(() => {
+      console.log(window.document.querySelector('.ktsAnt3x-drawer'))
+      if (visible) {
+        window.document.querySelector('.ktsAnt3x-drawer')?.addEventListener('click', e => {
+          // debugger
+          // e.stopPropagation();
+        }, true)
+      } else {
+      }
+    });
+  }, [visible])
+
   return (
     <Drawer
       title="商品列表"
@@ -32,9 +45,10 @@ export default () => {
       width={983}
       onClose={onClose}
       visible={visible}
+      getContainer={() => window.document.querySelector('.kts-invoice-operate-goods-list-able') as any}
     >
       {topExpand &&
-        <div style={{ marginBottom: 10 }} >
+        <div style={{ marginBottom: 10 }}  >
           {topExpand}
         </div>}
       <DrawerBody />
@@ -51,6 +65,8 @@ const DrawerBody = () => {
 
   const pagination = controller.useMemo(s => s.goodsListState.importGoods.pagination, []);
 
+  const [editGood] = React.useState(controller.state.goodsListState.editGood);
+
   React.useEffect(() => {
     controller.getGoodsList &&
       controller.getGoodsList({ pagination: { current: 1 } });
@@ -70,11 +86,15 @@ const DrawerBody = () => {
         return {
           onClick: () => {
             controller.pipeline(
-              async (s) => {
-                debugger;
+              async s => {
+                if(s.goodsListState.editGood) return;
+                s.goodsListState.editGood = editGood;
+              },
+              async s => {
                 Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
 
                 if (await s.goodsListState.importGoods.verifyFn(record) === false) return;
+
                 if (!s.goodsListState.editGood || !s.goodsListState.form) return;
 
                 s.goodsListState.editGood = { ...s.goodsListState.editGood, ...record };
@@ -86,13 +106,13 @@ const DrawerBody = () => {
                 } else {
                   s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record) as number;
                 }
-
+                
                 s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
                 s.goodsListState.editGood.itemName = getItemName(record);
 
                 s.goodsListState.form.setFieldsValue(s.goodsListState.editGood as any);
                 s.goodsListState.importGoods.isVisibleDrawer = false;
-                
+
                 s.goodsListState.isTaxIncluded
                   ? updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
                   : updateUnitPriceTax(controller, s.goodsListState.form, record)