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

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import 'kts-components-antd-x3/dist/kts-components-antd-x3.css';
-import React, { createElement, createContext, useContext, useEffect, forwardRef, Children, isValidElement } from 'react';
+import React, { createElement, createContext, useContext, useEffect, forwardRef, Children, isValidElement, useCallback } from 'react';
 import GreyReactBox, { decorator } from 'grey-react-box';
 import { chain as chain$1, bignumber, format as format$1, create, all, equal } from 'mathjs';
 import { message, Form, Input, Icon as Icon$1, Tag as Tag$1, Select, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete as AutoComplete$2, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover as Popover$1, Table as Table$1, Tree, Modal as Modal$1, Row as Row$2, Col as Col$2 } from 'kts-components-antd-x3';
@@ -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, Cascader, Input as Input$2, Select as Select$2 } from 'kts-components-antd-x4';
+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 { Input as Input$3, NumberPicker } from '@formily/antd-components';
 import { createAsyncFormActions, FormEffectHooks, SchemaForm, FormButtonGroup, SchemaMarkupField } from '@formily/antd';
 
@@ -981,6 +981,7 @@ var ImportGoods = /*#__PURE__*/_createClass(function ImportGoods() {
   this.dataSource = [];
   this.pagination = {};
   this.isVisibleDrawer = false;
+  this.filter = {};
   this.topExpand = void 0;
 
   this.verifyFn = /*#__PURE__*/function () {
@@ -1174,6 +1175,7 @@ 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() {
@@ -2217,7 +2219,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;
@@ -10967,7 +10969,7 @@ var Statistics = (function () {
   }, /*#__PURE__*/React.createElement("label", null, "\uFF08\u5C0F\u5199\uFF09 ", lineAmountIncludeTax === '' ? '' : parseFloat(lineAmountIncludeTax).toFixed(2)))));
 });
 
-var AddRowButton = (function () {
+var AddRowButton = (function (props) {
   var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
@@ -11000,24 +11002,54 @@ var AddRowButton = (function () {
   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 _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
+  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
-        switch (_context.prev = _context.next) {
+        switch (_context2.prev = _context2.next) {
           case 0:
-            _context.next = 2;
-            return addGood$1(controller);
+            _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:
-            _context.next = 4;
+            console.log('continue');
+            _context2.next = 5;
+            return addGood$1(controller);
+
+          case 5:
+            _context2.next = 7;
             return rollBottom(controller, rootElement);
 
-          case 4:
+          case 7:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
       }
-    }, _callee);
+    }, _callee2);
   })), [controller, rootElement]);
   if (isAddRow === false) return /*#__PURE__*/React.createElement(React.Fragment, null);
   if (model === 'prefab') return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -11029,35 +11061,35 @@ var AddRowButton = (function () {
 });
 /** 添加一个空货物 */
 
-function addGood$1(_x) {
+function addGood$1(_x2) {
   return _addGood.apply(this, arguments);
 }
 /** 货物列表，滚动到底部 */
 
 
 function _addGood() {
-  _addGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(controller) {
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+  _addGood = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.next = 2;
+            _context4.next = 2;
             return controller.saveEditGood();
 
           case 2:
-            _context3.next = 4;
+            _context4.next = 4;
             return controller.wait();
 
           case 4:
-            _context3.next = 6;
+            _context4.next = 6;
             return controller.run( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
-                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                   while (1) {
-                    switch (_context2.prev = _context2.next) {
+                    switch (_context3.prev = _context3.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context2.next = 3;
+                          _context3.next = 3;
                           break;
                         }
 
@@ -11065,74 +11097,74 @@ function _addGood() {
                           content: '你正在编辑一个货物',
                           key: '你正在编辑一个货物'
                         });
-                        return _context2.abrupt("return");
+                        return _context3.abrupt("return");
 
                       case 3:
-                        _context2.next = 5;
+                        _context3.next = 5;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
 
                       case 5:
-                        s.goodsListState.editGood = _context2.sent;
+                        s.goodsListState.editGood = _context3.sent;
 
                       case 6:
                       case "end":
-                        return _context2.stop();
+                        return _context3.stop();
                     }
                   }
-                }, _callee2);
+                }, _callee3);
               }));
 
-              return function (_x4) {
-                return _ref2.apply(this, arguments);
+              return function (_x5) {
+                return _ref3.apply(this, arguments);
               };
             }());
 
           case 6:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return _addGood.apply(this, arguments);
 }
 
-function rollBottom(_x2, _x3) {
+function rollBottom(_x3, _x4) {
   return _rollBottom.apply(this, arguments);
 }
 
 function _rollBottom() {
-  _rollBottom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller, rootElement) {
+  _rollBottom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, rootElement) {
     var cont;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.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) {
-              _context4.next = 5;
+              _context5.next = 5;
               break;
             }
 
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
 
           case 5:
             cont.scrollTop = cont.scrollHeight;
 
           case 6:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
   return _rollBottom.apply(this, arguments);
 }
@@ -16918,7 +16950,9 @@ 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, null), 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, {
+    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", {
     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', {
@@ -17922,7 +17956,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 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17939,7 +17973,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 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17953,7 +17987,22 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     readOnly: isReadOnly('buyerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), /*#__PURE__*/React.createElement(Col, {
+  })))), 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, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -18045,7 +18094,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 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -18062,7 +18111,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 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -18076,7 +18125,22 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     readOnly: isReadOnly('sellerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), /*#__PURE__*/React.createElement(Col, {
+  })))), 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, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -18465,8 +18529,29 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
   var rulesMap = controller.useMemo(function (s) {
     return s.stakeholder.rulesMap || {};
   }, []);
+
+  var _React$useState3 = React.useState(''),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      validateStatus = _React$useState4[0],
+      setStatus = _React$useState4[1];
+
+  var _React$useState5 = React.useState(''),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      errorInfo = _React$useState6[0],
+      setInfo = _React$useState6[1];
+
+  var _React$useState7 = React.useState(''),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      nation = _React$useState8[0],
+      setNationStatue = _React$useState8[1];
+
+  var _React$useState9 = React.useState(''),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      nationInfo = _React$useState10[0],
+      setNation = _React$useState10[1];
   /** 乐企 */
 
+
   var leqispanW = React.useMemo(function () {
     if (props.leqi) {
       return 0;
@@ -18507,6 +18592,200 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
   React.useEffect(function () {
     setExpand(typeof props.isExpand === 'boolean' ? props.isExpand : true);
   }, [props.isExpand]);
+  var onChangeType = useCallback(function (value) {
+    console.log(value);
+
+    if (value === "201") {
+      // 当“自然人证件类型”选择“201:居民身份证”时，校验是否为“156:中国’
+      form === null || form === void 0 ? void 0 : form.setFieldsValue({
+        nationality: "156"
+      });
+      var supplierTaxId = form === null || form === void 0 ? void 0 : form.getFieldValue("supplierTaxId");
+      var certificateNumber = form === null || form === void 0 ? void 0 : form.getFieldValue("certificateNumber");
+
+      if (supplierTaxId !== certificateNumber) {
+        setStatus('error');
+        setInfo('证件号码应与销方税号保持一致');
+      }
+    } else if (value === "227") {
+      // 当“自然人证件类型”选择“227:中华人民共和国护照”时，校验是否为“156:中国
+      form === null || form === void 0 ? void 0 : form.setFieldsValue({
+        nationality: "156"
+      });
+    } else if (value === "213" || value === "238") {
+      // 当“自然人证件类型”选择“213:台湾居民来往大陆通行证”时，校验是否为”158:中国台湾”
+      // 当“自然人证件类型”选择“238:中华人民共和国台湾居民居住证”时，校验是否为“ 158:中国台湾”
+      form === null || form === void 0 ? void 0 : form.setFieldsValue({
+        nationality: "158"
+      });
+    }
+  }, [form]);
+  /** 校验证件号码*/
+
+  var validateIDCode = useCallback(function (_, value) {
+    if (!value) {
+      return Promise.resolve();
+    }
+
+    var idtype = form === null || form === void 0 ? void 0 : form.getFieldValue("certificateType");
+    var nationality = form === null || form === void 0 ? void 0 : form.getFieldValue("nationality");
+
+    if (idtype === "210") {
+      // 当“自然人证件类型”选择“210:港澳居民来往内地通行证”时，
+      if (value.startsWith("M")) {
+        //如果“证件号码”以M开头，"国籍(或地区头，)”必须为“446:中国澳门”;校验证件号码必须以H或M开头
+        if (nationality !== '446') {
+          setNationStatue('error');
+          setNation('请选择正确的国籍');
+        } else {
+          setNationStatue('');
+          setNation('');
+        }
+      } else if (value.startsWith("H")) {
+        //如果“证件号码”以H开国籍(或地区)”必须为“344:中国香港”;
+        if (nationality !== '344') {
+          setNationStatue('error');
+          setNation('请选择正确的国籍');
+        } else {
+          setNationStatue('');
+          setNation('');
+        }
+      } else {
+        return Promise.reject("请输入正确的证件号码");
+      }
+    } else if (idtype === "237") {
+      //当“自然人证件类型”选择“237:中华人民共和国港澳居民居住证”时，校验证件号码必须以810000或820000开头，如果“证件号码”以810000开头，必须为“344:中国香国籍(或地区))港”;如果“证件号码”以820000开头，国籍(或地区)必须为“446:中国澳门”
+      if (value.startsWith("810000")) {
+        if (nationality !== '344') {
+          setNationStatue('error');
+          setNation('请选择正确的国籍');
+        } else {
+          setNationStatue('');
+          setNation('');
+        }
+      } else if (value.startsWith("820000")) {
+        if (nationality !== '446') {
+          setNationStatue('error');
+          setNation('请选择正确的国籍');
+        } else {
+          setNationStatue('');
+          setNation('');
+        }
+      } else {
+        setStatus('error');
+        setInfo('请输入正确的证件号码');
+        return Promise.reject("请输入正确的证件号码");
+      }
+    } // 当“销售方自然人证件类型”填写“201:居民身份证”，“销售方纳税人识别号”必须与“销售方自然人证件号码”完全一致
+
+
+    if (idtype === "201") {
+      var supplierTaxId = form === null || form === void 0 ? void 0 : form.getFieldValue("supplierTaxId");
+
+      if (value !== supplierTaxId) {
+        setStatus('error');
+        setInfo('证件号码应与销方税号保持一致');
+        return Promise.reject("证件号码应与销方税号保持一致");
+      } else if (value === supplierTaxId) {
+        setStatus('');
+        setInfo('');
+      }
+    }
+
+    setStatus('');
+    setInfo('');
+    return Promise.resolve();
+  }, [form]);
+  var validateIDCode2 = useCallback(function (e) {
+    var value = e.target.value; // if (!value) {
+    //     setStatus('');
+    //     setInfo('')
+    // }
+
+    var idtype = form === null || form === void 0 ? void 0 : form.getFieldValue("certificateType"); // // 当“销售方自然人证件类型”填写“201:居民身份证”，“销售方纳税人识别号”必须与“销售方自然人证件号码”完全一致
+
+    if (idtype === "201") {
+      var certificateNumber = form === null || form === void 0 ? void 0 : form.getFieldValue("certificateNumber");
+      console.log(value, certificateNumber);
+
+      if (value !== certificateNumber) {
+        setStatus('error');
+        setInfo('证件号码应与销方税号保持一致');
+      } else {
+        setStatus('');
+        setInfo('');
+      }
+    }
+  }, [form]);
+  var validateNationality = useCallback(function (_, value) {
+    if (!value) {
+      return Promise.resolve();
+    }
+
+    var idtype = form === null || form === void 0 ? void 0 : form.getFieldValue("certificateType");
+    var idcode = form === null || form === void 0 ? void 0 : form.getFieldValue("certificateNumber");
+    console.log(value, idtype, idcode);
+
+    if (idtype === "201" || idtype === "227") {
+      // 当“自然人证件类型”选择“201:居民身份证”时，校验是否为“156:中国’
+      // 当“自然人证件类型”选择“227:中华人民共和国护照”时，校验是否为“156:中国
+      if (value !== "156") {
+        setNationStatue('error');
+        setNation('请选择正确的国籍');
+        return Promise.reject("请选择正确的国籍");
+      }
+    } else if (idtype === "213" || idtype === "238") {
+      // 当“自然人证件类型”选择“213:台湾居民来往大陆通行证”时，校验是否为”158:中国台湾”
+      // 当“自然人证件类型”选择“238:中华人民共和国台湾居民居住证”时，校验是否为“ 158:中国台湾”
+      if (value !== "158") {
+        setNationStatue('error');
+        setNation('请选择正确的国籍');
+        return Promise.reject("请选择正确的国籍");
+      }
+    } else if (idtype === "210") {
+      //当“自然人证件类型”选择“210:港澳居民来往内地通行证”时，如果“证件号码”以H开国籍(或地区)”必须为“344:中国香港”;如果“证件号码”以M开头，"国籍(或地区头，)”必须为“446:中国澳门”;
+      var r = false;
+
+      if (idcode) {
+        if (idcode.startsWith("M") && value === "446") {
+          r = true;
+        } else if (idcode.startsWith("H") && value === "344") {
+          r = true;
+        }
+      } else if (value === "344" || value === "446") {
+        r = true;
+      }
+
+      if (!r) {
+        setNationStatue('error');
+        setNation('请选择正确的国籍');
+        return Promise.reject("请选择正确的国籍");
+      }
+    } else if (idtype === "237") {
+      //当“自然人证件类型”选择“237:中华人民共和国港澳居民居住证”时，校验证件号码必须以810000或820000开头，如果“证件号码”以810000开头，必须为“344:中国香国籍(或地区))港”;如果“证件号码”以820000开头，国籍(或地区)必须为“446:中国澳门”
+      var _r = false;
+
+      if (idcode) {
+        if (idcode.startsWith("820000") && value === "446") {
+          _r = true;
+        } else if (idcode.startsWith("810000") && value === "344") {
+          _r = true;
+        }
+      } else if (value === "344" || value === "446") {
+        _r = true;
+      }
+
+      if (!_r) {
+        setNationStatue('error');
+        setNation('请选择正确的国籍');
+        return Promise.reject("请选择正确的国籍");
+      }
+    }
+
+    setNationStatue('');
+    setNation('');
+    return Promise.resolve();
+  }, [form]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classnames("kts-invoice-operate-invoice-digtal-stakeholder", {
       readOnly: readOnly
@@ -18569,6 +18848,7 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
       message: '销售方纳税人识别号必填'
     }].concat(_toConsumableArray(RULES$1.taxId('销售方纳税人识别号'))))
   })( /*#__PURE__*/React.createElement(BuyerNameInput$2, {
+    onChange: validateIDCode2,
     myform: form,
     fieldName: 'supplierTaxId',
     readOnly: isReadOnly('supplierTaxId'),
@@ -18843,6 +19123,7 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
       message: '数据必填'
     }]
   })( /*#__PURE__*/React.createElement(CardSelect, {
+    onChange: onChangeType,
     readOnly: isReadOnly('certificateType'),
     placeholder: "\u6570\u636E\u5FC5\u586B",
     autoComplete: "off"
@@ -18850,7 +19131,9 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
     span: 7
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u8BC1\u4EF6\u53F7\u7801",
-    colon: false
+    colon: false,
+    validateStatus: validateStatus,
+    help: errorInfo
   }, getFieldDecorator('certificateNumber', {
     rules: [{
       required: true,
@@ -18858,6 +19141,8 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
     }, {
       max: 30,
       message: "\u5185\u5BB9\u8D85\u957F"
+    }, {
+      validator: validateIDCode
     }]
   })( /*#__PURE__*/React.createElement(MyInput$2, {
     readOnly: isReadOnly('certificateNumber'),
@@ -18867,13 +19152,28 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
     span: 6
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u56FD\u7C4D(\u6216\u5730\u533A)",
-    colon: false
+    colon: false,
+    validateStatus: nation,
+    help: nationInfo
   }, getFieldDecorator('nationality', {
     rules: [{
       required: true,
       message: '数据必填'
+    }, {
+      validator: validateNationality
     }]
   })( /*#__PURE__*/React.createElement(NationalSelect, {
+    showSearch: true,
+    optionFilterProp: "children",
+    filterOption: function filterOption(input, option) {
+      if (option) {
+        var _option$label;
+
+        return ((_option$label = option.label) === null || _option$label === void 0 ? void 0 : _option$label.indexOf(input)) >= 0;
+      }
+
+      return false;
+    },
     readOnly: isReadOnly('nationality'),
     placeholder: "\u6570\u636E\u5FC5\u586B",
     autoComplete: "off"
@@ -18881,10 +19181,10 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
 });
 
 function NaturalPersonFlag$1(props) {
-  var _React$useState3 = React.useState(props.value || 'COMPANY'),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      value = _React$useState4[0],
-      setValue = _React$useState4[1];
+  var _React$useState11 = React.useState(props.value || 'COMPANY'),
+      _React$useState12 = _slicedToArray(_React$useState11, 2),
+      value = _React$useState12[0],
+      setValue = _React$useState12[1];
 
   var onChange = React.useCallback(function (e) {
     if (props.readOnly) return;
@@ -18912,10 +19212,10 @@ function BuyerNameInput$2(props) {
     return s.autoComplete;
   }, []);
 
-  var _React$useState5 = React.useState([]),
-      _React$useState6 = _slicedToArray(_React$useState5, 2),
-      options = _React$useState6[0],
-      setOptions = _React$useState6[1];
+  var _React$useState13 = React.useState([]),
+      _React$useState14 = _slicedToArray(_React$useState13, 2),
+      options = _React$useState14[0],
+      setOptions = _React$useState14[1];
 
   var onChangeAutoComplete = React.useCallback(function (value) {
     var record = options.filter(function (e) {
@@ -19114,65 +19414,13 @@ var CardSelect = /*#__PURE__*/function (_React$Component2) {
   _createClass(CardSelect, [{
     key: "render",
     value: function render() {
-      var props = this.props; // const option = [
-      //     { label: '组织机构代码证', value: '101' },
-      //     { label: '营业执照', value: '102' },
-      //     { label: '税务登记证', value: '103' },
-      //     { label: '其他单位证件', value: '199' },
-      //     { label: '居民身份证', value: '201' },
-      //     { label: '军官证', value: '202' },
-      //     { label: '武警警官证', value: '203' },
-      //     { label: '士兵证', value: '204' },
-      //     { label: '军队离退休干部证', value: '205' },
-      //     { label: '残疾人证', value: '206' },
-      //     { label: '残疾军人证（1-8级）', value: '207' },
-      //     { label: '外国护照', value: '208', },
-      //     { label: '港澳同胞回乡证', value: '209', },
-      //     { label: '港澳居民来往内地通行证', value: '210', },
-      //     { label: '台胞证', value: '211', },
-      //     { label: '中华人民共和国往来港澳通行证', value: '212', },
-      //     { label: '台湾居民来往大陆通行证', value: '213', },
-      //     { label: '大陆居民往来台湾通行证', value: '214', },
-      //     { label: '外国人居留证', value: '215', },
-      //     { label: '外交官证', value: '216', },
-      //     { label: '使（领事）馆证', value: '217', },
-      //     { label: '海员证', value: '218', },
-      //     { label: '香港永久性居民身份证', value: '219', },
-      //     { label: '台湾身份证', value: '220', },
-      //     { label: '澳门特别行政区永久性居民身份证', value: '221', },
-      //     { label: '外国人身份证件', value: '222', },
-      //     { label: '高校毕业生自主创业证', value: '223', },
-      //     { label: '就业失业登记证', value: '224', },
-      //     { label: '退休证', value: '225', },
-      //     { label: '离休证', value: '226', },
-      //     { label: '中国护照', value: '227', },
-      //     { label: '城镇退役士兵自谋职业证', value: '228', },
-      //     { label: '随军家属身份证明', value: '229', },
-      //     { label: '中国护照', value: '230', },
-      //     { label: '中国人民解放军义务兵退出现役证', value: '231', },
-      //     { label: '中国人民解放军士官退出现役证', value: '232', },
-      //     { label: '外国人永久居留身份证', value: '233', },
-      //     { label: '就业创业证', value: '234', },
-      //     { label: '香港特别行政区护照', value: '235', },
-      //     { label: '澳门特别行政区护照', value: '236', },
-      //     { label: '中华人民共和国港澳居民居住证', value: '237', },
-      //     { label: '中华人民共和国台湾居民居住证', value: '238', },
-      //     { label: '《中华人民共和国外国人工作许可证》(A类)', value: '239', },
-      //     { label: '《中华人民共和国外国人工作许可证》(B类)', value: '240', },
-      //     { label: '《中华人民共和国外国人工作许可证》(C类)', value: '241', },
-      //     { label: '出生医学证明', value: '291', },
-      //     { label: '其他个人证件', value: '299', },
-      // ]
-
+      var props = this.props;
       var option = [{
         label: "居民身份证",
         value: "201"
       }, {
         label: "外国护照",
         value: "208"
-      }, {
-        label: "港澳同胞回乡证",
-        value: "209"
       }, {
         label: "港澳居民来往内地通行证",
         value: "210"
@@ -19237,6 +19485,15 @@ var NationalSelect = /*#__PURE__*/function (_React$Component3) {
       var option = [{
         value: "156",
         label: "中国"
+      }, {
+        value: "344",
+        label: "中国香港"
+      }, {
+        value: "158",
+        label: "中国台湾"
+      }, {
+        value: "446",
+        label: "中国澳门"
       }, {
         value: "004",
         label: "阿富汗"
@@ -19366,9 +19623,6 @@ var NationalSelect = /*#__PURE__*/function (_React$Component3) {
       }, {
         value: "152",
         label: "智利"
-      }, {
-        value: "158",
-        label: "中国台湾"
       }, {
         value: "162",
         label: "圣诞岛"
@@ -19528,9 +19782,6 @@ var NationalSelect = /*#__PURE__*/function (_React$Component3) {
       }, {
         value: "340",
         label: "洪都拉斯"
-      }, {
-        value: "344",
-        label: "中国香港"
       }, {
         value: "348",
         label: "匈牙利"
@@ -19615,9 +19866,6 @@ var NationalSelect = /*#__PURE__*/function (_React$Component3) {
       }, {
         value: "442",
         label: "卢森堡"
-      }, {
-        value: "446",
-        label: "中国澳门"
       }, {
         value: "450",
         label: "马达加斯加"
@@ -20124,7 +20372,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.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -20166,8 +20414,10 @@ function TableVirtual$1 (props) {
   }, [self, tableBody]); // 设置占位dom的搞
 
   var placeholderHeight = React.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]);
@@ -20179,12 +20429,12 @@ function TableVirtual$1 (props) {
   }, [tableBody, rowHeight, placeholderHeight]); // 计算渲染的行
 
   var dataSource = React.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.useEffect(function () {
@@ -20203,17 +20453,24 @@ 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;
-    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.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.createElement("span", {
     className: "kts-invoice-operate-goods-table-virtual",
     ref: function ref(e) {
@@ -20456,43 +20713,86 @@ function addGood$2(_x) {
 
 
 function _addGood$1() {
-  _addGood$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(controller) {
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+  _addGood$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller) {
+    var _controller$formList$;
+
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.next = 2;
-            return controller.saveEditGood();
-
-          case 2:
-            _context4.next = 4;
-            return controller.wait();
-
-          case 4:
-            _context4.next = 6;
-            return controller.run( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
-                var _controller$state$goo;
-
-                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            _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 (_context3.prev = _context3.next) {
+                    switch (_context2.prev = _context2.next) {
                       case 0:
-                        if (!s.goodsListState.editGood) {
-                          _context3.next = 3;
+                        if (!err) {
+                          _context2.next = 3;
                           break;
                         }
 
-                        _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 _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
+                        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;
+            return controller.saveEditGood();
+
+          case 4:
+            _context5.next = 6;
+            return controller.wait();
+
+          case 6:
+            _context5.next = 8;
+            return controller.run( /*#__PURE__*/function () {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
+                var isValidateGood, _controller$state$goo;
+
+                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                  while (1) {
+                    switch (_context4.prev = _context4.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;
+                          break;
+                        }
+
+                        _context4.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 firstError;
-                            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                               while (1) {
-                                switch (_context2.prev = _context2.next) {
+                                switch (_context3.prev = _context3.next) {
                                   case 0:
                                     if (!err) {
-                                      _context2.next = 4;
+                                      _context3.next = 4;
                                       break;
                                     }
 
@@ -20501,50 +20801,50 @@ function _addGood$1() {
                                       content: firstError.errors[0].message,
                                       key: '你正在编辑一个货物'
                                     });
-                                    return _context2.abrupt("return");
+                                    return _context3.abrupt("return");
 
                                   case 4:
                                   case "end":
-                                    return _context2.stop();
+                                    return _context3.stop();
                                 }
                               }
-                            }, _callee2);
+                            }, _callee3);
                           }));
 
-                          return function (_x5, _x6) {
-                            return _ref3.apply(this, arguments);
+                          return function (_x7, _x8) {
+                            return _ref4.apply(this, arguments);
                           };
                         }());
 
-                      case 3:
-                        _context3.next = 5;
+                      case 5:
+                        _context4.next = 7;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
 
-                      case 5:
-                        s.goodsListState.editGood = _context3.sent;
+                      case 7:
+                        s.goodsListState.editGood = _context4.sent;
 
-                      case 6:
+                      case 8:
                       case "end":
-                        return _context3.stop();
+                        return _context4.stop();
                     }
                   }
-                }, _callee3);
+                }, _callee4);
               }));
 
-              return function (_x4) {
-                return _ref2.apply(this, arguments);
+              return function (_x6) {
+                return _ref3.apply(this, arguments);
               };
             }());
 
-          case 6:
+          case 8:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
   return _addGood$1.apply(this, arguments);
 }
@@ -20554,34 +20854,34 @@ function rollBottom$1(_x2, _x3) {
 }
 
 function _rollBottom$1() {
-  _rollBottom$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(controller, rootElement) {
+  _rollBottom$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(controller, rootElement) {
     var cont;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.next = 2;
+            _context6.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;
+              _context6.next = 5;
               break;
             }
 
-            return _context5.abrupt("return");
+            return _context6.abrupt("return");
 
           case 5:
             cont.scrollTop = cont.scrollHeight;
 
           case 6:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
       }
-    }, _callee5);
+    }, _callee6);
   }));
   return _rollBottom$1.apply(this, arguments);
 }
@@ -21908,7 +22208,7 @@ var onChangeSwitchTax$1 = /*#__PURE__*/function () {
   };
 }();
 
-var TaxIncludedSwitch$1 = (function () {
+var TaxIncludedSwitch$1 = (function (props) {
   var controller = Invoice.useInvoiceController();
   /** 是否含税 */
 
@@ -21927,8 +22227,9 @@ var TaxIncludedSwitch$1 = (function () {
           switch (_context.prev = _context.next) {
             case 0:
               onChangeSwitchTax$1(controller, e);
+              props.onChange && props.onChange(e);
 
-            case 1:
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -22833,6 +23134,9 @@ 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) {
@@ -22927,25 +23231,37 @@ var useColumns$1 = (function (form) {
                     while (1) {
                       switch (_context2.prev = _context2.next) {
                         case 0:
-                          _context2.next = 2;
+                          if (!isValidateGood) {
+                            _context2.next = 11;
+                            break;
+                          }
+
+                          _context2.next = 3;
                           return controller.wait();
 
-                        case 2:
+                        case 3:
                           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 = 7;
+                            _context2.next = 8;
                             break;
                           }
 
                           callback('项目名称不能为空');
-                          _context2.next = 8;
+                          _context2.next = 9;
                           break;
 
-                        case 7:
+                        case 8:
                           return _context2.abrupt("return");
 
-                        case 8:
+                        case 9:
+                          _context2.next = 12;
+                          break;
+
+                        case 11:
+                          callback();
+
+                        case 12:
                         case "end":
                           return _context2.stop();
                       }
@@ -23146,24 +23462,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();
                       }
@@ -23381,7 +23707,7 @@ var useColumns$1 = (function (form) {
             initialValue: editGood.lineAmountIncludeTax,
             getValueFromEvent: onNumberValueChange,
             rules: [].concat(_toConsumableArray(getReplenishRules('lineAmountIncludeTax')), [{
-              required: true,
+              required: isValidateGood,
               message: '金额不能为空'
             }, {
               pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
@@ -23452,7 +23778,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));
         }
       }
     }, {
@@ -23469,7 +23795,7 @@ var useColumns$1 = (function (form) {
             initialValue: editGood.lineAmountExcludeTax,
             getValueFromEvent: onNumberValueChange,
             rules: [].concat(_toConsumableArray(getReplenishRules('lineAmountExcludeTax')), [{
-              required: true,
+              required: isValidateGood,
               message: '金额不能为空'
             }, {
               pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
@@ -23515,7 +23841,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));
         }
       }
     }, {
@@ -23531,7 +23857,7 @@ var useColumns$1 = (function (form) {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('taxRate', {
             initialValue: editGood.taxRate,
             rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
-              required: true,
+              required: isValidateGood,
               message: '请选择税率'
             }, {
               pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
@@ -23558,11 +23884,15 @@ var useColumns$1 = (function (form) {
             }, e, "%");
           }))));
         } else {
-          return /*#__PURE__*/React.createElement("span", {
-            style: {
-              padding: '0 10px'
-            }
-          }, isDutyFree$1(record) ? '免税' : "".concat(value, "%"));
+          if (value || value === '0' || value === 0) {
+            return /*#__PURE__*/React.createElement("span", {
+              style: {
+                padding: '0 10px'
+              }
+            }, isDutyFree$1(record) ? '免税' : "".concat(value, "%"));
+          } else {
+            return '';
+          }
         }
       }
     }, {
@@ -23578,7 +23908,7 @@ var useColumns$1 = (function (form) {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('taxAmount', {
             initialValue: editGood.taxAmount,
             rules: [].concat(_toConsumableArray(getReplenishRules('taxAmount')), [{
-              required: true,
+              required: isValidateGood,
               message: '税额不能为空'
             }, {
               validator: function validator(rule, value, callback) {
@@ -23623,7 +23953,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));
         }
       }
     }] // 含税不含税
@@ -25568,7 +25898,9 @@ 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, null), /*#__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, {
+    onChange: props.onTaxSwitchChange
+  }), /*#__PURE__*/React.createElement(Search$1, null), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1
     }
@@ -25599,7 +25931,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";
+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";
 styleInject(css_248z$r);
 
 var RangePicker = DatePicker.RangePicker;
@@ -25615,126 +25947,272 @@ var RealEstateInfo = decorator(Form.create())(function (props) {
   }, []);
   var readOnly = React.useMemo(function () {
     return model === 'readOnly';
-  }, [model]); // 注册 form
+  }, [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
 
   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\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")))))));
+  }, "\u7279\u5B9A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), getList());
 });
 
 var MyDiv$3 = /*#__PURE__*/function (_React$Component) {
@@ -25810,22 +26288,52 @@ var MyArrMoment = /*#__PURE__*/function (_React$Component3) {
           color: '#9F603D',
           fontWeight: 600
         }
-      }, " - "), /*#__PURE__*/React.createElement("span", null, hooks.isMoment(value[1]) && value[0].format('YYYY-MM-DD')));
+      }, " - "), /*#__PURE__*/React.createElement("span", null, hooks.isMoment(value[1]) && value[1].format('YYYY-MM-DD')));
     }
   }]);
 
   return MyArrMoment;
 }(React.Component);
 
-var MyNY = /*#__PURE__*/function (_React$Component4) {
-  _inherits(MyNY, _React$Component4);
+var MyArrMomentTime = /*#__PURE__*/function (_React$Component4) {
+  _inherits(MyArrMomentTime, _React$Component4);
 
-  var _super4 = _createSuper(MyNY);
+  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 _super5 = _createSuper(MyNY);
 
   function MyNY() {
     _classCallCheck(this, MyNY);
 
-    return _super4.apply(this, arguments);
+    return _super5.apply(this, arguments);
   }
 
   _createClass(MyNY, [{
@@ -25840,6 +26348,137 @@ var MyNY = /*#__PURE__*/function (_React$Component4) {
   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);
 
@@ -25862,7 +26501,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\u6B8A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React.createElement(Row$1, {
+  }, "\u7279\u5B9A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React.createElement(Row$1, {
     gutter: [17, 0]
   }, /*#__PURE__*/React.createElement(Col$1, {
     span: 6
@@ -27468,7 +28107,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\u6B8A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React.createElement("div", {
+  }, "\u7279\u5B9A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-digtal",
     onClick: function onClick(e) {
       e.stopPropagation();
@@ -27985,7 +28624,7 @@ var useColumns$3 = (function (form) {
               message: '请输入'
             }]
           })( /*#__PURE__*/React.createElement(MyInput$5, {
-            maxLength: 200,
+            maxLength: 40,
             onChange: function () {
               var _onChange2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -28931,9 +29570,10 @@ var ImportGoodsDrawer = (function () {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                s.goodsListState.importGoods.filter = {};
                 s.goodsListState.importGoods.isVisibleDrawer = false;
 
-              case 1:
+              case 2:
               case "end":
                 return _context.stop();
             }