kts-component-invoice-operate 3.2.196 → 3.2.198

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.196",
+  "version": "3.2.198",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

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

@@ -11,7 +11,9 @@ export default () => {
 
     React.useEffect(() => {
         controller.run(async s=>{
-            s.stakeholder.enables = ['taxAmount']
+            s.stakeholder.enables = ['taxAmount'];
+            s.priceIntegerDigit = 25;
+            s.calculatingDigits=25;
         })
     }, [controller])
     return (

package/src/Invoice/index.tsx

@@ -26,6 +26,13 @@ import ImportBuyerDrawer from './ui/default/ImportBuyerDrawer';
 import ImportGoodsDrawer from './ui/default/ImportGoodsDrawer';
 import EndowCodeDrawer from './ui/default/EndowCodeDrawer';
 import AddComparisonDrawer from './ui/default/AddComparisonDrawer';
+import { create, all } from 'mathjs';
+const config = {
+  number: 'BigNumber',
+  precision: 64,
+}
+create(all, config);
+
 
 /** 发票组件的上下文 */
 export const InvoiceContext = React.createContext<InvoiceController>(
@@ -97,7 +104,7 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
 
   /** 特殊信息-不动产经营租赁服务(数电) */
   static readonly RealEstateInfo = RealEstateInfo;
-  
+
   /** 特殊信息-建筑服务(数电) */
   static readonly Architecture = Architecture;
 

package/src/Invoice/ui/digtal/FreightList/ui/AddRowButton/index.tsx

@@ -20,8 +20,8 @@ export default () => {
   const goodMax = controller.useMemo(s => s.freightListState.goodMax, []);
 
   /** 按钮是否禁用 */
-  const disabled = React.useMemo(() =>{
-    return  typeof goodMax === 'number' ? goodsNum >= goodMax : false
+  const disabled = React.useMemo(() => {
+    return typeof goodMax === 'number' ? goodsNum >= goodMax : false
   }, [goodMax, goodsNum])
 
   const onClick = React.useCallback(async () => {
@@ -46,11 +46,21 @@ async function addGood(controller: InvoiceController) {
   await controller.wait();
   await controller.run(async (s) => {
     if (s.freightListState.editGood) {
-      message.error({
-        content: '你正在编辑一个货物运输行',
-        key: '你正在编辑一个货物运输行',
+      // message.error({
+      //   content: '你正在编辑一个货物运输行',
+      //   key: '你正在编辑一个货物运输行',
+      // });
+      // return;
+      await controller.state.goodsListState.form?.validateFields(async (err: any, values: any) => {
+        if (err) {
+          const firstError: any = Object.values(err)[0];
+          message.error({
+            content: firstError.errors[0].message,
+            key: '你正在编辑一个货物',
+          });
+          return;
+        }
       });
-      return;
     }
     s.freightListState.editGood = await controller.addFreight({});
   });

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

@@ -67,7 +67,7 @@ export const onChangeQuantity = lazyFn(
       };
 
       const calculatingDigits = controller.state.calculatingDigits;
-      const quantity = format15(values.quantity, calculatingDigits);
+      const quantity = values.quantity;
       await controller.setEditGood({ quantity });
       form.setFieldsValue({ quantity });
 
@@ -76,16 +76,16 @@ export const onChangeQuantity = lazyFn(
         // 含税
         if (!err.priceIncludeTax && values.priceIncludeTax) {
           // 可以找到 单价(含税)
-          const priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
+          const priceIncludeTax = values.priceIncludeTax;
           const lineAmountIncludeTax = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
           form.setFieldsValue({ lineAmountIncludeTax });
           await controller.setEditGood({ lineAmountIncludeTax });
         } else if (!err.lineAmountIncludeTax && values.lineAmountIncludeTax) {
           // 可以找到 金额(含税)
           const lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
-          const priceIncludeTax = format15(
-            evaluate(`${lineAmountIncludeTax} / ${quantity}`),
-            calculatingDigits);
+          const priceIncludeTax = 
+            evaluate(`${lineAmountIncludeTax} / ${quantity}`)
+            ;
           form.setFieldsValue({ priceIncludeTax });
           await controller.setEditGood({ priceIncludeTax });
         }
@@ -96,14 +96,14 @@ export const onChangeQuantity = lazyFn(
         // 不含税
         if (!err.priceExcludeTax && values.priceExcludeTax) {
           // 可以找到 单价(不含税)
-          const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
+          const priceExcludeTax = values.priceExcludeTax;
           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);
+          const priceExcludeTax = evaluate(`${lineAmountExcludeTax} / ${quantity}`);
           form.setFieldsValue({ priceExcludeTax });
           await controller.setEditGood({ priceExcludeTax, quantity });
         }
@@ -136,19 +136,19 @@ export const onChangePriceIncludeTax = lazyFn(
       }
 
       const calculatingDigits = controller.state.calculatingDigits;
-      const priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
+      const priceIncludeTax = values.priceIncludeTax;
       await controller.setEditGood({ priceIncludeTax });
       form.setFieldsValue({ priceIncludeTax });
 
       // 是否有数量
       if (!err.quantity && values.quantity) {
-        const quantity = format15(values.quantity, calculatingDigits);
+        const quantity = values.quantity;
         const lineAmountIncludeTax = format2(evaluate(`${quantity} * ${priceIncludeTax}`));
         form.setFieldsValue({ lineAmountIncludeTax });
         await controller.setEditGood({ lineAmountIncludeTax });
       } else if (!err.lineAmountIncludeTax && values.lineAmountIncludeTax) {
         const lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
-        const quantity = format15(evaluate(`${lineAmountIncludeTax} / ${priceIncludeTax}`), calculatingDigits);
+        const quantity = evaluate(`${lineAmountIncludeTax} / ${priceIncludeTax}`);
         form.setFieldsValue({ quantity });
         await controller.setEditGood({ quantity });
       }
@@ -180,22 +180,22 @@ export const onChangePriceExcludeTax = lazyFn(
       }
 
       const calculatingDigits = controller.state.calculatingDigits;
-      const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
+      const priceExcludeTax = values.priceExcludeTax;
       await controller.setEditGood({ priceExcludeTax });
       form.setFieldsValue({ priceExcludeTax });
 
       // 是否有数量
       if (!err.quantity && values.quantity) {
-        const quantity = format15(values.quantity, calculatingDigits);
+        const quantity = values.quantity;
         const lineAmountExcludeTax = format2(evaluate(`${quantity} * ${priceExcludeTax}`));
         form.setFieldsValue({ lineAmountExcludeTax });
         await controller.setEditGood({ lineAmountExcludeTax });
       } else if (!err.lineAmountExcludeTax && values.lineAmountExcludeTax) {
         const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
-        const quantity = format15(
-          evaluate(`${lineAmountExcludeTax} / ${priceExcludeTax}`),
-          calculatingDigits
-        );
+        const quantity = 
+          evaluate(`${lineAmountExcludeTax} / ${priceExcludeTax}`)
+          
+        ;
         form.setFieldsValue({ quantity });
         await controller.setEditGood({ quantity });
       }
@@ -365,7 +365,7 @@ export const onChangeTaxAmount = lazyFn(
       form.setFieldsValue({ lineAmountExcludeTax });
 
       const priceExcludeTax: any = countPrice(lineAmountExcludeTax || '', record?.quantity || '', controller.state.calculatingDigits);
-     
+
       await controller.setEditGood({ lineAmountExcludeTax, taxAmount: values.taxAmount, priceExcludeTax });
       form.setFieldsValue({ priceExcludeTax });
 
@@ -587,12 +587,22 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
 
   await controller.run(async s => {
     if (s.goodsListState.editGood) {
-      message.error({
-        content: '你正在编辑一个货物',
-        key: '你正在编辑一个货物',
+      // message.error({
+      //   content: '你正在编辑一个货物',
+      //   key: '你正在编辑一个货物',
+      // });
+
+      // return;
+      await controller.state.goodsListState.form?.validateFields(async (err: any, values: any) => {
+        if (err) {
+          const firstError: any = Object.values(err)[0];
+          message.error({
+            content: firstError.errors[0].message,
+            key: '你正在编辑一个货物',
+          });
+          return;
+        }
       });
-
-      return;
     }
 
     s.goodsListState.isTaxIncluded = isTaxIncluded;

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

@@ -381,7 +381,7 @@ export default (form: WrappedFormUtils) => {
                   rules: [
                     ...getReplenishRules('lineAmountIncludeTax'),
                     { required: true, message: '金额不能为空' },
-                    { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额必须为数字' },
+                    { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额错误，请重新输入' },
                     {
                       validator: async (_, value, callback) => {
                         if (`${value}`.split('.')[0].length > priceIntegerDigit) {
@@ -400,6 +400,7 @@ export default (form: WrappedFormUtils) => {
                 })(
                   <MyInput
                     style={{ textAlign: 'right' }}
+                    max={99999999999999999999}
                     loading={isCipher(changeField, 'lineAmountIncludeTax')}
                     onChange={() => {
                       setChangeField('lineAmountIncludeTax');
@@ -430,7 +431,7 @@ export default (form: WrappedFormUtils) => {
                   rules: [
                     ...getReplenishRules('lineAmountExcludeTax'),
                     { required: true, message: '金额不能为空' },
-                    { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额必须为数字' },
+                    { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额错误，请重新输入' },
                     {
                       validator: async (_, value: string, callback) => {
                         if (`${value}`.split('.')[0].length > priceIntegerDigit) {

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

@@ -23,8 +23,8 @@ export default () => {
   const goodMax = controller.useMemo(s => s.goodsListState.goodMax, []);
 
   /** 按钮是否禁用 */
-  const disabled = React.useMemo(() =>{
-    return  typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue
+  const disabled = React.useMemo(() => {
+    return typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue
   }, [goodMax, goodsNum, searchValue])
 
   const onClick = React.useCallback(async () => {
@@ -49,11 +49,21 @@ async function addGood(controller: InvoiceController) {
   await controller.wait();
   await controller.run(async (s) => {
     if (s.goodsListState.editGood) {
-      message.error({
-        content: '你正在编辑一个货物',
-        key: '你正在编辑一个货物',
+      // message.error({
+      //   content: '你正在编辑一个货物',
+      //   key: '你正在编辑一个货物',
+      // });
+      // return;
+      await controller.state.goodsListState.form?.validateFields(async (err: any, values: any) => {
+        if (err) {
+          const firstError: any = Object.values(err)[0];
+          message.error({
+            content: firstError.errors[0].message,
+            key: '你正在编辑一个货物',
+          });
+          return;
+        }
       });
-      return;
     }
     s.goodsListState.editGood = await controller.addGood({ taxRate: s.goodsListState.defaultRate, lineAttribute: LineAttributeType.正常 });
   });

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

@@ -21,11 +21,21 @@ export default function Search() {
         await controller.saveEditGood();
         await controller.wait();
         if (controller.state.goodsListState.editGood) {
-            message.error({
-                content: '你正在编辑一个货物',
-                key: '你正在编辑一个货物',
+            // message.error({
+            //     content: '你正在编辑一个货物',
+            //     key: '你正在编辑一个货物',
+            // });
+            // return;
+            await controller.state.goodsListState.form?.validateFields(async (err: any, values: any) => {
+                if (err) {
+                    const firstError: any = Object.values(err)[0];
+                    message.error({
+                        content: firstError.errors[0].message,
+                        key: '你正在编辑一个货物',
+                    });
+                    return;
+                }
             });
-            return;
         }
     }, [])