kts-component-invoice-operate 3.2.243 → 3.2.245

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/setEditFreight.ts

@@ -1,16 +1,16 @@
-import { InvoiceControllerState, IGood2 } from '..';
-
-/**
- * 设置当前的编辑货物运输
- */
-export default async (state: InvoiceControllerState, newEditGood?: any) => {
-  if (newEditGood) {
-    const editGood = state.freightListState.editGood as IGood2;
-    state.freightListState = {
-      ...state.freightListState,
-      editGood: { ...editGood, ...newEditGood },
-    };
-  } else {
-    state.freightListState = { ...state.freightListState, editGood: undefined };
-  }
-};
+import { InvoiceControllerState, IGood2 } from '..';
+
+/**
+ * 设置当前的编辑货物运输
+ */
+export default async (state: InvoiceControllerState, newEditGood?: any) => {
+  if (newEditGood) {
+    const editGood = state.freightListState.editGood as IGood2;
+    state.freightListState = {
+      ...state.freightListState,
+      editGood: { ...editGood, ...newEditGood },
+    };
+  } else {
+    state.freightListState = { ...state.freightListState, editGood: undefined };
+  }
+};

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

@@ -1,16 +1,16 @@
-import { InvoiceControllerState, IGood } from '../';
-
-/**
- * 设置当前的编辑货物
- */
-export default async (state: InvoiceControllerState, newEditGood?: any) => {
-  if (newEditGood) {
-    const editGood = state.goodsListState.editGood as IGood;
-    state.goodsListState = {
-      ...state.goodsListState,
-      editGood: { ...editGood, ...newEditGood },
-    };
-  } else {
-    state.goodsListState = { ...state.goodsListState, editGood: undefined };
-  }
-};
+import { InvoiceControllerState, IGood } from '../';
+
+/**
+ * 设置当前的编辑货物
+ */
+export default async (state: InvoiceControllerState, newEditGood?: any) => {
+  if (newEditGood) {
+    const editGood = state.goodsListState.editGood as IGood;
+    state.goodsListState = {
+      ...state.goodsListState,
+      editGood: { ...editGood, ...newEditGood },
+    };
+  } else {
+    state.goodsListState = { ...state.goodsListState, editGood: undefined };
+  }
+};

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/setFreight.ts

@@ -1,11 +1,11 @@
-
-import { InvoiceControllerState, IGood } from '..';
-
-/**
- * 设置单个货物属性
- */
-export default async (state: InvoiceControllerState, options?: IGood) => {
-    if (!options || !options.$index) return;
-    const goodsList = state.freightListState.goodsList.map(e => e.$index === options.$index ? { ...e, ...options } : e);
-    state.freightListState = { ...state.freightListState, goodsList };
+
+import { InvoiceControllerState, IGood } from '..';
+
+/**
+ * 设置单个货物属性
+ */
+export default async (state: InvoiceControllerState, options?: IGood) => {
+    if (!options || !options.$index) return;
+    const goodsList = state.freightListState.goodsList.map(e => e.$index === options.$index ? { ...e, ...options } : e);
+    state.freightListState = { ...state.freightListState, goodsList };
 };

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

@@ -1,11 +1,11 @@
-
-import { InvoiceControllerState, IGood } from '../';
-
-/**
- * 设置单个货物属性
- */
-export default async (state: InvoiceControllerState, options?: IGood) => {
-    if (!options || !options.$index) return;
-    const goodsList = state.goodsListState.goodsList.map(e => e.$index === options.$index ? { ...e, ...options } : e);
-    state.goodsListState = { ...state.goodsListState, goodsList };
+
+import { InvoiceControllerState, IGood } from '../';
+
+/**
+ * 设置单个货物属性
+ */
+export default async (state: InvoiceControllerState, options?: IGood) => {
+    if (!options || !options.$index) return;
+    const goodsList = state.goodsListState.goodsList.map(e => e.$index === options.$index ? { ...e, ...options } : e);
+    state.goodsListState = { ...state.goodsListState, goodsList };
 };

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

@@ -1,9 +1,9 @@
-
-import InvoiceControllerState from '../InvoiceControllerState';
-
-/**
- * 更新 发票单据编号
- */
-export default async (state: InvoiceControllerState) => {
-    return `INV${(Math.random() * 10000000000000).toFixed(0)}`;
+
+import InvoiceControllerState from '../InvoiceControllerState';
+
+/**
+ * 更新 发票单据编号
+ */
+export default async (state: InvoiceControllerState) => {
+    return `INV${(Math.random() * 10000000000000).toFixed(0)}`;
 };

package/src/Invoice/InvoiceController/index.ts

@@ -1,106 +1,127 @@
-import InvoiceControllerForm from './InvoiceControllerForm';
-import InvoiceControllerState from './InvoiceControllerState';
-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';
-import importGoodsDrawer from './fns/importGoodsDrawer';
-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);
-  }
-
-  // ----------------- 发票头 模块相关 -----------------
-
-  /** 更新发票单据编号 */
-  updateInvoiceNo?: (option?: undefined) => Promise<any> //= this.pipeline(updateInvoiceNo);
-
-  // ----------------- 购买方 模块相关 -----------------
-
-  /** 获取 购买方 列表 */
-  getBuyerList?: (option?: IGetBuyerListOption | undefined) => Promise<any>;
-
-  // ----------------- 货物 模块相关 -----------------
-
-  /** 设置单个货物属性 */
-  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);
-
-  /** 全单合并折扣 */
-  mergeDiscount = this.pipeline<any>(mergeDiscount);
-
-  /** 给一组货物添加折扣行 */
-  addGoodDiscount = this.pipeline(addGoodDiscount);
-
-  /** 给一组货物添加折扣行 */
-  addGoodDiscountV2 = this.pipeline(addGoodDiscountV2);
-
-  /** 导入商品 */
-  importGoodsDrawer = this.pipeline(importGoodsDrawer);
-
-  /** 项目名称智能赋码 */
-  itemNameBlur = this.pipeline(itemBlur);
-
-  /** 获取 商品 列表 */
-  getGoodsList?: (option?: IGetGoodsListOption | undefined) => Promise<any>;
-
-  /** 税收分类编码列表  */
-  getTaxCategoryCodeList?: () => Promise<any>;
-
-  /** 获取筛选后的列表 */
-  getGoodsSearch = getGoodsSearch;
-
-  /** 获取货物的税率可选列表, 如果没传taxClassificationCode，返回undefined */
-  getGoodsTaxRateList?: (taxClassificationCode: string) => Promise<number[] | undefined | null>;
-
-  /** 商品列表配置器 */
-  setColumnsConfig?: (columns: any[]) => any[];
-}
+import InvoiceControllerForm from './InvoiceControllerForm';
+import InvoiceControllerState from './InvoiceControllerState';
+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 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';
+import importGoodsDrawer from './fns/importGoodsDrawer';
+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 as IGood3 } from './InvoiceControllerState/PayListState/IGood';
+export default class InvoiceController extends InvoiceControllerForm {
+  constructor(state = new InvoiceControllerState()) {
+    super(state);
+  }
+
+  // ----------------- 发票头 模块相关 -----------------
+
+  /** 更新发票单据编号 */
+  updateInvoiceNo?: (option?: undefined) => Promise<any> //= this.pipeline(updateInvoiceNo);
+
+  // ----------------- 购买方 模块相关 -----------------
+
+  /** 获取 购买方 列表 */
+  getBuyerList?: (option?: IGetBuyerListOption | undefined) => Promise<any>;
+
+  // ----------------- 货物 模块相关 -----------------
+
+  /** 设置单个货物属性 */
+  setGoods = this.pipeline(setGoods);
+
+  /** 设置货物运输属性 */
+  setFreight = this.pipeline(setFreight);
+
+  setPay = this.pipeline(setPay);
+
+  setEditFreight = this.pipeline(setEditFreight);
+
+  setEditPay = this.pipeline(setEditPay);
+
+  /** 设置当前的编辑货物 */
+  setEditGood = this.pipeline(setEditGood);
+
+  /** 保存正在编辑的货物 */
+  saveEditGood = this.pipeline<any>(saveEditGood);
+
+  /** 保存正在编辑的货物运输 */
+  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);
+
+  /** 全单合并折扣 */
+  mergeDiscount = this.pipeline<any>(mergeDiscount);
+
+  /** 给一组货物添加折扣行 */
+  addGoodDiscount = this.pipeline(addGoodDiscount);
+
+  /** 给一组货物添加折扣行 */
+  addGoodDiscountV2 = this.pipeline(addGoodDiscountV2);
+
+  /** 导入商品 */
+  importGoodsDrawer = this.pipeline(importGoodsDrawer);
+
+  /** 项目名称智能赋码 */
+  itemNameBlur = this.pipeline(itemBlur);
+
+  /** 获取 商品 列表 */
+  getGoodsList?: (option?: IGetGoodsListOption | undefined) => Promise<any>;
+
+  /** 税收分类编码列表  */
+  getTaxCategoryCodeList?: () => Promise<any>;
+
+  /** 获取筛选后的列表 */
+  getGoodsSearch = getGoodsSearch;
+
+  /** 获取货物的税率可选列表, 如果没传taxClassificationCode，返回undefined */
+  getGoodsTaxRateList?: (taxClassificationCode: string) => Promise<number[] | undefined | null>;
+
+  /** 商品列表配置器 */
+  setColumnsConfig?: (columns: any[]) => any[];
+}

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

@@ -1,42 +1,42 @@
-
-import React from 'react';
-import { Invoice } from '../../..';
-
-export default () => {
-
-  const controller = React.useMemo(() => new MyController(), [])
-
-  return (
-    <Invoice controller={controller} />
-  );
-};
-
-class MyController extends Invoice.InvoiceController {
-  constructor() {
-    super()
-    this.state.buyerState.autoContainer = {
-      onBuyNameChange: async (e?: string) => {
-        await this.wait(2000);
-        return {
-          recent: [
-            { buyerName: '中科讯联科技北京网络有限公司中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-          ],
-          list: [
-            { buyerName: '中科讯联科技北京网络有限公司中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
-          ],
-        }
-      }
-    }
-  }
-}
+
+import React from 'react';
+import { Invoice } from '../../..';
+
+export default () => {
+
+  const controller = React.useMemo(() => new MyController(), [])
+
+  return (
+    <Invoice controller={controller} />
+  );
+};
+
+class MyController extends Invoice.InvoiceController {
+  constructor() {
+    super()
+    this.state.buyerState.autoContainer = {
+      onBuyNameChange: async (e?: string) => {
+        await this.wait(2000);
+        return {
+          recent: [
+            { buyerName: '中科讯联科技北京网络有限公司中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+          ],
+          list: [
+            { buyerName: '中科讯联科技北京网络有限公司中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+            { buyerName: '中科讯联科技北京网络有限公司', buyerNo: '918273829182918291' },
+          ],
+        }
+      }
+    }
+  }
+}