kts-component-invoice-operate 1.2.17 → 1.2.20-b1

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/EndowCode.d.ts

@@ -37,7 +37,9 @@ export default class EndowCode {
     favouredPolicyNameList: string[];
     /** 免税类型 列表 */
     taxFreeTypeList: any[];
-    /** 小规模纳税人 自动赋码缓存 */
+    /**
+     * 小规模纳税人 自动赋码缓存 、
+     * */
     cache: {
         [key: string]: any;
     };

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 | undefined;
 /** 含税 => 更新(不含税) */
 export declare const updateUnitPriceExcludingTax: (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => void;
 /** 不含税 => 更新(含税) */

package/dist/index.esm.js

@@ -354,54 +354,58 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                _context.next = 2;
+                return this.wait();
+
+              case 2:
                 _errors = new Map();
                 _values = new Map();
                 arr = Array.from(this.formList);
                 i = 0;
 
-              case 4:
+              case 6:
                 if (!(i < arr.length)) {
-                  _context.next = 16;
+                  _context.next = 18;
                   break;
                 }
 
                 key = arr[i][0];
-                _context.next = 8;
+                _context.next = 10;
                 return _validateFields(arr[i][1]);
 
-              case 8:
+              case 10:
                 _yield$_validateField = _context.sent;
                 errors = _yield$_validateField.errors;
                 values = _yield$_validateField.values;
                 errors && _errors.set(key, errors);
                 _values && _values.set(key, values);
 
-              case 13:
+              case 15:
                 i++;
-                _context.next = 4;
+                _context.next = 6;
                 break;
 
-              case 16:
+              case 18:
                 if (!this.state.goodsListState.form) {
-                  _context.next = 25;
+                  _context.next = 27;
                   break;
                 }
 
-                _context.prev = 17;
-                _context.next = 20;
+                _context.prev = 19;
+                _context.next = 22;
                 return (_this$state$goodsList = this.state.goodsListState.form) === null || _this$state$goodsList === void 0 ? void 0 : _this$state$goodsList.validateFields();
 
-              case 20:
-                _context.next = 25;
+              case 22:
+                _context.next = 27;
                 break;
 
-              case 22:
-                _context.prev = 22;
-                _context.t0 = _context["catch"](17);
+              case 24:
+                _context.prev = 24;
+                _context.t0 = _context["catch"](19);
 
                 _errors.set('goodsList', _context.t0.errors);
 
-              case 25:
+              case 27:
                 _values.set('goodsList', this.state.goodsListState.goodsList.slice()); // 金额（含税）
 
 
@@ -445,12 +449,12 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                   values: _values
                 });
 
-              case 30:
+              case 32:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this, [[17, 22]]);
+        }, _callee, this, [[19, 24]]);
       }));
 
       function validateFields() {
@@ -498,6 +502,10 @@ var ImportGoods = function ImportGoods() {
     title: '计量单位',
     dataIndex: 'unit',
     key: 'unit'
+  }, {
+    title: '税率（%）',
+    dataIndex: 'taxRate',
+    key: 'taxRate'
   }, {
     title: '单价(含税)',
     dataIndex: 'priceIncludeTax',
@@ -707,6 +715,7 @@ var InvoiceControllerState = function InvoiceControllerState() {
 
   this.model = 'default';
   this.en = '01';
+  this.invoiceType = '08';
   this.buyerState = new BuyerState();
   this.goodsListState = new GoodsListState();
 };
@@ -8786,15 +8795,26 @@ var onChangeTaxRate = lazyFn$1(function (controller, form, record) {
 
             case 3:
               taxRate = parseFloat(values.taxRate);
-              taxRate = dutyFree(controller, taxRate, form, record); // 小规模纳税人
-
-              _context6.next = 7;
+              _context6.next = 6;
               return controller.setEditGood({
                 taxRate: taxRate
               });
 
-            case 7:
-              // 是否含税
+            case 6:
+              // 去掉赋码
+              (function () {
+                var cache = controller.state.goodsListState.endowCode.cache;
+                var record = controller.state.goodsListState.editGood;
+
+                if (record && cache[record.$index]) {
+                  record.favouredPolicyName = cache[record.$index].favouredPolicyName;
+                  record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
+                  record.taxFreeType = cache[record.$index].taxFreeType;
+                  cache[record.$index] = undefined;
+                }
+              })(); // 是否含税
+
+
               if (controller.state.goodsListState.isTaxIncluded) {
                 updateUnitPriceExcludingTax(controller, form);
               } else {
@@ -8817,44 +8837,36 @@ 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日
+
+  console.log('===> 小规模纳税人免税逻辑');
+  console.log('===> invoiceType', invoiceType);
+  console.log('===> en', controller.state.en);
+  console.log('===> taxRate', taxRate);
+  console.log('===> state', controller.state);
   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;
 
   if (taxRate === 1 || taxRate === 3) {
-    // 是否处理过
-    if (cache[record.$index]) {
-      return taxRate;
-    } else {
-      cache[record.$index] = {
-        favouredPolicyName: record.favouredPolicyName,
-        favouredPolicyMark: record.favouredPolicyMark,
-        taxFreeType: record.taxFreeType
-      };
-      record.favouredPolicyName = '免税';
-      record.taxRate = 0;
-      record.favouredPolicyMark = 1;
-      record.taxFreeType = 1;
-      form.setFieldsValue({
-        taxRate: 0
-      });
-      return 0;
-    }
-  } else {
-    if (cache[record.$index] && cache[record.$index] !== true) {
-      record.favouredPolicyName = cache[record.$index].favouredPolicyName;
-      record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
-      record.taxFreeType = cache[record.$index].taxFreeType;
-      cache[record.$index] = true;
-    }
-
-    return taxRate;
+    cache[record.$index] = {
+      favouredPolicyName: record.favouredPolicyName,
+      favouredPolicyMark: record.favouredPolicyMark,
+      taxFreeType: record.taxFreeType
+    };
+    record.favouredPolicyName = '免税';
+    record.taxRate = 0;
+    record.favouredPolicyMark = 1;
+    record.taxFreeType = 1;
+    form.setFieldsValue({
+      taxRate: 0
+    });
+    return 0;
   }
 }
 /** 含税 => 更新(不含税) */
 
-
 var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(err, values) {
@@ -11362,7 +11374,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) {
@@ -11412,6 +11424,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, s.goodsListState.editGood);
+
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -11425,7 +11439,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();
                   }
@@ -11436,7 +11450,7 @@ var DrawerBody$2 = function DrawerBody() {
             return function (_x2) {
               return _ref2.apply(this, arguments);
             };
-          }())();
+          }());
         }
       };
     }

package/dist/index.js

@@ -364,54 +364,58 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                _context.next = 2;
+                return this.wait();
+
+              case 2:
                 _errors = new Map();
                 _values = new Map();
                 arr = Array.from(this.formList);
                 i = 0;
 
-              case 4:
+              case 6:
                 if (!(i < arr.length)) {
-                  _context.next = 16;
+                  _context.next = 18;
                   break;
                 }
 
                 key = arr[i][0];
-                _context.next = 8;
+                _context.next = 10;
                 return _validateFields(arr[i][1]);
 
-              case 8:
+              case 10:
                 _yield$_validateField = _context.sent;
                 errors = _yield$_validateField.errors;
                 values = _yield$_validateField.values;
                 errors && _errors.set(key, errors);
                 _values && _values.set(key, values);
 
-              case 13:
+              case 15:
                 i++;
-                _context.next = 4;
+                _context.next = 6;
                 break;
 
-              case 16:
+              case 18:
                 if (!this.state.goodsListState.form) {
-                  _context.next = 25;
+                  _context.next = 27;
                   break;
                 }
 
-                _context.prev = 17;
-                _context.next = 20;
+                _context.prev = 19;
+                _context.next = 22;
                 return (_this$state$goodsList = this.state.goodsListState.form) === null || _this$state$goodsList === void 0 ? void 0 : _this$state$goodsList.validateFields();
 
-              case 20:
-                _context.next = 25;
+              case 22:
+                _context.next = 27;
                 break;
 
-              case 22:
-                _context.prev = 22;
-                _context.t0 = _context["catch"](17);
+              case 24:
+                _context.prev = 24;
+                _context.t0 = _context["catch"](19);
 
                 _errors.set('goodsList', _context.t0.errors);
 
-              case 25:
+              case 27:
                 _values.set('goodsList', this.state.goodsListState.goodsList.slice()); // 金额（含税）
 
 
@@ -455,12 +459,12 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                   values: _values
                 });
 
-              case 30:
+              case 32:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this, [[17, 22]]);
+        }, _callee, this, [[19, 24]]);
       }));
 
       function validateFields() {
@@ -508,6 +512,10 @@ var ImportGoods = function ImportGoods() {
     title: '计量单位',
     dataIndex: 'unit',
     key: 'unit'
+  }, {
+    title: '税率（%）',
+    dataIndex: 'taxRate',
+    key: 'taxRate'
   }, {
     title: '单价(含税)',
     dataIndex: 'priceIncludeTax',
@@ -717,6 +725,7 @@ var InvoiceControllerState = function InvoiceControllerState() {
 
   this.model = 'default';
   this.en = '01';
+  this.invoiceType = '08';
   this.buyerState = new BuyerState();
   this.goodsListState = new GoodsListState();
 };
@@ -8796,15 +8805,26 @@ var onChangeTaxRate = lazyFn$1(function (controller, form, record) {
 
             case 3:
               taxRate = parseFloat(values.taxRate);
-              taxRate = dutyFree(controller, taxRate, form, record); // 小规模纳税人
-
-              _context6.next = 7;
+              _context6.next = 6;
               return controller.setEditGood({
                 taxRate: taxRate
               });
 
-            case 7:
-              // 是否含税
+            case 6:
+              // 去掉赋码
+              (function () {
+                var cache = controller.state.goodsListState.endowCode.cache;
+                var record = controller.state.goodsListState.editGood;
+
+                if (record && cache[record.$index]) {
+                  record.favouredPolicyName = cache[record.$index].favouredPolicyName;
+                  record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
+                  record.taxFreeType = cache[record.$index].taxFreeType;
+                  cache[record.$index] = undefined;
+                }
+              })(); // 是否含税
+
+
               if (controller.state.goodsListState.isTaxIncluded) {
                 updateUnitPriceExcludingTax(controller, form);
               } else {
@@ -8827,44 +8847,36 @@ 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日
+
+  console.log('===> 小规模纳税人免税逻辑');
+  console.log('===> invoiceType', invoiceType);
+  console.log('===> en', controller.state.en);
+  console.log('===> taxRate', taxRate);
+  console.log('===> state', controller.state);
   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;
 
   if (taxRate === 1 || taxRate === 3) {
-    // 是否处理过
-    if (cache[record.$index]) {
-      return taxRate;
-    } else {
-      cache[record.$index] = {
-        favouredPolicyName: record.favouredPolicyName,
-        favouredPolicyMark: record.favouredPolicyMark,
-        taxFreeType: record.taxFreeType
-      };
-      record.favouredPolicyName = '免税';
-      record.taxRate = 0;
-      record.favouredPolicyMark = 1;
-      record.taxFreeType = 1;
-      form.setFieldsValue({
-        taxRate: 0
-      });
-      return 0;
-    }
-  } else {
-    if (cache[record.$index] && cache[record.$index] !== true) {
-      record.favouredPolicyName = cache[record.$index].favouredPolicyName;
-      record.favouredPolicyMark = cache[record.$index].favouredPolicyMark;
-      record.taxFreeType = cache[record.$index].taxFreeType;
-      cache[record.$index] = true;
-    }
-
-    return taxRate;
+    cache[record.$index] = {
+      favouredPolicyName: record.favouredPolicyName,
+      favouredPolicyMark: record.favouredPolicyMark,
+      taxFreeType: record.taxFreeType
+    };
+    record.favouredPolicyName = '免税';
+    record.taxRate = 0;
+    record.favouredPolicyMark = 1;
+    record.taxFreeType = 1;
+    form.setFieldsValue({
+      taxRate: 0
+    });
+    return 0;
   }
 }
 /** 含税 => 更新(不含税) */
 
-
 var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(err, values) {
@@ -11372,7 +11384,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) {
@@ -11422,6 +11434,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, s.goodsListState.editGood);
+
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -11435,7 +11449,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();
                   }
@@ -11446,7 +11460,7 @@ var DrawerBody$2 = function DrawerBody() {
             return function (_x2) {
               return _ref2.apply(this, arguments);
             };
-          }())();
+          }());
         }
       };
     }

package/docs/index.md

@@ -1,5 +1,5 @@
-# 发票编辑组件
+# 发票编辑组件-
 
 npm 地址：https://www.npmjs.com/package/kts-component-invoice-operate
 
-### 版本 1.2.11
+### 版本 1.2.20