kts-component-invoice-operate 3.1.13 → 3.1.15

package/package.json

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

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

@@ -64,6 +64,9 @@ export default interface IGood {
   /** 税收分类编码 */
   taxClassificationCode?: string;
 
+  /** 商品和服务分类简称 */
+  shorthand?: string;
+
   /** 是否享受优惠政策 */
   favouredPolicyMark?: number;
 

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

@@ -35,7 +35,7 @@ export default class InvoiceControllerState {
   goodsListState = new GoodsListState();
 
   /** 计算中启动字段 */
-  calculating?: string;
+  calculatingField?: string;
 
   /** 数量，单价计算时保留的小数位,不传默认8位 */
   calculatingDigits?: number;

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 || state.calculating) return;
+  if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
   if ((await validateFields(form)).err) return;
 
   state.goodsListState.goodsList = state.goodsListState.goodsList.map((e) =>

package/src/Invoice/tools/itemName/index.ts

@@ -44,4 +44,13 @@ export const setShorthand = (name?:string, shorthand?:string) => {
     if(!sn) return undefined;
     sn.shorthand = shorthand || '';
     return getItemName(sn);
+}
+
+/** 组合全称加简称 */
+export const getItemNameWithShorthand = (value: ISN) => {
+    if (value.shorthand) {
+        return `*${value.shorthand}*${value.full}`;
+    } else {
+        return value.full;
+    }
 }

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

@@ -8,7 +8,6 @@ import { LineAttributeType } from '../../InvoiceController';
 import IGood from '../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
 import { countTaxAmount } from '../../tools/calculate';
 import { bytesLnegth, cutStr } from '../../tools/strringFn';
-import { setShorthand } from '../../tools/itemName';
 import {
   SchemaForm,
   FormButtonGroup,
@@ -302,9 +301,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       endowCodeGood.forEach(good => {
         if (!good) return;
 
-        good.itemName = setShorthand(good.itemName, values.shorthand);
-        good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand);
-        
+        good.shorthand = values.shorthand;
         good.taxClassificationCode = values.taxClassificationCode;
         good.taxRate = values.taxRate;
         good.taxFreeType = values.taxFreeType;
@@ -354,7 +351,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   }, [controller]);
 
   return (
-    <SchemaForm actions={actions} components={{ ...components, showSearch: !!controller.state.goodsListState.endowCode.getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch }} effects={effects}>
+    <SchemaForm actions={actions} previewPlaceholder=" "  components={{ ...components, showSearch: !!controller.state.goodsListState.endowCode.getTaxCategoryCodeTree ? ShowSearch2 : ShowSearch }} effects={effects}>
       <FormButtonGroup>
         <Field
           name="taxClassificationCode"
@@ -368,7 +365,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
           name="shorthand"
           type="string"
           readOnly
-          default={getShorthand(defaultValue?.itemName)}
+          default={defaultValue?.shorthand}
           title="商品和服务分类简称"
         />
         <Field
@@ -432,14 +429,3 @@ const components = {
   string: Input,
   number: NumberPicker,
 };
-
-/** 提取简称 */
-const getShorthand = (value?: string) => {
-  if (!value) return ' ';
-  const arr = value.match(/\*[^*]+\*/);
-  if (arr) {
-    return arr[0].split('*')[1];
-  } else {
-    return ' ';
-  }
-};

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

@@ -7,7 +7,6 @@
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import InvoiceController, { IGood, LineAttributeType } from '../../../../../InvoiceController';
 import evaluate from '../../../../../tools/evaluate';
-import { getSN, setShorthand } from '../../../../../tools/itemName';
 import { message } from 'kts-components-antd-x3'
 import { format2, format15, countTaxAmount, countAmountExcludeTax, countPrice } from '../../../../../tools/calculate';
 import moment from 'moment';
@@ -48,7 +47,7 @@ const promptErr = (err: any) => {
 }
 
 /** 清除计算中启动字段 */
-export const clearCalculatingField = async (controller: InvoiceController) => controller.run(async s => s.calculating = '');
+export const clearCalculatingField = async (controller: InvoiceController) => controller.run(async s => s.calculatingField = '');
 
 /** 数量改变了 */
 export const onChangeQuantity = lazyFn(
@@ -91,7 +90,7 @@ export const onChangeQuantity = lazyFn(
         }
 
         // 更新不含税
-        updateUnitPriceExcludingTax(controller, form, record);
+        await updateUnitPriceExcludingTax(controller, form, record);
       } else {
         // 不含税
         if (!err.priceExcludeTax && values.priceExcludeTax) {
@@ -107,7 +106,7 @@ export const onChangeQuantity = lazyFn(
         }
 
         // 更新含税
-        updateUnitPriceTax(controller, form, record);
+        await updateUnitPriceTax(controller, form, record);
       }
 
       // 清楚 计算中启动字段
@@ -152,7 +151,7 @@ export const onChangePriceIncludeTax = lazyFn(
       }
 
       // 更新不含税
-      updateUnitPriceExcludingTax(controller, form, record);
+      await updateUnitPriceExcludingTax(controller, form, record);
 
       // 清楚 计算中启动字段
       await clearCalculatingField(controller);
@@ -199,7 +198,7 @@ export const onChangePriceExcludeTax = lazyFn(
       }
 
       // 更新含税
-      updateUnitPriceTax(controller, form, record);
+      await updateUnitPriceTax(controller, form, record);
 
       // 清楚 计算中启动字段
       await clearCalculatingField(controller);
@@ -217,7 +216,7 @@ export const onChangeLineAmountIncludeTax = lazyFn(
       if (promptErr(err.lineAmountIncludeTax) || !values.lineAmountIncludeTax) {
         // 更新不含税
         await controller.setEditGood({ lineAmountIncludeTax: undefined, lineAmountExcludeTax: undefined });
-        updateUnitPriceExcludingTax(controller, form, record);
+        await updateUnitPriceExcludingTax(controller, form, record);
         await clearCalculatingField(controller);
         return;
       }
@@ -241,7 +240,7 @@ export const onChangeLineAmountIncludeTax = lazyFn(
       }
 
       // 更新不含税
-      updateUnitPriceExcludingTax(controller, form, record);
+      await updateUnitPriceExcludingTax(controller, form, record);
 
       // 清楚 计算中启动字段
       await clearCalculatingField(controller);
@@ -258,7 +257,7 @@ export const onChangeLineAmountExcludeTax = lazyFn(
       if (promptErr(err.lineAmountExcludeTax) || !values.lineAmountExcludeTax) {
         // 更新含税
         await controller.setEditGood({ lineAmountIncludeTax: undefined, lineAmountExcludeTax: undefined });
-        updateUnitPriceTax(controller, form, record);
+        await updateUnitPriceTax(controller, form, record);
         await clearCalculatingField(controller);
         return;
       }
@@ -281,7 +280,7 @@ export const onChangeLineAmountExcludeTax = lazyFn(
       }
 
       // 更新含税
-      updateUnitPriceTax(controller, form, record);
+      await updateUnitPriceTax(controller, form, record);
 
       // 清楚 计算中启动字段
       await clearCalculatingField(controller);
@@ -315,9 +314,9 @@ export const onChangeTaxRate = lazyFn(
 
       // 是否含税
       if (controller.state.goodsListState.isTaxIncluded) {
-        updateUnitPriceExcludingTax(controller, form, record);
+        await updateUnitPriceExcludingTax(controller, form, record);
       } else {
-        updateUnitPriceTax(controller, form, record);
+        await updateUnitPriceTax(controller, form, record);
       }
 
       // 清楚 计算中启动字段
@@ -356,91 +355,98 @@ export function dutyFree(controller: InvoiceController, taxRate: number, form: W
 }
 
 /** 含税 => 更新(不含税) */
-export const updateUnitPriceExcludingTax = (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
-  form.validateFields(async (err, values) => {
+export const updateUnitPriceExcludingTax = async (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
+  return new Promise((resolve) => {
+    form.validateFields(async (err, values) => {
 
-    err = err || {};
+      err = err || {};
 
-    /** 税额 */
-    let taxAmount;
+      /** 税额 */
+      let taxAmount;
 
-    /** 金额（不含税） */
-    let lineAmountExcludeTax;
+      /** 金额（不含税） */
+      let lineAmountExcludeTax;
 
-    /** 不含税单价 */
-    let priceExcludeTax;
+      /** 不含税单价 */
+      let priceExcludeTax;
 
-    /** 扣除额 */
-    const deduction = controller.state.goodsListState.deduction;
+      /** 扣除额 */
+      const deduction = controller.state.goodsListState.deduction;
 
-    // 计算税额
-    if (!promptErr(err.lineAmountIncludeTax) && !promptErr(err.taxRate)) {
-      taxAmount = countTaxAmount(values.lineAmountIncludeTax, deduction, values.taxRate);
-    }
-    await controller.setEditGood({ taxAmount });
+      // 计算税额
+      if (!promptErr(err.lineAmountIncludeTax) && !promptErr(err.taxRate)) {
+        taxAmount = countTaxAmount(values.lineAmountIncludeTax, deduction, values.taxRate);
+      }
+      await controller.setEditGood({ taxAmount });
 
-    // 计算 金额(不含税)
-    if ((taxAmount || taxAmount === 0) && !promptErr(err.lineAmountIncludeTax)) {
-      lineAmountExcludeTax = countAmountExcludeTax(values.lineAmountIncludeTax, taxAmount);
-    }
-    form.setFieldsValue({ lineAmountExcludeTax });
-    await controller.setEditGood({ lineAmountExcludeTax });
+      // 计算 金额(不含税)
+      if ((taxAmount || taxAmount === 0) && !promptErr(err.lineAmountIncludeTax)) {
+        lineAmountExcludeTax = countAmountExcludeTax(values.lineAmountIncludeTax, taxAmount);
+      }
+      form.setFieldsValue({ lineAmountExcludeTax });
+      await controller.setEditGood({ lineAmountExcludeTax });
 
-    // 单价(不含税)
-    if (lineAmountExcludeTax && !promptErr(err.quantity)) {
-      priceExcludeTax = countPrice(lineAmountExcludeTax, values.quantity, controller.state.calculatingDigits);
-    }
-    form.setFieldsValue({ priceExcludeTax });
-    await controller.setEditGood({ priceExcludeTax });
-  });
+      // 单价(不含税)
+      if (lineAmountExcludeTax && !promptErr(err.quantity)) {
+        priceExcludeTax = countPrice(lineAmountExcludeTax, values.quantity, controller.state.calculatingDigits);
+      }
+      form.setFieldsValue({ priceExcludeTax });
+      await controller.setEditGood({ priceExcludeTax });
+    });
+
+    resolve(undefined)
+  })
 };
 
 /** 不含税 => 更新(含税) */
-export const updateUnitPriceTax = (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
-  form.validateFields(async (err, values) => {
-    err = err || {};
+export const updateUnitPriceTax = async (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
+  return new Promise((resolve) => {
+    form.validateFields(async (err, values) => {
+      err = err || {};
 
-    if (
-      !err.taxRat &&
-      (values.taxRate || values.taxRate === 0) &&
-      !promptErr(err.lineAmountExcludeTax) &&
-      (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0)
-    ) {
+      if (
+        !err.taxRat &&
+        (values.taxRate || values.taxRate === 0) &&
+        !promptErr(err.lineAmountExcludeTax) &&
+        (values.lineAmountExcludeTax || values.lineAmountExcludeTax === 0)
+      ) {
 
-      const calculatingDigits = controller.state.calculatingDigits;
-      // 金额（含税）= 金额（不含税）* (1+ 税率)
-      const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
-      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}`), calculatingDigits);
-        await controller.setEditGood({ priceIncludeTax });
-      }
+        const calculatingDigits = controller.state.calculatingDigits;
+        // 金额（含税）= 金额（不含税）* (1+ 税率)
+        const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
+        const lineAmountIncludeTax = format2(evaluate(`${lineAmountExcludeTax} * (1+(${values.taxRate}/100))`));
+        await controller.setEditGood({ lineAmountIncludeTax });
 
-      // 税额 = 金额(含税)-金额(不含税)
-      const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
-      form.setFieldsValue({ taxAmount });
-      await controller.setEditGood({ taxAmount });
-    } else {
-      form.setFieldsValue({ taxAmount: undefined });
-      await controller.setEditGood({ taxAmount: undefined });
-    }
+        // 单价(含税) = 金额（含税） / (數量)
+        // 是否有数量
+        if (!err.quantity && values.quantity) {
+          const priceIncludeTax = format15(evaluate(`${lineAmountIncludeTax} / ${values.quantity}`), calculatingDigits);
+          await controller.setEditGood({ priceIncludeTax });
+        }
 
-    // 单价(含税) = 单价(不含税) * (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 });
-    // }
-  });
+        // 税额 = 金额(含税)-金额(不含税)
+        const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+        form.setFieldsValue({ taxAmount });
+        await controller.setEditGood({ taxAmount });
+      } else {
+        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 });
+      // }
+
+      resolve(undefined)
+    });
+  })
 };
 
 /** 保存到编辑货物 */
@@ -501,14 +507,13 @@ export const endowCode = async (controller: InvoiceController, goods: IGood) =>
 export const onChangeItemName = async (controller: InvoiceController, form: WrappedFormUtils<any>, record: IGood) => {
   controller.run(async s => {
     const value = form.getFieldsValue().itemName;
-    const shorthand = getSN(value)?.shorthand ?? '';
 
     if (s.goodsListState.isMyShow) {
       await controller.setEditGood({ itemNameSelf: value });
-      record.itemName && await controller.setEditGood({ itemName: setShorthand(record.itemName, shorthand) });
+      record.itemName && await controller.setEditGood({ itemName: record.itemName });
     } else {
       await controller.setEditGood({ itemName: value });
-      record.itemNameSelf && await controller.setEditGood({ itemNameSelf: setShorthand(record.itemNameSelf, shorthand) });
+      record.itemNameSelf && await controller.setEditGood({ itemNameSelf: record.itemNameSelf });
     }
   })
 }

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

@@ -16,6 +16,7 @@ import {
   onChangeTaxRate,
   onChangeItemName,
 } from './autoFillFn';
+import { getItemNameWithShorthand } from '../../../../tools/itemName';
 
 export default (form: WrappedFormUtils) => {
   const { getFieldDecorator, getFieldValue } = form;
@@ -50,10 +51,10 @@ export default (form: WrappedFormUtils) => {
   const deduction = controller.useMemo((e) => e.goodsListState.deduction, []);
 
   /** 计算中启动字段 */
-  const changeField = controller.useMemo((e) => e.calculating, []);
+  const changeField = controller.useMemo((e) => e.calculatingField, []);
 
   /** 计算中启动字段 */
-  const setChangeField = React.useCallback((value: string) => controller.run(async s => { s.calculating = value }), []);
+  const setChangeField = React.useCallback((value: string) => controller.run(async s => { s.calculatingField = value }), []);
 
   const onNumberValueChange = React.useCallback((e) => {
     const value = e?.target?.value;
@@ -106,6 +107,7 @@ export default (form: WrappedFormUtils) => {
                     ]
                   })(
                     <ItemNameInput
+                      shorthand={editGood.shorthand}
                       onChange={() => {
                         onChangeItemName(controller, form, record);
                       }}
@@ -128,8 +130,8 @@ export default (form: WrappedFormUtils) => {
           } else {
             return (
               <MyItemNameDiv
-                valueT={formatSearch(record.itemNameSelf, searchValue)}
-                valueF={formatSearch(record.itemName, searchValue)}
+                valueT={formatSearch(getItemNameWithShorthand({shorthand: record.shorthand, full: record.itemNameSelf || ''}), searchValue)}
+                valueF={formatSearch(getItemNameWithShorthand({shorthand: record.shorthand, full: record.itemName || ''}), searchValue)}
                 isMyShow={isMyShow}
               />
             )

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

@@ -3,32 +3,17 @@ import { Input } from 'kts-components-antd-x3';
 import React, { ChangeEvent } from 'react';
 import './index.less';
 
-export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string }) {
-
-    const { shorthand, fullName } = getShorthand(props.value);
+export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string, shorthand?: string }) {
 
     const onChange = React.useCallback((e: ChangeEvent<HTMLInputElement>) => {
         const event = { ...e };
-        event.target.value = shorthand ? `*${shorthand}*${e.target.value}` : e.target.value
         props.onChange && props.onChange(event);
     }, [])
 
     return (
         <div className='kts-invoice-operate-goods-list-itemName-input'>
-            {shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{shorthand}*</span>}
-            <Input style={{ height: '100%', border: 'none' }} value={fullName} onChange={onChange} />
+            {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
+            <Input style={{ height: '100%', border: 'none' }} value={props.value} onChange={onChange} />
         </div>
     )
 }
-
-/** 提取简称 */
-const getShorthand = (value?: string) => {
-    if (!value) return {};
-    const arr = value.match(/\*[^*]+\*/);
-
-    const shorthand = arr ? arr[0].split('*')[1] : '';
-    const fullName = shorthand ? value.replace(`*${shorthand}*`, '') : value;
-
-    return { shorthand, fullName }
-};
-

package/src/Invoice/ui/ImportGoodsDrawer/index.tsx

@@ -3,7 +3,6 @@ import { Drawer, Table } from 'kts-components-antd-x3';
 import Invoice from '../../';
 import { updateUnitPriceExcludingTax, updateUnitPriceTax, dutyFree, format15 } from '../GoodsList/hook/useColumns/autoFillFn';
 import { countAmountIncludeTax } from '../../tools/calculate'
-import { getSN } from '../../tools/itemName'
 import { IGood } from '../../InvoiceController';
 import evaluate from '../../tools/evaluate';
 
@@ -115,10 +114,9 @@ const DrawerBody = () => {
               }
 
               s.goodsListState.importGoods.isVisibleDrawer = false;
-
               s.goodsListState.isTaxIncluded
-                ? updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
-                : updateUnitPriceTax(controller, s.goodsListState.form, record)
+                ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
+                : await updateUnitPriceTax(controller, s.goodsListState.form, record)
             })
           }
         };
@@ -145,31 +143,31 @@ const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) =
 // 获取我方名称
 const getItemName = (record: any, editGood: IGood) => {
 
-  let shorthand;
+  // let shorthand;
 
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return `*${shorthand}*${record.itemName}`;
-  }
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemName}`;
+  // }
 
-  shorthand = getSN(editGood.itemName)?.shorthand;
-  if (shorthand) {
-    return `*${shorthand}*${record.itemNameSelf}`;
-  }
+  // shorthand = getSN(editGood.itemName)?.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
 
   return record.itemName;
 }
 
 // 获取他方名称
 const getItemNameOther = (record: any, editGood: IGood) => {
-  if (!editGood.itemName) return editGood.itemName;
+  // if (!editGood.itemName) return editGood.itemName;
 
-  let shorthand;
+  // let shorthand;
 
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return `*${shorthand}*${record.itemNameSelf}`;
-  }
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
 
   return record.itemName;
 }