kts-component-invoice-operate 3.2.234 → 3.2.235-fuling

package/dist/index.esm.js

@@ -8,7 +8,7 @@ import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete
 import classnames from 'classnames';
 import { Table } from 'kts-components-antd-x4-v4';
 import { render } from 'react-dom';
-import { DatePicker, Row as Row$1, Col as Col$1, Input as Input$2, Cascader, Select as Select$2 } from 'kts-components-antd-x4';
+import { DatePicker, Row as Row$1, Col as Col$1, Cascader, Input as Input$2, Select as Select$2 } from 'kts-components-antd-x4';
 import { Input as Input$3, NumberPicker } from '@formily/antd-components';
 import { createAsyncFormActions, FormEffectHooks, SchemaForm, FormButtonGroup, SchemaMarkupField } from '@formily/antd';
 
@@ -981,7 +981,6 @@ var ImportGoods = /*#__PURE__*/_createClass(function ImportGoods() {
   this.dataSource = [];
   this.pagination = {};
   this.isVisibleDrawer = false;
-  this.filter = {};
   this.topExpand = void 0;
 
   this.verifyFn = /*#__PURE__*/function () {
@@ -1175,7 +1174,6 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.isSalesGifts = false;
   this.addComparisonIndex = void 0;
   this.drag = new Drag();
-  this.isValidateGood = true;
 });
 
 var FreightListState = /*#__PURE__*/_createClass(function FreightListState() {
@@ -2219,7 +2217,7 @@ var saveEditGood = /*#__PURE__*/(function () {
         switch (_context.prev = _context.next) {
           case 0:
             editGood = state.goodsListState.editGood;
-            form = state.goodsListState.form; // const isValidateGood = state.goodsListState.isValidateGood
+            form = state.goodsListState.form;
 
             if (!(!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField)) {
               _context.next = 4;
@@ -10969,7 +10967,7 @@ var Statistics = (function () {
   }, /*#__PURE__*/React.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;
@@ -11002,54 +11000,24 @@ var AddRowButton = (function (props) {
   var disabled = React.useMemo(function () {
     return typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue;
   }, [goodMax, goodsNum, searchValue]);
-  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
-            _context2.next = 2;
-            return controller.run( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
-                return _regeneratorRuntime().wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        if (!s.addGoodsCheck) {
-                          _context.next = 3;
-                          break;
-                        }
-
-                        _context.next = 3;
-                        return s.addGoodsCheck();
-
-                      case 3:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }
-                }, _callee);
-              }));
-
-              return function (_x) {
-                return _ref2.apply(this, arguments);
-              };
-            }());
-
-          case 2:
-            console.log('continue');
-            _context2.next = 5;
+            _context.next = 2;
             return addGood$1(controller);
 
-          case 5:
-            _context2.next = 7;
+          case 2:
+            _context.next = 4;
             return rollBottom(controller, rootElement);
 
-          case 7:
+          case 4:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
       }
-    }, _callee2);
+    }, _callee);
   })), [controller, rootElement]);
   if (isAddRow === false) return /*#__PURE__*/React.createElement(React.Fragment, null);
   if (model === 'prefab') return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -11061,35 +11029,35 @@ var AddRowButton = (function (props) {
 });
 /** 添加一个空货物 */
 
-function addGood$1(_x2) {
+function addGood$1(_x) {
   return _addGood.apply(this, arguments);
 }
 /** 货物列表，滚动到底部 */
 
 
 function _addGood() {
-  _addGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller) {
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+  _addGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(controller) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context3.prev = _context3.next) {
           case 0:
-            _context4.next = 2;
+            _context3.next = 2;
             return controller.saveEditGood();
 
           case 2:
-            _context4.next = 4;
+            _context3.next = 4;
             return controller.wait();
 
           case 4:
-            _context4.next = 6;
+            _context3.next = 6;
             return controller.run( /*#__PURE__*/function () {
-              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
-                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                   while (1) {
-                    switch (_context3.prev = _context3.next) {
+                    switch (_context2.prev = _context2.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context3.next = 3;
+                          _context2.next = 3;
                           break;
                         }
 
@@ -11097,74 +11065,74 @@ function _addGood() {
                           content: '你正在编辑一个货物',
                           key: '你正在编辑一个货物'
                         });
-                        return _context3.abrupt("return");
+                        return _context2.abrupt("return");
 
                       case 3:
-                        _context3.next = 5;
+                        _context2.next = 5;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
 
                       case 5:
-                        s.goodsListState.editGood = _context3.sent;
+                        s.goodsListState.editGood = _context2.sent;
 
                       case 6:
                       case "end":
-                        return _context3.stop();
+                        return _context2.stop();
                     }
                   }
-                }, _callee3);
+                }, _callee2);
               }));
 
-              return function (_x5) {
-                return _ref3.apply(this, arguments);
+              return function (_x4) {
+                return _ref2.apply(this, arguments);
               };
             }());
 
           case 6:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
       }
-    }, _callee4);
+    }, _callee3);
   }));
   return _addGood.apply(this, arguments);
 }
 
-function rollBottom(_x3, _x4) {
+function rollBottom(_x2, _x3) {
   return _rollBottom.apply(this, arguments);
 }
 
 function _rollBottom() {
-  _rollBottom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, rootElement) {
+  _rollBottom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller, rootElement) {
     var cont;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            _context5.next = 2;
+            _context4.next = 2;
             return controller.wait();
 
           case 2:
             cont = rootElement === null || rootElement === void 0 ? void 0 : rootElement.querySelector('.ktsAntX-table-body');
 
             if (cont) {
-              _context5.next = 5;
+              _context4.next = 5;
               break;
             }
 
-            return _context5.abrupt("return");
+            return _context4.abrupt("return");
 
           case 5:
             cont.scrollTop = cont.scrollHeight;
 
           case 6:
           case "end":
-            return _context5.stop();
+            return _context4.stop();
         }
       }
-    }, _callee5);
+    }, _callee4);
   }));
   return _rollBottom.apply(this, arguments);
 }
@@ -16950,9 +16918,7 @@ var Main = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-goods-list-able"
   }, /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, /*#__PURE__*/React.createElement(AddRowButton, {
-    addGoodsCheck: props.addGoodsCheck
-  }), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React.createElement(Search, null)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React.createElement(Search, null)), /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, /*#__PURE__*/React.createElement(DescribeSwitch, null), /*#__PURE__*/React.createElement(TaxIncludedSwitch, null))), /*#__PURE__*/React.createElement("div", {
     className: classnames('kts-invoice-operate-goods-list-table', {
@@ -17956,7 +17922,7 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React.createElement(Col, {
-    span: 10 + leqispanW,
+    span: 10 + riskspanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17973,7 +17939,7 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     placeholder: "\u8BF7\u8F93\u5165\u8D2D\u4E70\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React.createElement(Col, {
-    span: 10 + leqispanW,
+    span: 10 + riskspanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17987,22 +17953,7 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     readOnly: isReadOnly('buyerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), props.leqi && /*#__PURE__*/React.createElement(Col, {
-    span: 4,
-    style: {
-      display: isExpand ? undefined : 'none'
-    }
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    colon: false
-  }, getFieldDecorator('buyerAddressPhoneFlag', {
-    valuePropName: 'checked'
-  })( /*#__PURE__*/React.createElement(Checkbox$1, {
-    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
-    disabled: isReadOnly('buyerAddressPhoneFlag'),
-    style: {
-      whiteSpace: 'nowrap'
-    }
-  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React.createElement(Col, {
+  })))), /*#__PURE__*/React.createElement(Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -18094,7 +18045,7 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React.createElement(Col, {
-    span: 10 + leqispanW,
+    span: 10 + riskspanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -18111,7 +18062,7 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     placeholder: "\u8BF7\u8F93\u5165\u9500\u552E\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React.createElement(Col, {
-    span: 10 + leqispanW,
+    span: 10 + riskspanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -18125,22 +18076,7 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     readOnly: isReadOnly('sellerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), props.leqi && /*#__PURE__*/React.createElement(Col, {
-    span: 4,
-    style: {
-      display: isExpand ? undefined : 'none'
-    }
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    colon: false
-  }, getFieldDecorator('sellerAddressPhoneFlag', {
-    valuePropName: 'checked'
-  })( /*#__PURE__*/React.createElement(Checkbox$1, {
-    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
-    disabled: isReadOnly('sellerAddressPhoneFlag'),
-    style: {
-      whiteSpace: 'nowrap'
-    }
-  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React.createElement(Col, {
+  })))), /*#__PURE__*/React.createElement(Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -19256,13 +19192,14 @@ var CardSelect = /*#__PURE__*/function (_React$Component2) {
         label: "中华人民共和国台湾居民居住证",
         value: "238"
       }];
-      var getLable = React.useCallback(function (value) {
+
+      function getLable(value) {
         var _option$find;
 
         return ((_option$find = option.find(function (e) {
           return e.value === value;
         })) === null || _option$find === void 0 ? void 0 : _option$find.label) || '';
-      }, []);
+      }
 
       if (props.readOnly) {
         return /*#__PURE__*/React.createElement("span", {
@@ -20036,13 +19973,14 @@ var NationalSelect = /*#__PURE__*/function (_React$Component3) {
         value: "A00",
         label: "科索沃"
       }];
-      var getLable = React.useCallback(function (value) {
+
+      function getLable(value) {
         var _option$find2;
 
         return ((_option$find2 = option.find(function (e) {
           return e.value === value;
         })) === null || _option$find2 === void 0 ? void 0 : _option$find2.label) || '';
-      }, []);
+      }
 
       if (props.readOnly) {
         return /*#__PURE__*/React.createElement("span", {
@@ -20186,7 +20124,7 @@ var css_248z$j = ".kts-invoice-operate-goods-table-virtual .ktsAntX-table-body {
 styleInject(css_248z$j);
 
 function TableVirtual$1 (props) {
-  var _props$dataSource4, _props$dataSource5;
+  var _props$dataSource2;
 
   var _React$useState = React.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -20228,10 +20166,8 @@ function TableVirtual$1 (props) {
   }, [self, tableBody]); // 设置占位dom的搞
 
   var placeholderHeight = React.useMemo(function () {
-    var _props$dataSource = props.dataSource,
-        dataSource = _props$dataSource === void 0 ? [] : _props$dataSource;
-    if (!self || !rowHeight || !dataSource || !placeholder) return;
-    var placeholderHeight = rowHeight * dataSource.length;
+    if (!self || !rowHeight || !props.dataSource || !placeholder) return;
+    var placeholderHeight = rowHeight * props.dataSource.length;
     placeholder.style.height = "".concat(placeholderHeight, "px");
     return placeholderHeight;
   }, [self, rowHeight, props.dataSource, placeholder]);
@@ -20243,12 +20179,12 @@ function TableVirtual$1 (props) {
   }, [tableBody, rowHeight, placeholderHeight]); // 计算渲染的行
 
   var dataSource = React.useMemo(function () {
-    var _props$dataSource2;
+    var _props$dataSource;
 
     if (!props.dataSource) return [];
     if (props.dataSource.length < 10) return props.dataSource;
     if (!rowSize) return [props.dataSource[0]];
-    return (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.slice(pointer, pointer + 2 * rowSize);
+    return (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.slice(pointer, pointer + 2 * rowSize);
   }, [props.dataSource, pointer, rowSize]); // 监听滚动
 
   React.useEffect(function () {
@@ -20267,24 +20203,17 @@ function TableVirtual$1 (props) {
   }, [self, placeholder, props.dataSource, rowHeight, rowSize]); // 移动列表
 
   React.useEffect(function () {
-    var _props$dataSource3;
-
     if (!self) return;
     var table = self.querySelector('.ktsAntX-table .ktsAntX-table-body>table');
     if (!table) return;
-
-    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]);
+    table.style.top = "".concat(pointer * rowHeight, "px");
+  }, [pointer, self, rowHeight]);
   React.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$dataSource5 = props.dataSource) === null || _props$dataSource5 === void 0 ? void 0 : _props$dataSource5.length]);
+  }, [(_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.length]);
   return /*#__PURE__*/React.createElement("span", {
     className: "kts-invoice-operate-goods-table-virtual",
     ref: function ref(e) {
@@ -20527,86 +20456,43 @@ 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;
-                        }
-
-                        message$1.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 isValidateGood, _controller$state$goo;
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+                var _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 = 5;
-                          break;
-                        }
-
-                        // message.error({
-                        //   content: '你正在编辑一个货物',
-                        //   key: '你正在编辑一个货物',
-                        // });
-                        // return;
-                        isValidateGood = controller.state.goodsListState.isValidateGood;
-
-                        if (!isValidateGood) {
-                          _context4.next = 5;
+                          _context3.next = 3;
                           break;
                         }
 
-                        _context4.next = 5;
+                        _context3.next = 3;
                         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;
                                     }
 
@@ -20615,50 +20501,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 5:
-                        _context4.next = 7;
+                      case 3:
+                        _context3.next = 5;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
 
-                      case 7:
-                        s.goodsListState.editGood = _context4.sent;
+                      case 5:
+                        s.goodsListState.editGood = _context3.sent;
 
-                      case 8:
+                      case 6:
                       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);
 }
@@ -20668,34 +20554,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);
 }
@@ -22022,7 +21908,7 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
   };
 }();
 
-var TaxIncludedSwitch$1 = (function (props) {
+var TaxIncludedSwitch$1 = (function () {
   var controller = Invoice.useInvoiceController();
   /** 是否含税 */
 
@@ -22041,9 +21927,8 @@ var TaxIncludedSwitch$1 = (function (props) {
           switch (_context.prev = _context.next) {
             case 0:
               onChangeSwitchTax$1(controller, e);
-              props.onChange && props.onChange(e);
 
-            case 2:
+            case 1:
             case "end":
               return _context.stop();
           }
@@ -22948,9 +22833,6 @@ var useColumns$1 = (function (form) {
   var changeField = controller.useMemo(function (e) {
     return e.calculatingField;
   }, []);
-  var isValidateGood = controller.useMemo(function (s) {
-    return s.goodsListState.isValidateGood;
-  }, []);
   /** 计算中启动字段 */
 
   var setChangeField = React.useCallback(function (value) {
@@ -23045,37 +22927,25 @@ var useColumns$1 = (function (form) {
                     while (1) {
                       switch (_context2.prev = _context2.next) {
                         case 0:
-                          if (!isValidateGood) {
-                            _context2.next = 11;
-                            break;
-                          }
-
-                          _context2.next = 3;
+                          _context2.next = 2;
                           return controller.wait();
 
-                        case 3:
+                        case 2:
                           value = controller.state.goodsListState.editGood;
 
                           if (!(!(value === null || value === void 0 ? void 0 : value.itemName) && !(value === null || value === void 0 ? void 0 : value.itemNameSelf))) {
-                            _context2.next = 8;
+                            _context2.next = 7;
                             break;
                           }
 
                           callback('项目名称不能为空');
-                          _context2.next = 9;
+                          _context2.next = 8;
                           break;
 
-                        case 8:
+                        case 7:
                           return _context2.abrupt("return");
 
-                        case 9:
-                          _context2.next = 12;
-                          break;
-
-                        case 11:
-                          callback();
-
-                        case 12:
+                        case 8:
                         case "end":
                           return _context2.stop();
                       }
@@ -23276,34 +23146,24 @@ var useColumns$1 = (function (form) {
                     while (1) {
                       switch (_context6.prev = _context6.next) {
                         case 0:
-                          if (!isValidateGood) {
-                            _context6.next = 10;
-                            break;
-                          }
-
-                          _context6.next = 3;
+                          _context6.next = 2;
                           return controller.wait();
 
-                        case 3:
+                        case 2:
                           isvalue = !!value || value === 0;
                           isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
 
                           if (!(isvalue || isPrice === isvalue)) {
-                            _context6.next = 7;
+                            _context6.next = 6;
                             break;
                           }
 
                           return _context6.abrupt("return");
 
-                        case 7:
+                        case 6:
                           callback('请输入数量');
-                          _context6.next = 11;
-                          break;
-
-                        case 10:
-                          callback();
 
-                        case 11:
+                        case 7:
                         case "end":
                           return _context6.stop();
                       }
@@ -23521,7 +23381,7 @@ var useColumns$1 = (function (form) {
             initialValue: editGood.lineAmountIncludeTax,
             getValueFromEvent: onNumberValueChange,
             rules: [].concat(_toConsumableArray(getReplenishRules('lineAmountIncludeTax')), [{
-              required: isValidateGood,
+              required: true,
               message: '金额不能为空'
             }, {
               pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
@@ -23592,7 +23452,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value && formatSearch$1(parseFloat(value).toFixed(2), searchValue));
+          }, formatSearch$1(parseFloat(value).toFixed(2), searchValue));
         }
       }
     }, {
@@ -23609,7 +23469,7 @@ var useColumns$1 = (function (form) {
             initialValue: editGood.lineAmountExcludeTax,
             getValueFromEvent: onNumberValueChange,
             rules: [].concat(_toConsumableArray(getReplenishRules('lineAmountExcludeTax')), [{
-              required: isValidateGood,
+              required: true,
               message: '金额不能为空'
             }, {
               pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
@@ -23655,7 +23515,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value && formatSearch$1(parseFloat(value).toFixed(2), searchValue));
+          }, formatSearch$1(parseFloat(value).toFixed(2), searchValue));
         }
       }
     }, {
@@ -23671,7 +23531,7 @@ var useColumns$1 = (function (form) {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('taxRate', {
             initialValue: editGood.taxRate,
             rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
-              required: isValidateGood,
+              required: true,
               message: '请选择税率'
             }, {
               pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
@@ -23698,15 +23558,11 @@ var useColumns$1 = (function (form) {
             }, e, "%");
           }))));
         } else {
-          if (value || value === '0' || value === 0) {
-            return /*#__PURE__*/React.createElement("span", {
-              style: {
-                padding: '0 10px'
-              }
-            }, isDutyFree$1(record) ? '免税' : "".concat(value, "%"));
-          } else {
-            return '';
-          }
+          return /*#__PURE__*/React.createElement("span", {
+            style: {
+              padding: '0 10px'
+            }
+          }, isDutyFree$1(record) ? '免税' : "".concat(value, "%"));
         }
       }
     }, {
@@ -23722,7 +23578,7 @@ var useColumns$1 = (function (form) {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('taxAmount', {
             initialValue: editGood.taxAmount,
             rules: [].concat(_toConsumableArray(getReplenishRules('taxAmount')), [{
-              required: isValidateGood,
+              required: true,
               message: '税额不能为空'
             }, {
               validator: function validator(rule, value, callback) {
@@ -23767,7 +23623,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, isDutyFree$1(record) ? '***' : value && parseFloat(value).toFixed(2));
+          }, isDutyFree$1(record) ? '***' : parseFloat(value).toFixed(2));
         }
       }
     }] // 含税不含税
@@ -25712,9 +25568,7 @@ var Main$3 = decorator(Form.create())(function (props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able"
-  }, /*#__PURE__*/React.createElement(AddRowButton$1, null), delRowButton.button, addDiscountRowButton.button, endowCodeButton.button, /*#__PURE__*/React.createElement(TaxIncludedSwitch$1, {
-    onChange: props.onTaxSwitchChange
-  }), /*#__PURE__*/React.createElement(Search$1, null), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(AddRowButton$1, null), delRowButton.button, addDiscountRowButton.button, endowCodeButton.button, /*#__PURE__*/React.createElement(TaxIncludedSwitch$1, null), /*#__PURE__*/React.createElement(Search$1, null), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1
     }
@@ -25745,7 +25599,7 @@ var Main$3 = decorator(Form.create())(function (props) {
   })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.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 = DatePicker.RangePicker;
@@ -25761,272 +25615,126 @@ var RealEstateInfo = decorator(Form.create())(function (props) {
   }, []);
   var readOnly = React.useMemo(function () {
     return model === 'readOnly';
-  }, [model]);
-  var goodsList = controller.useMemo(function (s) {
-    return s.goodsListState.goodsList;
-  }, []); //outcome-104 任务 https://wiki.dev.kingxunlian.com/pages/viewpage.action?pageId=180355189
-  //商品和服务税收分类合并编码为“3040502020200000000”时，视为停车费业务，针对停车费业务，蓝字发票增加以下判断：
-  // 单位必须为“平方米”；
-  // 项目名称必须为“车辆停放服务”；
-  // 车牌号必填，最多支持填写3个车牌号；除该场景车牌号必须为空；
-  // 租赁期起止格式必须为“yyyy-MM-dd HH:mm（租赁期起）”+“空格”+“yyyy-MM-dd HH:mm（租赁期止）。
-
-  var isParkFee = React.useCallback(function (taxClassificationCode) {
-    if (taxClassificationCode === '3040502020200000000') {
-      return true;
-    } else {
-      return false;
-    }
-  }, []);
-  var indexRef = React.useRef([]);
-  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
-        });
-      }
-    }
-
-    return goodsList.filter(function (item) {
-      return item.lineAttribute !== 1;
-    }).map(function (item, index) {
-      if (item.lineAttribute !== 1) {
-        var isParkFeeItem = isParkFee(item.taxClassificationCode);
-        return /*#__PURE__*/React.createElement(Row$1, {
-          gutter: [17, 0]
-        }, /*#__PURE__*/React.createElement(Col$1, {
-          span: 6
-        }, /*#__PURE__*/React.createElement(Form.Item, {
-          style: {
-            display: 'none'
-          }
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].$index"), {
-          initialValue: item.$index
-        })( /*#__PURE__*/React.createElement(Input$2, null))), /*#__PURE__*/React.createElement(Form.Item, {
-          label: "\u4E0D\u52A8\u4EA7\u5730\u5740"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateAddress"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择不动产地址'
-          }]
-        })(readOnly ? /*#__PURE__*/React.createElement(MyArrString, null) : /*#__PURE__*/React.createElement(Cascader, {
-          style: {
-            width: '100%'
-          },
-          options: props.realEstateAddressOptions,
-          fieldNames: props.realEstateAddressFieldNames,
-          placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A\u53BF"
-        })))), /*#__PURE__*/React.createElement(Col$1, {
-          span: 6
-        }, /*#__PURE__*/React.createElement(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.createElement(MyDiv$3, null) : /*#__PURE__*/React.createElement(Input$2, {
-          autoComplete: 'off',
-          placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740"
-        })))), !isParkFeeItem && /*#__PURE__*/React.createElement(Col$1, {
-          span: 6
-        }, /*#__PURE__*/React.createElement(Form.Item, {
-          label: "\u79DF\u8D41\u671F\u8D77\u6B62"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].leaseTerm"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请输入租赁期'
-          }]
-        })(readOnly ? /*#__PURE__*/React.createElement(MyArrMoment, null) : /*#__PURE__*/React.createElement(RangePicker, {
-          style: {
-            width: '100%'
-          }
-        })))), isParkFeeItem && /*#__PURE__*/React.createElement(Col$1, {
-          span: 6
-        }, /*#__PURE__*/React.createElement(Form.Item, {
-          label: "\u79DF\u8D41\u671F\u8D77\u6B62"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].leaseTerm"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请输入租赁期'
-          }]
-        })(readOnly ? /*#__PURE__*/React.createElement(MyArrMomentTime, null) : /*#__PURE__*/React.createElement(RangePicker, {
-          style: {
-            width: '100%'
-          },
-          showTime: {
-            format: 'HH:mm'
-          },
-          format: "YYYY-MM-DD HH:mm"
-        })))), /*#__PURE__*/React.createElement(Col$1, {
-          span: 6
-        }, /*#__PURE__*/React.createElement(Form.Item, {
-          label: "\u8DE8\u5730\uFF08\u5E02\uFF09\u6807\u5FD7"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].crossCitiesSign"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择跨地（市）标志'
-          }]
-        })(readOnly ? /*#__PURE__*/React.createElement(MyNY, null) : /*#__PURE__*/React.createElement(Select$2, {
-          placeholder: "\u8BF7\u9009\u62E9",
-          style: {
-            width: '100%'
-          }
-        }, /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: 'Y'
-        }, "\u662F"), /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: 'N'
-        }, "\u5426"))))), /*#__PURE__*/React.createElement(Col$1, {
-          span: 6
-        }, /*#__PURE__*/React.createElement(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.createElement(MyDiv$3, null) : /*#__PURE__*/React.createElement(Input$2, {
-          autoComplete: 'off',
-          placeholder: "\u8BF7\u8F93\u5165\u8BC1\u4E66\u7F16\u53F7\uFF0C\u82E5\u6CA1\u6709\u8BC1\u4E66\u586B\u5199\u201C\u65E0\u201D"
-        })))), !isParkFeeItem && /*#__PURE__*/React.createElement(Col$1, {
-          span: 6
-        }, /*#__PURE__*/React.createElement(Form.Item, {
-          label: "\u9762\u79EF\u5355\u4F4D"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateUnit"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择面积单位'
-          }]
-        })(readOnly ? /*#__PURE__*/React.createElement(MyDiv$3, null) : /*#__PURE__*/React.createElement(Select$2, {
-          placeholder: "\u8BF7\u9009\u62E9",
-          style: {
-            width: '100%'
-          }
-        }, /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: "\u5E73\u65B9\u5343\u7C73"
-        }, "\u5E73\u65B9\u5343\u7C73"), /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: "\u5E73\u65B9\u7C73"
-        }, "\u5E73\u65B9\u7C73"), /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: "\u516C\u9877"
-        }, "\u516C\u9877"), /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: "\u4EA9"
-        }, "\u4EA9"), /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: "h\u33A1"
-        }, "h\u33A1"), /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: "k\u33A1"
-        }, "k\u33A1"), /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: "\u33A1"
-        }, "\u33A1"))))), isParkFeeItem && /*#__PURE__*/React.createElement(Col$1, {
-          span: 6
-        }, /*#__PURE__*/React.createElement(Form.Item, {
-          label: "\u9762\u79EF\u5355\u4F4D"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateUnit"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择面积单位'
-          }]
-        })(readOnly ? /*#__PURE__*/React.createElement(MyDiv$3, null) : /*#__PURE__*/React.createElement(Select$2, {
-          placeholder: "\u8BF7\u9009\u62E9",
-          style: {
-            width: '100%'
-          }
-        }, /*#__PURE__*/React.createElement(Select$2.Option, {
-          value: "\u5E73\u65B9\u7C73"
-        }, "\u5E73\u65B9\u7C73"))))), isParkFeeItem && /*#__PURE__*/React.createElement(LicensePlateNumber, {
-          form: form,
-          index: index,
-          cd: item.cd,
-          readOnly: readOnly
-        }) // <Col span={6} >
-        //     <Form.Item label='车牌号' >
-        //         {getFieldDecorator(`realEstateDataDto[${index}].licensePlateNumber`, {
-        //             rules: readOnly ? [] : [{ required: true, message: '请选择面积单位' }]
-        //         })(
-        //             readOnly
-        //                 ? <MyDiv />
-        //                 : <LicensePlateNumber form={form}/>
-        //         )}
-        //     </Form.Item>
-        // </Col>
-        );
-      }
-    });
-  };
-
   return /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React.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.createElement(Row$1, {
+    gutter: [17, 0]
+  }, /*#__PURE__*/React.createElement(Col$1, {
+    span: 6
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u4E0D\u52A8\u4EA7\u5730\u5740"
+  }, getFieldDecorator('realEstateAddress', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择不动产地址'
+    }]
+  })(readOnly ? /*#__PURE__*/React.createElement(MyArrString, null) : /*#__PURE__*/React.createElement(Cascader, {
+    style: {
+      width: '100%'
+    },
+    options: props.realEstateAddressOptions,
+    fieldNames: props.realEstateAddressFieldNames,
+    placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A\u53BF"
+  })))), /*#__PURE__*/React.createElement(Col$1, {
+    span: 6
+  }, /*#__PURE__*/React.createElement(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.createElement(MyDiv$3, null) : /*#__PURE__*/React.createElement(Input$2, {
+    autoComplete: 'off',
+    placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740"
+  })))), /*#__PURE__*/React.createElement(Col$1, {
+    span: 6
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u79DF\u8D41\u671F\u8D77\u6B62"
+  }, getFieldDecorator('leaseTerm', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请输入租赁期'
+    }]
+  })(readOnly ? /*#__PURE__*/React.createElement(MyArrMoment, null) : /*#__PURE__*/React.createElement(RangePicker, {
+    style: {
+      width: '100%'
+    }
+  })))), /*#__PURE__*/React.createElement(Col$1, {
+    span: 6
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u8DE8\u5730\uFF08\u5E02\uFF09\u6807\u5FD7"
+  }, getFieldDecorator('crossCitiesSign', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择跨地（市）标志'
+    }]
+  })(readOnly ? /*#__PURE__*/React.createElement(MyNY, null) : /*#__PURE__*/React.createElement(Select$2, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: 'Y'
+  }, "\u662F"), /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: 'N'
+  }, "\u5426"))))), /*#__PURE__*/React.createElement(Col$1, {
+    span: 6
+  }, /*#__PURE__*/React.createElement(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.createElement(MyDiv$3, null) : /*#__PURE__*/React.createElement(Input$2, {
+    autoComplete: 'off',
+    placeholder: "\u8BF7\u8F93\u5165\u8BC1\u4E66\u7F16\u53F7\uFF0C\u82E5\u6CA1\u6709\u8BC1\u4E66\u586B\u5199\u201C\u65E0\u201D"
+  })))), /*#__PURE__*/React.createElement(Col$1, {
+    span: 6
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u9762\u79EF\u5355\u4F4D"
+  }, getFieldDecorator('realEstateUnit', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择面积单位'
+    }]
+  })(readOnly ? /*#__PURE__*/React.createElement(MyDiv$3, null) : /*#__PURE__*/React.createElement(Select$2, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: "\u5E73\u65B9\u5343\u7C73"
+  }, "\u5E73\u65B9\u5343\u7C73"), /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: "\u5E73\u65B9\u7C73"
+  }, "\u5E73\u65B9\u7C73"), /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: "\u516C\u9877"
+  }, "\u516C\u9877"), /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: "\u4EA9"
+  }, "\u4EA9"), /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: "h\u33A1"
+  }, "h\u33A1"), /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: "k\u33A1"
+  }, "k\u33A1"), /*#__PURE__*/React.createElement(Select$2.Option, {
+    value: "\u33A1"
+  }, "\u33A1")))))));
 });
 
 var MyDiv$3 = /*#__PURE__*/function (_React$Component) {
@@ -26102,52 +25810,22 @@ var MyArrMoment = /*#__PURE__*/function (_React$Component3) {
           color: '#9F603D',
           fontWeight: 600
         }
-      }, " - "), /*#__PURE__*/React.createElement("span", null, hooks.isMoment(value[1]) && value[1].format('YYYY-MM-DD')));
+      }, " - "), /*#__PURE__*/React.createElement("span", null, hooks.isMoment(value[1]) && value[0].format('YYYY-MM-DD')));
     }
   }]);
 
   return MyArrMoment;
 }(React.Component);
 
-var MyArrMomentTime = /*#__PURE__*/function (_React$Component4) {
-  _inherits(MyArrMomentTime, _React$Component4);
-
-  var _super4 = _createSuper(MyArrMomentTime);
-
-  function MyArrMomentTime() {
-    _classCallCheck(this, MyArrMomentTime);
-
-    return _super4.apply(this, arguments);
-  }
-
-  _createClass(MyArrMomentTime, [{
-    key: "render",
-    value: function render() {
-      var _this$props$value3 = this.props.value,
-          value = _this$props$value3 === void 0 ? [] : _this$props$value3;
-      return /*#__PURE__*/React.createElement("div", {
-        style: this.props.style
-      }, /*#__PURE__*/React.createElement("span", null, hooks.isMoment(value[0]) && value[0].format('YYYY-MM-DD HH:mm')), /*#__PURE__*/React.createElement("span", {
-        style: {
-          color: '#9F603D',
-          fontWeight: 600
-        }
-      }, " - "), /*#__PURE__*/React.createElement("span", null, hooks.isMoment(value[1]) && value[1].format('YYYY-MM-DD HH:mm')));
-    }
-  }]);
-
-  return MyArrMomentTime;
-}(React.Component);
-
-var MyNY = /*#__PURE__*/function (_React$Component5) {
-  _inherits(MyNY, _React$Component5);
+var MyNY = /*#__PURE__*/function (_React$Component4) {
+  _inherits(MyNY, _React$Component4);
 
-  var _super5 = _createSuper(MyNY);
+  var _super4 = _createSuper(MyNY);
 
   function MyNY() {
     _classCallCheck(this, MyNY);
 
-    return _super5.apply(this, arguments);
+    return _super4.apply(this, arguments);
   }
 
   _createClass(MyNY, [{
@@ -26162,137 +25840,6 @@ var MyNY = /*#__PURE__*/function (_React$Component5) {
   return MyNY;
 }(React.Component);
 
-var LicensePlateNumber = function LicensePlateNumber(props) {
-  var _formData$props$index2;
-
-  var form = props.form,
-      readOnly = props.readOnly;
-  var getFieldDecorator = form.getFieldDecorator;
-  var licenceLimit = 3; // 最多支持填写3个车牌号
-
-  var formData = form.getFieldValue('realEstateDataDto');
-
-  var _React$useState = React.useState(new Array(props.cd || 1).fill('')),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      value = _React$useState2[0],
-      setVal = _React$useState2[1];
-
-  var cd = React.useMemo(function () {
-    var _formData$props$index;
-
-    return (_formData$props$index = formData[props.index]) === null || _formData$props$index === void 0 ? void 0 : _formData$props$index.cd;
-  }, [(_formData$props$index2 = formData[props.index]) === null || _formData$props$index2 === void 0 ? void 0 : _formData$props$index2.cd]); // useEffect(() => {
-  //     if (cd) {
-  //         const dd = value.concat(new Array(cd.length-1).fill(''))
-  //         setVal(dd);
-  //     }
-  // }, [cd])
-
-  var onAdd = function onAdd() {
-    if (value.length < licenceLimit) {
-      setVal([].concat(_toConsumableArray(value), ['']));
-    } else {
-      message.warn('最多支持填写3个车牌号');
-    }
-  }; // 删除车牌号
-
-
-  var onDelete = function onDelete() {
-    if (value.length > 0) {
-      var dd = value.slice(0, -1);
-      setVal(dd);
-    }
-  };
-
-  return /*#__PURE__*/React.createElement(React.Fragment, null, value.length > 0 && value.map(function (item, key) {
-    return /*#__PURE__*/React.createElement(Col$1, {
-      span: 6
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: "\u8F66\u724C\u53F7",
-      key: key
-    }, getFieldDecorator("realEstateDataDto[".concat(props.index, "].cphList[").concat(key, "]"), {
-      rules: readOnly ? [] : [{
-        required: true,
-        message: '请输入车牌号,最多20位'
-      }]
-    })(readOnly ? /*#__PURE__*/React.createElement(MyDiv$3, null) : /*#__PURE__*/React.createElement(Input$2, {
-      style: {
-        width: '100%'
-      },
-      maxLength: 20,
-      autoComplete: 'off',
-      placeholder: "\u8BF7\u8F93\u5165\u8F66\u724C\u53F7"
-    }))));
-  }), !readOnly && /*#__PURE__*/React.createElement(Col$1, {
-    span: 6
-  }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
-    style: {
-      color: 'white'
-    }
-  }, "1"), /*#__PURE__*/React.createElement("a", {
-    style: {
-      marginRight: 10
-    },
-    onClick: onAdd
-  }, "\u6DFB\u52A0\u8F66\u724C\u53F7"), value.length > 1 && /*#__PURE__*/React.createElement("a", {
-    onClick: onDelete
-  }, "\u5220\u9664"))));
-}; // const LicensePlateNumber: React.FC<PriceInputProps> = (props) => {
-//     const { form } = props;
-//     const { getFieldDecorator } = form;
-//     const licenceLimit = 3; // 最多支持填写3个车牌号
-//     // const { value = [] } = this.props;
-//     const [value, setVal] = React.useState(props.value || ['']);
-//     // const newArr = value.filter(e => !!e);
-//     const newArrLength = value.length;
-//     console.log(value, newArrLength)
-//     // 新增车牌号
-//     const onAdd = () => {
-//         if (newArrLength < licenceLimit) {
-//             setVal([...value, '']);
-//             props.onChange?.([...value, ''])
-//         }
-//     }
-//     // 删除车牌号
-//     const onDelete = () => {
-//         if (newArrLength > 0) {
-//             const dd = value.slice(0, -1)
-//             setVal(dd);
-//             props.onChange?.(dd)
-//         }
-//     }
-//     const onInputChange = (e: React.ChangeEvent<HTMLInputElement>, index: number) => {
-//         console.log(e.target.value);
-//         const dd = value.map((item, i) => {
-//             if (i === index) {
-//                 return e.target.value
-//             }
-//             return item
-//         })
-//         setVal(dd);
-//         props.onChange?.(dd)
-//     }
-//     return (
-//         <>
-//             {newArrLength > 0 && value.map((item, index) => {
-//                 return
-//                 <Form.Item label='车牌号' >
-//                     {getFieldDecorator(`realEstateDataDto[${index}].licensePlateNumber`, {
-//                         rules: [{ required: true, }]
-//                     })(
-//                         <Input onChange={(e) => { onInputChange(e, index) }} key={index} style={{ width: '100%' }} autoComplete='off' placeholder="请输入车牌号" />
-//                     )}
-//                 </Form.Item>
-//                 // <Col span={6} >
-//                 //     <Input onChange={(e) => { onInputChange(e, index) }} key={index} style={{ width: '100%' }} autoComplete='off' placeholder="请输入车牌号" />
-//                 // </Col>
-//             })}
-//             <Button type="link" onClick={onAdd}>添加车牌号</Button>
-//             {newArrLength > 1 && <Button type="link" onClick={onDelete}>删除</Button>}
-//         </>
-//     )
-// }
-
 var css_248z$s = ".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 .break-word {\n  word-break: break-word;\n}\n";
 styleInject(css_248z$s);
 
@@ -26315,7 +25862,7 @@ var Architecture = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React.createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u5B9A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React.createElement(Row$1, {
+  }, "\u7279\u6B8A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React.createElement(Row$1, {
     gutter: [17, 0]
   }, /*#__PURE__*/React.createElement(Col$1, {
     span: 6
@@ -27921,7 +27468,7 @@ var Main$4 = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-freight"
   }, /*#__PURE__*/React.createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u5B9A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React.createElement("div", {
+  }, "\u7279\u6B8A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-digtal",
     onClick: function onClick(e) {
       e.stopPropagation();
@@ -29384,10 +28931,9 @@ var ImportGoodsDrawer = (function () {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                s.goodsListState.importGoods.filter = {};
                 s.goodsListState.importGoods.isVisibleDrawer = false;
 
-              case 2:
+              case 1:
               case "end":
                 return _context.stop();
             }