kts-component-invoice-operate 3.2.121 → 3.2.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.121",
+  "version": "3.2.123",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

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

@@ -11,6 +11,18 @@ export default () => {
   // 初始化控制器
   const controller = React.useMemo(() => new MyInvoiceController(), []);
 
+  React.useEffect(() => {
+    controller.run(async s => {
+      // 设置数量单价计算小数位
+      s.calculatingDigits = 13;
+      
+      // 设置数量金额计算小数位
+      s.priceIntegerDigit = 14;
+
+      s.goodsListState.isRecalculateWhenSwitchTax = true;
+    })
+  }, [controller])
+
   return (
     <>
       <Button style={{ marginBottom: 10 }} onClick={async () => { console.log('===> 当前组件状态', await controller.validateFields()); }} >获取数据</Button>

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

@@ -18,6 +18,9 @@ export default class GoodsListState {
   /** 是否可以切换(含税/不含税)状态 */
   isSwitchTax?: boolean;
 
+  /** 切换含税时是否重新计算 */
+  isRecalculateWhenSwitchTax = false;
+
   /** 是否能添加折扣行 */
   isAddDiscount?: boolean;
 
@@ -110,4 +113,5 @@ export default class GoodsListState {
 
   /** 商品拖拽数据 */
   drag = new Drag();
+
 }

package/src/Invoice/ui/default/EndowCodeDrawer/index.tsx

@@ -6,7 +6,7 @@ import { Input, NumberPicker } from '@formily/antd-components';
 import { format15 } from '../GoodsList/hook/useColumns/autoFillFn';
 import { LineAttributeType } from '../../../InvoiceController';
 import IGood from '../../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
-import { countTaxAmount } from '../../../tools/calculate';
+import { countTaxAmount, countAmountExcludeTax, countPrice } from '../../../tools/calculate';
 import { bytesLnegth, cutStr } from '../../../tools/strringFn';
 import {
   SchemaForm,
@@ -428,16 +428,15 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
         good.favouredPolicyMark = values.favouredPolicyMark;
         good.favouredPolicyName = values.favouredPolicyName;
 
-        const taxRate = chain(bignumber(values.taxRate)).dotDivide(bignumber(100)).add(bignumber(1)).done();
-
-        // 是否含税
-        const lineAmountExcludeTax = chain(bignumber(good.lineAmountIncludeTax)).dotDivide(taxRate).done();
-        const priceExcludeTax = good.priceIncludeTax ? chain(bignumber(good.priceIncludeTax)).dotDivide(taxRate).done() : undefined
-
-        good.lineAmountExcludeTax = lineAmountExcludeTax.toNumber().toFixed(2);
-        good.priceExcludeTax = (priceExcludeTax ? format15(priceExcludeTax.toNumber(), s.calculatingDigits) : undefined) || undefined;
-
+        // 无论是否含税，都保持价税合计不变
         good.taxAmount = countTaxAmount(good.lineAmountIncludeTax || 0, s.goodsListState.deduction, values.taxRate);
+        if (good.taxAmount || good.taxAmount === 0 ) {
+          good.lineAmountExcludeTax = countAmountExcludeTax(good.lineAmountIncludeTax || 0, good.taxAmount); 
+        }
+        if (good.lineAmountExcludeTax && good.quantity) {
+          good.priceExcludeTax = countPrice(good.lineAmountExcludeTax, good.quantity, controller.state.calculatingDigits) as any;
+        }
+
       });
 
       s.goodsListState.goodsList = s.goodsListState.goodsList.slice();

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

@@ -10,6 +10,7 @@ import evaluate from '../../../../../../tools/evaluate';
 import { message } from 'kts-components-antd-x3'
 import { format2, format15, countTaxAmount, countAmountExcludeTax, countPrice } from '../../../../../../tools/calculate';
 import moment from 'moment';
+import { equal } from 'mathjs';
 
 export { format2, format15 } from '../../../../../../tools/calculate';
 
@@ -531,3 +532,101 @@ export const onChangeItemCode = async (controller: InvoiceController, form: Wrap
     }
   })
 }
+
+/** 修改了含税开关 重新计算 */
+export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncluded: boolean) => {
+  if (!controller.state.goodsListState.isRecalculateWhenSwitchTax) {
+    controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded } })();
+    return
+  }
+  const calculatingDigits = controller.state.calculatingDigits;
+
+  await controller.saveEditGood();
+  await controller.wait();
+
+  await controller.run(async s => {
+    if (s.goodsListState.editGood) {
+      message.error({
+        content: '你正在编辑一个货物',
+        key: '你正在编辑一个货物',
+      });
+
+      return ;
+    }
+
+    s.goodsListState.isTaxIncluded = isTaxIncluded;
+
+    try {
+      let needRefresh = false;
+
+      if (s.goodsListState?.goodsList && s.goodsListState.goodsList.length) {
+        const newGoodsList = s.goodsListState.goodsList.map(good => {
+          const {
+            quantity: sourceQuantity,
+            priceExcludeTax: sourcePriceExcludeTax,
+            priceIncludeTax: sourcePriceIncludeTax,
+            lineAmountExcludeTax: sourceLineAmountExcludeTax,
+            lineAmountIncludeTax: sourceLineAmountIncludeTax,
+            taxRate } = good;
+          if (isTaxIncluded) {
+            if (!sourceQuantity && sourceQuantity !== 0) return good;
+            if (!sourcePriceIncludeTax && sourcePriceIncludeTax !== 0) return good;
+            if (!taxRate && taxRate !== 0) return good;
+            if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
+              return good
+            } else {
+              needRefresh = true;
+            }
+            const quantity: any = format15(sourceQuantity, calculatingDigits);
+            const priceIncludeTax: any = format15(sourcePriceIncludeTax, calculatingDigits);
+
+            const lineAmountIncludeTax: any = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
+            const taxAmount: any = countTaxAmount(lineAmountIncludeTax, controller.state.goodsListState.deduction, taxRate as any);
+            const lineAmountExcludeTax: any = countAmountExcludeTax(lineAmountIncludeTax, taxAmount);
+            const priceExcludeTax: any = countPrice(lineAmountExcludeTax, quantity, controller.state.calculatingDigits);
+
+            return {
+              ...good,
+              lineAmountExcludeTax,
+              lineAmountIncludeTax,
+              taxAmount,
+              priceExcludeTax
+            }
+
+          } else {
+            if (!sourceQuantity && sourceQuantity !== 0) return good;
+            if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
+            if (!taxRate && taxRate !== 0) return good;
+            if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
+              return good
+            } else {
+              needRefresh = true;
+            }
+            const quantity: any = format15(sourceQuantity, calculatingDigits);
+            const priceExcludeTax: any = format15(sourcePriceExcludeTax, calculatingDigits);
+
+            const lineAmountExcludeTax: any = format2(evaluate(`${priceExcludeTax} * ${quantity}`));
+            const lineAmountIncludeTax: any = format2(evaluate(`${lineAmountExcludeTax} * (1+(${taxRate}/100))`));
+            const priceIncludeTax: any = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), calculatingDigits);
+            const taxAmount: any = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+
+            return {
+              ...good,
+              lineAmountExcludeTax,
+              lineAmountIncludeTax,
+              taxAmount,
+              priceIncludeTax
+            }
+          }
+
+        })
+
+        if (needRefresh) {
+          s.goodsListState.goodsList = newGoodsList;
+        }
+      }
+    } catch(e) {
+      console.error('切换税率重新计算出错', e, s.goodsListState)
+    }
+  })
+}

package/src/Invoice/ui/default/GoodsList/ui/TaxIncludedSwitch/index.tsx

@@ -2,6 +2,7 @@
 import React from 'react';
 import { Switch } from 'kts-xui';
 import Invoice from '../../../../..';
+import { onChangeSwitchTax } from '../../hook/useColumns/autoFillFn';
 
 export default () => {
 
@@ -14,7 +15,7 @@ export default () => {
     const isSwitchTax = controller.useMemo(e => e.goodsListState.isSwitchTax, []);
 
     const onChange = React.useCallback(e => {
-        controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded: e } })();
+        onChangeSwitchTax(controller, e)
     }, [])
 
     return (

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

@@ -10,6 +10,7 @@ import evaluate from '../../../../../../tools/evaluate';
 import { message } from 'kts-components-antd-x3'
 import { format2, format15, countTaxAmount, countAmountExcludeTax, countPrice } from '../../../../../../tools/calculate';
 import moment from 'moment';
+import { equal } from 'mathjs';
 
 export { format2, format15 } from '../../../../../../tools/calculate';
 
@@ -94,11 +95,13 @@ export const onChangeQuantity = lazyFn(
       } else {
         // 不含税
         if (!err.priceExcludeTax && values.priceExcludeTax) {
+          // 可以找到 单价(不含税)
           const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
           const lineAmountExcludeTax = format2(evaluate(`${quantity} * ${priceExcludeTax}`));
           form.setFieldsValue({ lineAmountExcludeTax });
           await controller.setEditGood({ lineAmountExcludeTax, quantity });
         } else if (!err.lineAmountExcludeTax && values.lineAmountExcludeTax) {
+          // 可以找到 金额(不含税)
           const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
           const priceExcludeTax = format15(evaluate(`${lineAmountExcludeTax} / ${quantity}`), calculatingDigits);
           form.setFieldsValue({ priceExcludeTax });
@@ -358,6 +361,7 @@ export function dutyFree(controller: InvoiceController, taxRate: number, form: W
 export const updateUnitPriceExcludingTax = async (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
   return new Promise((resolve) => {
     form.validateFields(async (err, values) => {
+      console.log('含税 => 更新(不含税')
 
       err = err || {};
 
@@ -403,6 +407,8 @@ export const updateUnitPriceExcludingTax = async (controller: InvoiceController,
 export const updateUnitPriceTax = async (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
   return new Promise((resolve) => {
     form.validateFields(async (err, values) => {
+      console.log('不含税 => 更新(含税)')
+
       err = err || {};
 
       if (
@@ -517,4 +523,102 @@ export const onChangeItemName = async (controller: InvoiceController, form: Wrap
       record.itemNameSelf && await controller.setEditGood({ itemNameSelf: record.itemNameSelf });
     }
   })
-}
+}
+
+/** 修改了含税开关 重新计算 */
+export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncluded: boolean) => {
+  if (!controller.state.goodsListState.isRecalculateWhenSwitchTax) {
+    controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded } })();
+    return
+  }
+  const calculatingDigits = controller.state.calculatingDigits;
+
+  await controller.saveEditGood();
+  await controller.wait();
+
+  await controller.run(async s => {
+    if (s.goodsListState.editGood) {
+      message.error({
+        content: '你正在编辑一个货物',
+        key: '你正在编辑一个货物',
+      });
+
+      return ;
+    }
+
+    s.goodsListState.isTaxIncluded = isTaxIncluded;
+
+    try {
+      let needRefresh = false;
+
+      if (s.goodsListState?.goodsList && s.goodsListState.goodsList.length) {
+        const newGoodsList = s.goodsListState.goodsList.map(good => {
+          const {
+            quantity: sourceQuantity,
+            priceExcludeTax: sourcePriceExcludeTax,
+            priceIncludeTax: sourcePriceIncludeTax,
+            lineAmountExcludeTax: sourceLineAmountExcludeTax,
+            lineAmountIncludeTax: sourceLineAmountIncludeTax,
+            taxRate } = good;
+          if (isTaxIncluded) {
+            if (!sourceQuantity && sourceQuantity !== 0) return good;
+            if (!sourcePriceIncludeTax && sourcePriceIncludeTax !== 0) return good;
+            if (!taxRate && taxRate !== 0) return good;
+            if (sourcePriceExcludeTax && sourceLineAmountExcludeTax && equal(countPrice(sourceLineAmountExcludeTax, sourceQuantity) || 0, sourcePriceExcludeTax)) {
+              return good
+            } else {
+              needRefresh = true;
+            }
+            const quantity: any = format15(sourceQuantity, calculatingDigits);
+            const priceIncludeTax: any = format15(sourcePriceIncludeTax, calculatingDigits);
+
+            const lineAmountIncludeTax: any = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
+            const taxAmount: any = countTaxAmount(lineAmountIncludeTax, controller.state.goodsListState.deduction, taxRate as any);
+            const lineAmountExcludeTax: any = countAmountExcludeTax(lineAmountIncludeTax, taxAmount);
+            const priceExcludeTax: any = countPrice(lineAmountExcludeTax, quantity, controller.state.calculatingDigits);
+
+            return {
+              ...good,
+              lineAmountExcludeTax,
+              lineAmountIncludeTax,
+              taxAmount,
+              priceExcludeTax
+            }
+
+          } else {
+            if (!sourceQuantity && sourceQuantity !== 0) return good;
+            if (!sourcePriceExcludeTax && sourcePriceExcludeTax !== 0) return good;
+            if (!taxRate && taxRate !== 0) return good;
+            if (sourcePriceIncludeTax && sourceLineAmountIncludeTax && equal(countPrice(sourceLineAmountIncludeTax, sourceQuantity) || 0, sourcePriceIncludeTax)) {
+              return good
+            } else {
+              needRefresh = true;
+            }
+            const quantity: any = format15(sourceQuantity, calculatingDigits);
+            const priceExcludeTax: any = format15(sourcePriceExcludeTax, calculatingDigits);
+
+            const lineAmountExcludeTax: any = format2(evaluate(`${priceExcludeTax} * ${quantity}`));
+            const lineAmountIncludeTax: any = format2(evaluate(`${lineAmountExcludeTax} * (1+(${taxRate}/100))`));
+            const priceIncludeTax: any = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), calculatingDigits);
+            const taxAmount: any = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+
+            return {
+              ...good,
+              lineAmountExcludeTax,
+              lineAmountIncludeTax,
+              taxAmount,
+              priceIncludeTax
+            }
+          }
+
+        })
+
+        if (needRefresh) {
+          s.goodsListState.goodsList = newGoodsList;
+        }
+      }
+    } catch(e) {
+      console.error('切换税率重新计算出错', e, s.goodsListState)
+    }
+  })
+}

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

@@ -64,8 +64,6 @@ export default function ItemNameInput(props: {
         }
     }, [autoComplete.onItemNameSearch])
 
-    console.log('===> options', options);
-
     return (
         <div className='kts-invoice-operate-goods-list-itemName-input'>
             {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}

package/src/Invoice/ui/digtal/GoodsList/ui/TaxIncludedSwitch/index.tsx

@@ -2,6 +2,7 @@
 import React from 'react';
 import { Switch } from 'kts-xui';
 import Invoice from '../../../../..';
+import { onChangeSwitchTax } from '../../hook/useColumns/autoFillFn';
 
 export default () => {
 
@@ -13,8 +14,8 @@ export default () => {
     /** 是否可以切换(含税/不含税)状态 */
     const isSwitchTax = controller.useMemo(e => e.goodsListState.isSwitchTax, []);
 
-    const onChange = React.useCallback(e => {
-        controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded: e } })();
+    const onChange = React.useCallback(async e => {
+        onChangeSwitchTax(controller, e);
     }, [])
 
     return (

package/src/Invoice/ui/digtal/Sign/index.tsx

@@ -56,7 +56,7 @@ export default decorator<IBuyerProps, IBuyerProps & FormComponentProps>(Form.cre
                         })(
                             isEnables('remarks')
                                 ? <Input.TextArea placeholder='请输入' style={{ height: '100%' }} />
-                                : <MyDiv style={{whiteSpace: 'pre'}} />
+                                : <MyDiv style={{whiteSpace: 'pre-wrap'}} />
                         )}
                     </div>
                 </div>