kts-component-invoice-operate 3.2.245 → 3.2.246

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

@@ -37,3 +37,5 @@ export declare const onChangeItemName: (controller: InvoiceController, form: Wra
 export declare const onChangeItemCode: (controller: InvoiceController, form: WrappedFormUtils<any>, record: IGood) => Promise<void>;
 /** 修改了含税开关 重新计算 */
 export declare const onChangeSwitchTax: (controller: InvoiceController, isTaxIncluded: boolean) => Promise<void>;
+/** 税额 */
+export declare const onChangeTaxAmount: (...par: any[]) => void;

package/dist/index.esm.js

@@ -10156,6 +10156,67 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
     return _ref20.apply(this, arguments);
   };
 }();
+/** 税额 */
+
+var onChangeTaxAmount = lazyFn(function (controller, form, record) {
+  /** 金额（不含税） */
+  var lineAmountExcludeTax;
+  form.validateFields( /*#__PURE__*/function () {
+    var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(err, values) {
+      var record, priceExcludeTax;
+      return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+        while (1) {
+          switch (_context23.prev = _context23.next) {
+            case 0:
+              err = err || {};
+              record = controller.state.goodsListState.editGood; // 校验是否有含税金额
+
+              if (!(err.lineAmountIncludeTax && !(record === null || record === void 0 ? void 0 : record.lineAmountIncludeTax) && (record === null || record === void 0 ? void 0 : record.lineAmountIncludeTax) !== 0)) {
+                _context23.next = 6;
+                break;
+              }
+
+              _context23.next = 5;
+              return clearCalculatingField(controller);
+
+            case 5:
+              return _context23.abrupt("return");
+
+            case 6:
+              // 计数不含税金额
+              lineAmountExcludeTax = countAmountExcludeTax((record === null || record === void 0 ? void 0 : record.lineAmountIncludeTax) || 0, values.taxAmount);
+              form.setFieldsValue({
+                lineAmountExcludeTax: lineAmountExcludeTax
+              });
+              priceExcludeTax = countPrice(lineAmountExcludeTax || '', (record === null || record === void 0 ? void 0 : record.quantity) || '', controller.state.calculatingDigits);
+              _context23.next = 11;
+              return controller.setEditGood({
+                lineAmountExcludeTax: lineAmountExcludeTax,
+                taxAmount: values.taxAmount,
+                priceExcludeTax: priceExcludeTax
+              });
+
+            case 11:
+              form.setFieldsValue({
+                priceExcludeTax: priceExcludeTax
+              }); // 清楚 计算中启动字段
+
+              _context23.next = 14;
+              return clearCalculatingField(controller);
+
+            case 14:
+            case "end":
+              return _context23.stop();
+          }
+        }
+      }, _callee23);
+    }));
+
+    return function (_x42, _x43) {
+      return _ref23.apply(this, arguments);
+    };
+  }());
+}, 1000);
 
 /**
  * 删除一个货物
@@ -13883,6 +13944,11 @@ var useColumns = (function (form) {
   var taxRateList = controller.useMemo(function (e) {
     return e.goodsListState.taxRateList;
   }, []);
+  /** 启用字段 */
+
+  var enables = controller.useMemo(function (s) {
+    return s.stakeholder.enables || [];
+  }, []);
   /** 单位列表 */
 
   var unitList = controller.useMemo(function (e) {
@@ -13893,6 +13959,16 @@ var useColumns = (function (form) {
   var columnsReplenish = controller.useMemo(function (e) {
     return e.goodsListState.columnsReplenish;
   }, []);
+  /** 是否校验商品 */
+
+  var isValidateGood = controller.useMemo(function (s) {
+    return s.goodsListState.isValidateGood;
+  }, []);
+  /** 是否启用 */
+
+  var isEnables = React.useCallback(function (field) {
+    return enables.indexOf(field) >= 0;
+  }, [enables]);
   /** 扣除额 */
 
   var deduction = controller.useMemo(function (e) {
@@ -13949,7 +14025,7 @@ var useColumns = (function (form) {
   /** 表头 */
 
   var columns = React.useMemo(function () {
-    var _columnsReplenish$ite, _columnsReplenish$uni, _columnsReplenish$qua, _columnsReplenish$pri, _columnsReplenish$pri2, _columnsReplenish$tax;
+    var _columnsReplenish$ite, _columnsReplenish$uni, _columnsReplenish$qua, _columnsReplenish$pri, _columnsReplenish$pri2;
 
     return [{
       title: ' ',
@@ -14310,6 +14386,9 @@ var useColumns = (function (form) {
                         return onChangeQuantity(controller, form, record);
 
                       case 3:
+                        onChangeTaxAmount(controller, form, record);
+
+                      case 4:
                       case "end":
                         return _context8.stop();
                     }
@@ -14684,18 +14763,56 @@ var useColumns = (function (form) {
       }
     }, {
       title: /*#__PURE__*/React.createElement(TitleText, {
-        rules: (_columnsReplenish$tax = columnsReplenish['taxAmount']) === null || _columnsReplenish$tax === void 0 ? void 0 : _columnsReplenish$tax.rules
+        required: isEnables('taxAmount')
       }, "\u7A0E\u989D"),
       dataIndex: 'taxAmount',
       key: 'taxAmount',
       align: 'right',
       width: 119,
+      rules: [].concat(_toConsumableArray(getReplenishRules('taxAmount')), [{
+        required: isEnables('taxAmount'),
+        message: '税额不能为空'
+      }, {
+        pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
+        message: '税额必须为数字'
+      }, {
+        validator: function validator(rule, value, callback) {
+          //含税金额  
+          var lineAmountIncludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountIncludeTax) || 0; //不含税金额
+          // const lineAmountExcludeTax = lineAmountIncludeTax-value;
+
+          var lineAmountExcludeTax = chain$1(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
+          var taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
+
+          if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
+            // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+            var 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) {
+              callback();
+            } else {
+              callback('税额填写错误，请重新输入');
+            }
+          } else {
+            callback();
+          }
+        }
+      }]),
       render: function render(value, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           return getFieldDecorator('taxAmount', {
             initialValue: editGood.taxAmount,
             rules: getReplenishRules('taxAmount')
-          })( /*#__PURE__*/React.createElement(MyDiv, {
+          })(isEnables('taxAmount') ? /*#__PURE__*/React.createElement(MyInput, {
+            style: {
+              textAlign: 'right'
+            },
+            loading: isCipher(changeField, 'taxAmount'),
+            onChange: function onChange() {
+              setChangeField('taxAmount');
+              onChangeTaxAmount(controller, form, record);
+            }
+          }) : /*#__PURE__*/React.createElement(MyDiv, {
             loading: isCipher(changeField, 'taxAmount')
           }));
         } else {
@@ -21725,7 +21842,7 @@ var onChangeTaxRate$1 = lazyFn$2(function (controller, form, record) {
 }, 1000);
 /** 税额 */
 
-var onChangeTaxAmount = lazyFn$2(function (controller, form, record) {
+var onChangeTaxAmount$1 = lazyFn$2(function (controller, form, record) {
   /** 金额（不含税） */
   var lineAmountExcludeTax;
   form.validateFields( /*#__PURE__*/function () {
@@ -24006,7 +24123,7 @@ var useColumns$1 = (function (form) {
             loading: isCipher$1(changeField, 'taxAmount'),
             onChange: function onChange() {
               setChangeField('taxAmount');
-              onChangeTaxAmount(controller, form, record);
+              onChangeTaxAmount$1(controller, form, record);
             }
           }) : /*#__PURE__*/React.createElement(MyDiv$2, {
             loading: isCipher$1(changeField, 'taxAmount')

package/dist/index.js

@@ -10166,6 +10166,67 @@ var onChangeSwitchTax = /*#__PURE__*/function () {
     return _ref20.apply(this, arguments);
   };
 }();
+/** 税额 */
+
+var onChangeTaxAmount = lazyFn(function (controller, form, record) {
+  /** 金额（不含税） */
+  var lineAmountExcludeTax;
+  form.validateFields( /*#__PURE__*/function () {
+    var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(err, values) {
+      var record, priceExcludeTax;
+      return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+        while (1) {
+          switch (_context23.prev = _context23.next) {
+            case 0:
+              err = err || {};
+              record = controller.state.goodsListState.editGood; // 校验是否有含税金额
+
+              if (!(err.lineAmountIncludeTax && !(record === null || record === void 0 ? void 0 : record.lineAmountIncludeTax) && (record === null || record === void 0 ? void 0 : record.lineAmountIncludeTax) !== 0)) {
+                _context23.next = 6;
+                break;
+              }
+
+              _context23.next = 5;
+              return clearCalculatingField(controller);
+
+            case 5:
+              return _context23.abrupt("return");
+
+            case 6:
+              // 计数不含税金额
+              lineAmountExcludeTax = countAmountExcludeTax((record === null || record === void 0 ? void 0 : record.lineAmountIncludeTax) || 0, values.taxAmount);
+              form.setFieldsValue({
+                lineAmountExcludeTax: lineAmountExcludeTax
+              });
+              priceExcludeTax = countPrice(lineAmountExcludeTax || '', (record === null || record === void 0 ? void 0 : record.quantity) || '', controller.state.calculatingDigits);
+              _context23.next = 11;
+              return controller.setEditGood({
+                lineAmountExcludeTax: lineAmountExcludeTax,
+                taxAmount: values.taxAmount,
+                priceExcludeTax: priceExcludeTax
+              });
+
+            case 11:
+              form.setFieldsValue({
+                priceExcludeTax: priceExcludeTax
+              }); // 清楚 计算中启动字段
+
+              _context23.next = 14;
+              return clearCalculatingField(controller);
+
+            case 14:
+            case "end":
+              return _context23.stop();
+          }
+        }
+      }, _callee23);
+    }));
+
+    return function (_x42, _x43) {
+      return _ref23.apply(this, arguments);
+    };
+  }());
+}, 1000);
 
 /**
  * 删除一个货物
@@ -13893,6 +13954,11 @@ var useColumns = (function (form) {
   var taxRateList = controller.useMemo(function (e) {
     return e.goodsListState.taxRateList;
   }, []);
+  /** 启用字段 */
+
+  var enables = controller.useMemo(function (s) {
+    return s.stakeholder.enables || [];
+  }, []);
   /** 单位列表 */
 
   var unitList = controller.useMemo(function (e) {
@@ -13903,6 +13969,16 @@ var useColumns = (function (form) {
   var columnsReplenish = controller.useMemo(function (e) {
     return e.goodsListState.columnsReplenish;
   }, []);
+  /** 是否校验商品 */
+
+  var isValidateGood = controller.useMemo(function (s) {
+    return s.goodsListState.isValidateGood;
+  }, []);
+  /** 是否启用 */
+
+  var isEnables = React__default['default'].useCallback(function (field) {
+    return enables.indexOf(field) >= 0;
+  }, [enables]);
   /** 扣除额 */
 
   var deduction = controller.useMemo(function (e) {
@@ -13959,7 +14035,7 @@ var useColumns = (function (form) {
   /** 表头 */
 
   var columns = React__default['default'].useMemo(function () {
-    var _columnsReplenish$ite, _columnsReplenish$uni, _columnsReplenish$qua, _columnsReplenish$pri, _columnsReplenish$pri2, _columnsReplenish$tax;
+    var _columnsReplenish$ite, _columnsReplenish$uni, _columnsReplenish$qua, _columnsReplenish$pri, _columnsReplenish$pri2;
 
     return [{
       title: ' ',
@@ -14320,6 +14396,9 @@ var useColumns = (function (form) {
                         return onChangeQuantity(controller, form, record);
 
                       case 3:
+                        onChangeTaxAmount(controller, form, record);
+
+                      case 4:
                       case "end":
                         return _context8.stop();
                     }
@@ -14694,18 +14773,56 @@ var useColumns = (function (form) {
       }
     }, {
       title: /*#__PURE__*/React__default['default'].createElement(TitleText, {
-        rules: (_columnsReplenish$tax = columnsReplenish['taxAmount']) === null || _columnsReplenish$tax === void 0 ? void 0 : _columnsReplenish$tax.rules
+        required: isEnables('taxAmount')
       }, "\u7A0E\u989D"),
       dataIndex: 'taxAmount',
       key: 'taxAmount',
       align: 'right',
       width: 119,
+      rules: [].concat(_toConsumableArray(getReplenishRules('taxAmount')), [{
+        required: isEnables('taxAmount'),
+        message: '税额不能为空'
+      }, {
+        pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
+        message: '税额必须为数字'
+      }, {
+        validator: function validator(rule, value, callback) {
+          //含税金额  
+          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 taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
+
+          if (lineAmountExcludeTax && taxRate && 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) {
+
+            if (Math.abs(total.subtract(mathjs.bignumber(value || 0)).done().toNumber()) <= 0.01) {
+              callback();
+            } else {
+              callback('税额填写错误，请重新输入');
+            }
+          } else {
+            callback();
+          }
+        }
+      }]),
       render: function render(value, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           return getFieldDecorator('taxAmount', {
             initialValue: editGood.taxAmount,
             rules: getReplenishRules('taxAmount')
-          })( /*#__PURE__*/React__default['default'].createElement(MyDiv, {
+          })(isEnables('taxAmount') ? /*#__PURE__*/React__default['default'].createElement(MyInput, {
+            style: {
+              textAlign: 'right'
+            },
+            loading: isCipher(changeField, 'taxAmount'),
+            onChange: function onChange() {
+              setChangeField('taxAmount');
+              onChangeTaxAmount(controller, form, record);
+            }
+          }) : /*#__PURE__*/React__default['default'].createElement(MyDiv, {
             loading: isCipher(changeField, 'taxAmount')
           }));
         } else {
@@ -21735,7 +21852,7 @@ var onChangeTaxRate$1 = lazyFn$2(function (controller, form, record) {
 }, 1000);
 /** 税额 */
 
-var onChangeTaxAmount = lazyFn$2(function (controller, form, record) {
+var onChangeTaxAmount$1 = lazyFn$2(function (controller, form, record) {
   /** 金额（不含税） */
   var lineAmountExcludeTax;
   form.validateFields( /*#__PURE__*/function () {
@@ -24016,7 +24133,7 @@ var useColumns$1 = (function (form) {
             loading: isCipher$1(changeField, 'taxAmount'),
             onChange: function onChange() {
               setChangeField('taxAmount');
-              onChangeTaxAmount(controller, form, record);
+              onChangeTaxAmount$1(controller, form, record);
             }
           }) : /*#__PURE__*/React__default['default'].createElement(MyDiv$2, {
             loading: isCipher$1(changeField, 'taxAmount')

package/package.json

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

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

@@ -24,7 +24,7 @@ export default () => {
             //     'naturalPersonFlag'
             // ]));
             controller.state.payListState.goodsList = [{ $index: '222', channel: '001',number: '渝bkb190', }]
-          
+            controller.state.stakeholder.enables = ['taxAmount']
         })
     }, [controller])
     const onSave = async () => {

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

@@ -9,8 +9,7 @@ export default () => {
     React.useEffect(() => {
         controller.run(async s => {
             s.addGoodsCheck=checkGood;
-           
-
+            s.stakeholder.enables = ['taxAmount'];
         })
     }, [])
     const [deduction, setDeduction] = React.useState<number | undefined>(0);

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

@@ -645,3 +645,37 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
     }
   })
 }
+
+/** 税额 */
+export const onChangeTaxAmount = lazyFn(
+  (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
+
+    /** 金额（不含税） */
+    let lineAmountExcludeTax;
+
+    form.validateFields(async (err, values) => {
+      err = err || {};
+
+      const record = controller.state.goodsListState.editGood;
+
+      // 校验是否有含税金额
+      if (err.lineAmountIncludeTax && (!record?.lineAmountIncludeTax && record?.lineAmountIncludeTax !== 0)) {
+        await clearCalculatingField(controller);
+        return;
+      }
+
+      // 计数不含税金额
+      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 });
+
+      // 清楚 计算中启动字段
+      await clearCalculatingField(controller);
+    })
+  },
+  1000,
+)

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

@@ -3,6 +3,7 @@ import { Form, AutoComplete, Select, Button, Input, Spin, Tooltip } from 'kts-co
 import { InputProps } from 'kts-components-antd-x3/lib/input';
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import { IGood, LineAttributeType } from '../../../../../InvoiceController';
+import { chain, bignumber } from 'mathjs';
 import Invoice from '../../../../..';
 import RowMenu from './ui/RowMenu';
 import TitleText from './ui/TitleText';
@@ -17,6 +18,7 @@ import {
   onChangeTaxRate,
   onChangeItemName,
   onChangeItemCode,
+  onChangeTaxAmount,
 } from './autoFillFn';
 import { getItemNameWithShorthand } from '../../../../../tools/itemName';
 import Drag from './ui/Drag';
@@ -60,12 +62,21 @@ export default (form: WrappedFormUtils) => {
   /** 税率列表 */
   const taxRateList = controller.useMemo((e) => e.goodsListState.taxRateList, []);
 
+  /** 启用字段 */
+  const enables = controller.useMemo(s => s.stakeholder.enables || [], []);
+
   /** 单位列表 */
   const unitList = controller.useMemo((e) => e.goodsListState.unitList, []);
 
   /** 商品表格补充配置 */
   const columnsReplenish = controller.useMemo((e) => e.goodsListState.columnsReplenish, []);
 
+  /** 是否校验商品 */
+  const isValidateGood = controller.useMemo(s => s.goodsListState.isValidateGood, [])
+
+  /** 是否启用 */
+  const isEnables = React.useCallback(field => enables.indexOf(field) >= 0, [enables])
+
   /** 扣除额 */
   const deduction = controller.useMemo((e) => e.goodsListState.deduction, []);
 
@@ -299,6 +310,7 @@ export default (form: WrappedFormUtils) => {
                     onChange={async () => {
                       setChangeField('quantity');
                       await onChangeQuantity(controller, form, record);
+                      onChangeTaxAmount(controller, form, record);
                     }}
                   />,
                 )}
@@ -535,17 +547,55 @@ export default (form: WrappedFormUtils) => {
         },
       },
       {
-        title: <TitleText rules={columnsReplenish['taxAmount']?.rules} >税额</TitleText>,
+        title: <TitleText required={isEnables('taxAmount')} >税额</TitleText>,
         dataIndex: 'taxAmount',
         key: 'taxAmount',
         align: 'right',
         width: 119,
+        rules: [
+          ...getReplenishRules('taxAmount'),
+          { required: isEnables('taxAmount'), message: '税额不能为空' },
+          { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '税额必须为数字' },
+          {
+            validator: (rule: any, value: any, callback: any) => {
+              //含税金额  
+              const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
+              //不含税金额
+              // const lineAmountExcludeTax = lineAmountIncludeTax-value;
+              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));
+                // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
+                if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
+                  callback();
+                } else {
+                  callback('税额填写错误，请重新输入')
+                }
+              } else {
+                callback();
+              }
+            }
+          },
+        ],
         render: (value: string, record: IGood) => {
           if (editGood?.$index === record.$index) {
             return getFieldDecorator('taxAmount', {
               initialValue: editGood.taxAmount,
               rules: getReplenishRules('taxAmount'),
-            })(<MyDiv loading={isCipher(changeField, 'taxAmount')} />);
+            })(
+              isEnables('taxAmount')
+                ? <MyInput
+                  style={{ textAlign: 'right' }}
+                  loading={isCipher(changeField, 'taxAmount')}
+                  onChange={() => {
+                    setChangeField('taxAmount');
+                    onChangeTaxAmount(controller, form, record);
+                  }}
+                />
+                : <MyDiv loading={isCipher(changeField, 'taxAmount')} />
+            );
           } else {
             return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : value === '' ? '' : parseFloat(value).toFixed(2)}</span>;
           }

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

@@ -548,7 +548,6 @@ export default (form: WrappedFormUtils) => {
                           } else {
                             callback('税额填写错误，请重新输入')
                           }
-
                         } else {
                           callback();
                         }