kts-component-invoice-operate 3.2.178 → 3.2.180

package/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "kts-component-invoice-operate",
-  "version": "3.2.178",
+  "name": "kts-component-invoice-operate", 
+  "version": "3.2.180", 
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",
@@ -34,7 +34,7 @@
     "kts-components-antd-x3": "^3.26.20-5",
     "kts-components-antd-x4": "5.0.0",
     "kts-components-antd-x4-v4": "npm:kts-components-antd-x4@^4.0.3",
-    "kts-xui": "^2.1.79",
+    "kts-xui": "^2.1.76",
     "mathjs": "^9.4.2",
     "next": "^11.0.1",
     "nzh": "^1.0.4",

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

@@ -1,6 +1,6 @@
 # 数电
 
-<!-- ## 简单用法
+## 简单用法
 <code src="./_test/easiest/index.tsx"></code>
 
 ## 只读模式
@@ -32,9 +32,3 @@
 
 ## 不动产经营租赁服务
 <code src="./_test/realEstateInfo/index.tsx"></code>
-
-## 建筑服务
-<code src="./_test/architecture/index.tsx"></code> -->
-
-## 货物运输服务
-<code src="./_test/freight/index.tsx"></code>

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

@@ -1,5 +1,4 @@
 import GoodsListState from './GoodsListState';
-import FreightListState from './FreightListState';
 import BuyerState from './BuyerState';
 import Stakeholder from './Stakeholder';
 import { IInvoiceTypeModalProps } from '../../../InvoiceTypeModal';
@@ -63,9 +62,4 @@ export default class InvoiceControllerState {
    * 商品税收分类编码窗口
    * */
   taxClassificationProps?: TaxClassificationProps;
-
-  /**
-   * 货物运输列表
-   */
-  freightListState = new FreightListState();
 }

package/src/Invoice/InvoiceController/index.ts

@@ -4,17 +4,12 @@ import { IGetBuyerListOption } from './InvoiceControllerState/BuyerState';
 import { IGetGoodsListOption } from './InvoiceControllerState/GoodsListState/ImportGoods';
 // import updateInvoiceNo from './fns/updateInvoiceNo';
 import setEditGood from './fns/setEditGood';
-import setEditFreight from './fns/setEditFreight';
 import setGoods from './fns/setGoods';
-import setFreight from './fns/setFreight';
 import delGood from './fns/delGood';
-import delFreight from './fns/delFreight';
 import addGoodDiscount from './fns/addGoodDiscount';
 import addGoodDiscountV2 from './fns/addGoodDiscountV2';
 import addGood from './fns/addGood';
-import addFreight from './fns/addFreight';
 import saveEditGood from './fns/saveEditGood';
-import saveEditFreight from './fns/saveEditFreight';
 import getGoodsSearch from './fns/getGoodsSearch';
 import mergeDetails from './fns/mergeDetails';
 import mergeDiscount from './fns/mergeDiscount';
@@ -24,7 +19,7 @@ import itemBlur from './fns/itemBlur';
 export { default as InvoiceControllerState } from './InvoiceControllerState';
 export { default as IGood } from './InvoiceControllerState/GoodsListState/IGood';
 export { default as LineAttributeType } from './InvoiceControllerState/GoodsListState/LineAttributeType';
-export { default as IGood2 } from './InvoiceControllerState/FreightListState/IGood';
+
 export default class InvoiceController extends InvoiceControllerForm {
   constructor(state = new InvoiceControllerState()) {
     super(state);
@@ -45,32 +40,18 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 设置单个货物属性 */
   setGoods = this.pipeline(setGoods);
 
-  /** 设置货物运输属性 */
-  setFreight = this.pipeline(setFreight);
-
-  setEditFreight = this.pipeline(setEditFreight);
-
   /** 设置当前的编辑货物 */
   setEditGood = this.pipeline(setEditGood);
 
   /** 保存正在编辑的货物 */
   saveEditGood = this.pipeline<any>(saveEditGood);
 
-  /** 保存正在编辑的货物运输 */
-  saveEditFreight = this.pipeline<any>(saveEditFreight);
-
   /** 删除一个货物 */
   delGood = this.pipeline(delGood);
 
-  /** 删除一个货物运输 */
-  delFreight = this.pipeline(delFreight);
-
   /** 添加一个货物 */
   addGood = this.pipeline(addGood);
 
-  /** 添加一个货物运输 */
-  addFreight = this.pipeline(addFreight);
-
   /** 全单合并明细 */
   mergeDetails = this.pipeline(mergeDetails);
 

package/src/Invoice/index.tsx

@@ -19,8 +19,6 @@ import StakeFarmerholder from './ui/digtal/StakeFarmerholder';
 import SignDigtal from './ui/digtal/Sign';
 import GoodsListDigtal from './ui/digtal/GoodsList';
 import RealEstateInfo from './ui/digtal/RealEstateInfo';
-import Architecture from './ui/digtal/Architecture';
-import FreightList from './ui/digtal/FreightList';
 
 import ImportBuyerDrawer from './ui/default/ImportBuyerDrawer';
 import ImportGoodsDrawer from './ui/default/ImportGoodsDrawer';
@@ -88,7 +86,7 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
 
   /** 干系人(数电) */
   static readonly Stakeholder = Stakeholder;
-
+  
   /** 农产品干系人(数电) */
   static readonly StakeFarmerholder = StakeFarmerholder;
 
@@ -97,11 +95,6 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
 
   /** 特殊信息-不动产经营租赁服务(数电) */
   static readonly RealEstateInfo = RealEstateInfo;
-  
-  /** 特殊信息-建筑服务(数电) */
-  static readonly Architecture = Architecture;
-
-  static readonly FreightList = FreightList;
 
   /** 货物列表(数电) */
   static readonly GoodsListDigtal = GoodsListDigtal;

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

@@ -6,6 +6,4 @@ import InvoiceController from '../../InvoiceController'
 export default function useToGenerateId(controller: InvoiceController) {
     const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
     React.useEffect(() => {  goodsList.forEach((e, i) => { e.serialNo = i + 1 }) }, [goodsList])
-    const freightList = controller.useMemo(s => s.freightListState.goodsList, []);
-    React.useEffect(() => {  freightList.forEach((e, i) => { e.sortNumber = i + 1 }) }, [freightList])
 }

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

@@ -379,30 +379,31 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       //     s.value = info.node.taxRate
       //   }
       // });
-      
+      let node = info.node || info;
       actions.setFieldState('taxClassificationCode', async s => {
-        if(info.taxCategoryCode) {
-          s.value = info.taxCategoryCode
+        if(node.taxCategoryCode) {
+          s.value = node.taxCategoryCode
         }
       });
 
       actions.setFieldState('shorthand', async (s) => {
-        if (info.shorthand){
-          s.value = info.shorthand
+        if (node.shorthand){
+          s.value = node.shorthand
         }
       }); 
       setOpen(false);
     }, [controller, actions]);
 
     const onSelect = React.useCallback((key: any, info: any) => { 
+      let node = info.node || info;
       if (controller.state.goodsListState.isUpdateGoodsTaxRateList) {
-        if (info.node.taxRateList?.length) {
-          setGoodsTaxRateList(info.node.taxRateList);
+        if (node.taxRateList?.length) {
+          setGoodsTaxRateList(node.taxRateList);
         }
         if (!readOnlyTaxRate) {
           actions.setFieldState('taxRate', async s => {
-            if (info.node.taxRateList && info.node.taxRateList?.length === 1) {
-              s.value = info.node.taxRateList[0]
+            if (node.taxRateList && node.taxRateList?.length === 1) {
+              s.value = node.taxRateList[0]
             } else {
               s.value = undefined
             }
@@ -453,7 +454,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
           info={info}
           onSelect={onSelect}
           onSubmit={onSubmit1}
-          onCancel={()=> {setOpen(false)}}
+          onCancel={()=> {setOpen(false); setInfo({})}}
           onSearch={onSearch}
           onLoad={onLoad}
         />

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

@@ -121,6 +121,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   React.useEffect(() => {
     controller.pipeline(async s => { s.goodsListState.isSwitchTax = props.isSwitchTax })()
   }, [controller, props.isSwitchTax])
+
   return (
     <div className="kts-invoice-operate-goods-list-digtal" onClick={(e) => { e.stopPropagation() }} >
       <div className="kts-invoice-operate-goods-list-able">

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

@@ -32,6 +32,7 @@ export default function TableRow(props: any) {
         }
     }, [rowKey, goodsMap])
 
+
     return rowKey === current && current
         ? (
             <tr style={{ height: 50, position: 'relative' }} >

package/src/TaxClassificationCodeModal/index.less

@@ -6,5 +6,13 @@
       width: 340px;
       position: absolute;
       right: 30px; 
+      top: 79px;
+      bottom: 50px;
+      min-height: 300px;
+      .taxdesc{  
+        height: calc(100vh - 323px);
+        min-height: 105px;
+        overflow:auto
+      }
     }
   }

package/src/TaxClassificationCodeModal/index.tsx

@@ -72,14 +72,22 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
         if(!values.taxCategoryCode){
           message.warn('请选择税收分类编码');
           return; 
-        }
-        props.onCancel && props.onCancel();
+        } 
         onChildrenDrawerClose();
         props.onSubmit && props.onSubmit(props.info?.key, {...props.info,...values});
       }).catch(errorInfo => {
         console.log('errorInfo', errorInfo);
       }); 
-    } 
+    }  
+    React.useEffect(() => {
+      form.setFieldsValue({
+        ...form.getFieldsValue(),
+        taxCategoryCode: props?.info?.taxCategoryCode,
+        productName: props?.info?.productName,
+        shorthand: props?.info?.shorthand,
+        taxDesc: props?.info?.taxDesc, 
+      })
+    },[props?.info?.key])
     return (
       <Drawer
         title="商品和服务税收分类编码"
@@ -123,8 +131,8 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
             </Form.Item>
           </Form>  
           <Card className="taxrightbox">  
-            <Form form={form} key={props?.info?.key} {...layout} initialValues={props.info} >
-              <Form.Item rules={[{ required: true, message: '请勾选税收分类编码' }, ]} initialValue={props.info?.taxCategoryCode} name={"taxCategoryCode"} label="编码">
+            <Form form={form} {...layout} initialValues={props.info} >
+              <Form.Item name={"taxCategoryCode"} label="编码">
                   <FormReadOnly />
                 </Form.Item>
                 <Form.Item name={"productName"} label="货物和劳务名称">
@@ -133,7 +141,7 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
                 <Form.Item name={"shorthand"} label="简称">
                   <FormReadOnly />
                 </Form.Item> 
-                <Form.Item name={"desc"} label="说明">
+                <Form.Item name={"taxDesc"} className="taxdesc" label="说明">
                   <FormReadOnly />
                 </Form.Item> 
               </Form> 

package/dist/Invoice/Invoice-digtal/_test/architecture/index.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="react" />
-import 'antd/dist/antd.css';
-declare const _default: () => JSX.Element;
-export default _default;

package/dist/Invoice/Invoice-digtal/_test/freight/index.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="react" />
-import 'antd/dist/antd.css';
-declare const _default: () => JSX.Element;
-export default _default;

package/dist/Invoice/InvoiceController/InvoiceControllerState/FreightListState/IColumnsReplenish/index.d.ts

@@ -1,6 +0,0 @@
-/** 商品表格补充配置 */
-import { ValidationRule } from "kts-components-antd-x3/lib/form";
-export default interface IColumnsReplenish {
-    /** 补充的规则 */
-    rules: ValidationRule[];
-}

package/dist/Invoice/InvoiceController/InvoiceControllerState/FreightListState/IGood/index.d.ts

@@ -1,23 +0,0 @@
-export default interface IGood {
-    /** 数据索引 */
-    $index: string;
-    /** 序号 */
-    sortNumber?: number;
-    /** 运输工具种类列表 */
-    vehicleList?: any[] | null;
-    /** 运输工具种类 */
-    vehicle?: string;
-    type: string;
-    licensePlate: string;
-    itemName: string;
-    /** 运输工具牌号 */
-    vehicleNo?: string;
-    /** 起运地 */
-    origin?: string[];
-    /** 到达地 */
-    destination?: string[];
-    /** 运输货物名称 */
-    goodName?: string;
-    /** 地区 */
-    area?: string[];
-}

package/dist/Invoice/InvoiceController/InvoiceControllerState/FreightListState/ImportGoods/index.d.ts

@@ -1,21 +0,0 @@
-import { ColumnProps } from 'kts-components-antd-x3/lib/Table/interface';
-import { PaginationConfig } from 'kts-components-antd-x3/lib/Table';
-import React from 'react';
-export interface IGetGoodsListOption {
-    /** 分页数据 */
-    pagination: PaginationConfig;
-}
-export default class ImportGoods<ColumnType = any> {
-    /** 表头 */
-    columns: ColumnProps<ColumnType>[];
-    /** 货物列表 */
-    dataSource: ColumnType[];
-    /** 分页数据 */
-    pagination: PaginationConfig;
-    /** 是否显示导入 */
-    isVisibleDrawer: boolean;
-    /** 顶部扩展 */
-    topExpand?: React.ReactNode;
-    /** 导入时校验函数 */
-    verifyFn: (record: any) => Promise<boolean>;
-}

package/dist/Invoice/InvoiceController/InvoiceControllerState/FreightListState/index.d.ts

@@ -1,31 +0,0 @@
-import IGood from './IGood';
-import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
-export default class FreightListState {
-    /** 产品最大数 */
-    goodMax?: number;
-    /** 正在编辑的货物 */
-    editGood?: IGood;
-    /** 是否可以添加行 */
-    isAddRow: boolean;
-    /** 是否可以删除行 */
-    isRemRow: boolean;
-    /** 货物字典 */
-    goodsMap: Map<string, IGood>;
-    /** 被编辑行的form对象 */
-    form?: WrappedFormUtils;
-    /** 运输工具种类列表 */
-    vehicleTypeList: any[];
-    /** 货物列表 */
-    goodsList: IGood[];
-    /** 列表选中的货物索引列表 */
-    selectedGoodIndex: string[];
-    /** 地区 */
-    area: any[];
-    addressFieldNames: IFieldNames;
-}
-interface IFieldNames {
-    label: string;
-    value: string;
-    children: string;
-}
-export {};

package/dist/Invoice/InvoiceController/fns/addFreight.d.ts

@@ -1,6 +0,0 @@
-import { InvoiceControllerState } from '..';
-/**
- * 添加的编辑货物运输
- */
-declare const _default: (state: InvoiceControllerState, options?: any) => Promise<any>;
-export default _default;

package/dist/Invoice/InvoiceController/fns/delFreight.d.ts

@@ -1,6 +0,0 @@
-import { InvoiceControllerState } from '..';
-/**
- * 删除一个货物运输
- */
-declare const _default: (state: InvoiceControllerState, $index?: string) => Promise<void>;
-export default _default;

package/dist/Invoice/InvoiceController/fns/saveEditFreight.d.ts

@@ -1,6 +0,0 @@
-import { InvoiceControllerState } from '..';
-/**
- * 保存正在编辑的货物
- */
-declare const _default: (state: InvoiceControllerState) => Promise<void>;
-export default _default;

package/dist/Invoice/InvoiceController/fns/setEditFreight.d.ts

@@ -1,6 +0,0 @@
-import { InvoiceControllerState } from '..';
-/**
- * 设置当前的编辑货物运输
- */
-declare const _default: (state: InvoiceControllerState, newEditGood?: any) => Promise<void>;
-export default _default;

package/dist/Invoice/InvoiceController/fns/setFreight.d.ts

@@ -1,6 +0,0 @@
-import { InvoiceControllerState, IGood } from '..';
-/**
- * 设置单个货物属性
- */
-declare const _default: (state: InvoiceControllerState, options?: IGood) => Promise<void>;
-export default _default;

package/dist/Invoice/ui/digtal/Architecture/index.d.ts

@@ -1,15 +0,0 @@
-import React from "react";
-import './index.less';
-export interface RealEstateInfoProps {
-    /**
-     * 建筑服务地址数据
-     */
-    addressOptions?: any[];
-    /**
-     * 建筑服务地址数据字段名
-     */
-    fieldNames?: any;
-}
-/** 特殊信息-建筑服务 */
-declare const _default: React.FunctionComponent<RealEstateInfoProps>;
-export default _default;

package/dist/Invoice/ui/digtal/FreightList/hook/useColumns/index.d.ts

@@ -1,3 +0,0 @@
-import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
-declare const _default: (form: WrappedFormUtils) => any[];
-export default _default;

package/dist/Invoice/ui/digtal/FreightList/hook/useColumns/ui/TitleText/index.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-import { ValidationRule } from 'kts-components-antd-x3/lib/form';
-declare const _default: (props: {
-    children?: React.ReactNode;
-    required?: boolean;
-    rules?: ValidationRule[];
-}) => JSX.Element;
-export default _default;

package/dist/Invoice/ui/digtal/FreightList/hook/useOnRow/index.d.ts

@@ -1,8 +0,0 @@
-/**
- * 表格行事件
- */
-import IGood from '../../../../../InvoiceController/InvoiceControllerState/FreightListState/IGood';
-declare const _default: () => {
-    onClick: (record: IGood) => Promise<void>;
-};
-export default _default;

package/dist/Invoice/ui/digtal/FreightList/hook/useRowSelection/index.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-declare const _default: () => {
-    columnWidth: number;
-    columnTitle: JSX.Element;
-    onSelect: (record: any, selected: any) => Promise<void>;
-    selectedRowKeys: string[];
-} | undefined;
-export default _default;

package/dist/Invoice/ui/digtal/FreightList/hook/useWindowClick/index.d.ts

@@ -1,8 +0,0 @@
-/**
- * 点击组件外部 保存正在编辑的货物
- */
-import { InvoiceController } from "../../../../../..";
-/**
- * 点击组件外部 保存正在编辑的货物
- */
-export default function useWindowClick(controller: InvoiceController): void;

package/dist/Invoice/ui/digtal/FreightList/index.d.ts

@@ -1,15 +0,0 @@
-import React from 'react';
-import './index.less';
-export interface IGoodsListProps {
-    /** 产品最大数 */
-    goodMax?: number;
-    addressOptions: any[];
-    vehicleTypeList: any[];
-    /**
-     * 建筑服务地址数据字段名
-     */
-    fieldNames?: any;
-}
-export default class FreightList extends React.Component<IGoodsListProps> {
-    render(): JSX.Element;
-}

package/dist/Invoice/ui/digtal/FreightList/ui/AddRowButton/index.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-declare const _default: () => JSX.Element;
-export default _default;

package/dist/Invoice/ui/digtal/FreightList/ui/BulkMenu/hooks/useDelRowButton/index.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="react" />
-declare const _default: () => {
-    button: JSX.Element;
-    menuItem: JSX.Element;
-};
-export default _default;

package/dist/Invoice/ui/digtal/FreightList/ui/BulkMenu/hooks/useEmptyRefill/index.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="react" />
-/** 清空重填 */
-declare const _default: () => {
-    button: JSX.Element;
-};
-export default _default;

package/dist/Invoice/ui/digtal/FreightList/ui/TableRow/index.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-import './index.less';
-export default function TableRow(props: any): JSX.Element;

package/dist/Invoice/ui/digtal/FreightList/ui/TableVirtual/index.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="react" />
-import { TableProps } from "kts-xui";
-import './index.less';
-export default function <T extends object = any>(props: TableProps<T>): JSX.Element;

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

@@ -1,22 +0,0 @@
-import React from 'react';
-import Invoice from '../../..';
-import moment from 'moment';
-import 'antd/dist/antd.css';
-
-export default () => {
-
-    const controller = React.useMemo(() => new Invoice.InvoiceController(), []);
-
-    React.useEffect(() => {
-        controller.run(async s => {
-        })
-    }, [])
-
-    return (
-        <Invoice
-            invoiceType='digtal'
-            controller={controller}
-            specialInfor={<Invoice.Architecture />}
-        />
-    )
-};