kts-component-invoice-operate 3.2.228-fuling → 3.2.229

package/package.json

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

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

@@ -164,7 +164,7 @@ export default () => {
         <Invoice
             invoiceType='digtal'
             controller={controller}
-            goodsList={<Invoice.GoodsListDigtal />}
+            goodsList={<Invoice.GoodsListDigtal onTaxSwitchChange={onTaxSwitchChange} />}
             // stakeholder={<Invoice.Stakeholder leqi={true} invoiceMarkCallback={callback} />}
             invoiceHeader={
                 <Invoice.InvoiceHeader

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

@@ -2,21 +2,83 @@ import React from 'react';
 import Invoice from '../../..';
 import moment from 'moment';
 import 'antd/dist/antd.css';
-
+import { Button } from 'kts-components-antd-x3';
 export default () => {
 
     const controller = React.useMemo(() => new Invoice.InvoiceController(), []);
 
     React.useEffect(() => {
         controller.run(async s => {
+            controller.state.goodsListState.goodsList = [{
+                "taxRate": 3,
+                "lineAttribute": 0,
+                "$index": "88a5549b-ede2-488a-962b-26dc1d5e4e3a",
+                "serialNo": 1,
+                "itemName": "车辆停放服务",
+                "lineAmountIncludeTax": 6,
+                "taxAmount": 0.17,
+                "lineAmountExcludeTax": 5.83,
+                cd:3,
+            },{
+                "taxRate": 3,
+                "lineAttribute": 0,
+                "$index": "88a5549b-ede2-488a-962b-26dc1d5e4e31",
+                "serialNo": 1,
+                "itemName": "车辆停放服务",
+                "lineAmountIncludeTax": 6,
+                "taxAmount": 0.17,
+                "lineAmountExcludeTax": 5.83,
+                cd:2
+            }]
+            window.setTimeout(() => {
+                controller.formList.get('realEstateInfo')?.setFieldsValue({
+                    realEstateDataDto: [
+                        {
+                            "$index": "88a5549b-ede2-488a-962b-26dc1d5e4e3a",
+                            realEstateAddress: ['北京市', '北京市', '东城区'],
+                            realEstateDetailedAddress: '东城区东华门大街',
+                            leaseTerm: [moment('2023-07-06 10:43'), moment('2023-07-06 10:59')],
+                            crossCitiesSign: 'Y',
+                            realEstateNumber: '123456789',
+                            realEstateUnit: '平方米',
+                            cphList:['京b22132','渝a12345','渝a1x212'],
+                        },
+                        {
+                            "$index": "88a5549b-ede2-488a-962b-26dc1d5e4e31",
+                            realEstateAddress: ['北京市', '北京市', '东城区'],
+                            realEstateDetailedAddress: '东城区东华门大街',
+                            leaseTerm: [moment('2023-07-06 10:43'), moment('2023-07-06 10:59')],
+                            crossCitiesSign: 'Y',
+                            realEstateNumber: '123456789',
+                            realEstateUnit: '平方米',
+                            cphList:['渝b22132','陕a12345',],
+                        }
+                    ]
+                })
+            }, 1000)
         })
     }, [])
-
+    const onSave = async () => {
+        const formValues = await controller.validateFields();
+        console.log(formValues)
+    }
     return (
-        <Invoice
-            invoiceType='digtal'
-            controller={controller}
-            specialInfor={<Invoice.RealEstateInfo />}
-        />
+        <>
+            <Button onClick={onSave}>输出表单内容</Button>
+            <Invoice
+                invoiceType='digtal'
+                controller={controller}
+                specialInfor={<Invoice.RealEstateInfo realEstateAddressOptions={[
+                    {
+                        "code": "11",
+                        "name": "北京市"
+                    }] || []}
+                    realEstateAddressFieldNames={{
+                        label: 'name',
+                        value: 'name',
+                        children: 'children'
+                    }} />}
+            />
+        </>
     )
 };

package/src/Invoice/Invoice-digtal/index.md

@@ -37,16 +37,9 @@
 ## 查看当前可用授信额度
 <code src="./_test/lineCredit/index.tsx"></code>
 
-## 不动产经营租赁服务
-<code src="./_test/realEstateInfo/index.tsx"></code>
 
--->
-<<<<<<< HEAD
 
-## 货物运输服务
-<code src="./_test/freight/index.tsx"></code> 
-=======
+-->
 <!-- 
 ## 货物运输服务
-<code src="./_test/freight/index.tsx"></code>  -->
->>>>>>> 3e4750d (农产品发票升级)
+<code src="./_test/freight/index.tsx"></code>  -->

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

@@ -84,4 +84,6 @@ export default interface IGood {
 
   /** 孩子 */
   children?: IGood[];
+
+  cd?:number
 }

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

@@ -63,6 +63,9 @@ export default class ImportGoods<ColumnType = any> {
   /** 是否显示导入 */
   isVisibleDrawer = false;
 
+  /** 搜索条件 */
+  filter: any = {};
+
   /** 顶部扩展 */
   topExpand?: React.ReactNode;
 

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

@@ -128,4 +128,7 @@ export default class GoodsListState {
   /** 商品拖拽数据 */
   drag = new Drag();
 
+  /** 商品校验是否关闭，默认开启 */
+  isValidateGood = true;
+
 }

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

@@ -4,10 +4,10 @@ import { InvoiceControllerState } from '../';
  * 保存正在编辑的货物
  */
 export default async (state: InvoiceControllerState) => {
-  
+
   const editGood = state.goodsListState.editGood;
   const form = state.goodsListState.form;
-  
+  // const isValidateGood = state.goodsListState.isValidateGood
   if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
   if ((await validateFields(form)).err) return;
 

package/src/Invoice/_test/deduction/index.tsx

@@ -1,12 +1,18 @@
 import React from 'react';
-import { Input } from 'kts-components-antd-x3';
+import { Input, message } from 'kts-components-antd-x3';
 import Invoice from '../../';
 import 'antd/dist/antd.css';
 
 export default () => {
 
     const controller = React.useMemo(() => new MyController1(), [])
+    React.useEffect(() => {
+        controller.run(async s => {
+            s.addGoodsCheck=checkGood;
+           
 
+        })
+    }, [])
     const [deduction, setDeduction] = React.useState<number | undefined>(0);
 
     const [goodMax, setgoodMax] = React.useState(0);
@@ -29,17 +35,33 @@ export default () => {
             </span>
         )
     }, [])
+    const checkGood = async () => {
+        await new Promise((resolve,) => {
+            setTimeout(() => {
+                const a = Math.random();
+                if (a > 0.5) {
+                    message.error('请先填写发票行信息，再添加新的行');
+                    return false;
+                } else {
+                    resolve(true)
+                    console.log(11112)
+                }
 
+            }, 1000)
+        })
+    }
     return (
         <Invoice
             controller={controller}
             goodsList={
                 <Invoice.GoodsList
-                    isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
-                    isAddDiscount={false}           // 不能添加折扣行
-                    goodMax={goodMax}               // 控制能可以添加的货物函数
-                    deduction={deduction}           // 扣除额
-                    menuExpansion={menuExpansion}   // 扩展
+
+                    // addGoodsCheck={checkGood}
+                // isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
+                // isAddDiscount={false}           // 不能添加折扣行
+                // goodMax={goodMax}               // 控制能可以添加的货物函数
+                // deduction={deduction}           // 扣除额
+                // menuExpansion={menuExpansion}   // 扩展
                 />
             }
         />

package/src/Invoice/index.md

@@ -1,18 +1,18 @@
 # 默认
 
-## 简单用法
+<!-- ## 简单用法
 <code src="./_test/easiest/index.tsx"></code>
 
 ## 设置为草稿，设置默认参数 扩展按钮
 <code src="./_test/draft/index.tsx" title="类似的操作,请查看API" ></code>
 
 ## 设置购买方名称搜索 
-<code src="./_test/buyerNameSearch/index.tsx"></code>
+<code src="./_test/buyerNameSearch/index.tsx"></code> -->
 
 ## 设置扣除额（差额征税）
 <code src="./_test/deduction/index.tsx"></code>
 
-## 设置单位列表、税率列表
+<!-- ## 设置单位列表、税率列表
 <code src="./_test/unit/index.tsx" ></code>
 
 ## 发票头类型设置和购买方信息配置
@@ -53,4 +53,4 @@
 <API name="GoodsList 商品列表 API" exports='["default"]' src="./ui/default/GoodsList/index.tsx"></API>
 <API name="Buyer 购买方 API" exports='["default"]' src="./ui/default/Buyer/index.tsx"></API>
 <API name="Seller 销售方 API" exports='["default"]' src="./ui/default/Seller/index.tsx"></API>
-<API name="Sign 落款 API" exports='["default"]' src="./ui/default/Sign/index.tsx"></API>
+<API name="Sign 落款 API" exports='["default"]' src="./ui/default/Sign/index.tsx"></API> -->

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

@@ -47,6 +47,8 @@ export interface IGoodsListProps {
 
   /** 是否可以切换(含税/不含税)状态 */
   isSwitchTax?: boolean;
+
+  addGoodsCheck?:()=>void;
 }
 
 export default class GoodsList extends React.Component<IGoodsListProps>{
@@ -137,7 +139,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
       <div className="kts-invoice-operate-goods-list-able">
         <div className="kts-invoice-operate-goods-list-able-list">
           {/* 添加行 */}
-          <AddRowButton />
+          <AddRowButton addGoodsCheck={props.addGoodsCheck}/>
 
           {/* 批量菜单 */}
           {/* <BulkMenu /> */}

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

@@ -3,7 +3,7 @@ import Invoice from '../../../../..';
 import { Button, message } from 'kts-components-antd-x3';
 import InvoiceController, { LineAttributeType } from '../../../../../InvoiceController';
 
-export default () => {
+export default (props: any) => {
   const controller = Invoice.useInvoiceController();
 
   const model = controller.useMemo(s => s.model, []);
@@ -26,6 +26,12 @@ export default () => {
   const disabled = React.useMemo(() => typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue, [goodMax, goodsNum, searchValue])
 
   const onClick = React.useCallback(async () => {
+    await controller.run(async (s) => {
+      if (s.addGoodsCheck) {  
+        await s.addGoodsCheck();
+      }
+    });
+    console.log('continue')
     await addGood(controller);
     await rollBottom(controller, rootElement);
   }, [controller, rootElement]);
@@ -43,6 +49,7 @@ export default () => {
 
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
+
   await controller.saveEditGood();
   await controller.wait();
   await controller.run(async (s) => {

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

@@ -14,7 +14,10 @@ export default () => {
   const topExpand = controller.useMemo(s => s.goodsListState.importGoods.topExpand, []);
 
   const onClose = React.useCallback(() => {
-    controller.pipeline(async s => { s.goodsListState.importGoods.isVisibleDrawer = false })();
+    controller.pipeline(async s => { 
+      s.goodsListState.importGoods.filter = {};
+      s.goodsListState.importGoods.isVisibleDrawer = false;
+    })();
   }, [controller]);
 
   return (

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

@@ -40,7 +40,7 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
 
     return (
         <div className="kts-invoice-operate-real-estate-info-digtal">
-            <div className='real-estate-info-digtal-label' >特殊信息-建筑服务</div>
+            <div className='real-estate-info-digtal-label' >特定信息-建筑服务</div>
             <Row gutter={[17, 0]}>
                 <Col span={6} >
                     <Form.Item label='土地增值税项目编号' >

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

@@ -94,7 +94,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   //  controller.useForm('freightInfo', form);
   return (
     <div className="kts-invoice-operate-freight">
-      <div className='real-estate-info-digtal-label' >特殊信息-货物运输</div>
+      <div className='real-estate-info-digtal-label' >特定信息-货物运输</div>
       <div className="kts-invoice-operate-goods-list-digtal" onClick={(e) => { e.stopPropagation() }} >
         <div className="kts-invoice-operate-freight-list-able">
           {/* 添加行 */}

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

@@ -73,6 +73,7 @@ export default (form: WrappedFormUtils) => {
   /** 计算中启动字段 */
   const changeField = controller.useMemo((e) => e.calculatingField, []);
 
+  const isValidateGood = controller.useMemo(s => s.goodsListState.isValidateGood, [])
   /** 计算中启动字段 */
   const setChangeField = React.useCallback((value: string) => controller.run(async s => { s.calculatingField = value }), []);
 
@@ -124,12 +125,16 @@ export default (form: WrappedFormUtils) => {
                       ...getReplenishRules('itemName'),
                       {
                         validator: async (_, __, callback) => {
-                          await controller.wait();
-                          const value = controller.state.goodsListState.editGood;
-                          if (!value?.itemName && !value?.itemNameSelf) {
-                            callback('项目名称不能为空');
+                          if (isValidateGood) {
+                            await controller.wait();
+                            const value = controller.state.goodsListState.editGood;
+                            if (!value?.itemName && !value?.itemNameSelf) {
+                              callback('项目名称不能为空');
+                            } else {
+                              return;
+                            }
                           } else {
-                            return;
+                            callback();
                           }
                         }
                       }
@@ -252,11 +257,16 @@ export default (form: WrappedFormUtils) => {
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '数量必须为数字' },
                     {
                       validator: async (_, value, callback) => {
-                        await controller.wait();
-                        const isvalue = !!value || value === 0;
-                        const isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
-                        if (isvalue || isPrice === isvalue) return;
-                        callback('请输入数量');
+
+                        if (isValidateGood) {
+                          await controller.wait();
+                          const isvalue = !!value || value === 0;
+                          const isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
+                          if (isvalue || isPrice === isvalue) return;
+                          callback('请输入数量');
+                        } else {
+                          callback();
+                        }
                       }
                     }
                   ],
@@ -381,7 +391,7 @@ export default (form: WrappedFormUtils) => {
                   getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('lineAmountIncludeTax'),
-                    { required: true, message: '金额不能为空' },
+                    { required: isValidateGood, message: '金额不能为空' },
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额错误，请重新输入' },
                     {
                       validator: async (_, value, callback) => {
@@ -411,7 +421,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
+            return <span style={{ padding: '0 10px' }}>{value && formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },
@@ -430,7 +440,7 @@ export default (form: WrappedFormUtils) => {
                   getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('lineAmountExcludeTax'),
-                    { required: true, message: '金额不能为空' },
+                    { required: isValidateGood, message: '金额不能为空' },
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额错误，请重新输入' },
                     {
                       validator: async (_, value: string, callback) => {
@@ -453,7 +463,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
+            return <span style={{ padding: '0 10px' }}>{value && formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },
@@ -463,7 +473,7 @@ export default (form: WrappedFormUtils) => {
         key: 'taxRate',
         align: 'right',
         width: 70,
-        render: (value: string, record: IGood) => {
+        render: (value: string|number, record: IGood) => {
           if (editGood?.$index === record.$index && !disableds.includes('taxRate') && !(model === 'prefab' && calculateType === '3')) {
             return (
               <Form.Item>
@@ -471,7 +481,7 @@ export default (form: WrappedFormUtils) => {
                   initialValue: editGood.taxRate,
                   rules: [
                     ...getReplenishRules('taxRate'),
-                    { required: true, message: '请选择税率' },
+                    { required: isValidateGood, message: '请选择税率' },
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '请选择正确税率' },
                   ],
                 })(
@@ -498,7 +508,11 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '免税' : `${value}%`}</span>;
+            if (value || value === '0' || value === 0) {
+              return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '免税' : `${value}%`}</span>;
+            } else {
+              return ''
+            }
           }
         },
       },
@@ -509,27 +523,27 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 119,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('taxAmount')&& model !== 'prefab') {
+          if (editGood?.$index === record.$index && !disableds.includes('taxAmount') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('taxAmount', {
                   initialValue: editGood.taxAmount,
                   rules: [
                     ...getReplenishRules('taxAmount'),
-                    { required: true, message: '税额不能为空' },
+                    { required: isValidateGood, message: '税额不能为空' },
                     {
                       validator: (rule, value, callback) => {
                         //含税金额
                         const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
                         //不含税金额
                         // const lineAmountExcludeTax = lineAmountIncludeTax-value;
-                        const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax||0)).subtract(bignumber(value||0));
+                        const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
                         const taxRate = editGood?.taxRate;
                         if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
                           // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
-                          const total = lineAmountExcludeTax.multiply(bignumber(taxRate||0)).divide(bignumber(100));
+                          const total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100));
                           // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
-                          if (Math.abs(total.subtract(bignumber(value||0)).done().toNumber()) <= 0.01) {
+                          if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
                             callback();
                           } else {
                             callback('税额填写错误，请重新输入')
@@ -559,7 +573,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             )
           } else {
-            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : parseFloat(value).toFixed(2)}</span>;
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : value && parseFloat(value).toFixed(2)}</span>;
           }
         },
       },

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

@@ -42,6 +42,8 @@ export interface IGoodsListProps {
 
   /** 是否可以切换(含税/不含税)状态 */
   isSwitchTax?: boolean;
+
+  onTaxSwitchChange?:(e:any)=>void;
 }
 
 export default class GoodsList extends React.Component<IGoodsListProps>{
@@ -137,7 +139,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
         {endowCodeButton.button}
 
         {/* 是否含税开关 */}
-        <TaxIncludedSwitch />
+        <TaxIncludedSwitch onChange={props.onTaxSwitchChange}/>
 
         {/* 搜索 */}
         <Search />

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

@@ -45,6 +45,13 @@ export default () => {
 
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
+  await controller.formList.get('realEstateInfo')?.validateFields(async (err: any, values: any) => {
+
+    if (err) {
+      message.error('请先填写发票行信息，再添加新的行');
+      return;
+    }
+  });
   await controller.saveEditGood();
   await controller.wait();
   await controller.run(async (s) => {
@@ -54,16 +61,19 @@ async function addGood(controller: InvoiceController) {
       //   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;
-        }
-      });
+      const isValidateGood = controller.state.goodsListState.isValidateGood;
+      if (isValidateGood) {
+        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;
+          }
+        });
+      }
     }
     s.goodsListState.editGood = await controller.addGood({ taxRate: s.goodsListState.defaultRate, lineAttribute: LineAttributeType.正常 });
   });

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

@@ -40,8 +40,9 @@ export default function <T extends object = any>(props: TableProps<T>) {
 
     // 设置占位dom的搞
     const placeholderHeight = React.useMemo(() => {
-        if (!self || !rowHeight || !props.dataSource || !placeholder) return;
-        const placeholderHeight = rowHeight * props.dataSource.length;
+        const { dataSource = [] } = props
+        if (!self || !rowHeight || !dataSource || !placeholder) return;
+        const placeholderHeight = rowHeight * dataSource.length;
         placeholder.style.height = `${placeholderHeight}px`;
         return placeholderHeight;
     }, [self, rowHeight, props.dataSource, placeholder]);
@@ -80,19 +81,23 @@ export default function <T extends object = any>(props: TableProps<T>) {
 
     // 移动列表
     React.useEffect(() => {
-        if (!self) return;
+        if (!self) return
 
         const table = self.querySelector('.ktsAntX-table .ktsAntX-table-body>table') as HTMLDivElement;
+
         if (!table) return;
+        if ((props.dataSource?.length || 0) < 10) {
+            table.style.top = '0px';
+        } else {
+            table.style.top = `${pointer * rowHeight}px`;
+        }
 
-        table.style.top = `${pointer * rowHeight}px`;
-    }, [pointer, self, rowHeight]);
+    }, [pointer, self, rowHeight, props.dataSource?.length]);
 
     React.useEffect(() => {
         if (!self) return;
         const cont = self.querySelector('.kts-invoice-operate-goods-table-virtual .ktsAntX-table-body');
         if (!cont) return;
-
         cont.scrollTop = 0;
     }, [props.dataSource?.length])
 

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

@@ -3,8 +3,10 @@ import React from 'react';
 import { Switch } from 'kts-xui';
 import Invoice from '../../../../..';
 import { onChangeSwitchTax } from '../../hook/useColumns/autoFillFn';
-
-export default () => {
+interface IProps {
+    onChange?:(e:any)=>void;
+}
+export default (props:IProps) => {
 
     const controller = Invoice.useInvoiceController();
 
@@ -16,6 +18,7 @@ export default () => {
 
     const onChange = React.useCallback(async e => {
         onChangeSwitchTax(controller, e);
+        props.onChange && props.onChange(e);
     }, [])
 
     return (

package/src/Invoice/ui/digtal/RealEstateInfo/index.less

@@ -12,4 +12,11 @@
     .ktsAnt3x-row.ktsAnt3x-form-item {
         margin-bottom: 0;
     }
+    .ktsAntX-row{
+        border-bottom: 1px dashed #9F613E;
+        &:last-child {
+            border-bottom: none;
+          }
+    }
+
 }