kts-component-invoice-operate 3.0.13 → 3.0.15

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

@@ -46,6 +46,4 @@ export default interface IGood {
     favouredPolicyMark?: number;
     /** 优惠政策类型 */
     favouredPolicyName?: string;
-    /** 零税率标识 */
-    zeroTaxRateFlag?: string;
 }

package/dist/index.esm.js

@@ -1375,7 +1375,7 @@ var addGoodDiscount = /*#__PURE__*/(function () {
                 itemNameSelf: good.itemNameSelf,
                 favouredPolicyMark: good.favouredPolicyMark,
                 favouredPolicyName: good.favouredPolicyName,
-                zeroTaxRateFlag: good.zeroTaxRateFlag,
+                taxFreeType: good.taxFreeType,
                 discountGroup: discountGroup,
                 lineAmountIncludeTax: lineAmountIncludeTax,
                 lineAmountExcludeTax: lineAmountExcludeTax,
@@ -8858,23 +8858,22 @@ var onChangeTaxRate = lazyFn(function (controller, form, record) {
           switch (_context6.prev = _context6.next) {
             case 0:
               err = err || {};
-              debugger;
 
               if (!(promptErr(err.taxRate) || !values.taxRate && values.taxRate !== 0)) {
-                _context6.next = 4;
+                _context6.next = 3;
                 break;
               }
 
               return _context6.abrupt("return");
 
-            case 4:
+            case 3:
               taxRate = parseFloat(values.taxRate);
-              _context6.next = 7;
+              _context6.next = 6;
               return controller.setEditGood({
                 taxRate: taxRate
               });
 
-            case 7:
+            case 6:
               // 去掉赋码
               (function () {
                 var cache = controller.state.goodsListState.endowCode.cache;
@@ -8895,7 +8894,7 @@ var onChangeTaxRate = lazyFn(function (controller, form, record) {
                 updateUnitPriceTax(controller, form);
               }
 
-            case 9:
+            case 8:
             case "end":
               return _context6.stop();
           }
@@ -9010,7 +9009,7 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
 var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(err, values) {
-      var lineAmountExcludeTax, lineAmountIncludeTax, taxAmount, priceExcludeTax, priceIncludeTax;
+      var lineAmountExcludeTax, lineAmountIncludeTax, priceIncludeTax, taxAmount;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) {
           switch (_context8.prev = _context8.next) {
@@ -9018,7 +9017,7 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               err = err || {};
 
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !promptErr(err.lineAmountExcludeTax) && (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0))) {
-                _context8.next = 12;
+                _context8.next = 16;
                 break;
               }
 
@@ -9031,43 +9030,42 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               });
 
             case 6:
+              if (!(!err.quantity && values.quantity)) {
+                _context8.next = 10;
+                break;
+              }
+
+              priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(values.quantity)));
+              _context8.next = 10;
+              return controller.setEditGood({
+                priceIncludeTax: priceIncludeTax
+              });
+
+            case 10:
               // 税额 = 金额(含税)-金额(不含税)
               taxAmount = evaluate("".concat(lineAmountIncludeTax, " - ").concat(lineAmountExcludeTax));
               form.setFieldsValue({
                 taxAmount: taxAmount
               });
-              _context8.next = 10;
+              _context8.next = 14;
               return controller.setEditGood({
                 taxAmount: taxAmount
               });
 
-            case 10:
-              _context8.next = 15;
+            case 14:
+              _context8.next = 19;
               break;
 
-            case 12:
+            case 16:
               form.setFieldsValue({
                 taxAmount: undefined
               });
-              _context8.next = 15;
+              _context8.next = 19;
               return controller.setEditGood({
                 taxAmount: undefined
               });
 
-            case 15:
-              if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !promptErr(err.priceExcludeTax) && (values.priceExcludeTax || values.priceExcludeTax === 0))) {
-                _context8.next = 20;
-                break;
-              }
-
-              priceExcludeTax = format15(values.priceExcludeTax);
-              priceIncludeTax = format15(evaluate("".concat(priceExcludeTax, " * (1+(").concat(values.taxRate, "/100))")));
-              _context8.next = 20;
-              return controller.setEditGood({
-                priceIncludeTax: priceIncludeTax
-              });
-
-            case 20:
+            case 19:
             case "end":
               return _context8.stop();
           }

package/dist/index.js

@@ -1385,7 +1385,7 @@ var addGoodDiscount = /*#__PURE__*/(function () {
                 itemNameSelf: good.itemNameSelf,
                 favouredPolicyMark: good.favouredPolicyMark,
                 favouredPolicyName: good.favouredPolicyName,
-                zeroTaxRateFlag: good.zeroTaxRateFlag,
+                taxFreeType: good.taxFreeType,
                 discountGroup: discountGroup,
                 lineAmountIncludeTax: lineAmountIncludeTax,
                 lineAmountExcludeTax: lineAmountExcludeTax,
@@ -8868,23 +8868,22 @@ var onChangeTaxRate = lazyFn(function (controller, form, record) {
           switch (_context6.prev = _context6.next) {
             case 0:
               err = err || {};
-              debugger;
 
               if (!(promptErr(err.taxRate) || !values.taxRate && values.taxRate !== 0)) {
-                _context6.next = 4;
+                _context6.next = 3;
                 break;
               }
 
               return _context6.abrupt("return");
 
-            case 4:
+            case 3:
               taxRate = parseFloat(values.taxRate);
-              _context6.next = 7;
+              _context6.next = 6;
               return controller.setEditGood({
                 taxRate: taxRate
               });
 
-            case 7:
+            case 6:
               // 去掉赋码
               (function () {
                 var cache = controller.state.goodsListState.endowCode.cache;
@@ -8905,7 +8904,7 @@ var onChangeTaxRate = lazyFn(function (controller, form, record) {
                 updateUnitPriceTax(controller, form);
               }
 
-            case 9:
+            case 8:
             case "end":
               return _context6.stop();
           }
@@ -9020,7 +9019,7 @@ var updateUnitPriceExcludingTax = function updateUnitPriceExcludingTax(controlle
 var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
   form.validateFields( /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(err, values) {
-      var lineAmountExcludeTax, lineAmountIncludeTax, taxAmount, priceExcludeTax, priceIncludeTax;
+      var lineAmountExcludeTax, lineAmountIncludeTax, priceIncludeTax, taxAmount;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) {
           switch (_context8.prev = _context8.next) {
@@ -9028,7 +9027,7 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               err = err || {};
 
               if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !promptErr(err.lineAmountExcludeTax) && (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0))) {
-                _context8.next = 12;
+                _context8.next = 16;
                 break;
               }
 
@@ -9041,43 +9040,42 @@ var updateUnitPriceTax = function updateUnitPriceTax(controller, form, record) {
               });
 
             case 6:
+              if (!(!err.quantity && values.quantity)) {
+                _context8.next = 10;
+                break;
+              }
+
+              priceIncludeTax = format15(evaluate("".concat(lineAmountIncludeTax, " / ").concat(values.quantity)));
+              _context8.next = 10;
+              return controller.setEditGood({
+                priceIncludeTax: priceIncludeTax
+              });
+
+            case 10:
               // 税额 = 金额(含税)-金额(不含税)
               taxAmount = evaluate("".concat(lineAmountIncludeTax, " - ").concat(lineAmountExcludeTax));
               form.setFieldsValue({
                 taxAmount: taxAmount
               });
-              _context8.next = 10;
+              _context8.next = 14;
               return controller.setEditGood({
                 taxAmount: taxAmount
               });
 
-            case 10:
-              _context8.next = 15;
+            case 14:
+              _context8.next = 19;
               break;
 
-            case 12:
+            case 16:
               form.setFieldsValue({
                 taxAmount: undefined
               });
-              _context8.next = 15;
+              _context8.next = 19;
               return controller.setEditGood({
                 taxAmount: undefined
               });
 
-            case 15:
-              if (!(!err.taxRat && (values.taxRate || values.taxRate === 0) && !promptErr(err.priceExcludeTax) && (values.priceExcludeTax || values.priceExcludeTax === 0))) {
-                _context8.next = 20;
-                break;
-              }
-
-              priceExcludeTax = format15(values.priceExcludeTax);
-              priceIncludeTax = format15(evaluate("".concat(priceExcludeTax, " * (1+(").concat(values.taxRate, "/100))")));
-              _context8.next = 20;
-              return controller.setEditGood({
-                priceIncludeTax: priceIncludeTax
-              });
-
-            case 20:
+            case 19:
             case "end":
               return _context8.stop();
           }

package/package.json

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

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

@@ -69,7 +69,4 @@ export default interface IGood {
 
   /** 优惠政策类型 */
   favouredPolicyName?: string;
-
-  /** 零税率标识 */
-  zeroTaxRateFlag?: string;
 }

package/src/Invoice/InvoiceController/fns/addGoodDiscount.ts

@@ -101,6 +101,7 @@ export default async (state: InvoiceControllerState, options?: IOptions) => {
       .done()
       .toNumber();
 
+      
     good.discountGroup = discountGroup;
     good.lineAttribute = LineAttributeType.被折扣行;
     goodsList.splice(i + 1, 0, {
@@ -112,7 +113,7 @@ export default async (state: InvoiceControllerState, options?: IOptions) => {
       itemNameSelf: good.itemNameSelf,
       favouredPolicyMark: good.favouredPolicyMark,
       favouredPolicyName: good.favouredPolicyName,
-      zeroTaxRateFlag: good.zeroTaxRateFlag,
+      taxFreeType: good.taxFreeType,
       discountGroup,
       lineAmountIncludeTax,
       lineAmountExcludeTax,

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

@@ -176,7 +176,7 @@ const lines: any[] = [
     "taxDiscount": 576.38,
     "taxRate": 13,
     "unit": "件",
-    "zeroTaxRateFlag": null
+    "zeroTaxRateFlag": 'dddddd'
   },
   {
     "buyersItemCode": null,
@@ -1093,4 +1093,4 @@ const moke = [
     "zzstsgl": "",
     "zzszcyj": ""
   }
-]
+].map(e => ({ ...e, "zeroTaxRateFlag": 'dddddd' }))

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

@@ -257,7 +257,6 @@ export const onChangeTaxRate = lazyFn(
 
     form.validateFields(async (err, values) => {
       err = err || {};
-      debugger;
       if (promptErr(err.taxRate) || (!values.taxRate && values.taxRate !== 0)) return;
 
       let taxRate = parseFloat(values.taxRate);
@@ -339,7 +338,7 @@ export const updateUnitPriceExcludingTax = (controller: InvoiceController, form:
     await controller.setEditGood({ taxAmount });
 
     // 计算 金额(不含税)
-    if ((taxAmount || taxAmount===0) && !promptErr(err.lineAmountIncludeTax)) {
+    if ((taxAmount || taxAmount === 0) && !promptErr(err.lineAmountIncludeTax)) {
       lineAmountExcludeTax = countAmountExcludeTax(values.lineAmountIncludeTax, taxAmount);
     }
     form.setFieldsValue({ lineAmountExcludeTax });
@@ -371,6 +370,13 @@ export const updateUnitPriceTax = (controller: InvoiceController, form: WrappedF
       const lineAmountIncludeTax = format2(evaluate(`${lineAmountExcludeTax} * (1+(${values.taxRate}/100))`));
       await controller.setEditGood({ lineAmountIncludeTax });
 
+      // 单价(含税) = 金额（含税） / (數量)
+      // 是否有数量
+      if (!err.quantity && values.quantity) {
+        const priceIncludeTax = format15(evaluate(`${lineAmountIncludeTax} / ${values.quantity}`));
+        await controller.setEditGood({ priceIncludeTax });
+      }
+
       // 税额 = 金额(含税)-金额(不含税)
       const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
       form.setFieldsValue({ taxAmount });
@@ -379,18 +385,18 @@ export const updateUnitPriceTax = (controller: InvoiceController, form: WrappedF
       form.setFieldsValue({ taxAmount: undefined });
       await controller.setEditGood({ taxAmount: undefined });
     }
-
+    
     // 单价(含税) = 单价(不含税) * (1+税率)
-    if (
-      !err.taxRat &&
-      (values.taxRate || values.taxRate === 0) &&
-      !promptErr(err.priceExcludeTax) &&
-      (values.priceExcludeTax || values.priceExcludeTax === 0)
-    ) {
-      const priceExcludeTax = format15(values.priceExcludeTax);
-      const priceIncludeTax = format15(evaluate(`${priceExcludeTax} * (1+(${values.taxRate}/100))`));
-      await controller.setEditGood({ priceIncludeTax });
-    }
+    // if (
+    //   !err.taxRat &&
+    //   (values.taxRate || values.taxRate === 0) &&
+    //   !promptErr(err.priceExcludeTax) &&
+    //   (values.priceExcludeTax || values.priceExcludeTax === 0)
+    // ) {
+    //   const priceExcludeTax = format15(values.priceExcludeTax);
+    //   const priceIncludeTax = format15(evaluate(`${priceExcludeTax} * (1+(${values.taxRate}/100))`));
+    //   await controller.setEditGood({ priceIncludeTax });
+    // }
   });
 };