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

package/dist/index.js

@@ -17617,7 +17617,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17634,7 +17634,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u8D2D\u4E70\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17648,7 +17648,22 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     readOnly: isReadOnly('buyerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+  })))), props.leqi && /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+    span: 4,
+    style: {
+      display: isExpand ? undefined : 'none'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    colon: false
+  }, getFieldDecorator('buyerAddressPhoneFlag', {
+    valuePropName: 'checked'
+  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Checkbox, {
+    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
+    disabled: isReadOnly('buyerAddressPhoneFlag'),
+    style: {
+      whiteSpace: 'nowrap'
+    }
+  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -17740,7 +17755,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801/\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17757,7 +17772,7 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     placeholder: "\u8BF7\u8F93\u5165\u9500\u552E\u65B9\u5730\u5740",
     autoComplete: "off"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
-    span: 10 + riskspanW,
+    span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
     }
@@ -17771,7 +17786,22 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     readOnly: isReadOnly('sellerPhone'),
     placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD",
     autoComplete: "off"
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+  })))), props.leqi && /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+    span: 4,
+    style: {
+      display: isExpand ? undefined : 'none'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    colon: false
+  }, getFieldDecorator('sellerAddressPhoneFlag', {
+    valuePropName: 'checked'
+  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Checkbox, {
+    onChange: props === null || props === void 0 ? void 0 : props.invoiceMarkCallback,
+    disabled: isReadOnly('sellerAddressPhoneFlag'),
+    style: {
+      whiteSpace: 'nowrap'
+    }
+  }, "\u662F\u5426\u5C55\u793A")))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 10 + leqispanW,
     style: {
       display: isExpand ? undefined : 'none'
@@ -21860,24 +21890,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();
                       }
@@ -22166,7 +22206,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));
         }
       }
     }, {
@@ -22229,7 +22269,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));
         }
       }
     }, {
@@ -22341,7 +22381,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));
         }
       }
     }] // 含税不含税
@@ -24319,7 +24359,7 @@ var Main$3 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
   })), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Statistics$1, null)));
 });
 
-var css_248z$r = ".kts-invoice-operate-real-estate-info-digtal {\n  padding: 20px;\n  border-bottom: 2px solid #9F613E;\n  border-left: 2px solid #9F613E;\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-real-estate-info-digtal .real-estate-info-digtal-label {\n  color: #9F613E;\n  font-weight: bold;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAnt3x-row.ktsAnt3x-form-item {\n  margin-bottom: 0;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAntX-row {\n  border-bottom: 1px dashed #9F613E;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAntX-row:last-child {\n  border-bottom: none;\n}\n";
+var css_248z$r = ".kts-invoice-operate-real-estate-info-digtal {\n  padding: 20px;\n  border-bottom: 2px solid #9F613E;\n  border-left: 2px solid #9F613E;\n  border-right: 2px solid #9F613E;\n}\n.kts-invoice-operate-real-estate-info-digtal .real-estate-info-digtal-label {\n  color: #9F613E;\n  font-weight: bold;\n}\n.kts-invoice-operate-real-estate-info-digtal .ktsAnt3x-row.ktsAnt3x-form-item {\n  margin-bottom: 0;\n}\n";
 styleInject(css_248z$r);
 
 var RangePicker = ktsComponentsAntdX4.DatePicker.RangePicker;
@@ -24335,210 +24375,126 @@ var RealEstateInfo = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(f
   }, []);
   var readOnly = React__default['default'].useMemo(function () {
     return model === 'readOnly';
-  }, [model]);
-  var goodsList = controller.useMemo(function (s) {
-    return s.goodsListState.goodsList;
-  }, []);
-  var indexRef = React__default['default'].useRef([]);
-  React.useEffect(function () {
-    var dd = goodsList === null || goodsList === void 0 ? void 0 : goodsList.reduce(function (acc, cur) {
-      if (cur.lineAttribute !== 1) {
-        acc.push(cur.$index);
-      }
-
-      return acc;
-    }, []);
-    indexRef.current = dd;
-  }, [goodsList, indexRef]); // 注册 form
+  }, [model]); // 注册 form
 
   controller.useForm('realEstateInfo', form);
-
-  var getList = function getList() {
-    var decrease = indexRef.current.length > goodsList.length;
-
-    if (decrease) {
-      //已删行列表
-      var diff = indexRef.current.filter(function (item) {
-        return !goodsList.find(function (i) {
-          return i.$index === item;
-        });
-      });
-      var formData = form.getFieldValue('realEstateDataDto');
-
-      if (Array.isArray(formData) && diff.length > 0) {
-        var newForm = formData === null || formData === void 0 ? void 0 : formData.filter(function (item) {
-          return !diff.find(function (i) {
-            return i === item.$index;
-          });
-        });
-        form.setFieldsValue({
-          realEstateDataDto: newForm
-        });
-      } else {
-        form.setFieldsValue({
-          realEstateDataDto: undefined
-        });
-      }
-    }
-
-    console.log('goodsList', goodsList);
-    return goodsList.filter(function (item) {
-      return item.lineAttribute !== 1;
-    }).map(function (item, index) {
-      if (item.lineAttribute !== 1) {
-        return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
-          gutter: [17, 0]
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          style: {
-            display: 'none'
-          }
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].$index"), {
-          initialValue: item.$index
-        })( /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, null))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u4E0D\u52A8\u4EA7\u5730\u5740"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateAddress"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择不动产地址'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrString, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Cascader, {
-          style: {
-            width: '100%'
-          },
-          options: props.realEstateAddressOptions,
-          fieldNames: props.realEstateAddressFieldNames,
-          placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A\u53BF"
-        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u8BE6\u7EC6\u5730\u5740"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateDetailedAddress"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请输入详细地址'
-          }, {
-            max: 120,
-            message: '详细地址最多120个字符'
-          }, {
-            validator: function () {
-              var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, value, callback) {
-                var pattern;
-                return _regeneratorRuntime().wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        pattern = /街|路|村|乡|镇|道|巷|号/;
-
-                        if (pattern.test(value)) {
-                          callback();
-                        } else {
-                          callback('地址必须包含“街”、“路”、“村”、“乡”、“镇”、“道”、“巷”、“号”等任意一个关键词');
-                        }
-
-                      case 2:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }
-                }, _callee);
-              }));
-
-              function validator(_x, _x2, _x3) {
-                return _validator.apply(this, arguments);
-              }
-
-              return validator;
-            }()
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-          autoComplete: 'off',
-          placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740"
-        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u79DF\u8D41\u671F\u8D77\u6B62"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].leaseTerm"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请输入租赁期'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrMoment, null) : /*#__PURE__*/React__default['default'].createElement(RangePicker, {
-          style: {
-            width: '100%'
-          }
-        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u8DE8\u5730\uFF08\u5E02\uFF09\u6807\u5FD7"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].crossCitiesSign"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择跨地（市）标志'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyNY, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
-          placeholder: "\u8BF7\u9009\u62E9",
-          style: {
-            width: '100%'
-          }
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: 'Y'
-        }, "\u662F"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: 'N'
-        }, "\u5426"))))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u4EA7\u6743\u8BC1\u4E66/\u4E0D\u52A8\u4EA7\u6743\u8BC1\u53F7"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateNumber"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请输入证书编号，若没有证书填写“无”'
-          }, {
-            max: 40,
-            message: '证书编号最多40个字符'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
-          autoComplete: 'off',
-          placeholder: "\u8BF7\u8F93\u5165\u8BC1\u4E66\u7F16\u53F7\uFF0C\u82E5\u6CA1\u6709\u8BC1\u4E66\u586B\u5199\u201C\u65E0\u201D"
-        })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
-          span: 6
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-          label: "\u9762\u79EF\u5355\u4F4D"
-        }, getFieldDecorator("realEstateDataDto[".concat(index, "].realEstateUnit"), {
-          rules: readOnly ? [] : [{
-            required: true,
-            message: '请选择面积单位'
-          }]
-        })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
-          placeholder: "\u8BF7\u9009\u62E9",
-          style: {
-            width: '100%'
-          }
-        }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u5E73\u65B9\u5343\u7C73"
-        }, "\u5E73\u65B9\u5343\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u5E73\u65B9\u7C73"
-        }, "\u5E73\u65B9\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u516C\u9877"
-        }, "\u516C\u9877"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u4EA9"
-        }, "\u4EA9"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "h\u33A1"
-        }, "h\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "k\u33A1"
-        }, "k\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
-          value: "\u33A1"
-        }, "\u33A1"))))));
-      }
-    });
-  };
-
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'real-estate-info-digtal-label'
-  }, "\u7279\u6B8A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), getList());
+  }, "\u7279\u6B8A\u4FE1\u606F-\u4E0D\u52A8\u4EA7\u7ECF\u8425\u79DF\u8D41\u670D\u52A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Row, {
+    gutter: [17, 0]
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u4E0D\u52A8\u4EA7\u5730\u5740"
+  }, getFieldDecorator('realEstateAddress', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择不动产地址'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrString, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Cascader, {
+    style: {
+      width: '100%'
+    },
+    options: props.realEstateAddressOptions,
+    fieldNames: props.realEstateAddressFieldNames,
+    placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A\u53BF"
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u8BE6\u7EC6\u5730\u5740"
+  }, getFieldDecorator('realEstateDetailedAddress', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请输入详细地址'
+    }, {
+      max: 120,
+      message: '详细地址最多120个字符'
+    }, {
+      validator: function validator(_, value) {
+        var pattern = /街|路|村|乡|镇|道|巷|号/;
+        return pattern.test(value) ? Promise.resolve() : Promise.reject('地址必须包含“街”、“路”、“村”、“乡”、“镇”、“道”、“巷”、“号”等任意一个关键词');
+      }
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+    autoComplete: 'off',
+    placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740"
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u79DF\u8D41\u671F\u8D77\u6B62"
+  }, getFieldDecorator('leaseTerm', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请输入租赁期'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyArrMoment, null) : /*#__PURE__*/React__default['default'].createElement(RangePicker, {
+    style: {
+      width: '100%'
+    }
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u8DE8\u5730\uFF08\u5E02\uFF09\u6807\u5FD7"
+  }, getFieldDecorator('crossCitiesSign', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择跨地（市）标志'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyNY, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: 'Y'
+  }, "\u662F"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: 'N'
+  }, "\u5426"))))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u4EA7\u6743\u8BC1\u4E66/\u4E0D\u52A8\u4EA7\u6743\u8BC1\u53F7"
+  }, getFieldDecorator('realEstateNumber', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请输入证书编号，若没有证书填写“无”'
+    }, {
+      max: 40,
+      message: '证书编号最多40个字符'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+    autoComplete: 'off',
+    placeholder: "\u8BF7\u8F93\u5165\u8BC1\u4E66\u7F16\u53F7\uFF0C\u82E5\u6CA1\u6709\u8BC1\u4E66\u586B\u5199\u201C\u65E0\u201D"
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u9762\u79EF\u5355\u4F4D"
+  }, getFieldDecorator('realEstateUnit', {
+    rules: readOnly ? [] : [{
+      required: true,
+      message: '请选择面积单位'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$3, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u5E73\u65B9\u5343\u7C73"
+  }, "\u5E73\u65B9\u5343\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u5E73\u65B9\u7C73"
+  }, "\u5E73\u65B9\u7C73"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u516C\u9877"
+  }, "\u516C\u9877"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u4EA9"
+  }, "\u4EA9"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "h\u33A1"
+  }, "h\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "k\u33A1"
+  }, "k\u33A1"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
+    value: "\u33A1"
+  }, "\u33A1")))))));
 });
 
 var MyDiv$3 = /*#__PURE__*/function (_React$Component) {
@@ -24614,7 +24570,7 @@ var MyArrMoment = /*#__PURE__*/function (_React$Component3) {
           color: '#9F603D',
           fontWeight: 600
         }
-      }, " - "), /*#__PURE__*/React__default['default'].createElement("span", null, hooks.isMoment(value[1]) && value[1].format('YYYY-MM-DD')));
+      }, " - "), /*#__PURE__*/React__default['default'].createElement("span", null, hooks.isMoment(value[1]) && value[0].format('YYYY-MM-DD')));
     }
   }]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.217",
+  "version": "3.2.219-chinaship",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

package/src/Invoice/Invoice-digtal/_test/realEstateInfo/index.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import Invoice from '../../..';
 import moment from 'moment';
 import 'antd/dist/antd.css';
-import { Button } from 'kts-components-antd-x3';
+
 export default () => {
 
     const controller = React.useMemo(() => new Invoice.InvoiceController(), []);
@@ -11,18 +11,12 @@ export default () => {
         controller.run(async s => {
         })
     }, [])
-    const onSave =async ()=>{
-        const formValues = await controller.validateFields();
-        console.log(formValues)
-    }
+
     return (
-        <>
-        <Button onClick={onSave}>输出表单内容</Button>
         <Invoice
             invoiceType='digtal'
             controller={controller}
             specialInfor={<Invoice.RealEstateInfo />}
         />
-        </>
     )
 };

package/src/Invoice/Invoice-digtal/index.md

@@ -1,13 +1,10 @@
 # 数电
 
-<!-- ## 简单用法
-<code src="./_test/easiest/index.tsx"></code> -->
+## 简单用法
+<code src="./_test/easiest/index.tsx"></code>
 
-## 不动产经营租赁服务
-<code src="./_test/realEstateInfo/index.tsx"></code>
-
-<!-- ## 建筑服务
-<code src="./_test/architecture/index.tsx"></code> -->
+## 建筑服务
+<code src="./_test/architecture/index.tsx"></code>
 
 <!-- ## 只读模式
 <code src="./_test/readOnly/index.tsx"></code> -->
@@ -36,9 +33,10 @@
 ## 查看当前可用授信额度
 <code src="./_test/lineCredit/index.tsx"></code>
 
-
+## 不动产经营租赁服务
+<code src="./_test/realEstateInfo/index.tsx"></code>
 
 -->
 
-<!-- ## 货物运输服务
-<code src="./_test/freight/index.tsx"></code>  -->
+## 货物运输服务
+<code src="./_test/freight/index.tsx"></code> 

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/index.tsx

@@ -257,11 +257,15 @@ export default (form: WrappedFormUtils) => {
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '数量必须为数字' },
                     {
                       validator: async (_, value, callback) => {
-                        await controller.wait();
-                        const isvalue = !!value || value === 0;
-                        const isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
-                        if (isvalue || isPrice === isvalue) return;
-                        callback('请输入数量');
+                        if (isValidateGood) {
+                          await controller.wait();
+                          const isvalue = !!value || value === 0;
+                          const isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
+                          if (isvalue || isPrice === isvalue) return;
+                          callback('请输入数量');
+                        }else{
+                          callback();
+                        }
                       }
                     }
                   ],
@@ -416,7 +420,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
+            return <span style={{ padding: '0 10px' }}>{value && formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },
@@ -458,7 +462,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
+            return <span style={{ padding: '0 10px' }}>{value && formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },
@@ -518,7 +522,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 119,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('taxAmount')&& model !== 'prefab') {
+          if (editGood?.$index === record.$index && !disableds.includes('taxAmount') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('taxAmount', {
@@ -532,13 +536,13 @@ export default (form: WrappedFormUtils) => {
                         const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
                         //不含税金额
                         // const lineAmountExcludeTax = lineAmountIncludeTax-value;
-                        const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax||0)).subtract(bignumber(value||0));
+                        const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
                         const taxRate = editGood?.taxRate;
                         if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
                           // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
-                          const total = lineAmountExcludeTax.multiply(bignumber(taxRate||0)).divide(bignumber(100));
+                          const total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100));
                           // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
-                          if (Math.abs(total.subtract(bignumber(value||0)).done().toNumber()) <= 0.01) {
+                          if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
                             callback();
                           } else {
                             callback('税额填写错误，请重新输入')
@@ -568,7 +572,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             )
           } else {
-            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : parseFloat(value).toFixed(2)}</span>;
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : value && parseFloat(value).toFixed(2)}</span>;
           }
         },
       },

package/src/Invoice/ui/digtal/RealEstateInfo/index.less

@@ -12,11 +12,4 @@
     .ktsAnt3x-row.ktsAnt3x-form-item {
         margin-bottom: 0;
     }
-    .ktsAntX-row{
-        border-bottom: 1px dashed #9F613E;
-        &:last-child {
-            border-bottom: none;
-          }
-    }
-
 }