kts-component-invoice-operate 1.2.15 → 1.2.18

package/dist/Invoice/InvoiceController/InvoiceControllerState/index.d.ts

@@ -11,6 +11,14 @@ export default class InvoiceControllerState {
      * 08 小规模纳税人
      * */
     en: '01' | '05' | '04' | '08';
+    /**
+     * 发票类型
+     * 08 - 增值税电子专用发票
+     * 10 - 增值税电子普通发票
+     * 01 - 增值税纸质专用发票
+     * 04 - 增值税纸质普通发票
+     */
+    invoiceType: '08' | '10' | '01' | '04';
     /** 购买方 */
     buyerState: BuyerState;
     /** 货物信息 */

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

@@ -19,6 +19,8 @@ export declare const onChangeLineAmountIncludeTax: (...par: any[]) => void;
 export declare const onChangeLineAmountExcludeTax: (...par: any[]) => void;
 /** 税率 */
 export declare const onChangeTaxRate: (...par: any[]) => void;
+/** 小规模纳税人 1% 和 3% 自动赋码免税 */
+export declare function dutyFree(controller: InvoiceController, taxRate: number, form: WrappedFormUtils<any>, record: IGood): number;
 /** 含税 => 更新(不含税) */
 export declare const updateUnitPriceExcludingTax: (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => void;
 /** 不含税 => 更新(含税) */

package/dist/index.esm.js

@@ -498,6 +498,10 @@ var ImportGoods = function ImportGoods() {
     title: '计量单位',
     dataIndex: 'unit',
     key: 'unit'
+  }, {
+    title: '税率（%）',
+    dataIndex: 'taxRate',
+    key: 'taxRate'
   }, {
     title: '单价(含税)',
     dataIndex: 'priceIncludeTax',
@@ -707,6 +711,7 @@ var InvoiceControllerState = function InvoiceControllerState() {
 
   this.model = 'default';
   this.en = '01';
+  this.invoiceType = '08';
   this.buyerState = new BuyerState();
   this.goodsListState = new GoodsListState();
 };
@@ -8817,10 +8822,12 @@ var onChangeTaxRate = lazyFn$1(function (controller, form, record) {
 /** 小规模纳税人 1% 和 3% 自动赋码免税 */
 
 function dutyFree(controller, taxRate, form, record) {
-  var cache = controller.state.goodsListState.endowCode.cache; // 4月1日至12月31日
+  var cache = controller.state.goodsListState.endowCode.cache;
+  var invoiceType = controller.state.invoiceType; // 4月1日至12月31日
 
   if (hooks().valueOf() > hooks('2022-12-31 23:59').valueOf()) return taxRate;
-  if (controller.state.en !== '08') return taxRate; // 选择的 1或者3
+  if (controller.state.en !== '08') return taxRate;
+  if (invoiceType !== '10' && invoiceType !== '04') return taxRate; // 选择的 1或者3
 
   if (taxRate === 1 || taxRate === 3) {
     // 是否处理过
@@ -8829,11 +8836,13 @@ function dutyFree(controller, taxRate, form, record) {
     } else {
       cache[record.$index] = {
         favouredPolicyName: record.favouredPolicyName,
-        favouredPolicyMark: record.favouredPolicyMark
+        favouredPolicyMark: record.favouredPolicyMark,
+        taxFreeType: record.taxFreeType
       };
       record.favouredPolicyName = '免税';
-      record.favouredPolicyMark = 1;
       record.taxRate = 0;
+      record.favouredPolicyMark = 1;
+      record.taxFreeType = 1;
       form.setFieldsValue({
         taxRate: 0
       });
@@ -8842,7 +8851,8 @@ function dutyFree(controller, taxRate, form, record) {
   } else {
     if (cache[record.$index] && cache[record.$index] !== true) {
       record.favouredPolicyName = cache[record.$index].favouredPolicyName;
-      record.favouredPolicyName = cache[record.$index].favouredPolicyName;
+      record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
+      record.taxFreeType = cache[record.$index].taxFreeType;
       cache[record.$index] = true;
     }
 
@@ -8851,7 +8861,6 @@ function dutyFree(controller, taxRate, form, record) {
 }
 /** 含税 => 更新(不含税) */
 
-
 var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(err, values) {
@@ -11359,7 +11368,7 @@ var DrawerBody$2 = function DrawerBody() {
     onRow: function onRow(record) {
       return {
         onClick: function onClick() {
-          controller.pipeline( /*#__PURE__*/function () {
+          controller.run( /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
               return regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
@@ -11409,6 +11418,8 @@ var DrawerBody$2 = function DrawerBody() {
                       return _context2.abrupt("return");
 
                     case 12:
+                      if (s.goodsListState.editGood.taxRate) s.goodsListState.editGood.taxRate = dutyFree(controller, s.goodsListState.editGood.taxRate, s.goodsListState.form, record);
+
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -11422,7 +11433,7 @@ var DrawerBody$2 = function DrawerBody() {
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
-                    case 18:
+                    case 19:
                     case "end":
                       return _context2.stop();
                   }
@@ -11433,7 +11444,7 @@ var DrawerBody$2 = function DrawerBody() {
             return function (_x2) {
               return _ref2.apply(this, arguments);
             };
-          }())();
+          }());
         }
       };
     }

package/dist/index.js

@@ -508,6 +508,10 @@ var ImportGoods = function ImportGoods() {
     title: '计量单位',
     dataIndex: 'unit',
     key: 'unit'
+  }, {
+    title: '税率（%）',
+    dataIndex: 'taxRate',
+    key: 'taxRate'
   }, {
     title: '单价(含税)',
     dataIndex: 'priceIncludeTax',
@@ -717,6 +721,7 @@ var InvoiceControllerState = function InvoiceControllerState() {
 
   this.model = 'default';
   this.en = '01';
+  this.invoiceType = '08';
   this.buyerState = new BuyerState();
   this.goodsListState = new GoodsListState();
 };
@@ -8827,10 +8832,12 @@ var onChangeTaxRate = lazyFn$1(function (controller, form, record) {
 /** 小规模纳税人 1% 和 3% 自动赋码免税 */
 
 function dutyFree(controller, taxRate, form, record) {
-  var cache = controller.state.goodsListState.endowCode.cache; // 4月1日至12月31日
+  var cache = controller.state.goodsListState.endowCode.cache;
+  var invoiceType = controller.state.invoiceType; // 4月1日至12月31日
 
   if (hooks().valueOf() > hooks('2022-12-31 23:59').valueOf()) return taxRate;
-  if (controller.state.en !== '08') return taxRate; // 选择的 1或者3
+  if (controller.state.en !== '08') return taxRate;
+  if (invoiceType !== '10' && invoiceType !== '04') return taxRate; // 选择的 1或者3
 
   if (taxRate === 1 || taxRate === 3) {
     // 是否处理过
@@ -8839,11 +8846,13 @@ function dutyFree(controller, taxRate, form, record) {
     } else {
       cache[record.$index] = {
         favouredPolicyName: record.favouredPolicyName,
-        favouredPolicyMark: record.favouredPolicyMark
+        favouredPolicyMark: record.favouredPolicyMark,
+        taxFreeType: record.taxFreeType
       };
       record.favouredPolicyName = '免税';
-      record.favouredPolicyMark = 1;
       record.taxRate = 0;
+      record.favouredPolicyMark = 1;
+      record.taxFreeType = 1;
       form.setFieldsValue({
         taxRate: 0
       });
@@ -8852,7 +8861,8 @@ function dutyFree(controller, taxRate, form, record) {
   } else {
     if (cache[record.$index] && cache[record.$index] !== true) {
       record.favouredPolicyName = cache[record.$index].favouredPolicyName;
-      record.favouredPolicyName = cache[record.$index].favouredPolicyName;
+      record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
+      record.taxFreeType = cache[record.$index].taxFreeType;
       cache[record.$index] = true;
     }
 
@@ -8861,7 +8871,6 @@ function dutyFree(controller, taxRate, form, record) {
 }
 /** 含税 => 更新(不含税) */
 
-
 var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(err, values) {
@@ -11369,7 +11378,7 @@ var DrawerBody$2 = function DrawerBody() {
     onRow: function onRow(record) {
       return {
         onClick: function onClick() {
-          controller.pipeline( /*#__PURE__*/function () {
+          controller.run( /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
               return regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
@@ -11419,6 +11428,8 @@ var DrawerBody$2 = function DrawerBody() {
                       return _context2.abrupt("return");
 
                     case 12:
+                      if (s.goodsListState.editGood.taxRate) s.goodsListState.editGood.taxRate = dutyFree(controller, s.goodsListState.editGood.taxRate, s.goodsListState.form, record);
+
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -11432,7 +11443,7 @@ var DrawerBody$2 = function DrawerBody() {
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
-                    case 18:
+                    case 19:
                     case "end":
                       return _context2.stop();
                   }
@@ -11443,7 +11454,7 @@ var DrawerBody$2 = function DrawerBody() {
             return function (_x2) {
               return _ref2.apply(this, arguments);
             };
-          }())();
+          }());
         }
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "1.2.15",
+  "version": "1.2.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/ImportGoods.ts

@@ -36,6 +36,11 @@ export default class ImportGoods<ColumnType = any> {
       dataIndex: 'unit',
       key: 'unit',
     },
+    {
+      title: '税率（%）',
+      dataIndex: 'taxRate',
+      key: 'taxRate',
+    },
     {
       title: '单价(含税)',
       dataIndex: 'priceIncludeTax',

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

@@ -4,7 +4,7 @@ import BuyerState from './BuyerState';
 export default class InvoiceControllerState {
 
   /** 组件模式 */
-  model: 'default' | 'prefab' = 'default'
+  model: 'default' | 'prefab' = 'default';
 
   /** 
    * 企业类型 
@@ -15,6 +15,15 @@ export default class InvoiceControllerState {
    * */
   en: '01' | '05' | '04' | '08' = '01';
 
+  /**
+   * 发票类型
+   * 08 - 增值税电子专用发票
+   * 10 - 增值税电子普通发票
+   * 01 - 增值税纸质专用发票
+   * 04 - 增值税纸质普通发票
+   */
+  invoiceType: '08' | '10' | '01' | '04' = '08';
+
   /** 购买方 */
   buyerState = new BuyerState();
 

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

@@ -8,15 +8,9 @@ export default () => {
   // 初始化控制器
   const controller = React.useMemo(() => new MyInvoiceController(), []);
 
-  // 开始搜索
-  const onSumbit = React.useCallback(controller.pipeline(async (s, inputVal?: any) => {
-    console.log('inputVal ===>', inputVal, s.goodsListState.importGoods.pagination);
-    s.goodsListState.importGoods.dataSource = [];
-  }), [])
-
   return (
     <>
-      <Button onClick={async () => { console.log('===> 当前组件状态', await controller.validateFields()); }} >获取数据</Button>
+      <Button style={{ marginBottom: 10 }} onClick={async () => { console.log('===> 当前组件状态', await controller.validateFields()); }} >获取数据</Button>
       <Invoice controller={controller} />
     </>
   );
@@ -36,6 +30,9 @@ class MyInvoiceController extends Invoice.InvoiceController {
         key: 'affix',
       },
     ];
+
+    this.state.en = '08'
+    this.state.invoiceType = '10'
   }
 
   // 重写 的 获取商品列表

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

@@ -273,13 +273,15 @@ export const onChangeTaxRate = lazyFn(
 );
 
 /** 小规模纳税人 1% 和 3% 自动赋码免税 */
-function dutyFree(controller: InvoiceController, taxRate: number, form: WrappedFormUtils<any>, record: IGood) {
+export function dutyFree(controller: InvoiceController, taxRate: number, form: WrappedFormUtils<any>, record: IGood) {
 
   const cache = controller.state.goodsListState.endowCode.cache;
+  const invoiceType = controller.state.invoiceType;
 
   // 4月1日至12月31日
   if (moment().valueOf() > moment('2022-12-31 23:59').valueOf()) return taxRate;
   if (controller.state.en !== '08') return taxRate;
+  if (invoiceType !== '10' && invoiceType !== '04') return taxRate;
   
   // 选择的 1或者3
   if (taxRate === 1 || taxRate === 3) {
@@ -287,17 +289,19 @@ function dutyFree(controller: InvoiceController, taxRate: number, form: WrappedF
     if (cache[record.$index]) {
       return taxRate;
     } else {
-      cache[record.$index] = { favouredPolicyName: record.favouredPolicyName, favouredPolicyMark: record.favouredPolicyMark, }
+      cache[record.$index] = { favouredPolicyName: record.favouredPolicyName, favouredPolicyMark: record.favouredPolicyMark,taxFreeType:record.taxFreeType }
       record.favouredPolicyName = '免税';
-      record.favouredPolicyMark = 1;
       record.taxRate = 0;
+      record.favouredPolicyMark = 1;
+      record.taxFreeType = 1 as any;
       form.setFieldsValue({ taxRate: 0 });
       return 0;
     }
   } else {
     if (cache[record.$index] && cache[record.$index] !== true) {
       record.favouredPolicyName = cache[record.$index].favouredPolicyName;
-      record.favouredPolicyName = cache[record.$index].favouredPolicyName;
+      record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
+      record.taxFreeType = cache[record.$index].taxFreeType;
       cache[record.$index] = true;
     }
     return taxRate;

package/src/Invoice/ui/ImportGoodsDrawer/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Drawer, message, Table } from 'kts-components-antd-x3';
 import Invoice from '../../';
-import { updateUnitPriceExcludingTax, updateUnitPriceTax, format15 } from '../GoodsList/hook/useColumns/autoFillFn';
+import { updateUnitPriceExcludingTax, updateUnitPriceTax, dutyFree, format15 } from '../GoodsList/hook/useColumns/autoFillFn';
 import { countAmountIncludeTax } from '../../tools/calculate'
 import { IGood } from '../../InvoiceController';
 import evaluate from '../../tools/evaluate';
@@ -64,7 +64,7 @@ const DrawerBody = () => {
       onRow={record => {
         return {
           onClick: () => {
-            controller.pipeline(
+            controller.run(
               async s => {
                 Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
 
@@ -82,6 +82,9 @@ const DrawerBody = () => {
                 s.goodsListState.editGood = { ...s.goodsListState.editGood, ...record };
                 if (!s.goodsListState.editGood) return;
 
+                if(s.goodsListState.editGood.taxRate)
+                  s.goodsListState.editGood.taxRate = dutyFree(controller, s.goodsListState.editGood.taxRate, s.goodsListState.form, record)
+
                 if (`${s.goodsListState.editGood.priceIncludeTax}` === '0') {
                   s.goodsListState.editGood.priceIncludeTax = undefined;
                   s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -101,8 +104,8 @@ const DrawerBody = () => {
                   ? updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
                   : updateUnitPriceTax(controller, s.goodsListState.form, record)
               }
-            )();
-          },
+            )
+          }
         };
       }}
     />