kts-component-invoice-operate 3.2.250 → 3.2.251

package/dist/index.js

@@ -873,42 +873,42 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                 _errors.set('payList', _context.t2.errors);
 
               case 47:
-                _values.set('payList', this.state.payListState.goodsList.slice()); // 金额（含税）
+                _values.set('payList', this.state.payListState.goodsList.slice()); // 金额（不含税）
 
 
-                _values.set('lineAmountIncludeTax', function () {
+                _values.set('lineAmountExcludeTax', function () {
                   var sum = mathjs.chain(mathjs.bignumber(0));
 
                   _this3.state.goodsListState.goodsList.forEach(function (e) {
                     if (!e || e.lineAttribute === LineAttributeType$1.赠品行) return;
-                    sum = sum.add(mathjs.bignumber(e.lineAmountIncludeTax || 0));
+                    sum = sum.add(mathjs.bignumber(e.lineAmountExcludeTax || 0));
                   });
 
                   return sum.done().toNumber();
-                }()); // 金额（不含税）
+                }()); // 税额 
 
 
-                _values.set('lineAmountExcludeTax', function () {
+                _values.set('taxAmount', function () {
                   var sum = mathjs.chain(mathjs.bignumber(0));
 
                   _this3.state.goodsListState.goodsList.forEach(function (e) {
                     if (!e || e.lineAttribute === LineAttributeType$1.赠品行) return;
-                    sum = sum.add(mathjs.bignumber(e.lineAmountExcludeTax || 0));
+                    sum = sum.add(mathjs.bignumber(e.taxAmount || 0));
                   });
 
                   return sum.done().toNumber();
-                }()); // 税额 
+                }()); // 金额（含税）
 
 
-                _values.set('taxAmount', function () {
+                _values.set('lineAmountIncludeTax', function () {
                   var sum = mathjs.chain(mathjs.bignumber(0));
 
                   _this3.state.goodsListState.goodsList.forEach(function (e) {
                     if (!e || e.lineAttribute === LineAttributeType$1.赠品行) return;
-                    sum = sum.add(mathjs.bignumber(e.taxAmount || 0));
+                    sum = sum.add(mathjs.bignumber(e.lineAmountIncludeTax || 0));
                   });
 
-                  return sum.done().toNumber();
+                  return sum.done().toNumber(); // return  chain(bignumber(_values.get('lineAmountExcludeTax'))).add(bignumber(_values.get('taxAmount'))).done().toNumber();
                 }()); // 含税标记
 
 
@@ -9693,8 +9693,10 @@ var updateUnitPriceTax = /*#__PURE__*/function () {
                           });
 
                         case 11:
-                          // 税额 = 金额(含税)-金额(不含税)
-                          taxAmount = evaluate("".concat(lineAmountIncludeTax, " - ").concat(lineAmountExcludeTax));
+                          // 税额 = 金额(含税)-金额(不含税) （老逻辑）
+                          // const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+                          // 税额 = 金额(含税)-金额(不含税)（新逻辑）
+                          taxAmount = evaluate("".concat(lineAmountExcludeTax, " * ").concat(values.taxRate, "/100"));
                           form.setFieldsValue({
                             taxAmount: taxAmount
                           });
@@ -14892,9 +14894,8 @@ var useColumns = (function (form) {
               textAlign: 'right'
             },
             loading: isCipher(changeField, 'taxAmount'),
-            onChange: function onChange() {
-              setChangeField('taxAmount');
-              onChangeTaxAmount(controller, form, record);
+            onChange: function onChange() {// setChangeField('taxAmount');
+              // onChangeTaxAmount(controller, form, record);
             }
           }) : /*#__PURE__*/React__default['default'].createElement(MyDiv, {
             loading: isCipher(changeField, 'taxAmount')
@@ -20784,13 +20785,13 @@ var Statistics$1 = (function () {
   var isTaxIncluded = controller.useMemo(function (s) {
     return s.goodsListState.isTaxIncluded;
   }, []);
-  /** 金额（含税） */
+  /** 金额（不含税） */
 
-  var lineAmountIncludeTax = controller.useMemo(function (s) {
+  var lineAmountExcludeTax = controller.useMemo(function (s) {
     var _s$goodsListState$for, _s$goodsListState$for2;
 
-    if (typeof s.goodsListState.amountIncludeTax === 'number') {
-      return s.goodsListState.amountIncludeTax;
+    if (typeof s.goodsListState.amountExcludeTax === 'number') {
+      return s.goodsListState.amountExcludeTax;
     }
 
     var sum = mathjs.chain(mathjs.bignumber(0));
@@ -20799,54 +20800,54 @@ var Statistics$1 = (function () {
     var err = (_s$goodsListState$for = (_s$goodsListState$for2 = s.goodsListState.form) === null || _s$goodsListState$for2 === void 0 ? void 0 : _s$goodsListState$for2.getFieldsError()) !== null && _s$goodsListState$for !== void 0 ? _s$goodsListState$for : {};
     s.goodsListState.goodsList.forEach(function (e) {
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
-        if (!err.lineAmountIncludeTax) {
-          sum = sum.add(mathjs.bignumber(editGood.lineAmountIncludeTax || 0));
+        if (!err.lineAmountExcludeTax) {
+          sum = sum.add(mathjs.bignumber(editGood.lineAmountExcludeTax || 0));
         }
       } else {
-        sum = sum.add(mathjs.bignumber(e.lineAmountIncludeTax || 0));
+        sum = sum.add(mathjs.bignumber(e.lineAmountExcludeTax || 0));
       }
     });
     return sum.done().toNumber();
   }, []);
-  /** 金额（不含税） */
-
-  var lineAmountExcludeTax = controller.useMemo(function (s) {
-    var _s$goodsListState$for3, _s$goodsListState$for4;
+  /** 税额 */
 
-    if (typeof s.goodsListState.amountExcludeTax === 'number') {
-      return s.goodsListState.amountExcludeTax;
+  var taxAmount = controller.useMemo(function (s) {
+    if (typeof s.goodsListState.amountTax === 'number') {
+      return s.goodsListState.amountTax;
     }
 
     var sum = mathjs.chain(mathjs.bignumber(0));
     var editGood = s.goodsListState.editGood; // 正在编辑的货物
 
-    var err = (_s$goodsListState$for3 = (_s$goodsListState$for4 = s.goodsListState.form) === null || _s$goodsListState$for4 === void 0 ? void 0 : _s$goodsListState$for4.getFieldsError()) !== null && _s$goodsListState$for3 !== void 0 ? _s$goodsListState$for3 : {};
     s.goodsListState.goodsList.forEach(function (e) {
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
-        if (!err.lineAmountExcludeTax) {
-          sum = sum.add(mathjs.bignumber(editGood.lineAmountExcludeTax || 0));
-        }
+        sum = sum.add(mathjs.bignumber(editGood.taxAmount || 0));
       } else {
-        sum = sum.add(mathjs.bignumber(e.lineAmountExcludeTax || 0));
+        sum = sum.add(mathjs.bignumber(e.taxAmount || 0));
       }
     });
     return sum.done().toNumber();
   }, []);
-  /** 税额 */
+  /** 金额（含税） */
 
-  var taxAmount = controller.useMemo(function (s) {
-    if (typeof s.goodsListState.amountTax === 'number') {
-      return s.goodsListState.amountTax;
+  var lineAmountIncludeTax = controller.useMemo(function (s) {
+    var _s$goodsListState$for3, _s$goodsListState$for4;
+
+    if (typeof s.goodsListState.amountIncludeTax === 'number') {
+      return s.goodsListState.amountIncludeTax;
     }
 
     var sum = mathjs.chain(mathjs.bignumber(0));
     var editGood = s.goodsListState.editGood; // 正在编辑的货物
 
+    var err = (_s$goodsListState$for3 = (_s$goodsListState$for4 = s.goodsListState.form) === null || _s$goodsListState$for4 === void 0 ? void 0 : _s$goodsListState$for4.getFieldsError()) !== null && _s$goodsListState$for3 !== void 0 ? _s$goodsListState$for3 : {};
     s.goodsListState.goodsList.forEach(function (e) {
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
-        sum = sum.add(mathjs.bignumber(editGood.taxAmount || 0));
+        if (!err.lineAmountIncludeTax) {
+          sum = sum.add(mathjs.bignumber(editGood.lineAmountIncludeTax || 0));
+        }
       } else {
-        sum = sum.add(mathjs.bignumber(e.taxAmount || 0));
+        sum = sum.add(mathjs.bignumber(e.lineAmountIncludeTax || 0));
       }
     });
     return sum.done().toNumber();
@@ -20889,7 +20890,7 @@ var Statistics$1 = (function () {
       fontWeight: 'bold',
       marginLeft: 4
     }
-  }, toStringChinese(lineAmountIncludeTax))), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, toStringChinese(lineAmountExcludeTax + taxAmount))), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       flex: 1
     }
@@ -20903,7 +20904,7 @@ var Statistics$1 = (function () {
       minWidth: 119,
       maxWidth: 300
     }
-  }, "\xA5", parseFloat(lineAmountIncludeTax).toFixed(2))));
+  }, "\xA5", parseFloat(lineAmountExcludeTax + taxAmount).toFixed(2))));
 });
 
 var AddRowButton$1 = (function () {
@@ -21927,11 +21928,9 @@ var onChangeTaxRate$1 = lazyFn$2(function (controller, form, record) {
 /** 税额 */
 
 var onChangeTaxAmount$1 = lazyFn$2(function (controller, form, record) {
-  /** 金额（不含税） */
-  var lineAmountExcludeTax;
   form.validateFields( /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(err, values) {
-      var record, priceExcludeTax;
+      var record, lineAmountIncludeTax;
       return _regeneratorRuntime().wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
@@ -21952,27 +21951,27 @@ var onChangeTaxAmount$1 = lazyFn$2(function (controller, form, record) {
 
             case 6:
               // 计数不含税金额
-              lineAmountExcludeTax = countAmountExcludeTax((record === null || record === void 0 ? void 0 : record.lineAmountIncludeTax) || 0, values.taxAmount);
+              // lineAmountExcludeTax = countAmountExcludeTax(record?.lineAmountIncludeTax || 0, values.taxAmount);
+              // form.setFieldsValue({ lineAmountExcludeTax });
+              // const priceExcludeTax: any = countPrice(lineAmountExcludeTax || '', record?.quantity || '', controller.state.calculatingDigits);
+              // await controller.setEditGood({ lineAmountExcludeTax, taxAmount: values.taxAmount, priceExcludeTax });
+              // form.setFieldsValue({ priceExcludeTax });
+              // 计算含税金额
+              lineAmountIncludeTax = mathjs.chain(mathjs.bignumber((record === null || record === void 0 ? void 0 : record.lineAmountExcludeTax) || 0)).add(mathjs.bignumber(values.taxAmount || 0)).done().toNumber();
               form.setFieldsValue({
-                lineAmountExcludeTax: lineAmountExcludeTax
+                lineAmountIncludeTax: lineAmountIncludeTax
               });
-              priceExcludeTax = countPrice(lineAmountExcludeTax || '', (record === null || record === void 0 ? void 0 : record.quantity) || '', controller.state.calculatingDigits);
-              _context9.next = 11;
+              _context9.next = 10;
               return controller.setEditGood({
-                lineAmountExcludeTax: lineAmountExcludeTax,
                 taxAmount: values.taxAmount,
-                priceExcludeTax: priceExcludeTax
+                lineAmountIncludeTax: lineAmountIncludeTax
               });
 
-            case 11:
-              form.setFieldsValue({
-                priceExcludeTax: priceExcludeTax
-              }); // 清楚 计算中启动字段
-
-              _context9.next = 14;
+            case 10:
+              _context9.next = 12;
               return clearCalculatingField$1(controller);
 
-            case 14:
+            case 12:
             case "end":
               return _context9.stop();
           }
@@ -22123,7 +22122,8 @@ var updateUnitPriceTax$1 = /*#__PURE__*/function () {
 
                         case 12:
                           // 税额 = 金额(含税)-金额(不含税)
-                          taxAmount = evaluate("".concat(lineAmountIncludeTax, " - ").concat(lineAmountExcludeTax));
+                          // const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+                          taxAmount = format2(evaluate("".concat(lineAmountExcludeTax, " * ").concat(values.taxRate, "/100")));
                           form.setFieldsValue({
                             taxAmount: taxAmount
                           });
@@ -24176,21 +24176,22 @@ var useColumns$1 = (function (form) {
               message: '税额不能为空'
             }, {
               validator: function validator(rule, value, callback) {
-                //含税金额
+                //含税金额(lineAmountExcludeTax)
                 var lineAmountIncludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountIncludeTax) || 0; //不含税金额
                 // const lineAmountExcludeTax = lineAmountIncludeTax-value;
 
-                var lineAmountExcludeTax = mathjs.chain(mathjs.bignumber(lineAmountIncludeTax || 0)).subtract(mathjs.bignumber(value || 0));
+                var lineAmountExcludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountExcludeTax) || 0;
                 var taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
+                console.log('taxRate ===>', taxRate);
 
-                if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
+                if (lineAmountExcludeTax && (taxRate || taxRate === 0) && lineAmountIncludeTax) {
                   // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
-                  var total = lineAmountExcludeTax.multiply(mathjs.bignumber(taxRate || 0)).divide(mathjs.bignumber(100)); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
+                  var total = mathjs.chain(mathjs.bignumber(lineAmountExcludeTax)).multiply(mathjs.bignumber(taxRate || 0)).divide(mathjs.bignumber(100)); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
 
-                  if (Math.abs(total.subtract(mathjs.bignumber(value || 0)).done().toNumber()) <= 0.01) {
+                  if (Math.abs(total.subtract(mathjs.bignumber(value || 0)).done().toNumber()) <= 0.06) {
                     callback();
                   } else {
-                    callback('税额填写错误，请重新输入');
+                    callback('第' + record.serialNo + '行税额校验不通过!');
                   }
                 } else {
                   callback();
@@ -26748,9 +26749,25 @@ var LicensePlateNumber = function LicensePlateNumber(props) {
 //     )
 // }
 
-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";
+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 .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-control {\n  line-height: normal;\n}\n.kts-invoice-operate-real-estate-info-digtal .break-word {\n  word-break: break-word;\n}\n";
 styleInject(css_248z$s);
 
+var _path$a;
+
+function _extends$e() { _extends$e = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$e.apply(this, arguments); }
+
+function SvgPlus$3(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends$e({
+    className: "plus_svg__icon",
+    viewBox: "0 0 1024 1024",
+    xmlns: "http://www.w3.org/2000/svg",
+    width: 200,
+    height: 200
+  }, props), _path$a || (_path$a = /*#__PURE__*/React.createElement("path", {
+    d: "M644.879 886.426c0-71.304-56.367-129.106-125.887-129.106-69.511 0-125.898 57.802-125.898 129.106 0 71.323 56.388 129.124 125.898 129.124 69.52 0 125.887-57.803 125.887-129.124zm0-387.336c0-71.303-56.367-129.124-125.887-129.124-69.511 0-125.898 57.822-125.898 129.124 0 71.303 56.388 129.106 125.898 129.106 69.52 0 125.887-57.803 125.887-129.106zm0-361.515c0-71.324-56.367-129.125-125.887-129.125-69.511 0-125.898 57.801-125.898 129.125 0 71.304 56.388 129.105 125.898 129.105 69.52-.001 125.887-57.802 125.887-129.105z"
+  })));
+}
+
 /** 特殊信息-建筑服务 */
 
 var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (props) {
@@ -26765,7 +26782,18 @@ var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fun
     return model === 'readOnly';
   }, [model]); // 注册 form
 
-  controller.useForm('serviceDataDtoInfo', form);
+  controller.useForm('serviceDataDtoInfo', form); // 监听 crossCitiesSign 字段值变化
+
+  var _React$useState = React__default['default'].useState(form.getFieldValue('crossCitiesSign')),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      crossCitiesSign = _React$useState2[0],
+      setCrossCitiesSign = _React$useState2[1]; // 同步表单初始值和外部更新
+
+
+  React__default['default'].useEffect(function () {
+    var currentValue = form.getFieldValue('crossCitiesSign');
+    setCrossCitiesSign(currentValue);
+  }, [form]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -26835,6 +26863,9 @@ var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fun
     placeholder: "\u8BF7\u9009\u62E9",
     style: {
       width: '100%'
+    },
+    onChange: function onChange(value) {
+      return setCrossCitiesSign(value);
     }
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select.Option, {
     value: 'Y'
@@ -26842,6 +26873,62 @@ var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fun
     value: 'N'
   }, "\u5426"))))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
     span: 6
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u8DE8\u533A\u57DF\u6D89\u7A0E\u4E8B\u9879\u62A5\u9A8C\u7BA1\u7406\u7F16\u53F7"
+  }, getFieldDecorator('crossRegionTaxReportNo', {
+    rules: [{
+      required: crossCitiesSign === 'Y',
+      message: '请输入跨区域涉税事项报验管理编号'
+    }]
+  })( /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+    readOnly: true,
+    autoComplete: 'off',
+    addonAfter: props.showGetCrossRegionTaxReportNoButton && /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Button, {
+      style: {
+        height: 0,
+        padding: 0,
+        width: "auto"
+      },
+      type: "link",
+      icon: /*#__PURE__*/React__default['default'].createElement(Icon, {
+        component: SvgPlus$3
+      }),
+      disabled: readOnly || crossCitiesSign !== 'Y',
+      onClick: function () {
+        var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var _props$getCrossRegion;
+
+          var no;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return (_props$getCrossRegion = props.getCrossRegionTaxReportNo) === null || _props$getCrossRegion === void 0 ? void 0 : _props$getCrossRegion.call(props);
+
+                case 2:
+                  no = _context.sent;
+                  form.setFieldsValue({
+                    crossRegionTaxReportNo: no
+                  });
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function onClick() {
+          return _onClick.apply(this, arguments);
+        }
+
+        return onClick;
+      }()
+    })
+  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
+    span: 6
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
     label: "\u5EFA\u7B51\u9879\u76EE\u540D\u79F0"
   }, getFieldDecorator('constructName', {
@@ -31640,7 +31727,11 @@ var Main$6 = function Main(props) {
   useToGenerateId(controller);
   React__default['default'].useEffect(function () {
     setKey(key + 1);
-  }, [controller]);
+  }, [controller]); // React.useEffect(() => { 
+  //   setKey(key + 1) 
+  //   controller.state.stakeholder.enables = ['taxAmount']
+  // }, [controller]);
+
   return /*#__PURE__*/React__default['default'].createElement(InvoiceContext.Provider, {
     key: key,
     value: controller

package/package.json

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

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

@@ -14581,18 +14581,26 @@ export default () => {
                     title='农产品'
                 />
             }
-            specialInfor={<Invoice.PayList
-                vehicleTypeList={[
-                    { label: '现金', value: '001' },
-                    { label: '银行转账', value: '002' },
-                ]}
+            specialInfor={<Invoice.Architecture
+                addressOptions={[]}
                 fieldNames={{
                     label: 'name',
                     value: 'name',
                     children: 'children'
                 }}
-            />
-            }
+            />}
+            // specialInfor={<Invoice.PayList
+            //     vehicleTypeList={[
+            //         { label: '现金', value: '001' },
+            //         { label: '银行转账', value: '002' },
+            //     ]}
+            //     fieldNames={{
+            //         label: 'name',
+            //         value: 'name',
+            //         children: 'children'
+            //     }}
+            // />
+            // }
             stakeholder={
                 <Invoice.StakeFarmerholder
                     isExpand={false}

package/src/Invoice/InvoiceController/InvoiceControllerForm/index.ts

@@ -69,16 +69,6 @@ export default class InvoiceControllerForm extends GreyReactBox<InvoiceControlle
 
     _values.set('payList', this.state.payListState.goodsList.slice());
 
-    // 金额（含税）
-    _values.set('lineAmountIncludeTax', (() => {
-      let sum = chain(bignumber(0));
-      this.state.goodsListState.goodsList.forEach(e => {
-        if (!e || e.lineAttribute === LineAttributeType.赠品行) return;
-        sum = sum.add(bignumber(e.lineAmountIncludeTax || 0));
-      });
-      return sum.done().toNumber();
-    })());
-
     // 金额（不含税）
     _values.set('lineAmountExcludeTax', (() => {
       let sum = chain(bignumber(0));
@@ -99,6 +89,17 @@ export default class InvoiceControllerForm extends GreyReactBox<InvoiceControlle
       return sum.done().toNumber();
     })());
 
+    // 金额（含税）
+    _values.set('lineAmountIncludeTax', (() => {
+      let sum = chain(bignumber(0));
+      this.state.goodsListState.goodsList.forEach(e => {
+        if (!e || e.lineAttribute === LineAttributeType.赠品行) return;
+        sum = sum.add(bignumber(e.lineAmountIncludeTax || 0));
+      });
+      return sum.done().toNumber();
+      // return  chain(bignumber(_values.get('lineAmountExcludeTax'))).add(bignumber(_values.get('taxAmount'))).done().toNumber();
+    })());
+
     // 含税标记
     _values.set('isTaxIncluded', this.state.goodsListState.isTaxIncluded)
 

package/src/Invoice/_test/importBuyer/index.tsx

@@ -16,6 +16,7 @@ export default () => {
     // 设置扩展内容
     controller.pipeline(async s => {
       s.buyerState.topExpand = topExpand
+      s.stakeholder.enables = ['taxAmount']
     })()
   }, [topExpand, controller])
 

package/src/Invoice/index.tsx

@@ -148,6 +148,10 @@ const Main = (props: IInvoiceProps) => {
   useToGenerateId(controller);
 
   React.useEffect(() => { setKey(key + 1) }, [controller]);
+  // React.useEffect(() => { 
+  //   setKey(key + 1) 
+  //   controller.state.stakeholder.enables = ['taxAmount']
+  // }, [controller]);
 
   return (
     <InvoiceContext.Provider key={key} value={controller}>

package/src/Invoice/ui/default/GoodsList/hook/useColumns/autoFillFn/index.ts

@@ -439,8 +439,11 @@ export const updateUnitPriceTax = async (controller: InvoiceController, form: Wr
           await controller.setEditGood({ priceIncludeTax });
         }
 
-        // 税额 = 金额(含税)-金额(不含税)
-        const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+        // 税额 = 金额(含税)-金额(不含税) （老逻辑）
+        // const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+
+        // 税额 = 金额(含税)-金额(不含税)（新逻辑）
+        const taxAmount = evaluate(`${lineAmountExcludeTax} * ${values.taxRate}/100`);
         form.setFieldsValue({ taxAmount });
         await controller.setEditGood({ taxAmount });
       } else {

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

@@ -593,8 +593,8 @@ export default (form: WrappedFormUtils) => {
                     style={{ textAlign: 'right' }}
                     loading={isCipher(changeField, 'taxAmount')}
                     onChange={() => {
-                      setChangeField('taxAmount');
-                      onChangeTaxAmount(controller, form, record);
+                      // setChangeField('taxAmount');
+                      // onChangeTaxAmount(controller, form, record);
                     }}
                   />
                   : <MyDiv loading={isCipher(changeField, 'taxAmount')} />
@@ -770,3 +770,4 @@ function dcoding(v: string): string {
 function isDutyFree(record: IGood): boolean {
   return (record.taxFreeType as any) === 1 && record.favouredPolicyName === '免税';
 }
+

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

@@ -11,6 +11,10 @@
 
     .ktsAnt3x-row.ktsAnt3x-form-item {
         margin-bottom: 0;
+
+        .ktsAnt3x-form-item-control{
+            line-height: normal;
+        }
     }
 
     .break-word {