kts-component-invoice-operate 3.2.28 → 3.2.30

package/package.json

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

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

@@ -13,5 +13,5 @@ export default class AutoComplete {
     onBuyerTaxIdSearch?: (searchText: string) => Promise<any[]>;
 
     /** 商品编码自动补全 */
-    onItemCodeSearch?: (searchText: string) => Promise<any[]>;
+    onItemCodeSearch?: (searchText: string, itemName: any) => Promise<any[]>;
 }

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

@@ -106,9 +106,10 @@ export default (form: WrappedFormUtils) => {
                   initialValue: editGood.itemCode,
                 })(
                   <ItemCodeInput
-                    shorthand={editGood.shorthand}
-                    onChange={() => {
-                      onChangeItemCode(controller, form, record);
+                    record={record}
+                    onChange={async () => {
+                      await onChangeItemCode(controller, form, record);
+                      await onChangeLineAmountIncludeTax(controller, form, record);
                     }}
                   />
                 )}
@@ -128,7 +129,7 @@ export default (form: WrappedFormUtils) => {
               <Form.Item>
                 <div style={{ display: 'flex' }} >
                   {getFieldDecorator('itemName', {
-                    initialValue: isMyShow ? record.itemNameSelf : record.itemName,
+                    initialValue: record.itemName,
                     rules: [
                       ...getReplenishRules('itemName'),
                       {

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

@@ -5,7 +5,7 @@ import { AutoComplete } from 'kts-xui';
 import { IGood, Invoice } from '../../../../../../../..';
 import './index.less';
 
-export default function ItemCodeInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string, shorthand?: string }) {
+export default function ItemCodeInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string, record: any }) {
 
     const controller = Invoice.useInvoiceController();
 
@@ -21,7 +21,7 @@ export default function ItemCodeInput(props: { onChange?: (e: ChangeEvent<HTMLIn
     const onSearch = React.useCallback(async (searchText: string) => {
         try {
             if (autoComplete.onItemCodeSearch) {
-                setOptions(await autoComplete.onItemCodeSearch(searchText))
+                setOptions(await autoComplete.onItemCodeSearch(searchText, props.record?.itemName))
             }
         } catch (error) {
             setOptions([])
@@ -29,15 +29,26 @@ export default function ItemCodeInput(props: { onChange?: (e: ChangeEvent<HTMLIn
         }
     }, [autoComplete.onItemCodeSearch])
 
-    const onChangeAutoComplete = React.useCallback(itemName => {
+    const onChangeAutoComplete = React.useCallback(async itemName => {
         const record = options.filter(e => e.itemCode === itemName)[0] as any;
         if (!record) return;
+
+        const option = {
+          itemCode: record.itemCode,
+          itemName: record.itemName,
+          taxCategoryCode: record.taxCategoryCode,
+          shorthand: record.shorthand,
+          specification: record.specification,
+          unit: record.unit,
+          lineAmountIncludeTax: record.lineAmountIncludeTax,
+          taxRate: record.taxRate,
+        }
+        await controller.setEditGood(option);
     }, [options, controller])
 
     return (
         <div className='kts-invoice-operate-goods-list-itemCode-input'>
-            {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
-            <AutoComplete onSearch={onSearch} options={options.map(e => ({ value: e.itemCode }))} onChange={onChangeAutoComplete} >
+            <AutoComplete onSearch={onSearch} defaultValue={props.value} options={options.map(e => ({ value: e.itemCode }))} onChange={onChangeAutoComplete} >
                 <Input style={{ height: '100%', border: 'none' }} value={props.value} onChange={onChange} />
             </AutoComplete>
         </div>

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

@@ -32,12 +32,15 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
         }
     }, [autoComplete.onItemNameSearch])
 
-    const onChangeAutoComplete = React.useCallback(itemName => {
+    const onChangeAutoComplete = React.useCallback(async itemName => {
         // const good = options.filter(e=>e.itemName === itemName)[0];
         // good && controller.state.goodsListState.form?.setFieldsValue(removeNullUndefined(good));
 
         const record = options.filter(e => e.itemName === itemName)[0] as any;
         if (!record) return;
+
+        await controller.setEditGood({ itemName: record.itemName });
+
         controller.importGoodsDrawer(record);
         // controller.run(async s => {
         //     Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
@@ -96,7 +99,7 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
     return (
         <div className='kts-invoice-operate-goods-list-itemName-input'>
             {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
-            <AutoComplete onSearch={onSearch} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
+            <AutoComplete onSearch={onSearch} defaultValue={props.value} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
                 <Input style={{ height: '100%', border: 'none' }} value={props.value} onChange={onChange} />
             </AutoComplete>
         </div>
@@ -122,4 +125,4 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
 
 //     // 单价(含税)/(1+税率) = 单价(不含税)
 //     return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`), calculatingDigits);
-// };
+// };