kts-component-invoice-operate 3.2.25 → 3.2.26

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

@@ -31,6 +31,8 @@ export default class GoodsListState {
     columnsReplenish: {
         [key: string]: IColumnsReplenish;
     };
+    /** 商品表格隐藏列 */
+    columnshide: string[];
     /** 单位列表 */
     unitList: string[];
     /** 默认税率 */

package/dist/index.esm.js

@@ -999,6 +999,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.editGood = void 0;
   this.form = void 0;
   this.columnsReplenish = {};
+  this.columnshide = ['itemCode'];
   this.unitList = [];
   this.defaultRate = 3;
   this.taxRateList = [0, 3, 5, 6, 9, 13];
@@ -1703,12 +1704,12 @@ function mergeDetails(_x) {
 
 function _mergeDetails() {
   _mergeDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
-    var sum;
+    var goodsList, sum, p;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            if (!(state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood)) {
+            if (!state.goodsListState.editGood) {
               _context.next = 2;
               break;
             }
@@ -1716,65 +1717,88 @@ function _mergeDetails() {
             return _context.abrupt("return");
 
           case 2:
-            _context.prev = 2;
+            goodsList = state.goodsListState.selectedGoodIndex.map(function (e) {
+              return state.goodsListState.goodsMap.get(e);
+            }).filter(function (e) {
+              return !!e;
+            });
+
+            if (!(goodsList.length < 2)) {
+              _context.next = 5;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 5:
+            _context.prev = 5;
             // 创建合并后的商品对象
             sum = {
               $index: idGenerator(),
               lineAttribute: LineAttributeType$1.正常
             }; // 存在税率不一样的明细，不能合并
 
-            _context.next = 6;
-            return checkTaxTate(state.goodsListState.goodsList);
-
-          case 6:
-            _context.next = 8;
-            return fillingInformationGood(state.goodsListState.goodsList, sum);
+            _context.next = 9;
+            return checkTaxTate(goodsList);
 
-          case 8:
-            sum = _context.sent;
+          case 9:
             _context.next = 11;
-            return mergeQuantity(state.goodsListState.goodsList);
+            return fillingInformationGood(goodsList, sum);
 
           case 11:
-            sum.quantity = _context.sent;
+            sum = _context.sent;
             _context.next = 14;
-            return mergeLineAmountExcludeTax(state.goodsListState.goodsList);
+            return mergeQuantity(goodsList);
 
           case 14:
-            sum.lineAmountExcludeTax = _context.sent;
+            sum.quantity = _context.sent;
             _context.next = 17;
-            return mergeLineAmountIncludeTax(state.goodsListState.goodsList);
+            return mergeLineAmountExcludeTax(goodsList);
 
           case 17:
-            sum.lineAmountIncludeTax = _context.sent;
+            sum.lineAmountExcludeTax = _context.sent;
             _context.next = 20;
-            return calculatePriceExcludeTax(sum);
+            return mergeLineAmountIncludeTax(goodsList);
 
           case 20:
-            sum.priceExcludeTax = _context.sent;
+            sum.lineAmountIncludeTax = _context.sent;
             _context.next = 23;
-            return calculatePriceIncludeTax(sum);
+            return calculatePriceExcludeTax(sum);
 
           case 23:
+            sum.priceExcludeTax = _context.sent;
+            _context.next = 26;
+            return calculatePriceIncludeTax(sum);
+
+          case 26:
             sum.priceIncludeTax = _context.sent;
             // 计算税额
             sum.taxAmount = chain$1(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber();
-            state.goodsListState.goodsList = [sum];
-            state.goodsListState.goodsMap = new Map([[sum.$index, sum]]);
-            _context.next = 32;
+            p = state.goodsListState.goodsList.indexOf(goodsList[0]);
+            state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
+              return state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0;
+            });
+            state.goodsListState.goodsList.splice(p, 0, sum);
+            state.goodsListState.goodsMap = new Map();
+            state.goodsListState.goodsList.forEach(function (e) {
+              state.goodsListState.goodsMap.set(e.$index, e);
+            });
+            state.goodsListState.selectedGoodIndex = [];
+            _context.next = 40;
             break;
 
-          case 29:
-            _context.prev = 29;
-            _context.t0 = _context["catch"](2);
+          case 36:
+            _context.prev = 36;
+            _context.t0 = _context["catch"](5);
+            debugger;
             showError(_context.t0);
 
-          case 32:
+          case 40:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 29]]);
+    }, _callee, null, [[5, 36]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -10519,6 +10543,11 @@ var useColumns = (function (form) {
   var editGood = controller.useMemo(function (e) {
     return e.goodsListState.editGood;
   }, []);
+  /** 商品表格隐藏列 */
+
+  var columnshide = controller.useMemo(function (e) {
+    return e.goodsListState.columnshide;
+  }, []);
   /** 搜索条件 */
 
   var searchValue = controller.useMemo(function (e) {
@@ -10710,6 +10739,19 @@ var useColumns = (function (form) {
           });
         }
       }
+    }, {
+      title: '商品编码',
+      key: 'itemCode',
+      width: 119,
+      render: function render(_, record) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
+          return React.createElement(Form.Item, null, getFieldDecorator('itemCode', {
+            initialValue: editGood.itemCode
+          })(React.createElement(MyInput, null)));
+        } else {
+          return record.itemCode;
+        }
+      }
     }, {
       title: React.createElement(TitleText, {
         rules: (_columnsReplenish$ite = columnsReplenish['itemModelName']) === null || _columnsReplenish$ite === void 0 ? void 0 : _columnsReplenish$ite.rules
@@ -11295,7 +11337,10 @@ var useColumns = (function (form) {
           goods: record
         });
       }
-    }] // 含税不含税
+    }] // 筛选隐藏
+    .filter(function (e) {
+      return e.key ? columnshide.indexOf(e.key) < 0 : false;
+    }) // 含税不含税
     .filter(function (e) {
       if (isTaxIncluded) {
         return !(e.key === 'priceExcludeTax' || e.key === 'lineAmountExcludeTax');
@@ -11314,7 +11359,7 @@ var useColumns = (function (form) {
         ellipsis: true
       });
     });
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish]); // React.useEffect(() => {
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide]); // React.useEffect(() => {
   //   clearTimeout(t)
   //   const t = setTimeout(() => { setChangeField('') }, 1000);
   //   return () => { clearTimeout(t) }

package/dist/index.js

@@ -1009,6 +1009,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.editGood = void 0;
   this.form = void 0;
   this.columnsReplenish = {};
+  this.columnshide = ['itemCode'];
   this.unitList = [];
   this.defaultRate = 3;
   this.taxRateList = [0, 3, 5, 6, 9, 13];
@@ -1713,12 +1714,12 @@ function mergeDetails(_x) {
 
 function _mergeDetails() {
   _mergeDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
-    var sum;
+    var goodsList, sum, p;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            if (!(state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood)) {
+            if (!state.goodsListState.editGood) {
               _context.next = 2;
               break;
             }
@@ -1726,65 +1727,88 @@ function _mergeDetails() {
             return _context.abrupt("return");
 
           case 2:
-            _context.prev = 2;
+            goodsList = state.goodsListState.selectedGoodIndex.map(function (e) {
+              return state.goodsListState.goodsMap.get(e);
+            }).filter(function (e) {
+              return !!e;
+            });
+
+            if (!(goodsList.length < 2)) {
+              _context.next = 5;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 5:
+            _context.prev = 5;
             // 创建合并后的商品对象
             sum = {
               $index: idGenerator(),
               lineAttribute: LineAttributeType$1.正常
             }; // 存在税率不一样的明细，不能合并
 
-            _context.next = 6;
-            return checkTaxTate(state.goodsListState.goodsList);
-
-          case 6:
-            _context.next = 8;
-            return fillingInformationGood(state.goodsListState.goodsList, sum);
+            _context.next = 9;
+            return checkTaxTate(goodsList);
 
-          case 8:
-            sum = _context.sent;
+          case 9:
             _context.next = 11;
-            return mergeQuantity(state.goodsListState.goodsList);
+            return fillingInformationGood(goodsList, sum);
 
           case 11:
-            sum.quantity = _context.sent;
+            sum = _context.sent;
             _context.next = 14;
-            return mergeLineAmountExcludeTax(state.goodsListState.goodsList);
+            return mergeQuantity(goodsList);
 
           case 14:
-            sum.lineAmountExcludeTax = _context.sent;
+            sum.quantity = _context.sent;
             _context.next = 17;
-            return mergeLineAmountIncludeTax(state.goodsListState.goodsList);
+            return mergeLineAmountExcludeTax(goodsList);
 
           case 17:
-            sum.lineAmountIncludeTax = _context.sent;
+            sum.lineAmountExcludeTax = _context.sent;
             _context.next = 20;
-            return calculatePriceExcludeTax(sum);
+            return mergeLineAmountIncludeTax(goodsList);
 
           case 20:
-            sum.priceExcludeTax = _context.sent;
+            sum.lineAmountIncludeTax = _context.sent;
             _context.next = 23;
-            return calculatePriceIncludeTax(sum);
+            return calculatePriceExcludeTax(sum);
 
           case 23:
+            sum.priceExcludeTax = _context.sent;
+            _context.next = 26;
+            return calculatePriceIncludeTax(sum);
+
+          case 26:
             sum.priceIncludeTax = _context.sent;
             // 计算税额
             sum.taxAmount = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).subtract(mathjs.bignumber(sum.lineAmountExcludeTax)).done().toNumber();
-            state.goodsListState.goodsList = [sum];
-            state.goodsListState.goodsMap = new Map([[sum.$index, sum]]);
-            _context.next = 32;
+            p = state.goodsListState.goodsList.indexOf(goodsList[0]);
+            state.goodsListState.goodsList = state.goodsListState.goodsList.filter(function (e) {
+              return state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0;
+            });
+            state.goodsListState.goodsList.splice(p, 0, sum);
+            state.goodsListState.goodsMap = new Map();
+            state.goodsListState.goodsList.forEach(function (e) {
+              state.goodsListState.goodsMap.set(e.$index, e);
+            });
+            state.goodsListState.selectedGoodIndex = [];
+            _context.next = 40;
             break;
 
-          case 29:
-            _context.prev = 29;
-            _context.t0 = _context["catch"](2);
+          case 36:
+            _context.prev = 36;
+            _context.t0 = _context["catch"](5);
+            debugger;
             showError(_context.t0);
 
-          case 32:
+          case 40:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 29]]);
+    }, _callee, null, [[5, 36]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -10529,6 +10553,11 @@ var useColumns = (function (form) {
   var editGood = controller.useMemo(function (e) {
     return e.goodsListState.editGood;
   }, []);
+  /** 商品表格隐藏列 */
+
+  var columnshide = controller.useMemo(function (e) {
+    return e.goodsListState.columnshide;
+  }, []);
   /** 搜索条件 */
 
   var searchValue = controller.useMemo(function (e) {
@@ -10720,6 +10749,19 @@ var useColumns = (function (form) {
           });
         }
       }
+    }, {
+      title: '商品编码',
+      key: 'itemCode',
+      width: 119,
+      render: function render(_, record) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
+          return React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, null, getFieldDecorator('itemCode', {
+            initialValue: editGood.itemCode
+          })(React__default['default'].createElement(MyInput, null)));
+        } else {
+          return record.itemCode;
+        }
+      }
     }, {
       title: React__default['default'].createElement(TitleText, {
         rules: (_columnsReplenish$ite = columnsReplenish['itemModelName']) === null || _columnsReplenish$ite === void 0 ? void 0 : _columnsReplenish$ite.rules
@@ -11305,7 +11347,10 @@ var useColumns = (function (form) {
           goods: record
         });
       }
-    }] // 含税不含税
+    }] // 筛选隐藏
+    .filter(function (e) {
+      return e.key ? columnshide.indexOf(e.key) < 0 : false;
+    }) // 含税不含税
     .filter(function (e) {
       if (isTaxIncluded) {
         return !(e.key === 'priceExcludeTax' || e.key === 'lineAmountExcludeTax');
@@ -11324,7 +11369,7 @@ var useColumns = (function (form) {
         ellipsis: true
       });
     });
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish]); // React.useEffect(() => {
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide]); // React.useEffect(() => {
   //   clearTimeout(t)
   //   const t = setTimeout(() => { setChangeField('') }, 1000);
   //   return () => { clearTimeout(t) }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.25",
+  "version": "3.2.26",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -41,6 +41,9 @@ export default class GoodsListState {
   /** 商品表格补充配置 */
   columnsReplenish: { [key: string]: IColumnsReplenish } = {};
 
+  /** 商品表格隐藏列 */
+  columnshide:string[] = ['itemCode'];
+
   /** 单位列表 */
   unitList: string[] = [];
 

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

@@ -5,25 +5,29 @@ import idGenerator from '../../tools/idGenerator';
 import { IGood, InvoiceControllerState, LineAttributeType } from '..';
 
 export default async function mergeDetails(state: InvoiceControllerState) {
-    if (state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood) return;
+    if (state.goodsListState.editGood) return;
+
+    const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
+    if (goodsList.length < 2) return;
+
     try {
         // 创建合并后的商品对象
         let sum: IGood = { $index: idGenerator(), lineAttribute: LineAttributeType.正常 }
 
         // 存在税率不一样的明细，不能合并
-        await checkTaxTate(state.goodsListState.goodsList);
+        await checkTaxTate(goodsList);
 
         // 填充行明细信息
-        sum = await fillingInformationGood(state.goodsListState.goodsList, sum);
+        sum = await fillingInformationGood(goodsList, sum);
 
         // 合并数量
-        sum.quantity = await mergeQuantity(state.goodsListState.goodsList);
+        sum.quantity = await mergeQuantity(goodsList);
 
         // 合并金额(不含税)
-        sum.lineAmountExcludeTax = await mergeLineAmountExcludeTax(state.goodsListState.goodsList);
+        sum.lineAmountExcludeTax = await mergeLineAmountExcludeTax(goodsList);
 
         // 合并金额(含税)
-        sum.lineAmountIncludeTax = await mergeLineAmountIncludeTax(state.goodsListState.goodsList);
+        sum.lineAmountIncludeTax = await mergeLineAmountIncludeTax(goodsList);
 
         // 计算单价(不含税)
         sum.priceExcludeTax = await calculatePriceExcludeTax(sum);
@@ -34,9 +38,14 @@ export default async function mergeDetails(state: InvoiceControllerState) {
         // 计算税额
         sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
 
-        state.goodsListState.goodsList = [sum];
-        state.goodsListState.goodsMap = new Map([[sum.$index, sum]]);
+        const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
+        state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
+        state.goodsListState.goodsList.splice(p, 0, sum);
+        state.goodsListState.goodsMap = new Map();
+        state.goodsListState.goodsList.forEach(e => { state.goodsListState.goodsMap.set(e.$index, e) });
+        state.goodsListState.selectedGoodIndex = [];
     } catch (error: any) {
+        debugger;
         showError(error)
     }
 }

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

@@ -64,6 +64,7 @@ class MyController1 extends Invoice.InvoiceController {
   constructor() {
     super()
     this.state.model = 'default'
+    this.state.goodsListState.isMergeDetails = true;
   }
 
   getTaxCategoryCodeList = this.pipeline(async (s) => {
@@ -88,6 +89,7 @@ class MyController2 extends Invoice.InvoiceController {
   constructor() {
     super()
     this.state.model = 'prefab'
+    this.state.goodsListState.isMergeDetails = true;
   }
 
   getTaxCategoryCodeList = this.pipeline(async (s) => {

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

@@ -35,6 +35,9 @@ export default (form: WrappedFormUtils) => {
   /** 正在编辑的货物 */
   const editGood = controller.useMemo((e) => e.goodsListState.editGood, []);
 
+  /** 商品表格隐藏列 */
+  const columnshide = controller.useMemo((e) => e.goodsListState.columnshide, []);
+
   /** 搜索条件 */
   const searchValue = controller.useMemo((e) => e.goodsListState.searchValue, []);
 
@@ -58,9 +61,9 @@ export default (form: WrappedFormUtils) => {
 
   const onNumberValueChange = React.useCallback((e) => {
     const value = e?.target?.value;
-        if (value) {
-            return value.replace(/[^0-9-\.]/g, '');
-        }
+    if (value) {
+      return value.replace(/[^0-9-\.]/g, '');
+    }
   }, [])
 
   /** 获取补充校验规则 */
@@ -130,14 +133,34 @@ export default (form: WrappedFormUtils) => {
           } else {
             return (
               <MyItemNameDiv
-                valueT={formatSearch(getItemNameWithShorthand({shorthand: record.shorthand, full: record.itemNameSelf || ''}), searchValue)}
-                valueF={formatSearch(getItemNameWithShorthand({shorthand: record.shorthand, full: record.itemName || ''}), searchValue)}
+                valueT={formatSearch(getItemNameWithShorthand({ shorthand: record.shorthand, full: record.itemNameSelf || '' }), searchValue)}
+                valueF={formatSearch(getItemNameWithShorthand({ shorthand: record.shorthand, full: record.itemName || '' }), searchValue)}
                 isMyShow={isMyShow}
               />
             )
           }
         },
       },
+      {
+        title: '商品编码',
+        key: 'itemCode',
+        width: 119,
+        render: (_: string, record: IGood) => {
+          if (editGood?.$index === record.$index) {
+            return (
+              <Form.Item>
+                {getFieldDecorator('itemCode', {
+                  initialValue: editGood.itemCode,
+                })(
+                  <MyInput />,
+                )}
+              </Form.Item>
+            )
+          } else {
+            return record.itemCode
+          }
+        }
+      },
       {
         title: <TitleText rules={columnsReplenish['itemModelName']?.rules} >规格型号</TitleText>,
         key: 'itemModelName',
@@ -497,6 +520,10 @@ export default (form: WrappedFormUtils) => {
         render: (_value: string, record: IGood) => <RowMenu key={record.lineAttribute} goods={record} />,
       },
     ]
+      // 筛选隐藏
+      .filter(e => {  
+        return e.key ? columnshide.indexOf(e.key) < 0 : false;
+      })
       // 含税不含税
       .filter((e) => {
         if (isTaxIncluded) {
@@ -519,7 +546,7 @@ export default (form: WrappedFormUtils) => {
           ellipsis: true,
         };
       }) as any[];
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish]);
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide]);
 
   // React.useEffect(() => {
   //   clearTimeout(t)