kts-component-invoice-operate 3.2.219 → 3.2.220-chinaship

package/package.json

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

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

@@ -2,7 +2,7 @@ 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(), []);
@@ -11,27 +11,12 @@ export default () => {
         controller.run(async s => {
         })
     }, [])
-    const onSave = async () => {
-        const formValues = await controller.validateFields();
-        console.log(formValues)
-    }
+
     return (
-        <>
-            <Button onClick={onSave}>输出表单内容</Button>
-            <Invoice
-                invoiceType='digtal'
-                controller={controller}
-                specialInfor={<Invoice.RealEstateInfo realEstateAddressOptions={[
-                    {
-                        "code": "11",
-                        "name": "北京市"
-                    }] || []}
-                    realEstateAddressFieldNames={{
-                        label: 'name',
-                        value: 'name',
-                        children: 'children'
-                    }} />}
-            />
-        </>
+        <Invoice
+            invoiceType='digtal'
+            controller={controller}
+            specialInfor={<Invoice.RealEstateInfo />}
+        />
     )
 };

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

@@ -1,10 +1,7 @@
 # 数电
 
-<!-- ## 简单用法
-<code src="./_test/easiest/index.tsx"></code> -->
-
-## 不动产经营租赁服务
-<code src="./_test/realEstateInfo/index.tsx"></code>
+## 简单用法
+<code src="./_test/easiest/index.tsx"></code>
 
 <!-- ## 建筑服务
 <code src="./_test/architecture/index.tsx"></code> -->
@@ -36,7 +33,8 @@
 ## 查看当前可用授信额度
 <code src="./_test/lineCredit/index.tsx"></code>
 
-
+## 不动产经营租赁服务
+<code src="./_test/realEstateInfo/index.tsx"></code>
 
 -->
 

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

@@ -68,5 +68,4 @@ export default class InvoiceControllerState {
    * 货物运输列表
    */
   freightListState = new FreightListState();
-
 }

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,5 +1,5 @@
 import React from 'react';
-import { Input, message } from 'kts-components-antd-x3';
+import { Input } from 'kts-components-antd-x3';
 import Invoice from '../../';
 import 'antd/dist/antd.css';
 
@@ -29,33 +29,17 @@ 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
-
-                    addGoodsCheck={checkGood}
-                // isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
-                // isAddDiscount={false}           // 不能添加折扣行
-                // goodMax={goodMax}               // 控制能可以添加的货物函数
-                // deduction={deduction}           // 扣除额
-                // menuExpansion={menuExpansion}   // 扩展
+                    isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
+                    isAddDiscount={false}           // 不能添加折扣行
+                    goodMax={goodMax}               // 控制能可以添加的货物函数
+                    deduction={deduction}           // 扣除额
+                    menuExpansion={menuExpansion}   // 扩展
                 />
             }
         />

package/src/Invoice/index.md

@@ -7,12 +7,12 @@
 <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>
 
 ## 发票头类型设置和购买方信息配置

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

@@ -47,8 +47,6 @@ export interface IGoodsListProps {
 
   /** 是否可以切换(含税/不含税)状态 */
   isSwitchTax?: boolean;
-
-  addGoodsCheck?:()=>void;
 }
 
 export default class GoodsList extends React.Component<IGoodsListProps>{
@@ -139,7 +137,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 addGoodsCheck={props.addGoodsCheck}/>
+          <AddRowButton />
 
           {/* 批量菜单 */}
           {/* <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 (props: any) => {
+export default () => {
   const controller = Invoice.useInvoiceController();
 
   const model = controller.useMemo(s => s.model, []);
@@ -26,8 +26,6 @@ export default (props: any) => {
   const disabled = React.useMemo(() => typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue, [goodMax, goodsNum, searchValue])
 
   const onClick = React.useCallback(async () => {
-    props.addGoodsCheck &&await props.addGoodsCheck();
-    console.log('continue')
     await addGood(controller);
     await rollBottom(controller, rootElement);
   }, [controller, rootElement]);
@@ -45,7 +43,6 @@ export default (props: any) => {
 
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
- 
   await controller.saveEditGood();
   await controller.wait();
   await controller.run(async (s) => {

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

@@ -257,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();
+                        }
                       }
                     }
                   ],
@@ -416,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>;
           }
         },
       },
@@ -458,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>;
           }
         },
       },
@@ -518,7 +523,7 @@ 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', {
@@ -532,13 +537,13 @@ export default (form: WrappedFormUtils) => {
                         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('税额填写错误，请重新输入')
@@ -568,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/ui/AddRowButton/index.tsx

@@ -45,13 +45,6 @@ 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) => {
@@ -61,17 +54,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/RealEstateInfo/index.less

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