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

package/dist/index.js

@@ -1277,6 +1277,7 @@ var InvoiceControllerState = /*#__PURE__*/_createClass(function InvoiceControlle
   this.autoComplete = new AutoComplete();
   this.taxClassificationProps = void 0;
   this.freightListState = new FreightListState();
+  this.addGoodsCheck = void 0;
 });
 
 /**
@@ -10662,7 +10663,7 @@ var Statistics = (function () {
   }, /*#__PURE__*/React__default['default'].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;
@@ -10695,24 +10696,54 @@ var AddRowButton = (function () {
   var disabled = React__default['default'].useMemo(function () {
     return typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue;
   }, [goodMax, goodsNum, searchValue]);
-  var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
+  var onClick = React__default['default'].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__default['default'].createElement(React__default['default'].Fragment, null);
   if (model === 'prefab') return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
@@ -10724,35 +10755,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;
                         }
 
@@ -10760,74 +10791,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);
 }
@@ -16613,7 +16644,9 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
     className: "kts-invoice-operate-goods-list-able"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, /*#__PURE__*/React__default['default'].createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React__default['default'].createElement(Search, null)), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default['default'].createElement(AddRowButton, {
+    addGoodsCheck: props.addGoodsCheck
+  }), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React__default['default'].createElement(Search, null)), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, /*#__PURE__*/React__default['default'].createElement(DescribeSwitch, null), /*#__PURE__*/React__default['default'].createElement(TaxIncludedSwitch, null))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: classnames__default['default']('kts-invoice-operate-goods-list-table', {
@@ -17617,7 +17650,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + leqispanW,
+    span: 10 + riskspanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17634,7 +17667,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u8D2D\u4E70\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + leqispanW,
+    span: 10 + riskspanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17648,22 +17681,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     readOnly: isReadOnly('buyerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), props.leqi && /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 4,
-    style: {
-      display: isExpand ? undefined : 'none'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    colon: false
-  }, getFieldDecorator('buyerAddressPhoneFlag', {
-    valuePropName: 'checked'
-  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Checkbox, {
-    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
-    disabled: isReadOnly('buyerAddressPhoneFlag'),
-    style: {
-      whiteSpace: 'nowrap'
-    }
-  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -17755,7 +17773,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + leqispanW,
+    span: 10 + riskspanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17772,7 +17790,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u9500\u552E\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + leqispanW,
+    span: 10 + riskspanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17786,22 +17804,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     readOnly: isReadOnly('sellerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), props.leqi && /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 4,
-    style: {
-      display: isExpand ? undefined : 'none'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    colon: false
-  }, getFieldDecorator('sellerAddressPhoneFlag', {
-    valuePropName: 'checked'
-  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Checkbox, {
-    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
-    disabled: isReadOnly('sellerAddressPhoneFlag'),
-    style: {
-      whiteSpace: 'nowrap'
-    }
-  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -19184,43 +19187,74 @@ 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();
+            _context5.next = 2;
+            return (_controller$formList$ = controller.formList.get('realEstateInfo')) === null || _controller$formList$ === void 0 ? void 0 : _controller$formList$.validateFields( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err, values) {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
+                      case 0:
+                        if (!err) {
+                          _context2.next = 3;
+                          break;
+                        }
+
+                        ktsXui.message.error('请先填写发票行信息，再添加新的行');
+                        return _context2.abrupt("return");
+
+                      case 3:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }
+                }, _callee2);
+              }));
+
+              return function (_x4, _x5) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
 
           case 2:
-            _context4.next = 4;
-            return controller.wait();
+            _context5.next = 4;
+            return controller.saveEditGood();
 
           case 4:
-            _context4.next = 6;
+            _context5.next = 6;
+            return controller.wait();
+
+          case 6:
+            _context5.next = 8;
             return controller.run( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(s) {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
                 var _controller$state$goo;
 
-                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                   while (1) {
-                    switch (_context3.prev = _context3.next) {
+                    switch (_context4.prev = _context4.next) {
                       case 0:
                         if (!s.goodsListState.editGood) {
-                          _context3.next = 3;
+                          _context4.next = 3;
                           break;
                         }
 
-                        _context3.next = 3;
+                        _context4.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) {
+                          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;
                                     }
 
@@ -19229,50 +19263,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;
+                        _context4.next = 5;
                         return controller.addGood({
                           taxRate: s.goodsListState.defaultRate,
                           lineAttribute: LineAttributeType$1.正常
                         });
 
                       case 5:
-                        s.goodsListState.editGood = _context3.sent;
+                        s.goodsListState.editGood = _context4.sent;
 
                       case 6:
                       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);
 }
@@ -19282,34 +19316,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);
 }
@@ -21890,34 +21924,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();
                       }
@@ -22206,7 +22230,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));
         }
       }
     }, {
@@ -22269,7 +22293,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));
         }
       }
     }, {
@@ -22381,7 +22405,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));
         }
       }
     }] // 含税不含税
@@ -24359,7 +24383,7 @@ var Main$3 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
   })), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Statistics$1, null)));
 });
 
-var css_248z$r = ".kts-invoice-operate-real-estate-info-digtal {\n  padding: 20px;\n  border-bottom: 2px solid #9F613E;\n  border-left: 2px solid #9F613E;\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-real-estate-info-digtal .real-estate-info-digtal-label {\n  color: #9F613E;\n  font-weight: bold;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAnt3x-row.ktsAnt3x-form-item {\n  margin-bottom: 0;\n}\n";
+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 = ktsComponentsAntdX4.DatePicker.RangePicker;
@@ -24375,126 +24399,210 @@ var RealEstateInfo = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(f
   }, []);
   var readOnly = React__default['default'].useMemo(function () {
     return model === 'readOnly';
-  }, [model]); // 注册 form
+  }, [model]);
+  var goodsList = controller.useMemo(function (s) {
+    return s.goodsListState.goodsList;
+  }, []);
+  var indexRef = React__default['default'].useRef([]);
+  React.useEffect(function () {
+    var dd = goodsList === null || goodsList === void 0 ? void 0 : goodsList.reduce(function (acc, cur) {
+      if (cur.lineAttribute !== 1) {
+        acc.push(cur.$index);
+      }
+
+      return acc;
+    }, []);
+    indexRef.current = dd;
+  }, [goodsList, indexRef]); // 注册 form
 
   controller.useForm('realEstateInfo', form);
+
+  var getList = function getList() {
+    var decrease = indexRef.current.length > goodsList.length;
+
+    if (decrease) {
+      //已删行列表
+      var diff = indexRef.current.filter(function (item) {
+        return !goodsList.find(function (i) {
+          return i.$index === item;
+        });
+      });
+      var formData = form.getFieldValue('realEstateDataDto');
+
+      if (Array.isArray(formData) && diff.length > 0) {
+        var newForm = formData === null || formData === void 0 ? void 0 : formData.filter(function (item) {
+          return !diff.find(function (i) {
+            return i === item.$index;
+          });
+        });
+        form.setFieldsValue({
+          realEstateDataDto: newForm
+        });
+      } else {
+        form.setFieldsValue({
+          realEstateDataDto: undefined
+        });
+      }
+    }
+
+    console.log('goodsList', goodsList);
+    return goodsList.filter(function (item) {
+      return item.lineAttribute !== 1;
+    }).map(function (item, index) {
+      if (item.lineAttribute !== 1) {
+        return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
+          gutter: [17, 0]
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+          span: 6
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+          style: {
+            display: 'none'
+          }
+        }, getFieldDecorator("realEstateDataDto[".concat(index, "].$index"), {
+          initialValue: item.$index
+        })( /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, null))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+          label: "\u4E0D\u52A8\u4EA7\u5730\u5740"
+        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateAddress"), {
+          rules: readOnly ? [] : [{
+            required: true,
+            message: '请选择不动产地址'
+          }]
+        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrString, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Cascader, {
+          style: {
+            width: '100%'
+          },
+          options: props.realEstateAddressOptions,
+          fieldNames: props.realEstateAddressFieldNames,
+          placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A\u53BF"
+        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+          span: 6
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+          label: "\u8BE6\u7EC6\u5730\u5740"
+        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateDetailedAddress"), {
+          rules: readOnly ? [] : [{
+            required: true,
+            message: '请输入详细地址'
+          }, {
+            max: 120,
+            message: '详细地址最多120个字符'
+          }, {
+            validator: function () {
+              var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, value, callback) {
+                var pattern;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        pattern = /街|路|村|乡|镇|道|巷|号/;
+
+                        if (pattern.test(value)) {
+                          callback();
+                        } else {
+                          callback('地址必须包含“街”、“路”、“村”、“乡”、“镇”、“道”、“巷”、“号”等任意一个关键词');
+                        }
+
+                      case 2:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee);
+              }));
+
+              function validator(_x, _x2, _x3) {
+                return _validator.apply(this, arguments);
+              }
+
+              return validator;
+            }()
+          }]
+        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+          autoComplete: 'off',
+          placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740"
+        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+          span: 6
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+          label: "\u79DF\u8D41\u671F\u8D77\u6B62"
+        }, getFieldDecorator("realEstateDataDto[".concat(index, "].leaseTerm"), {
+          rules: readOnly ? [] : [{
+            required: true,
+            message: '请输入租赁期'
+          }]
+        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrMoment, null) : /*#__PURE__*/React__default['default'].createElement(RangePicker, {
+          style: {
+            width: '100%'
+          }
+        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+          span: 6
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+          label: "\u8DE8\u5730\uFF08\u5E02\uFF09\u6807\u5FD7"
+        }, getFieldDecorator("realEstateDataDto[".concat(index, "].crossCitiesSign"), {
+          rules: readOnly ? [] : [{
+            required: true,
+            message: '请选择跨地（市）标志'
+          }]
+        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyNY, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
+          placeholder: "\u8BF7\u9009\u62E9",
+          style: {
+            width: '100%'
+          }
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: 'Y'
+        }, "\u662F"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: 'N'
+        }, "\u5426"))))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+          span: 6
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+          label: "\u4EA7\u6743\u8BC1\u4E66/\u4E0D\u52A8\u4EA7\u6743\u8BC1\u53F7"
+        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateNumber"), {
+          rules: readOnly ? [] : [{
+            required: true,
+            message: '请输入证书编号，若没有证书填写“无”'
+          }, {
+            max: 40,
+            message: '证书编号最多40个字符'
+          }]
+        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+          autoComplete: 'off',
+          placeholder: "\u8BF7\u8F93\u5165\u8BC1\u4E66\u7F16\u53F7\uFF0C\u82E5\u6CA1\u6709\u8BC1\u4E66\u586B\u5199\u201C\u65E0\u201D"
+        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+          span: 6
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+          label: "\u9762\u79EF\u5355\u4F4D"
+        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateUnit"), {
+          rules: readOnly ? [] : [{
+            required: true,
+            message: '请选择面积单位'
+          }]
+        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
+          placeholder: "\u8BF7\u9009\u62E9",
+          style: {
+            width: '100%'
+          }
+        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: "\u5E73\u65B9\u5343\u7C73"
+        }, "\u5E73\u65B9\u5343\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: "\u5E73\u65B9\u7C73"
+        }, "\u5E73\u65B9\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: "\u516C\u9877"
+        }, "\u516C\u9877"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: "\u4EA9"
+        }, "\u4EA9"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: "h\u33A1"
+        }, "h\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: "k\u33A1"
+        }, "k\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+          value: "\u33A1"
+        }, "\u33A1"))))));
+      }
+    });
+  };
+
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
-    gutter: [17, 0]
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-    span: 6
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u4E0D\u52A8\u4EA7\u5730\u5740"
-  }, getFieldDecorator('realEstateAddress', {
-    rules: readOnly ? [] : [{
-      required: true,
-      message: '请选择不动产地址'
-    }]
-  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrString, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Cascader, {
-    style: {
-      width: '100%'
-    },
-    options: props.realEstateAddressOptions,
-    fieldNames: props.realEstateAddressFieldNames,
-    placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A\u53BF"
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-    span: 6
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u8BE6\u7EC6\u5730\u5740"
-  }, getFieldDecorator('realEstateDetailedAddress', {
-    rules: readOnly ? [] : [{
-      required: true,
-      message: '请输入详细地址'
-    }, {
-      max: 120,
-      message: '详细地址最多120个字符'
-    }, {
-      validator: function validator(_, value) {
-        var pattern = /街|路|村|乡|镇|道|巷|号/;
-        return pattern.test(value) ? Promise.resolve() : Promise.reject('地址必须包含“街”、“路”、“村”、“乡”、“镇”、“道”、“巷”、“号”等任意一个关键词');
-      }
-    }]
-  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-    autoComplete: 'off',
-    placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740"
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-    span: 6
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u79DF\u8D41\u671F\u8D77\u6B62"
-  }, getFieldDecorator('leaseTerm', {
-    rules: readOnly ? [] : [{
-      required: true,
-      message: '请输入租赁期'
-    }]
-  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrMoment, null) : /*#__PURE__*/React__default['default'].createElement(RangePicker, {
-    style: {
-      width: '100%'
-    }
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-    span: 6
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u8DE8\u5730\uFF08\u5E02\uFF09\u6807\u5FD7"
-  }, getFieldDecorator('crossCitiesSign', {
-    rules: readOnly ? [] : [{
-      required: true,
-      message: '请选择跨地（市）标志'
-    }]
-  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyNY, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
-    placeholder: "\u8BF7\u9009\u62E9",
-    style: {
-      width: '100%'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: 'Y'
-  }, "\u662F"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: 'N'
-  }, "\u5426"))))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-    span: 6
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u4EA7\u6743\u8BC1\u4E66/\u4E0D\u52A8\u4EA7\u6743\u8BC1\u53F7"
-  }, getFieldDecorator('realEstateNumber', {
-    rules: readOnly ? [] : [{
-      required: true,
-      message: '请输入证书编号，若没有证书填写“无”'
-    }, {
-      max: 40,
-      message: '证书编号最多40个字符'
-    }]
-  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-    autoComplete: 'off',
-    placeholder: "\u8BF7\u8F93\u5165\u8BC1\u4E66\u7F16\u53F7\uFF0C\u82E5\u6CA1\u6709\u8BC1\u4E66\u586B\u5199\u201C\u65E0\u201D"
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-    span: 6
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u9762\u79EF\u5355\u4F4D"
-  }, getFieldDecorator('realEstateUnit', {
-    rules: readOnly ? [] : [{
-      required: true,
-      message: '请选择面积单位'
-    }]
-  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
-    placeholder: "\u8BF7\u9009\u62E9",
-    style: {
-      width: '100%'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: "\u5E73\u65B9\u5343\u7C73"
-  }, "\u5E73\u65B9\u5343\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: "\u5E73\u65B9\u7C73"
-  }, "\u5E73\u65B9\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: "\u516C\u9877"
-  }, "\u516C\u9877"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: "\u4EA9"
-  }, "\u4EA9"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: "h\u33A1"
-  }, "h\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: "k\u33A1"
-  }, "k\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-    value: "\u33A1"
-  }, "\u33A1")))))));
+  }, "\u7279\u5B9A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), getList());
 });
 
 var MyDiv$3 = /*#__PURE__*/function (_React$Component) {
@@ -24570,7 +24678,7 @@ var MyArrMoment = /*#__PURE__*/function (_React$Component3) {
           color: '#9F603D',
           fontWeight: 600
         }
-      }, " - "), /*#__PURE__*/React__default['default'].createElement("span", null, hooks.isMoment(value[1]) && value[0].format('YYYY-MM-DD')));
+      }, " - "), /*#__PURE__*/React__default['default'].createElement("span", null, hooks.isMoment(value[1]) && value[1].format('YYYY-MM-DD')));
     }
   }]);
 
@@ -24622,7 +24730,7 @@ var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fun
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
+  }, "\u7279\u5B9A\u4FE1\u606F-\u5EFA\u7B51\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
     gutter: [17, 0]
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
     span: 6
@@ -26228,7 +26336,7 @@ var Main$4 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
     className: "kts-invoice-operate-freight"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, "\u7279\u5B9A\u4FE1\u606F-\u8D27\u7269\u8FD0\u8F93"), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-digtal",
     onClick: function onClick(e) {
       e.stopPropagation();