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

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,12 +26,6 @@ export default (props: any) => {
   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]);
@@ -49,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/default/ImportGoodsDrawer/index.tsx

@@ -14,10 +14,7 @@ export default () => {
   const topExpand = controller.useMemo(s => s.goodsListState.importGoods.topExpand, []);
 
   const onClose = React.useCallback(() => {
-    controller.pipeline(async s => { 
-      s.goodsListState.importGoods.filter = {};
-      s.goodsListState.importGoods.isVisibleDrawer = false;
-    })();
+    controller.pipeline(async s => { 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,7 +73,6 @@ 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 }), []);
 
@@ -125,16 +124,12 @@ export default (form: WrappedFormUtils) => {
                       ...getReplenishRules('itemName'),
                       {
                         validator: async (_, __, callback) => {
-                          if (isValidateGood) {
-                            await controller.wait();
-                            const value = controller.state.goodsListState.editGood;
-                            if (!value?.itemName && !value?.itemNameSelf) {
-                              callback('项目名称不能为空');
-                            } else {
-                              return;
-                            }
+                          await controller.wait();
+                          const value = controller.state.goodsListState.editGood;
+                          if (!value?.itemName && !value?.itemNameSelf) {
+                            callback('项目名称不能为空');
                           } else {
-                            callback();
+                            return;
                           }
                         }
                       }
@@ -257,16 +252,11 @@ export default (form: WrappedFormUtils) => {
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '数量必须为数字' },
                     {
                       validator: async (_, value, 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();
-                        }
+                        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('请输入数量');
                       }
                     }
                   ],
@@ -391,7 +381,7 @@ export default (form: WrappedFormUtils) => {
                   getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('lineAmountIncludeTax'),
-                    { required: isValidateGood, message: '金额不能为空' },
+                    { required: true, message: '金额不能为空' },
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额错误，请重新输入' },
                     {
                       validator: async (_, value, callback) => {
@@ -421,7 +411,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{value && formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
+            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },
@@ -440,7 +430,7 @@ export default (form: WrappedFormUtils) => {
                   getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('lineAmountExcludeTax'),
-                    { required: isValidateGood, message: '金额不能为空' },
+                    { required: true, message: '金额不能为空' },
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额错误，请重新输入' },
                     {
                       validator: async (_, value: string, callback) => {
@@ -463,7 +453,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{value && formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
+            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },
@@ -473,7 +463,7 @@ export default (form: WrappedFormUtils) => {
         key: 'taxRate',
         align: 'right',
         width: 70,
-        render: (value: string|number, record: IGood) => {
+        render: (value: string, record: IGood) => {
           if (editGood?.$index === record.$index && !disableds.includes('taxRate') && !(model === 'prefab' && calculateType === '3')) {
             return (
               <Form.Item>
@@ -481,7 +471,7 @@ export default (form: WrappedFormUtils) => {
                   initialValue: editGood.taxRate,
                   rules: [
                     ...getReplenishRules('taxRate'),
-                    { required: isValidateGood, message: '请选择税率' },
+                    { required: true, message: '请选择税率' },
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '请选择正确税率' },
                   ],
                 })(
@@ -508,11 +498,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            if (value || value === '0' || value === 0) {
-              return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '免税' : `${value}%`}</span>;
-            } else {
-              return ''
-            }
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '免税' : `${value}%`}</span>;
           }
         },
       },
@@ -523,27 +509,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: isValidateGood, message: '税额不能为空' },
+                    { required: true, 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('税额填写错误，请重新输入')
@@ -573,7 +559,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             )
           } else {
-            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : value && parseFloat(value).toFixed(2)}</span>;
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : parseFloat(value).toFixed(2)}</span>;
           }
         },
       },

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

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

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,19 +54,16 @@ async function addGood(controller: InvoiceController) {
       //   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;
-          }
-        });
-      }
+      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,9 +40,8 @@ export default function <T extends object = any>(props: TableProps<T>) {
 
     // 设置占位dom的搞
     const placeholderHeight = React.useMemo(() => {
-        const { dataSource = [] } = props
-        if (!self || !rowHeight || !dataSource || !placeholder) return;
-        const placeholderHeight = rowHeight * dataSource.length;
+        if (!self || !rowHeight || !props.dataSource || !placeholder) return;
+        const placeholderHeight = rowHeight * props.dataSource.length;
         placeholder.style.height = `${placeholderHeight}px`;
         return placeholderHeight;
     }, [self, rowHeight, props.dataSource, placeholder]);
@@ -81,23 +80,19 @@ 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`;
-        }
 
-    }, [pointer, self, rowHeight, props.dataSource?.length]);
+        table.style.top = `${pointer * rowHeight}px`;
+    }, [pointer, self, rowHeight]);
 
     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,10 +3,8 @@ import React from 'react';
 import { Switch } from 'kts-xui';
 import Invoice from '../../../../..';
 import { onChangeSwitchTax } from '../../hook/useColumns/autoFillFn';
-interface IProps {
-    onChange?:(e:any)=>void;
-}
-export default (props:IProps) => {
+
+export default () => {
 
     const controller = Invoice.useInvoiceController();
 
@@ -18,7 +16,6 @@ export default (props:IProps) => {
 
     const onChange = React.useCallback(async e => {
         onChangeSwitchTax(controller, e);
-        props.onChange && props.onChange(e);
     }, [])
 
     return (