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

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

@@ -2,83 +2,21 @@ 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 (
-        <>
-            <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,11 @@
 # 数电
 
-<!-- ## 简单用法
-<code src="./_test/easiest/index.tsx"></code> -->
+## 简单用法
+<code src="./_test/pay/index.tsx"></code>
+<!-- <code src="./_test/easiest/index.tsx"></code> -->
 
-## 不动产经营租赁服务
-<code src="./_test/realEstateInfo/index.tsx"></code>
+<!-- ## 不动产经营租赁服务
+<code src="./_test/realEstateInfo/index.tsx"></code> -->
 
 <!-- ## 建筑服务
 <code src="./_test/architecture/index.tsx"></code> -->
@@ -36,9 +37,16 @@
 ## 查看当前可用授信额度
 <code src="./_test/lineCredit/index.tsx"></code>
 
-
+## 不动产经营租赁服务
+<code src="./_test/realEstateInfo/index.tsx"></code>
 
 -->
-
-<!-- ## 货物运输服务
-<code src="./_test/freight/index.tsx"></code>  -->
+<<<<<<< HEAD
+
+## 货物运输服务
+<code src="./_test/freight/index.tsx"></code> 
+=======
+<!-- 
+## 货物运输服务
+<code src="./_test/freight/index.tsx"></code>  -->
+>>>>>>> 3e4750d (农产品发票升级)

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

@@ -58,6 +58,17 @@ export default class InvoiceControllerForm extends GreyReactBox<InvoiceControlle
 
     _values.set('freightList', this.state.freightListState.goodsList.slice());
 
+    //支付
+    if (this.state.payListState.form) {
+      try {
+        await this.state.payListState.form?.validateFields()
+      } catch (error: any) {
+        _errors.set('payList', error.errors);
+      }
+    }
+
+    _values.set('payList', this.state.payListState.goodsList.slice());
+
     // 金额（含税）
     _values.set('lineAmountIncludeTax', (() => {
       let sum = chain(bignumber(0));

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,81 @@
+import { ColumnProps } from 'kts-components-antd-x3/lib/Table/interface';
+import { PaginationConfig } from 'kts-components-antd-x3/lib/Table';
+import { message } from 'kts-components-antd-x3';
+import React from 'react';
+
+export interface IGetGoodsListOption {
+  /** 分页数据 */
+  pagination: PaginationConfig;
+}
+
+export default class ImportGoods<ColumnType = any> {
+  /** 表头 */
+  columns: ColumnProps<ColumnType>[] = [
+    {
+      title: '商品分类',
+      dataIndex: 'itemType',
+      key: 'itemType',
+    },
+    {
+      title: '商品编码',
+      dataIndex: 'itemNo',
+      key: 'itemNo',
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'itemName',
+      key: 'itemName',
+    },
+    {
+      title: '规格型号',
+      dataIndex: 'itemModelName',
+      key: 'itemModelName',
+    },
+    {
+      title: '计量单位',
+      dataIndex: 'unit',
+      key: 'unit',
+    },
+    {
+      title: '税率',
+      dataIndex: 'taxRate',
+      key: 'taxRate',
+      render: text => text || text === 0 ? `${text}%` : ''
+    },
+    {
+      title: '单价(含税)',
+      dataIndex: 'priceIncludeTax',
+      key: 'priceIncludeTax',
+    },
+    {
+      title: '税收分类编码',
+      dataIndex: 'taxClassificationCode',
+      key: 'taxClassificationCode',
+    },
+  ];
+
+  /** 货物列表 */
+  dataSource: ColumnType[] = [];
+
+  /** 分页数据 */
+  pagination: PaginationConfig = {};
+
+  /** 是否显示导入 */
+  isVisibleDrawer = false;
+
+  /** 顶部扩展 */
+  topExpand?: React.ReactNode;
+
+  /** 导入时校验函数 */
+  verifyFn: (record: any) => Promise<boolean> = async record => {
+    if (!record.taxClassificationCode) {
+      message.error({ content: '请维护该商品的税收分类编码！', key: '请维护该商品的税收分类编码！' })
+      return false;
+    }
+    if (record.productStatus === 0) {
+      message.error({ content: '当前货物为禁用', key: '当前货物为禁用' })
+      return false;
+    }
+    return true;
+  };
+}

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

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

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

@@ -1,5 +1,6 @@
 import GoodsListState from './GoodsListState';
 import FreightListState from './FreightListState';
+import PayListState from './PayListState';
 import BuyerState from './BuyerState';
 import Stakeholder from './Stakeholder';
 import { IInvoiceTypeModalProps } from '../../../InvoiceTypeModal';
@@ -68,6 +69,8 @@ export default class InvoiceControllerState {
    * 货物运输列表
    */
   freightListState = new FreightListState();
+  
+  payListState=new PayListState();
 
   addGoodsCheck?: any;
 }

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

@@ -0,0 +1,11 @@
+import { InvoiceControllerState } from '..';
+import idGenerator from '../../tools/idGenerator';
+
+/**
+ * 添加的付款
+ */
+export default async (state: InvoiceControllerState, options?: any) => {
+  options.$index = idGenerator();
+  state.payListState.goodsList = [...state.payListState.goodsList, options];
+  return options;
+};

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

@@ -0,0 +1,38 @@
+import { InvoiceControllerState } from '..';
+
+/**
+ * 删除一个付款行
+ */
+export default async (state: InvoiceControllerState, $index?: string) => {
+  if (!$index) return;
+  // 查下要删除的货物
+  const goods = state.payListState.goodsList.filter((e) => e.$index === $index)[0];
+  if (!goods) return;
+
+  // 如果正在编辑 就取消编辑
+  if (state.payListState.editGood && state.payListState.editGood.$index === $index) {
+    state.payListState.editGood = undefined;
+  }
+  const goodsList = state.payListState.goodsList;
+  const goodsMap = state.payListState.goodsMap;
+
+  goodsMap.delete($index);
+
+  for (let i = 0; i < goodsList.length; i++) {
+
+    if (goodsList[i].$index === $index) {
+      // const good = goodsList[i];
+
+      // if (good.lineAttribute === LineAttributeType.折扣行 && goodsList[i - 1] && goodsList[i - 1].lineAttribute === LineAttributeType.被折扣行) {
+      //   goodsList[i - 1].lineAttribute = LineAttributeType.正常;
+      // }
+
+      goodsList.splice(i, 1);
+
+      break;
+    }
+  }
+  
+  state.payListState.goodsList = [...goodsList];
+  state.payListState.goodsMap = new Map(goodsMap);
+};

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/InvoiceController/fns/saveEditPay.ts

@@ -0,0 +1,23 @@
+import { InvoiceControllerState } from '..';
+
+/**
+ * 保存正在编辑的支付信息
+ */
+export default async (state: InvoiceControllerState) => {
+  
+  const editGood = state.payListState.editGood;
+  const form = state.payListState.form;
+  if (!editGood || !form ) return;
+  if ((await validateFields(form)).err) return;
+
+  state.payListState.goodsList = state.payListState.goodsList.map((e) =>
+    e.$index === editGood.$index ? { ...e, ...editGood } : e,
+  );
+  state.payListState.editGood = undefined;
+};
+
+const validateFields = (form: any) => new Promise((resolve: (v: { err: any; values: any }) => void) => {
+  form.validateFields(async (err: any, values: any) => {
+    resolve({ err, values });
+  });
+});

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

@@ -0,0 +1,16 @@
+import { InvoiceControllerState, IGood3 } from '..';
+
+/**
+ * 设置当前的编辑的付款信息
+ */
+export default async (state: InvoiceControllerState, newEditGood?: any) => {
+  if (newEditGood) {
+    const editGood = state.payListState.editGood as IGood3;
+    state.payListState = {
+      ...state.payListState,
+      editGood: { ...editGood, ...newEditGood },
+    };
+  } else {
+    state.payListState = { ...state.payListState, editGood: undefined };
+  }
+};

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

@@ -0,0 +1,11 @@
+
+import { InvoiceControllerState, IGood } from '..';
+
+/**
+ * 设置单个商品的付款信息
+ */
+export default async (state: InvoiceControllerState, options?: IGood) => {
+    if (!options || !options.$index) return;
+    const goodsList = state.payListState.goodsList.map(e => e.$index === options.$index ? { ...e, ...options } : e);
+    state.payListState = { ...state.payListState, goodsList };
+};

package/src/Invoice/InvoiceController/index.ts

@@ -5,16 +5,27 @@ import { IGetGoodsListOption } from './InvoiceControllerState/GoodsListState/Imp
 // import updateInvoiceNo from './fns/updateInvoiceNo';
 import setEditGood from './fns/setEditGood';
 import setEditFreight from './fns/setEditFreight';
+import setEditPay from './fns/setEditPay';
+
 import setGoods from './fns/setGoods';
 import setFreight from './fns/setFreight';
+import setPay from './fns/setPay';
+
 import delGood from './fns/delGood';
 import delFreight from './fns/delFreight';
+import delPay from './fns/delPay';
+
 import addGoodDiscount from './fns/addGoodDiscount';
 import addGoodDiscountV2 from './fns/addGoodDiscountV2';
+
 import addGood from './fns/addGood';
 import addFreight from './fns/addFreight';
+import addPay from './fns/addPay';
+
 import saveEditGood from './fns/saveEditGood';
 import saveEditFreight from './fns/saveEditFreight';
+import saveEditPay from './fns/saveEditPay';
+
 import getGoodsSearch from './fns/getGoodsSearch';
 import mergeDetails from './fns/mergeDetails';
 import mergeDiscount from './fns/mergeDiscount';
@@ -25,6 +36,7 @@ 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 as IGood3 } from './InvoiceControllerState/PayListState/IGood';
 export default class InvoiceController extends InvoiceControllerForm {
   constructor(state = new InvoiceControllerState()) {
     super(state);
@@ -48,8 +60,12 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 设置货物运输属性 */
   setFreight = this.pipeline(setFreight);
 
+  setPay = this.pipeline(setPay);
+
   setEditFreight = this.pipeline(setEditFreight);
 
+  setEditPay = this.pipeline(setEditPay);
+
   /** 设置当前的编辑货物 */
   setEditGood = this.pipeline(setEditGood);
 
@@ -59,18 +75,23 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 保存正在编辑的货物运输 */
   saveEditFreight = this.pipeline<any>(saveEditFreight);
 
+  saveEditPay=this.pipeline<any>(saveEditPay);
   /** 删除一个货物 */
   delGood = this.pipeline(delGood);
 
   /** 删除一个货物运输 */
   delFreight = this.pipeline(delFreight);
 
+  delPay = this.pipeline(delPay);
+
   /** 添加一个货物 */
   addGood = this.pipeline(addGood);
 
   /** 添加一个货物运输 */
   addFreight = this.pipeline(addFreight);
 
+  addPay = this.pipeline(addPay);
+
   /** 全单合并明细 */
   mergeDetails = this.pipeline(mergeDetails);
 

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

@@ -1,18 +1,12 @@
 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';
 
 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);
@@ -35,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

@@ -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/index.tsx

@@ -21,6 +21,7 @@ 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 PayList from './ui/digtal/PayList';
 
 import ImportBuyerDrawer from './ui/default/ImportBuyerDrawer';
 import ImportGoodsDrawer from './ui/default/ImportGoodsDrawer';
@@ -110,6 +111,8 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
 
   static readonly FreightList = FreightList;
 
+  static readonly PayList = PayList;
+
   /** 货物列表(数电) */
   static readonly GoodsListDigtal = GoodsListDigtal;
 

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

@@ -8,4 +8,6 @@ export default function useToGenerateId(controller: InvoiceController) {
     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])
+    const payList = controller.useMemo(s => s.payListState.goodsList, []);
+    React.useEffect(() => {  payList.forEach((e, i) => { e.sortNumber = i + 1 }) }, [payList])
 }