kts-component-invoice-operate 3.2.219 → 3.2.220-chinaship

package/dist/index.js

@@ -2004,7 +2004,7 @@ var saveEditGood = /*#__PURE__*/(function () {
         switch (_context.prev = _context.next) {
           case 0:
             editGood = state.goodsListState.editGood;
-            form = state.goodsListState.form;
+            form = state.goodsListState.form; // const isValidateGood = state.goodsListState.isValidateGood
 
             if (!(!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField)) {
               _context.next = 4;
@@ -10662,7 +10662,7 @@ var Statistics = (function () {
   }, /*#__PURE__*/React__default['default'].createElement("label", null, "\uFF08\u5C0F\u5199\uFF09 ", lineAmountIncludeTax === '' ? '' : parseFloat(lineAmountIncludeTax).toFixed(2)))));
 });
 
-var AddRowButton = (function (props) {
+var AddRowButton = (function () {
   var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
@@ -10700,26 +10700,14 @@ var AddRowButton = (function (props) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _context.t0 = props.addGoodsCheck;
-
-            if (!_context.t0) {
-              _context.next = 4;
-              break;
-            }
-
-            _context.next = 4;
-            return props.addGoodsCheck();
-
-          case 4:
-            console.log('continue');
-            _context.next = 7;
+            _context.next = 2;
             return addGood$1(controller);
 
-          case 7:
-            _context.next = 9;
+          case 2:
+            _context.next = 4;
             return rollBottom(controller, rootElement);
 
-          case 9:
+          case 4:
           case "end":
             return _context.stop();
         }
@@ -16625,9 +16613,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, {
-    addGoodsCheck: props.addGoodsCheck
-  }), 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, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, 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', {
@@ -17631,7 +17617,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17648,7 +17634,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u8D2D\u4E70\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17662,7 +17648,22 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     readOnly: isReadOnly('buyerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+  })))), props.leqi && /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+    span: 4,
+    style: {
+      display: isExpand ? undefined : 'none'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    colon: false
+  }, getFieldDecorator('buyerAddressPhoneFlag', {
+    valuePropName: 'checked'
+  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Checkbox, {
+    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
+    disabled: isReadOnly('buyerAddressPhoneFlag'),
+    style: {
+      whiteSpace: 'nowrap'
+    }
+  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -17754,7 +17755,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17771,7 +17772,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u9500\u552E\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17785,7 +17786,22 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     readOnly: isReadOnly('sellerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+  })))), props.leqi && /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+    span: 4,
+    style: {
+      display: isExpand ? undefined : 'none'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    colon: false
+  }, getFieldDecorator('sellerAddressPhoneFlag', {
+    valuePropName: 'checked'
+  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Checkbox, {
+    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
+    disabled: isReadOnly('sellerAddressPhoneFlag'),
+    style: {
+      whiteSpace: 'nowrap'
+    }
+  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -18272,7 +18288,7 @@ var StakeFarmerholder = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create()
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -18289,7 +18305,7 @@ var StakeFarmerholder = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create()
     placeholder: "\u8BF7\u8F93\u5165\u9500\u552E\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -18317,7 +18333,22 @@ var StakeFarmerholder = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create()
     readOnly: isReadOnly('sellerBank'),
     placeholder: "\u8BF7\u8F93\u5165\u9500\u552E\u65B9\u5F00\u6237\u94F6\u884C",
     autoComplete: "off"
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+  })))), props.leqi && /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+    span: 4,
+    style: {
+      display: isExpand ? undefined : 'none'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    colon: false
+  }, getFieldDecorator('sellerAddressPhoneFlag', {
+    valuePropName: 'checked'
+  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Checkbox, {
+    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
+    disabled: isReadOnly('sellerAddressPhoneFlag'),
+    style: {
+      whiteSpace: 'nowrap'
+    }
+  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -18412,7 +18443,7 @@ var StakeFarmerholder = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create()
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -18429,7 +18460,7 @@ var StakeFarmerholder = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create()
     placeholder: "\u8BF7\u8F93\u5165\u8D2D\u4E70\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -18462,6 +18493,20 @@ var StakeFarmerholder = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create()
     style: {
       display: isExpand ? undefined : 'none'
     }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u8D2D\u4E70\u65B9\u5F00\u6237\u94F6\u884C",
+    colon: false
+  }, getFieldDecorator('buyerBank', {
+    rules: getRules('buyerBank', RULES$1.bankName('购买方开户银行'))
+  })( /*#__PURE__*/React__default['default'].createElement(MyInput$2, {
+    readOnly: isReadOnly('buyerBank'),
+    placeholder: "\u8BF7\u8F93\u5165\u8D2D\u4E70\u65B9\u5F00\u6237\u94F6\u884C",
+    autoComplete: "off"
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+    span: 10 + leqispanW,
+    style: {
+      display: isExpand ? undefined : 'none'
+    }
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
     label: "\u94F6\u884C\u8D26\u53F7",
     colon: false
@@ -18836,7 +18881,7 @@ var css_248z$j = ".kts-invoice-operate-goods-table-virtual .ktsAntX-table-body {
 styleInject(css_248z$j);
 
 function TableVirtual$1 (props) {
-  var _props$dataSource2;
+  var _props$dataSource4, _props$dataSource5;
 
   var _React$useState = React__default['default'].useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -18878,8 +18923,10 @@ function TableVirtual$1 (props) {
   }, [self, tableBody]); // 设置占位dom的搞
 
   var placeholderHeight = React__default['default'].useMemo(function () {
-    if (!self || !rowHeight || !props.dataSource || !placeholder) return;
-    var placeholderHeight = rowHeight * props.dataSource.length;
+    var _props$dataSource = props.dataSource,
+        dataSource = _props$dataSource === void 0 ? [] : _props$dataSource;
+    if (!self || !rowHeight || !dataSource || !placeholder) return;
+    var placeholderHeight = rowHeight * dataSource.length;
     placeholder.style.height = "".concat(placeholderHeight, "px");
     return placeholderHeight;
   }, [self, rowHeight, props.dataSource, placeholder]);
@@ -18891,12 +18938,12 @@ function TableVirtual$1 (props) {
   }, [tableBody, rowHeight, placeholderHeight]); // 计算渲染的行
 
   var dataSource = React__default['default'].useMemo(function () {
-    var _props$dataSource;
+    var _props$dataSource2;
 
     if (!props.dataSource) return [];
     if (props.dataSource.length < 10) return props.dataSource;
     if (!rowSize) return [props.dataSource[0]];
-    return (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.slice(pointer, pointer + 2 * rowSize);
+    return (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.slice(pointer, pointer + 2 * rowSize);
   }, [props.dataSource, pointer, rowSize]); // 监听滚动
 
   React__default['default'].useEffect(function () {
@@ -18915,17 +18962,24 @@ function TableVirtual$1 (props) {
   }, [self, placeholder, props.dataSource, rowHeight, rowSize]); // 移动列表
 
   React__default['default'].useEffect(function () {
+    var _props$dataSource3;
+
     if (!self) return;
     var table = self.querySelector('.ktsAntX-table .ktsAntX-table-body>table');
     if (!table) return;
-    table.style.top = "".concat(pointer * rowHeight, "px");
-  }, [pointer, self, rowHeight]);
+
+    if ((((_props$dataSource3 = props.dataSource) === null || _props$dataSource3 === void 0 ? void 0 : _props$dataSource3.length) || 0) < 10) {
+      table.style.top = '0px';
+    } else {
+      table.style.top = "".concat(pointer * rowHeight, "px");
+    }
+  }, [pointer, self, rowHeight, (_props$dataSource4 = props.dataSource) === null || _props$dataSource4 === void 0 ? void 0 : _props$dataSource4.length]);
   React__default['default'].useEffect(function () {
     if (!self) return;
     var cont = self.querySelector('.kts-invoice-operate-goods-table-virtual .ktsAntX-table-body');
     if (!cont) return;
     cont.scrollTop = 0;
-  }, [(_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.length]);
+  }, [(_props$dataSource5 = props.dataSource) === null || _props$dataSource5 === void 0 ? void 0 : _props$dataSource5.length]);
   return /*#__PURE__*/React__default['default'].createElement("span", {
     className: "kts-invoice-operate-goods-table-virtual",
     ref: function ref(e) {
@@ -19168,74 +19222,55 @@ function addGood$2(_x) {
 
 
 function _addGood$1() {
-  _addGood$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller) {
-    var _controller$formList$;
-
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+  _addGood$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            _context5.next = 2;
-            return (_controller$formList$ = controller.formList.get('realEstateInfo')) === null || _controller$formList$ === void 0 ? void 0 : _controller$formList$.validateFields( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
-                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                  while (1) {
-                    switch (_context2.prev = _context2.next) {
-                      case 0:
-                        if (!err) {
-                          _context2.next = 3;
-                          break;
-                        }
-
-                        ktsXui.message.error('请先填写发票行信息，再添加新的行');
-                        return _context2.abrupt("return");
-
-                      case 3:
-                      case "end":
-                        return _context2.stop();
-                    }
-                  }
-                }, _callee2);
-              }));
-
-              return function (_x4, _x5) {
-                return _ref2.apply(this, arguments);
-              };
-            }());
-
-          case 2:
-            _context5.next = 4;
+            _context4.next = 2;
             return controller.saveEditGood();
 
-          case 4:
-            _context5.next = 6;
+          case 2:
+            _context4.next = 4;
             return controller.wait();
 
-          case 6:
-            _context5.next = 8;
+          case 4:
+            _context4.next = 6;
             return controller.run( /*#__PURE__*/function () {
-              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
-                var _controller$state$goo;
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+                var isValidateGood, _controller$state$goo;
 
-                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                   while (1) {
-                    switch (_context4.prev = _context4.next) {
+                    switch (_context3.prev = _context3.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context4.next = 3;
+                          _context3.next = 5;
                           break;
                         }
 
-                        _context4.next = 3;
+                        // message.error({
+                        //   content: '你正在编辑一个货物',
+                        //   key: '你正在编辑一个货物',
+                        // });
+                        // return;
+                        isValidateGood = controller.state.goodsListState.isValidateGood;
+
+                        if (!isValidateGood) {
+                          _context3.next = 5;
+                          break;
+                        }
+
+                        _context3.next = 5;
                         return (_controller$state$goo = controller.state.goodsListState.form) === null || _controller$state$goo === void 0 ? void 0 : _controller$state$goo.validateFields( /*#__PURE__*/function () {
-                          var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(err, values) {
+                          var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
                             var firstError;
-                            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                               while (1) {
-                                switch (_context3.prev = _context3.next) {
+                                switch (_context2.prev = _context2.next) {
                                   case 0:
                                     if (!err) {
-                                      _context3.next = 4;
+                                      _context2.next = 4;
                                       break;
                                     }
 
@@ -19244,50 +19279,50 @@ function _addGood$1() {
                                       content: firstError.errors[0].message,
                                       key: '你正在编辑一个货物'
                                     });
-                                    return _context3.abrupt("return");
+                                    return _context2.abrupt("return");
 
                                   case 4:
                                   case "end":
-                                    return _context3.stop();
+                                    return _context2.stop();
                                 }
                               }
-                            }, _callee3);
+                            }, _callee2);
                           }));
 
-                          return function (_x7, _x8) {
-                            return _ref4.apply(this, arguments);
+                          return function (_x5, _x6) {
+                            return _ref3.apply(this, arguments);
                           };
                         }());
 
-                      case 3:
-                        _context4.next = 5;
+                      case 5:
+                        _context3.next = 7;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
 
-                      case 5:
-                        s.goodsListState.editGood = _context4.sent;
+                      case 7:
+                        s.goodsListState.editGood = _context3.sent;
 
-                      case 6:
+                      case 8:
                       case "end":
-                        return _context4.stop();
+                        return _context3.stop();
                     }
                   }
-                }, _callee4);
+                }, _callee3);
               }));
 
-              return function (_x6) {
-                return _ref3.apply(this, arguments);
+              return function (_x4) {
+                return _ref2.apply(this, arguments);
               };
             }());
 
-          case 8:
+          case 6:
           case "end":
-            return _context5.stop();
+            return _context4.stop();
         }
       }
-    }, _callee5);
+    }, _callee4);
   }));
   return _addGood$1.apply(this, arguments);
 }
@@ -19297,34 +19332,34 @@ function rollBottom$1(_x2, _x3) {
 }
 
 function _rollBottom$1() {
-  _rollBottom$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(controller, rootElement) {
+  _rollBottom$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, rootElement) {
     var cont;
-    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context6.prev = _context6.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            _context6.next = 2;
+            _context5.next = 2;
             return controller.wait();
 
           case 2:
             cont = rootElement === null || rootElement === void 0 ? void 0 : rootElement.querySelector('.ktsAntX-table-body');
 
             if (cont) {
-              _context6.next = 5;
+              _context5.next = 5;
               break;
             }
 
-            return _context6.abrupt("return");
+            return _context5.abrupt("return");
 
           case 5:
             cont.scrollTop = cont.scrollHeight;
 
           case 6:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
       }
-    }, _callee6);
+    }, _callee5);
   }));
   return _rollBottom$1.apply(this, arguments);
 }
@@ -21905,24 +21940,34 @@ var useColumns$1 = (function (form) {
                     while (1) {
                       switch (_context6.prev = _context6.next) {
                         case 0:
-                          _context6.next = 2;
+                          if (!isValidateGood) {
+                            _context6.next = 10;
+                            break;
+                          }
+
+                          _context6.next = 3;
                           return controller.wait();
 
-                        case 2:
+                        case 3:
                           isvalue = !!value || value === 0;
                           isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
 
                           if (!(isvalue || isPrice === isvalue)) {
-                            _context6.next = 6;
+                            _context6.next = 7;
                             break;
                           }
 
                           return _context6.abrupt("return");
 
-                        case 6:
+                        case 7:
                           callback('请输入数量');
+                          _context6.next = 11;
+                          break;
 
-                        case 7:
+                        case 10:
+                          callback();
+
+                        case 11:
                         case "end":
                           return _context6.stop();
                       }
@@ -22211,7 +22256,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, formatSearch$1(parseFloat(value).toFixed(2), searchValue));
+          }, value && formatSearch$1(parseFloat(value).toFixed(2), searchValue));
         }
       }
     }, {
@@ -22274,7 +22319,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, formatSearch$1(parseFloat(value).toFixed(2), searchValue));
+          }, value && formatSearch$1(parseFloat(value).toFixed(2), searchValue));
         }
       }
     }, {
@@ -22386,7 +22431,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, isDutyFree$1(record) ? '***' : parseFloat(value).toFixed(2));
+          }, isDutyFree$1(record) ? '***' : value && parseFloat(value).toFixed(2));
         }
       }
     }] // 含税不含税
@@ -24364,7 +24409,7 @@ var Main$3 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
   })), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Statistics$1, null)));
 });
 
-var css_248z$r = ".kts-invoice-operate-real-estate-info-digtal {\n  padding: 20px;\n  border-bottom: 2px solid #9F613E;\n  border-left: 2px solid #9F613E;\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-real-estate-info-digtal .real-estate-info-digtal-label {\n  color: #9F613E;\n  font-weight: bold;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAnt3x-row.ktsAnt3x-form-item {\n  margin-bottom: 0;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAntX-row {\n  border-bottom: 1px dashed #9F613E;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAntX-row:last-child {\n  border-bottom: none;\n}\n";
+var css_248z$r = ".kts-invoice-operate-real-estate-info-digtal {\n  padding: 20px;\n  border-bottom: 2px solid #9F613E;\n  border-left: 2px solid #9F613E;\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-real-estate-info-digtal .real-estate-info-digtal-label {\n  color: #9F613E;\n  font-weight: bold;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAnt3x-row.ktsAnt3x-form-item {\n  margin-bottom: 0;\n}\n";
 styleInject(css_248z$r);
 
 var RangePicker = ktsComponentsAntdX4.DatePicker.RangePicker;
@@ -24380,210 +24425,126 @@ var RealEstateInfo = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(f
   }, []);
   var readOnly = React__default['default'].useMemo(function () {
     return model === 'readOnly';
-  }, [model]);
-  var goodsList = controller.useMemo(function (s) {
-    return s.goodsListState.goodsList;
-  }, []);
-  var indexRef = React__default['default'].useRef([]);
-  React.useEffect(function () {
-    var dd = goodsList === null || goodsList === void 0 ? void 0 : goodsList.reduce(function (acc, cur) {
-      if (cur.lineAttribute !== 1) {
-        acc.push(cur.$index);
-      }
-
-      return acc;
-    }, []);
-    indexRef.current = dd;
-  }, [goodsList, indexRef]); // 注册 form
+  }, [model]); // 注册 form
 
   controller.useForm('realEstateInfo', form);
-
-  var getList = function getList() {
-    var decrease = indexRef.current.length > goodsList.length;
-
-    if (decrease) {
-      //已删行列表
-      var diff = indexRef.current.filter(function (item) {
-        return !goodsList.find(function (i) {
-          return i.$index === item;
-        });
-      });
-      var formData = form.getFieldValue('realEstateDataDto');
-
-      if (Array.isArray(formData) && diff.length > 0) {
-        var newForm = formData === null || formData === void 0 ? void 0 : formData.filter(function (item) {
-          return !diff.find(function (i) {
-            return i === item.$index;
-          });
-        });
-        form.setFieldsValue({
-          realEstateDataDto: newForm
-        });
-      } else {
-        form.setFieldsValue({
-          realEstateDataDto: undefined
-        });
-      }
-    }
-
-    console.log('goodsList', goodsList);
-    return goodsList.filter(function (item) {
-      return item.lineAttribute !== 1;
-    }).map(function (item, index) {
-      if (item.lineAttribute !== 1) {
-        return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
-          gutter: [17, 0]
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          style: {
-            display: 'none'
-          }
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].$index"), {
-          initialValue: item.$index
-        })( /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, null))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u4E0D\u52A8\u4EA7\u5730\u5740"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateAddress"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择不动产地址'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrString, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Cascader, {
-          style: {
-            width: '100%'
-          },
-          options: props.realEstateAddressOptions,
-          fieldNames: props.realEstateAddressFieldNames,
-          placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A\u53BF"
-        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u8BE6\u7EC6\u5730\u5740"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateDetailedAddress"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请输入详细地址'
-          }, {
-            max: 120,
-            message: '详细地址最多120个字符'
-          }, {
-            validator: function () {
-              var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, value, callback) {
-                var pattern;
-                return _regeneratorRuntime().wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        pattern = /街|路|村|乡|镇|道|巷|号/;
-
-                        if (pattern.test(value)) {
-                          callback();
-                        } else {
-                          callback('地址必须包含“街”、“路”、“村”、“乡”、“镇”、“道”、“巷”、“号”等任意一个关键词');
-                        }
-
-                      case 2:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }
-                }, _callee);
-              }));
-
-              function validator(_x, _x2, _x3) {
-                return _validator.apply(this, arguments);
-              }
-
-              return validator;
-            }()
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-          autoComplete: 'off',
-          placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740"
-        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u79DF\u8D41\u671F\u8D77\u6B62"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].leaseTerm"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请输入租赁期'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrMoment, null) : /*#__PURE__*/React__default['default'].createElement(RangePicker, {
-          style: {
-            width: '100%'
-          }
-        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u8DE8\u5730\uFF08\u5E02\uFF09\u6807\u5FD7"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].crossCitiesSign"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择跨地（市）标志'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyNY, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
-          placeholder: "\u8BF7\u9009\u62E9",
-          style: {
-            width: '100%'
-          }
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: 'Y'
-        }, "\u662F"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: 'N'
-        }, "\u5426"))))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u4EA7\u6743\u8BC1\u4E66/\u4E0D\u52A8\u4EA7\u6743\u8BC1\u53F7"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateNumber"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请输入证书编号，若没有证书填写“无”'
-          }, {
-            max: 40,
-            message: '证书编号最多40个字符'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-          autoComplete: 'off',
-          placeholder: "\u8BF7\u8F93\u5165\u8BC1\u4E66\u7F16\u53F7\uFF0C\u82E5\u6CA1\u6709\u8BC1\u4E66\u586B\u5199\u201C\u65E0\u201D"
-        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u9762\u79EF\u5355\u4F4D"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateUnit"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择面积单位'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
-          placeholder: "\u8BF7\u9009\u62E9",
-          style: {
-            width: '100%'
-          }
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u5E73\u65B9\u5343\u7C73"
-        }, "\u5E73\u65B9\u5343\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u5E73\u65B9\u7C73"
-        }, "\u5E73\u65B9\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u516C\u9877"
-        }, "\u516C\u9877"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u4EA9"
-        }, "\u4EA9"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "h\u33A1"
-        }, "h\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "k\u33A1"
-        }, "k\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u33A1"
-        }, "\u33A1"))))));
-      }
-    });
-  };
-
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u5B9A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), getList());
+  }, "\u7279\u6B8A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
+    gutter: [17, 0]
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u4E0D\u52A8\u4EA7\u5730\u5740"
+  }, getFieldDecorator('realEstateAddress', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择不动产地址'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrString, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Cascader, {
+    style: {
+      width: '100%'
+    },
+    options: props.realEstateAddressOptions,
+    fieldNames: props.realEstateAddressFieldNames,
+    placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A\u53BF"
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u8BE6\u7EC6\u5730\u5740"
+  }, getFieldDecorator('realEstateDetailedAddress', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请输入详细地址'
+    }, {
+      max: 120,
+      message: '详细地址最多120个字符'
+    }, {
+      validator: function validator(_, value) {
+        var pattern = /街|路|村|乡|镇|道|巷|号/;
+        return pattern.test(value) ? Promise.resolve() : Promise.reject('地址必须包含“街”、“路”、“村”、“乡”、“镇”、“道”、“巷”、“号”等任意一个关键词');
+      }
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+    autoComplete: 'off',
+    placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740"
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u79DF\u8D41\u671F\u8D77\u6B62"
+  }, getFieldDecorator('leaseTerm', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请输入租赁期'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrMoment, null) : /*#__PURE__*/React__default['default'].createElement(RangePicker, {
+    style: {
+      width: '100%'
+    }
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u8DE8\u5730\uFF08\u5E02\uFF09\u6807\u5FD7"
+  }, getFieldDecorator('crossCitiesSign', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择跨地（市）标志'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyNY, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: 'Y'
+  }, "\u662F"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: 'N'
+  }, "\u5426"))))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u4EA7\u6743\u8BC1\u4E66/\u4E0D\u52A8\u4EA7\u6743\u8BC1\u53F7"
+  }, getFieldDecorator('realEstateNumber', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请输入证书编号，若没有证书填写“无”'
+    }, {
+      max: 40,
+      message: '证书编号最多40个字符'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+    autoComplete: 'off',
+    placeholder: "\u8BF7\u8F93\u5165\u8BC1\u4E66\u7F16\u53F7\uFF0C\u82E5\u6CA1\u6709\u8BC1\u4E66\u586B\u5199\u201C\u65E0\u201D"
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u9762\u79EF\u5355\u4F4D"
+  }, getFieldDecorator('realEstateUnit', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择面积单位'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u5E73\u65B9\u5343\u7C73"
+  }, "\u5E73\u65B9\u5343\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u5E73\u65B9\u7C73"
+  }, "\u5E73\u65B9\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u516C\u9877"
+  }, "\u516C\u9877"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u4EA9"
+  }, "\u4EA9"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "h\u33A1"
+  }, "h\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "k\u33A1"
+  }, "k\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u33A1"
+  }, "\u33A1")))))));
 });
 
 var MyDiv$3 = /*#__PURE__*/function (_React$Component) {
@@ -24659,7 +24620,7 @@ var MyArrMoment = /*#__PURE__*/function (_React$Component3) {
           color: '#9F603D',
           fontWeight: 600
         }
-      }, " - "), /*#__PURE__*/React__default['default'].createElement("span", null, hooks.isMoment(value[1]) && value[1].format('YYYY-MM-DD')));
+      }, " - "), /*#__PURE__*/React__default['default'].createElement("span", null, hooks.isMoment(value[1]) && value[0].format('YYYY-MM-DD')));
     }
   }]);
 
@@ -24711,7 +24672,7 @@ var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fun
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u5B9A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
+  }, "\u7279\u6B8A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
     gutter: [17, 0]
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
     span: 6
@@ -26317,7 +26278,7 @@ var Main$4 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
     className: "kts-invoice-operate-freight"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u5B9A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, "\u7279\u6B8A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-digtal",
     onClick: function onClick(e) {
       e.stopPropagation();