kts-component-invoice-operate 3.1.11 → 3.1.13

package/package.json

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

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/EndowCode/index.tsx

@@ -67,7 +67,7 @@ export default class EndowCode {
   /** 免税类型 列表 */
   taxFreeTypeList: any[] = [
     { label: '出口免税和其他免税优惠政策（免税）', value: 1 },
-    { label: '不征增值税（不征税））', value: 2 },
+    { label: '不征增值税（不征税）', value: 2 },
     { label: '普通零税率（0%）', value: 3 },
   ];
 

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

@@ -7,7 +7,7 @@ export default async (state: InvoiceControllerState) => {
   const editGood = state.goodsListState.editGood;
   const form = state.goodsListState.form;
   
-  if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer) return;
+  if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculating) return;
   if ((await validateFields(form)).err) return;
 
   state.goodsListState.goodsList = state.goodsListState.goodsList.map((e) =>

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

@@ -47,6 +47,9 @@ const promptErr = (err: any) => {
   return true;
 }
 
+/** 清除计算中启动字段 */
+export const clearCalculatingField = async (controller: InvoiceController) => controller.run(async s => s.calculating = '');
+
 /** 数量改变了 */
 export const onChangeQuantity = lazyFn(
   (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
@@ -55,9 +58,13 @@ export const onChangeQuantity = lazyFn(
 
       if (!values.quantity && values.quantity !== 0) {
         await controller.setEditGood({ quantity: undefined });
+        await clearCalculatingField(controller);
         return;
       }
-      if (err.quantity) return;
+      if (err.quantity) {
+        await clearCalculatingField(controller);
+        return
+      };
 
       const calculatingDigits = controller.state.calculatingDigits;
       const quantity = format15(values.quantity, calculatingDigits);
@@ -104,7 +111,7 @@ export const onChangeQuantity = lazyFn(
       }
 
       // 清楚 计算中启动字段
-      controller.run(async s => s.calculating = '')
+      await clearCalculatingField(controller);
     });
   },
   1000,
@@ -118,9 +125,13 @@ export const onChangePriceIncludeTax = lazyFn(
 
       if (!values.priceIncludeTax && values.priceIncludeTax !== 0) {
         await controller.setEditGood({ priceIncludeTax: undefined, priceExcludeTax: undefined });
+        await clearCalculatingField(controller);
+        return;
+      }
+      if (err.priceIncludeTax) {
+        await clearCalculatingField(controller);
         return;
       }
-      if (err.priceIncludeTax) return;
 
       const calculatingDigits = controller.state.calculatingDigits;
       const priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
@@ -144,7 +155,7 @@ export const onChangePriceIncludeTax = lazyFn(
       updateUnitPriceExcludingTax(controller, form, record);
 
       // 清楚 计算中启动字段
-      controller.run(async s => s.calculating = '')
+      await clearCalculatingField(controller);
     });
   },
   1000,
@@ -158,9 +169,13 @@ export const onChangePriceExcludeTax = lazyFn(
 
       if (!values.priceExcludeTax && values.priceExcludeTax !== 0) {
         await controller.setEditGood({ priceIncludeTax: undefined, priceExcludeTax: undefined });
+        await clearCalculatingField(controller);
+        return;
+      }
+      if (err.priceExcludeTax) {
+        await clearCalculatingField(controller);
         return;
       }
-      if (err.priceExcludeTax) return;
 
       const calculatingDigits = controller.state.calculatingDigits;
       const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
@@ -187,7 +202,7 @@ export const onChangePriceExcludeTax = lazyFn(
       updateUnitPriceTax(controller, form, record);
 
       // 清楚 计算中启动字段
-      controller.run(async s => s.calculating = '')
+      await clearCalculatingField(controller);
     });
   },
   1000,
@@ -203,6 +218,7 @@ export const onChangeLineAmountIncludeTax = lazyFn(
         // 更新不含税
         await controller.setEditGood({ lineAmountIncludeTax: undefined, lineAmountExcludeTax: undefined });
         updateUnitPriceExcludingTax(controller, form, record);
+        await clearCalculatingField(controller);
         return;
       }
 
@@ -228,7 +244,7 @@ export const onChangeLineAmountIncludeTax = lazyFn(
       updateUnitPriceExcludingTax(controller, form, record);
 
       // 清楚 计算中启动字段
-      controller.run(async s => s.calculating = '')
+      await clearCalculatingField(controller);
     });
   },
   1000,
@@ -243,6 +259,7 @@ export const onChangeLineAmountExcludeTax = lazyFn(
         // 更新含税
         await controller.setEditGood({ lineAmountIncludeTax: undefined, lineAmountExcludeTax: undefined });
         updateUnitPriceTax(controller, form, record);
+        await clearCalculatingField(controller);
         return;
       }
       const calculatingDigits = controller.state.calculatingDigits;
@@ -267,7 +284,7 @@ export const onChangeLineAmountExcludeTax = lazyFn(
       updateUnitPriceTax(controller, form, record);
 
       // 清楚 计算中启动字段
-      controller.run(async s => s.calculating = '')
+      await clearCalculatingField(controller);
     });
   },
   1000,
@@ -304,7 +321,7 @@ export const onChangeTaxRate = lazyFn(
       }
 
       // 清楚 计算中启动字段
-      controller.run(async s => s.calculating = '')
+      await clearCalculatingField(controller);
     });
   },
   1000,

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

@@ -55,6 +55,13 @@ export default (form: WrappedFormUtils) => {
   /** 计算中启动字段 */
   const setChangeField = React.useCallback((value: string) => controller.run(async s => { s.calculating = value }), []);
 
+  const onNumberValueChange = React.useCallback((e) => {
+    const value = e?.target?.value;
+        if (value) {
+            return value.replace(/[^0-9-\.]/g, '');
+        }
+  }, [])
+
   /** 获取补充校验规则 */
   const getReplenishRules = React.useCallback((id: string) => {
     return columnsReplenish[id] ? columnsReplenish[id].rules || [] : []
@@ -207,6 +214,7 @@ export default (form: WrappedFormUtils) => {
               <Form.Item>
                 {getFieldDecorator('quantity', {
                   initialValue: editGood.quantity,
+                  getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('quantity'),
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '数量必须为数字' },
@@ -250,6 +258,7 @@ export default (form: WrappedFormUtils) => {
               <Form.Item>
                 {getFieldDecorator('priceIncludeTax', {
                   initialValue: editGood.priceIncludeTax,
+                  getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('priceIncludeTax'),
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
@@ -293,6 +302,7 @@ export default (form: WrappedFormUtils) => {
               <Form.Item>
                 {getFieldDecorator('priceExcludeTax', {
                   initialValue: editGood.priceExcludeTax,
+                  getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('priceExcludeTax'),
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
@@ -336,6 +346,7 @@ export default (form: WrappedFormUtils) => {
               <Form.Item>
                 {getFieldDecorator('lineAmountIncludeTax', {
                   initialValue: editGood.lineAmountIncludeTax,
+                  getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('lineAmountIncludeTax'),
                     { required: true, message: '金额不能为空' },
@@ -384,6 +395,7 @@ export default (form: WrappedFormUtils) => {
               <Form.Item>
                 {getFieldDecorator('lineAmountExcludeTax', {
                   initialValue: editGood.lineAmountExcludeTax,
+                  getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('lineAmountExcludeTax'),
                     { required: true, message: '金额不能为空' },