kts-component-invoice-operate 3.2.244 → 3.2.246

package/.dumi/theme/builtins/API.tsx

@@ -1,66 +1,66 @@
-import React, { useContext } from 'react';
-import type { IApiComponentProps } from 'dumi/theme';
-import { context, useApiData, AnchorLink } from 'dumi/theme';
-
-const LOCALE_TEXTS = {
-  'zh-CN': {
-    name: '属性名',
-    description: '描述',
-    type: '类型',
-    default: '默认值',
-    required: '(必选)',
-  },
-  'en-US': {
-    name: 'Name',
-    description: 'Description',
-    type: 'Type',
-    default: 'Default',
-    required: '(required)',
-  },
-};
-
-export default ({
-  name,
-  identifier,
-  export: expt,
-}: IApiComponentProps & { name: string }) => {
-  const data = useApiData(identifier);
-  const { locale } = useContext(context);
-  const texts = /^zh|cn$/i.test(locale)
-    ? LOCALE_TEXTS['zh-CN']
-    : LOCALE_TEXTS['en-US'];
-
-  return (
-    <>
-      <p>{name}</p>
-      {data && (
-        <table style={{ marginTop: 24 }}>
-          <thead>
-            <tr>
-              <th>{texts.name}</th>
-              <th>{texts.description}</th>
-              <th>{texts.type}</th>
-              <th>{texts.default}</th>
-            </tr>
-          </thead>
-          <tbody>
-            {data[expt]?.map((row) => (
-              <tr key={row.identifier}>
-                <td>{row.identifier}</td>
-                <td>{row.description || '--'}</td>
-                <td>
-                  <code>{row.type}</code>
-                </td>
-                <td>
-                  <code>
-                    {row.default || (row.required && texts.required) || '--'}
-                  </code>
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      )}
-    </>
-  );
-};
+import React, { useContext } from 'react';
+import type { IApiComponentProps } from 'dumi/theme';
+import { context, useApiData, AnchorLink } from 'dumi/theme';
+
+const LOCALE_TEXTS = {
+  'zh-CN': {
+    name: '属性名',
+    description: '描述',
+    type: '类型',
+    default: '默认值',
+    required: '(必选)',
+  },
+  'en-US': {
+    name: 'Name',
+    description: 'Description',
+    type: 'Type',
+    default: 'Default',
+    required: '(required)',
+  },
+};
+
+export default ({
+  name,
+  identifier,
+  export: expt,
+}: IApiComponentProps & { name: string }) => {
+  const data = useApiData(identifier);
+  const { locale } = useContext(context);
+  const texts = /^zh|cn$/i.test(locale)
+    ? LOCALE_TEXTS['zh-CN']
+    : LOCALE_TEXTS['en-US'];
+
+  return (
+    <>
+      <p>{name}</p>
+      {data && (
+        <table style={{ marginTop: 24 }}>
+          <thead>
+            <tr>
+              <th>{texts.name}</th>
+              <th>{texts.description}</th>
+              <th>{texts.type}</th>
+              <th>{texts.default}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {data[expt]?.map((row) => (
+              <tr key={row.identifier}>
+                <td>{row.identifier}</td>
+                <td>{row.description || '--'}</td>
+                <td>
+                  <code>{row.type}</code>
+                </td>
+                <td>
+                  <code>
+                    {row.default || (row.required && texts.required) || '--'}
+                  </code>
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      )}
+    </>
+  );
+};

package/.editorconfig

@@ -1,16 +1,16 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

package/.fatherrc.ts

@@ -1,4 +1,4 @@
-export default {
-  esm: 'rollup',
-  cjs: 'rollup',
-};
+export default {
+  esm: 'rollup',
+  cjs: 'rollup',
+};

package/.prettierignore

@@ -1,7 +1,7 @@
-**/*.svg
-**/*.ejs
-**/*.html
-package.json
-.umi
-.umi-production
-.umi-test
+**/*.svg
+**/*.ejs
+**/*.html
+package.json
+.umi
+.umi-production
+.umi-test

package/.prettierrc

@@ -1,11 +1,11 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 80,
-  "overrides": [
-    {
-      "files": ".prettierrc",
-      "options": { "parser": "json" }
-    }
-  ]
-}
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 80,
+  "overrides": [
+    {
+      "files": ".prettierrc",
+      "options": { "parser": "json" }
+    }
+  ]
+}

package/.umirc.ts

@@ -1,8 +1,8 @@
-import { defineConfig } from 'dumi';
-
-export default defineConfig({
-  locales: [['zh-CN', '中文']],
-  title: '发票组件',
-  outputPath: 'docs-dist',
-  publicPath:'/docs-dist/',
-});
+import { defineConfig } from 'dumi';
+
+export default defineConfig({
+  locales: [['zh-CN', '中文']],
+  title: '发票组件',
+  outputPath: 'docs-dist',
+  publicPath:'/docs-dist/',
+});

package/BRANCH.md

@@ -0,0 +1,5 @@
+# 分支说明
+| 分支名 | 创建分支 | 说明 |
+|---------|---------|---------|
+| 3.2.x  |  --  | 3.2 帮帮最新版本 |
+| 3.2.x.o  | 3.2.x  | 2020/7/30 时备份得3.2.x |

package/README.md

@@ -1,13 +1,13 @@
-# kts-component-invoice-operate
-
-文档地址：http://kts-component-invoice-operate.dev.kingxunlian.com/
-
-
-南湖：https://lanhuapp.com/web/#/item/project/detailDetach?pid=7daf94b0-9aa7-4372-89a7-226f389b021d&project_id=7daf94b0-9aa7-4372-89a7-226f389b021d&image_id=3bc42812-5718-4aa5-b088-5bc7e0c9a62f&fromEditor=true
-
-
-node 16.20.2
-
-version 4.0.1
-这个版本升级主要是为了支持途虎的特殊票种，但是标准版暂时不能升级，数据结构发生了变化，22升级会导致报错，
+# kts-component-invoice-operate
+
+文档地址：http://kts-component-invoice-operate.dev.kingxunlian.com/
+
+
+南湖：https://lanhuapp.com/web/#/item/project/detailDetach?pid=7daf94b0-9aa7-4372-89a7-226f389b021d&project_id=7daf94b0-9aa7-4372-89a7-226f389b021d&image_id=3bc42812-5718-4aa5-b088-5bc7e0c9a62f&fromEditor=true
+
+
+node 16.20.2
+
+version 4.0.1
+这个版本升级主要是为了支持途虎的特殊票种，但是标准版暂时不能升级，数据结构发生了变化，22升级会导致报错，
 这是一个不兼容的升级

package/branch/3.2.x

@@ -0,0 +1 @@
+# 3.2 帮帮最新版本

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/Invoice/ui/digtal/StakeFarmerholder/index.d.ts

@@ -12,6 +12,8 @@ export interface IStakeholder {
     isVatNormal?: boolean;
     /** 是否可以选择自然人 */
     isNaturalPerson?: boolean;
+    /** 是否显示自然人销售方补充信息 */
+    isShowNaturalPersonInfo?: boolean;
     /** 是否展开 */
     isExpand?: boolean;
     leqi?: boolean;

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 {
@@ -18516,7 +18633,9 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
       isShowImportButton = props.isShowImportButton,
       onClickImportButton = props.onClickImportButton,
       _props$isVatNormal = props.isVatNormal,
-      isVatNormal = _props$isVatNormal === void 0 ? false : _props$isVatNormal;
+      isVatNormal = _props$isVatNormal === void 0 ? false : _props$isVatNormal,
+      _props$isShowNaturalP = props.isShowNaturalPersonInfo,
+      isShowNaturalPersonInfo = _props$isShowNaturalP === void 0 ? true : _props$isShowNaturalP;
 
   var _React$useState = React.useState(typeof props.isExpand === 'boolean' ? props.isExpand : true),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -19156,7 +19275,7 @@ var StakeFarmerholder = decorator(Form.create())(function (props) {
     style: {
       whiteSpace: 'nowrap'
     }
-  }, "\u662F\u5426\u5C55\u793A")))))))), /*#__PURE__*/React.createElement("div", {
+  }, "\u662F\u5426\u5C55\u793A")))))))), isShowNaturalPersonInfo && /*#__PURE__*/React.createElement("div", {
     className: 'kts-invoice-operate-invoice-digtal-payinfo'
   }, /*#__PURE__*/React.createElement(Form, {
     className: "digtal-stakeholder-form",
@@ -21723,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 () {
@@ -24004,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')